[AMORO-2802] Change the folder name of optimizer module

.github/workflows/docker-images.yml

@@ -160,7 +160,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/flink-optimizer' -am -e ${OPTIMIZER_FLINK} -DskipTests -B -ntp
+        run: mvn clean package -pl 'amoro-ams/amoro-ams-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
@@ -174,7 +174,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           build-args: |
             FLINK_VERSION=${{ matrix.flink }}
-            OPTIMIZER_JOB=amoro-ams/amoro-ams-optimizer/flink-optimizer/target/flink-optimizer-${{ env.AMORO_VERSION }}-jar-with-dependencies.jar
+            OPTIMIZER_JOB=amoro-ams/amoro-ams-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
@@ -232,7 +232,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/spark-optimizer' -am -e ${OPTIMIZER_SPARK} -DskipTests -B -ntp
+        run: mvn clean package -pl 'amoro-ams/amoro-ams-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
@@ -246,7 +246,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           build-args: |
             SPARK_VERSION=${{ matrix.spark }}
-            OPTIMIZER_JOB=amoro-ams/amoro-ams-optimizer/spark-optimizer/target/spark-optimizer-${{ env.AMORO_VERSION }}-jar-with-dependencies.jar
+            OPTIMIZER_JOB=amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${{ env.AMORO_VERSION }}-jar-with-dependencies.jar
 
 
   docker-quickdemo:

.gitignore

@@ -55,7 +55,7 @@ core/derby.log
 target/
 
 # keberos configs
-*arctic_krb_conf/
+*amoro_krb_conf/
 
 # local config
 conf/
@@ -72,4 +72,4 @@ amoro-ams/amoro-ams-dashboard/src/main/resources/static/
 amoro-ams/amoro-ams-dashboard/node/
 
 !amoro-ams/dist/src/main/arctic-bin/bin/
-!amoro-ams/dist/src/main/arctic-bin/conf/
+!amoro-ams/dist/src/main/arctic-bin/conf/

amoro-ams/amoro-ams-optimizer/common/pom.xml → amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/pom.xml

@@ -28,7 +28,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>optimizer-common</artifactId>
+    <artifactId>amoro-optimizer-common</artifactId>
     <name>Amoro Project AMS Optimizer Common</name>
     <url>https://amoro.apache.org</url>
 

amoro-ams/amoro-ams-optimizer/flink-optimizer/pom.xml → amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/pom.xml

@@ -28,7 +28,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>flink-optimizer</artifactId>
+    <artifactId>amoro-optimizer-flink</artifactId>
     <name>Amoro Project AMS Flink Optimizer</name>
     <url>https://amoro.apache.org</url>
 
@@ -42,7 +42,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>optimizer-common</artifactId>
+            <artifactId>amoro-optimizer-common</artifactId>
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>

amoro-ams/amoro-ams-optimizer/spark-optimizer/pom.xml → amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml

@@ -28,7 +28,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>spark-optimizer</artifactId>
+    <artifactId>amoro-optimizer-spark</artifactId>
     <name>Amoro Project AMS Spark Optimizer</name>
     <url>https://amoro.apache.org</url>
 
@@ -40,7 +40,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>optimizer-common</artifactId>
+            <artifactId>amoro-optimizer-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -183,4 +183,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>

amoro-ams/amoro-ams-optimizer/standalone-optimizer/pom.xml → amoro-ams/amoro-ams-optimizer/amoro-optimizer-standalone/pom.xml

@@ -28,15 +28,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>standalone-optimizer</artifactId>
+    <artifactId>amoro-optimizer-standalone</artifactId>
     <name>Amoro Project AMS Standalone Optimizer</name>
     <url>https://amoro.apache.org</url>
 
 
     <dependencies>
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>optimizer-common</artifactId>
+            <artifactId>amoro-optimizer-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 

amoro-ams/amoro-ams-optimizer/pom.xml

@@ -33,10 +33,10 @@
     <url>https://amoro.apache.org</url>
 
     <modules>
