refactor: optimzie agg and meta module

traas-stack · Apr 23, 2024 · eda64a2 · eda64a2
1 parent 9572699
commit eda64a2
Show file tree

Hide file tree

Showing 74 changed files with 925 additions and 9,719 deletions.
diff --git a/.../io/holoinsight/server/agg/v1/executor/executor/AggExecutorRegistryAutoConfiguration.java b/.../io/holoinsight/server/agg/v1/executor/executor/AggExecutorRegistryAutoConfiguration.java
@@ -7,8 +7,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import io.holoinsight.server.agg.v1.executor.CompletenessService;
-import io.holoinsight.server.agg.v1.executor.output.XOutput;
+import io.holoinsight.server.agg.v1.core.executor.CompletenessService;
+import io.holoinsight.server.agg.v1.core.executor.output.XOutput;
 import io.holoinsight.server.common.springboot.ConditionalOnRole;
 import io.holoinsight.server.extension.MetricStorage;
 import io.holoinsight.server.registry.core.collecttarget.CollectTargetStorage;

diff --git a/...oot/src/main/java/io/holoinsight/server/agg/v1/executor/executor/MetricStorageOutput.java b/...oot/src/main/java/io/holoinsight/server/agg/v1/executor/executor/MetricStorageOutput.java
@@ -19,10 +19,10 @@
 
 import io.holoinsight.server.agg.v1.core.Utils;
 import io.holoinsight.server.agg.v1.core.conf.OutputField;
-import io.holoinsight.server.agg.v1.executor.output.AggStringLookup;
-import io.holoinsight.server.agg.v1.executor.output.MergedCompleteness;
-import io.holoinsight.server.agg.v1.executor.output.PercentileFinalValues;
-import io.holoinsight.server.agg.v1.executor.output.XOutput;
+import io.holoinsight.server.agg.v1.core.executor.output.AggStringLookup;
+import io.holoinsight.server.agg.v1.core.executor.output.MergedCompleteness;
+import io.holoinsight.server.agg.v1.core.executor.output.PercentileFinalValues;
+import io.holoinsight.server.agg.v1.core.executor.output.XOutput;
 import io.holoinsight.server.extension.MetricStorage;
 import io.holoinsight.server.extension.model.WriteMetricsParam;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...a/io/holoinsight/server/agg/v1/executor/executor/RegistryInternalCompletenessService.java b/...a/io/holoinsight/server/agg/v1/executor/executor/RegistryInternalCompletenessService.java
@@ -10,8 +10,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import io.holoinsight.server.agg.v1.executor.CompletenessService;
-import io.holoinsight.server.agg.v1.executor.ExpectedCompleteness;
+import io.holoinsight.server.agg.v1.core.executor.CompletenessService;
+import io.holoinsight.server.agg.v1.core.executor.ExpectedCompleteness;
 import io.holoinsight.server.meta.common.model.QueryExample;
 import io.holoinsight.server.registry.core.collecttarget.CollectTargetKey;
 import io.holoinsight.server.registry.core.collecttarget.CollectTargetStorage;

