This is an automated email from the ASF dual-hosted git repository.
nathanma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new aa17fbddd [AMORO-3159] Pull optimizer and metrics module out of
amoro-ams (#3160)
aa17fbddd is described below
commit aa17fbdddef26ee4472757259d3739dbf0c2cf6d
Author: majin1102 <[email protected]>
AuthorDate: Mon Sep 2 22:32:45 2024 +0800
[AMORO-3159] Pull optimizer and metrics module out of amoro-ams (#3160)
* Pull optimizer and metrics module out of amoro-ams
* Fix parent modification for optimizer and metrics module
---------
Co-authored-by: majin.nathan <[email protected]>
---
.github/labeler.yml | 2 +-
.github/workflows/docker-images.yml | 8 ++++----
README.md | 2 +-
amoro-ams/dist/src/main/assemblies/bin.xml | 6 +++---
amoro-ams/pom.xml | 2 --
.../amoro-metrics-prometheus/pom.xml | 2 +-
.../org/apache/amoro/metrics/promethues/MetricsCollector.java | 0
.../amoro/metrics/promethues/PrometheusMetricsReporter.java | 0
.../META-INF/services/org.apache.amoro.metrics.MetricReporter | 0
{amoro-ams/amoro-ams-metrics => amoro-metrics}/pom.xml | 4 ++--
.../amoro-optimizer-common/pom.xml | 2 +-
.../apache/amoro/optimizer/common/AbstractOptimizerOperator.java | 0
.../main/java/org/apache/amoro/optimizer/common/Optimizer.java | 0
.../java/org/apache/amoro/optimizer/common/OptimizerConfig.java | 0
.../java/org/apache/amoro/optimizer/common/OptimizerExecutor.java | 0
.../java/org/apache/amoro/optimizer/common/OptimizerToucher.java | 0
.../java/org/apache/amoro/optimizer/common/OptimizerTestBase.java | 0
.../org/apache/amoro/optimizer/common/OptimizerTestHelpers.java | 0
.../java/org/apache/amoro/optimizer/common/TestOptimizer.java | 0
.../org/apache/amoro/optimizer/common/TestOptimizerConfig.java | 0
.../org/apache/amoro/optimizer/common/TestOptimizerExecutor.java | 0
.../org/apache/amoro/optimizer/common/TestOptimizerToucher.java | 0
.../amoro-optimizer-flink/pom.xml | 2 +-
.../main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java | 0
.../java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java | 0
.../org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java | 0
.../main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java | 0
.../amoro-optimizer-spark/pom.xml | 2 +-
.../java/org/apache/amoro/optimizer/spark/SparkOptimizer.java | 0
.../org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java | 0
.../apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java | 0
.../amoro-optimizer-standalone/pom.xml | 2 +-
.../apache/amoro/optimizer/standalone/StandaloneOptimizer.java | 0
{amoro-ams/amoro-ams-optimizer => amoro-optimizer}/pom.xml | 4 ++--
docker/build.sh | 8 ++++----
pom.xml | 2 ++
36 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index d2eb2a195..cda0eca53 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -51,7 +51,7 @@
- "amoro-web/**/*"
"module:ams-optimizer":
- - "amoro-ams/amoro-ams-optimizer/**/*"
+ - "amoro-optimizer/**/*"
"module:mixed-spark":
- "amoro-mixed-format/amoro-mixed-format-spark/**/*"
diff --git a/.github/workflows/docker-images.yml
b/.github/workflows/docker-images.yml
index f2d1c16c1..43b9508a0 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -162,7 +162,7 @@ jobs:
&& echo "AMORO_VERSION=${AMORO_VERSION}" >> $GITHUB_OUTPUT
- name: Build optimizer module with Maven
- run: mvn clean package -pl
'amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink' -am -e ${OPTIMIZER_FLINK}
-DskipTests -B -ntp
+ run: mvn clean package -pl 'amoro-optimizer/amoro-optimizer-flink' -am
-e ${OPTIMIZER_FLINK} -DskipTests -B -ntp
- name: Build and Push Flink Optimizer Docker Image
uses: docker/build-push-action@v4
@@ -176,7 +176,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
build-args: |
FLINK_VERSION=${{ matrix.flink }}
-
OPTIMIZER_JOB=amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${{
env.AMORO_VERSION }}-jar-with-dependencies.jar
+
OPTIMIZER_JOB=amoro-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${{
env.AMORO_VERSION }}-jar-with-dependencies.jar
docker-optimizer-spark:
name: Push Amoro Optimizer-Spark Docker Image to Docker Hub
@@ -237,7 +237,7 @@ jobs:
&& echo "AMORO_VERSION=${AMORO_VERSION}" >> $GITHUB_OUTPUT
- name: Build optimizer module with Maven
- run: mvn clean package -pl
'amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark' -am -e ${OPTIMIZER_SPARK}
-DskipTests -B -ntp
+ run: mvn clean package -pl 'amoro-optimizer/amoro-optimizer-spark' -am
-e ${OPTIMIZER_SPARK} -DskipTests -B -ntp
- name: Build and Push Spark Optimizer Docker Image
uses: docker/build-push-action@v4
@@ -251,6 +251,6 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
build-args: |
SPARK_VERSION=${{ matrix.spark }}
-
OPTIMIZER_JOB=amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${{
env.AMORO_VERSION }}-jar-with-dependencies.jar
+
OPTIMIZER_JOB=amoro-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${{
env.AMORO_VERSION }}-jar-with-dependencies.jar
diff --git a/README.md b/README.md
index bc23104bb..9fbf3b58d 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ Amoro contains modules as below:
- `amoro-ams-api` contains ams thrift api and common interfaces
- `amoro-ams-dashboard` is the dashboard frontend for ams
- `amoro-ams-server` is the backend server for ams
- - `amoro-ams-optimizer` provides default optimizer implementation
+ - `amoro-optimizer` provides default optimizer implementation
- `amoro-mixed-format` provides Mixed format implementation
- `amoro-mixed-format-hive` integrates with Apache Hive and implements
Mixed Hive format
- `amoro-mixed-format-flink` provides Flink connectors for Mixed format
tables (use amoro-flink-runtime for a shaded version)
diff --git a/amoro-ams/dist/src/main/assemblies/bin.xml
b/amoro-ams/dist/src/main/assemblies/bin.xml
index 409d190ec..f8bfdd3da 100644
--- a/amoro-ams/dist/src/main/assemblies/bin.xml
+++ b/amoro-ams/dist/src/main/assemblies/bin.xml
@@ -30,7 +30,7 @@
<files>
<file>
<source>
-
../amoro-ams-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${project.version}-jar-with-dependencies.jar
+
../../amoro-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${project.version}-jar-with-dependencies.jar
</source>
<outputDirectory>plugin/optimizer/flink</outputDirectory>
<destName>optimizer-job.jar</destName>
@@ -38,7 +38,7 @@
</file>
<file>
<source>
-
../amoro-ams-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${project.version}-jar-with-dependencies.jar
+
../../amoro-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${project.version}-jar-with-dependencies.jar
</source>
<outputDirectory>plugin/optimizer/spark</outputDirectory>
<destName>optimizer-job.jar</destName>
@@ -46,7 +46,7 @@
</file>
<file>
<source>
-
../amoro-ams-metrics/amoro-metrics-prometheus/target/amoro-metrics-prometheus-${project.version}-jar-with-dependencies.jar
+
../../amoro-metrics/amoro-metrics-prometheus/target/amoro-metrics-prometheus-${project.version}-jar-with-dependencies.jar
</source>
<outputDirectory>plugin/metric-reporters</outputDirectory>
<destName>prometheus-reporter.jar</destName>
diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index 71e10b334..9a1503cad 100644
--- a/amoro-ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -34,8 +34,6 @@
<modules>
<module>amoro-ams-server</module>
- <module>amoro-ams-optimizer</module>
- <module>amoro-ams-metrics</module>
<module>dist</module>
</modules>
diff --git a/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/pom.xml
b/amoro-metrics/amoro-metrics-prometheus/pom.xml
similarity index 98%
rename from amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/pom.xml
rename to amoro-metrics/amoro-metrics-prometheus/pom.xml
index 011bcc27c..73670b475 100644
--- a/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/pom.xml
+++ b/amoro-metrics/amoro-metrics-prometheus/pom.xml
@@ -20,7 +20,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>amoro-ams-metrics</artifactId>
+ <artifactId>amoro-metrics</artifactId>
<groupId>org.apache.amoro</groupId>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
diff --git
a/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java
b/amoro-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java
similarity index 100%
rename from
amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java
rename to
amoro-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java
diff --git
a/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/PrometheusMetricsReporter.java
b/amoro-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/PrometheusMetricsReporter.java
similarity index 100%
rename from
amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/PrometheusMetricsReporter.java
rename to
amoro-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/PrometheusMetricsReporter.java
diff --git
a/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter
b/amoro-metrics/amoro-metrics-prometheus/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter
similarity index 100%
rename from
amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter
rename to
amoro-metrics/amoro-metrics-prometheus/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter
diff --git a/amoro-ams/amoro-ams-metrics/pom.xml b/amoro-metrics/pom.xml
similarity index 94%
rename from amoro-ams/amoro-ams-metrics/pom.xml
rename to amoro-metrics/pom.xml
index 91e5f4993..1ee4344ac 100644
--- a/amoro-ams/amoro-ams-metrics/pom.xml
+++ b/amoro-metrics/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.amoro</groupId>
- <artifactId>amoro-ams</artifactId>
+ <artifactId>amoro-parent</artifactId>
<version>0.8-SNAPSHOT</version>
</parent>
- <artifactId>amoro-ams-metrics</artifactId>
+ <artifactId>amoro-metrics</artifactId>
<packaging>pom</packaging>
<name>Amoro Project AMS Metric Reporter Parent</name>
<url>https://amoro.apache.org</url>
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/pom.xml
b/amoro-optimizer/amoro-optimizer-common/pom.xml
similarity index 97%
rename from amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/pom.xml
rename to amoro-optimizer/amoro-optimizer-common/pom.xml
index 4fa049e0c..d691fbc06 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/pom.xml
+++ b/amoro-optimizer/amoro-optimizer-common/pom.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>amoro-ams-optimizer</artifactId>
+ <artifactId>amoro-optimizer</artifactId>
<groupId>org.apache.amoro</groupId>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
b/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
rename to
amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java
b/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java
rename to
amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
b/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
rename to
amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
b/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
rename to
amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
b/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
rename to
amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
rename to
amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
rename to
amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
rename to
amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java
rename to
amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
rename to
amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
rename to
amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/pom.xml
b/amoro-optimizer/amoro-optimizer-flink/pom.xml
similarity index 99%
rename from amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/pom.xml
rename to amoro-optimizer/amoro-optimizer-flink/pom.xml
index c85ea02c5..b9ed069f1 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/pom.xml
+++ b/amoro-optimizer/amoro-optimizer-flink/pom.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>amoro-ams-optimizer</artifactId>
+ <artifactId>amoro-optimizer</artifactId>
<groupId>org.apache.amoro</groupId>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java
b/amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java
rename to
amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java
b/amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java
rename to
amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
b/amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
rename to
amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java
b/amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java
rename to
amoro-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml
b/amoro-optimizer/amoro-optimizer-spark/pom.xml
similarity index 99%
rename from amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml
rename to amoro-optimizer/amoro-optimizer-spark/pom.xml
index 398ef4ace..65288df2e 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml
+++ b/amoro-optimizer/amoro-optimizer-spark/pom.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>amoro-ams-optimizer</artifactId>
+ <artifactId>amoro-optimizer</artifactId>
<groupId>org.apache.amoro</groupId>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java
b/amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java
rename to
amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
b/amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
rename to
amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
b/amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
rename to
amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-standalone/pom.xml
b/amoro-optimizer/amoro-optimizer-standalone/pom.xml
similarity index 97%
rename from amoro-ams/amoro-ams-optimizer/amoro-optimizer-standalone/pom.xml
rename to amoro-optimizer/amoro-optimizer-standalone/pom.xml
index c5fb8671c..bfd829ff3 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-standalone/pom.xml
+++ b/amoro-optimizer/amoro-optimizer-standalone/pom.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>amoro-ams-optimizer</artifactId>
+ <artifactId>amoro-optimizer</artifactId>
<groupId>org.apache.amoro</groupId>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
diff --git
a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-standalone/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java
b/amoro-optimizer/amoro-optimizer-standalone/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java
similarity index 100%
rename from
amoro-ams/amoro-ams-optimizer/amoro-optimizer-standalone/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java
rename to
amoro-optimizer/amoro-optimizer-standalone/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java
diff --git a/amoro-ams/amoro-ams-optimizer/pom.xml b/amoro-optimizer/pom.xml
similarity index 94%
rename from amoro-ams/amoro-ams-optimizer/pom.xml
rename to amoro-optimizer/pom.xml
index 13b54d696..dc7a2a941 100644
--- a/amoro-ams/amoro-ams-optimizer/pom.xml
+++ b/amoro-optimizer/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.amoro</groupId>
- <artifactId>amoro-ams</artifactId>
+ <artifactId>amoro-parent</artifactId>
<version>0.8-SNAPSHOT</version>
</parent>
- <artifactId>amoro-ams-optimizer</artifactId>
+ <artifactId>amoro-optimizer</artifactId>
<packaging>pom</packaging>
<name>Amoro Project AMS Optimizer Parent</name>
<url>https://amoro.apache.org</url>
diff --git a/docker/build.sh b/docker/build.sh
index 4f4871894..e31031bb8 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -28,9 +28,9 @@ FLINK_VERSION=1.20.0
SPARK_VERSION=3.3.3
DEBIAN_MIRROR=http://deb.debian.org
APACHE_ARCHIVE=https://archive.apache.org/dist
-FLINK_OPTIMIZER_JOB_PATH=amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${AMORO_VERSION}-jar-with-dependencies.jar
+FLINK_OPTIMIZER_JOB_PATH=amoro-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${AMORO_VERSION}-jar-with-dependencies.jar
FLINK_OPTIMIZER_JOB=${PROJECT_HOME}/${FLINK_OPTIMIZER_JOB_PATH}
-SPARK_OPTIMIZER_JOB_PATH=amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${AMORO_VERSION}-jar-with-dependencies.jar
+SPARK_OPTIMIZER_JOB_PATH=amoro-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${AMORO_VERSION}-jar-with-dependencies.jar
SPARK_OPTIMIZER_JOB=${PROJECT_HOME}/${SPARK_OPTIMIZER_JOB_PATH}
AMORO_TAG=$AMORO_VERSION
MAVEN_MIRROR=https://repo.maven.apache.org/maven2
@@ -160,7 +160,7 @@ function build_optimizer_flink() {
OPTIMIZER_JOB=${FLINK_OPTIMIZER_JOB}
if [ ! -f "${OPTIMIZER_JOB}" ]; then
- BUILD_CMD="mvn clean package -pl
amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink -am -e -DskipTests"
+ BUILD_CMD="mvn clean package -pl amoro-optimizer/amoro-optimizer-flink
-am -e -DskipTests"
echo "flink optimizer job not exists in ${OPTIMIZER_JOB}"
echo "please check the file or run '${BUILD_CMD}' first. "
exit 1
@@ -183,7 +183,7 @@ function build_optimizer_spark() {
OPTIMIZER_JOB=${SPARK_OPTIMIZER_JOB}
if [ ! -f "${OPTIMIZER_JOB}" ]; then
- BUILD_CMD="mvn clean package -pl
amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark -am -e -DskipTests"
+ BUILD_CMD="mvn clean package -pl amoro-optimizer/amoro-optimizer-spark
-am -e -DskipTests"
echo "spark optimizer job not exists in ${OPTIMIZER_JOB}"
echo "please check the file or run '${BUILD_CMD}' first. "
exit 1
diff --git a/pom.xml b/pom.xml
index 93d7b5ffe..787f1de75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
<module>amoro-common</module>
<module>amoro-web</module>
<module>amoro-ams</module>
+ <module>amoro-optimizer</module>
+ <module>amoro-metrics</module>
<module>amoro-iceberg-format</module>
<module>amoro-mixed-format</module>
<module>amoro-hudi-format</module>