-        <module>flink-optimizer</module>
-        <module>spark-optimizer</module>
-        <module>standalone-optimizer</module>
-        <module>common</module>
+        <module>amoro-optimizer-common</module>
+        <module>amoro-optimizer-flink</module>
+        <module>amoro-optimizer-spark</module>
+        <module>amoro-optimizer-standalone</module>
     </modules>
 
 </project>

amoro-ams/amoro-ams-server/pom.xml

@@ -300,7 +300,7 @@
 
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>standalone-optimizer</artifactId>
+            <artifactId>amoro-optimizer-standalone</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>

amoro-ams/dist/pom.xml

@@ -43,18 +43,18 @@
         </dependency>
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>standalone-optimizer</artifactId>
+            <artifactId>amoro-optimizer-standalone</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>flink-optimizer</artifactId>
+            <artifactId>amoro-optimizer-flink</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>spark-optimizer</artifactId>
+            <artifactId>amoro-optimizer-spark</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

amoro-ams/dist/src/main/assemblies/bin.xml

@@ -30,15 +30,15 @@
     <files>
         <file>
             <source>
-                ../amoro-ams-optimizer/flink-optimizer/target/flink-optimizer-${project.version}-jar-with-dependencies.jar
+                ../amoro-ams-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>
             <fileMode>0644</fileMode>
         </file>
         <file>
             <source>
-                ../amoro-ams-optimizer/spark-optimizer/target/spark-optimizer-${project.version}-jar-with-dependencies.jar
+                ../amoro-ams-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>

docker/README.md

@@ -19,13 +19,16 @@
 
 We provide a bash script to help you build docker image easier.
 
-You can build all images via the script in current dir.
+You can control which image is built by the follow parameters :
 
-```shell
-./build.sh all 
-```
+- amoro
+- optimizer-flink
+- optimizer-spark
+- quickdemo
+- namenode
+- datanode
 
