Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: optimzie agg and meta module #839

Merged
merged 2 commits into from
Apr 23, 2024
Merged

refactor: optimzie agg and meta module #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eda64a2
refactor: optimzie agg and meta module
Apr 22, 2024
3c5c8d7
fix: fix licensed
Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../io/holoinsight/server/agg/v1/executor/executor/AggExecutorRegistryAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...oot/src/main/java/io/holoinsight/server/agg/v1/executor/executor/MetricStorageOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...a/io/holoinsight/server/agg/v1/executor/executor/RegistryInternalCompletenessService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions server/agg/agg-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../agg/v1/executor/CompletenessService.java → ...v1/core/executor/CompletenessService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...agg/v1/executor/ExpectedCompleteness.java → ...1/core/executor/ExpectedCompleteness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...g/v1/executor/executor/FixedSizeTags.java → ...r/agg/v1/core/executor/FixedSizeTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rver/agg/v1/executor/executor/XWhere.java → ...t/server/agg/v1/core/executor/XWhere.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
5 changes: 2 additions & 3 deletions ...g/v1/executor/output/AggStringLookup.java → ...core/executor/output/AggStringLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...r/agg/v1/executor/output/BatchSerdes.java → .../v1/core/executor/output/BatchSerdes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...1/executor/output/MergedCompleteness.java → ...e/executor/output/MergedCompleteness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...xecutor/output/PercentileFinalValues.java → ...xecutor/output/PercentileFinalValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...er/agg/v1/executor/output/WindowStat.java → ...g/v1/core/executor/output/WindowStat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...erver/agg/v1/executor/output/XOutput.java → .../agg/v1/core/executor/output/XOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ver/agg/v1/executor/state/OffsetInfo.java → ...gg/v1/core/executor/state/OffsetInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...1/executor/state/PartitionStateStore.java → ...e/executor/state/PartitionStateStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
38 changes: 0 additions & 38 deletions server/agg/agg-executor-api/.gitignore
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions server/agg/agg-executor-api/generate.sh
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions server/agg/agg-executor-api/pom.xml
View file
Open in desktop

This file was deleted.

Loading
Loading