diff --git a/server/agg/agg-core/pom.xml b/server/agg/agg-core/pom.xml
@@ -65,6 +65,10 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/.../agg/v1/executor/CompletenessService.java → ...v1/core/executor/CompletenessService.java b/.../agg/v1/executor/CompletenessService.java → ...v1/core/executor/CompletenessService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor;
+package io.holoinsight.server.agg.v1.core.executor;
 
 /**
  * <p>

diff --git a/...agg/v1/executor/ExpectedCompleteness.java → ...1/core/executor/ExpectedCompleteness.java b/...agg/v1/executor/ExpectedCompleteness.java → ...1/core/executor/ExpectedCompleteness.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor;
+package io.holoinsight.server.agg.v1.core.executor;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...g/v1/executor/executor/FixedSizeTags.java → ...r/agg/v1/core/executor/FixedSizeTags.java b/...g/v1/executor/executor/FixedSizeTags.java → ...r/agg/v1/core/executor/FixedSizeTags.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.executor;
+package io.holoinsight.server.agg.v1.core.executor;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/...rver/agg/v1/executor/executor/XWhere.java → ...t/server/agg/v1/core/executor/XWhere.java b/...rver/agg/v1/executor/executor/XWhere.java → ...t/server/agg/v1/core/executor/XWhere.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.executor;
+package io.holoinsight.server.agg.v1.core.executor;
 
 import io.holoinsight.server.agg.v1.core.data.DataAccessor;
 

diff --git a/...g/v1/executor/output/AggStringLookup.java → ...core/executor/output/AggStringLookup.java b/...g/v1/executor/output/AggStringLookup.java → ...core/executor/output/AggStringLookup.java
@@ -1,14 +1,13 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.output;
+package io.holoinsight.server.agg.v1.core.executor.output;
 
 import java.util.Map;
 
+import io.holoinsight.server.agg.v1.core.executor.FixedSizeTags;
 import org.apache.commons.text.lookup.StringLookup;
 
-import io.holoinsight.server.agg.v1.executor.executor.FixedSizeTags;
-
 /**
  * <p>
  * created at 2023/10/25

diff --git a/...r/agg/v1/executor/output/BatchSerdes.java → .../v1/core/executor/output/BatchSerdes.java b/...r/agg/v1/executor/output/BatchSerdes.java → .../v1/core/executor/output/BatchSerdes.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.output;
+package io.holoinsight.server.agg.v1.core.executor.output;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/...1/executor/output/MergedCompleteness.java → ...e/executor/output/MergedCompleteness.java b/...1/executor/output/MergedCompleteness.java → ...e/executor/output/MergedCompleteness.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.output;
+package io.holoinsight.server.agg.v1.core.executor.output;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...xecutor/output/PercentileFinalValues.java → ...xecutor/output/PercentileFinalValues.java b/...xecutor/output/PercentileFinalValues.java → ...xecutor/output/PercentileFinalValues.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.output;
+package io.holoinsight.server.agg.v1.core.executor.output;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...er/agg/v1/executor/output/WindowStat.java → ...g/v1/core/executor/output/WindowStat.java b/...er/agg/v1/executor/output/WindowStat.java → ...g/v1/core/executor/output/WindowStat.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.output;
+package io.holoinsight.server.agg.v1.core.executor.output;
 
 import com.alibaba.fastjson.JSON;
 

diff --git a/...erver/agg/v1/executor/output/XOutput.java → .../agg/v1/core/executor/output/XOutput.java b/...erver/agg/v1/executor/output/XOutput.java → .../agg/v1/core/executor/output/XOutput.java
@@ -1,15 +1,15 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.output;
+package io.holoinsight.server.agg.v1.core.executor.output;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import io.holoinsight.server.agg.v1.core.conf.OutputItem;
 import io.holoinsight.server.agg.v1.core.data.AggTaskKey;
-import io.holoinsight.server.agg.v1.executor.executor.FixedSizeTags;
+import io.holoinsight.server.agg.v1.core.executor.FixedSizeTags;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/...ver/agg/v1/executor/state/OffsetInfo.java → ...gg/v1/core/executor/state/OffsetInfo.java b/...ver/agg/v1/executor/state/OffsetInfo.java → ...gg/v1/core/executor/state/OffsetInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.state;
+package io.holoinsight.server.agg.v1.core.executor.state;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...1/executor/state/PartitionStateStore.java → ...e/executor/state/PartitionStateStore.java b/...1/executor/state/PartitionStateStore.java → ...e/executor/state/PartitionStateStore.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.agg.v1.executor.state;
+package io.holoinsight.server.agg.v1.core.executor.state;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/server/agg/agg-executor-api/.gitignore b/server/agg/agg-executor-api/.gitignore
diff --git a/server/agg/agg-executor-api/generate.sh b/server/agg/agg-executor-api/generate.sh
diff --git a/server/agg/agg-executor-api/pom.xml b/server/agg/agg-executor-api/pom.xml