diff --git a/.github/labeler.yml b/.github/labeler.yml index 3dc6b3bfca..81b0e1d917 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -32,7 +32,7 @@ "type:build": - "**/*pom.xml" - - "amoro-ams/dist/**/*" + - "dist/**/*" - "docker/**/*" - "charts/**/" @@ -40,27 +40,26 @@ - "*.md" - "docs/**/*" -"module:core": - - "amoro-core/**/*" +"module:common": + - "amoro-common/**/*" "module:ams-server": - - "amoro-ams/amoro-ams-api/**/*" - - "amoro-ams/amoro-ams-server/**/*" + - "amoro-ams/**/*" "module:ams-dashboard": - - "amoro-ams/amoro-ams-dashboard/**/*" + - "amoro-web/**/*" "module:ams-optimizer": - - "amoro-ams/amoro-ams-optimizer/**/*" + - "amoro-optimizer/**/*" "module:mixed-spark": - - "amoro-mixed-format/amoro-mixed-format-spark/**/*" + - "amoro-format-mixed/amoro-mixed-spark/**/*" "module:mixed-flink": - - "amoro-mixed-format/amoro-mixed-format-flink/**/*" + - "amoro-format-mixed/amoro-mixed-flink/**/*" "module:mixed-hive": - - "amoro-mixed-format/amoro-mixed-format-hive/**/*" + - "amoro-format-mixed/amoro-mixed-hive/**/*" "module:mixed-trino": - - "amoro-mixed-format/amoro-mixed-format-trino/**/*" + - "amoro-format-mixed/amoro-mixed-trino/**/*" diff --git a/.github/workflows/core-hadoop2-ci.yml b/.github/workflows/core-hadoop2-ci.yml index 4fc34d93b5..d5ac469e8f 100644 --- a/.github/workflows/core-hadoop2-ci.yml +++ b/.github/workflows/core-hadoop2-ci.yml @@ -21,9 +21,9 @@ on: - ".github/workflows/**" - "amoro-ams/**" - "amoro-core/**" - - "amoro-mixed-format/amoro-mixed-format-flink/**" - - "amoro-mixed-format/amoro-mixed-format-hive/**" - - "amoro-mixed-format/amoro-mixed-format-spark/**" + - "amoro-format-mixed/amoro-format-mixed-flink/**" + - "amoro-format-mixed/amoro-format-mixed-hive/**" + - "amoro-format-mixed/amoro-format-mixed-spark/**" - "pom.xml" - "tools/maven/**" diff --git a/.github/workflows/core-hadoop3-ci.yml b/.github/workflows/core-hadoop3-ci.yml index 44a6c85d56..034ec67cf8 100644 --- a/.github/workflows/core-hadoop3-ci.yml +++ b/.github/workflows/core-hadoop3-ci.yml @@ -21,9 +21,9 @@ on: - ".github/workflows/**" - "amoro-ams/**" - "amoro-core/**" - - "amoro-mixed-format/amoro-mixed-format-flink/**" - - "amoro-mixed-format/amoro-mixed-format-hive/**" - - "amoro-mixed-format/amoro-mixed-format-spark/**" + - "amoro-format-mixed/amoro-format-mixed-flink/**" + - "amoro-format-mixed/amoro-format-mixed-hive/**" + - "amoro-format-mixed/amoro-format-mixed-spark/**" - "pom.xml" - "tools/maven/**" diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index f2d1c16c11..3bb7158dbe 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -86,7 +86,7 @@ jobs: echo "MVN_HADOOP=-Phadoop2" >> $GITHUB_ENV - name: Build dist module with Maven - run: mvn clean package -pl 'amoro-ams/dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp + run: mvn clean package -pl 'dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp - name: Build and Push Amoro Docker Image uses: docker/build-push-action@v4 @@ -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/.github/workflows/trino-ci.yml b/.github/workflows/trino-ci.yml index b1238ffcd9..075823a7d9 100644 --- a/.github/workflows/trino-ci.yml +++ b/.github/workflows/trino-ci.yml @@ -21,8 +21,8 @@ on: - ".github/workflows/**" - "amoro-ams/**" - "amoro-core/**" - - "amoro-mixed-format/amoro-mixed-format-hive/**" - - "amoro-mixed-format/amoro-mixed-format-trino/**" + - "amoro-format-mixed/amoro-mixed-hive/**" + - "amoro-format-mixed/amoro-mixed-trino/**" - "pom.xml" - "tools/maven/**" @@ -42,7 +42,7 @@ jobs: run: mvn validate -P format-mixed-format-trino - name: Build trino module with Maven - run: mvn clean install -pl 'amoro-mixed-format/amoro-mixed-format-trino' -am -B -P hadoop2,format-mixed-format-trino,build-mixed-format-trino + run: mvn clean install -pl 'amoro-format-mixed/amoro-mixed-trino' -am -B -P hadoop2,format-mixed-format-trino,build-mixed-format-trino - name: Code coverage uses: codecov/codecov-action@v3 diff --git a/.gitignore b/.gitignore index aef8ddf7c1..435bca0a21 100644 --- a/.gitignore +++ b/.gitignore @@ -67,8 +67,8 @@ conf/ *.tgz # dashboard static resources -amoro-ams/amoro-ams-dashboard/src/main/resources/static/ -amoro-ams/amoro-ams-dashboard/node/ +amoro-web/src/main/resources/static/ +amoro-web/node/ -!amoro-ams/dist/src/main/amoro-bin/bin/ -!amoro-ams/dist/src/main/amoro-bin/conf/ +!dist/src/main/amoro-bin/bin/ +!dist/src/main/amoro-bin/conf/ diff --git a/README.md b/README.md index bc23104bbe..878d90aa06 100644 --- a/README.md +++ b/README.md @@ -95,27 +95,25 @@ Amoro support multiple processing engines for Mixed format as below: Amoro contains modules as below: -- `amoro-core` contains core abstractions and common implementation for other modules -- `amoro-iceberg-format` contains integration of Apache Iceberg format -- `amoro-hudi-format` contains integration of Apache Hudi format -- `amoro-paimon-format` contains integration of Apache Paimon format +- `amoro-common` contains core abstractions and common implementation for other modules - `amoro-ams` is amoro management service module - - `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-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) - - `amoro-mixed-format-spark` provides Spark connectors for Mixed format tables (use amoro-spark-runtime for a shaded version) - - `amoro-mixed-format-trino` provides Trino connectors for Mixed format tables +- `amoro-web` is the dashboard frontend for ams +- `amoro-optimizer` provides default optimizer implementation +- `amoro-format-iceberg` contains integration of Apache Iceberg format +- `amoro-format-hudi` contains integration of Apache Hudi format +- `amoro-format-paimon` contains integration of Apache Paimon format +- `amoro-format-mixed` provides Mixed format implementation + - `amoro-mixed-hive` integrates with Apache Hive and implements Mixed Hive format + - `amoro-mixed-flink` provides Flink connectors for Mixed format tables (use amoro-flink-runtime for a shaded version) + - `amoro-mixed-spark` provides Spark connectors for Mixed format tables (use amoro-spark-runtime for a shaded version) + - `amoro-mixed-trino` provides Trino connectors for Mixed format tables ## Building -Amoro is built using Maven with JDK 8 and JDK 17(only for `amoro-mixed-format/amoro-mixed-format-trino` module). +Amoro is built using Maven with JDK 8 and JDK 17(only for `amoro-format-mixed/amoro-mixed-trino` module). -* Build all modules without `amoro-mixed-format-trino`: `mvn clean package` +* Build all modules without `amoro-mixed-trino`: `mvn clean package` * Build and skip tests: `mvn clean package -DskipTests` * Build and skip dashboard: `mvn clean package -Pskip-dashboard-build` * Build and disable disk storage, RocksDB will NOT be introduced to avoid memory overflow: `mvn clean package -DskipTests -Pno-extented-disk-storage` @@ -123,7 +121,7 @@ Amoro is built using Maven with JDK 8 and JDK 17(only for `amoro-mixed-format/am * Specify Flink version for Flink optimizer(the default is 1.20.0): `mvn clean package -DskipTests -Dflink-optimizer.flink-version=1.20.0` * If the version of Flink is below 1.15.0, you also need to add the `-Pflink-optimizer-pre-1.15` parameter: `mvn clean package -DskipTests -Pflink-optimizer-pre-1.15 -Dflink-optimizer.flink-version=1.14.6` * Specify Spark version for Spark optimizer(the default is 3.3.3): `mvn clean package -DskipTests -Dspark-optimizer.spark-version=3.3.3` -* Build `amoro-mixed-format-trino` module under JDK 17: `mvn clean package -DskipTests -Pformat-mixed-format-trino,build-mixed-format-trino -pl 'amoro-mixed-format/amoro-mixed-format-trino' -am`. +* Build `amoro-mixed-trino` module under JDK 17: `mvn clean package -DskipTests -Pformat-mixed-format-trino,build-mixed-format-trino -pl 'amoro-format-mixed/amoro-mixed-trino' -am`. * Build all modules: `mvn clean package -DskipTests -Ptoolchain,build-mixed-format-trino`, besides you need config `toolchains.xml` in `${user.home}/.m2/` dir with content below. * Build a distribution package with all formats integrated: `mvn clean package -Psupport-all-formats` * Build a distribution package with Apache Paimon format: `mvn clean package -Psupport-paimon-format` diff --git a/amoro-ams/amoro-ams-server/pom.xml b/amoro-ams/amoro-ams-server/pom.xml deleted file mode 100644 index 055cc7cbc3..0000000000 --- a/amoro-ams/amoro-ams-server/pom.xml +++ /dev/null @@ -1,495 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.amoro - amoro-ams - 0.8-SNAPSHOT - - - amoro-ams-server - jar - Amoro Project AMS Server - https://amoro.apache.org - - - - org.apache.amoro - amoro-iceberg-format - - - - org.apache.amoro - amoro-mixed-format-hive - - - org.eclipse.jetty.orbit - javax.servlet - - - - - - org.apache.amoro - amoro-ams-dashboard - ${project.version} - - - - io.fabric8 - kubernetes-client - - - - org.apache.spark - spark-core_2.12 - ${terminal.spark.version} - - - org.apache.parquet - * - - - log4j - log4j - - - org.slf4j - * - - - org.apache.avro - avro - - - org.apache.curator - * - - - org.apache.hadoop - * - - - org.apache.zookeeper - * - - - org.rocksdb - rocksdbjni - - - - - - org.apache.spark - spark-sql_2.12 - ${terminal.spark.version} - - - org.apache.parquet - * - - - org.apache.hadoop - * - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.rocksdb - rocksdbjni - - - - - - org.apache.spark - spark-hive_2.12 - ${terminal.spark.version} - - - org.apache.hive - hive-metastore - - - commons-logging - commons-logging - - - com.google.guava - guava - - - org.apache.avro - avro - - - org.apache.thrift - libthrift - - - org.apache.velocity - velocity - - - org.apache.hadoop - * - - - org.apache.hive - * - - - org.jodd - jodd-core - - - org.codehaus.jackson - jackson-mapper-asl - - - - - - org.mybatis - mybatis - - - - org.postgresql - postgresql - - - - org.apache.derby - derby - - - - mysql - mysql-connector-java - provided - - - - org.apache.commons - commons-dbcp2 - - - - org.yaml - snakeyaml - - - - io.netty - netty-all - - - - io.javalin - javalin - - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - org.apache.logging.log4j - log4j-api - - - - org.apache.logging.log4j - log4j-core - - - - - org.apache.logging.log4j - log4j-1.2-api - - - - org.apache.kyuubi - kyuubi-hive-jdbc-shaded - - - - - software.amazon.awssdk - s3 - - - - software.amazon.awssdk - glue - - - - software.amazon.awssdk - kms - - - - software.amazon.awssdk - dynamodb - - - - software.amazon.awssdk - sts - - - - software.amazon.awssdk - url-connection-client - - - - software.amazon.awssdk - s3-transfer-manager - - - - org.apache.hadoop - hadoop-aws - - - - - org.apache.flink - flink-runtime-web - - - org.apache.flink - flink-rpc-akka-loader - - - org.apache.flink - flink-shaded-zookeeper-3 - - - - - - - org.apache.hudi - hudi-java-client - - - org.apache.orc - orc-core - - - asm - asm - - - - - - - org.apache.amoro - amoro-mixed-format-spark-${terminal.spark.major.version} - ${project.version} - runtime - - - - org.apache.amoro - amoro-optimizer-standalone - ${project.version} - runtime - - - - - org.apache.amoro - amoro-common - ${project.version} - tests - test - - - - org.apache.amoro - amoro-iceberg-format - ${project.version} - tests - test - - - - org.apache.amoro - amoro-mixed-format-hive - ${project.version} - test - test-jar - - - - org.apache.amoro - amoro-paimon-format - ${project.version} - test - - - - org.apache.amoro - amoro-paimon-format - ${project.version} - test - test-jar - - - - org.apache.curator - curator-test - ${curator.version} - test - - - com.google.guava - guava - - - org.junit.jupiter - junit-jupiter-api - - - - - - org.apache.iceberg - iceberg-data - ${iceberg.version} - tests - test - - - - - - - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - false - false - ${project.basedir}/.git - true - - ${project.build.outputDirectory}/amoro/git.properties - - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - ^git.commit.time$ - - full - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy-dependencies - - - - ${project.build.directory}/amoro-ams-server-dependency/lib - - runtime - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - - - support-paimon-format - - - org.apache.amoro - amoro-paimon-format - - - - - support-hudi-format - - - org.apache.amoro - amoro-hudi-format - - - - - support-all-formats - - - org.apache.amoro - amoro-paimon-format - - - org.apache.amoro - amoro-hudi-format - - - - - diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewBaseData.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewBaseData.java deleted file mode 100644 index 1f56e01b75..0000000000 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewBaseData.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amoro.server.dashboard.model; - -import org.apache.amoro.shade.guava32.com.google.common.base.MoreObjects; - -public class OverviewBaseData { - private String name; - private Long value; - - public OverviewBaseData(String name, Long value) { - this.name = name; - this.value = value; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getValue() { - return value; - } - - public void setValue(Long value) { - this.value = value; - } - - @Override - public String toString() { - return MoreObjects.toStringHelper(this).add("name", name).add("value", value).toString(); - } -} diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml index 687e3522a5..1a78ca0f26 100644 --- a/amoro-ams/pom.xml +++ b/amoro-ams/pom.xml @@ -1,4 +1,5 @@ + - 4.0.0 @@ -28,16 +30,476 @@ amoro-ams - pom - Amoro Project AMS Parent + jar + Amoro Project AMS Server https://amoro.apache.org - - amoro-ams-server - amoro-ams-dashboard - amoro-ams-optimizer - amoro-ams-metrics - dist - + + false + + + + + org.apache.amoro + amoro-format-iceberg + + + + org.apache.amoro + amoro-mixed-hive + + + org.eclipse.jetty.orbit + javax.servlet + + + + + + org.apache.amoro + amoro-web + ${project.version} + + + + io.fabric8 + kubernetes-client + + + + org.apache.spark + spark-core_2.12 + ${terminal.spark.version} + + + org.apache.parquet + * + + + log4j + log4j + + + org.slf4j + * + + + org.apache.avro + avro + + + org.apache.curator + * + + + org.apache.hadoop + * + + + org.apache.zookeeper + * + + + org.rocksdb + rocksdbjni + + + + + + org.apache.spark + spark-sql_2.12 + ${terminal.spark.version} + + + org.apache.parquet + * + + + org.apache.hadoop + * + + + org.apache.orc + orc-core + + + org.apache.orc + orc-mapreduce + + + org.rocksdb + rocksdbjni + + + + + + org.apache.spark + spark-hive_2.12 + ${terminal.spark.version} + + + org.apache.hive + hive-metastore + + + commons-logging + commons-logging + + + com.google.guava + guava + + + org.apache.avro + avro + + + org.apache.thrift + libthrift + + + org.apache.velocity + velocity + + + org.apache.hadoop + * + + + org.apache.hive + * + + + org.jodd + jodd-core + + + org.codehaus.jackson + jackson-mapper-asl + + + + + + org.mybatis + mybatis + + + + org.postgresql + postgresql + + + + org.apache.derby + derby + + + + mysql + mysql-connector-java + provided + + + + org.apache.commons + commons-dbcp2 + + + + org.yaml + snakeyaml + + + + io.netty + netty-all + + + + io.javalin + javalin + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + + org.apache.logging.log4j + log4j-api + + + + org.apache.logging.log4j + log4j-core + + + + + org.apache.logging.log4j + log4j-1.2-api + + + + org.apache.kyuubi + kyuubi-hive-jdbc-shaded + + + + + software.amazon.awssdk + s3 + + + + software.amazon.awssdk + glue + + + + software.amazon.awssdk + kms + + + + software.amazon.awssdk + dynamodb + + + + software.amazon.awssdk + sts + + + + software.amazon.awssdk + url-connection-client + + + + software.amazon.awssdk + s3-transfer-manager + + + + org.apache.hadoop + hadoop-aws + + + + + org.apache.flink + flink-runtime-web + + + org.apache.flink + flink-rpc-akka-loader + + + org.apache.flink + flink-shaded-zookeeper-3 + + + + + + + org.apache.hudi + hudi-java-client + + + org.apache.orc + orc-core + + + asm + asm + + + + + + + org.apache.amoro + amoro-format-mixed-spark-${terminal.spark.major.version} + ${project.version} + runtime + + + + org.apache.amoro + amoro-optimizer-standalone + ${project.version} + runtime + + + + + org.apache.amoro + amoro-common + ${project.version} + tests + test + + + + org.apache.amoro + amoro-format-iceberg + ${project.version} + tests + test + + + + org.apache.amoro + amoro-mixed-hive + ${project.version} + test + test-jar + + + + org.apache.amoro + amoro-format-paimon + ${project.version} + test + + + + org.apache.amoro + amoro-format-paimon + ${project.version} + test + test-jar + + + + org.apache.curator + curator-test + ${curator.version} + test + + + com.google.guava + guava + + + org.junit.jupiter + junit-jupiter-api + + + + + + org.apache.iceberg + iceberg-data + ${iceberg.version} + tests + test + + + + + + + pl.project13.maven + git-commit-id-plugin + 4.0.0 + + + get-the-git-infos + + revision + + initialize + + + + ${git-commit-id-plugin.fail-on-no-git-dir} + ${git-commit-id-plugin.fail-on-no-git-dir} + ${project.basedir}/.git + true + + ${project.build.outputDirectory}/amoro/git.properties + + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + ^git.commit.time$ + + full + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + + ${project.build.directory}/amoro-ams-dependency/lib + + runtime + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + support-paimon-format + + + org.apache.amoro + amoro-format-paimon + + + + + support-hudi-format + + + org.apache.amoro + amoro-format-hudi + + + + + support-all-formats + + + org.apache.amoro + amoro-format-paimon + + + org.apache.amoro + amoro-format-hudi + + + + + fail-on-no-git-dir + + true + + + diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConf.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java similarity index 98% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConf.java rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java index b63c132462..871ab5bc9a 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConf.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java @@ -260,6 +260,12 @@ public class AmoroManagementConf { .defaultValue("jdbc:derby:/tmp/amoro/derby;create=true") .withDescription("Database connection address"); + public static final ConfigOption DB_AUTO_CREATE_TABLES = + ConfigOptions.key("database.auto-create-tables") + .booleanType() + .defaultValue(true) + .withDescription("Auto init table schema when started"); + public static final ConfigOption DB_DRIVER_CLASS_NAME = ConfigOptions.key("database.jdbc-driver-class") .stringType() diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java similarity index 98% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java index 92f0dff2b9..1dd763f324 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java @@ -52,8 +52,8 @@ import org.apache.amoro.shade.thrift.org.apache.thrift.TProcessor; import org.apache.amoro.shade.thrift.org.apache.thrift.protocol.TBinaryProtocol; import org.apache.amoro.shade.thrift.org.apache.thrift.protocol.TProtocolFactory; +import org.apache.amoro.shade.thrift.org.apache.thrift.server.THsHaServer; import org.apache.amoro.shade.thrift.org.apache.thrift.server.TServer; -import org.apache.amoro.shade.thrift.org.apache.thrift.server.TThreadedSelectorServer; import org.apache.amoro.shade.thrift.org.apache.thrift.transport.TNonblockingServerSocket; import org.apache.amoro.shade.thrift.org.apache.thrift.transport.TTransportException; import org.apache.amoro.shade.thrift.org.apache.thrift.transport.TTransportFactory; @@ -374,15 +374,13 @@ private TServer createThriftServer( TTransportFactory transportFactory = new TFramedTransport.Factory(); TMultiplexedProcessor multiplexedProcessor = new TMultiplexedProcessor(); multiplexedProcessor.registerProcessor(processorName, processor); - TThreadedSelectorServer.Args args = - new TThreadedSelectorServer.Args(serverTransport) + THsHaServer.Args args = + new THsHaServer.Args(serverTransport) .processor(multiplexedProcessor) .transportFactory(transportFactory) .protocolFactory(protocolFactory) .inputProtocolFactory(inputProtoFactory) - .executorService(executorService) - .selectorThreads(selectorThreads) - .acceptQueueSizePerThread(queueSizePerSelector); + .executorService(executorService); LOG.info( "The number of selector threads for the {} thrift server is: {}", processorName, @@ -391,7 +389,7 @@ private TServer createThriftServer( "The size of per-selector queue for the {} thrift server is: {}", processorName, queueSizePerSelector); - return new TThreadedSelectorServer(args); + return new THsHaServer(args); } private ThreadFactory getThriftThreadFactory(String processorName) { diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java rename to amoro-ams/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java b/amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java rename to amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/Environments.java b/amoro-ams/src/main/java/org/apache/amoro/server/Environments.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/Environments.java rename to amoro-ams/src/main/java/org/apache/amoro/server/Environments.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java b/amoro-ams/src/main/java/org/apache/amoro/server/RestCatalogService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java rename to amoro-ams/src/main/java/org/apache/amoro/server/RestCatalogService.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/TableManagementService.java b/amoro-ams/src/main/java/org/apache/amoro/server/TableManagementService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/TableManagementService.java rename to amoro-ams/src/main/java/org/apache/amoro/server/TableManagementService.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogService.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogType.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogType.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java similarity index 85% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java index ad41de77ed..bfc4a70b83 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java @@ -18,6 +18,9 @@ package org.apache.amoro.server.catalog; +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.RemovalListener; import org.apache.amoro.AmoroTable; import org.apache.amoro.TableFormat; import org.apache.amoro.api.CatalogMeta; @@ -40,6 +43,7 @@ import org.apache.iceberg.TableOperations; import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.exceptions.AlreadyExistsException; +import org.apache.iceberg.io.FileIO; import org.apache.iceberg.rest.RESTCatalog; import org.apache.iceberg.rest.requests.CreateTableRequest; @@ -50,10 +54,13 @@ public class InternalIcebergCatalogImpl extends InternalCatalog { final int httpPort; final String exposedHost; + final Cache, FileIO> fileIOCloser; + protected InternalIcebergCatalogImpl(CatalogMeta metadata, Configurations serverConfiguration) { super(metadata); this.httpPort = serverConfiguration.getInteger(AmoroManagementConf.HTTP_SERVER_PORT); this.exposedHost = serverConfiguration.getString(AmoroManagementConf.SERVER_EXPOSE_HOST); + this.fileIOCloser = newFileIOCloser(); } @Override @@ -96,12 +103,14 @@ public AmoroTable loadTable(String database, String tableName) { .toString()); org.apache.amoro.table.TableIdentifier tableIdentifier = org.apache.amoro.table.TableIdentifier.of(name(), database, tableName); - - return IcebergTable.newIcebergTable( - tableIdentifier, - table, - CatalogUtil.buildMetaStore(getMetadata()), - getMetadata().getCatalogProperties()); + AmoroTable amoroTable = + IcebergTable.newIcebergTable( + tableIdentifier, + table, + CatalogUtil.buildMetaStore(getMetadata()), + getMetadata().getCatalogProperties()); + fileIOCloser.put(amoroTable, ops.io()); + return amoroTable; } protected AuthenticatedFileIO fileIO(CatalogMeta catalogMeta) { @@ -144,4 +153,17 @@ public InternalTableHandler newTableHandler(String database, String table //noinspection unchecked return (InternalTableHandler) new InternalIcebergHandler(getMetadata(), metadata); } + + private Cache, FileIO> newFileIOCloser() { + return Caffeine.newBuilder() + .weakKeys() + .removalListener( + (RemovalListener, FileIO>) + (tbl, fileIO, cause) -> { + if (null != fileIO) { + fileIO.close(); + } + }) + .build(); + } } diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java similarity index 97% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java index 48731d882c..45d2cfb339 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java @@ -142,9 +142,10 @@ tableIdentifier, baseTable, fileIO, getMetadata().getCatalogProperties()), new BasicUnkeyedTable( tableIdentifier, baseTable, fileIO, getMetadata().getCatalogProperties()); } - - return new org.apache.amoro.formats.mixed.MixedTable( - mixedIcebergTable, TableFormat.MIXED_ICEBERG); + AmoroTable amoroTable = + new org.apache.amoro.formats.mixed.MixedTable(mixedIcebergTable, TableFormat.MIXED_ICEBERG); + fileIOCloser.put(amoroTable, fileIO); + return amoroTable; } protected TableFormat format() { diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java similarity index 99% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java index fe7920dcd0..3db518a241 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java @@ -171,7 +171,7 @@ public ServerTableMeta getTableDetail(AmoroTable amoroTable) { return serverTableMeta; } - private String decorateTableFormat(AmoroTable table) { + private String decorateTableFormat(AmoroTable table) { StringBuilder sb = new StringBuilder(); sb.append(AmsUtil.formatString(table.format().name())); if (table.format().equals(TableFormat.ICEBERG)) { @@ -340,14 +340,15 @@ public List getSnapshotDetail( AmoroTable amoroTable, String snapshotId) { MixedTable mixedTable = getTable(amoroTable); List result = new ArrayList<>(); + long commitId = Long.parseLong(snapshotId); Snapshot snapshot; if (mixedTable.isKeyedTable()) { - snapshot = mixedTable.asKeyedTable().changeTable().snapshot(snapshotId); + snapshot = mixedTable.asKeyedTable().changeTable().snapshot(commitId); if (snapshot == null) { - snapshot = mixedTable.asKeyedTable().baseTable().snapshot(snapshotId); + snapshot = mixedTable.asKeyedTable().baseTable().snapshot(commitId); } } else { - snapshot = mixedTable.asUnkeyedTable().snapshot(snapshotId); + snapshot = mixedTable.asUnkeyedTable().snapshot(commitId); } if (snapshot == null) { throw new IllegalArgumentException( diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/OverviewCache.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/OverviewCache.java similarity index 97% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/OverviewCache.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/OverviewCache.java index 2a7c1f7786..55b88dbcdf 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/OverviewCache.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/OverviewCache.java @@ -236,13 +236,13 @@ private String tableName(MetricKey metricKey) { private void updateResourceUsage(long ts) { int optimizerGroupThreadCount = (int) sumMetricValuesByDefine(OPTIMIZER_GROUP_THREADS); - long optimizerGroupMemoryInMb = - byte2Mb(sumMetricValuesByDefine(OPTIMIZER_GROUP_MEMORY_BYTES_ALLOCATED)); + long optimizerGroupMemoryBytes = + sumMetricValuesByDefine(OPTIMIZER_GROUP_MEMORY_BYTES_ALLOCATED); this.totalCpu.set(optimizerGroupThreadCount); - this.totalMemory.set(optimizerGroupMemoryInMb); + this.totalMemory.set(optimizerGroupMemoryBytes); addAndCheck( - new OverviewResourceUsageItem(ts, optimizerGroupThreadCount, optimizerGroupMemoryInMb)); + new OverviewResourceUsageItem(ts, optimizerGroupThreadCount, optimizerGroupMemoryBytes)); } private void addAndCheck(OverviewDataSizeItem dataSizeItem) { @@ -261,10 +261,6 @@ private void checkSize(Deque deque) { } } - private long byte2Mb(long bytes) { - return bytes / 1024 / 1024; - } - private void updateOptimizingStatus() { optimizingStatusCountMap.put( STATUS_PENDING, sumMetricValuesByDefine(OPTIMIZER_GROUP_PENDING_TABLES)); diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/OverviewMetricsReporter.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/OverviewMetricsReporter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/OverviewMetricsReporter.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/OverviewMetricsReporter.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OverviewController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OverviewController.java similarity index 94% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OverviewController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OverviewController.java index 2060039791..21a3c795ae 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OverviewController.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OverviewController.java @@ -20,15 +20,16 @@ import io.javalin.http.Context; import org.apache.amoro.server.dashboard.OverviewCache; -import org.apache.amoro.server.dashboard.model.OverviewBaseData; import org.apache.amoro.server.dashboard.model.OverviewDataSizeItem; import org.apache.amoro.server.dashboard.model.OverviewResourceUsageItem; import org.apache.amoro.server.dashboard.model.OverviewSummary; import org.apache.amoro.server.dashboard.model.OverviewTopTableItem; import org.apache.amoro.server.dashboard.response.OkResponse; import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions; +import org.apache.amoro.shade.guava32.com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -113,9 +114,9 @@ public void getSummary(Context ctx) { public void getOptimizingStatus(Context ctx) { Map optimizingStatus = overviewCache.getOptimizingStatus(); - List optimizingStatusList = + List> optimizingStatusList = optimizingStatus.entrySet().stream() - .map(status -> new OverviewBaseData(status.getKey(), status.getValue())) + .map(status -> ImmutableMap.of("name", status.getKey(), "value", status.getValue())) .collect(Collectors.toList()); ctx.json(OkResponse.of(optimizingStatusList)); } diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewDataSizeItem.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewDataSizeItem.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewDataSizeItem.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewDataSizeItem.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewResourceUsageItem.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewResourceUsageItem.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewResourceUsageItem.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewResourceUsageItem.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewSummary.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewSummary.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewSummary.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewSummary.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewTopTableItem.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewTopTableItem.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OverviewTopTableItem.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OverviewTopTableItem.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/Response.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/Response.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java b/amoro-ams/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java rename to amoro-ams/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/PersistenceException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/PersistenceException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/UndefinedException.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/UndefinedException.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/EventsManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/EventsManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/EventsManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/EventsManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/ExecUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/ExecUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java similarity index 58% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java index 1bd6134081..3ccb0db3d2 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java @@ -18,12 +18,18 @@ package org.apache.amoro.server.manager; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.PodTemplate; import io.fabric8.kubernetes.api.model.Quantity; +import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder; +import io.fabric8.kubernetes.api.model.apps.DeploymentSpec; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; @@ -34,12 +40,15 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.yaml.snakeyaml.Yaml; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -54,7 +63,7 @@ public class KubernetesOptimizerContainer extends AbstractResourceContainer { public static final String NAMESPACE = "namespace"; public static final String IMAGE = "image"; public static final String PULL_POLICY = "pullPolicy"; - + public static final String PODTEMPLATE = "podTemplate"; public static final String PULL_SECRETS = "imagePullSecrets"; public static final String KUBE_CONFIG_PATH = "kube-config-path"; @@ -79,9 +88,67 @@ protected Map doScaleOut(Resource resource) { groupProperties.putAll(getContainerProperties()); groupProperties.putAll(resource.getProperties()); - // generate pod start args - long memoryPerThread = Long.parseLong(checkAndGetProperty(groupProperties, MEMORY_PROPERTY)); - long memory = memoryPerThread * resource.getThreadCount(); + Map argsList = generatePodStartArgs(resource, groupProperties); + String image = argsList.get(IMAGE).toString(); + String namespace = argsList.get(NAMESPACE).toString(); + String pullPolicy = argsList.get(PULL_POLICY).toString(); + List imagePullSecretsList = + (List) argsList.get(PULL_SECRETS); + int cpuLimit = (int) argsList.get("cpuLimit"); + long memory = (long) argsList.get(MEMORY_PROPERTY); + String groupName = argsList.get("groupName").toString(); + String resourceId = argsList.get("resourceId").toString(); + String startUpArgs = argsList.get("startUpArgs").toString(); + + String kubernetesName = NAME_PREFIX + resourceId; + Deployment deployment; + + if (null != groupProperties.get(PODTEMPLATE)) { + // configure the podTemplate read from config + PodTemplate podTemplate = initPodTemplateFromLocal(groupProperties); + + deployment = + initPodTemplateFromFrontEnd( + podTemplate, + image, + pullPolicy, + cpuLimit, + groupName, + resourceId, + startUpArgs, + memory, + imagePullSecretsList); + } else { + deployment = + initPodTemplateWithoutConfig( + image, + pullPolicy, + cpuLimit, + groupName, + resourceId, + startUpArgs, + memory, + imagePullSecretsList); + } + + client.apps().deployments().inNamespace(namespace).resource(deployment).create(); + Map startupProperties = Maps.newHashMap(); + startupProperties.put(NAMESPACE, namespace); + startupProperties.put(KUBERNETES_NAME_PROPERTIES, kubernetesName); + return startupProperties; + } + + public Map generatePodStartArgs( + Resource resource, Map groupProperties) { + long memoryPerThread; + long memory; + + if (resource.getMemoryMb() > 0) { + memory = resource.getMemoryMb(); + } else { + memoryPerThread = Long.parseLong(checkAndGetProperty(groupProperties, MEMORY_PROPERTY)); + memory = memoryPerThread * resource.getThreadCount(); + } // point at amoro home in docker image String startUpArgs = String.format( @@ -104,7 +171,31 @@ protected Map doScaleOut(Resource resource) { String resourceId = resource.getResourceId(); String groupName = resource.getGroupName(); - String kubernetesName = NAME_PREFIX + resourceId; + + Map argsList = Maps.newHashMap(); + argsList.put(NAMESPACE, namespace); + argsList.put(IMAGE, image); + argsList.put(PULL_POLICY, pullPolicy); + argsList.put(PULL_SECRETS, imagePullSecretsList); + argsList.put(MEMORY_PROPERTY, memory); + argsList.put("cpuLimit", cpuLimit); + argsList.put("resourceId", resourceId); + argsList.put("groupName", groupName); + argsList.put("startUpArgs", startUpArgs); + + return argsList; + } + + public Deployment initPodTemplateWithoutConfig( + String image, + String pullPolicy, + int cpuLimit, + String groupName, + String resourceId, + String startUpArgs, + long memory, + List imagePullSecretsList) { + DeploymentBuilder deploymentBuilder = new DeploymentBuilder() .withNewMetadata() @@ -156,13 +247,80 @@ protected Map doScaleOut(Resource resource) { .endTemplate() .endSpec(); } - Deployment deployment = deploymentBuilder.build(); - client.apps().deployments().inNamespace(namespace).resource(deployment).create(); - Map startupProperties = Maps.newHashMap(); - startupProperties.put(NAMESPACE, namespace); - startupProperties.put(KUBERNETES_NAME_PROPERTIES, kubernetesName); - return startupProperties; + return deploymentBuilder.build(); + } + + public PodTemplate initPodTemplateFromLocal(Map groupProperties) { + return new Yaml().loadAs(groupProperties.get(PODTEMPLATE), PodTemplate.class); + } + + public Deployment initPodTemplateFromFrontEnd( + PodTemplate podTemplate, + String image, + String pullPolicy, + int cpuLimit, + String groupName, + String resourceId, + String startUpArgs, + long memory, + List imagePullSecretsList) { + podTemplate + .getTemplate() + .getMetadata() + .setLabels( + new HashMap() { + { + put("app", NAME_PREFIX + resourceId); + put("AmoroOptimizerGroup", groupName); + put("AmoroResourceId", resourceId); + } + }); + + Container container = new Container(); + container.setName("optimizer"); + container.setImage(image); + container.setImagePullPolicy(pullPolicy); + container.setCommand(new ArrayList<>(Arrays.asList("sh", "-c", startUpArgs))); + + ResourceRequirements resourceRequirements = new ResourceRequirements(); + resourceRequirements.setLimits( + ImmutableMap.of( + "memory", new Quantity(memory + "Mi"), + "cpu", new Quantity(cpuLimit + ""))); + resourceRequirements.setRequests( + ImmutableMap.of( + "memory", new Quantity(memory + "Mi"), + "cpu", new Quantity(cpuLimit + ""))); + container.setResources(resourceRequirements); + + podTemplate.getTemplate().getSpec().getContainers().set(0, container); + + if (!imagePullSecretsList.isEmpty()) { + podTemplate.getTemplate().getSpec().setImagePullSecrets(imagePullSecretsList); + } + + DeploymentSpec deploymentSpec = new DeploymentSpec(); + deploymentSpec.setTemplate(podTemplate.getTemplate()); + + LabelSelector labelSelector = new LabelSelector(); + labelSelector.setMatchLabels( + new HashMap() { + { + put("app", NAME_PREFIX + resourceId); + } + }); + + deploymentSpec.setSelector(labelSelector); + deploymentSpec.setReplicas(1); + + Deployment deployment = new Deployment(); + deployment.setSpec(deploymentSpec); + ObjectMeta deploymentMetadata = new ObjectMeta(); + deploymentMetadata.setName(NAME_PREFIX + resourceId); + deployment.setMetadata(deploymentMetadata); + + return deployment; } @Override diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/MetricManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/MetricManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/MetricManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/MetricManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java b/amoro-ams/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java rename to amoro-ams/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java similarity index 90% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java index 2230e0f767..6a59d34a8b 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java @@ -40,6 +40,8 @@ import org.apache.ibatis.session.SqlSessionFactoryBuilder; import org.apache.ibatis.transaction.TransactionFactory; import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.InputStreamReader; import java.net.URI; @@ -47,6 +49,7 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.sql.Connection; import java.sql.ResultSet; @@ -54,6 +57,7 @@ import java.time.Duration; public class SqlSessionFactoryProvider { + private static final Logger LOG = LoggerFactory.getLogger(SqlSessionFactoryProvider.class); private static final String DERBY_INIT_SQL_SCRIPT = "derby/ams-derby-init.sql"; private static final String MYSQL_INIT_SQL_SCRIPT = "mysql/ams-mysql-init.sql"; @@ -123,8 +127,14 @@ public void init(Configurations config) { * @param config */ private void createTablesIfNeed(Configurations config) { + boolean initSchema = config.getBoolean(AmoroManagementConf.DB_AUTO_CREATE_TABLES); + if (!initSchema) { + LOG.info("Skip auto create tables due to configuration"); + return; + } String dbTypeConfig = config.getString(AmoroManagementConf.DB_TYPE); String query = ""; + LOG.info("Start create tables, database type:{}", dbTypeConfig); try (SqlSession sqlSession = get().openSession(true); Connection connection = sqlSession.getConnection(); @@ -142,13 +152,17 @@ private void createTablesIfNeed(Configurations config) { "SELECT 1 FROM information_schema.tables WHERE table_schema = %s AND table_name = '%s'", "current_schema()", "catalog_metadata"); } + LOG.info("Start check table creation, using query: {}", query); try (ResultSet rs = statement.executeQuery(query)) { if (!rs.next()) { + Path script = Paths.get(getInitSqlScriptPath(dbTypeConfig)); + LOG.info("Table not exists, start run create tables script file:{}", script); ScriptRunner runner = new ScriptRunner(connection); runner.runScript( - new InputStreamReader( - Files.newInputStream(Paths.get(getInitSqlScriptPath(dbTypeConfig))), - StandardCharsets.UTF_8)); + new InputStreamReader(Files.newInputStream(script), StandardCharsets.UTF_8)); + LOG.info("Tables are created successfully"); + } else { + LOG.info("Tables are created, skip auto create tables."); } } } catch (Exception e) { diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableConfigurations.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableConfigurations.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableConfigurations.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableConfigurations.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetadata.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableMetadata.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetadata.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableMetadata.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntime.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntime.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntime.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntime.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableService.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableService.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableService.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableSnapshot.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableSnapshot.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java index e01682dc62..5cd16e26fb 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java +++ b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java @@ -18,6 +18,8 @@ package org.apache.amoro.server.table; +import static org.apache.amoro.metrics.MetricDefine.defineGauge; + import org.apache.amoro.ServerTableIdentifier; import org.apache.amoro.metrics.Gauge; import org.apache.amoro.metrics.Metric; @@ -32,8 +34,6 @@ import java.util.List; -import static org.apache.amoro.metrics.MetricDefine.defineGauge; - /** Table Summary metrics. */ public class TableSummaryMetrics { diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/StatementResult.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/StatementResult.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/CompressUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/CompressUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java diff --git a/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener b/amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener rename to amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener diff --git a/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter b/amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter rename to amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter diff --git a/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer b/amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer rename to amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer diff --git a/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor b/amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor rename to amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor diff --git a/amoro-ams/amoro-ams-server/src/main/resources/derby/ams-derby-init.sql b/amoro-ams/src/main/resources/derby/ams-derby-init.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/derby/ams-derby-init.sql rename to amoro-ams/src/main/resources/derby/ams-derby-init.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/log4j2.xml b/amoro-ams/src/main/resources/log4j2.xml similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/log4j2.xml rename to amoro-ams/src/main/resources/log4j2.xml diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql b/amoro-ams/src/main/resources/mysql/ams-mysql-init.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql rename to amoro-ams/src/main/resources/mysql/ams-mysql-init.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql rename to amoro-ams/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade.sql b/amoro-ams/src/main/resources/mysql/upgrade.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade.sql rename to amoro-ams/src/main/resources/mysql/upgrade.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/ams-postgres-init.sql b/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/ams-postgres-init.sql rename to amoro-ams/src/main/resources/postgres/ams-postgres-init.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql b/amoro-ams/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql rename to amoro-ams/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql b/amoro-ams/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql rename to amoro-ams/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade.sql b/amoro-ams/src/main/resources/postgres/upgrade.sql similarity index 100% rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade.sql rename to amoro-ams/src/main/resources/postgres/upgrade.sql diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/AmsEnvironment.java b/amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/AmsEnvironment.java rename to amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java rename to amoro-ams/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java rename to amoro-ams/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java rename to amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java rename to amoro-ams/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java rename to amoro-ams/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java b/amoro-ams/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java rename to amoro-ams/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java rename to amoro-ams/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/TestOverviewCache.java b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/TestOverviewCache.java new file mode 100644 index 0000000000..575f9ae182 --- /dev/null +++ b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/TestOverviewCache.java @@ -0,0 +1,155 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amoro.server.dashboard; + +import static org.apache.amoro.server.dashboard.OverviewCache.STATUS_COMMITTING; +import static org.apache.amoro.server.dashboard.OverviewCache.STATUS_EXECUTING; +import static org.apache.amoro.server.dashboard.OverviewCache.STATUS_IDLE; +import static org.apache.amoro.server.dashboard.OverviewCache.STATUS_PENDING; +import static org.apache.amoro.server.dashboard.OverviewCache.STATUS_PLANING; + +import org.apache.amoro.BasicTableTestHelper; +import org.apache.amoro.TableFormat; +import org.apache.amoro.TableTestHelper; +import org.apache.amoro.catalog.BasicCatalogTestHelper; +import org.apache.amoro.catalog.CatalogTestHelper; +import org.apache.amoro.io.MixedDataTestHelpers; +import org.apache.amoro.server.dashboard.model.OverviewTopTableItem; +import org.apache.amoro.server.manager.MetricManager; +import org.apache.amoro.server.table.AMSTableTestBase; +import org.apache.amoro.server.table.TableRuntime; +import org.apache.amoro.server.table.executor.TableRuntimeRefreshExecutor; +import org.apache.amoro.shade.guava32.com.google.common.collect.Lists; +import org.apache.amoro.table.MixedTable; +import org.apache.amoro.table.UnkeyedTable; +import org.apache.iceberg.AppendFiles; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.data.Record; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.util.ArrayList; +import java.util.List; + +@RunWith(Parameterized.class) +public class TestOverviewCache extends AMSTableTestBase { + + private OverviewCache overviewCache; + + @Parameterized.Parameters(name = "{0}, {1}") + public static Object[] parameters() { + return new Object[][] { + {new BasicCatalogTestHelper(TableFormat.ICEBERG), new BasicTableTestHelper(true, false)} + }; + } + + public TestOverviewCache(CatalogTestHelper catalogTestHelper, TableTestHelper tableTestHelper) { + super(catalogTestHelper, tableTestHelper, false); + } + + @Before + public void prepare() { + createDatabase(); + createTable(); + this.overviewCache = OverviewCache.getInstance(); + this.overviewCache.initialize(MetricManager.getInstance().getGlobalRegistry()); + this.overviewCache.refresh(); + } + + @After + public void clear() { + try { + dropTable(); + dropDatabase(); + } catch (Exception e) { + // ignore + } + } + + private void initTableWithFiles() { + UnkeyedTable table = + ((MixedTable) tableService().loadTable(serverTableIdentifier()).originalTable()) + .asUnkeyedTable(); + appendData(table, 1); + appendData(table, 2); + TableRuntime runtime = tableService().getRuntime(serverTableIdentifier()); + runtime.refresh(tableService().loadTable(serverTableIdentifier())); + } + + private void appendData(UnkeyedTable table, int id) { + ArrayList newRecords = + Lists.newArrayList( + MixedDataTestHelpers.createRecord( + table.schema(), id, "111", 0L, "2022-01-01T12:00:00")); + List dataFiles = MixedDataTestHelpers.writeBaseStore(table, 0L, newRecords, false); + AppendFiles appendFiles = table.newAppend(); + dataFiles.forEach(appendFiles::appendFile); + appendFiles.commit(); + } + + void refreshPending() { + TableRuntimeRefreshExecutor refresher = + new TableRuntimeRefreshExecutor(tableService(), 1, Integer.MAX_VALUE); + refresher.execute(tableService().getRuntime(serverTableIdentifier())); + refresher.dispose(); + } + + @Test + public void testOverviewCache() { + // empty table + Assertions.assertEquals(1, overviewCache.getTotalCatalog()); + Assertions.assertEquals(1, overviewCache.getTotalTableCount()); + Assertions.assertEquals(0, overviewCache.getTotalDataSize()); + Assertions.assertEquals(0, overviewCache.getTotalCpu()); + Assertions.assertEquals(0, overviewCache.getTotalMemory()); + + Assertions.assertEquals(0, overviewCache.getOptimizingStatus().get(STATUS_PENDING)); + Assertions.assertEquals(0, overviewCache.getOptimizingStatus().get(STATUS_COMMITTING)); + Assertions.assertEquals(0, overviewCache.getOptimizingStatus().get(STATUS_EXECUTING)); + Assertions.assertEquals(0, overviewCache.getOptimizingStatus().get(STATUS_PLANING)); + Assertions.assertEquals(1, overviewCache.getOptimizingStatus().get(STATUS_IDLE)); + + Assertions.assertEquals(1, overviewCache.getDataSizeHistory(0).size()); + Assertions.assertEquals(1, overviewCache.getResourceUsageHistory(0).size()); + + List allTopTableItem = overviewCache.getAllTopTableItem(); + Assertions.assertEquals(1, allTopTableItem.size()); + Assertions.assertTrue(allTopTableItem.get(0).getHealthScore() > 0); + + // insert data + initTableWithFiles(); + refreshPending(); + overviewCache.refresh(); + + Assertions.assertTrue(overviewCache.getTotalDataSize() > 0); + + Assertions.assertEquals(1, overviewCache.getOptimizingStatus().get(STATUS_PENDING)); + Assertions.assertEquals(0, overviewCache.getOptimizingStatus().get(STATUS_IDLE)); + + Assertions.assertEquals(2, overviewCache.getDataSizeHistory(0).size()); + Assertions.assertEquals(2, overviewCache.getResourceUsageHistory(0).size()); + + allTopTableItem = overviewCache.getAllTopTableItem(); + Assertions.assertTrue(allTopTableItem.get(0).getHealthScore() > 0); + } +} diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java rename to amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java rename to amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java rename to amoro-ams/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java rename to amoro-ams/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestKubernetesOptimizerContainer.java b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestKubernetesOptimizerContainer.java new file mode 100644 index 0000000000..fa44530b49 --- /dev/null +++ b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestKubernetesOptimizerContainer.java @@ -0,0 +1,274 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amoro.server.manager; + +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder; +import io.fabric8.kubernetes.api.model.PodTemplate; +import io.fabric8.kubernetes.api.model.apps.Deployment; +import org.apache.amoro.OptimizerProperties; +import org.apache.amoro.resource.Resource; +import org.apache.amoro.resource.ResourceType; +import org.apache.amoro.server.AmoroManagementConf; +import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions; +import org.apache.amoro.shade.guava32.com.google.common.collect.Maps; +import org.apache.amoro.shade.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.amoro.shade.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.amoro.utils.JacksonUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.yaml.snakeyaml.Yaml; + +import java.io.IOException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class TestKubernetesOptimizerContainer { + private KubernetesOptimizerContainer kubernetesOptimizerContainer; + private Map containerProperties; + private Map groupProperties; + public static final String MEMORY_PROPERTY = "memory"; + public static final String CPU_FACTOR_PROPERTY = "cpu.factor"; + public static final String IMAGE = "image"; + public static final String PULL_POLICY = "pullPolicy"; + public static final String PULL_SECRETS = "imagePullSecrets"; + + @Before + public void setup() throws IOException { + // generating configuration files + kubernetesOptimizerContainer = new KubernetesOptimizerContainer(); + groupProperties = Maps.newHashMap(); + containerProperties = Maps.newHashMap(); + + containerProperties.put(OptimizerProperties.AMS_HOME, "/home/ams"); + containerProperties.put(OptimizerProperties.AMS_OPTIMIZER_URI, "thrift://127.0.0.1:1261"); + + URL resource = getClass().getClassLoader().getResource("config.yaml"); + + JsonNode yamlConfig = + JacksonUtil.fromObjects( + new Yaml().loadAs(Files.newInputStream(Paths.get(resource.getPath())), Map.class)); + JsonNode containers = yamlConfig.get(AmoroManagementConf.CONTAINER_LIST); + for (JsonNode container : containers) { + if (container.get("name").asText().equals("KubernetesContainer")) { + ObjectMapper mapper = new ObjectMapper(); + containerProperties.putAll(mapper.convertValue(container.get("properties"), Map.class)); + } + } + groupProperties.putAll(this.containerProperties); + } + + private static String checkAndGetProperty(Map properties, String key) { + Preconditions.checkState( + properties != null && properties.containsKey(key), "Cannot find %s in properties", key); + return properties.get(key); + } + + @Test + public void testBuildPodTemplateFromLocal() { + PodTemplate podTemplate = + kubernetesOptimizerContainer.initPodTemplateFromLocal(groupProperties); + + Assert.assertEquals(1, podTemplate.getTemplate().getSpec().getContainers().size()); + // read the image version from the podTemplate config and assert it + Assert.assertEquals( + "apache/amoro:0.6", podTemplate.getTemplate().getSpec().getContainers().get(0).getImage()); + } + + @Test + public void testBuildPodTemplateWithResourceSetMemoryMb() { + PodTemplate podTemplate = + kubernetesOptimizerContainer.initPodTemplateFromLocal(groupProperties); + + ResourceType resourceType = ResourceType.OPTIMIZER; + Map properties = Maps.newHashMap(); + properties.put("memory", "1024"); + Resource resource = + new Resource.Builder("KubernetesContainer", "k8s", resourceType) + .setMemoryMb(1025) // It's not 0 here + .setThreadCount(1) + .setProperties(properties) + .build(); + groupProperties.putAll(resource.getProperties()); + + Map argsList = + kubernetesOptimizerContainer.generatePodStartArgs(resource, groupProperties); + String image = argsList.get(IMAGE).toString(); + String pullPolicy = argsList.get(PULL_POLICY).toString(); + List imagePullSecretsList = + (List) argsList.get(PULL_SECRETS); + int cpuLimit = (int) argsList.get("cpuLimit"); + long memory = (long) argsList.get(MEMORY_PROPERTY); + String groupName = argsList.get("groupName").toString(); + String resourceId = argsList.get("resourceId").toString(); + String startUpArgs = argsList.get("startUpArgs").toString(); + + Deployment deployment = + kubernetesOptimizerContainer.initPodTemplateFromFrontEnd( + podTemplate, + image, + pullPolicy, + cpuLimit, + groupName, + resourceId, + startUpArgs, + memory, + imagePullSecretsList); + + Assert.assertEquals(1, deployment.getSpec().getReplicas().intValue()); + Assert.assertNotEquals( + "1024Mi", + deployment + .getSpec() + .getTemplate() + .getSpec() + .getContainers() + .get(0) + .getResources() + .getLimits() + .get("memory") + .toString()); + Assert.assertEquals( + "1025Mi", + deployment + .getSpec() + .getTemplate() + .getSpec() + .getContainers() + .get(0) + .getResources() + .getLimits() + .get("memory") + .toString()); + } + + @Test + public void testBuildPodTemplateConfig() { + // before parameter merging + PodTemplate podTemplate = + kubernetesOptimizerContainer.initPodTemplateFromLocal(groupProperties); + + // after parameter merging + ResourceType resourceType = ResourceType.OPTIMIZER; + Map properties = Maps.newHashMap(); + properties.put("memory", "1024"); + Resource resource = + new Resource.Builder("KubernetesContainer", "k8s", resourceType) + .setMemoryMb(0) + .setThreadCount(1) + .setProperties(properties) + .build(); + groupProperties.putAll(resource.getProperties()); + + // generate pod start args + long memoryPerThread; + long memory; + + if (resource.getMemoryMb() > 0) { + memory = resource.getMemoryMb(); + } else { + memoryPerThread = Long.parseLong(checkAndGetProperty(groupProperties, MEMORY_PROPERTY)); + memory = memoryPerThread * resource.getThreadCount(); + } + String startUpArgs = + String.format( + "/entrypoint.sh optimizer %s %s", + memory, kubernetesOptimizerContainer.buildOptimizerStartupArgsString(resource)); + // read the image version from config and assert it , but not from podTemplate + String image = checkAndGetProperty(groupProperties, IMAGE); + String pullPolicy = checkAndGetProperty(groupProperties, PULL_POLICY); + String pullSecrets = groupProperties.getOrDefault(PULL_SECRETS, ""); + String cpuLimitFactorString = groupProperties.getOrDefault(CPU_FACTOR_PROPERTY, "1.0"); + double cpuLimitFactor = Double.parseDouble(cpuLimitFactorString); + int cpuLimit = (int) (Math.ceil(cpuLimitFactor * resource.getThreadCount())); + + List imagePullSecretsList = + Arrays.stream(pullSecrets.split(";")) + .map(secret -> new LocalObjectReferenceBuilder().withName(secret).build()) + .collect(Collectors.toList()); + + String resourceId = resource.getResourceId(); + String groupName = resource.getGroupName(); + + Assert.assertEquals(1, podTemplate.getTemplate().getSpec().getContainers().size()); + + // read the image version from the podTemplate config and assert it + Assert.assertEquals( + "apache/amoro:0.6", podTemplate.getTemplate().getSpec().getContainers().get(0).getImage()); + + Deployment deployment = + kubernetesOptimizerContainer.initPodTemplateFromFrontEnd( + podTemplate, + image, + pullPolicy, + cpuLimit, + groupName, + resourceId, + startUpArgs, + memory, + imagePullSecretsList); + + Assert.assertEquals("amoro-optimizer-" + resourceId, deployment.getMetadata().getName()); + Assert.assertEquals( + "k8s", + deployment.getSpec().getTemplate().getMetadata().getLabels().get("AmoroOptimizerGroup")); + Assert.assertEquals(1, deployment.getSpec().getReplicas().intValue()); + Assert.assertEquals( + "IfNotPresent", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImagePullPolicy()); + + Assert.assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().size()); + + // read the image version from the podTemplate config and assert it + // the final version is still apache/amoro:0.7-SNAPSHOT + Assert.assertEquals( + "apache/amoro:0.7-SNAPSHOT", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage()); + Assert.assertEquals( + String.valueOf(cpuLimit), + deployment + .getSpec() + .getTemplate() + .getSpec() + .getContainers() + .get(0) + .getResources() + .getLimits() + .get("cpu") + .toString()); + Assert.assertEquals( + memory + "Mi", + deployment + .getSpec() + .getTemplate() + .getSpec() + .getContainers() + .get(0) + .getResources() + .getLimits() + .get("memory") + .toString()); + } +} diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java rename to amoro-ams/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java b/amoro-ams/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java rename to amoro-ams/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java b/amoro-ams/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java rename to amoro-ams/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java b/amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java rename to amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestCatalogService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestCatalogService.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableService.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableService.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java similarity index 87% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java index d9d558bf0f..1b4632b29c 100644 --- a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java +++ b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java @@ -18,6 +18,20 @@ package org.apache.amoro.server.table; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_DATA_FILES; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_DATA_FILES_RECORDS; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_DATA_FILES_SIZE; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_EQUALITY_DELETE_FILES; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_EQUALITY_DELETE_FILES_RECORDS; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_EQUALITY_DELETE_FILES_SIZE; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_POSITION_DELETE_FILES; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_POSITION_DELETE_FILES_RECORDS; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_POSITION_DELETE_FILES_SIZE; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_SNAPSHOTS; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_TOTAL_FILES; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_TOTAL_FILES_SIZE; +import static org.apache.amoro.server.table.TableSummaryMetrics.TABLE_SUMMARY_TOTAL_RECORDS; + import org.apache.amoro.BasicTableTestHelper; import org.apache.amoro.ServerTableIdentifier; import org.apache.amoro.TableFormat; @@ -52,8 +66,6 @@ import java.util.List; import java.util.Map; -import static org.apache.amoro.server.table.TableSummaryMetrics.*; - @RunWith(Parameterized.class) public class TestTableSummaryMetrics extends AMSTableTestBase { diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java rename to amoro-ams/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java rename to amoro-ams/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java rename to amoro-ams/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java rename to amoro-ams/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java diff --git a/amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter b/amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter rename to amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter diff --git a/amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin b/amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin rename to amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin diff --git a/amoro-ams/amoro-ams-server/src/test/resources/config.yaml b/amoro-ams/src/test/resources/config.yaml similarity index 54% rename from amoro-ams/amoro-ams-server/src/test/resources/config.yaml rename to amoro-ams/src/test/resources/config.yaml index 168046fda6..4f1efa9c9f 100644 --- a/amoro-ams/amoro-ams-server/src/test/resources/config.yaml +++ b/amoro-ams/src/test/resources/config.yaml @@ -36,4 +36,37 @@ taskmanager: size: 1728m parallelism: - default: 1 \ No newline at end of file + default: 1 + +containers: + - name: KubernetesContainer + container-impl: org.apache.amoro.server.manager.KubernetesOptimizerContainer + properties: + kube-config-path: "~/.kube/config" + image: apache/amoro:0.7-SNAPSHOT + namespace: default + pullPolicy: "IfNotPresent" + podTemplate: | + apiVersion: apps/v1 + kind: PodTemplate + metadata: + name: + template: + metadata: + labels: + app: + AmoroOptimizerGroup: + AmoroResourceId: + spec: + containers: + - name: optimizer + image: apache/amoro:0.6 + imagePullPolicy: IfNotPresent + command: [ "sh", "-c", "echo 'Hello, World!'" ] + resources: + limits: + memory: 2048Mi + cpu: 2 + requests: + memory: 2048Mi + cpu: 2 \ No newline at end of file diff --git a/amoro-ams/amoro-ams-server/src/test/resources/flink-conf.yaml b/amoro-ams/src/test/resources/flink-conf.yaml similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/resources/flink-conf.yaml rename to amoro-ams/src/test/resources/flink-conf.yaml diff --git a/amoro-ams/amoro-ams-server/src/test/resources/log4j2.xml b/amoro-ams/src/test/resources/log4j2.xml similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/resources/log4j2.xml rename to amoro-ams/src/test/resources/log4j2.xml diff --git a/amoro-ams/amoro-ams-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/amoro-ams/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from amoro-ams/amoro-ams-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to amoro-ams/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/amoro-hudi-format/pom.xml b/amoro-format-hudi/pom.xml similarity index 98% rename from amoro-hudi-format/pom.xml rename to amoro-format-hudi/pom.xml index a028b7f62d..283ca2e692 100644 --- a/amoro-hudi-format/pom.xml +++ b/amoro-format-hudi/pom.xml @@ -27,7 +27,7 @@ ../pom.xml - amoro-hudi-format + amoro-format-hudi Amoro Hudi Format Integration diff --git a/amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiCatalogFactory.java b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiCatalogFactory.java similarity index 100% rename from amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiCatalogFactory.java rename to amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiCatalogFactory.java diff --git a/amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java similarity index 100% rename from amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java rename to amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHadoopCatalog.java diff --git a/amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiHiveCatalog.java b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHiveCatalog.java similarity index 100% rename from amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiHiveCatalog.java rename to amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiHiveCatalog.java diff --git a/amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiSnapshot.java b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiSnapshot.java similarity index 100% rename from amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiSnapshot.java rename to amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiSnapshot.java diff --git a/amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiTable.java b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTable.java similarity index 100% rename from amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiTable.java rename to amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTable.java diff --git a/amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java similarity index 100% rename from amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java rename to amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableDescriptor.java diff --git a/amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiTableUtil.java b/amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableUtil.java similarity index 100% rename from amoro-hudi-format/src/main/java/org/apache/amoro/formats/hudi/HudiTableUtil.java rename to amoro-format-hudi/src/main/java/org/apache/amoro/formats/hudi/HudiTableUtil.java diff --git a/amoro-hudi-format/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory b/amoro-format-hudi/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory similarity index 100% rename from amoro-hudi-format/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory rename to amoro-format-hudi/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory diff --git a/amoro-hudi-format/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor b/amoro-format-hudi/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor similarity index 100% rename from amoro-hudi-format/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor rename to amoro-format-hudi/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor diff --git a/amoro-iceberg-format/pom.xml b/amoro-format-iceberg/pom.xml similarity index 99% rename from amoro-iceberg-format/pom.xml rename to amoro-format-iceberg/pom.xml index 0051b3843a..f05f58c2f6 100644 --- a/amoro-iceberg-format/pom.xml +++ b/amoro-format-iceberg/pom.xml @@ -27,7 +27,7 @@ 0.8-SNAPSHOT - amoro-iceberg-format + amoro-format-iceberg Amoro Project Iceberg Format https://amoro.apache.org diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/IcebergFileEntry.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/IcebergFileEntry.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/IcebergFileEntry.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/IcebergFileEntry.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/ChangeAction.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/ChangeAction.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/ChangeAction.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/ChangeAction.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/ChangedLsn.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/ChangedLsn.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/ChangedLsn.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/ChangedLsn.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/DataFileType.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/DataFileType.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/DataFileType.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/DataFileType.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/DataTreeNode.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/DataTreeNode.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/DataTreeNode.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/DataTreeNode.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/FileNameRules.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/FileNameRules.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/FileNameRules.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/FileNameRules.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/PrimaryKeyData.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/PrimaryKeyData.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/PrimaryKeyData.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/PrimaryKeyData.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/events/IcebergReportEvent.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/events/IcebergReportEvent.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/events/IcebergReportEvent.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/events/IcebergReportEvent.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedFileIO.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedFileIO.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedFileIO.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedFileIO.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedFileIOAdapter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedFileIOAdapter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedFileIOAdapter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedFileIOAdapter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedFileIOs.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedFileIOs.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedFileIOs.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedFileIOs.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/CloseablePredicate.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/CloseablePredicate.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/CloseablePredicate.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/CloseablePredicate.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/PathInfo.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/PathInfo.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/PathInfo.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/PathInfo.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/TableTrashManager.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/TableTrashManager.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/TableTrashManager.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/TableTrashManager.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/TableTrashManagers.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/TableTrashManagers.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/TableTrashManagers.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/TableTrashManagers.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/Deletes.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/Deletes.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/Deletes.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/Deletes.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/MixedDeleteFilter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/MixedDeleteFilter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/MixedDeleteFilter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/MixedDeleteFilter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/StructForDelete.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/StructForDelete.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/StructForDelete.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/StructForDelete.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/MixedTreeNodePosDeleteWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/MixedTreeNodePosDeleteWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/MixedTreeNodePosDeleteWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/MixedTreeNodePosDeleteWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/Bytes.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/Bytes.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/Bytes.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/Bytes.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/Converter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/Converter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/Converter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/Converter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/FormatVersion.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/FormatVersion.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/FormatVersion.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/FormatVersion.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogData.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogData.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogData.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogData.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/MessageBytes.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/MessageBytes.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/MessageBytes.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/MessageBytes.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/TimeFormats.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/TimeFormats.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/TimeFormats.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/TimeFormats.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/data/LogArrayData.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/data/LogArrayData.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/data/LogArrayData.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/data/LogArrayData.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/log/data/LogMapData.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/log/data/LogMapData.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/log/data/LogMapData.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/log/data/LogMapData.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/CatalogLoader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/CatalogLoader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/CatalogLoader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/CatalogLoader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/MixedFormatCatalog.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/MixedFormatCatalog.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/MixedFormatCatalog.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/MixedFormatCatalog.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/MixedTables.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/MixedTables.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/mixed/MixedTables.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/mixed/MixedTables.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/CreateTableTransaction.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/CreateTableTransaction.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/CreateTableTransaction.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/CreateTableTransaction.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedAppendFiles.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedAppendFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedAppendFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedAppendFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedDeleteFiles.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedDeleteFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedDeleteFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedDeleteFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedHadoopTableOperations.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedHadoopTableOperations.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedHadoopTableOperations.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedHadoopTableOperations.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedOverwriteFiles.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedOverwriteFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedOverwriteFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedOverwriteFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedReplacePartitions.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedReplacePartitions.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedReplacePartitions.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedReplacePartitions.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedRewriteFiles.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedRewriteFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedRewriteFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedRewriteFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedRowDelta.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedRowDelta.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedRowDelta.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedRowDelta.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedTableOperations.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedTableOperations.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedTableOperations.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedTableOperations.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedTransaction.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedTransaction.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedTransaction.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedTransaction.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedUpdate.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedUpdate.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/MixedUpdate.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/MixedUpdate.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/RewritePartitions.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/RewritePartitions.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/RewritePartitions.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/RewritePartitions.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/SnapshotSummary.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/SnapshotSummary.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/SnapshotSummary.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/SnapshotSummary.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/properties/HiveTableProperties.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/properties/HiveTableProperties.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/properties/HiveTableProperties.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/properties/HiveTableProperties.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/properties/MetaTableProperties.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/properties/MetaTableProperties.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/properties/MetaTableProperties.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/properties/MetaTableProperties.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/BasicMixedFileScanTask.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/BasicMixedFileScanTask.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/BasicMixedFileScanTask.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/BasicMixedFileScanTask.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/CombinedScanTask.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/CombinedScanTask.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/CombinedScanTask.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/CombinedScanTask.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/KeyedTableScan.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/KeyedTableScan.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/KeyedTableScan.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/KeyedTableScan.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/MixedFileScanTask.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/MixedFileScanTask.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/MixedFileScanTask.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/MixedFileScanTask.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/TableEntriesScan.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/TableEntriesScan.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/TableEntriesScan.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/TableEntriesScan.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/BaseLocationKind.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/BaseLocationKind.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/BaseLocationKind.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/BaseLocationKind.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/BaseTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/BaseTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/BaseTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/BaseTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/BasicKeyedTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/BasicKeyedTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/BasicKeyedTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/BasicKeyedTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/BasicTableBuilder.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/BasicTableBuilder.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/BasicTableBuilder.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/BasicTableBuilder.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/ChangeLocationKind.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/ChangeLocationKind.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/ChangeLocationKind.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/ChangeLocationKind.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/ChangeTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/ChangeTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/ChangeTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/ChangeTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/DistributionHashMode.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/DistributionHashMode.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/DistributionHashMode.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/DistributionHashMode.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/KeyedTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/KeyedTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/KeyedTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/KeyedTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/LocationKind.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/LocationKind.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/LocationKind.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/LocationKind.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/MetadataColumns.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/MetadataColumns.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/MetadataColumns.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/MetadataColumns.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/MixedTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/MixedTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/MixedTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/MixedTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/TableBuilder.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/TableBuilder.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/TableBuilder.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/TableBuilder.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/TableProperties.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/TableProperties.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/TableProperties.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/TableProperties.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/UnkeyedTable.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/UnkeyedTable.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/UnkeyedTable.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/UnkeyedTable.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/WatermarkGenerator.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/WatermarkGenerator.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/WatermarkGenerator.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/WatermarkGenerator.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/WriteOperationKind.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/WriteOperationKind.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/WriteOperationKind.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/WriteOperationKind.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/Blocker.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/Blocker.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/Blocker.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/Blocker.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ContentFiles.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ContentFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ContentFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ContentFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ExpressionUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ExpressionUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ExpressionUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ExpressionUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/MixedDataFiles.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/MixedDataFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/MixedDataFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/MixedDataFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/MixedFormatCatalogUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/MixedFormatCatalogUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/MixedFormatCatalogUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/MixedFormatCatalogUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/MixedTableUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/MixedTableUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/MixedTableUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/MixedTableUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/NodeFilter.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/NodeFilter.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/NodeFilter.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/NodeFilter.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/SchemaUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/SchemaUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/SchemaUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/SchemaUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/SerializationUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/SerializationUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/SerializationUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/SerializationUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/StructLikeSet.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/StructLikeSet.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/StructLikeSet.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/StructLikeSet.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/TableFileUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/TableFileUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/TableFileUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/TableFileUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/SimpleMap.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/SimpleMap.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/SimpleMap.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/SimpleMap.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java rename to amoro-format-iceberg/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/iceberg/IcebergFindFiles.java b/amoro-format-iceberg/src/main/java/org/apache/iceberg/IcebergFindFiles.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/iceberg/IcebergFindFiles.java rename to amoro-format-iceberg/src/main/java/org/apache/iceberg/IcebergFindFiles.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/iceberg/MixedChangeTableScan.java b/amoro-format-iceberg/src/main/java/org/apache/iceberg/MixedChangeTableScan.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/iceberg/MixedChangeTableScan.java rename to amoro-format-iceberg/src/main/java/org/apache/iceberg/MixedChangeTableScan.java diff --git a/amoro-iceberg-format/src/main/java/org/apache/iceberg/data/PublicGenericReader.java b/amoro-format-iceberg/src/main/java/org/apache/iceberg/data/PublicGenericReader.java similarity index 100% rename from amoro-iceberg-format/src/main/java/org/apache/iceberg/data/PublicGenericReader.java rename to amoro-format-iceberg/src/main/java/org/apache/iceberg/data/PublicGenericReader.java diff --git a/amoro-iceberg-format/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory b/amoro-format-iceberg/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory similarity index 100% rename from amoro-iceberg-format/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory rename to amoro-format-iceberg/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/BasicTableTestHelper.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/BasicTableTestHelper.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/BasicTableTestHelper.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/BasicTableTestHelper.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/DataFileTestHelpers.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/DataFileTestHelpers.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/DataFileTestHelpers.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/DataFileTestHelpers.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/TableTestHelper.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/TableTestHelper.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/TableTestHelper.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/TableTestHelper.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/TestTreeNode.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/TestTreeNode.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/TestTreeNode.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/TestTreeNode.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/TestUnifiedCatalog.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/TestUnifiedCatalog.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/TestUnifiedCatalog.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/TestUnifiedCatalog.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/TestedCatalogs.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/TestedCatalogs.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/TestedCatalogs.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/TestedCatalogs.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/BasicMixedCatalog.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/BasicMixedCatalog.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/BasicMixedCatalog.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/BasicMixedCatalog.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/MixedTables.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/MixedTables.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/MixedTables.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/MixedTables.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/TableTestBase.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/TableTestBase.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/TableTestBase.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/TableTestBase.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TableDataTestBase.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TableDataTestBase.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TableDataTestBase.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TableDataTestBase.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestMixedTreeNodePosDeleteWriter.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestMixedTreeNodePosDeleteWriter.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestMixedTreeNodePosDeleteWriter.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestMixedTreeNodePosDeleteWriter.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestRecoverableAuthenticatedFileIO.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestRecoverableAuthenticatedFileIO.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestRecoverableAuthenticatedFileIO.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestRecoverableAuthenticatedFileIO.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestTaskReader.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestTaskReader.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestTaskReader.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestTaskReader.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestTaskWriter.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestTaskWriter.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/io/TestTaskWriter.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/io/TestTaskWriter.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/log/FormatTestBase.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/log/FormatTestBase.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/log/FormatTestBase.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/log/FormatTestBase.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestRewritePartitions.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestRewritePartitions.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestRewritePartitions.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestRewritePartitions.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestUpdateTable.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestUpdateTable.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/op/TestUpdateTable.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/op/TestUpdateTable.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/trace/TestTableTracer.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/trace/TestTableTracer.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/trace/TestTableTracer.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/trace/TestTableTracer.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/trace/TestTableWatermark.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/trace/TestTableWatermark.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/trace/TestTableWatermark.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/trace/TestTableWatermark.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestFileUtil.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestFileUtil.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestFileUtil.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestFileUtil.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestMixedDataFiles.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestMixedDataFiles.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestMixedDataFiles.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestMixedDataFiles.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestMixedFormatCatalogUtil.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestMixedFormatCatalogUtil.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestMixedFormatCatalogUtil.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestMixedFormatCatalogUtil.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java b/amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java rename to amoro-format-iceberg/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java diff --git a/amoro-iceberg-format/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java b/amoro-format-iceberg/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java similarity index 100% rename from amoro-iceberg-format/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java rename to amoro-format-iceberg/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-format/pom.xml b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/pom.xml similarity index 91% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-format/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/pom.xml index 9f714dfb70..8be96c28d8 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-format/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../pom.xml - amoro-mixed-format-flink-common-format + amoro-format-mixed-flink-common-format Amoro Project Mixed Format Flink Common Format https://amoro.apache.org @@ -37,7 +37,7 @@ org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg provided diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/pom.xml b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml similarity index 98% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml index 48208c4380..51d0dc00db 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../pom.xml - amoro-mixed-format-flink-common-iceberg-bridge + amoro-format-mixed-flink-common-iceberg-bridge Amoro Project Mixed Format Flink Iceberg Bridge https://amoro.apache.org @@ -41,7 +41,7 @@ org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg org.ow2.asm @@ -52,7 +52,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/pom.xml b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml similarity index 96% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml index 6a4722d0d0..41a51b9d89 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../pom.xml - amoro-mixed-format-flink-common + amoro-mixed-flink-common Amoro Project Mixed Format Flink Common https://amoro.apache.org @@ -44,7 +44,7 @@ org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg org.ow2.asm @@ -55,12 +55,12 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive org.apache.amoro - amoro-mixed-format-flink-common-iceberg-bridge + amoro-format-mixed-flink-common-iceberg-bridge ${project.version} @@ -93,7 +93,7 @@ org.apache.amoro - amoro-mixed-format-flink-common-format + amoro-format-mixed-flink-common-format ${project.parent.version} @@ -320,7 +320,7 @@ org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg ${project.version} test-jar test @@ -328,7 +328,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} tests test @@ -336,7 +336,7 @@ org.apache.amoro - amoro-paimon-format + amoro-format-paimon ${project.version} tests test @@ -344,7 +344,7 @@ org.apache.amoro - amoro-paimon-format + amoro-format-paimon ${project.version} test diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/MixedFormatSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/MixedFormatSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/MixedFormatSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/MixedFormatSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractMixedFormatEnumerator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractMixedFormatEnumerator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractMixedFormatEnumerator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractMixedFormatEnumerator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffset.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffset.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffset.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffset.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffsetSerializer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffsetSerializer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffsetSerializer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatEnumeratorOffsetSerializer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumState.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumState.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumState.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumState.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumStateSerializer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumStateSerializer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumStateSerializer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumStateSerializer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumerator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumerator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumerator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MixedFormatSourceEnumerator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticMixedFormatSourceEnumerator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticMixedFormatSourceEnumerator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticMixedFormatSourceEnumerator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticMixedFormatSourceEnumerator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordEmitter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordEmitter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordEmitter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordEmitter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordWithOffset.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordWithOffset.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordWithOffset.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatRecordWithOffset.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatSourceReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatSourceReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatSourceReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/MixedFormatSourceReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplit.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplit.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplit.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitSerializer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitSerializer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitSerializer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitSerializer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitState.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitState.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitState.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MixedFormatSplitState.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkKeyedMORDataReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkKeyedMORDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkKeyedMORDataReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkKeyedMORDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkUnkyedDataReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkUnkyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkUnkyedDataReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkUnkyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/MixedFormatScanContext.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/MixedFormatScanContext.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/MixedFormatScanContext.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/MixedFormatScanContext.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSink.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSink.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSink.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSink.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatFileSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatFileSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatFileSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatFileSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatTableLoader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatTableLoader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatTableLoader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/MixedFormatTableLoader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/MixedFormatValidator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/MixedFormatValidator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/MixedFormatValidator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/MixedFormatValidator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/MixedFormatUtils.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/MixedFormatUtils.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/MixedFormatUtils.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/MixedFormatUtils.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatFileWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatFileWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatFileWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatFileWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatLogWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatLogWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatLogWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatLogWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatRowDataTaskWriterFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatRowDataTaskWriterFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatRowDataTaskWriterFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatRowDataTaskWriterFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/MixedFormatWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/MixedFormatLogPartitioner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/MixedFormatLogPartitioner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/MixedFormatLogPartitioner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/MixedFormatLogPartitioner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/resources/log4j.properties b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/resources/log4j.properties similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/main/resources/log4j.properties rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/resources/log4j.properties diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/TestMixedFormatSource.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/TestMixedFormatSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/TestMixedFormatSource.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/TestMixedFormatSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumStateSerializer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumStateSerializer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumStateSerializer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumStateSerializer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumerator.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumerator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumerator.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestMixedFormatSourceEnumerator.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestMixedFormatSplitSerializer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestMixedFormatSplitSerializer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestMixedFormatSplitSerializer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestMixedFormatSplitSerializer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/MixedFormatMockEnvironment.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/MixedFormatMockEnvironment.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/MixedFormatMockEnvironment.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/MixedFormatMockEnvironment.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/MixedFormatFileWriterITCase.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/MixedFormatFileWriterITCase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/MixedFormatFileWriterITCase.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/MixedFormatFileWriterITCase.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileCommitter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileCommitter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileCommitter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileCommitter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileWriter.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileWriter.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/TestMixedFormatFileWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/resources/log4j2-test.xml b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/resources/log4j2-test.xml similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/resources/log4j2-test.xml rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/resources/log4j2-test.xml diff --git a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/resources/log4j2.component.properties b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/resources/log4j2.component.properties similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/src/test/resources/log4j2.component.properties rename to amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/resources/log4j2.component.properties diff --git a/amoro-mixed-format/amoro-mixed-format-flink/pom.xml b/amoro-format-mixed/amoro-mixed-flink/pom.xml similarity index 71% rename from amoro-mixed-format/amoro-mixed-format-flink/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/pom.xml index f5dc8702f7..32871a988b 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/pom.xml @@ -23,26 +23,26 @@ org.apache.amoro - amoro-mixed-format + amoro-format-mixed 0.8-SNAPSHOT ../pom.xml - amoro-mixed-format-flink + amoro-mixed-flink pom Amoro Project Mixed Format Flink Parent https://amoro.apache.org - amoro-mixed-format-flink-common - amoro-mixed-format-flink-common-format - amoro-mixed-format-flink-common-iceberg-bridge - v1.15/amoro-mixed-format-flink-1.15 - v1.15/amoro-mixed-format-flink-runtime-1.15 - v1.16/amoro-mixed-format-flink-1.16 - v1.16/amoro-mixed-format-flink-runtime-1.16 - v1.17/amoro-mixed-format-flink-1.17 - v1.17/amoro-mixed-format-flink-runtime-1.17 + amoro-mixed-flink-common + amoro-mixed-flink-common-format + amoro-mixed-flink-common-iceberg-bridge + v1.15/amoro-mixed-flink-1.15 + v1.15/amoro-mixed-flink-runtime-1.15 + v1.16/amoro-mixed-flink-1.16 + v1.16/amoro-mixed-flink-runtime-1.16 + v1.17/amoro-mixed-flink-1.17 + v1.17/amoro-mixed-flink-runtime-1.17 diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-1.15/pom.xml b/amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-1.15/pom.xml similarity index 94% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-1.15/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-1.15/pom.xml index 8b82535e3b..0f9202e688 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-1.15/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-1.15/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../../pom.xml - amoro-mixed-format-flink-1.15 + amoro-format-mixed-flink-1.15 Amoro Project Mixed Format Flink 1.15 https://amoro.apache.org @@ -43,7 +43,7 @@ org.apache.amoro - amoro-mixed-format-flink-common + amoro-mixed-flink-common ${project.parent.version} @@ -96,7 +96,7 @@ - org.apache.amoro:amoro-mixed-format-flink-common + org.apache.amoro:amoro-format-mixed-flink-common diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-1.15/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java b/amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-1.15/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-1.15/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java rename to amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-1.15/src/main/java/org/apache/amoro/flink/lookup/MixedFormatRowDataLookupFunction.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-1.15/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java b/amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-1.15/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-1.15/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java rename to amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-1.15/src/main/java/org/apache/amoro/flink/table/MixedFormatDynamicSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-runtime-1.15/pom.xml b/amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-runtime-1.15/pom.xml similarity index 98% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-runtime-1.15/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-runtime-1.15/pom.xml index b54440487a..e218e978aa 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/v1.15/amoro-mixed-format-flink-runtime-1.15/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/v1.15/amoro-mixed-flink-runtime-1.15/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../../pom.xml - amoro-mixed-format-flink-runtime-1.15 + amoro-format-mixed-flink-runtime-1.15 Amoro Project Mixed Format Flink 1.15 Runtime https://amoro.apache.org @@ -38,7 +38,7 @@ org.apache.amoro - amoro-mixed-format-flink-1.15 + amoro-format-mixed-flink-1.15 ${project.parent.version} diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.16/amoro-mixed-format-flink-1.16/pom.xml b/amoro-format-mixed/amoro-mixed-flink/v1.16/amoro-mixed-flink-1.16/pom.xml similarity index 94% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.16/amoro-mixed-format-flink-1.16/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/v1.16/amoro-mixed-flink-1.16/pom.xml index 0a7b6c1ce7..cee7422677 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/v1.16/amoro-mixed-format-flink-1.16/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/v1.16/amoro-mixed-flink-1.16/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../../pom.xml - amoro-mixed-format-flink-1.16 + amoro-format-mixed-flink-1.16 Amoro Project Mixed Format Flink 1.16 https://amoro.apache.org @@ -43,7 +43,7 @@ org.apache.amoro - amoro-mixed-format-flink-common + amoro-mixed-flink-common ${project.parent.version} @@ -89,7 +89,7 @@ - org.apache.amoro:amoro-mixed-format-flink-common + org.apache.amoro:amoro-format-mixed-flink-common diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.16/amoro-mixed-format-flink-runtime-1.16/pom.xml b/amoro-format-mixed/amoro-mixed-flink/v1.16/amoro-mixed-flink-runtime-1.16/pom.xml similarity index 98% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.16/amoro-mixed-format-flink-runtime-1.16/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/v1.16/amoro-mixed-flink-runtime-1.16/pom.xml index a237ccf5ea..1bfcfb1386 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/v1.16/amoro-mixed-format-flink-runtime-1.16/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/v1.16/amoro-mixed-flink-runtime-1.16/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../../pom.xml - amoro-mixed-format-flink-runtime-1.16 + amoro-format-mixed-flink-runtime-1.16 Amoro Project Mixed Format Flink 1.16 Runtime https://amoro.apache.org @@ -38,7 +38,7 @@ org.apache.amoro - amoro-mixed-format-flink-1.16 + amoro-format-mixed-flink-1.16 ${project.parent.version} diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.17/amoro-mixed-format-flink-1.17/pom.xml b/amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-1.17/pom.xml similarity index 94% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.17/amoro-mixed-format-flink-1.17/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-1.17/pom.xml index 8f52deb559..5fd713cca7 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/v1.17/amoro-mixed-format-flink-1.17/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-1.17/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../../pom.xml - amoro-mixed-format-flink-1.17 + amoro-format-mixed-flink-1.17 Amoro Project Mixed Format Flink 1.17 https://amoro.apache.org @@ -43,7 +43,7 @@ org.apache.amoro - amoro-mixed-format-flink-common + amoro-mixed-flink-common ${project.parent.version} @@ -89,7 +89,7 @@ - org.apache.amoro:amoro-mixed-format-flink-common + org.apache.amoro:amoro-format-mixed-flink-common diff --git a/amoro-mixed-format/amoro-mixed-format-flink/v1.17/amoro-mixed-format-flink-runtime-1.17/pom.xml b/amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-runtime-1.17/pom.xml similarity index 98% rename from amoro-mixed-format/amoro-mixed-format-flink/v1.17/amoro-mixed-format-flink-runtime-1.17/pom.xml rename to amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-runtime-1.17/pom.xml index 04804ffa13..014d8c9d4c 100644 --- a/amoro-mixed-format/amoro-mixed-format-flink/v1.17/amoro-mixed-format-flink-runtime-1.17/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-runtime-1.17/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-flink + amoro-mixed-flink 0.8-SNAPSHOT ../../pom.xml - amoro-mixed-format-flink-runtime-1.17 + amoro-format-mixed-flink-runtime-1.17 Amoro Project Mixed Format Flink 1.17 Runtime https://amoro.apache.org @@ -38,7 +38,7 @@ org.apache.amoro - amoro-mixed-format-flink-1.17 + amoro-format-mixed-flink-1.17 ${project.parent.version} diff --git a/amoro-mixed-format/amoro-mixed-format-hive/pom.xml b/amoro-format-mixed/amoro-mixed-hive/pom.xml similarity index 94% rename from amoro-mixed-format/amoro-mixed-format-hive/pom.xml rename to amoro-format-mixed/amoro-mixed-hive/pom.xml index 6980091c6d..4c55031d7e 100644 --- a/amoro-mixed-format/amoro-mixed-format-hive/pom.xml +++ b/amoro-format-mixed/amoro-mixed-hive/pom.xml @@ -22,19 +22,19 @@ 4.0.0 org.apache.amoro - amoro-mixed-format + amoro-format-mixed 0.8-SNAPSHOT ../pom.xml - amoro-mixed-format-hive + amoro-mixed-hive Amoro Project Mixed Hive Format https://amoro.apache.org org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg @@ -103,7 +103,7 @@ org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg ${project.version} tests test diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveCatalog.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveCatalog.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveMixedDeleteFilter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveMixedDeleteFilter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveMixedDeleteFilter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveMixedDeleteFilter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java rename to amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java b/amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java rename to amoro-format-mixed/amoro-mixed-hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/hive.parquet b/amoro-format-mixed/amoro-mixed-hive/src/test/resources/hive.parquet similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/hive.parquet rename to amoro-format-mixed/amoro-mixed-hive/src/test/resources/hive.parquet diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/log4j2.xml b/amoro-format-mixed/amoro-mixed-hive/src/test/resources/log4j2.xml similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/log4j2.xml rename to amoro-format-mixed/amoro-mixed-hive/src/test/resources/log4j2.xml diff --git a/amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/string_is_bytes.parquet b/amoro-format-mixed/amoro-mixed-hive/src/test/resources/string_is_bytes.parquet similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/string_is_bytes.parquet rename to amoro-format-mixed/amoro-mixed-hive/src/test/resources/string_is_bytes.parquet diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/pom.xml b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml similarity index 96% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/pom.xml rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml index bb9517081d..dd4fa09950 100644 --- a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml @@ -22,12 +22,12 @@ 4.0.0 org.apache.amoro - amoro-mixed-format-spark + amoro-mixed-spark 0.8-SNAPSHOT ../pom.xml - amoro-mixed-format-spark-3-common + amoro-format-mixed-spark-3-common jar Amoro Project Mixed Format Spark 3 Common https://amoro.apache.org @@ -46,7 +46,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} @@ -188,14 +188,14 @@ org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg ${project.version} test-jar test org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} test-jar test diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalogBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/amoro-mixed-format-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java rename to amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/pom.xml b/amoro-format-mixed/amoro-mixed-spark/pom.xml similarity index 77% rename from amoro-mixed-format/amoro-mixed-format-spark/pom.xml rename to amoro-format-mixed/amoro-mixed-spark/pom.xml index 682302769c..306eda8e8e 100644 --- a/amoro-mixed-format/amoro-mixed-format-spark/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/pom.xml @@ -22,20 +22,20 @@ 4.0.0 org.apache.amoro - amoro-mixed-format + amoro-format-mixed 0.8-SNAPSHOT - amoro-mixed-format-spark + amoro-mixed-spark pom Amoro Project Mixed Format Spark Parent https://amoro.apache.org - amoro-mixed-format-spark-3-common - v3.2/amoro-mixed-format-spark-3.2 - v3.2/amoro-mixed-format-spark-runtime-3.2 - v3.3/amoro-mixed-format-spark-3.3 - v3.3/amoro-mixed-format-spark-runtime-3.3 + amoro-mixed-spark-3-common + v3.2/amoro-mixed-spark-3.2 + v3.2/amoro-mixed-spark-runtime-3.2 + v3.3/amoro-mixed-spark-3.3 + v3.3/amoro-mixed-spark-runtime-3.3 diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/pom.xml b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/pom.xml similarity index 97% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/pom.xml rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/pom.xml index 561a100d25..cc4e7a8d3d 100644 --- a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/pom.xml @@ -21,14 +21,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-mixed-format-spark + amoro-mixed-spark org.apache.amoro 0.8-SNAPSHOT ../../pom.xml 4.0.0 - amoro-mixed-format-spark-3.2 + amoro-format-mixed-spark-3.2 jar Amoro Project Mixed Format Spark 3.2 https://amoro.apache.org @@ -221,7 +221,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} @@ -237,7 +237,7 @@ org.apache.amoro - amoro-mixed-format-spark-3-common + amoro-format-mixed-spark-3-common ${project.version} @@ -315,7 +315,7 @@ org.apache.amoro - amoro-paimon-format + amoro-format-paimon ${project.version} test @@ -347,7 +347,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} test-jar test @@ -361,14 +361,14 @@ org.apache.amoro - amoro-mixed-format-spark-3-common + amoro-format-mixed-spark-3-common ${project.version} test-jar test org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg ${project.version} test-jar test diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/.gitignore b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/.gitignore similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/.gitignore rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/.gitignore diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/Spark32Adapter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/Spark32Adapter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/Spark32Adapter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/Spark32Adapter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/TaskWriters.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/TaskWriters.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/TaskWriters.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/TaskWriters.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/Stats.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/Stats.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/util/Stats.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/util/Stats.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteMode.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteMode.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteMode.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteMode.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark32Helper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark32Helper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark32Helper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark32Helper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/resources/log4j2.properties b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/resources/log4j2.properties similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-3.2/src/test/resources/log4j2.properties rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/test/resources/log4j2.properties diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-runtime-3.2/pom.xml similarity index 99% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml rename to amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-runtime-3.2/pom.xml index 63b4910ec4..642010ae93 100644 --- a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-runtime-3.2/pom.xml @@ -21,14 +21,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-mixed-format-spark + amoro-mixed-spark org.apache.amoro 0.8-SNAPSHOT ../../pom.xml 4.0.0 - amoro-mixed-format-spark-runtime-3.2 + amoro-format-mixed-spark-runtime-3.2 jar Amoro Project Mixed Format Spark 3.2 Runtime https://amoro.apache.org @@ -36,7 +36,7 @@ org.apache.amoro - amoro-mixed-format-spark-3.2 + amoro-format-mixed-spark-3.2 ${project.parent.version} @@ -58,8 +58,8 @@ false - org.apache.amoro:amoro-mixed-format-spark-3-common - org.apache.amoro:amoro-mixed-format-spark-3.2 + org.apache.amoro:amoro-format-mixed-spark-3-common + org.apache.amoro:amoro-format-mixed-spark-3.2 org.apache.amoro:amoro-core org.apache.amoro:amoro-shade-guava-32 org.apache.amoro:amoro-shade-jackson-2 diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/pom.xml b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml similarity index 97% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/pom.xml rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml index a2d6c71dd2..6e54618f58 100644 --- a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml @@ -21,14 +21,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-mixed-format-spark + amoro-mixed-spark org.apache.amoro 0.8-SNAPSHOT ../../pom.xml 4.0.0 - amoro-mixed-format-spark-3.3 + amoro-format-mixed-spark-3.3 jar Amoro Project Mixed Format Spark 3.3 https://amoro.apache.org @@ -217,7 +217,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} @@ -233,7 +233,7 @@ org.apache.amoro - amoro-mixed-format-spark-3-common + amoro-format-mixed-spark-3-common ${project.version} @@ -276,7 +276,7 @@ org.apache.amoro - amoro-paimon-format + amoro-format-paimon ${parent.version} test @@ -348,7 +348,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} test-jar test @@ -361,14 +361,14 @@ org.apache.amoro - amoro-mixed-format-spark-3-common + amoro-format-mixed-spark-3-common ${project.version} test-jar test org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg ${project.version} test-jar test diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/antlr4/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtend.g4 diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/.gitignore b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/.gitignore similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/.gitignore rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/.gitignore diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseListener.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendBaseVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendLexer.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendListener.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendParser.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/MixedFormatSqlExtendVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/MixedFormatSparkSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/Spark33Adapter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/Spark33Adapter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/Spark33Adapter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/Spark33Adapter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/command/MigrateToMixedFormatCommand.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/command/MixedFormatSparkCommand.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkBaseTaskWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/SparkChangeTaskWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/TaskWriters.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/TaskWriters.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/TaskWriters.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/TaskWriters.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkKeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/SparkUnkeyedDataReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/MixedSparkTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/SparkChangeTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/table/UnkeyedSparkTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/MixedFormatSparkUtils.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/Stats.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/Stats.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/util/Stats.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/util/Stats.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/MixedFormatSparkWriteBuilder.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteMode.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteMode.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteMode.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteMode.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/MixedFormatExtensionUtils.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/MixedFormatAlignRowLevelCommandAssignments.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoMixedFormatTableReferences.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMixedFormatCommand.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatCommand.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteMixedFormatMergeIntoTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatParserUtils.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/MixedFormatSqlExtensionsParser.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterMixedFormatTableDropPartition.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MixedFormatRowLevelWrite.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoMixedFormatTable.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/AlterMixedFormatTableDropPartitionExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedMixedFormatStrategy.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatCommandExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/MixedFormatRowLevelWriteExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateMixedFormatTableExec.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/MixedFormatRewriteHelper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark33Helper.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark33Helper.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark33Helper.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/catalyst/MixedFormatSpark33Helper.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/MixedFormatSqlExtendAstBuilder.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/catalyst/analysis/MixedFormatAssignmentAlignmentSupport.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/scala/org/apache/spark/sql/execution/datasources/v2/MixedFormatExtendedDataSourceV2Strategy.scala diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMixedFormatSessionCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/resources/log4j2.properties b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/resources/log4j2.properties similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-3.3/src/test/resources/log4j2.properties rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/test/resources/log4j2.properties diff --git a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/pom.xml similarity index 98% rename from amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml rename to amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/pom.xml index 0469a736ba..33ebd34400 100644 --- a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/pom.xml @@ -21,14 +21,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-mixed-format-spark + amoro-mixed-spark org.apache.amoro 0.8-SNAPSHOT ../../pom.xml 4.0.0 - amoro-mixed-format-spark-runtime-3.3 + amoro-format-mixed-spark-runtime-3.3 jar Amoro Project Mixed Format Spark 3.3 Runtime https://amoro.apache.org @@ -36,7 +36,7 @@ org.apache.amoro - amoro-mixed-format-spark-3.3 + amoro-format-mixed-spark-3.3 ${project.parent.version} @@ -58,10 +58,10 @@ false - org.apache.amoro:amoro-mixed-format-spark-3-common - org.apache.amoro:amoro-mixed-format-spark-3.3 + org.apache.amoro:amoro-format-mixed-spark-3-common + org.apache.amoro:amoro-format-mixed-spark-3.3 org.apache.amoro:amoro-core - org.apache.amoro:amoro-mixed-format-hive + org.apache.amoro:amoro-format-mixed-hive org.apache.amoro:amoro-shade-guava-32 org.apache.amoro:amoro-shade-jackson-2 org.apache.amoro:amoro-shade-thrift diff --git a/amoro-mixed-format/amoro-mixed-format-trino/assembly.xml b/amoro-format-mixed/amoro-mixed-trino/assembly.xml similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/assembly.xml rename to amoro-format-mixed/amoro-mixed-trino/assembly.xml diff --git a/amoro-mixed-format/amoro-mixed-format-trino/pom.xml b/amoro-format-mixed/amoro-mixed-trino/pom.xml similarity index 98% rename from amoro-mixed-format/amoro-mixed-format-trino/pom.xml rename to amoro-format-mixed/amoro-mixed-trino/pom.xml index 8ac823491f..936c8b4e13 100644 --- a/amoro-mixed-format/amoro-mixed-format-trino/pom.xml +++ b/amoro-format-mixed/amoro-mixed-trino/pom.xml @@ -22,11 +22,11 @@ 4.0.0 org.apache.amoro - amoro-mixed-format + amoro-format-mixed 0.8-SNAPSHOT - amoro-mixed-format-trino + amoro-mixed-trino Amoro Project Mixed Format Trino https://amoro.apache.org @@ -423,7 +423,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} @@ -471,7 +471,7 @@ org.apache.amoro - amoro-iceberg-format + amoro-format-iceberg ${project.version} tests test @@ -479,7 +479,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive ${project.version} test-jar test diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/AmoroErrorCode.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/AmoroErrorCode.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/AmoroErrorCode.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/AmoroErrorCode.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/DefaultMixedFormatCatalogFactory.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/DefaultMixedFormatCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/DefaultMixedFormatCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/DefaultMixedFormatCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogFactory.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogSupportTableSuffix.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogSupportTableSuffix.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogSupportTableSuffix.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatCatalogSupportTableSuffix.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConfig.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConfig.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConfig.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConfig.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnector.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnector.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnector.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnector.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorFactory.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorFactory.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorMetadata.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorMetadata.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorMetadata.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorMetadata.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorSplitManager.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorSplitManager.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorSplitManager.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatConnectorSplitManager.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsAuthentication.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsAuthentication.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsAuthentication.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsAuthentication.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsConfiguration.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsConfiguration.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsConfiguration.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatHdfsConfiguration.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatMetadataFactory.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatMetadataFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatMetadataFactory.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatMetadataFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatModule.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatModule.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatModule.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatModule.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatPageSourceProvider.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatPageSourceProvider.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatPageSourceProvider.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatPageSourceProvider.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatPlugin.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatPlugin.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatPlugin.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatPlugin.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatSessionProperties.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatSessionProperties.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatSessionProperties.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatSessionProperties.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatTransactionManager.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatTransactionManager.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatTransactionManager.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatTransactionManager.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalog.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalog.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalog.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalog.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalogFactory.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalogFactory.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalogFactory.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/MixedFormatTrinoCatalogFactory.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/util/VersionInfo.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/hadoop/util/VersionInfo.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/util/VersionInfo.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/hadoop/util/VersionInfo.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java b/amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java rename to amoro-format-mixed/amoro-mixed-trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/main/resources/META-INF/services/io.trino.spi.Plugin b/amoro-format-mixed/amoro-mixed-trino/src/main/resources/META-INF/services/io.trino.spi.Plugin similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/main/resources/META-INF/services/io.trino.spi.Plugin rename to amoro-format-mixed/amoro-mixed-trino/src/main/resources/META-INF/services/io.trino.spi.Plugin diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java b/amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java rename to amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/MixedFormatQueryRunner.java b/amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/MixedFormatQueryRunner.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/MixedFormatQueryRunner.java rename to amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/MixedFormatQueryRunner.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java b/amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java rename to amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java b/amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java rename to amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java b/amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java rename to amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java b/amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java rename to amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java diff --git a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestKeyedTable.java b/amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TestKeyedTable.java similarity index 100% rename from amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestKeyedTable.java rename to amoro-format-mixed/amoro-mixed-trino/src/test/java/org/apache/amoro/trino/mixed/TestKeyedTable.java diff --git a/amoro-mixed-format/pom.xml b/amoro-format-mixed/pom.xml similarity index 85% rename from amoro-mixed-format/pom.xml rename to amoro-format-mixed/pom.xml index 333ed6d107..db25810dc8 100644 --- a/amoro-mixed-format/pom.xml +++ b/amoro-format-mixed/pom.xml @@ -28,16 +28,16 @@ ../pom.xml - amoro-mixed-format + amoro-format-mixed pom Amoro Project Mixed Format Parent https://amoro.apache.org - amoro-mixed-format-flink - amoro-mixed-format-spark - amoro-mixed-format-hive - amoro-mixed-format-trino + amoro-mixed-flink + amoro-mixed-spark + amoro-mixed-hive + amoro-mixed-trino \ No newline at end of file diff --git a/amoro-paimon-format/pom.xml b/amoro-format-paimon/pom.xml similarity index 97% rename from amoro-paimon-format/pom.xml rename to amoro-format-paimon/pom.xml index cf914b3661..10ef509cbf 100644 --- a/amoro-paimon-format/pom.xml +++ b/amoro-format-paimon/pom.xml @@ -27,7 +27,7 @@ ../pom.xml - amoro-paimon-format + amoro-format-paimon Amoro Paimon Format Integration diff --git a/amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java similarity index 100% rename from amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java rename to amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java diff --git a/amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java similarity index 100% rename from amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java rename to amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java diff --git a/amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java similarity index 100% rename from amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java rename to amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java diff --git a/amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java similarity index 100% rename from amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java rename to amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java diff --git a/amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTableDescriptor.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableDescriptor.java similarity index 100% rename from amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTableDescriptor.java rename to amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableDescriptor.java diff --git a/amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java similarity index 100% rename from amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java rename to amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java diff --git a/amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java similarity index 100% rename from amoro-paimon-format/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java rename to amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java diff --git a/amoro-paimon-format/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory b/amoro-format-paimon/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory similarity index 100% rename from amoro-paimon-format/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory rename to amoro-format-paimon/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory diff --git a/amoro-paimon-format/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor b/amoro-format-paimon/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor similarity index 100% rename from amoro-paimon-format/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor rename to amoro-format-paimon/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor diff --git a/amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/PaimonHadoopCatalogTestHelper.java b/amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/PaimonHadoopCatalogTestHelper.java similarity index 100% rename from amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/PaimonHadoopCatalogTestHelper.java rename to amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/PaimonHadoopCatalogTestHelper.java diff --git a/amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/PaimonHiveCatalogTestHelper.java b/amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/PaimonHiveCatalogTestHelper.java similarity index 100% rename from amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/PaimonHiveCatalogTestHelper.java rename to amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/PaimonHiveCatalogTestHelper.java diff --git a/amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/TestPaimonAmoroCatalog.java b/amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/TestPaimonAmoroCatalog.java similarity index 100% rename from amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/TestPaimonAmoroCatalog.java rename to amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/TestPaimonAmoroCatalog.java diff --git a/amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/TestPaimonHiveAmoroCatalog.java b/amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/TestPaimonHiveAmoroCatalog.java similarity index 100% rename from amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/TestPaimonHiveAmoroCatalog.java rename to amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/TestPaimonHiveAmoroCatalog.java diff --git a/amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/TestPaimonServerTableDescriptor.java b/amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/TestPaimonServerTableDescriptor.java similarity index 100% rename from amoro-paimon-format/src/test/java/org/apache/amoro/formats/paimon/TestPaimonServerTableDescriptor.java rename to amoro-format-paimon/src/test/java/org/apache/amoro/formats/paimon/TestPaimonServerTableDescriptor.java 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 011bcc27c6..73670b475a 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"> - amoro-ams-metrics + amoro-metrics org.apache.amoro 0.8-SNAPSHOT ../pom.xml 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 91e5f49930..1ee4344acc 100644 --- a/amoro-ams/amoro-ams-metrics/pom.xml +++ b/amoro-metrics/pom.xml @@ -23,11 +23,11 @@ org.apache.amoro - amoro-ams + amoro-parent 0.8-SNAPSHOT - amoro-ams-metrics + amoro-metrics pom Amoro Project AMS Metric Reporter Parent https://amoro.apache.org diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/pom.xml b/amoro-optimizer/amoro-optimizer-common/pom.xml similarity index 94% rename from amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/pom.xml rename to amoro-optimizer/amoro-optimizer-common/pom.xml index 4fa049e0c0..b5018f9b88 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"> - amoro-ams-optimizer + amoro-optimizer org.apache.amoro 0.8-SNAPSHOT ../pom.xml @@ -36,7 +36,7 @@ org.apache.amoro - amoro-mixed-format-hive + amoro-mixed-hive 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 c85ea02c53..b9ed069f11 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"> - amoro-ams-optimizer + amoro-optimizer org.apache.amoro 0.8-SNAPSHOT ../pom.xml 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 398ef4ace9..65288df2ef 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"> - amoro-ams-optimizer + amoro-optimizer org.apache.amoro 0.8-SNAPSHOT ../pom.xml 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 c5fb8671c6..bfd829ff37 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"> - amoro-ams-optimizer + amoro-optimizer org.apache.amoro 0.8-SNAPSHOT ../pom.xml 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 13b54d696c..dc7a2a941e 100644 --- a/amoro-ams/amoro-ams-optimizer/pom.xml +++ b/amoro-optimizer/pom.xml @@ -23,11 +23,11 @@ org.apache.amoro - amoro-ams + amoro-parent 0.8-SNAPSHOT - amoro-ams-optimizer + amoro-optimizer pom Amoro Project AMS Optimizer Parent https://amoro.apache.org diff --git a/amoro-ams/amoro-ams-dashboard/.browserslistrc b/amoro-web/.browserslistrc similarity index 100% rename from amoro-ams/amoro-ams-dashboard/.browserslistrc rename to amoro-web/.browserslistrc diff --git a/amoro-ams/amoro-ams-dashboard/.gitignore b/amoro-web/.gitignore similarity index 98% rename from amoro-ams/amoro-ams-dashboard/.gitignore rename to amoro-web/.gitignore index ec77c991fd..048e3df987 100644 --- a/amoro-ams/amoro-ams-dashboard/.gitignore +++ b/amoro-web/.gitignore @@ -50,4 +50,4 @@ node_modules .env.local .env.*.local -components.d.ts +components.d.ts \ No newline at end of file diff --git a/amoro-ams/amoro-ams-dashboard/.vscode/extensions.json b/amoro-web/.vscode/extensions.json similarity index 100% rename from amoro-ams/amoro-ams-dashboard/.vscode/extensions.json rename to amoro-web/.vscode/extensions.json diff --git a/amoro-ams/amoro-ams-dashboard/.vscode/settings.json b/amoro-web/.vscode/settings.json similarity index 100% rename from amoro-ams/amoro-ams-dashboard/.vscode/settings.json rename to amoro-web/.vscode/settings.json diff --git a/amoro-ams/amoro-ams-dashboard/README.md b/amoro-web/README.md similarity index 59% rename from amoro-ams/amoro-ams-dashboard/README.md rename to amoro-web/README.md index eb01e6ed52..217a540b05 100644 --- a/amoro-ams/amoro-ams-dashboard/README.md +++ b/amoro-web/README.md @@ -25,7 +25,7 @@ This is the Dashboard frontend for Amoro Management Service (AMS). ## Installing Dependencies -In the `amoro-ams/amoro-ams-dashboard` directory, run `pnpm install` to install all the dependencies. +In the `amoro-web` directory, run `pnpm install` to install all the dependencies. ## Running Locally @@ -35,13 +35,13 @@ After completing the [Installing Dependencies](#Installing Dependencies) step, y If You are a frontend developer -In the `amoro-ams/amoro-ams-dashboard` directory, run `pnpm dev:mock` to start a development server for the dashboard app at `http://127.0.0.1:8080`. +In the `amoro-web` directory, run `pnpm dev:mock` to start a development server for the dashboard app at `http://127.0.0.1:8080`. If You not. You just running `pnpm dev` ### Configure the ams Server to connect to -1. open the `vite.config.ts` under the folder `amoro-ams/amoro-ams-dashboard` +1. open the `vite.config.ts` under the folder `amoro-web` 2. find the `proxy` configuration then unpack annotations and change the `target` to you server location @@ -69,12 +69,12 @@ proxy: { ## Building Project -In the `amoro-ams/amoro-ams-dashboard` directory, run `pnpm build` to prepare the dashboard for deployment. +In the `amoro-web` directory, run `pnpm build` to prepare the dashboard for deployment. ## Top Level Directory Structure ``` -amoro-ams/amoro-ams-dashboard +amoro-web |-- mock |-- public |-- src @@ -91,13 +91,13 @@ amoro-ams/amoro-ams-dashboard |-- pnpm-lock ``` -- [public](amoro-ams/amoro-ams-dashboard/public): The index.html and favicon.ico of this project. -- [src](amoro-ams/amoro-ams-dashboard/src): The source files of this project. - - [src/components](amoro-ams/amoro-ams-dashboard/src/components): All the shared components in the repo, can be used in all views. - - [src/views](amoro-ams/amoro-ams-dashboard/src/views): All the views. - - [src/services](amoro-ams/amoro-ams-dashboard/src/services): The services for the feature component to communicate with ams server. - - [src/utils](amoro-ams/amoro-ams-dashboard/src/utils): The utility functions in this project. - - [src/App.vue](amoro-ams/amoro-ams-dashboard/src/main.tsx): The entrance of this project. -- [vite.config.ts](/amoro-ams/amoro-ams-dashboard/vite.config.ts): The configuration file of vue3. -- [package.json](amoro-ams/amoro-ams-dashboard/package.json): The project build files and package management, it defines the scripts/tasks and the dependent packages for this project. -- [pnpm-lock.yaml](amoro-ams/amoro-ams-dashboard/pnpm-lock.yaml): The package management pnpm lock file. +- [public](amoro-web/public): The index.html and favicon.ico of this project. +- [src](amoro-web/src): The source files of this project. + - [src/components](amoro-web/src/components): All the shared components in the repo, can be used in all views. + - [src/views](amoro-web/src/views): All the views. + - [src/services](amoro-web/src/services): The services for the feature component to communicate with ams server. + - [src/utils](amoro-web/src/utils): The utility functions in this project. + - [src/App.vue](amoro-web/src/main.tsx): The entrance of this project. +- [vite.config.ts](/amoro-web/vite.config.ts): The configuration file of vue3. +- [package.json](amoro-web/package.json): The project build files and package management, it defines the scripts/tasks and the dependent packages for this project. +- [pnpm-lock.yaml](amoro-web/pnpm-lock.yaml): The package management pnpm lock file. diff --git a/amoro-ams/amoro-ams-dashboard/eslint.config.mjs b/amoro-web/eslint.config.mjs similarity index 100% rename from amoro-ams/amoro-ams-dashboard/eslint.config.mjs rename to amoro-web/eslint.config.mjs diff --git a/amoro-ams/amoro-ams-dashboard/index.html b/amoro-web/index.html similarity index 100% rename from amoro-ams/amoro-ams-dashboard/index.html rename to amoro-web/index.html diff --git a/amoro-ams/amoro-ams-dashboard/license.node.js b/amoro-web/license.node.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/license.node.js rename to amoro-web/license.node.js diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@ant-design-icons-vue b/amoro-web/licenses/LICENSE-@ant-design-icons-vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@ant-design-icons-vue rename to amoro-web/licenses/LICENSE-@ant-design-icons-vue diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@antfu-eslint-config b/amoro-web/licenses/LICENSE-@antfu-eslint-config similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@antfu-eslint-config rename to amoro-web/licenses/LICENSE-@antfu-eslint-config diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@tsconfig-node18 b/amoro-web/licenses/LICENSE-@tsconfig-node18 similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@tsconfig-node18 rename to amoro-web/licenses/LICENSE-@tsconfig-node18 diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@types-node b/amoro-web/licenses/LICENSE-@types-node similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@types-node rename to amoro-web/licenses/LICENSE-@types-node diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@vitejs-plugin-vue b/amoro-web/licenses/LICENSE-@vitejs-plugin-vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-@vitejs-plugin-vue rename to amoro-web/licenses/LICENSE-@vitejs-plugin-vue diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-ant-design-vue b/amoro-web/licenses/LICENSE-ant-design-vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-ant-design-vue rename to amoro-web/licenses/LICENSE-ant-design-vue diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-axios b/amoro-web/licenses/LICENSE-axios similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-axios rename to amoro-web/licenses/LICENSE-axios diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-babel b/amoro-web/licenses/LICENSE-babel similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-babel rename to amoro-web/licenses/LICENSE-babel diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-dayjs b/amoro-web/licenses/LICENSE-dayjs similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-dayjs rename to amoro-web/licenses/LICENSE-dayjs diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-echarts b/amoro-web/licenses/LICENSE-echarts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-echarts rename to amoro-web/licenses/LICENSE-echarts diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-eslint b/amoro-web/licenses/LICENSE-eslint similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-eslint rename to amoro-web/licenses/LICENSE-eslint diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-less b/amoro-web/licenses/LICENSE-less similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-less rename to amoro-web/licenses/LICENSE-less diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-mockjs b/amoro-web/licenses/LICENSE-mockjs similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-mockjs rename to amoro-web/licenses/LICENSE-mockjs diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-monaco-editor b/amoro-web/licenses/LICENSE-monaco-editor similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-monaco-editor rename to amoro-web/licenses/LICENSE-monaco-editor diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-pinia b/amoro-web/licenses/LICENSE-pinia similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-pinia rename to amoro-web/licenses/LICENSE-pinia diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-qs b/amoro-web/licenses/LICENSE-qs similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-qs rename to amoro-web/licenses/LICENSE-qs diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-sql-formatter b/amoro-web/licenses/LICENSE-sql-formatter similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-sql-formatter rename to amoro-web/licenses/LICENSE-sql-formatter diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-typescript b/amoro-web/licenses/LICENSE-typescript similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-typescript rename to amoro-web/licenses/LICENSE-typescript diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-unplugin-auto-import b/amoro-web/licenses/LICENSE-unplugin-auto-import similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-unplugin-auto-import rename to amoro-web/licenses/LICENSE-unplugin-auto-import diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-unplugin-vue-components b/amoro-web/licenses/LICENSE-unplugin-vue-components similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-unplugin-vue-components rename to amoro-web/licenses/LICENSE-unplugin-vue-components diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vite b/amoro-web/licenses/LICENSE-vite similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vite rename to amoro-web/licenses/LICENSE-vite diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vite-plugin-fake-server b/amoro-web/licenses/LICENSE-vite-plugin-fake-server similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vite-plugin-fake-server rename to amoro-web/licenses/LICENSE-vite-plugin-fake-server diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vite-plugin-svg-icons b/amoro-web/licenses/LICENSE-vite-plugin-svg-icons similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vite-plugin-svg-icons rename to amoro-web/licenses/LICENSE-vite-plugin-svg-icons diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue b/amoro-web/licenses/LICENSE-vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue rename to amoro-web/licenses/LICENSE-vue diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-clipboard3 b/amoro-web/licenses/LICENSE-vue-clipboard3 similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-clipboard3 rename to amoro-web/licenses/LICENSE-vue-clipboard3 diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-draggable-plus b/amoro-web/licenses/LICENSE-vue-draggable-plus similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-draggable-plus rename to amoro-web/licenses/LICENSE-vue-draggable-plus diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-i18n b/amoro-web/licenses/LICENSE-vue-i18n similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-i18n rename to amoro-web/licenses/LICENSE-vue-i18n diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-router b/amoro-web/licenses/LICENSE-vue-router similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-router rename to amoro-web/licenses/LICENSE-vue-router diff --git a/amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-tsc b/amoro-web/licenses/LICENSE-vue-tsc similarity index 100% rename from amoro-ams/amoro-ams-dashboard/licenses/LICENSE-vue-tsc rename to amoro-web/licenses/LICENSE-vue-tsc diff --git a/amoro-ams/amoro-ams-dashboard/mock/index.js b/amoro-web/mock/index.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/index.js rename to amoro-web/mock/index.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js b/amoro-web/mock/modules/catalogs.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js rename to amoro-web/mock/modules/catalogs.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/common.js b/amoro-web/mock/modules/common.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/common.js rename to amoro-web/mock/modules/common.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/database.js b/amoro-web/mock/modules/database.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/database.js rename to amoro-web/mock/modules/database.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/db.js b/amoro-web/mock/modules/db.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/db.js rename to amoro-web/mock/modules/db.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/optimize.js b/amoro-web/mock/modules/optimize.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/optimize.js rename to amoro-web/mock/modules/optimize.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/overview.js b/amoro-web/mock/modules/overview.js similarity index 79% rename from amoro-ams/amoro-ams-dashboard/mock/modules/overview.js rename to amoro-web/mock/modules/overview.js index f72fadd000..5b060e7564 100644 --- a/amoro-ams/amoro-ams-dashboard/mock/modules/overview.js +++ b/amoro-web/mock/modules/overview.js @@ -28,23 +28,10 @@ export default [ tableCnt: 37944, tableTotalSize: 10585900, totalCpu: '6', - totalMemory: 62464 + totalMemory: 62464000000 } }), }, - { - url: '/mock/ams/v1/overview/format', - method: 'get', - response: () => ({ - code: 200, - msg: 'success', - result: [ - { value: 70, name: 'Iceberg format' }, - { value: 20, name: 'Mixed-Iceberg' }, - { value: 10, name: 'Mixed-Hive format' }, - ] - }), - }, { url: '/mock/ams/v1/overview/optimizing', method: 'get', @@ -60,27 +47,6 @@ export default [ ] }), }, - { - url: '/mock/ams/v1/overview/operations', - method: 'get', - response: () => ({ - code: 200, - msg: 'success', - result: [ - { - tableIdentifier: { - catalog: 'test_catalog', - database: 'db', - tableName: 'user', - id: 1 - }, - tableName: 'test_catalog.db.user', - operation: `ALTER TABLE user RENAME COLUMN name TO user_name`, - ts: '1721353678000', - }, - ] - }), - }, { url: '/mock/ams/v1/overview/top', method: 'get', @@ -111,23 +77,23 @@ export default [ result: [{ ts: 1724119207500, totalCpu: 2, - totalMemory: 4048 + totalMemory: 4048000000 },{ ts: 1724122892000, totalCpu: 5, - totalMemory: 8096 + totalMemory: 8096000000 },{ ts: 1724126441000, totalCpu: 12, - totalMemory: 32492 + totalMemory: 32492000000 },{ ts: 1724130154000, totalCpu: 7, - totalMemory: 14462 + totalMemory: 14462000000 },{ ts: 1724133605600, totalCpu: 26, - totalMemory: 50176 + totalMemory: 50176000000 }] }), }, diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/settings.js b/amoro-web/mock/modules/settings.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/settings.js rename to amoro-web/mock/modules/settings.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/table.js b/amoro-web/mock/modules/table.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/table.js rename to amoro-web/mock/modules/table.js diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/terminal.js b/amoro-web/mock/modules/terminal.js similarity index 100% rename from amoro-ams/amoro-ams-dashboard/mock/modules/terminal.js rename to amoro-web/mock/modules/terminal.js diff --git a/amoro-ams/amoro-ams-dashboard/package.json b/amoro-web/package.json similarity index 100% rename from amoro-ams/amoro-ams-dashboard/package.json rename to amoro-web/package.json diff --git a/amoro-ams/amoro-ams-dashboard/pnpm-lock.yaml b/amoro-web/pnpm-lock.yaml similarity index 99% rename from amoro-ams/amoro-ams-dashboard/pnpm-lock.yaml rename to amoro-web/pnpm-lock.yaml index 83306db581..c90f1d0a46 100644 --- a/amoro-ams/amoro-ams-dashboard/pnpm-lock.yaml +++ b/amoro-web/pnpm-lock.yaml @@ -6318,4 +6318,4 @@ snapshots: zrender@5.5.0: dependencies: - tslib: 2.3.0 \ No newline at end of file + tslib: 2.3.0 diff --git a/amoro-ams/amoro-ams-dashboard/pom.xml b/amoro-web/pom.xml similarity index 97% rename from amoro-ams/amoro-ams-dashboard/pom.xml rename to amoro-web/pom.xml index 26129ad6b6..1c261ebf2d 100644 --- a/amoro-ams/amoro-ams-dashboard/pom.xml +++ b/amoro-web/pom.xml @@ -22,11 +22,11 @@ 4.0.0 org.apache.amoro - amoro-ams + amoro-parent 0.8-SNAPSHOT - amoro-ams-dashboard + amoro-web jar Amoro Project AMS Dashboard https://amoro.apache.org @@ -38,7 +38,7 @@ - amoro-ams-dashboard-${project.version} + amoro-web-${project.version} org.apache.maven.plugins diff --git a/amoro-ams/amoro-ams-dashboard/public/favicon-bak.ico b/amoro-web/public/favicon-bak.ico similarity index 100% rename from amoro-ams/amoro-ams-dashboard/public/favicon-bak.ico rename to amoro-web/public/favicon-bak.ico diff --git a/amoro-ams/amoro-ams-dashboard/public/favicon.ico b/amoro-web/public/favicon.ico similarity index 100% rename from amoro-ams/amoro-ams-dashboard/public/favicon.ico rename to amoro-web/public/favicon.ico diff --git a/amoro-ams/amoro-ams-dashboard/src/.gitkeep b/amoro-web/src/.gitkeep similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/.gitkeep rename to amoro-web/src/.gitkeep diff --git a/amoro-ams/amoro-ams-dashboard/src/App.vue b/amoro-web/src/App.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/App.vue rename to amoro-web/src/App.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/index.ts b/amoro-web/src/assets/icons/index.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/index.ts rename to amoro-web/src/assets/icons/index.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/amoro.svg b/amoro-web/src/assets/icons/svg/amoro.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/amoro.svg rename to amoro-web/src/assets/icons/svg/amoro.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/arctic.svg b/amoro-web/src/assets/icons/svg/arctic.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/arctic.svg rename to amoro-web/src/assets/icons/svg/arctic.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg b/amoro-web/src/assets/icons/svg/branch.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg rename to amoro-web/src/assets/icons/svg/branch.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/catalogs.svg b/amoro-web/src/assets/icons/svg/catalogs.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/catalogs.svg rename to amoro-web/src/assets/icons/svg/catalogs.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/database.svg b/amoro-web/src/assets/icons/svg/database.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/database.svg rename to amoro-web/src/assets/icons/svg/database.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/format.svg b/amoro-web/src/assets/icons/svg/format.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/format.svg rename to amoro-web/src/assets/icons/svg/format.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/hive.svg b/amoro-web/src/assets/icons/svg/hive.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/hive.svg rename to amoro-web/src/assets/icons/svg/hive.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/hudi.svg b/amoro-web/src/assets/icons/svg/hudi.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/hudi.svg rename to amoro-web/src/assets/icons/svg/hudi.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/iceberg.svg b/amoro-web/src/assets/icons/svg/iceberg.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/iceberg.svg rename to amoro-web/src/assets/icons/svg/iceberg.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizers.svg b/amoro-web/src/assets/icons/svg/optimizers.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizers.svg rename to amoro-web/src/assets/icons/svg/optimizers.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizing.svg b/amoro-web/src/assets/icons/svg/optimizing.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizing.svg rename to amoro-web/src/assets/icons/svg/optimizing.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/overview.svg b/amoro-web/src/assets/icons/svg/overview.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/overview.svg rename to amoro-web/src/assets/icons/svg/overview.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg b/amoro-web/src/assets/icons/svg/paimon.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg rename to amoro-web/src/assets/icons/svg/paimon.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/settings.svg b/amoro-web/src/assets/icons/svg/settings.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/settings.svg rename to amoro-web/src/assets/icons/svg/settings.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg b/amoro-web/src/assets/icons/svg/slide.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg rename to amoro-web/src/assets/icons/svg/slide.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqldebug.svg b/amoro-web/src/assets/icons/svg/sqldebug.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqldebug.svg rename to amoro-web/src/assets/icons/svg/sqldebug.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlinit.svg b/amoro-web/src/assets/icons/svg/sqlinit.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlinit.svg rename to amoro-web/src/assets/icons/svg/sqlinit.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlmax.svg b/amoro-web/src/assets/icons/svg/sqlmax.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlmax.svg rename to amoro-web/src/assets/icons/svg/sqlmax.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlpause.svg b/amoro-web/src/assets/icons/svg/sqlpause.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlpause.svg rename to amoro-web/src/assets/icons/svg/sqlpause.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tables.svg b/amoro-web/src/assets/icons/svg/tables.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tables.svg rename to amoro-web/src/assets/icons/svg/tables.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg b/amoro-web/src/assets/icons/svg/tag.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg rename to amoro-web/src/assets/icons/svg/tag.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/terminal.svg b/amoro-web/src/assets/icons/svg/terminal.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/terminal.svg rename to amoro-web/src/assets/icons/svg/terminal.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/Catalog-Service.png b/amoro-web/src/assets/images/Catalog-Service.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/Catalog-Service.png rename to amoro-web/src/assets/images/Catalog-Service.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/Infrastructure-Idependent.png b/amoro-web/src/assets/images/Infrastructure-Idependent.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/Infrastructure-Idependent.png rename to amoro-web/src/assets/images/Infrastructure-Idependent.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/Management-tools.png b/amoro-web/src/assets/images/Management-tools.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/Management-tools.png rename to amoro-web/src/assets/images/Management-tools.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/Multiple-Formats.png b/amoro-web/src/assets/images/Multiple-Formats.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/Multiple-Formats.png rename to amoro-web/src/assets/images/Multiple-Formats.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/Rich-Plugins.png b/amoro-web/src/assets/images/Rich-Plugins.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/Rich-Plugins.png rename to amoro-web/src/assets/images/Rich-Plugins.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/Self-managed.png b/amoro-web/src/assets/images/Self-managed.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/Self-managed.png rename to amoro-web/src/assets/images/Self-managed.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard.svg b/amoro-web/src/assets/images/arctic-dashboard.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard.svg rename to amoro-web/src/assets/images/arctic-dashboard.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard1.svg b/amoro-web/src/assets/images/arctic-dashboard1.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard1.svg rename to amoro-web/src/assets/images/arctic-dashboard1.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-introduce.png b/amoro-web/src/assets/images/arctic-introduce.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-introduce.png rename to amoro-web/src/assets/images/arctic-introduce.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/home-content.png b/amoro-web/src/assets/images/home-content.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/home-content.png rename to amoro-web/src/assets/images/home-content.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/introduce_arctic.png b/amoro-web/src/assets/images/introduce_arctic.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/introduce_arctic.png rename to amoro-web/src/assets/images/introduce_arctic.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/item-icon.png b/amoro-web/src/assets/images/item-icon.png similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/item-icon.png rename to amoro-web/src/assets/images/item-icon.png diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/logo-all1.svg b/amoro-web/src/assets/images/logo-all1.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/logo-all1.svg rename to amoro-web/src/assets/images/logo-all1.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/logo.svg b/amoro-web/src/assets/images/logo.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/logo.svg rename to amoro-web/src/assets/images/logo.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/logo1.svg b/amoro-web/src/assets/images/logo1.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/logo1.svg rename to amoro-web/src/assets/images/logo1.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/images/logo2.svg b/amoro-web/src/assets/images/logo2.svg similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/assets/images/logo2.svg rename to amoro-web/src/assets/images/logo2.svg diff --git a/amoro-ams/amoro-ams-dashboard/src/components/Layout.vue b/amoro-web/src/components/Layout.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/Layout.vue rename to amoro-web/src/components/Layout.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/Sidebar.vue b/amoro-web/src/components/Sidebar.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/Sidebar.vue rename to amoro-web/src/components/Sidebar.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue b/amoro-web/src/components/Topbar.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue rename to amoro-web/src/components/Topbar.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/VirtualRecycleScroller.vue b/amoro-web/src/components/VirtualRecycleScroller.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/VirtualRecycleScroller.vue rename to amoro-web/src/components/VirtualRecycleScroller.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/echarts/Chart.vue b/amoro-web/src/components/echarts/Chart.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/echarts/Chart.vue rename to amoro-web/src/components/echarts/Chart.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/echarts/index.ts b/amoro-web/src/components/echarts/index.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/echarts/index.ts rename to amoro-web/src/components/echarts/index.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/components/loading/index.ts b/amoro-web/src/components/loading/index.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/loading/index.ts rename to amoro-web/src/components/loading/index.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/components/loading/loading.vue b/amoro-web/src/components/loading/loading.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/loading/loading.vue rename to amoro-web/src/components/loading/loading.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/register.ts b/amoro-web/src/components/register.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/register.ts rename to amoro-web/src/components/register.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/components/sql-editor/editor-config.ts b/amoro-web/src/components/sql-editor/editor-config.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/sql-editor/editor-config.ts rename to amoro-web/src/components/sql-editor/editor-config.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/components/sql-editor/index.vue b/amoro-web/src/components/sql-editor/index.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/sql-editor/index.vue rename to amoro-web/src/components/sql-editor/index.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/svg-icon.vue b/amoro-web/src/components/svg-icon.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/svg-icon.vue rename to amoro-web/src/components/svg-icon.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue b/amoro-web/src/components/tables-sub-menu/CreateDB.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue rename to amoro-web/src/components/tables-sub-menu/CreateDB.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue b/amoro-web/src/components/tables-sub-menu/TablesMenu.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue rename to amoro-web/src/components/tables-sub-menu/TablesMenu.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/hooks/usePagination.ts b/amoro-web/src/hooks/usePagination.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/hooks/usePagination.ts rename to amoro-web/src/hooks/usePagination.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/hooks/usePlaceholder.ts b/amoro-web/src/hooks/usePlaceholder.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/hooks/usePlaceholder.ts rename to amoro-web/src/hooks/usePlaceholder.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/language/datetimeFormats.ts b/amoro-web/src/language/datetimeFormats.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/language/datetimeFormats.ts rename to amoro-web/src/language/datetimeFormats.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/language/en.ts b/amoro-web/src/language/en.ts similarity index 99% rename from amoro-ams/amoro-ams-dashboard/src/language/en.ts rename to amoro-web/src/language/en.ts index 4d77488591..24c2344ac1 100644 --- a/amoro-ams/amoro-ams-dashboard/src/language/en.ts +++ b/amoro-web/src/language/en.ts @@ -19,7 +19,7 @@ export default { overview: 'Overview', healthScore: 'Health Score', - unhealthTables: 'Unhealth Tables', + top10Tables: 'Top 10 Tables', latestOperations: 'Latest Operations', catalogs: 'Catalogs', catalog: 'Catalog', diff --git a/amoro-ams/amoro-ams-dashboard/src/language/i18n.ts b/amoro-web/src/language/i18n.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/language/i18n.ts rename to amoro-web/src/language/i18n.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/language/index.ts b/amoro-web/src/language/index.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/language/index.ts rename to amoro-web/src/language/index.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts b/amoro-web/src/language/zh.ts similarity index 99% rename from amoro-ams/amoro-ams-dashboard/src/language/zh.ts rename to amoro-web/src/language/zh.ts index 97140e1d01..8ac153c4cf 100644 --- a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts +++ b/amoro-web/src/language/zh.ts @@ -19,7 +19,7 @@ export default { overview: '总览', healthScore: '健康度', - unhealthTables: '非健康表', + top10Tables: '表TOP 10', latestOperations: '最近操作', catalogs: '目录', catalog: '目录', diff --git a/amoro-ams/amoro-ams-dashboard/src/main.ts b/amoro-web/src/main.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/main.ts rename to amoro-web/src/main.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/router/index.ts b/amoro-web/src/router/index.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/router/index.ts rename to amoro-web/src/router/index.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/services/global.service.ts b/amoro-web/src/services/global.service.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/services/global.service.ts rename to amoro-web/src/services/global.service.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/services/login.service.ts b/amoro-web/src/services/login.service.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/services/login.service.ts rename to amoro-web/src/services/login.service.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/services/optimize.service.ts b/amoro-web/src/services/optimize.service.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/services/optimize.service.ts rename to amoro-web/src/services/optimize.service.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/services/overview.service.ts b/amoro-web/src/services/overview.service.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/services/overview.service.ts rename to amoro-web/src/services/overview.service.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts b/amoro-web/src/services/setting.services.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts rename to amoro-web/src/services/setting.services.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/services/table.service.ts b/amoro-web/src/services/table.service.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/services/table.service.ts rename to amoro-web/src/services/table.service.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/services/terminal.service.ts b/amoro-web/src/services/terminal.service.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/services/terminal.service.ts rename to amoro-web/src/services/terminal.service.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/shims-vue.d.ts b/amoro-web/src/shims-vue.d.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/shims-vue.d.ts rename to amoro-web/src/shims-vue.d.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/store/index.ts b/amoro-web/src/store/index.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/store/index.ts rename to amoro-web/src/store/index.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/styles/ant-design.less b/amoro-web/src/styles/ant-design.less similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/styles/ant-design.less rename to amoro-web/src/styles/ant-design.less diff --git a/amoro-ams/amoro-ams-dashboard/src/styles/global.less b/amoro-web/src/styles/global.less similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/styles/global.less rename to amoro-web/src/styles/global.less diff --git a/amoro-ams/amoro-ams-dashboard/src/styles/index.less b/amoro-web/src/styles/index.less similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/styles/index.less rename to amoro-web/src/styles/index.less diff --git a/amoro-ams/amoro-ams-dashboard/src/styles/reset.less b/amoro-web/src/styles/reset.less similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/styles/reset.less rename to amoro-web/src/styles/reset.less diff --git a/amoro-ams/amoro-ams-dashboard/src/types/common.type.ts b/amoro-web/src/types/common.type.ts similarity index 99% rename from amoro-ams/amoro-ams-dashboard/src/types/common.type.ts rename to amoro-web/src/types/common.type.ts index 7cd8ad7421..6b89cf046a 100644 --- a/amoro-ams/amoro-ams-dashboard/src/types/common.type.ts +++ b/amoro-web/src/types/common.type.ts @@ -59,6 +59,7 @@ export interface IKeyAndValue { value: string } export interface IBaseDetailInfo { + optimizingStatus: string tableType: string tableName: string createTime: string diff --git a/amoro-ams/amoro-ams-dashboard/src/utils/chart.ts b/amoro-web/src/utils/chart.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/utils/chart.ts rename to amoro-web/src/utils/chart.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/utils/editor.ts b/amoro-web/src/utils/editor.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/utils/editor.ts rename to amoro-web/src/utils/editor.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/utils/index.ts b/amoro-web/src/utils/index.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/utils/index.ts rename to amoro-web/src/utils/index.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/utils/request.ts b/amoro-web/src/utils/request.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/utils/request.ts rename to amoro-web/src/utils/request.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/utils/sql.ts b/amoro-web/src/utils/sql.ts similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/utils/sql.ts rename to amoro-web/src/utils/sql.ts diff --git a/amoro-ams/amoro-ams-dashboard/src/views/404.vue b/amoro-web/src/views/404.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/404.vue rename to amoro-web/src/views/404.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/Home.vue b/amoro-web/src/views/Home.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/Home.vue rename to amoro-web/src/views/Home.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue b/amoro-web/src/views/catalogs/Detail.vue similarity index 99% rename from amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue rename to amoro-web/src/views/catalogs/Detail.vue index 61bc43066c..0dc7f70a6c 100644 --- a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue +++ b/amoro-web/src/views/catalogs/Detail.vue @@ -125,8 +125,7 @@ const tableFormatText = { } const storeSupportFormat: { [prop: string]: string[] } = { ams: [tableFormatMap.MIXED_ICEBERG, tableFormatMap.ICEBERG], - hive: [tableFormatMap.MIXED_HIVE, tableFormatMap.MIXED_ICEBERG, - tableFormatMap.ICEBERG, tableFormatMap.PAIMON, tableFormatMap.HUDI], + hive: [tableFormatMap.MIXED_HIVE, tableFormatMap.MIXED_ICEBERG, tableFormatMap.ICEBERG, tableFormatMap.PAIMON, tableFormatMap.HUDI], hadoop: [tableFormatMap.MIXED_ICEBERG, tableFormatMap.ICEBERG, tableFormatMap.PAIMON], glue: [tableFormatMap.MIXED_ICEBERG, tableFormatMap.ICEBERG], custom: [tableFormatMap.MIXED_ICEBERG, tableFormatMap.ICEBERG], diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Properties.vue b/amoro-web/src/views/catalogs/Properties.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/catalogs/Properties.vue rename to amoro-web/src/views/catalogs/Properties.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue b/amoro-web/src/views/catalogs/index.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue rename to amoro-web/src/views/catalogs/index.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Details.vue b/amoro-web/src/views/hive-details/components/Details.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Details.vue rename to amoro-web/src/views/hive-details/components/Details.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue b/amoro-web/src/views/hive-details/components/ErrorMsg.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue rename to amoro-web/src/views/hive-details/components/ErrorMsg.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Field.vue b/amoro-web/src/views/hive-details/components/Field.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Field.vue rename to amoro-web/src/views/hive-details/components/Field.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Partition.vue b/amoro-web/src/views/hive-details/components/Partition.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Partition.vue rename to amoro-web/src/views/hive-details/components/Partition.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Properties.vue b/amoro-web/src/views/hive-details/components/Properties.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Properties.vue rename to amoro-web/src/views/hive-details/components/Properties.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/index.vue b/amoro-web/src/views/hive-details/index.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/hive-details/index.vue rename to amoro-web/src/views/hive-details/index.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue b/amoro-web/src/views/hive-details/upgrade.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue rename to amoro-web/src/views/hive-details/upgrade.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/introduce/index-bakl.vue b/amoro-web/src/views/introduce/index-bakl.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/introduce/index-bakl.vue rename to amoro-web/src/views/introduce/index-bakl.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/introduce/index.vue b/amoro-web/src/views/introduce/index.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/introduce/index.vue rename to amoro-web/src/views/introduce/index.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/login/index.vue b/amoro-web/src/views/login/index.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/login/index.vue rename to amoro-web/src/views/login/index.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue b/amoro-web/src/views/optimize/components/List.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue rename to amoro-web/src/views/optimize/components/List.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue b/amoro-web/src/views/optimize/components/ScaleOut.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue rename to amoro-web/src/views/optimize/components/ScaleOut.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue b/amoro-web/src/views/optimize/index.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue rename to amoro-web/src/views/optimize/index.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/DataSizeCard.vue b/amoro-web/src/views/overview/components/DataSizeCard.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/overview/components/DataSizeCard.vue rename to amoro-web/src/views/overview/components/DataSizeCard.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/MultipleDataCard.vue b/amoro-web/src/views/overview/components/MultipleDataCard.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/overview/components/MultipleDataCard.vue rename to amoro-web/src/views/overview/components/MultipleDataCard.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/PieChartCard.vue b/amoro-web/src/views/overview/components/PieChartCard.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/overview/components/PieChartCard.vue rename to amoro-web/src/views/overview/components/PieChartCard.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/ResourceUsageCard.vue b/amoro-web/src/views/overview/components/ResourceUsageCard.vue similarity index 95% rename from amoro-ams/amoro-ams-dashboard/src/views/overview/components/ResourceUsageCard.vue rename to amoro-web/src/views/overview/components/ResourceUsageCard.vue index 42598268e1..426e915896 100644 --- a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/ResourceUsageCard.vue +++ b/amoro-web/src/views/overview/components/ResourceUsageCard.vue @@ -20,7 +20,7 @@ limitations under the License. import { useI18n } from 'vue-i18n' import { ref, onMounted } from 'vue'; import Chart from '@/components/echarts/Chart.vue' -import { mbToSize, dateFormat } from '@/utils' +import { bytesToSize, dateFormat } from '@/utils' import { getResourceUsageList } from '@/services/overview.service' import type { ResourceUsageItem } from '@/types/common.type' @@ -31,7 +31,7 @@ const loading = ref(false) function resourceFormatter(params: any[]): string { const cpuParam = params.find(p => p.seriesName === 'CPU'); const memoryParam = params.find(p => p.seriesName === 'Memory'); - const memorySize = mbToSize(memoryParam.value); + const memorySize = bytesToSize(memoryParam.value); let str = `${params[0].axisValue}
`; str += `CPU: ${cpuParam.value} Core
`; str += `Memory: ${memorySize}
`; @@ -47,7 +47,7 @@ const option = ref({ xAxis: { type: 'category', data: [''] }, yAxis: [ { type: 'value', name: 'CPU Core', axisLabel: { formatter: '{value}' } }, - { type: 'value', name: 'Memory', axisLabel: { formatter: (value: number) => { return `${mbToSize(value)}` } } } + { type: 'value', name: 'Memory', axisLabel: { formatter: (value: number) => { return `${bytesToSize(value)}` } } } ], series: [ { name: 'CPU', type: 'line', yAxisIndex: 0, data: [-1] }, diff --git a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/SingleDataCard.vue b/amoro-web/src/views/overview/components/SingleDataCard.vue similarity index 100% rename from amoro-ams/amoro-ams-dashboard/src/views/overview/components/SingleDataCard.vue rename to amoro-web/src/views/overview/components/SingleDataCard.vue diff --git a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/Top10TablesCard.vue b/amoro-web/src/views/overview/components/Top10TablesCard.vue similarity index 95% rename from amoro-ams/amoro-ams-dashboard/src/views/overview/components/Top10TablesCard.vue rename to amoro-web/src/views/overview/components/Top10TablesCard.vue index 2664ddd3f9..b137bda4d7 100644 --- a/amoro-ams/amoro-ams-dashboard/src/views/overview/components/Top10TablesCard.vue +++ b/amoro-web/src/views/overview/components/Top10TablesCard.vue @@ -17,10 +17,9 @@ limitations under the License. / -->