-or just build only one image.
+e.g.
 
 ```shell
 ./build.sh amoro

docker/build.sh

@@ -29,9 +29,9 @@ SPARK_VERSION=3.3.3
 HADOOP_VERSION=2.10.2
 DEBIAN_MIRROR=http://deb.debian.org
 APACHE_ARCHIVE=https://archive.apache.org/dist
-FLINK_OPTIMIZER_JOB_PATH=ams/optimizer/flink-optimizer/target/flink-optimizer-${AMORO_VERSION}-jar-with-dependencies.jar
+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=${PROJECT_HOME}/${FLINK_OPTIMIZER_JOB_PATH}
-SPARK_OPTIMIZER_JOB_PATH=ams/optimizer/spark-optimizer/target/spark-optimizer-${AMORO_VERSION}-jar-with-dependencies.jar
+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=${PROJECT_HOME}/${SPARK_OPTIMIZER_JOB_PATH}
 AMORO_TAG=$AMORO_VERSION
 ALSO_MAKE=true
@@ -210,7 +210,7 @@ function build_optimizer_flink() {
     OPTIMIZER_JOB=${FLINK_OPTIMIZER_JOB}
 
     if [ ! -f "${OPTIMIZER_JOB}" ]; then
-      BUILD_CMD="mvn clean package -pl ams/optimizer/flink-optimizer -am -e -DskipTests"
+      BUILD_CMD="mvn clean package -pl amoro-ams/amoro-ams-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
@@ -233,7 +233,7 @@ function build_optimizer_spark() {
     OPTIMIZER_JOB=${SPARK_OPTIMIZER_JOB}
 
     if [ ! -f "${OPTIMIZER_JOB}" ]; then
-      BUILD_CMD="mvn clean package -pl ams/optimizer/spark-optimizer -am -e -DskipTests"
+      BUILD_CMD="mvn clean package -pl amoro-ams/amoro-ams-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
@@ -253,7 +253,7 @@ function build_amoro() {
   local IMAGE_TAG=$AMORO_TAG
   print_image $IMAGE_REF $IMAGE_TAG
 
-  local DIST_FILE=${PROJECT_HOME}/ams/dist/target/amoro-${AMORO_VERSION}-bin.zip
+  local DIST_FILE=${PROJECT_HOME}/amoro-ams/dist/target/amoro-${AMORO_VERSION}-bin.zip
 
   if [ ! -f "${DIST_FILE}" ]; then
     local BUILD_CMD="mvn clean package -am -e -pl ams/dist -DskipTests "
@@ -272,8 +272,8 @@ function build_quickdemo() {
     local IMAGE_REF=arctic163/quickdemo
     local IMAGE_TAG=$AMORO_TAG
 
-    local FLINK_CONNECTOR_BINARY=${PROJECT_HOME}/mixed/flink/v${FLINK_MAJOR_VERSION}/flink-runtime/target/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar
-    local SPARK_CONNECTOR_BINARY=${PROJECT_HOME}/mixed/spark/v${SPARK_MAJOR_VERSION}/spark-runtime/target/amoro-mixed-spark-runtime-${SPARK_MAJOR_VERSION}-${AMORO_VERSION}.jar
+    local FLINK_CONNECTOR_BINARY=${PROJECT_HOME}/amoro-mixed-format/amoro-mixed-format-flink/v${FLINK_MAJOR_VERSION}/amoro-mixed-format-flink-runtime-${FLINK_MAJOR_VERSION}/target/amoro-mixed-format-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar
+    local SPARK_CONNECTOR_BINARY=${PROJECT_HOME}/amoro-mixed-format/amoro-mixed-format-spark/v${SPARK_MAJOR_VERSION}/amoro-mixed-format-spark-${SPARK_MAJOR_VERSION}-runtime/target/amoro-mixed-format-spark-${SPARK_MAJOR_VERSION}-runtime-${AMORO_VERSION}.jar
 
     if [ ! -f "${FLINK_CONNECTOR_BINARY}" ]; then
         echo "amoro-mixed-flink-connector not exists in ${FLINK_CONNECTOR_BINARY}, run 'mvn clean package -pl !mixed/trino' first. "
@@ -338,4 +338,4 @@ case "$ACTION" in
     echo "Unknown image type: $ACTION"
     exit 1
     ;;
-esac
+esac

docker/quickdemo/Dockerfile

@@ -34,8 +34,8 @@ WORKDIR /workspace/amoro
 RUN AMORO_VERSION=`cat pom.xml | grep 'amoro-parent' -C 3 | grep -Eo '<version>.*</version>' | awk -F'[><]' '{print $3}'` \
     && FLINK_VERSION=${FLINK_VERSION} \
     && FLINK_MAJOR_VERSION="${FLINK_VERSION%.*}" \
-    && cp mixed/flink/v${FLINK_MAJOR_VERSION}/flink-runtime/target/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \
-      /opt/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \
+    && cp amoro-mixed-format/amoro-mixed-format-flink/v${FLINK_MAJOR_VERSION}/amoro-mixed-format-flink-runtime-${FLINK_MAJOR_VERSION}/target/amoro-mixed-format-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \
+      /opt/amoro-mixed-format-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \
     && rm -rf /workspace/amoro
 
 
@@ -72,6 +72,3 @@ WORKDIR ${FLINK_HOME}
 COPY --from=builder /opt/*.jar ${FLINK_HOME}/lib/
 COPY ./docker/quickdemo/flink-conf.yaml ${FLINK_HOME}/conf/flink-conf.yaml
 RUN ln -s ${FLINK_HOME} /usr/local/flink
-
-
-

docs/admin-guides/deployment.md

@@ -59,7 +59,7 @@ amoro-mixed-format-spark-3.2-runtime-x.y.z-sources.jar
 original-amoro-mixed-format-spark-3.2-runtime-x.y.z.jar
 ```
 
-If the Flink version in the ams/optimizer/flink-optimizer module you compiled is lower than 1.15, you must add the `-Pflink-pre-1.15` parameter before mvn.
+If the Flink version in the amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink module you compiled is lower than 1.15, you must add the `-Pflink-pre-1.15` parameter before mvn.
 for example `mvn clean package -Pflink-pre-1.15 -Dflink-optimizer.flink-version=1.14.6 -DskipTests` to compile.
 
 If you need to compile the Trino module at the same time, you need to install jdk17 locally and configure `toolchains.xml` in the user's `${user.home}/.m2/` directory,