refactor: remove query-dal

traas-stack · Apr 3, 2024 · 3ff41fe · 3ff41fe
1 parent 8a8050e
commit 3ff41fe
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 81 deletions.
diff --git a/...eresdbx/src/main/java/io/holoinsight/server/extension/ceresdbx/CeresdbxMetricStorage.java b/...eresdbx/src/main/java/io/holoinsight/server/extension/ceresdbx/CeresdbxMetricStorage.java
@@ -166,8 +166,7 @@ public List<Result> queryData(QueryParam queryParam) {
 
   @Override
   public List<Result> queryTags(QueryParam queryParam) {
-    List<Result> results = queryData(queryParam);
-    return results;
+    return queryData(queryParam);
   }
 
   @Override
@@ -230,7 +229,7 @@ public List<Result> pqlRangeQuery(PqlParam pqlParam) {
   @Override
   public DetailResult queryDetail(QueryParam queryParam) {
     String sql = queryParam.getQl();
-    List<String> tables = null;
+    List<String> tables;
     if (StringUtils.isNotBlank(sql)) {
       SqlParser parser = SqlParserFactoryProvider.getSqlParserFactory().getParser(sql);
       tables = parser.tableNames();
@@ -321,13 +320,13 @@ private void doBatchInsert(Set<String> metrics, String tenant,
           StatUtils.STORAGE_WRITE.add(StringsKey.of("CeresDBx", tenant, "N"),
               new long[] {1, oneBatch.size(), System.currentTimeMillis() - start});
           if (result != null && null != result.getErr()) {
-            LOGGER.error("save metrics:{} to CeresDBx error msg:{}", metrics,
+            LOGGER.error("save metrics:{},[{}] to CeresDBx error msg:{}", metrics, tenant,
                 result.getErr().getError());
           } else if (null != throwable) {
-            LOGGER.error("save metrics:{} to CeresDBx error msg:{}", metrics,
+            LOGGER.error("save metrics:{},[{}] to CeresDBx error msg:{}", metrics, tenant,
                 throwable.getMessage(), throwable);
           } else {
-            LOGGER.error("save metrics:{} to CeresDBx error", metrics);
+            LOGGER.error("save metrics:{},[{}] to CeresDBx error", metrics, tenant);
           }
         }
       });

diff --git a/server/query/query-dal/pom.xml b/server/query/query-dal/pom.xml
diff --git a/...query/query-dal/src/main/java/io/holoinsight/server/query/dal/mapper/TenantOpsMapper.java b/...query/query-dal/src/main/java/io/holoinsight/server/query/dal/mapper/TenantOpsMapper.java
diff --git a/server/query/query-dal/src/main/java/io/holoinsight/server/query/dal/model/TenantOps.java b/server/query/query-dal/src/main/java/io/holoinsight/server/query/dal/model/TenantOps.java
diff --git a/server/query/query-service/pom.xml b/server/query/query-service/pom.xml
@@ -13,11 +13,6 @@
 	<artifactId>query-service</artifactId>
 
 	<dependencies>
-		<dependency>
-			<groupId>io.holoinsight.server</groupId>
-			<artifactId>query-dal</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>io.holoinsight.server</groupId>
 			<artifactId>extension-storage-ceresdbx</artifactId>

diff --git a/server/server-parent/pom.xml b/server/server-parent/pom.xml
@@ -40,7 +40,6 @@
 		<module>../query/query-service</module>
 		<module>../query/query-bootstrap</module>
 		<module>../query/query-client</module>
-		<module>../query/query-dal</module>
 		<module>../query/query-server</module>
 		<module>../query/query-boot</module>
 		<module>../query/query-grpc-gen</module>