diff --git a/.github/labeler.yml b/.github/labeler.yml index 22eedc6f4c..e5d3a5afb5 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -57,13 +57,13 @@ - "ams/optimizer/**/*" "module:mixed-spark": - - "mixed/spark/**/*" + - "mixed-format/spark/**/*" "module:mixed-flink": - - "mixed/flink/**/*" + - "mixed-format/flink/**/*" "module:mixed-hive": - - "mixed/hive/**/*" + - "mixed-format/hive/**/*" "module:mixed-trino": - - "mixed/trino/**/*" \ No newline at end of file + - "mixed-format/trino/**/*" \ No newline at end of file diff --git a/.github/workflows/core-hadoop2-ci.yml b/.github/workflows/core-hadoop2-ci.yml index eba2d800b9..5c79b7c722 100644 --- a/.github/workflows/core-hadoop2-ci.yml +++ b/.github/workflows/core-hadoop2-ci.yml @@ -20,9 +20,9 @@ on: paths: - "ams/**" - "core/**" - - "mixed/flink/**" - - "mixed/hive/**" - - "mixed/spark/**" + - "mixed-format/flink/**" + - "mixed-format/hive/**" + - "mixed-format/spark/**" - "pom.xml" jobs: @@ -42,7 +42,7 @@ jobs: run: mvn validate - name: Build all module with Maven - run: mvn clean install -pl '!mixed/trino' -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2 + run: mvn clean install -pl '!mixed-format/trino' -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2 - name: Code coverage uses: codecov/codecov-action@v3 diff --git a/.github/workflows/core-hadoop3-ci.yml b/.github/workflows/core-hadoop3-ci.yml index 4a3d1fbb30..10736a47eb 100644 --- a/.github/workflows/core-hadoop3-ci.yml +++ b/.github/workflows/core-hadoop3-ci.yml @@ -20,9 +20,9 @@ on: paths: - "ams/**" - "core/**" - - "mixed/flink/**" - - "mixed/hive/**" - - "mixed/spark/**" + - "mixed-format/flink/**" + - "mixed-format/hive/**" + - "mixed-format/spark/**" - "pom.xml" jobs: @@ -42,7 +42,7 @@ jobs: run: mvn validate - name: Build all module with Maven - run: mvn clean install -pl '!mixed/trino' -Djacoco.flink.skip=true -B -ntp + run: mvn clean install -pl '!mixed-format/trino' -Djacoco.flink.skip=true -B -ntp - name: Code coverage uses: codecov/codecov-action@v3 diff --git a/.github/workflows/trino-ci.yml b/.github/workflows/trino-ci.yml index 3ab9082d83..117e57ba55 100644 --- a/.github/workflows/trino-ci.yml +++ b/.github/workflows/trino-ci.yml @@ -20,8 +20,8 @@ on: paths: - "ams/**" - "core/**" - - "mixed/hive/**" - - "mixed/trino/**" + - "mixed-format/hive/**" + - "mixed-format/trino/**" - "pom.xml" jobs: @@ -40,10 +40,10 @@ jobs: run: mvn validate -P trino-spotless - name: Install dependency with Maven - run: mvn clean install -DskipTests -pl 'ams/api,core,mixed/hive' -Dhadoop=v2 -am -B -P trino-spotless + run: mvn clean install -DskipTests -pl 'ams/api,core,mixed-format/hive' -Dhadoop=v2 -am -B -P trino-spotless - name: Build with Maven - run: mvn clean test -pl 'mixed/trino' -B -ntp -Dhadoop=v2 -P trino-spotless + run: mvn clean test -pl 'mixed-format/trino' -B -ntp -Dhadoop=v2 -P trino-spotless - name: Code coverage uses: codecov/codecov-action@v3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aa9d63cb1e..9120d50980 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,7 +79,7 @@ a [design document template](https://docs.google.com/document/d/1LeTyrlzQJfSs2Dk for reference. ## Building the Project Locally -Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed/trino` module). +Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed-format/trino` module). * To build Trino module need config `toolchains.xml` in `${user.home}/.m2/` dir, the content is @@ -101,15 +101,15 @@ Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed/trino` modu * To invoke a build and run tests: `mvn package -P toolchain` * To skip tests: `mvn -DskipTests package -P toolchain` -* To package without trino module and JAVA 17 dependency: `mvn clean package -DskipTests -pl '!mixed/trino'` +* To package without trino module and JAVA 17 dependency: `mvn clean package -DskipTests -pl '!mixed-format/trino'` * To build with hadoop 2.x(the default is 3.x) `mvn clean package -DskipTests -Dhadoop=v2` * To indicate Flink version for optimizer (the default is 1.18.1): `mvn clean package -Dflink-optimizer.flink-version=1.15.4`. If the version of Flink is below 1.15.0, you also need to add the `-Pflink-pre-1.15` parameter: `mvn clean package -Pflink-pre-1.15 -Dflink-optimizer.flink-version=1.14.6`. `mvn clean package -Pflink-pre-1.15 -Dflink-optimizer.flink-version=1.14.6 -DskipTests` >Spotless is skipped by default in `trino` module. So if you want to perform checkstyle when building `trino` module, you must be in a Java 17 environment. -* To invoke a build include `mixed/trino` module in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless` -* To only build `mixed/trino` and its dependent modules in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless -pl 'mixed/trino' -am` +* To invoke a build include `mixed-format/trino` module in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless` +* To only build `mixe-format/trino` and its dependent modules in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless -pl 'mixed-format/trino' -am` ## Code suggestions diff --git a/README.md b/README.md index aa23aedf16..949fb55836 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ Amoro contains modules as below: - `ams-dashboard` is the dashboard frontend for ams - `ams-server` is the backend server for ams - `ams-optimizer` provides default optimizer implementation -- `amoro-mixed` provides Mixed format implementation +- `amoro-mixed-format` provides Mixed format implementation - `amoro-hive` integrates with Apache Hive and implements Mixed Hive format - `amoro-flink` provides Flink connectors for Mixed format tables (use amoro-flink-runtime for a shaded version) - `amoro-spark` provides Spark connectors for Mixed format tables (use amoro-spark-runtime for a shaded version) @@ -111,7 +111,7 @@ Amoro contains modules as below: ## Building -Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed/trino` module). +Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed-format/trino` module). * To build Trino module need config `toolchains.xml` in `${user.home}/.m2/` dir, the content is @@ -133,15 +133,15 @@ Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed/trino` modu * To invoke a build and run tests: `mvn package -P toolchain` * To skip tests: `mvn -DskipTests package -P toolchain` -* To package without trino module and JAVA 17 dependency: `mvn clean package -DskipTests -pl '!mixed/trino'` +* To package without trino module and JAVA 17 dependency: `mvn clean package -DskipTests -pl '!mixed-format/trino'` * To build with hadoop 2.x(the default is 3.x) `mvn clean package -DskipTests -Dhadoop=v2` * To indicate Flink version for optimizer (the default is 1.18.1): `mvn clean package -Dflink-optimizer.flink-version=1.15.4`. If the version of Flink is below 1.15.0, you also need to add the `-Pflink-pre-1.15` parameter: `mvn clean package -Pflink-pre-1.15 -Dflink-optimizer.flink-version=1.14.6`. `mvn clean package -Pflink-pre-1.15 -Dflink-optimizer.flink-version=1.14.6 -DskipTests` >Spotless is skipped by default in `trino` module. So if you want to perform checkstyle when building `trino` module, you must be in a Java 17 environment. -* To invoke a build include `mixed/trino` module in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless` -* To only build `mixed/trino` and its dependent modules in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless -pl 'mixed/trino' -am` +* To invoke a build include `mixed-format/trino` module in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless` +* To only build `mixed-format/trino` and its dependent modules in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless -pl 'mixed-format/trino' -am` ## Quickstart Visit [https://amoro.netease.com/quick-demo/](https://amoro.netease.com/quick-demo/) to quickly diff --git a/ams/api/pom.xml b/ams/api/pom.xml index 15c7e6823d..383e45121f 100644 --- a/ams/api/pom.xml +++ b/ams/api/pom.xml @@ -36,54 +36,8 @@ - org.apache.thrift - libthrift - - - - org.apache.commons - commons-pool2 - - - - com.github.ben-manes.caffeine - caffeine - - - - org.apache.curator - curator-framework - - - - org.apache.curator - curator-recipes - - - - org.apache.iceberg - iceberg-bundled-guava - - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - org.slf4j - slf4j-api - - - ch.qos.logback - * - - - - - - com.alibaba - fastjson + com.netease.amoro + amoro-core @@ -110,97 +64,4 @@ commons-lang3 - - - ${basedir}/src/main/java - - - org.codehaus.mojo - build-helper-maven-plugin - ${maven-build-helper-plugin.version} - - - add-source - generate-sources - - add-source - - - - src/main/gen-java - - - - - - - - - org.apache.thrift.tools - maven-thrift-plugin - ${maven-thrift-plugin.version} - - src/main/gen-java - src/main/thrift - java - - - - org.apache.maven.plugins - maven-shade-plugin - - - create-shaded-jar - package - - shade - - - - - org.apache.zookeeper:* - org.apache.curator:* - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - org.apache.zookeeper - com.netease.arctic.shade.org.apache.zookeeper - - - - org.apache.curator - com.netease.arctic.shade.org.apache.curator - - - - - - - - - com.diffplug.spotless - spotless-maven-plugin - - - - src/main/gen-java/** - - - - - - - - diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/Action.java b/ams/api/src/main/java/com/netease/arctic/api/Action.java similarity index 81% rename from ams/api/src/main/java/com/netease/arctic/ams/api/Action.java rename to ams/api/src/main/java/com/netease/arctic/api/Action.java index 058ea11d0c..c50c150d08 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/Action.java +++ b/ams/api/src/main/java/com/netease/arctic/api/Action.java @@ -16,9 +16,10 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; -import com.netease.arctic.ams.api.process.TableProcessState; +import com.netease.arctic.api.process.TableProcess; +import com.netease.arctic.api.process.TableProcessState; import org.apache.iceberg.relocated.com.google.common.collect.Sets; import java.util.Collections; @@ -38,11 +39,10 @@ public enum Action { /** * Arbitrary actions are actions that can be handled by a single optimizer. The processes they * related to like refreshing, expiring, cleaning and syncing all share the same basic - * implementations which are {@link com.netease.arctic.ams.api.process.TableProcess} and {@link - * TableProcessState} and they won't have any spitted stages like optimizing processes(plan, - * execute, commit), so they can be easily triggered and managed. If you want to add a new action - * which is handled stand-alone, you should add it to this set, and you would find it's easy to - * implement the process and state. + * implementations which are {@link TableProcess} and {@link TableProcessState} and they won't + * have any spitted stages like optimizing processes(plan, execute, commit), so they can be easily + * triggered and managed. If you want to add a new action which is handled stand-alone, you should + * add it to this set, and you would find it's easy to implement the process and state. */ public static final Set ARBITRARY_ACTIONS = Collections.unmodifiableSet( diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/ActivePlugin.java b/ams/api/src/main/java/com/netease/arctic/api/ActivePlugin.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/ActivePlugin.java rename to ams/api/src/main/java/com/netease/arctic/api/ActivePlugin.java index d8631a6bab..923462f1ae 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/ActivePlugin.java +++ b/ams/api/src/main/java/com/netease/arctic/api/ActivePlugin.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; import java.util.Map; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/AmoroPlugin.java b/ams/api/src/main/java/com/netease/arctic/api/AmoroPlugin.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/AmoroPlugin.java rename to ams/api/src/main/java/com/netease/arctic/api/AmoroPlugin.java index a0a0446b54..bbfd3bc367 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/AmoroPlugin.java +++ b/ams/api/src/main/java/com/netease/arctic/api/AmoroPlugin.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; /** * Plugin interface for all pluggable services including MetricEmitter, TableProcessFactory, etc. diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/OptimizerProperties.java b/ams/api/src/main/java/com/netease/arctic/api/OptimizerProperties.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/OptimizerProperties.java rename to ams/api/src/main/java/com/netease/arctic/api/OptimizerProperties.java index f698497bf8..df459f5ae0 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/OptimizerProperties.java +++ b/ams/api/src/main/java/com/netease/arctic/api/OptimizerProperties.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; public class OptimizerProperties { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/ServerTableIdentifier.java b/ams/api/src/main/java/com/netease/arctic/api/ServerTableIdentifier.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/ServerTableIdentifier.java rename to ams/api/src/main/java/com/netease/arctic/api/ServerTableIdentifier.java index a8de222c5e..f7a94e08e0 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/ServerTableIdentifier.java +++ b/ams/api/src/main/java/com/netease/arctic/api/ServerTableIdentifier.java @@ -16,7 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; + +import com.netease.arctic.TableFormat; import java.util.Objects; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/StateField.java b/ams/api/src/main/java/com/netease/arctic/api/StateField.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/StateField.java rename to ams/api/src/main/java/com/netease/arctic/api/StateField.java index 56d6c12aa2..147c93deea 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/StateField.java +++ b/ams/api/src/main/java/com/netease/arctic/api/StateField.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/TableRuntime.java b/ams/api/src/main/java/com/netease/arctic/api/TableRuntime.java similarity index 80% rename from ams/api/src/main/java/com/netease/arctic/ams/api/TableRuntime.java rename to ams/api/src/main/java/com/netease/arctic/api/TableRuntime.java index bcd723ad86..e9410944b1 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/TableRuntime.java +++ b/ams/api/src/main/java/com/netease/arctic/api/TableRuntime.java @@ -16,18 +16,19 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; -import com.netease.arctic.ams.api.config.TableConfiguration; -import com.netease.arctic.ams.api.process.OptimizingState; -import com.netease.arctic.ams.api.process.TableProcessState; +import com.netease.arctic.api.config.TableConfiguration; +import com.netease.arctic.api.process.OptimizingState; +import com.netease.arctic.api.process.ProcessFactory; +import com.netease.arctic.api.process.TableProcessState; import java.util.List; /** * TableRuntime is the key interface for the AMS framework to interact with the table. Typically, it * is used to get the table's configuration, process states, and table identifier. The key usage is - * {@link com.netease.arctic.ams.api.process.ProcessFactory} to create and recover Process. + * {@link ProcessFactory} to create and recover Process. */ public interface TableRuntime { @@ -42,8 +43,8 @@ public interface TableRuntime { /** * Get the list of arbitrary process states. One arbitrary state belongs to one arbitrary process - * related to one {@link com.netease.arctic.ams.api.Action#ARBITRARY_ACTIONS}. There could be more - * than one arbitrary states depending on scheduler implementation. + * related to one {@link Action#ARBITRARY_ACTIONS}. There could be more than one arbitrary states + * depending on scheduler implementation. * * @return the list of arbitrary process states */ diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/config/DataExpirationConfig.java b/ams/api/src/main/java/com/netease/arctic/api/config/DataExpirationConfig.java similarity index 99% rename from ams/api/src/main/java/com/netease/arctic/ams/api/config/DataExpirationConfig.java rename to ams/api/src/main/java/com/netease/arctic/api/config/DataExpirationConfig.java index 9f77d42d90..aff7ba6233 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/config/DataExpirationConfig.java +++ b/ams/api/src/main/java/com/netease/arctic/api/config/DataExpirationConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.config; +package com.netease.arctic.api.config; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.apache.commons.lang3.StringUtils; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/config/OptimizingConfig.java b/ams/api/src/main/java/com/netease/arctic/api/config/OptimizingConfig.java similarity index 99% rename from ams/api/src/main/java/com/netease/arctic/ams/api/config/OptimizingConfig.java rename to ams/api/src/main/java/com/netease/arctic/api/config/OptimizingConfig.java index c8cb06c890..48906b733b 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/config/OptimizingConfig.java +++ b/ams/api/src/main/java/com/netease/arctic/api/config/OptimizingConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.config; +package com.netease.arctic.api.config; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/config/TableConfiguration.java b/ams/api/src/main/java/com/netease/arctic/api/config/TableConfiguration.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/config/TableConfiguration.java rename to ams/api/src/main/java/com/netease/arctic/api/config/TableConfiguration.java index 785ed798c0..e8b822ae47 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/config/TableConfiguration.java +++ b/ams/api/src/main/java/com/netease/arctic/api/config/TableConfiguration.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.config; +package com.netease.arctic.api.config; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.netease.arctic.ams.api.Action; +import com.netease.arctic.api.Action; import org.apache.iceberg.relocated.com.google.common.base.Objects; import java.util.HashMap; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/config/TagConfiguration.java b/ams/api/src/main/java/com/netease/arctic/api/config/TagConfiguration.java similarity index 99% rename from ams/api/src/main/java/com/netease/arctic/ams/api/config/TagConfiguration.java rename to ams/api/src/main/java/com/netease/arctic/api/config/TagConfiguration.java index 1c53952ea4..489a79770a 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/config/TagConfiguration.java +++ b/ams/api/src/main/java/com/netease/arctic/api/config/TagConfiguration.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.config; +package com.netease.arctic.api.config; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/events/Event.java b/ams/api/src/main/java/com/netease/arctic/api/events/Event.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/events/Event.java rename to ams/api/src/main/java/com/netease/arctic/api/events/Event.java index c6913a19bd..97864896ee 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/events/Event.java +++ b/ams/api/src/main/java/com/netease/arctic/api/events/Event.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.events; +package com.netease.arctic.api.events; /** * Standard event interface in Amoro domain this is a parallel concept with specific metrics data of diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/events/EventListener.java b/ams/api/src/main/java/com/netease/arctic/api/events/EventListener.java similarity index 92% rename from ams/api/src/main/java/com/netease/arctic/ams/api/events/EventListener.java rename to ams/api/src/main/java/com/netease/arctic/api/events/EventListener.java index fe6b8acefa..2ae4d4ed35 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/events/EventListener.java +++ b/ams/api/src/main/java/com/netease/arctic/api/events/EventListener.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.events; +package com.netease.arctic.api.events; -import com.netease.arctic.ams.api.ActivePlugin; +import com.netease.arctic.api.ActivePlugin; /** * This is an interface defining a reporter, which users can implement to notify event to a diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/events/EventType.java b/ams/api/src/main/java/com/netease/arctic/api/events/EventType.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/events/EventType.java rename to ams/api/src/main/java/com/netease/arctic/api/events/EventType.java index f0930d2260..49fa74b01e 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/events/EventType.java +++ b/ams/api/src/main/java/com/netease/arctic/api/events/EventType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.events; +package com.netease.arctic.api.events; /** Event types define */ public enum EventType { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/events/IcebergReportEvent.java b/ams/api/src/main/java/com/netease/arctic/api/events/IcebergReportEvent.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/events/IcebergReportEvent.java rename to ams/api/src/main/java/com/netease/arctic/api/events/IcebergReportEvent.java index f3548cf3e0..bf5764d62c 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/events/IcebergReportEvent.java +++ b/ams/api/src/main/java/com/netease/arctic/api/events/IcebergReportEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.events; +package com.netease.arctic.api.events; import org.apache.iceberg.metrics.MetricsReport; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/events/TableEvent.java b/ams/api/src/main/java/com/netease/arctic/api/events/TableEvent.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/events/TableEvent.java rename to ams/api/src/main/java/com/netease/arctic/api/events/TableEvent.java index 7eaedb41a7..ffb3deaaf8 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/events/TableEvent.java +++ b/ams/api/src/main/java/com/netease/arctic/api/events/TableEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.events; +package com.netease.arctic.api.events; /** An event associated with a table */ public interface TableEvent extends Event { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Counter.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/Counter.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Counter.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/Counter.java index 4de5db61ac..093f25173b 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Counter.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/Counter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; import java.util.concurrent.atomic.LongAdder; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Gauge.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/Gauge.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Gauge.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/Gauge.java index f53b90a611..459b18b779 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Gauge.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/Gauge.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; /** * A gauge metric is an instantaneous reading of a particular value. To instrument a queue's depth, diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Metric.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/Metric.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Metric.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/Metric.java index 9f69d0dbc5..29c757bfc2 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/Metric.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/Metric.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; /** Base interface for all amoro metric */ public interface Metric {} diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricDefine.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricDefine.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricDefine.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/MetricDefine.java index 5fe2469b43..0ee808ea39 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricDefine.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricDefine.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; import com.google.common.collect.Lists; import org.apache.iceberg.relocated.com.google.common.base.Joiner; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricDefines.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricDefines.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricDefines.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/MetricDefines.java index b1f5248cb1..4d589e77cf 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricDefines.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricDefines.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; /** All metric defines. */ public class MetricDefines {} diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricKey.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricKey.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricKey.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/MetricKey.java index 49aed8b900..03aa3199c3 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricKey.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricKey.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricRegisterListener.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricRegisterListener.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricRegisterListener.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/MetricRegisterListener.java index edb663f9a0..f5b7abcd29 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricRegisterListener.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricRegisterListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; /** A listener interface to respond to events related to metric registration. */ public interface MetricRegisterListener { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricReporter.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricReporter.java similarity index 94% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricReporter.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/MetricReporter.java index 0ef0b8d1fd..7f5448c547 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricReporter.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricReporter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; -import com.netease.arctic.ams.api.ActivePlugin; +import com.netease.arctic.api.ActivePlugin; /** * This interface define a collector, which users can fetch metrics and report to metrics monitor diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricSet.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricSet.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricSet.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/MetricSet.java index ca584696eb..d0cc0bf4d7 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricSet.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricSet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; import java.util.Map; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricType.java b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricType.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricType.java rename to ams/api/src/main/java/com/netease/arctic/api/metrics/MetricType.java index 7e97bce23a..bd2ed3966e 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/metrics/MetricType.java +++ b/ams/api/src/main/java/com/netease/arctic/api/metrics/MetricType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; /** Metric type defines. */ public enum MetricType { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/AmoroProcess.java b/ams/api/src/main/java/com/netease/arctic/api/process/AmoroProcess.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/AmoroProcess.java rename to ams/api/src/main/java/com/netease/arctic/api/process/AmoroProcess.java index ffba73a32c..31c653d01c 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/AmoroProcess.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/AmoroProcess.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; -import com.netease.arctic.ams.api.Action; +import com.netease.arctic.api.Action; import java.util.Map; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/OptimizingStage.java b/ams/api/src/main/java/com/netease/arctic/api/process/OptimizingStage.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/OptimizingStage.java rename to ams/api/src/main/java/com/netease/arctic/api/process/OptimizingStage.java index 475e318f36..115aa653a3 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/OptimizingStage.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/OptimizingStage.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; /** The stage of the optimizing process. */ public enum OptimizingStage { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/OptimizingState.java b/ams/api/src/main/java/com/netease/arctic/api/process/OptimizingState.java similarity index 92% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/OptimizingState.java rename to ams/api/src/main/java/com/netease/arctic/api/process/OptimizingState.java index 597944748f..e6b7307d66 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/OptimizingState.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/OptimizingState.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; -import com.netease.arctic.ams.api.Action; -import com.netease.arctic.ams.api.ServerTableIdentifier; -import com.netease.arctic.ams.api.StateField; +import com.netease.arctic.api.Action; +import com.netease.arctic.api.ServerTableIdentifier; +import com.netease.arctic.api.StateField; /** The state of the optimizing process. */ public abstract class OptimizingState extends TableProcessState { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/PendingInput.java b/ams/api/src/main/java/com/netease/arctic/api/process/PendingInput.java similarity index 99% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/PendingInput.java rename to ams/api/src/main/java/com/netease/arctic/api/process/PendingInput.java index 20ab33fea9..c596485fcd 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/PendingInput.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/PendingInput.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; import org.apache.iceberg.relocated.com.google.common.collect.Sets; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessFactory.java b/ams/api/src/main/java/com/netease/arctic/api/process/ProcessFactory.java similarity index 92% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessFactory.java rename to ams/api/src/main/java/com/netease/arctic/api/process/ProcessFactory.java index 52628e255e..83628f3e32 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessFactory.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/ProcessFactory.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; -import com.netease.arctic.ams.api.Action; -import com.netease.arctic.ams.api.TableRuntime; +import com.netease.arctic.api.Action; +import com.netease.arctic.api.TableRuntime; /** * A factory to create a process. Normally, There will be default ProcessFactories for each action diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessState.java b/ams/api/src/main/java/com/netease/arctic/api/process/ProcessState.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessState.java rename to ams/api/src/main/java/com/netease/arctic/api/process/ProcessState.java index e70c09dca5..c814677b8c 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessState.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/ProcessState.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; -import com.netease.arctic.ams.api.Action; +import com.netease.arctic.api.Action; import java.util.Map; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessStatus.java b/ams/api/src/main/java/com/netease/arctic/api/process/ProcessStatus.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessStatus.java rename to ams/api/src/main/java/com/netease/arctic/api/process/ProcessStatus.java index 48d38a3e32..ad0ac80572 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/ProcessStatus.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/ProcessStatus.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; /** * Status of any {@link AmoroProcess}. Only UNKNOWN, RUNNING, FINISHED(SUCCESS, CLOSED, FAILED) are diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/SimpleFuture.java b/ams/api/src/main/java/com/netease/arctic/api/process/SimpleFuture.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/SimpleFuture.java rename to ams/api/src/main/java/com/netease/arctic/api/process/SimpleFuture.java index 1e7bfdab15..e4435bb0f4 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/SimpleFuture.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/SimpleFuture.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/TableProcess.java b/ams/api/src/main/java/com/netease/arctic/api/process/TableProcess.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/TableProcess.java rename to ams/api/src/main/java/com/netease/arctic/api/process/TableProcess.java index b051abbd0f..28f1ee4c5b 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/TableProcess.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/TableProcess.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; -import com.netease.arctic.ams.api.TableRuntime; +import com.netease.arctic.api.TableRuntime; /** * An abstract table process to handle table state. diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/process/TableProcessState.java b/ams/api/src/main/java/com/netease/arctic/api/process/TableProcessState.java similarity index 94% rename from ams/api/src/main/java/com/netease/arctic/ams/api/process/TableProcessState.java rename to ams/api/src/main/java/com/netease/arctic/api/process/TableProcessState.java index a0a2d3f554..fa070345b6 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/process/TableProcessState.java +++ b/ams/api/src/main/java/com/netease/arctic/api/process/TableProcessState.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.process; +package com.netease.arctic.api.process; -import com.netease.arctic.ams.api.Action; -import com.netease.arctic.ams.api.ServerTableIdentifier; -import com.netease.arctic.ams.api.StateField; +import com.netease.arctic.api.Action; +import com.netease.arctic.api.ServerTableIdentifier; +import com.netease.arctic.api.StateField; import java.util.Map; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/Resource.java b/ams/api/src/main/java/com/netease/arctic/api/resource/Resource.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/resource/Resource.java rename to ams/api/src/main/java/com/netease/arctic/api/resource/Resource.java index 8d98d2ca6e..c551a00bef 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/Resource.java +++ b/ams/api/src/main/java/com/netease/arctic/api/resource/Resource.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.resource; +package com.netease.arctic.api.resource; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; +import com.netease.arctic.api.OptimizerRegisterInfo; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import java.math.BigInteger; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceContainer.java b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceContainer.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceContainer.java rename to ams/api/src/main/java/com/netease/arctic/api/resource/ResourceContainer.java index 468bbc02cb..7667edcde4 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceContainer.java +++ b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceContainer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.resource; +package com.netease.arctic.api.resource; import java.util.Map; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceGroup.java b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceGroup.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceGroup.java rename to ams/api/src/main/java/com/netease/arctic/api/resource/ResourceGroup.java index 17079a073e..cc9e5c9946 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceGroup.java +++ b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceGroup.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.resource; +package com.netease.arctic.api.resource; -import com.netease.arctic.ams.api.Constants; +import com.netease.arctic.Constants; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import java.util.HashMap; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceManager.java b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceManager.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceManager.java rename to ams/api/src/main/java/com/netease/arctic/api/resource/ResourceManager.java index 2f6aa5e7d5..337bad19bd 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceManager.java +++ b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.resource; +package com.netease.arctic.api.resource; import java.util.List; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceStatus.java b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceStatus.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceStatus.java rename to ams/api/src/main/java/com/netease/arctic/api/resource/ResourceStatus.java index f278af75d5..2f96bdbd09 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceStatus.java +++ b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceStatus.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.resource; +package com.netease.arctic.api.resource; public enum ResourceStatus { INITIALIZING, diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceType.java b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceType.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceType.java rename to ams/api/src/main/java/com/netease/arctic/api/resource/ResourceType.java index 045d0ed0ef..9991fb26b5 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/resource/ResourceType.java +++ b/ams/api/src/main/java/com/netease/arctic/api/resource/ResourceType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.resource; +package com.netease.arctic.api.resource; public enum ResourceType { OPTIMIZER(0); diff --git a/ams/api/src/test/java/com/netease/arctic/ams/api/MockZookeeperServer.java b/ams/api/src/test/java/com/netease/arctic/api/MockZookeeperServer.java similarity index 98% rename from ams/api/src/test/java/com/netease/arctic/ams/api/MockZookeeperServer.java rename to ams/api/src/test/java/com/netease/arctic/api/MockZookeeperServer.java index 5d444819e0..ecfac50e39 100644 --- a/ams/api/src/test/java/com/netease/arctic/ams/api/MockZookeeperServer.java +++ b/ams/api/src/test/java/com/netease/arctic/api/MockZookeeperServer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/ams/api/src/test/java/com/netease/arctic/ams/api/metrics/MetricDefineTest.java b/ams/api/src/test/java/com/netease/arctic/api/metrics/MetricDefineTest.java similarity index 98% rename from ams/api/src/test/java/com/netease/arctic/ams/api/metrics/MetricDefineTest.java rename to ams/api/src/test/java/com/netease/arctic/api/metrics/MetricDefineTest.java index 82f4d34a1e..b85497eef5 100644 --- a/ams/api/src/test/java/com/netease/arctic/ams/api/metrics/MetricDefineTest.java +++ b/ams/api/src/test/java/com/netease/arctic/api/metrics/MetricDefineTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/ams/api/src/test/java/com/netease/arctic/ams/api/metrics/TestMetricDefine.java b/ams/api/src/test/java/com/netease/arctic/api/metrics/TestMetricDefine.java similarity index 98% rename from ams/api/src/test/java/com/netease/arctic/ams/api/metrics/TestMetricDefine.java rename to ams/api/src/test/java/com/netease/arctic/api/metrics/TestMetricDefine.java index 8ab0729810..e4bcf7cdd1 100644 --- a/ams/api/src/test/java/com/netease/arctic/ams/api/metrics/TestMetricDefine.java +++ b/ams/api/src/test/java/com/netease/arctic/api/metrics/TestMetricDefine.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/ams/api/src/test/java/com/netease/arctic/ams/api/metrics/TestMetricKey.java b/ams/api/src/test/java/com/netease/arctic/api/metrics/TestMetricKey.java similarity index 98% rename from ams/api/src/test/java/com/netease/arctic/ams/api/metrics/TestMetricKey.java rename to ams/api/src/test/java/com/netease/arctic/api/metrics/TestMetricKey.java index 028b5eade1..4064dddf6c 100644 --- a/ams/api/src/test/java/com/netease/arctic/ams/api/metrics/TestMetricKey.java +++ b/ams/api/src/test/java/com/netease/arctic/api/metrics/TestMetricKey.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.metrics; +package com.netease.arctic.api.metrics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/MetricCollector.java b/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/MetricCollector.java index f032bb3377..044bba05b7 100644 --- a/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/MetricCollector.java +++ b/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/MetricCollector.java @@ -18,13 +18,13 @@ package com.netease.arctic.metrics.reporter.promethues; -import com.netease.arctic.ams.api.metrics.Counter; -import com.netease.arctic.ams.api.metrics.Gauge; -import com.netease.arctic.ams.api.metrics.Metric; -import com.netease.arctic.ams.api.metrics.MetricDefine; -import com.netease.arctic.ams.api.metrics.MetricKey; -import com.netease.arctic.ams.api.metrics.MetricSet; -import com.netease.arctic.ams.api.metrics.MetricType; +import com.netease.arctic.api.metrics.Counter; +import com.netease.arctic.api.metrics.Gauge; +import com.netease.arctic.api.metrics.Metric; +import com.netease.arctic.api.metrics.MetricDefine; +import com.netease.arctic.api.metrics.MetricKey; +import com.netease.arctic.api.metrics.MetricSet; +import com.netease.arctic.api.metrics.MetricType; import io.prometheus.client.Collector; import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.slf4j.Logger; diff --git a/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/PrometheusExporterMetricReporter.java b/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/PrometheusExporterMetricReporter.java index c1e3ee9682..7e9e02eb44 100644 --- a/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/PrometheusExporterMetricReporter.java +++ b/ams/metric-reporter/prometheus-reporter/src/main/java/com.netease.arctic.metrics.reporter.promethues/PrometheusExporterMetricReporter.java @@ -18,8 +18,8 @@ package com.netease.arctic.metrics.reporter.promethues; -import com.netease.arctic.ams.api.metrics.MetricReporter; -import com.netease.arctic.ams.api.metrics.MetricSet; +import com.netease.arctic.api.metrics.MetricReporter; +import com.netease.arctic.api.metrics.MetricSet; import io.prometheus.client.exporter.HTTPServer; import java.io.IOException; diff --git a/ams/optimizer/common/pom.xml b/ams/optimizer/common/pom.xml index 80b534b4e2..2006d22188 100644 --- a/ams/optimizer/common/pom.xml +++ b/ams/optimizer/common/pom.xml @@ -35,12 +35,12 @@ com.netease.amoro - amoro-core + amoro-ams-api com.netease.amoro - amoro-mixed-hive + amoro-mixed-format-hive diff --git a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/AbstractOptimizerOperator.java b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/AbstractOptimizerOperator.java index f71552bd47..5af63a55ed 100644 --- a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/AbstractOptimizerOperator.java +++ b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/AbstractOptimizerOperator.java @@ -18,10 +18,10 @@ package com.netease.arctic.optimizer.common; -import com.netease.arctic.ams.api.ArcticException; -import com.netease.arctic.ams.api.ErrorCodes; -import com.netease.arctic.ams.api.OptimizingService; -import com.netease.arctic.ams.api.client.OptimizingClientPools; +import com.netease.arctic.ErrorCodes; +import com.netease.arctic.api.ArcticException; +import com.netease.arctic.api.OptimizingService; +import com.netease.arctic.client.OptimizingClientPools; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.thrift.TApplicationException; import org.apache.thrift.TException; diff --git a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/Optimizer.java b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/Optimizer.java index b00c2ce026..c989ab7f0e 100644 --- a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/Optimizer.java +++ b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/Optimizer.java @@ -18,7 +18,7 @@ package com.netease.arctic.optimizer.common; -import com.netease.arctic.ams.api.OptimizerProperties; +import com.netease.arctic.api.OptimizerProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerConfig.java b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerConfig.java index adbb5547aa..266eb1faae 100644 --- a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerConfig.java +++ b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerConfig.java @@ -18,7 +18,7 @@ package com.netease.arctic.optimizer.common; -import com.netease.arctic.ams.api.OptimizerProperties; +import com.netease.arctic.api.OptimizerProperties; import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; diff --git a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerExecutor.java b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerExecutor.java index c0f75459ed..b72a447d16 100644 --- a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerExecutor.java +++ b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerExecutor.java @@ -18,8 +18,8 @@ package com.netease.arctic.optimizer.common; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskResult; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskResult; import com.netease.arctic.optimizing.OptimizingExecutor; import com.netease.arctic.optimizing.OptimizingExecutorFactory; import com.netease.arctic.optimizing.OptimizingInputProperties; diff --git a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerToucher.java b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerToucher.java index d161a4e636..0a1bd81ff3 100644 --- a/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerToucher.java +++ b/ams/optimizer/common/src/main/java/com/netease/arctic/optimizer/common/OptimizerToucher.java @@ -18,10 +18,10 @@ package com.netease.arctic.optimizer.common; -import com.netease.arctic.ams.api.ArcticException; -import com.netease.arctic.ams.api.ErrorCodes; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; +import com.netease.arctic.ErrorCodes; +import com.netease.arctic.api.ArcticException; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.OptimizerRegisterInfo; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.thrift.TException; import org.slf4j.Logger; diff --git a/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizer.java b/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizer.java index d56be2f20a..18643c5177 100644 --- a/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizer.java +++ b/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizer.java @@ -18,7 +18,7 @@ package com.netease.arctic.optimizer.common; -import com.netease.arctic.ams.api.OptimizingTaskResult; +import com.netease.arctic.api.OptimizingTaskResult; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerExecutor.java b/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerExecutor.java index 2b9df930d4..3ef90c6414 100644 --- a/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerExecutor.java +++ b/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerExecutor.java @@ -19,10 +19,10 @@ package com.netease.arctic.optimizer.common; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskId; -import com.netease.arctic.ams.api.OptimizingTaskResult; +import com.netease.arctic.api.OptimizerRegisterInfo; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskId; +import com.netease.arctic.api.OptimizingTaskResult; import com.netease.arctic.optimizing.BaseOptimizingInput; import com.netease.arctic.optimizing.OptimizingExecutor; import com.netease.arctic.optimizing.OptimizingExecutorFactory; diff --git a/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerToucher.java b/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerToucher.java index 0c547c870c..36c3aea03d 100644 --- a/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerToucher.java +++ b/ams/optimizer/common/src/test/java/com/netease/arctic/optimizer/common/TestOptimizerToucher.java @@ -19,8 +19,8 @@ package com.netease.arctic.optimizer.common; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.OptimizerRegisterInfo; import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; diff --git a/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkOptimizerExecutor.java b/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkOptimizerExecutor.java index dae29b4f3d..7b1559cb8f 100644 --- a/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkOptimizerExecutor.java +++ b/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkOptimizerExecutor.java @@ -19,8 +19,8 @@ package com.netease.arctic.optimizer.flink; import com.google.common.base.Strings; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskResult; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskResult; import com.netease.arctic.optimizer.common.OptimizerConfig; import com.netease.arctic.optimizer.common.OptimizerExecutor; import org.apache.flink.metrics.Counter; diff --git a/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkToucher.java b/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkToucher.java index 12b22a51fc..bf0e4f8adb 100644 --- a/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkToucher.java +++ b/ams/optimizer/flink-optimizer/src/main/java/com/netease/arctic/optimizer/flink/FlinkToucher.java @@ -18,7 +18,7 @@ package com.netease.arctic.optimizer.flink; -import com.netease.arctic.ams.api.resource.Resource; +import com.netease.arctic.api.resource.Resource; import com.netease.arctic.optimizer.common.OptimizerToucher; import org.apache.flink.runtime.execution.Environment; import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction; diff --git a/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizer.java b/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizer.java index 102b7f26b0..6e21e59cb0 100644 --- a/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizer.java +++ b/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizer.java @@ -18,7 +18,7 @@ package com.netease.arctic.optimizer.spark; -import com.netease.arctic.ams.api.resource.Resource; +import com.netease.arctic.api.resource.Resource; import com.netease.arctic.optimizer.common.Optimizer; import com.netease.arctic.optimizer.common.OptimizerConfig; import com.netease.arctic.optimizer.common.OptimizerToucher; diff --git a/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizerExecutor.java b/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizerExecutor.java index 9f6dbc9747..becf957990 100644 --- a/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizerExecutor.java +++ b/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizerExecutor.java @@ -18,8 +18,8 @@ package com.netease.arctic.optimizer.spark; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskResult; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskResult; import com.netease.arctic.optimizer.common.OptimizerConfig; import com.netease.arctic.optimizer.common.OptimizerExecutor; import com.netease.arctic.optimizing.RewriteFilesInput; diff --git a/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizingTaskFunction.java b/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizingTaskFunction.java index e3c95547fd..11c9e3bb7d 100644 --- a/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizingTaskFunction.java +++ b/ams/optimizer/spark-optimizer/src/main/java/com/netease/arctic/optimizer/spark/SparkOptimizingTaskFunction.java @@ -18,8 +18,8 @@ package com.netease.arctic.optimizer.spark; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskResult; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskResult; import com.netease.arctic.optimizer.common.OptimizerConfig; import com.netease.arctic.optimizer.common.OptimizerExecutor; import org.apache.spark.api.java.function.Function; diff --git a/ams/optimizer/standalone-optimizer/src/main/java/com/netease/arctic/optimizer/standalone/StandaloneOptimizer.java b/ams/optimizer/standalone-optimizer/src/main/java/com/netease/arctic/optimizer/standalone/StandaloneOptimizer.java index ab2e31f1cc..c079800641 100644 --- a/ams/optimizer/standalone-optimizer/src/main/java/com/netease/arctic/optimizer/standalone/StandaloneOptimizer.java +++ b/ams/optimizer/standalone-optimizer/src/main/java/com/netease/arctic/optimizer/standalone/StandaloneOptimizer.java @@ -18,7 +18,7 @@ package com.netease.arctic.optimizer.standalone; -import com.netease.arctic.ams.api.resource.Resource; +import com.netease.arctic.api.resource.Resource; import com.netease.arctic.optimizer.common.Optimizer; import com.netease.arctic.optimizer.common.OptimizerConfig; import org.kohsuke.args4j.CmdLineException; diff --git a/ams/server/pom.xml b/ams/server/pom.xml index 2d2025f39d..3e4fbf6868 100644 --- a/ams/server/pom.xml +++ b/ams/server/pom.xml @@ -38,12 +38,12 @@ com.netease.amoro - amoro-core + amoro-ams-api com.netease.amoro - amoro-mixed-hive + amoro-mixed-format-hive org.eclipse.jetty.orbit @@ -270,7 +270,7 @@ com.netease.amoro - amoro-mixed-spark-${terminal.spark.major.version} + amoro-mixed-format-spark-${terminal.spark.major.version} ${project.version} runtime @@ -308,7 +308,7 @@ com.netease.amoro - amoro-mixed-hive + amoro-mixed-format-hive ${project.version} test test-jar diff --git a/ams/server/src/main/java/com/netease/arctic/server/ArcticServiceContainer.java b/ams/server/src/main/java/com/netease/arctic/server/ArcticServiceContainer.java index 954f1e612c..9d42628b18 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/ArcticServiceContainer.java +++ b/ams/server/src/main/java/com/netease/arctic/server/ArcticServiceContainer.java @@ -22,10 +22,10 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.netease.arctic.ams.api.ArcticTableMetastore; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.OptimizingService; +import com.netease.arctic.Constants; +import com.netease.arctic.api.ArcticTableMetastore; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.OptimizingService; import com.netease.arctic.server.dashboard.DashboardServer; import com.netease.arctic.server.dashboard.response.ErrorResponse; import com.netease.arctic.server.dashboard.utils.AmsUtil; diff --git a/ams/server/src/main/java/com/netease/arctic/server/DefaultOptimizingService.java b/ams/server/src/main/java/com/netease/arctic/server/DefaultOptimizingService.java index ee7e24c165..872dfe9729 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/DefaultOptimizingService.java +++ b/ams/server/src/main/java/com/netease/arctic/server/DefaultOptimizingService.java @@ -19,16 +19,16 @@ package com.netease.arctic.server; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; -import com.netease.arctic.ams.api.OptimizingService; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskId; -import com.netease.arctic.ams.api.OptimizingTaskResult; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; -import com.netease.arctic.ams.api.resource.Resource; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.OptimizerRegisterInfo; +import com.netease.arctic.api.OptimizingService; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskId; +import com.netease.arctic.api.OptimizingTaskResult; +import com.netease.arctic.api.resource.Resource; +import com.netease.arctic.api.resource.ResourceGroup; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.exception.ForbiddenException; import com.netease.arctic.server.exception.ObjectNotExistsException; import com.netease.arctic.server.exception.PluginRetryAuthException; diff --git a/ams/server/src/main/java/com/netease/arctic/server/HighAvailabilityContainer.java b/ams/server/src/main/java/com/netease/arctic/server/HighAvailabilityContainer.java index 3d13cc36bf..66a0a8d2a1 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/HighAvailabilityContainer.java +++ b/ams/server/src/main/java/com/netease/arctic/server/HighAvailabilityContainer.java @@ -19,8 +19,8 @@ package com.netease.arctic.server; import com.alibaba.fastjson.JSONObject; -import com.netease.arctic.ams.api.client.AmsServerInfo; -import com.netease.arctic.ams.api.properties.AmsHAProperties; +import com.netease.arctic.client.AmsServerInfo; +import com.netease.arctic.properties.AmsHAProperties; import com.netease.arctic.server.utils.Configurations; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/ams/server/src/main/java/com/netease/arctic/server/RestCatalogService.java b/ams/server/src/main/java/com/netease/arctic/server/RestCatalogService.java index b1ef1b3669..e9cee3a248 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/RestCatalogService.java +++ b/ams/server/src/main/java/com/netease/arctic/server/RestCatalogService.java @@ -31,9 +31,9 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.events.IcebergReportEvent; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.events.IcebergReportEvent; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.catalog.InternalCatalog; import com.netease.arctic.server.catalog.ServerCatalog; import com.netease.arctic.server.exception.ObjectNotExistsException; @@ -43,7 +43,7 @@ import com.netease.arctic.server.table.TableService; import com.netease.arctic.server.table.internal.InternalTableCreator; import com.netease.arctic.server.table.internal.InternalTableHandler; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.TablePropertyUtil; import io.javalin.apibuilder.EndpointGroup; import io.javalin.http.ContentType; @@ -435,7 +435,7 @@ private InternalCatalog getCatalog(String catalog) { ServerCatalog internalCatalog = tableService.getServerCatalog(catalog); Preconditions.checkArgument( internalCatalog instanceof InternalCatalog, "The catalog is not an iceberg rest catalog"); - Set tableFormats = CatalogUtil.tableFormats(internalCatalog.getMetadata()); + Set tableFormats = ArcticCatalogUtil.tableFormats(internalCatalog.getMetadata()); Preconditions.checkArgument( tableFormats.size() == 1 && (tableFormats.contains(TableFormat.ICEBERG) diff --git a/ams/server/src/main/java/com/netease/arctic/server/TableManagementService.java b/ams/server/src/main/java/com/netease/arctic/server/TableManagementService.java index b005edb6b8..8d2454bbf8 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/TableManagementService.java +++ b/ams/server/src/main/java/com/netease/arctic/server/TableManagementService.java @@ -18,16 +18,16 @@ package com.netease.arctic.server; -import com.netease.arctic.ams.api.ArcticTableMetastore; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.Blocker; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.NoSuchObjectException; -import com.netease.arctic.ams.api.OperationConflictException; -import com.netease.arctic.ams.api.TableCommitMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableIdentifier; -import com.netease.arctic.ams.api.TableMeta; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.ArcticTableMetastore; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.Blocker; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.NoSuchObjectException; +import com.netease.arctic.api.OperationConflictException; +import com.netease.arctic.api.TableCommitMeta; +import com.netease.arctic.api.TableIdentifier; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.server.table.ServerTableIdentifier; import com.netease.arctic.server.table.TableMetadata; import com.netease.arctic.server.table.TableService; diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogBuilder.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogBuilder.java index dbacecd723..d6dd5ed0c4 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogBuilder.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogBuilder.java @@ -18,16 +18,16 @@ package com.netease.arctic.server.catalog; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_AMS; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_CUSTOM; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_GLUE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HADOOP; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HIVE; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_AMS; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_CUSTOM; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_GLUE; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_HADOOP; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_HIVE; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.server.utils.Configurations; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.relocated.com.google.common.base.Joiner; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; @@ -56,7 +56,7 @@ public class CatalogBuilder { public static ServerCatalog buildServerCatalog( CatalogMeta catalogMeta, Configurations serverConfiguration) { String type = catalogMeta.getCatalogType(); - Set tableFormats = CatalogUtil.tableFormats(catalogMeta); + Set tableFormats = ArcticCatalogUtil.tableFormats(catalogMeta); Preconditions.checkState( formatSupportedMatrix.containsKey(type), "unsupported catalog type: %s", type); diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogService.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogService.java index 61839fbb79..873487b72e 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogService.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/CatalogService.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.catalog; -import com.netease.arctic.ams.api.CatalogMeta; +import com.netease.arctic.api.CatalogMeta; import java.util.List; diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/ExternalCatalog.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/ExternalCatalog.java index 1535dd72e0..c58abe330e 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/ExternalCatalog.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/ExternalCatalog.java @@ -20,15 +20,15 @@ import com.netease.arctic.AmoroTable; import com.netease.arctic.CommonUnifiedCatalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableIDWithFormat; import com.netease.arctic.UnifiedCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.persistence.mapper.TableMetaMapper; import com.netease.arctic.server.table.ServerTableIdentifier; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import java.util.ArrayList; @@ -46,7 +46,7 @@ public class ExternalCatalog extends ServerCatalog { protected ExternalCatalog(CatalogMeta metadata) { super(metadata); - this.tableMetaStore = CatalogUtil.buildMetaStore(metadata); + this.tableMetaStore = ArcticCatalogUtil.buildMetaStore(metadata); this.unifiedCatalog = this.tableMetaStore.doAs( () -> new CommonUnifiedCatalog(this::getMetadata, Maps.newHashMap())); @@ -76,7 +76,7 @@ public void disposeTable(String database, String tableName) { @Override public void updateMetadata(CatalogMeta metadata) { super.updateMetadata(metadata); - this.tableMetaStore = CatalogUtil.buildMetaStore(metadata); + this.tableMetaStore = ArcticCatalogUtil.buildMetaStore(metadata); this.unifiedCatalog.refresh(); updateDatabaseFilter(metadata); updateTableFilter(metadata); diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalCatalog.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalCatalog.java index 6bdca666aa..3157366cf3 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalCatalog.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalCatalog.java @@ -18,10 +18,10 @@ package com.netease.arctic.server.catalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableIDWithFormat; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.server.exception.AlreadyExistsException; import com.netease.arctic.server.exception.IllegalMetadataException; import com.netease.arctic.server.exception.ObjectNotExistsException; diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalIcebergCatalogImpl.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalIcebergCatalogImpl.java index c08e2f04f2..5777fee7c7 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalIcebergCatalogImpl.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalIcebergCatalogImpl.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.catalog; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.formats.iceberg.IcebergTable; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.server.ArcticManagementConf; @@ -33,7 +33,7 @@ import com.netease.arctic.server.table.internal.InternalTableHandler; import com.netease.arctic.server.utils.Configurations; import com.netease.arctic.server.utils.InternalTableUtil; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.BaseTable; import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.TableOperations; @@ -100,7 +100,7 @@ public AmoroTable loadTable(String database, String tableName) { return IcebergTable.newIcebergTable( tableIdentifier, table, - CatalogUtil.buildMetaStore(getMetadata()), + ArcticCatalogUtil.buildMetaStore(getMetadata()), getMetadata().getCatalogProperties()); } diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalMixedCatalogImpl.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalMixedCatalogImpl.java index 9d194b910f..022ecda7a3 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalMixedCatalogImpl.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/InternalMixedCatalogImpl.java @@ -21,8 +21,8 @@ import static com.netease.arctic.server.table.internal.InternalTableConstants.CHANGE_STORE_TABLE_NAME_SUFFIX; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.formats.mixed.MixedTable; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.mixed.InternalMixedIcebergCatalog; diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/MixedHiveCatalogImpl.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/MixedHiveCatalogImpl.java index 4d4bbcd7df..cda5f91908 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/MixedHiveCatalogImpl.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/MixedHiveCatalogImpl.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.catalog; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.MixedTables; import com.netease.arctic.formats.mixed.MixedTable; import com.netease.arctic.hive.CachedHiveClientPool; @@ -30,7 +30,7 @@ import com.netease.arctic.server.table.TableMetadata; import com.netease.arctic.server.table.internal.InternalTableCreator; import com.netease.arctic.server.table.internal.InternalTableHandler; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.iceberg.rest.requests.CreateTableRequest; import org.apache.thrift.TException; @@ -45,7 +45,7 @@ protected MixedHiveCatalogImpl(CatalogMeta catalogMeta) { super(catalogMeta); this.tables = new MixedHiveTables( - catalogMeta.getCatalogProperties(), CatalogUtil.buildMetaStore(catalogMeta)); + catalogMeta.getCatalogProperties(), ArcticCatalogUtil.buildMetaStore(catalogMeta)); hiveClientPool = ((MixedHiveTables) tables()).getHiveClientPool(); } @@ -54,7 +54,8 @@ public void updateMetadata(CatalogMeta metadata) { super.updateMetadata(metadata); hiveClientPool = ((MixedHiveTables) tables()).getHiveClientPool(); this.tables = - new MixedHiveTables(metadata.getCatalogProperties(), CatalogUtil.buildMetaStore(metadata)); + new MixedHiveTables( + metadata.getCatalogProperties(), ArcticCatalogUtil.buildMetaStore(metadata)); } @Override diff --git a/ams/server/src/main/java/com/netease/arctic/server/catalog/ServerCatalog.java b/ams/server/src/main/java/com/netease/arctic/server/catalog/ServerCatalog.java index b38595f110..f49373a121 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/catalog/ServerCatalog.java +++ b/ams/server/src/main/java/com/netease/arctic/server/catalog/ServerCatalog.java @@ -20,7 +20,7 @@ import com.netease.arctic.AmoroTable; import com.netease.arctic.TableIDWithFormat; -import com.netease.arctic.ams.api.CatalogMeta; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.server.exception.IllegalMetadataException; import com.netease.arctic.server.persistence.PersistentBase; import com.netease.arctic.server.persistence.mapper.CatalogMetaMapper; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/FormatTableDescriptor.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/FormatTableDescriptor.java index e328655888..acb37d1703 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/FormatTableDescriptor.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/FormatTableDescriptor.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.dashboard; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.server.dashboard.model.AmoroSnapshotsOfTable; import com.netease.arctic.server.dashboard.model.DDLInfo; import com.netease.arctic.server.dashboard.model.OperationType; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/MixedAndIcebergTableDescriptor.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/MixedAndIcebergTableDescriptor.java index 960492eb97..181cb5a283 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/MixedAndIcebergTableDescriptor.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/MixedAndIcebergTableDescriptor.java @@ -21,8 +21,8 @@ import static com.netease.arctic.server.dashboard.utils.AmsUtil.byteToXB; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.CommitMetaProducer; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CommitMetaProducer; import com.netease.arctic.data.DataFileType; import com.netease.arctic.data.FileNameRules; import com.netease.arctic.server.dashboard.component.reverser.DDLReverser; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/PaimonTableDescriptor.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/PaimonTableDescriptor.java index 2fa880b04b..1317e204fe 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/PaimonTableDescriptor.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/PaimonTableDescriptor.java @@ -22,8 +22,8 @@ import static org.apache.paimon.operation.FileStoreScan.Plan.groupByPartFiles; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.CommitMetaProducer; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CommitMetaProducer; import com.netease.arctic.data.DataFileType; import com.netease.arctic.server.dashboard.component.reverser.DDLReverser; import com.netease.arctic.server.dashboard.component.reverser.PaimonTableMetaExtract; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/ServerTableDescriptor.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/ServerTableDescriptor.java index 18d217acfa..9993e96919 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/ServerTableDescriptor.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/ServerTableDescriptor.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.dashboard; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.server.catalog.ServerCatalog; import com.netease.arctic.server.dashboard.model.AmoroSnapshotsOfTable; import com.netease.arctic.server.dashboard.model.DDLInfo; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/CatalogController.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/CatalogController.java index 3cef477a32..a7382bcc54 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/CatalogController.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/CatalogController.java @@ -18,39 +18,39 @@ package com.netease.arctic.server.dashboard.controller; -import static com.netease.arctic.ams.api.TableFormat.ICEBERG; -import static com.netease.arctic.ams.api.TableFormat.MIXED_HIVE; -import static com.netease.arctic.ams.api.TableFormat.MIXED_ICEBERG; -import static com.netease.arctic.ams.api.TableFormat.PAIMON; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_ACCESS_KEY; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_HADOOP_USERNAME; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_KEYTAB; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_KRB5; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_PRINCIPAL; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_SECRET_KEY; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_TYPE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_VALUE_TYPE_AK_SK; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_VALUE_TYPE_KERBEROS; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.AUTH_CONFIGS_VALUE_TYPE_SIMPLE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_AMS; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_CUSTOM; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_GLUE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HADOOP; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HIVE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.KEY_WAREHOUSE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_CORE_SITE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_ENDPOINT; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_HDFS_SITE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_HIVE_SITE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_REGION; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_TYPE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HADOOP; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_S3; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.TABLE_FORMATS; - -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import static com.netease.arctic.TableFormat.ICEBERG; +import static com.netease.arctic.TableFormat.MIXED_HIVE; +import static com.netease.arctic.TableFormat.MIXED_ICEBERG; +import static com.netease.arctic.TableFormat.PAIMON; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_ACCESS_KEY; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_HADOOP_USERNAME; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_KEYTAB; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_KRB5; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_PRINCIPAL; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_SECRET_KEY; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_KEY_TYPE; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_VALUE_TYPE_AK_SK; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_VALUE_TYPE_KERBEROS; +import static com.netease.arctic.properties.CatalogMetaProperties.AUTH_CONFIGS_VALUE_TYPE_SIMPLE; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_AMS; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_CUSTOM; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_GLUE; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_HADOOP; +import static com.netease.arctic.properties.CatalogMetaProperties.CATALOG_TYPE_HIVE; +import static com.netease.arctic.properties.CatalogMetaProperties.KEY_WAREHOUSE; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_CORE_SITE; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_ENDPOINT; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_HDFS_SITE; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_HIVE_SITE; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_REGION; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_TYPE; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HADOOP; +import static com.netease.arctic.properties.CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_S3; +import static com.netease.arctic.properties.CatalogMetaProperties.TABLE_FORMATS; + +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.ArcticManagementConf; import com.netease.arctic.server.catalog.InternalCatalog; import com.netease.arctic.server.catalog.ServerCatalog; @@ -63,7 +63,7 @@ import com.netease.arctic.server.dashboard.utils.PropertiesUtil; import com.netease.arctic.server.table.TableService; import com.netease.arctic.table.TableProperties; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import io.javalin.http.Context; import org.apache.commons.lang.StringUtils; import org.apache.iceberg.CatalogProperties; @@ -236,12 +236,12 @@ private void fillAuthConfigs2CatalogMeta( AUTH_CONFIGS_KEY_PRINCIPAL, serverAuthConfig.get(AUTH_CONFIGS_KEY_PRINCIPAL)); break; case AUTH_CONFIGS_VALUE_TYPE_AK_SK: - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( serverAuthConfig, catalogMeta.getCatalogProperties(), AUTH_CONFIGS_KEY_ACCESS_KEY, S3FileIOProperties.ACCESS_KEY_ID); - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( serverAuthConfig, catalogMeta.getCatalogProperties(), AUTH_CONFIGS_KEY_SECRET_KEY, @@ -282,12 +282,12 @@ private Map extractAuthConfigsFromCatalogMeta( catalogName, CONFIG_TYPE_AUTH, AUTH_CONFIGS_KEY_KRB5.replace("\\.", "-")))); break; case AUTH_CONFIGS_VALUE_TYPE_AK_SK: - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( catalogMeta.getCatalogProperties(), serverAuthConfig, S3FileIOProperties.ACCESS_KEY_ID, AUTH_CONFIGS_KEY_ACCESS_KEY); - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( catalogMeta.getCatalogProperties(), serverAuthConfig, S3FileIOProperties.SECRET_ACCESS_KEY, @@ -302,7 +302,7 @@ private Map extractStorageConfigsFromCatalogMeta( String catalogName, CatalogMeta catalogMeta) { Map storageConfig = new HashMap<>(); Map config = catalogMeta.getStorageConfigs(); - String storageType = CatalogUtil.getCompatibleStorageType(config); + String storageType = ArcticCatalogUtil.getCompatibleStorageType(config); storageConfig.put(STORAGE_CONFIGS_KEY_TYPE, storageType); if (STORAGE_CONFIGS_VALUE_TYPE_HADOOP.equals(storageType)) { storageConfig.put( @@ -332,12 +332,12 @@ private Map extractStorageConfigsFromCatalogMeta( CONFIG_TYPE_STORAGE, STORAGE_CONFIGS_KEY_HIVE_SITE.replace("\\.", "-")))); } else if (STORAGE_CONFIGS_VALUE_TYPE_S3.equals(storageType)) { - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( catalogMeta.getCatalogProperties(), storageConfig, AwsClientProperties.CLIENT_REGION, STORAGE_CONFIGS_KEY_REGION); - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( catalogMeta.getCatalogProperties(), storageConfig, S3FileIOProperties.ENDPOINT, @@ -405,12 +405,12 @@ private CatalogMeta constructCatalogMeta(CatalogRegisterInfo info, CatalogMeta o } } } else if (storageType.equals(STORAGE_CONFIGS_VALUE_TYPE_S3)) { - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( info.getStorageConfig(), catalogMeta.getCatalogProperties(), STORAGE_CONFIGS_KEY_REGION, AwsClientProperties.CLIENT_REGION); - CatalogUtil.copyProperty( + ArcticCatalogUtil.copyProperty( info.getStorageConfig(), catalogMeta.getCatalogProperties(), STORAGE_CONFIGS_KEY_ENDPOINT, diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/OptimizerController.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/OptimizerController.java index 11367a61da..e7bcf5e918 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/OptimizerController.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/OptimizerController.java @@ -21,9 +21,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Preconditions; -import com.netease.arctic.ams.api.resource.Resource; -import com.netease.arctic.ams.api.resource.ResourceGroup; -import com.netease.arctic.ams.api.resource.ResourceType; +import com.netease.arctic.api.resource.Resource; +import com.netease.arctic.api.resource.ResourceGroup; +import com.netease.arctic.api.resource.ResourceType; import com.netease.arctic.server.DefaultOptimizingService; import com.netease.arctic.server.dashboard.model.OptimizerResourceInfo; import com.netease.arctic.server.dashboard.model.TableOptimizingInfo; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/SettingController.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/SettingController.java index 150fe1fdb7..ebcc1bcb17 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/SettingController.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/SettingController.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.dashboard.controller; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.resource.ResourceGroup; import com.netease.arctic.server.ArcticManagementConf; import com.netease.arctic.server.dashboard.response.OkResponse; import com.netease.arctic.server.resource.ContainerMetadata; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/TableController.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/TableController.java index 70ecbb3ce9..8d5f6ee595 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/TableController.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/controller/TableController.java @@ -18,9 +18,9 @@ package com.netease.arctic.server.dashboard.controller; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.Constants; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.CatalogLoader; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.catalog.ArcticHiveCatalog; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/model/OptimizerResourceInfo.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/model/OptimizerResourceInfo.java index a8475616c3..ca311e9428 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/model/OptimizerResourceInfo.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/model/OptimizerResourceInfo.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.dashboard.model; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.resource.ResourceGroup; public class OptimizerResourceInfo { private ResourceGroup resourceGroup; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/AmsUtil.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/AmsUtil.java index 24175231a7..fad3aa0033 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/AmsUtil.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/AmsUtil.java @@ -25,8 +25,8 @@ import static com.netease.arctic.server.ArcticManagementConf.SERVER_EXPOSE_HOST; import static com.netease.arctic.server.ArcticManagementConf.TABLE_SERVICE_THRIFT_BIND_PORT; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.Constants; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.server.utils.Configurations; import java.io.File; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/PropertiesUtil.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/PropertiesUtil.java index ef5bb9ba10..d6194789f5 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/PropertiesUtil.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/PropertiesUtil.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.dashboard.utils; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import java.util.Map; diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/TableStatCollector.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/TableStatCollector.java index 53e820c7ff..1657a1f462 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/TableStatCollector.java +++ b/ams/server/src/main/java/com/netease/arctic/server/dashboard/utils/TableStatCollector.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.dashboard.utils; -import com.netease.arctic.ams.api.Constants; +import com.netease.arctic.Constants; import com.netease.arctic.server.dashboard.model.FilesStatistics; import com.netease.arctic.server.dashboard.model.SnapshotInfo; import com.netease.arctic.server.dashboard.model.TableStatistics; diff --git a/ams/server/src/main/java/com/netease/arctic/server/events/LoggingEventListener.java b/ams/server/src/main/java/com/netease/arctic/server/events/LoggingEventListener.java index 22b10a54bd..26ba156494 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/events/LoggingEventListener.java +++ b/ams/server/src/main/java/com/netease/arctic/server/events/LoggingEventListener.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.events; -import com.netease.arctic.ams.api.events.Event; -import com.netease.arctic.ams.api.events.EventListener; +import com.netease.arctic.api.events.Event; +import com.netease.arctic.api.events.EventListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ams/server/src/main/java/com/netease/arctic/server/exception/AlreadyExistsException.java b/ams/server/src/main/java/com/netease/arctic/server/exception/AlreadyExistsException.java index cd58181167..fe2404ce0b 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/exception/AlreadyExistsException.java +++ b/ams/server/src/main/java/com/netease/arctic/server/exception/AlreadyExistsException.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.exception; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.api.TableIdentifier; public class AlreadyExistsException extends ArcticRuntimeException { public AlreadyExistsException(String object) { diff --git a/ams/server/src/main/java/com/netease/arctic/server/exception/ArcticRuntimeException.java b/ams/server/src/main/java/com/netease/arctic/server/exception/ArcticRuntimeException.java index ae28154805..b2b833f166 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/exception/ArcticRuntimeException.java +++ b/ams/server/src/main/java/com/netease/arctic/server/exception/ArcticRuntimeException.java @@ -18,13 +18,13 @@ package com.netease.arctic.server.exception; -import com.netease.arctic.ams.api.ArcticException; -import com.netease.arctic.ams.api.ErrorCodes; -import com.netease.arctic.ams.api.InvalidObjectException; -import com.netease.arctic.ams.api.MetaException; -import com.netease.arctic.ams.api.NoSuchObjectException; -import com.netease.arctic.ams.api.OperationConflictException; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.ErrorCodes; +import com.netease.arctic.api.ArcticException; +import com.netease.arctic.api.InvalidObjectException; +import com.netease.arctic.api.MetaException; +import com.netease.arctic.api.NoSuchObjectException; +import com.netease.arctic.api.OperationConflictException; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.server.table.ServerTableIdentifier; import org.apache.thrift.TException; @@ -121,7 +121,7 @@ public static TException normalizeCompatibly(Throwable throwable) { if (throwable.getClass().equals(ObjectNotExistsException.class)) { return new NoSuchObjectException(throwable.getMessage()); } else if (throwable.getClass().equals(AlreadyExistsException.class)) { - return new com.netease.arctic.ams.api.AlreadyExistsException(throwable.getMessage()); + return new com.netease.arctic.api.AlreadyExistsException(throwable.getMessage()); } else if (throwable.getClass().equals(IllegalMetadataException.class) || throwable.getClass().equals(PersistenceException.class)) { return new MetaException(throwable.getMessage()); diff --git a/ams/server/src/main/java/com/netease/arctic/server/exception/IllegalTaskStateException.java b/ams/server/src/main/java/com/netease/arctic/server/exception/IllegalTaskStateException.java index df66ca1145..4cc726a7ef 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/exception/IllegalTaskStateException.java +++ b/ams/server/src/main/java/com/netease/arctic/server/exception/IllegalTaskStateException.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.exception; -import com.netease.arctic.ams.api.OptimizingTaskId; +import com.netease.arctic.api.OptimizingTaskId; import com.netease.arctic.server.optimizing.TaskRuntime; public class IllegalTaskStateException extends ArcticRuntimeException { diff --git a/ams/server/src/main/java/com/netease/arctic/server/exception/ObjectNotExistsException.java b/ams/server/src/main/java/com/netease/arctic/server/exception/ObjectNotExistsException.java index a8ac2981ea..4cc83b8dce 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/exception/ObjectNotExistsException.java +++ b/ams/server/src/main/java/com/netease/arctic/server/exception/ObjectNotExistsException.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.exception; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.server.table.ServerTableIdentifier; public class ObjectNotExistsException extends ArcticRuntimeException { diff --git a/ams/server/src/main/java/com/netease/arctic/server/exception/TaskNotFoundException.java b/ams/server/src/main/java/com/netease/arctic/server/exception/TaskNotFoundException.java index f88d368a2f..64fb3dbf94 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/exception/TaskNotFoundException.java +++ b/ams/server/src/main/java/com/netease/arctic/server/exception/TaskNotFoundException.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.exception; -import com.netease.arctic.ams.api.OptimizingTaskId; +import com.netease.arctic.api.OptimizingTaskId; public class TaskNotFoundException extends ArcticRuntimeException { private final OptimizingTaskId taskId; diff --git a/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractPluginManager.java b/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractPluginManager.java index 2c015533f0..a644f3c2bf 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractPluginManager.java +++ b/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractPluginManager.java @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.netease.arctic.ams.api.ActivePlugin; +import com.netease.arctic.api.ActivePlugin; import com.netease.arctic.server.Environments; import com.netease.arctic.server.exception.AlreadyExistsException; import com.netease.arctic.server.exception.LoadingPluginException; diff --git a/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractResourceContainer.java b/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractResourceContainer.java index 4f88dc91be..3d4280eb7a 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractResourceContainer.java +++ b/ams/server/src/main/java/com/netease/arctic/server/manager/AbstractResourceContainer.java @@ -18,10 +18,10 @@ package com.netease.arctic.server.manager; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.resource.Resource; -import com.netease.arctic.ams.api.resource.ResourceContainer; -import com.netease.arctic.ams.api.resource.ResourceStatus; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.resource.Resource; +import com.netease.arctic.api.resource.ResourceContainer; +import com.netease.arctic.api.resource.ResourceStatus; import org.apache.commons.lang3.StringUtils; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; diff --git a/ams/server/src/main/java/com/netease/arctic/server/manager/EventsManager.java b/ams/server/src/main/java/com/netease/arctic/server/manager/EventsManager.java index 57a975dd0f..271d8ff93a 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/manager/EventsManager.java +++ b/ams/server/src/main/java/com/netease/arctic/server/manager/EventsManager.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.manager; -import com.netease.arctic.ams.api.events.Event; -import com.netease.arctic.ams.api.events.EventListener; +import com.netease.arctic.api.events.Event; +import com.netease.arctic.api.events.EventListener; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; diff --git a/ams/server/src/main/java/com/netease/arctic/server/manager/FlinkOptimizerContainer.java b/ams/server/src/main/java/com/netease/arctic/server/manager/FlinkOptimizerContainer.java index 0fc60de8bf..a6b778daaa 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/manager/FlinkOptimizerContainer.java +++ b/ams/server/src/main/java/com/netease/arctic/server/manager/FlinkOptimizerContainer.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.manager; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.resource.Resource; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.resource.Resource; import org.apache.commons.lang3.StringUtils; import org.apache.curator.shaded.com.google.common.annotations.VisibleForTesting; import org.apache.iceberg.relocated.com.google.common.base.Function; diff --git a/ams/server/src/main/java/com/netease/arctic/server/manager/LocalOptimizerContainer.java b/ams/server/src/main/java/com/netease/arctic/server/manager/LocalOptimizerContainer.java index 87bb384411..d8de2600c1 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/manager/LocalOptimizerContainer.java +++ b/ams/server/src/main/java/com/netease/arctic/server/manager/LocalOptimizerContainer.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.manager; -import com.netease.arctic.ams.api.resource.Resource; +import com.netease.arctic.api.resource.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ams/server/src/main/java/com/netease/arctic/server/manager/MetricManager.java b/ams/server/src/main/java/com/netease/arctic/server/manager/MetricManager.java index c84a45232d..c05315f88f 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/manager/MetricManager.java +++ b/ams/server/src/main/java/com/netease/arctic/server/manager/MetricManager.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.manager; -import com.netease.arctic.ams.api.metrics.MetricRegisterListener; -import com.netease.arctic.ams.api.metrics.MetricReporter; +import com.netease.arctic.api.metrics.MetricRegisterListener; +import com.netease.arctic.api.metrics.MetricReporter; import com.netease.arctic.server.metrics.MetricRegistry; /** Metric plugins manager and registry */ diff --git a/ams/server/src/main/java/com/netease/arctic/server/manager/PluginManager.java b/ams/server/src/main/java/com/netease/arctic/server/manager/PluginManager.java index 0899be50bc..9b7f81f3fe 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/manager/PluginManager.java +++ b/ams/server/src/main/java/com/netease/arctic/server/manager/PluginManager.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.manager; -import com.netease.arctic.ams.api.AmoroPlugin; +import com.netease.arctic.api.AmoroPlugin; import java.util.List; diff --git a/ams/server/src/main/java/com/netease/arctic/server/metrics/MetricRegistry.java b/ams/server/src/main/java/com/netease/arctic/server/metrics/MetricRegistry.java index bc2d721b4b..1c8425cc9b 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/metrics/MetricRegistry.java +++ b/ams/server/src/main/java/com/netease/arctic/server/metrics/MetricRegistry.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.metrics; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.metrics.*; +import com.netease.arctic.api.metrics.*; import org.apache.commons.lang3.tuple.Pair; import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/KeyedTableCommit.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/KeyedTableCommit.java index 84ebc25b29..f53c26350a 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/KeyedTableCommit.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/KeyedTableCommit.java @@ -22,7 +22,7 @@ import static com.netease.arctic.hive.op.UpdateHiveFiles.SYNC_DATA_TO_HIVE; import static com.netease.arctic.server.ArcticServiceConstants.INVALID_SNAPSHOT_ID; -import com.netease.arctic.ams.api.CommitMetaProducer; +import com.netease.arctic.api.CommitMetaProducer; import com.netease.arctic.data.DataFileType; import com.netease.arctic.data.PrimaryKeyedFile; import com.netease.arctic.hive.utils.TableTypeUtil; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizerGroupMetrics.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizerGroupMetrics.java index 56635f72e0..919f2fcc0c 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizerGroupMetrics.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizerGroupMetrics.java @@ -18,17 +18,17 @@ package com.netease.arctic.server.optimizing; -import static com.netease.arctic.ams.api.metrics.MetricDefine.defineGauge; +import static com.netease.arctic.api.metrics.MetricDefine.defineGauge; import static com.netease.arctic.server.optimizing.OptimizingStatus.PENDING; import static com.netease.arctic.server.optimizing.OptimizingStatus.PLANNING; import static com.netease.arctic.server.optimizing.TaskRuntime.Status.ACKED; import static com.netease.arctic.server.optimizing.TaskRuntime.Status.PLANNED; import static com.netease.arctic.server.optimizing.TaskRuntime.Status.SCHEDULED; -import com.netease.arctic.ams.api.metrics.Gauge; -import com.netease.arctic.ams.api.metrics.Metric; -import com.netease.arctic.ams.api.metrics.MetricDefine; -import com.netease.arctic.ams.api.metrics.MetricKey; +import com.netease.arctic.api.metrics.Gauge; +import com.netease.arctic.api.metrics.Metric; +import com.netease.arctic.api.metrics.MetricDefine; +import com.netease.arctic.api.metrics.MetricKey; import com.netease.arctic.server.metrics.MetricRegistry; import com.netease.arctic.server.resource.OptimizerInstance; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizingQueue.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizingQueue.java index e2ac295074..43ddc411c1 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizingQueue.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizingQueue.java @@ -19,9 +19,9 @@ package com.netease.arctic.server.optimizing; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.OptimizingTaskId; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.OptimizingTaskId; +import com.netease.arctic.api.resource.ResourceGroup; import com.netease.arctic.optimizing.RewriteFilesInput; import com.netease.arctic.server.ArcticServiceConstants; import com.netease.arctic.server.exception.OptimizingClosedException; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/SchedulingPolicy.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/SchedulingPolicy.java index a7fb6e5ffe..f385f0f299 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/SchedulingPolicy.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/SchedulingPolicy.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.resource.ResourceGroup; import com.netease.arctic.server.table.ServerTableIdentifier; import com.netease.arctic.server.table.TableRuntime; import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java index 94994e9baf..039201e31d 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java @@ -19,9 +19,9 @@ package com.netease.arctic.server.optimizing; import com.google.common.collect.Sets; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskId; -import com.netease.arctic.ams.api.OptimizingTaskResult; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskId; +import com.netease.arctic.api.OptimizingTaskResult; import com.netease.arctic.optimizing.RewriteFilesInput; import com.netease.arctic.optimizing.RewriteFilesOutput; import com.netease.arctic.server.ArcticServiceConstants; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/UnKeyedTableCommit.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/UnKeyedTableCommit.java index e2cdb7c449..8d72b67f6f 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/UnKeyedTableCommit.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/UnKeyedTableCommit.java @@ -22,7 +22,7 @@ import static com.netease.arctic.hive.op.UpdateHiveFiles.SYNC_DATA_TO_HIVE; import static com.netease.arctic.server.ArcticServiceConstants.INVALID_SNAPSHOT_ID; -import com.netease.arctic.ams.api.CommitMetaProducer; +import com.netease.arctic.api.CommitMetaProducer; import com.netease.arctic.data.FileNameRules; import com.netease.arctic.hive.HMSClientPool; import com.netease.arctic.hive.HiveTableProperties; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/IcebergTableMaintainer.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/IcebergTableMaintainer.java index a6258c70cd..c468ad585f 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/IcebergTableMaintainer.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/IcebergTableMaintainer.java @@ -20,7 +20,7 @@ import static org.apache.iceberg.relocated.com.google.common.primitives.Longs.min; -import com.netease.arctic.ams.api.CommitMetaProducer; +import com.netease.arctic.api.CommitMetaProducer; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.PathInfo; import com.netease.arctic.io.SupportsFileSystemOperations; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/TableMaintainer.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/TableMaintainer.java index c6f06c365d..b520d5472c 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/TableMaintainer.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/maintainer/TableMaintainer.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.optimizing.maintainer; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.server.table.TableRuntime; import com.netease.arctic.table.ArcticTable; import org.apache.iceberg.Table; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingEvaluator.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingEvaluator.java index 52797e5ef8..55ffbccd88 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingEvaluator.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingEvaluator.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.optimizing.plan; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.hive.table.SupportHive; import com.netease.arctic.server.optimizing.scan.IcebergTableFileScanHelper; import com.netease.arctic.server.optimizing.scan.KeyedTableFileScanHelper; diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingPlanner.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingPlanner.java index c89d0feaec..149d773594 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingPlanner.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/plan/OptimizingPlanner.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.optimizing.plan; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.hive.table.SupportHive; import com.netease.arctic.server.ArcticServiceConstants; import com.netease.arctic.server.optimizing.OptimizingType; diff --git a/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/CatalogMetaMapper.java b/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/CatalogMetaMapper.java index 6a63e26f4a..b5dbb6486f 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/CatalogMetaMapper.java +++ b/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/CatalogMetaMapper.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.persistence.mapper; -import com.netease.arctic.ams.api.CatalogMeta; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.server.persistence.converter.Map2StringConverter; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; diff --git a/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/ResourceMapper.java b/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/ResourceMapper.java index 7b3884690f..835dedf765 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/ResourceMapper.java +++ b/ams/server/src/main/java/com/netease/arctic/server/persistence/mapper/ResourceMapper.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.persistence.mapper; -import com.netease.arctic.ams.api.resource.Resource; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.resource.Resource; +import com.netease.arctic.api.resource.ResourceGroup; import com.netease.arctic.server.persistence.converter.Long2TsConverter; import com.netease.arctic.server.persistence.converter.Map2StringConverter; import com.netease.arctic.server.resource.OptimizerInstance; diff --git a/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerInstance.java b/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerInstance.java index 3379be2d5e..3985c2b862 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerInstance.java +++ b/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerInstance.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.resource; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; -import com.netease.arctic.ams.api.resource.Resource; +import com.netease.arctic.api.OptimizerRegisterInfo; +import com.netease.arctic.api.resource.Resource; import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; import java.util.UUID; diff --git a/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerManager.java b/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerManager.java index 2f31a63ac4..bcaea0486c 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerManager.java +++ b/ams/server/src/main/java/com/netease/arctic/server/resource/OptimizerManager.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.resource; -import com.netease.arctic.ams.api.resource.ResourceManager; +import com.netease.arctic.api.resource.ResourceManager; import java.util.List; diff --git a/ams/server/src/main/java/com/netease/arctic/server/resource/ResourceContainers.java b/ams/server/src/main/java/com/netease/arctic/server/resource/ResourceContainers.java index e8b8224a9e..5c3d279466 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/resource/ResourceContainers.java +++ b/ams/server/src/main/java/com/netease/arctic/server/resource/ResourceContainers.java @@ -20,7 +20,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.resource.ResourceContainer; +import com.netease.arctic.api.resource.ResourceContainer; import java.util.List; import java.util.Map; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/DefaultTableService.java b/ams/server/src/main/java/com/netease/arctic/server/table/DefaultTableService.java index 4b52a968f6..e26654fada 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/DefaultTableService.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/DefaultTableService.java @@ -25,12 +25,12 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.netease.arctic.AmoroTable; import com.netease.arctic.NoSuchTableException; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableIDWithFormat; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.Blocker; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.Blocker; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.server.ArcticManagementConf; import com.netease.arctic.server.catalog.CatalogBuilder; import com.netease.arctic.server.catalog.ExternalCatalog; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/RuntimeHandlerChain.java b/ams/server/src/main/java/com/netease/arctic/server/table/RuntimeHandlerChain.java index 139f44fcbf..24fb8844a9 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/RuntimeHandlerChain.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/RuntimeHandlerChain.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.table; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.server.optimizing.OptimizingStatus; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.slf4j.Logger; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/ServerTableIdentifier.java b/ams/server/src/main/java/com/netease/arctic/server/table/ServerTableIdentifier.java index efc198af41..fa52ff2069 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/ServerTableIdentifier.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/ServerTableIdentifier.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.table; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.TableIdentifier; import java.util.Objects; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/TableMetadata.java b/ams/server/src/main/java/com/netease/arctic/server/table/TableMetadata.java index 2dbb69aeda..2dce05be52 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/TableMetadata.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/TableMetadata.java @@ -21,11 +21,11 @@ import static com.netease.arctic.table.PrimaryKeySpec.PRIMARY_KEY_COLUMN_JOIN_DELIMITER; import com.google.common.annotations.VisibleForTesting; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; -import com.netease.arctic.ams.api.properties.MetaTableProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableMeta; +import com.netease.arctic.properties.CatalogMetaProperties; +import com.netease.arctic.properties.MetaTableProperties; import com.netease.arctic.server.dashboard.utils.PropertiesUtil; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableMetaStore; @@ -110,8 +110,7 @@ public TableMeta buildTableMeta() { meta.setProperties(newProperties); if (StringUtils.isNotBlank(primaryKey)) { - com.netease.arctic.ams.api.PrimaryKeySpec keySpec = - new com.netease.arctic.ams.api.PrimaryKeySpec(); + com.netease.arctic.api.PrimaryKeySpec keySpec = new com.netease.arctic.api.PrimaryKeySpec(); List fields = Arrays.stream(primaryKey.split(PRIMARY_KEY_COLUMN_JOIN_DELIMITER)) .collect(Collectors.toList()); diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/TableMetrics.java b/ams/server/src/main/java/com/netease/arctic/server/table/TableMetrics.java index ea685274f9..29369fa4bd 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/TableMetrics.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/TableMetrics.java @@ -18,12 +18,12 @@ package com.netease.arctic.server.table; -import static com.netease.arctic.ams.api.metrics.MetricDefine.defineGauge; +import static com.netease.arctic.api.metrics.MetricDefine.defineGauge; -import com.netease.arctic.ams.api.metrics.Gauge; -import com.netease.arctic.ams.api.metrics.Metric; -import com.netease.arctic.ams.api.metrics.MetricDefine; -import com.netease.arctic.ams.api.metrics.MetricKey; +import com.netease.arctic.api.metrics.Gauge; +import com.netease.arctic.api.metrics.Metric; +import com.netease.arctic.api.metrics.MetricDefine; +import com.netease.arctic.api.metrics.MetricKey; import com.netease.arctic.server.metrics.MetricRegistry; import com.netease.arctic.server.optimizing.OptimizingStatus; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java b/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java index a2edbad3a7..40ae6f10e0 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.table; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.BlockableOperation; import com.netease.arctic.server.ArcticServiceConstants; import com.netease.arctic.server.exception.BlockerConflictException; import com.netease.arctic.server.exception.ObjectNotExistsException; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntimeMeta.java b/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntimeMeta.java index 4a42ea8d50..b396f3329a 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntimeMeta.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntimeMeta.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.table; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.server.optimizing.OptimizingProcess; import com.netease.arctic.server.optimizing.OptimizingStatus; import com.netease.arctic.server.optimizing.OptimizingType; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/TableService.java b/ams/server/src/main/java/com/netease/arctic/server/table/TableService.java index 98e859a508..2d26c66784 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/TableService.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/TableService.java @@ -19,9 +19,9 @@ package com.netease.arctic.server.table; import com.netease.arctic.TableIDWithFormat; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.Blocker; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.Blocker; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.server.catalog.CatalogService; import java.util.List; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/blocker/TableBlocker.java b/ams/server/src/main/java/com/netease/arctic/server/table/blocker/TableBlocker.java index aa6361e5f2..3baaea0e03 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/blocker/TableBlocker.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/blocker/TableBlocker.java @@ -18,7 +18,8 @@ package com.netease.arctic.server.table.blocker; -import com.netease.arctic.ams.api.BlockableOperation; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.Blocker; import com.netease.arctic.server.table.ServerTableIdentifier; import com.netease.arctic.table.blocker.RenewableBlocker; import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; @@ -86,13 +87,13 @@ public void setProperties(Map properties) { this.properties = properties; } - public com.netease.arctic.ams.api.Blocker buildBlocker() { + public Blocker buildBlocker() { Map properties = this.properties == null ? Maps.newHashMap() : this.properties; properties.put(RenewableBlocker.CREATE_TIME_PROPERTY, createTime + ""); properties.put(RenewableBlocker.EXPIRATION_TIME_PROPERTY, expirationTime + ""); List operations = getOperations().stream().map(BlockableOperation::valueOf).collect(Collectors.toList()); - return new com.netease.arctic.ams.api.Blocker(blockerId + "", operations, properties); + return new Blocker(blockerId + "", operations, properties); } @Override diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/executor/TagsAutoCreatingExecutor.java b/ams/server/src/main/java/com/netease/arctic/server/table/executor/TagsAutoCreatingExecutor.java index 01e4d9ea52..852bdf53bc 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/executor/TagsAutoCreatingExecutor.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/executor/TagsAutoCreatingExecutor.java @@ -21,7 +21,7 @@ import static com.netease.arctic.server.optimizing.maintainer.TableMaintainer.ofTable; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.server.optimizing.maintainer.TableMaintainer; import com.netease.arctic.server.table.TableConfiguration; import com.netease.arctic.server.table.TableManager; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergCreator.java b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergCreator.java index 2b18918c16..bf7e03fb46 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergCreator.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergCreator.java @@ -21,12 +21,12 @@ import static com.netease.arctic.server.table.internal.InternalTableConstants.PROPERTIES_METADATA_LOCATION; import static com.netease.arctic.server.utils.InternalTableUtil.genNewMetadataFileLocation; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; -import com.netease.arctic.ams.api.properties.MetaTableProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.io.ArcticFileIO; +import com.netease.arctic.properties.CatalogMetaProperties; +import com.netease.arctic.properties.MetaTableProperties; import com.netease.arctic.server.table.ServerTableIdentifier; import com.netease.arctic.server.table.TableMetadata; import com.netease.arctic.server.utils.InternalTableUtil; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergHandler.java b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergHandler.java index be8838c6f8..8a4b67cc09 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergHandler.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalIcebergHandler.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.table.internal; -import com.netease.arctic.ams.api.CatalogMeta; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.server.table.TableMetadata; import com.netease.arctic.server.utils.InternalTableUtil; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergCreator.java b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergCreator.java index 5223bef7c7..b6af7ac3f0 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergCreator.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergCreator.java @@ -25,8 +25,8 @@ import static com.netease.arctic.server.utils.InternalTableUtil.genNewMetadataFileLocation; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.server.table.TableMetadata; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.utils.TablePropertyUtil; diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergHandler.java b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergHandler.java index a7242918fd..a92f68a30d 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergHandler.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/internal/InternalMixedIcebergHandler.java @@ -20,15 +20,15 @@ import static com.netease.arctic.server.table.internal.InternalTableConstants.CHANGE_STORE_TABLE_NAME_SUFFIX; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.op.ArcticHadoopTableOperations; import com.netease.arctic.server.table.TableMetadata; import com.netease.arctic.server.utils.InternalTableUtil; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.TablePropertyUtil; import org.apache.hadoop.fs.Path; import org.apache.iceberg.TableOperations; @@ -67,7 +67,7 @@ private TableOperations newTableOperations(boolean changeStore) { if (InternalTableUtil.isLegacyMixedIceberg(tableMetadata())) { String tableLocation = changeStore ? tableMetadata().getChangeLocation() : tableMetadata().getBaseLocation(); - TableMetaStore metaStore = CatalogUtil.buildMetaStore(catalogMeta); + TableMetaStore metaStore = ArcticCatalogUtil.buildMetaStore(catalogMeta); ArcticHadoopTableOperations ops = new ArcticHadoopTableOperations( diff --git a/ams/server/src/main/java/com/netease/arctic/server/terminal/TerminalManager.java b/ams/server/src/main/java/com/netease/arctic/server/terminal/TerminalManager.java index 55b613b2d0..c6f9dc310a 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/terminal/TerminalManager.java +++ b/ams/server/src/main/java/com/netease/arctic/server/terminal/TerminalManager.java @@ -18,10 +18,10 @@ package com.netease.arctic.server.terminal; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.Constants; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.ArcticManagementConf; import com.netease.arctic.server.catalog.CatalogType; import com.netease.arctic.server.dashboard.model.LatestSessionInfo; @@ -35,7 +35,7 @@ import com.netease.arctic.server.utils.ConfigOptions; import com.netease.arctic.server.utils.Configurations; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.commons.lang.StringUtils; import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.relocated.com.google.common.collect.Lists; @@ -278,7 +278,7 @@ private TableMetaStore getCatalogTableMetaStore(CatalogMeta catalogMeta) { if (catalogMeta.getStorageConfigs() != null) { Map storageConfigs = catalogMeta.getStorageConfigs(); if (CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HADOOP.equalsIgnoreCase( - CatalogUtil.getCompatibleStorageType(storageConfigs))) { + ArcticCatalogUtil.getCompatibleStorageType(storageConfigs))) { builder .withBase64MetaStoreSite( catalogMeta @@ -360,7 +360,7 @@ private TerminalSessionFactory loadTerminalSessionFactory(Configurations conf) { } private void applyClientProperties(CatalogMeta catalogMeta) { - Set formats = CatalogUtil.tableFormats(catalogMeta); + Set formats = ArcticCatalogUtil.tableFormats(catalogMeta); String catalogType = catalogMeta.getCatalogType(); if (formats.contains(TableFormat.ICEBERG)) { if (CatalogMetaProperties.CATALOG_TYPE_AMS.equalsIgnoreCase(catalogType)) { diff --git a/ams/server/src/main/java/com/netease/arctic/server/utils/InternalTableUtil.java b/ams/server/src/main/java/com/netease/arctic/server/utils/InternalTableUtil.java index 3f6149e0cc..7c69ca5315 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/utils/InternalTableUtil.java +++ b/ams/server/src/main/java/com/netease/arctic/server/utils/InternalTableUtil.java @@ -24,13 +24,13 @@ import static com.netease.arctic.server.table.internal.InternalTableConstants.S3_FILE_IO_IMPL; import static com.netease.arctic.server.table.internal.InternalTableConstants.S3_PROTOCOL_PREFIX; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.ArcticFileIOs; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.iceberg.CatalogProperties; @@ -82,7 +82,7 @@ public static boolean isKeyedMixedTable( */ public static ArcticFileIO newIcebergFileIo(CatalogMeta meta) { Map catalogProperties = meta.getCatalogProperties(); - TableMetaStore store = CatalogUtil.buildMetaStore(meta); + TableMetaStore store = ArcticCatalogUtil.buildMetaStore(meta); Configuration conf = store.getConfiguration(); String warehouse = meta.getCatalogProperties().get(CatalogMetaProperties.KEY_WAREHOUSE); String defaultImpl = HADOOP_FILE_IO_IMPL; diff --git a/ams/server/src/main/resources/META-INF/services/com.netease.arctic.ams.api.events.EventListener b/ams/server/src/main/resources/META-INF/services/com.netease.arctic.api.events.EventListener similarity index 100% rename from ams/server/src/main/resources/META-INF/services/com.netease.arctic.ams.api.events.EventListener rename to ams/server/src/main/resources/META-INF/services/com.netease.arctic.api.events.EventListener diff --git a/ams/server/src/main/resources/META-INF/services/com.netease.arctic.ams.api.resource.ResourceContainer b/ams/server/src/main/resources/META-INF/services/com.netease.arctic.api.resource.ResourceContainer similarity index 100% rename from ams/server/src/main/resources/META-INF/services/com.netease.arctic.ams.api.resource.ResourceContainer rename to ams/server/src/main/resources/META-INF/services/com.netease.arctic.api.resource.ResourceContainer diff --git a/ams/server/src/test/java/com/netease/arctic/server/AmsEnvironment.java b/ams/server/src/test/java/com/netease/arctic/server/AmsEnvironment.java index e5116dcbc8..908282ef2c 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/AmsEnvironment.java +++ b/ams/server/src/test/java/com/netease/arctic/server/AmsEnvironment.java @@ -19,15 +19,15 @@ package com.netease.arctic.server; import com.netease.arctic.SingletonResourceUtil; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.resource.ResourceGroup; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.CatalogLoader; import com.netease.arctic.catalog.CatalogTestHelpers; import com.netease.arctic.hive.HMSMockServer; import com.netease.arctic.optimizer.standalone.StandaloneOptimizer; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.resource.OptimizerManager; import com.netease.arctic.server.resource.ResourceContainers; import com.netease.arctic.server.table.DefaultTableService; diff --git a/ams/server/src/test/java/com/netease/arctic/server/RestCatalogServiceTestBase.java b/ams/server/src/test/java/com/netease/arctic/server/RestCatalogServiceTestBase.java index c236a99d06..1a03fb207a 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/RestCatalogServiceTestBase.java +++ b/ams/server/src/test/java/com/netease/arctic/server/RestCatalogServiceTestBase.java @@ -19,9 +19,9 @@ package com.netease.arctic.server; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.catalog.InternalCatalog; import com.netease.arctic.server.table.ServerTableIdentifier; import com.netease.arctic.server.table.TableMetadata; @@ -30,6 +30,7 @@ import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableIdentifier; import com.netease.arctic.table.TableMetaStore; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.CatalogUtil; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -98,7 +99,7 @@ protected RESTCatalog loadIcebergCatalog(Map clientProperties) { clientProperties.putIfAbsent("warehouse", catalogName()); CatalogMeta catalogMeta = serverCatalog.getMetadata(); - TableMetaStore store = com.netease.arctic.utils.CatalogUtil.buildMetaStore(catalogMeta); + TableMetaStore store = ArcticCatalogUtil.buildMetaStore(catalogMeta); return (RESTCatalog) CatalogUtil.loadCatalog( diff --git a/ams/server/src/test/java/com/netease/arctic/server/TestDefaultOptimizingService.java b/ams/server/src/test/java/com/netease/arctic/server/TestDefaultOptimizingService.java index 199ec2d66d..0cb80c9d93 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/TestDefaultOptimizingService.java +++ b/ams/server/src/test/java/com/netease/arctic/server/TestDefaultOptimizingService.java @@ -20,13 +20,13 @@ import com.google.common.collect.Maps; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; -import com.netease.arctic.ams.api.OptimizingTask; -import com.netease.arctic.ams.api.OptimizingTaskId; -import com.netease.arctic.ams.api.OptimizingTaskResult; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.api.OptimizerProperties; +import com.netease.arctic.api.OptimizerRegisterInfo; +import com.netease.arctic.api.OptimizingTask; +import com.netease.arctic.api.OptimizingTaskId; +import com.netease.arctic.api.OptimizingTaskResult; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.io.MixedDataTestHelpers; diff --git a/ams/server/src/test/java/com/netease/arctic/server/TestInternalIcebergCatalogService.java b/ams/server/src/test/java/com/netease/arctic/server/TestInternalIcebergCatalogService.java index 4126424abc..844826a052 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/TestInternalIcebergCatalogService.java +++ b/ams/server/src/test/java/com/netease/arctic/server/TestInternalIcebergCatalogService.java @@ -18,12 +18,12 @@ package com.netease.arctic.server; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.io.IcebergDataTestHelpers; import com.netease.arctic.io.MixedDataTestHelpers; import com.netease.arctic.io.reader.GenericUnkeyedDataReader; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.ArcticTable; import org.apache.iceberg.AppendFiles; import org.apache.iceberg.DataFile; diff --git a/ams/server/src/test/java/com/netease/arctic/server/TestInternalMixedCatalogService.java b/ams/server/src/test/java/com/netease/arctic/server/TestInternalMixedCatalogService.java index 45f77762d9..b7cdea9914 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/TestInternalMixedCatalogService.java +++ b/ams/server/src/test/java/com/netease/arctic/server/TestInternalMixedCatalogService.java @@ -19,9 +19,8 @@ package com.netease.arctic.server; import com.netease.arctic.AmoroTable; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.BasicArcticCatalog; import com.netease.arctic.catalog.CatalogLoader; @@ -29,11 +28,12 @@ import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.MixedDataTestHelpers; import com.netease.arctic.mixed.InternalMixedIcebergCatalog; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.TableBuilder; import com.netease.arctic.table.UnkeyedTable; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.ArcticTableUtil; -import com.netease.arctic.utils.CatalogUtil; import org.apache.iceberg.AppendFiles; import org.apache.iceberg.DataFile; import org.apache.iceberg.catalog.Namespace; @@ -233,7 +233,9 @@ public void setupTest() { ArcticCatalog catalog = new BasicArcticCatalog(); catalog.initialize( - meta.getCatalogName(), meta.getCatalogProperties(), CatalogUtil.buildMetaStore(meta)); + meta.getCatalogName(), + meta.getCatalogProperties(), + ArcticCatalogUtil.buildMetaStore(meta)); this.historicalCatalog = catalog; this.historicalCatalog.createDatabase(database); } diff --git a/ams/server/src/test/java/com/netease/arctic/server/catalog/TestServerCatalog.java b/ams/server/src/test/java/com/netease/arctic/server/catalog/TestServerCatalog.java index ae82a728d7..4c5b403ac7 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/catalog/TestServerCatalog.java +++ b/ams/server/src/test/java/com/netease/arctic/server/catalog/TestServerCatalog.java @@ -18,8 +18,7 @@ package com.netease.arctic.server.catalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.formats.AmoroCatalogTestHelper; import com.netease.arctic.formats.IcebergHadoopCatalogTestHelper; import com.netease.arctic.formats.MixedIcebergHadoopCatalogTestHelper; @@ -27,6 +26,7 @@ import com.netease.arctic.hive.formats.IcebergHiveCatalogTestHelper; import com.netease.arctic.hive.formats.MixedIcebergHiveCatalogTestHelper; import com.netease.arctic.hive.formats.PaimonHiveCatalogTestHelper; +import com.netease.arctic.properties.CatalogMetaProperties; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/ams/server/src/test/java/com/netease/arctic/server/manager/TestAbstractPluginManager.java b/ams/server/src/test/java/com/netease/arctic/server/manager/TestAbstractPluginManager.java index 0fbe8898ea..bd75214ad7 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/manager/TestAbstractPluginManager.java +++ b/ams/server/src/test/java/com/netease/arctic/server/manager/TestAbstractPluginManager.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.manager; import com.clearspring.analytics.util.Lists; -import com.netease.arctic.ams.api.ActivePlugin; +import com.netease.arctic.api.ActivePlugin; import com.netease.arctic.server.exception.AlreadyExistsException; import com.netease.arctic.server.exception.LoadingPluginException; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; diff --git a/ams/server/src/test/java/com/netease/arctic/server/manager/TestFlinkOptimizerContainer.java b/ams/server/src/test/java/com/netease/arctic/server/manager/TestFlinkOptimizerContainer.java index 9f27db26b3..9e327cdd7d 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/manager/TestFlinkOptimizerContainer.java +++ b/ams/server/src/test/java/com/netease/arctic/server/manager/TestFlinkOptimizerContainer.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.manager; -import com.netease.arctic.ams.api.OptimizerProperties; +import com.netease.arctic.api.OptimizerProperties; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.junit.Assert; import org.junit.Test; diff --git a/ams/server/src/test/java/com/netease/arctic/server/metrics/MockedMetricReporter.java b/ams/server/src/test/java/com/netease/arctic/server/metrics/MockedMetricReporter.java index 0121ccc950..287ab0b150 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/metrics/MockedMetricReporter.java +++ b/ams/server/src/test/java/com/netease/arctic/server/metrics/MockedMetricReporter.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.metrics; -import com.netease.arctic.ams.api.metrics.MetricReporter; -import com.netease.arctic.ams.api.metrics.MetricSet; +import com.netease.arctic.api.metrics.MetricReporter; +import com.netease.arctic.api.metrics.MetricSet; import java.util.Map; diff --git a/ams/server/src/test/java/com/netease/arctic/server/metrics/TestMetricRegistry.java b/ams/server/src/test/java/com/netease/arctic/server/metrics/TestMetricRegistry.java index 17b97bdca4..132b719ba4 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/metrics/TestMetricRegistry.java +++ b/ams/server/src/test/java/com/netease/arctic/server/metrics/TestMetricRegistry.java @@ -25,12 +25,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.netease.arctic.ams.api.metrics.Counter; -import com.netease.arctic.ams.api.metrics.Gauge; -import com.netease.arctic.ams.api.metrics.Metric; -import com.netease.arctic.ams.api.metrics.MetricDefine; -import com.netease.arctic.ams.api.metrics.MetricKey; -import com.netease.arctic.ams.api.metrics.MetricRegisterListener; +import com.netease.arctic.api.metrics.Counter; +import com.netease.arctic.api.metrics.Gauge; +import com.netease.arctic.api.metrics.Metric; +import com.netease.arctic.api.metrics.MetricDefine; +import com.netease.arctic.api.metrics.MetricKey; +import com.netease.arctic.api.metrics.MetricRegisterListener; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.junit.jupiter.api.BeforeEach; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestIcebergHadoopOptimizing.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestIcebergHadoopOptimizing.java index 772ddd4d29..60e421daca 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestIcebergHadoopOptimizing.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestIcebergHadoopOptimizing.java @@ -19,13 +19,14 @@ package com.netease.arctic.server.optimizing; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.AmsEnvironment; import com.netease.arctic.server.RestCatalogService; import com.netease.arctic.server.catalog.InternalCatalog; import com.netease.arctic.server.catalog.ServerCatalog; import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.TableProperties; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.CatalogUtil; import org.apache.iceberg.PartitionKey; import org.apache.iceberg.PartitionSpec; @@ -432,8 +433,7 @@ private Table createIcebergTable(String catalog, PartitionSpec spec, int formatV throw new IllegalStateException("unknown catalog"); } - TableMetaStore tms = - com.netease.arctic.utils.CatalogUtil.buildMetaStore(serverCatalog.getMetadata()); + TableMetaStore tms = ArcticCatalogUtil.buildMetaStore(serverCatalog.getMetadata()); Catalog icebergCatalog = CatalogUtil.loadCatalog(impl, catalog, properties, tms.getConfiguration()); diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestOptimizingQueue.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestOptimizingQueue.java index 040cc16685..d64b936698 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestOptimizingQueue.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/TestOptimizingQueue.java @@ -30,14 +30,14 @@ import com.google.common.collect.ImmutableMap; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.OptimizerRegisterInfo; -import com.netease.arctic.ams.api.OptimizingTaskId; -import com.netease.arctic.ams.api.OptimizingTaskResult; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.metrics.Gauge; -import com.netease.arctic.ams.api.metrics.MetricKey; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.OptimizerRegisterInfo; +import com.netease.arctic.api.OptimizingTaskId; +import com.netease.arctic.api.OptimizingTaskResult; +import com.netease.arctic.api.metrics.Gauge; +import com.netease.arctic.api.metrics.MetricKey; +import com.netease.arctic.api.resource.ResourceGroup; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.io.MixedDataTestHelpers; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestMixIcebergCommit.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestMixIcebergCommit.java index b159ed8e6d..266baaede4 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestMixIcebergCommit.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestMixIcebergCommit.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.commit; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.DataFileType; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestUnKeyedTableCommit.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestUnKeyedTableCommit.java index 49f1a3bbcc..ac9b4a22de 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestUnKeyedTableCommit.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/commit/TestUnKeyedTableCommit.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.commit; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/CompleteOptimizingFlow.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/CompleteOptimizingFlow.java index 64d0ad26d5..81185dfc9f 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/CompleteOptimizingFlow.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/CompleteOptimizingFlow.java @@ -23,8 +23,8 @@ import static com.netease.arctic.table.TableProperties.SELF_OPTIMIZING_MINOR_TRIGGER_FILE_CNT; import static com.netease.arctic.table.TableProperties.SELF_OPTIMIZING_TARGET_SIZE; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.OptimizerProperties; import com.netease.arctic.hive.optimizing.MixFormatRewriteExecutor; import com.netease.arctic.optimizing.IcebergRewriteExecutor; import com.netease.arctic.optimizing.OptimizingExecutor; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestKeyedContinuousOptimizing.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestKeyedContinuousOptimizing.java index 9b2d6c0f90..c2e48359e5 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestKeyedContinuousOptimizing.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestKeyedContinuousOptimizing.java @@ -22,8 +22,8 @@ import static com.netease.arctic.table.TableProperties.SELF_OPTIMIZING_FULL_TRIGGER_INTERVAL; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java index 27faee77cb..8f65340bfb 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java @@ -22,8 +22,8 @@ import static com.netease.arctic.table.TableProperties.SELF_OPTIMIZING_FULL_TRIGGER_INTERVAL; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/AbstractTableDataView.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/AbstractTableDataView.java index fd195a1e6c..6aafded9a3 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/AbstractTableDataView.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/AbstractTableDataView.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.optimizing.flow.view; import com.google.common.collect.Lists; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.data.ChangeAction; import com.netease.arctic.io.writer.GenericBaseTaskWriter; import com.netease.arctic.io.writer.GenericChangeTaskWriter; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/KeyedTableDataView.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/KeyedTableDataView.java index 3f14144dff..604465f3c9 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/KeyedTableDataView.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/KeyedTableDataView.java @@ -21,7 +21,7 @@ import static com.netease.arctic.table.TableProperties.WRITE_TARGET_FILE_SIZE_BYTES; import com.google.common.base.Preconditions; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.data.ChangeAction; import com.netease.arctic.io.writer.RecordWithAction; import com.netease.arctic.server.optimizing.flow.DataReader; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/UnKeyedTableDataView.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/UnKeyedTableDataView.java index 72732b5511..3ff457fe0e 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/UnKeyedTableDataView.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/flow/view/UnKeyedTableDataView.java @@ -20,7 +20,7 @@ import static com.netease.arctic.table.TableProperties.WRITE_TARGET_FILE_SIZE_BYTES; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.data.ChangeAction; import com.netease.arctic.io.writer.RecordWithAction; import com.netease.arctic.server.optimizing.flow.RandomRecordGenerator; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java index a539234be8..483c9677d4 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java @@ -19,7 +19,7 @@ package com.netease.arctic.server.optimizing.maintainer; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.server.table.TagConfiguration; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpire.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpire.java index 244653b679..3e21364f80 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpire.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpire.java @@ -23,8 +23,8 @@ import com.google.common.collect.Lists; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.ChangeAction; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireHive.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireHive.java index 9be98bf14c..b8c02ddab7 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireHive.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireHive.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.optimizing.maintainer; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireIceberg.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireIceberg.java index 6517d843f0..96dbe2dec6 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireIceberg.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestDataExpireIceberg.java @@ -21,8 +21,8 @@ import static com.netease.arctic.BasicTableTestHelper.SPEC; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.table.PrimaryKeySpec; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileClean.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileClean.java index b5339404bd..119a5dbd89 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileClean.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileClean.java @@ -22,8 +22,8 @@ import static com.netease.arctic.server.optimizing.maintainer.IcebergTableMaintainer.FLINK_JOB_ID; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.ChangeAction; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanHive.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanHive.java index e2c2586dea..12bde06b2f 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanHive.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanHive.java @@ -20,8 +20,8 @@ import static com.netease.arctic.server.optimizing.maintainer.IcebergTableMaintainer.DATA_FOLDER_NAME; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java index 830efd9091..e1684bbd58 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java @@ -20,8 +20,8 @@ import com.google.common.collect.Lists; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.io.writer.AdaptHiveGenericTaskWriterBuilder; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpire.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpire.java index d02e2fa254..03be93a076 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpire.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpire.java @@ -22,8 +22,8 @@ import static com.netease.arctic.utils.ArcticTableUtil.BLOB_TYPE_OPTIMIZED_SEQUENCE_EXIST; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.ChangeAction; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireHive.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireHive.java index e7c04311a5..a9cff3d452 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireHive.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireHive.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.optimizing.maintainer; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireIceberg.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireIceberg.java index cb50a447e2..c3b08eba23 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireIceberg.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/maintainer/TestSnapshotExpireIceberg.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.maintainer; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import org.junit.runner.RunWith; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveKeyedPartitionPlan.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveKeyedPartitionPlan.java index 1aab5363db..bb42fe61c2 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveKeyedPartitionPlan.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveKeyedPartitionPlan.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.plan; import com.google.common.collect.Maps; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.ChangeAction; import com.netease.arctic.hive.HiveTableProperties; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveOptimizingEvaluator.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveOptimizingEvaluator.java index 349e67031d..1252f71268 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveOptimizingEvaluator.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveOptimizingEvaluator.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.optimizing.plan; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java index ca12f42724..a25235d7d8 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.plan; import com.google.common.collect.Maps; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.TestHMS; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestIcebergPartitionPlan.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestIcebergPartitionPlan.java index 75aeec144a..aa7553eccb 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestIcebergPartitionPlan.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestIcebergPartitionPlan.java @@ -20,8 +20,8 @@ import com.google.common.collect.Maps; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.optimizing.IcebergRewriteExecutorFactory; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestKeyedPartitionPlan.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestKeyedPartitionPlan.java index 7a1e6cd4c6..70c12f518e 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestKeyedPartitionPlan.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestKeyedPartitionPlan.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.plan; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.ChangeAction; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingEvaluator.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingEvaluator.java index 4a9cdee5f9..179561f638 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingEvaluator.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingEvaluator.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.plan; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.server.optimizing.OptimizingTestHelpers; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingPlanner.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingPlanner.java index 6f8e9da660..f1862f0743 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingPlanner.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestOptimizingPlanner.java @@ -19,9 +19,9 @@ package com.netease.arctic.server.optimizing.plan; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.OptimizerProperties; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.api.OptimizerProperties; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.server.optimizing.OptimizingType; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestUnkeyedPartitionPlan.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestUnkeyedPartitionPlan.java index 3a2e402332..cf09db8c73 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestUnkeyedPartitionPlan.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/plan/TestUnkeyedPartitionPlan.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.plan; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.server.optimizing.scan.TableFileScanHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java index b6cb8b5c44..211d4c4ac0 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.optimizing.scan; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java index 8ed7bc694d..db28e1bc4e 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.optimizing.scan; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestIcebergTableFileScanHelper.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestIcebergTableFileScanHelper.java index 3e850aacea..ce1259c87a 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestIcebergTableFileScanHelper.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestIcebergTableFileScanHelper.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.scan; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.server.utils.IcebergTableUtil; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestKeyedTableFileScanHelper.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestKeyedTableFileScanHelper.java index 23b5e4a290..26e5102ce6 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestKeyedTableFileScanHelper.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestKeyedTableFileScanHelper.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.scan; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.ChangeAction; diff --git a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java index 346cbce9cf..69fde185fb 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java +++ b/ams/server/src/test/java/com/netease/arctic/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.optimizing.scan; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.io.MixedDataTestHelpers; diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/AMSTableTestBase.java b/ams/server/src/test/java/com/netease/arctic/server/table/AMSTableTestBase.java index bd9e1391b1..198ebcb89f 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/AMSTableTestBase.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/AMSTableTestBase.java @@ -19,18 +19,18 @@ package com.netease.arctic.server.table; import com.netease.arctic.CommonUnifiedCatalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; import com.netease.arctic.UnifiedCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.CatalogLoader; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.MixedTables; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.table.ArcticTable; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.ConvertStructUtil; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Database; @@ -186,7 +186,7 @@ private void createMixedIcebergTable() { catalogMeta.getCatalogName(), catalogMeta.getCatalogType(), catalogMeta.getCatalogProperties(), - CatalogUtil.buildMetaStore(catalogMeta)); + ArcticCatalogUtil.buildMetaStore(catalogMeta)); catalog .newTableBuilder(tableTestHelper.id(), tableTestHelper.tableSchema()) .withPartitionSpec(tableTestHelper.partitionSpec()) diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/TableServiceTestBase.java b/ams/server/src/test/java/com/netease/arctic/server/table/TableServiceTestBase.java index 57830771a8..40f127dade 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/TableServiceTestBase.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/TableServiceTestBase.java @@ -18,7 +18,7 @@ package com.netease.arctic.server.table; -import com.netease.arctic.ams.api.resource.ResourceGroup; +import com.netease.arctic.api.resource.ResourceGroup; import com.netease.arctic.server.ArcticManagementConf; import com.netease.arctic.server.DefaultOptimizingService; import com.netease.arctic.server.manager.EventsManager; diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/TestCatalogService.java b/ams/server/src/test/java/com/netease/arctic/server/table/TestCatalogService.java index 20336c6654..9259af7f5c 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/TestCatalogService.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/TestCatalogService.java @@ -18,13 +18,13 @@ package com.netease.arctic.server.table; +import com.netease.arctic.TableFormat; import com.netease.arctic.TestedCatalogs; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.server.exception.AlreadyExistsException; import com.netease.arctic.server.exception.IllegalMetadataException; import com.netease.arctic.server.exception.ObjectNotExistsException; diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/TestDatabaseService.java b/ams/server/src/test/java/com/netease/arctic/server/table/TestDatabaseService.java index 362e6ff970..06ccf07b70 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/TestDatabaseService.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/TestDatabaseService.java @@ -23,9 +23,9 @@ import com.google.common.collect.Lists; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; import com.netease.arctic.TestedCatalogs; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.server.exception.AlreadyExistsException; import com.netease.arctic.server.exception.IllegalMetadataException; diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeHandler.java b/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeHandler.java index 68b29a316a..e00380647d 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeHandler.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeHandler.java @@ -20,8 +20,8 @@ import com.netease.arctic.AmoroTable; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeManager.java b/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeManager.java index 37d7817ccc..ade9575698 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeManager.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/TestTableRuntimeManager.java @@ -19,8 +19,8 @@ package com.netease.arctic.server.table; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/TestTableService.java b/ams/server/src/test/java/com/netease/arctic/server/table/TestTableService.java index 9ae14ae1b8..f5faac959e 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/TestTableService.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/TestTableService.java @@ -22,13 +22,13 @@ import static com.netease.arctic.catalog.CatalogTestHelper.TEST_CATALOG_NAME; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableIDWithFormat; import com.netease.arctic.TableTestHelper; import com.netease.arctic.TestedCatalogs; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.Blocker; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableIdentifier; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.Blocker; +import com.netease.arctic.api.TableIdentifier; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; import com.netease.arctic.hive.catalog.HiveTableTestHelper; diff --git a/ams/server/src/test/java/com/netease/arctic/server/table/executor/TestBlockerExpiringExecutor.java b/ams/server/src/test/java/com/netease/arctic/server/table/executor/TestBlockerExpiringExecutor.java index 6c583bf209..b7d82f9342 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/table/executor/TestBlockerExpiringExecutor.java +++ b/ams/server/src/test/java/com/netease/arctic/server/table/executor/TestBlockerExpiringExecutor.java @@ -18,8 +18,8 @@ package com.netease.arctic.server.table.executor; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.BlockableOperation; import com.netease.arctic.server.persistence.PersistentBase; import com.netease.arctic.server.persistence.mapper.TableBlockerMapper; import com.netease.arctic.server.table.ServerTableIdentifier; diff --git a/ams/server/src/test/resources/META-INF/services/com.netease.arctic.ams.api.metrics.MetricReporter b/ams/server/src/test/resources/META-INF/services/com.netease.arctic.api.metrics.MetricReporter similarity index 100% rename from ams/server/src/test/resources/META-INF/services/com.netease.arctic.ams.api.metrics.MetricReporter rename to ams/server/src/test/resources/META-INF/services/com.netease.arctic.api.metrics.MetricReporter diff --git a/core/pom.xml b/core/pom.xml index 7747c43f98..7933fa575e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,8 +35,54 @@ - com.netease.amoro - amoro-ams-api + org.apache.thrift + libthrift + + + + org.apache.iceberg + iceberg-bundled-guava + + + + com.github.ben-manes.caffeine + caffeine + + + + org.apache.curator + curator-framework + + + + org.apache.curator + curator-recipes + + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + org.slf4j + slf4j-api + + + ch.qos.logback + * + + + + + + org.apache.commons + commons-pool2 + + + + com.alibaba + fastjson @@ -144,14 +190,96 @@ tests test + - - com.netease.amoro - amoro-ams-api - ${project.version} - tests - test - + + ${basedir}/src/main/java + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven-build-helper-plugin.version} + + + add-source + generate-sources + + add-source + + + + src/main/gen-java + + + + + - + + + org.apache.thrift.tools + maven-thrift-plugin + ${maven-thrift-plugin.version} + + src/main/gen-java + src/main/thrift + java + + + + org.apache.maven.plugins + maven-shade-plugin + + + create-shaded-jar + package + + shade + + + + + org.apache.zookeeper:* + org.apache.curator:* + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + org.apache.zookeeper + com.netease.arctic.shade.org.apache.zookeeper + + + + org.apache.curator + com.netease.arctic.shade.org.apache.curator + + + + + + + + + com.diffplug.spotless + spotless-maven-plugin + + + + src/main/gen-java/** + + + + + + diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/AlreadyExistsException.java b/core/src/main/gen-java/com/netease/arctic/api/AlreadyExistsException.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/AlreadyExistsException.java rename to core/src/main/gen-java/com/netease/arctic/api/AlreadyExistsException.java index 3421f94394..368754ec40 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/AlreadyExistsException.java +++ b/core/src/main/gen-java/com/netease/arctic/api/AlreadyExistsException.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) /** @@ -12,7 +12,7 @@ * This file defines the type definitions that all of arctic's multiple thrift services depend on. * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class AlreadyExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyExistsException"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/ArcticException.java b/core/src/main/gen-java/com/netease/arctic/api/ArcticException.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/ArcticException.java rename to core/src/main/gen-java/com/netease/arctic/api/ArcticException.java index 0ef8f8775e..886fdcface 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/ArcticException.java +++ b/core/src/main/gen-java/com/netease/arctic/api/ArcticException.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class ArcticException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArcticException"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/ArcticTableMetastore.java b/core/src/main/gen-java/com/netease/arctic/api/ArcticTableMetastore.java similarity index 94% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/ArcticTableMetastore.java rename to core/src/main/gen-java/com/netease/arctic/api/ArcticTableMetastore.java index 586718359a..ee2f6163b0 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/ArcticTableMetastore.java +++ b/core/src/main/gen-java/com/netease/arctic/api/ArcticTableMetastore.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class ArcticTableMetastore { /** @@ -20,33 +20,33 @@ public interface Iface { public java.util.List getCatalogs() throws org.apache.thrift.TException; - public CatalogMeta getCatalog(java.lang.String name) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException; + public CatalogMeta getCatalog(java.lang.String name) throws NoSuchObjectException, org.apache.thrift.TException; - public java.util.List getDatabases(java.lang.String catalogName) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException; + public java.util.List getDatabases(java.lang.String catalogName) throws NoSuchObjectException, org.apache.thrift.TException; - public void createDatabase(java.lang.String catalogName, java.lang.String database) throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.AlreadyExistsException, org.apache.thrift.TException; + public void createDatabase(java.lang.String catalogName, java.lang.String database) throws NoSuchObjectException, AlreadyExistsException, org.apache.thrift.TException; - public void dropDatabase(java.lang.String catalogName, java.lang.String database) throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.NotSupportedException, org.apache.thrift.TException; + public void dropDatabase(java.lang.String catalogName, java.lang.String database) throws NoSuchObjectException, NotSupportedException, org.apache.thrift.TException; - public void createTableMeta(TableMeta tableMeta) throws com.netease.arctic.ams.api.AlreadyExistsException, com.netease.arctic.ams.api.InvalidObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException; + public void createTableMeta(TableMeta tableMeta) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException; - public java.util.List listTables(java.lang.String catalogName, java.lang.String database) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException; + public java.util.List listTables(java.lang.String catalogName, java.lang.String database) throws NoSuchObjectException, org.apache.thrift.TException; - public TableMeta getTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException; + public TableMeta getTable(TableIdentifier tableIdentifier) throws NoSuchObjectException, org.apache.thrift.TException; - public void removeTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, boolean deleteData) throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException; + public void removeTable(TableIdentifier tableIdentifier, boolean deleteData) throws NoSuchObjectException, MetaException, org.apache.thrift.TException; - public void tableCommit(TableCommitMeta commit) throws com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException; + public void tableCommit(TableCommitMeta commit) throws MetaException, org.apache.thrift.TException; - public long allocateTransactionId(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String transactionSignature) throws org.apache.thrift.TException; + public long allocateTransactionId(TableIdentifier tableIdentifier, java.lang.String transactionSignature) throws org.apache.thrift.TException; - public Blocker block(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties) throws com.netease.arctic.ams.api.OperationConflictException, org.apache.thrift.TException; + public Blocker block(TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties) throws OperationConflictException, org.apache.thrift.TException; - public void releaseBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException; + public void releaseBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException; - public long renewBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException; + public long renewBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId) throws NoSuchObjectException, org.apache.thrift.TException; - public java.util.List getBlockers(com.netease.arctic.ams.api.TableIdentifier tableIdentifier) throws org.apache.thrift.TException; + public java.util.List getBlockers(TableIdentifier tableIdentifier) throws org.apache.thrift.TException; } @@ -68,21 +68,21 @@ public interface AsyncIface { public void listTables(java.lang.String catalogName, java.lang.String database, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getTable(TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void removeTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void removeTable(TableIdentifier tableIdentifier, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void tableCommit(TableCommitMeta commit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void allocateTransactionId(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String transactionSignature, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void allocateTransactionId(TableIdentifier tableIdentifier, java.lang.String transactionSignature, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void block(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void block(TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void releaseBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void releaseBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void renewBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void renewBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getBlockers(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; + public void getBlockers(TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; } @@ -147,7 +147,7 @@ public java.util.List recv_getCatalogs() throws org.apache.thrift.T throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getCatalogs failed: unknown result"); } - public CatalogMeta getCatalog(java.lang.String name) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public CatalogMeta getCatalog(java.lang.String name) throws NoSuchObjectException, org.apache.thrift.TException { send_getCatalog(name); return recv_getCatalog(); @@ -160,7 +160,7 @@ public void send_getCatalog(java.lang.String name) throws org.apache.thrift.TExc sendBase("getCatalog", args); } - public CatalogMeta recv_getCatalog() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public CatalogMeta recv_getCatalog() throws NoSuchObjectException, org.apache.thrift.TException { getCatalog_result result = new getCatalog_result(); receiveBase(result, "getCatalog"); @@ -173,7 +173,7 @@ public CatalogMeta recv_getCatalog() throws com.netease.arctic.ams.api.NoSuchObj throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getCatalog failed: unknown result"); } - public java.util.List getDatabases(java.lang.String catalogName) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public java.util.List getDatabases(java.lang.String catalogName) throws NoSuchObjectException, org.apache.thrift.TException { send_getDatabases(catalogName); return recv_getDatabases(); @@ -186,7 +186,7 @@ public void send_getDatabases(java.lang.String catalogName) throws org.apache.th sendBase("getDatabases", args); } - public java.util.List recv_getDatabases() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public java.util.List recv_getDatabases() throws NoSuchObjectException, org.apache.thrift.TException { getDatabases_result result = new getDatabases_result(); receiveBase(result, "getDatabases"); @@ -199,7 +199,7 @@ public java.util.List recv_getDatabases() throws com.netease.a throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getDatabases failed: unknown result"); } - public void createDatabase(java.lang.String catalogName, java.lang.String database) throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.AlreadyExistsException, org.apache.thrift.TException + public void createDatabase(java.lang.String catalogName, java.lang.String database) throws NoSuchObjectException, AlreadyExistsException, org.apache.thrift.TException { send_createDatabase(catalogName, database); recv_createDatabase(); @@ -213,7 +213,7 @@ public void send_createDatabase(java.lang.String catalogName, java.lang.String d sendBase("createDatabase", args); } - public void recv_createDatabase() throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.AlreadyExistsException, org.apache.thrift.TException + public void recv_createDatabase() throws NoSuchObjectException, AlreadyExistsException, org.apache.thrift.TException { createDatabase_result result = new createDatabase_result(); receiveBase(result, "createDatabase"); @@ -226,7 +226,7 @@ public void recv_createDatabase() throws com.netease.arctic.ams.api.NoSuchObject return; } - public void dropDatabase(java.lang.String catalogName, java.lang.String database) throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.NotSupportedException, org.apache.thrift.TException + public void dropDatabase(java.lang.String catalogName, java.lang.String database) throws NoSuchObjectException, NotSupportedException, org.apache.thrift.TException { send_dropDatabase(catalogName, database); recv_dropDatabase(); @@ -240,7 +240,7 @@ public void send_dropDatabase(java.lang.String catalogName, java.lang.String dat sendBase("dropDatabase", args); } - public void recv_dropDatabase() throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.NotSupportedException, org.apache.thrift.TException + public void recv_dropDatabase() throws NoSuchObjectException, NotSupportedException, org.apache.thrift.TException { dropDatabase_result result = new dropDatabase_result(); receiveBase(result, "dropDatabase"); @@ -253,7 +253,7 @@ public void recv_dropDatabase() throws com.netease.arctic.ams.api.NoSuchObjectEx return; } - public void createTableMeta(TableMeta tableMeta) throws com.netease.arctic.ams.api.AlreadyExistsException, com.netease.arctic.ams.api.InvalidObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException + public void createTableMeta(TableMeta tableMeta) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException { send_createTableMeta(tableMeta); recv_createTableMeta(); @@ -266,7 +266,7 @@ public void send_createTableMeta(TableMeta tableMeta) throws org.apache.thrift.T sendBase("createTableMeta", args); } - public void recv_createTableMeta() throws com.netease.arctic.ams.api.AlreadyExistsException, com.netease.arctic.ams.api.InvalidObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException + public void recv_createTableMeta() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException { createTableMeta_result result = new createTableMeta_result(); receiveBase(result, "createTableMeta"); @@ -282,7 +282,7 @@ public void recv_createTableMeta() throws com.netease.arctic.ams.api.AlreadyExis return; } - public java.util.List listTables(java.lang.String catalogName, java.lang.String database) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public java.util.List listTables(java.lang.String catalogName, java.lang.String database) throws NoSuchObjectException, org.apache.thrift.TException { send_listTables(catalogName, database); return recv_listTables(); @@ -296,7 +296,7 @@ public void send_listTables(java.lang.String catalogName, java.lang.String datab sendBase("listTables", args); } - public java.util.List recv_listTables() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public java.util.List recv_listTables() throws NoSuchObjectException, org.apache.thrift.TException { listTables_result result = new listTables_result(); receiveBase(result, "listTables"); @@ -309,20 +309,20 @@ public java.util.List recv_listTables() throws com.netease.arctic.ams throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listTables failed: unknown result"); } - public TableMeta getTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public TableMeta getTable(TableIdentifier tableIdentifier) throws NoSuchObjectException, org.apache.thrift.TException { send_getTable(tableIdentifier); return recv_getTable(); } - public void send_getTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier) throws org.apache.thrift.TException + public void send_getTable(TableIdentifier tableIdentifier) throws org.apache.thrift.TException { getTable_args args = new getTable_args(); args.setTableIdentifier(tableIdentifier); sendBase("getTable", args); } - public TableMeta recv_getTable() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public TableMeta recv_getTable() throws NoSuchObjectException, org.apache.thrift.TException { getTable_result result = new getTable_result(); receiveBase(result, "getTable"); @@ -335,13 +335,13 @@ public TableMeta recv_getTable() throws com.netease.arctic.ams.api.NoSuchObjectE throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTable failed: unknown result"); } - public void removeTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, boolean deleteData) throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException + public void removeTable(TableIdentifier tableIdentifier, boolean deleteData) throws NoSuchObjectException, MetaException, org.apache.thrift.TException { send_removeTable(tableIdentifier, deleteData); recv_removeTable(); } - public void send_removeTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, boolean deleteData) throws org.apache.thrift.TException + public void send_removeTable(TableIdentifier tableIdentifier, boolean deleteData) throws org.apache.thrift.TException { removeTable_args args = new removeTable_args(); args.setTableIdentifier(tableIdentifier); @@ -349,7 +349,7 @@ public void send_removeTable(com.netease.arctic.ams.api.TableIdentifier tableIde sendBase("removeTable", args); } - public void recv_removeTable() throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException + public void recv_removeTable() throws NoSuchObjectException, MetaException, org.apache.thrift.TException { removeTable_result result = new removeTable_result(); receiveBase(result, "removeTable"); @@ -362,7 +362,7 @@ public void recv_removeTable() throws com.netease.arctic.ams.api.NoSuchObjectExc return; } - public void tableCommit(TableCommitMeta commit) throws com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException + public void tableCommit(TableCommitMeta commit) throws MetaException, org.apache.thrift.TException { send_tableCommit(commit); recv_tableCommit(); @@ -375,7 +375,7 @@ public void send_tableCommit(TableCommitMeta commit) throws org.apache.thrift.TE sendBase("tableCommit", args); } - public void recv_tableCommit() throws com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException + public void recv_tableCommit() throws MetaException, org.apache.thrift.TException { tableCommit_result result = new tableCommit_result(); receiveBase(result, "tableCommit"); @@ -385,13 +385,13 @@ public void recv_tableCommit() throws com.netease.arctic.ams.api.MetaException, return; } - public long allocateTransactionId(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String transactionSignature) throws org.apache.thrift.TException + public long allocateTransactionId(TableIdentifier tableIdentifier, java.lang.String transactionSignature) throws org.apache.thrift.TException { send_allocateTransactionId(tableIdentifier, transactionSignature); return recv_allocateTransactionId(); } - public void send_allocateTransactionId(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String transactionSignature) throws org.apache.thrift.TException + public void send_allocateTransactionId(TableIdentifier tableIdentifier, java.lang.String transactionSignature) throws org.apache.thrift.TException { allocateTransactionId_args args = new allocateTransactionId_args(); args.setTableIdentifier(tableIdentifier); @@ -409,13 +409,13 @@ public long recv_allocateTransactionId() throws org.apache.thrift.TException throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "allocateTransactionId failed: unknown result"); } - public Blocker block(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties) throws com.netease.arctic.ams.api.OperationConflictException, org.apache.thrift.TException + public Blocker block(TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties) throws OperationConflictException, org.apache.thrift.TException { send_block(tableIdentifier, operations, properties); return recv_block(); } - public void send_block(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties) throws org.apache.thrift.TException + public void send_block(TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties) throws org.apache.thrift.TException { block_args args = new block_args(); args.setTableIdentifier(tableIdentifier); @@ -424,7 +424,7 @@ public void send_block(com.netease.arctic.ams.api.TableIdentifier tableIdentifie sendBase("block", args); } - public Blocker recv_block() throws com.netease.arctic.ams.api.OperationConflictException, org.apache.thrift.TException + public Blocker recv_block() throws OperationConflictException, org.apache.thrift.TException { block_result result = new block_result(); receiveBase(result, "block"); @@ -437,13 +437,13 @@ public Blocker recv_block() throws com.netease.arctic.ams.api.OperationConflictE throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "block failed: unknown result"); } - public void releaseBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException + public void releaseBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException { send_releaseBlocker(tableIdentifier, blockerId); recv_releaseBlocker(); } - public void send_releaseBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException + public void send_releaseBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException { releaseBlocker_args args = new releaseBlocker_args(); args.setTableIdentifier(tableIdentifier); @@ -458,13 +458,13 @@ public void recv_releaseBlocker() throws org.apache.thrift.TException return; } - public long renewBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId) throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public long renewBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId) throws NoSuchObjectException, org.apache.thrift.TException { send_renewBlocker(tableIdentifier, blockerId); return recv_renewBlocker(); } - public void send_renewBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException + public void send_renewBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId) throws org.apache.thrift.TException { renewBlocker_args args = new renewBlocker_args(); args.setTableIdentifier(tableIdentifier); @@ -472,7 +472,7 @@ public void send_renewBlocker(com.netease.arctic.ams.api.TableIdentifier tableId sendBase("renewBlocker", args); } - public long recv_renewBlocker() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException + public long recv_renewBlocker() throws NoSuchObjectException, org.apache.thrift.TException { renewBlocker_result result = new renewBlocker_result(); receiveBase(result, "renewBlocker"); @@ -485,13 +485,13 @@ public long recv_renewBlocker() throws com.netease.arctic.ams.api.NoSuchObjectEx throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "renewBlocker failed: unknown result"); } - public java.util.List getBlockers(com.netease.arctic.ams.api.TableIdentifier tableIdentifier) throws org.apache.thrift.TException + public java.util.List getBlockers(TableIdentifier tableIdentifier) throws org.apache.thrift.TException { send_getBlockers(tableIdentifier); return recv_getBlockers(); } - public void send_getBlockers(com.netease.arctic.ams.api.TableIdentifier tableIdentifier) throws org.apache.thrift.TException + public void send_getBlockers(TableIdentifier tableIdentifier) throws org.apache.thrift.TException { getBlockers_args args = new getBlockers_args(); args.setTableIdentifier(tableIdentifier); @@ -606,7 +606,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public CatalogMeta getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException { + public CatalogMeta getResult() throws NoSuchObjectException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -638,7 +638,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public java.util.List getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException { + public java.util.List getResult() throws NoSuchObjectException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -673,7 +673,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.AlreadyExistsException, org.apache.thrift.TException { + public Void getResult() throws NoSuchObjectException, AlreadyExistsException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -708,7 +708,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.NotSupportedException, org.apache.thrift.TException { + public Void getResult() throws NoSuchObjectException, NotSupportedException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -740,7 +740,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.AlreadyExistsException, com.netease.arctic.ams.api.InvalidObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException { + public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -775,7 +775,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public java.util.List getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException { + public java.util.List getResult() throws NoSuchObjectException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -785,7 +785,7 @@ public java.util.List getResult() throws com.netease.arctic.ams.api.N } } - public void getTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getTable(TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getTable_call method_call = new getTable_call(tableIdentifier, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -793,8 +793,8 @@ public void getTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, } public static class getTable_call extends org.apache.thrift.async.TAsyncMethodCall { - private com.netease.arctic.ams.api.TableIdentifier tableIdentifier; - public getTable_call(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private TableIdentifier tableIdentifier; + public getTable_call(TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tableIdentifier = tableIdentifier; } @@ -807,7 +807,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public TableMeta getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException { + public TableMeta getResult() throws NoSuchObjectException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -817,7 +817,7 @@ public TableMeta getResult() throws com.netease.arctic.ams.api.NoSuchObjectExcep } } - public void removeTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void removeTable(TableIdentifier tableIdentifier, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); removeTable_call method_call = new removeTable_call(tableIdentifier, deleteData, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -825,9 +825,9 @@ public void removeTable(com.netease.arctic.ams.api.TableIdentifier tableIdentifi } public static class removeTable_call extends org.apache.thrift.async.TAsyncMethodCall { - private com.netease.arctic.ams.api.TableIdentifier tableIdentifier; + private TableIdentifier tableIdentifier; private boolean deleteData; - public removeTable_call(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public removeTable_call(TableIdentifier tableIdentifier, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tableIdentifier = tableIdentifier; this.deleteData = deleteData; @@ -842,7 +842,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException { + public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -874,7 +874,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.MetaException, org.apache.thrift.TException { + public Void getResult() throws MetaException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -884,7 +884,7 @@ public Void getResult() throws com.netease.arctic.ams.api.MetaException, org.apa } } - public void allocateTransactionId(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String transactionSignature, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void allocateTransactionId(TableIdentifier tableIdentifier, java.lang.String transactionSignature, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); allocateTransactionId_call method_call = new allocateTransactionId_call(tableIdentifier, transactionSignature, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -892,9 +892,9 @@ public void allocateTransactionId(com.netease.arctic.ams.api.TableIdentifier tab } public static class allocateTransactionId_call extends org.apache.thrift.async.TAsyncMethodCall { - private com.netease.arctic.ams.api.TableIdentifier tableIdentifier; + private TableIdentifier tableIdentifier; private java.lang.String transactionSignature; - public allocateTransactionId_call(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String transactionSignature, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public allocateTransactionId_call(TableIdentifier tableIdentifier, java.lang.String transactionSignature, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tableIdentifier = tableIdentifier; this.transactionSignature = transactionSignature; @@ -919,7 +919,7 @@ public java.lang.Long getResult() throws org.apache.thrift.TException { } } - public void block(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void block(TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); block_call method_call = new block_call(tableIdentifier, operations, properties, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -927,10 +927,10 @@ public void block(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, ja } public static class block_call extends org.apache.thrift.async.TAsyncMethodCall { - private com.netease.arctic.ams.api.TableIdentifier tableIdentifier; + private TableIdentifier tableIdentifier; private java.util.List operations; private java.util.Map properties; - public block_call(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public block_call(TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tableIdentifier = tableIdentifier; this.operations = operations; @@ -947,7 +947,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Blocker getResult() throws com.netease.arctic.ams.api.OperationConflictException, org.apache.thrift.TException { + public Blocker getResult() throws OperationConflictException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -957,7 +957,7 @@ public Blocker getResult() throws com.netease.arctic.ams.api.OperationConflictEx } } - public void releaseBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void releaseBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); releaseBlocker_call method_call = new releaseBlocker_call(tableIdentifier, blockerId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -965,9 +965,9 @@ public void releaseBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdent } public static class releaseBlocker_call extends org.apache.thrift.async.TAsyncMethodCall { - private com.netease.arctic.ams.api.TableIdentifier tableIdentifier; + private TableIdentifier tableIdentifier; private java.lang.String blockerId; - public releaseBlocker_call(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public releaseBlocker_call(TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tableIdentifier = tableIdentifier; this.blockerId = blockerId; @@ -992,7 +992,7 @@ public Void getResult() throws org.apache.thrift.TException { } } - public void renewBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void renewBlocker(TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); renewBlocker_call method_call = new renewBlocker_call(tableIdentifier, blockerId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -1000,9 +1000,9 @@ public void renewBlocker(com.netease.arctic.ams.api.TableIdentifier tableIdentif } public static class renewBlocker_call extends org.apache.thrift.async.TAsyncMethodCall { - private com.netease.arctic.ams.api.TableIdentifier tableIdentifier; + private TableIdentifier tableIdentifier; private java.lang.String blockerId; - public renewBlocker_call(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public renewBlocker_call(TableIdentifier tableIdentifier, java.lang.String blockerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tableIdentifier = tableIdentifier; this.blockerId = blockerId; @@ -1017,7 +1017,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public java.lang.Long getResult() throws com.netease.arctic.ams.api.NoSuchObjectException, org.apache.thrift.TException { + public java.lang.Long getResult() throws NoSuchObjectException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -1027,7 +1027,7 @@ public java.lang.Long getResult() throws com.netease.arctic.ams.api.NoSuchObject } } - public void getBlockers(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { + public void getBlockers(TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); getBlockers_call method_call = new getBlockers_call(tableIdentifier, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -1035,8 +1035,8 @@ public void getBlockers(com.netease.arctic.ams.api.TableIdentifier tableIdentifi } public static class getBlockers_call extends org.apache.thrift.async.TAsyncMethodCall> { - private com.netease.arctic.ams.api.TableIdentifier tableIdentifier; - public getBlockers_call(com.netease.arctic.ams.api.TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private TableIdentifier tableIdentifier; + public getBlockers_call(TableIdentifier tableIdentifier, org.apache.thrift.async.AsyncMethodCallback> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tableIdentifier = tableIdentifier; } @@ -1163,7 +1163,7 @@ public getCatalog_result getResult(I iface, getCatalog_args args) throws org.apa getCatalog_result result = new getCatalog_result(); try { result.success = iface.getCatalog(args.name); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e1) { + } catch (NoSuchObjectException e1) { result.e1 = e1; } return result; @@ -1192,7 +1192,7 @@ public getDatabases_result getResult(I iface, getDatabases_args args) throws org getDatabases_result result = new getDatabases_result(); try { result.success = iface.getDatabases(args.catalogName); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e) { + } catch (NoSuchObjectException e) { result.e = e; } return result; @@ -1221,9 +1221,9 @@ public createDatabase_result getResult(I iface, createDatabase_args args) throws createDatabase_result result = new createDatabase_result(); try { iface.createDatabase(args.catalogName, args.database); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e1) { + } catch (NoSuchObjectException e1) { result.e1 = e1; - } catch (com.netease.arctic.ams.api.AlreadyExistsException e2) { + } catch (AlreadyExistsException e2) { result.e2 = e2; } return result; @@ -1252,9 +1252,9 @@ public dropDatabase_result getResult(I iface, dropDatabase_args args) throws org dropDatabase_result result = new dropDatabase_result(); try { iface.dropDatabase(args.catalogName, args.database); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e1) { + } catch (NoSuchObjectException e1) { result.e1 = e1; - } catch (com.netease.arctic.ams.api.NotSupportedException e2) { + } catch (NotSupportedException e2) { result.e2 = e2; } return result; @@ -1283,11 +1283,11 @@ public createTableMeta_result getResult(I iface, createTableMeta_args args) thro createTableMeta_result result = new createTableMeta_result(); try { iface.createTableMeta(args.tableMeta); - } catch (com.netease.arctic.ams.api.AlreadyExistsException e1) { + } catch (AlreadyExistsException e1) { result.e1 = e1; - } catch (com.netease.arctic.ams.api.InvalidObjectException e2) { + } catch (InvalidObjectException e2) { result.e2 = e2; - } catch (com.netease.arctic.ams.api.MetaException e3) { + } catch (MetaException e3) { result.e3 = e3; } return result; @@ -1316,7 +1316,7 @@ public listTables_result getResult(I iface, listTables_args args) throws org.apa listTables_result result = new listTables_result(); try { result.success = iface.listTables(args.catalogName, args.database); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e) { + } catch (NoSuchObjectException e) { result.e = e; } return result; @@ -1345,7 +1345,7 @@ public getTable_result getResult(I iface, getTable_args args) throws org.apache. getTable_result result = new getTable_result(); try { result.success = iface.getTable(args.tableIdentifier); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e) { + } catch (NoSuchObjectException e) { result.e = e; } return result; @@ -1374,9 +1374,9 @@ public removeTable_result getResult(I iface, removeTable_args args) throws org.a removeTable_result result = new removeTable_result(); try { iface.removeTable(args.tableIdentifier, args.deleteData); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e1) { + } catch (NoSuchObjectException e1) { result.e1 = e1; - } catch (com.netease.arctic.ams.api.MetaException e2) { + } catch (MetaException e2) { result.e2 = e2; } return result; @@ -1405,7 +1405,7 @@ public tableCommit_result getResult(I iface, tableCommit_args args) throws org.a tableCommit_result result = new tableCommit_result(); try { iface.tableCommit(args.commit); - } catch (com.netease.arctic.ams.api.MetaException e1) { + } catch (MetaException e1) { result.e1 = e1; } return result; @@ -1460,7 +1460,7 @@ public block_result getResult(I iface, block_args args) throws org.apache.thrift block_result result = new block_result(); try { result.success = iface.block(args.tableIdentifier, args.operations, args.properties); - } catch (com.netease.arctic.ams.api.OperationConflictException e1) { + } catch (OperationConflictException e1) { result.e1 = e1; } return result; @@ -1515,7 +1515,7 @@ public renewBlocker_result getResult(I iface, renewBlocker_args args) throws org try { result.success = iface.renewBlocker(args.tableIdentifier, args.blockerId); result.setSuccessIsSet(true); - } catch (com.netease.arctic.ams.api.NoSuchObjectException e) { + } catch (NoSuchObjectException e) { result.e = e; } return result; @@ -1729,8 +1729,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; getCatalog_result result = new getCatalog_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e1 = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e1 = (NoSuchObjectException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -1794,8 +1794,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; getDatabases_result result = new getDatabases_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e = (NoSuchObjectException) e; result.setEIsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -1858,12 +1858,12 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; createDatabase_result result = new createDatabase_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e1 = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e1 = (NoSuchObjectException) e; result.setE1IsSet(true); msg = result; - } else if (e instanceof com.netease.arctic.ams.api.AlreadyExistsException) { - result.e2 = (com.netease.arctic.ams.api.AlreadyExistsException) e; + } else if (e instanceof AlreadyExistsException) { + result.e2 = (AlreadyExistsException) e; result.setE2IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -1926,12 +1926,12 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; dropDatabase_result result = new dropDatabase_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e1 = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e1 = (NoSuchObjectException) e; result.setE1IsSet(true); msg = result; - } else if (e instanceof com.netease.arctic.ams.api.NotSupportedException) { - result.e2 = (com.netease.arctic.ams.api.NotSupportedException) e; + } else if (e instanceof NotSupportedException) { + result.e2 = (NotSupportedException) e; result.setE2IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -1994,16 +1994,16 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; createTableMeta_result result = new createTableMeta_result(); - if (e instanceof com.netease.arctic.ams.api.AlreadyExistsException) { - result.e1 = (com.netease.arctic.ams.api.AlreadyExistsException) e; + if (e instanceof AlreadyExistsException) { + result.e1 = (AlreadyExistsException) e; result.setE1IsSet(true); msg = result; - } else if (e instanceof com.netease.arctic.ams.api.InvalidObjectException) { - result.e2 = (com.netease.arctic.ams.api.InvalidObjectException) e; + } else if (e instanceof InvalidObjectException) { + result.e2 = (InvalidObjectException) e; result.setE2IsSet(true); msg = result; - } else if (e instanceof com.netease.arctic.ams.api.MetaException) { - result.e3 = (com.netease.arctic.ams.api.MetaException) e; + } else if (e instanceof MetaException) { + result.e3 = (MetaException) e; result.setE3IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -2067,8 +2067,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; listTables_result result = new listTables_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e = (NoSuchObjectException) e; result.setEIsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -2132,8 +2132,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; getTable_result result = new getTable_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e = (NoSuchObjectException) e; result.setEIsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -2196,12 +2196,12 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; removeTable_result result = new removeTable_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e1 = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e1 = (NoSuchObjectException) e; result.setE1IsSet(true); msg = result; - } else if (e instanceof com.netease.arctic.ams.api.MetaException) { - result.e2 = (com.netease.arctic.ams.api.MetaException) e; + } else if (e instanceof MetaException) { + result.e2 = (MetaException) e; result.setE2IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -2264,8 +2264,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; tableCommit_result result = new tableCommit_result(); - if (e instanceof com.netease.arctic.ams.api.MetaException) { - result.e1 = (com.netease.arctic.ams.api.MetaException) e; + if (e instanceof MetaException) { + result.e1 = (MetaException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -2391,8 +2391,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; block_result result = new block_result(); - if (e instanceof com.netease.arctic.ams.api.OperationConflictException) { - result.e1 = (com.netease.arctic.ams.api.OperationConflictException) e; + if (e instanceof OperationConflictException) { + result.e1 = (OperationConflictException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -2517,8 +2517,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; renewBlocker_result result = new renewBlocker_result(); - if (e instanceof com.netease.arctic.ams.api.NoSuchObjectException) { - result.e = (com.netease.arctic.ams.api.NoSuchObjectException) e; + if (e instanceof NoSuchObjectException) { + result.e = (NoSuchObjectException) e; result.setEIsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -4177,7 +4177,7 @@ public static class getCatalog_result implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NoSuchObjectException e; // required + public @org.apache.thrift.annotation.Nullable NoSuchObjectException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -5096,7 +5096,7 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.NoSuchObjectException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getDatabases_result.class, metaDataMap); } @@ -5106,7 +5106,7 @@ public getDatabases_result() { public getDatabases_result( java.util.List success, - com.netease.arctic.ams.api.NoSuchObjectException e) + NoSuchObjectException e) { this(); this.success = success; @@ -5122,7 +5122,7 @@ public getDatabases_result(getDatabases_result other) { this.success = __this__success; } if (other.isSetE()) { - this.e = new com.netease.arctic.ams.api.NoSuchObjectException(other.e); + this.e = new NoSuchObjectException(other.e); } } @@ -5178,11 +5178,11 @@ public void setSuccessIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.NoSuchObjectException getE() { + public NoSuchObjectException getE() { return this.e; } - public getDatabases_result setE(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NoSuchObjectException e) { + public getDatabases_result setE(@org.apache.thrift.annotation.Nullable NoSuchObjectException e) { this.e = e; return this; } @@ -5216,7 +5216,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE(); } else { - setE((com.netease.arctic.ams.api.NoSuchObjectException)value); + setE((NoSuchObjectException)value); } break; @@ -5429,7 +5429,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getDatabases_result break; case 1: // E if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e = new NoSuchObjectException(); struct.e.read(iprot); struct.setEIsSet(true); } else { @@ -5525,7 +5525,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getDatabases_result struct.setSuccessIsSet(true); } if (incoming.get(1)) { - struct.e = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e = new NoSuchObjectException(); struct.e.read(iprot); struct.setEIsSet(true); } @@ -6018,8 +6018,8 @@ public static class createDatabase_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.NoSuchObjectException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); tmpMap.put(_Fields.E2, new org.apache.thrift.meta_data.FieldMetaData("e2", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.AlreadyExistsException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AlreadyExistsException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createDatabase_result.class, metaDataMap); } @@ -6100,8 +6100,8 @@ public createDatabase_result() { } public createDatabase_result( - com.netease.arctic.ams.api.NoSuchObjectException e1, - com.netease.arctic.ams.api.AlreadyExistsException e2) + NoSuchObjectException e1, + AlreadyExistsException e2) { this(); this.e1 = e1; @@ -6113,10 +6113,10 @@ public createDatabase_result( */ public createDatabase_result(createDatabase_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(other.e1); + this.e1 = new NoSuchObjectException(other.e1); } if (other.isSetE2()) { - this.e2 = new com.netease.arctic.ams.api.AlreadyExistsException(other.e2); + this.e2 = new AlreadyExistsException(other.e2); } } @@ -6131,11 +6131,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.NoSuchObjectException getE1() { + public NoSuchObjectException getE1() { return this.e1; } - public createDatabase_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NoSuchObjectException e1) { + public createDatabase_result setE1(@org.apache.thrift.annotation.Nullable NoSuchObjectException e1) { this.e1 = e1; return this; } @@ -6156,11 +6156,11 @@ public void setE1IsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.AlreadyExistsException getE2() { + public AlreadyExistsException getE2() { return this.e2; } - public createDatabase_result setE2(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.AlreadyExistsException e2) { + public createDatabase_result setE2(@org.apache.thrift.annotation.Nullable AlreadyExistsException e2) { this.e2 = e2; return this; } @@ -6186,7 +6186,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.NoSuchObjectException)value); + setE1((NoSuchObjectException)value); } break; @@ -6194,7 +6194,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE2(); } else { - setE2((com.netease.arctic.ams.api.AlreadyExistsException)value); + setE2((AlreadyExistsException)value); } break; @@ -6389,7 +6389,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createDatabase_resu switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e1 = new NoSuchObjectException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -6398,7 +6398,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createDatabase_resu break; case 2: // E2 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e2 = new com.netease.arctic.ams.api.AlreadyExistsException(); + struct.e2 = new AlreadyExistsException(); struct.e2.read(iprot); struct.setE2IsSet(true); } else { @@ -6468,12 +6468,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, createDatabase_resul org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e1 = new NoSuchObjectException(); struct.e1.read(iprot); struct.setE1IsSet(true); } if (incoming.get(1)) { - struct.e2 = new com.netease.arctic.ams.api.AlreadyExistsException(); + struct.e2 = new AlreadyExistsException(); struct.e2.read(iprot); struct.setE2IsSet(true); } @@ -6966,8 +6966,8 @@ public static class dropDatabase_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.NoSuchObjectException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); tmpMap.put(_Fields.E2, new org.apache.thrift.meta_data.FieldMetaData("e2", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.NotSupportedException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NotSupportedException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(dropDatabase_result.class, metaDataMap); } @@ -7048,8 +7048,8 @@ public dropDatabase_result() { } public dropDatabase_result( - com.netease.arctic.ams.api.NoSuchObjectException e1, - com.netease.arctic.ams.api.NotSupportedException e2) + NoSuchObjectException e1, + NotSupportedException e2) { this(); this.e1 = e1; @@ -7061,10 +7061,10 @@ public dropDatabase_result( */ public dropDatabase_result(dropDatabase_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(other.e1); + this.e1 = new NoSuchObjectException(other.e1); } if (other.isSetE2()) { - this.e2 = new com.netease.arctic.ams.api.NotSupportedException(other.e2); + this.e2 = new NotSupportedException(other.e2); } } @@ -7079,11 +7079,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.NoSuchObjectException getE1() { + public NoSuchObjectException getE1() { return this.e1; } - public dropDatabase_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NoSuchObjectException e1) { + public dropDatabase_result setE1(@org.apache.thrift.annotation.Nullable NoSuchObjectException e1) { this.e1 = e1; return this; } @@ -7104,11 +7104,11 @@ public void setE1IsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.NotSupportedException getE2() { + public NotSupportedException getE2() { return this.e2; } - public dropDatabase_result setE2(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NotSupportedException e2) { + public dropDatabase_result setE2(@org.apache.thrift.annotation.Nullable NotSupportedException e2) { this.e2 = e2; return this; } @@ -7134,7 +7134,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.NoSuchObjectException)value); + setE1((NoSuchObjectException)value); } break; @@ -7142,7 +7142,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE2(); } else { - setE2((com.netease.arctic.ams.api.NotSupportedException)value); + setE2((NotSupportedException)value); } break; @@ -7337,7 +7337,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, dropDatabase_result switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e1 = new NoSuchObjectException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -7346,7 +7346,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, dropDatabase_result break; case 2: // E2 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e2 = new com.netease.arctic.ams.api.NotSupportedException(); + struct.e2 = new NotSupportedException(); struct.e2.read(iprot); struct.setE2IsSet(true); } else { @@ -7416,12 +7416,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, dropDatabase_result org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e1 = new NoSuchObjectException(); struct.e1.read(iprot); struct.setE1IsSet(true); } if (incoming.get(1)) { - struct.e2 = new com.netease.arctic.ams.api.NotSupportedException(); + struct.e2 = new NotSupportedException(); struct.e2.read(iprot); struct.setE2IsSet(true); } @@ -7815,9 +7815,9 @@ public static class createTableMeta_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.AlreadyExistsException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AlreadyExistsException.class))); tmpMap.put(_Fields.E2, new org.apache.thrift.meta_data.FieldMetaData("e2", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.InvalidObjectException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, InvalidObjectException.class))); tmpMap.put(_Fields.E3, new org.apache.thrift.meta_data.FieldMetaData("e3", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.MetaException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createTableMeta_result.class, metaDataMap); } @@ -7903,9 +7903,9 @@ public createTableMeta_result() { } public createTableMeta_result( - com.netease.arctic.ams.api.AlreadyExistsException e1, - com.netease.arctic.ams.api.InvalidObjectException e2, - com.netease.arctic.ams.api.MetaException e3) + AlreadyExistsException e1, + InvalidObjectException e2, + MetaException e3) { this(); this.e1 = e1; @@ -7918,13 +7918,13 @@ public createTableMeta_result( */ public createTableMeta_result(createTableMeta_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.AlreadyExistsException(other.e1); + this.e1 = new AlreadyExistsException(other.e1); } if (other.isSetE2()) { - this.e2 = new com.netease.arctic.ams.api.InvalidObjectException(other.e2); + this.e2 = new InvalidObjectException(other.e2); } if (other.isSetE3()) { - this.e3 = new com.netease.arctic.ams.api.MetaException(other.e3); + this.e3 = new MetaException(other.e3); } } @@ -7940,11 +7940,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.AlreadyExistsException getE1() { + public AlreadyExistsException getE1() { return this.e1; } - public createTableMeta_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.AlreadyExistsException e1) { + public createTableMeta_result setE1(@org.apache.thrift.annotation.Nullable AlreadyExistsException e1) { this.e1 = e1; return this; } @@ -7965,11 +7965,11 @@ public void setE1IsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.InvalidObjectException getE2() { + public InvalidObjectException getE2() { return this.e2; } - public createTableMeta_result setE2(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.InvalidObjectException e2) { + public createTableMeta_result setE2(@org.apache.thrift.annotation.Nullable InvalidObjectException e2) { this.e2 = e2; return this; } @@ -7990,11 +7990,11 @@ public void setE2IsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.MetaException getE3() { + public MetaException getE3() { return this.e3; } - public createTableMeta_result setE3(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.MetaException e3) { + public createTableMeta_result setE3(@org.apache.thrift.annotation.Nullable MetaException e3) { this.e3 = e3; return this; } @@ -8020,7 +8020,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.AlreadyExistsException)value); + setE1((AlreadyExistsException)value); } break; @@ -8028,7 +8028,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE2(); } else { - setE2((com.netease.arctic.ams.api.InvalidObjectException)value); + setE2((InvalidObjectException)value); } break; @@ -8036,7 +8036,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE3(); } else { - setE3((com.netease.arctic.ams.api.MetaException)value); + setE3((MetaException)value); } break; @@ -8267,7 +8267,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createTableMeta_res switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.AlreadyExistsException(); + struct.e1 = new AlreadyExistsException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -8276,7 +8276,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createTableMeta_res break; case 2: // E2 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e2 = new com.netease.arctic.ams.api.InvalidObjectException(); + struct.e2 = new InvalidObjectException(); struct.e2.read(iprot); struct.setE2IsSet(true); } else { @@ -8285,7 +8285,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createTableMeta_res break; case 3: // E3 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e3 = new com.netease.arctic.ams.api.MetaException(); + struct.e3 = new MetaException(); struct.e3.read(iprot); struct.setE3IsSet(true); } else { @@ -8366,17 +8366,17 @@ public void read(org.apache.thrift.protocol.TProtocol prot, createTableMeta_resu org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.AlreadyExistsException(); + struct.e1 = new AlreadyExistsException(); struct.e1.read(iprot); struct.setE1IsSet(true); } if (incoming.get(1)) { - struct.e2 = new com.netease.arctic.ams.api.InvalidObjectException(); + struct.e2 = new InvalidObjectException(); struct.e2.read(iprot); struct.setE2IsSet(true); } if (incoming.get(2)) { - struct.e3 = new com.netease.arctic.ams.api.MetaException(); + struct.e3 = new MetaException(); struct.e3.read(iprot); struct.setE3IsSet(true); } @@ -8870,7 +8870,7 @@ public static class listTables_result implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NoSuchObjectException e; // required + public @org.apache.thrift.annotation.Nullable NoSuchObjectException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -8943,7 +8943,7 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableMeta.class)))); tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.NoSuchObjectException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(listTables_result.class, metaDataMap); } @@ -8953,7 +8953,7 @@ public listTables_result() { public listTables_result( java.util.List success, - com.netease.arctic.ams.api.NoSuchObjectException e) + NoSuchObjectException e) { this(); this.success = success; @@ -8972,7 +8972,7 @@ public listTables_result(listTables_result other) { this.success = __this__success; } if (other.isSetE()) { - this.e = new com.netease.arctic.ams.api.NoSuchObjectException(other.e); + this.e = new NoSuchObjectException(other.e); } } @@ -9028,11 +9028,11 @@ public void setSuccessIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.NoSuchObjectException getE() { + public NoSuchObjectException getE() { return this.e; } - public listTables_result setE(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NoSuchObjectException e) { + public listTables_result setE(@org.apache.thrift.annotation.Nullable NoSuchObjectException e) { this.e = e; return this; } @@ -9066,7 +9066,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE(); } else { - setE((com.netease.arctic.ams.api.NoSuchObjectException)value); + setE((NoSuchObjectException)value); } break; @@ -9280,7 +9280,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, listTables_result s break; case 1: // E if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e = new NoSuchObjectException(); struct.e.read(iprot); struct.setEIsSet(true); } else { @@ -9377,7 +9377,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, listTables_result st struct.setSuccessIsSet(true); } if (incoming.get(1)) { - struct.e = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e = new NoSuchObjectException(); struct.e.read(iprot); struct.setEIsSet(true); } @@ -9397,7 +9397,7 @@ public static class getTable_args implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTable_args.class, metaDataMap); } @@ -9473,7 +9473,7 @@ public getTable_args() { } public getTable_args( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier) + TableIdentifier tableIdentifier) { this(); this.tableIdentifier = tableIdentifier; @@ -9484,7 +9484,7 @@ public getTable_args( */ public getTable_args(getTable_args other) { if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } } @@ -9498,11 +9498,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public getTable_args setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public getTable_args setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -9528,7 +9528,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -9690,7 +9690,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getTable_args struc switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -9749,7 +9749,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getTable_args struct org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } @@ -9771,7 +9771,7 @@ public static class getTable_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); tmpMap.put(_Fields.DELETE_DATA, new org.apache.thrift.meta_data.FieldMetaData("deleteData", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -10333,7 +10333,7 @@ public removeTable_args() { } public removeTable_args( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier, + TableIdentifier tableIdentifier, boolean deleteData) { this(); @@ -10348,7 +10348,7 @@ public removeTable_args( public removeTable_args(removeTable_args other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } this.deleteData = other.deleteData; } @@ -10365,11 +10365,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public removeTable_args setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public removeTable_args setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -10418,7 +10418,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -10620,7 +10620,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeTable_args st switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -10696,7 +10696,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeTable_args str org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } @@ -10721,8 +10721,8 @@ public static class removeTable_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.NoSuchObjectException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); tmpMap.put(_Fields.E2, new org.apache.thrift.meta_data.FieldMetaData("e2", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.MetaException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTable_result.class, metaDataMap); } @@ -10803,8 +10803,8 @@ public removeTable_result() { } public removeTable_result( - com.netease.arctic.ams.api.NoSuchObjectException e1, - com.netease.arctic.ams.api.MetaException e2) + NoSuchObjectException e1, + MetaException e2) { this(); this.e1 = e1; @@ -10816,10 +10816,10 @@ public removeTable_result( */ public removeTable_result(removeTable_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(other.e1); + this.e1 = new NoSuchObjectException(other.e1); } if (other.isSetE2()) { - this.e2 = new com.netease.arctic.ams.api.MetaException(other.e2); + this.e2 = new MetaException(other.e2); } } @@ -10834,11 +10834,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.NoSuchObjectException getE1() { + public NoSuchObjectException getE1() { return this.e1; } - public removeTable_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.NoSuchObjectException e1) { + public removeTable_result setE1(@org.apache.thrift.annotation.Nullable NoSuchObjectException e1) { this.e1 = e1; return this; } @@ -10859,11 +10859,11 @@ public void setE1IsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.MetaException getE2() { + public MetaException getE2() { return this.e2; } - public removeTable_result setE2(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.MetaException e2) { + public removeTable_result setE2(@org.apache.thrift.annotation.Nullable MetaException e2) { this.e2 = e2; return this; } @@ -10889,7 +10889,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.NoSuchObjectException)value); + setE1((NoSuchObjectException)value); } break; @@ -10897,7 +10897,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE2(); } else { - setE2((com.netease.arctic.ams.api.MetaException)value); + setE2((MetaException)value); } break; @@ -11092,7 +11092,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeTable_result switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e1 = new NoSuchObjectException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -11101,7 +11101,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeTable_result break; case 2: // E2 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e2 = new com.netease.arctic.ams.api.MetaException(); + struct.e2 = new MetaException(); struct.e2.read(iprot); struct.setE2IsSet(true); } else { @@ -11171,12 +11171,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeTable_result s org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.NoSuchObjectException(); + struct.e1 = new NoSuchObjectException(); struct.e1.read(iprot); struct.setE1IsSet(true); } if (incoming.get(1)) { - struct.e2 = new com.netease.arctic.ams.api.MetaException(); + struct.e2 = new MetaException(); struct.e2.read(iprot); struct.setE2IsSet(true); } @@ -11568,7 +11568,7 @@ public static class tableCommit_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.MetaException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(tableCommit_result.class, metaDataMap); } @@ -11644,7 +11644,7 @@ public tableCommit_result() { } public tableCommit_result( - com.netease.arctic.ams.api.MetaException e1) + MetaException e1) { this(); this.e1 = e1; @@ -11655,7 +11655,7 @@ public tableCommit_result( */ public tableCommit_result(tableCommit_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.MetaException(other.e1); + this.e1 = new MetaException(other.e1); } } @@ -11669,11 +11669,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.MetaException getE1() { + public MetaException getE1() { return this.e1; } - public tableCommit_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.MetaException e1) { + public tableCommit_result setE1(@org.apache.thrift.annotation.Nullable MetaException e1) { this.e1 = e1; return this; } @@ -11699,7 +11699,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.MetaException)value); + setE1((MetaException)value); } break; @@ -11858,7 +11858,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, tableCommit_result switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.MetaException(); + struct.e1 = new MetaException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -11917,7 +11917,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, tableCommit_result s org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.MetaException(); + struct.e1 = new MetaException(); struct.e1.read(iprot); struct.setE1IsSet(true); } @@ -11938,7 +11938,7 @@ public static class allocateTransactionId_args implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new allocateTransactionId_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new allocateTransactionId_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier; // required + public @org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier; // required public @org.apache.thrift.annotation.Nullable java.lang.String transactionSignature; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -12009,7 +12009,7 @@ public java.lang.String getFieldName() { static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); tmpMap.put(_Fields.TRANSACTION_SIGNATURE, new org.apache.thrift.meta_data.FieldMetaData("transactionSignature", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -12020,7 +12020,7 @@ public allocateTransactionId_args() { } public allocateTransactionId_args( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier, + TableIdentifier tableIdentifier, java.lang.String transactionSignature) { this(); @@ -12033,7 +12033,7 @@ public allocateTransactionId_args( */ public allocateTransactionId_args(allocateTransactionId_args other) { if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } if (other.isSetTransactionSignature()) { this.transactionSignature = other.transactionSignature; @@ -12051,11 +12051,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public allocateTransactionId_args setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public allocateTransactionId_args setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -12106,7 +12106,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -12312,7 +12312,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, allocateTransaction switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -12390,7 +12390,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, allocateTransactionI org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } @@ -12780,7 +12780,7 @@ public static class block_args implements org.apache.thrift.TBase operations; // required public @org.apache.thrift.annotation.Nullable java.util.Map properties; // required @@ -12855,7 +12855,7 @@ public java.lang.String getFieldName() { static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); tmpMap.put(_Fields.OPERATIONS, new org.apache.thrift.meta_data.FieldMetaData("operations", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, BlockableOperation.class)))); @@ -12871,7 +12871,7 @@ public block_args() { } public block_args( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier, + TableIdentifier tableIdentifier, java.util.List operations, java.util.Map properties) { @@ -12886,7 +12886,7 @@ public block_args( */ public block_args(block_args other) { if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } if (other.isSetOperations()) { java.util.List __this__operations = new java.util.ArrayList(other.operations.size()); @@ -12913,11 +12913,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public block_args setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public block_args setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -13020,7 +13020,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -13270,7 +13270,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, block_args struct) switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -13285,7 +13285,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, block_args struct) @org.apache.thrift.annotation.Nullable BlockableOperation _elem161; for (int _i162 = 0; _i162 < _list160.size; ++_i162) { - _elem161 = com.netease.arctic.ams.api.BlockableOperation.findByValue(iprot.readI32()); + _elem161 = BlockableOperation.findByValue(iprot.readI32()); if (_elem161 != null) { struct.operations.add(_elem161); @@ -13420,7 +13420,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, block_args struct) t org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } @@ -13431,7 +13431,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, block_args struct) t @org.apache.thrift.annotation.Nullable BlockableOperation _elem172; for (int _i173 = 0; _i173 < _list171.size; ++_i173) { - _elem172 = com.netease.arctic.ams.api.BlockableOperation.findByValue(iprot.readI32()); + _elem172 = BlockableOperation.findByValue(iprot.readI32()); if (_elem172 != null) { struct.operations.add(_elem172); @@ -13473,7 +13473,7 @@ public static class block_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); tmpMap.put(_Fields.BLOCKER_ID, new org.apache.thrift.meta_data.FieldMetaData("blockerId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -14033,7 +14033,7 @@ public releaseBlocker_args() { } public releaseBlocker_args( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier, + TableIdentifier tableIdentifier, java.lang.String blockerId) { this(); @@ -14046,7 +14046,7 @@ public releaseBlocker_args( */ public releaseBlocker_args(releaseBlocker_args other) { if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } if (other.isSetBlockerId()) { this.blockerId = other.blockerId; @@ -14064,11 +14064,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public releaseBlocker_args setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public releaseBlocker_args setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -14119,7 +14119,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -14325,7 +14325,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, releaseBlocker_args switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -14403,7 +14403,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, releaseBlocker_args org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } @@ -14682,7 +14682,7 @@ public static class renewBlocker_args implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); tmpMap.put(_Fields.BLOCKER_ID, new org.apache.thrift.meta_data.FieldMetaData("blockerId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -14764,7 +14764,7 @@ public renewBlocker_args() { } public renewBlocker_args( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier, + TableIdentifier tableIdentifier, java.lang.String blockerId) { this(); @@ -14777,7 +14777,7 @@ public renewBlocker_args( */ public renewBlocker_args(renewBlocker_args other) { if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } if (other.isSetBlockerId()) { this.blockerId = other.blockerId; @@ -14795,11 +14795,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public renewBlocker_args setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public renewBlocker_args setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -14850,7 +14850,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -15056,7 +15056,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, renewBlocker_args s switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -15134,7 +15134,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, renewBlocker_args st org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } @@ -15160,7 +15160,7 @@ public static class renewBlocker_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getBlockers_args.class, metaDataMap); } @@ -15705,7 +15705,7 @@ public getBlockers_args() { } public getBlockers_args( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier) + TableIdentifier tableIdentifier) { this(); this.tableIdentifier = tableIdentifier; @@ -15716,7 +15716,7 @@ public getBlockers_args( */ public getBlockers_args(getBlockers_args other) { if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } } @@ -15730,11 +15730,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public getBlockers_args setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public getBlockers_args setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -15760,7 +15760,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -15922,7 +15922,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getBlockers_args st switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -15981,7 +15981,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getBlockers_args str org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/BlockableOperation.java b/core/src/main/gen-java/com/netease/arctic/api/BlockableOperation.java similarity index 92% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/BlockableOperation.java rename to core/src/main/gen-java/com/netease/arctic/api/BlockableOperation.java index 240628cf52..aa6e927004 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/BlockableOperation.java +++ b/core/src/main/gen-java/com/netease/arctic/api/BlockableOperation.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public enum BlockableOperation implements org.apache.thrift.TEnum { OPTIMIZE(0), BATCH_WRITE(1); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/Blocker.java b/core/src/main/gen-java/com/netease/arctic/api/Blocker.java similarity index 98% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/Blocker.java rename to core/src/main/gen-java/com/netease/arctic/api/Blocker.java index a0c0107aa5..046769d276 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/Blocker.java +++ b/core/src/main/gen-java/com/netease/arctic/api/Blocker.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class Blocker implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Blocker"); @@ -519,7 +519,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Blocker struct) thr @org.apache.thrift.annotation.Nullable BlockableOperation _elem119; for (int _i120 = 0; _i120 < _list118.size; ++_i120) { - _elem119 = com.netease.arctic.ams.api.BlockableOperation.findByValue(iprot.readI32()); + _elem119 = BlockableOperation.findByValue(iprot.readI32()); if (_elem119 != null) { struct.operations.add(_elem119); @@ -664,7 +664,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Blocker struct) thro @org.apache.thrift.annotation.Nullable BlockableOperation _elem130; for (int _i131 = 0; _i131 < _list129.size; ++_i131) { - _elem130 = com.netease.arctic.ams.api.BlockableOperation.findByValue(iprot.readI32()); + _elem130 = BlockableOperation.findByValue(iprot.readI32()); if (_elem130 != null) { struct.operations.add(_elem130); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/CatalogMeta.java b/core/src/main/gen-java/com/netease/arctic/api/CatalogMeta.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/CatalogMeta.java rename to core/src/main/gen-java/com/netease/arctic/api/CatalogMeta.java index 80f71504a3..984bf09a35 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/CatalogMeta.java +++ b/core/src/main/gen-java/com/netease/arctic/api/CatalogMeta.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class CatalogMeta implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogMeta"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/ColumnInfo.java b/core/src/main/gen-java/com/netease/arctic/api/ColumnInfo.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/ColumnInfo.java rename to core/src/main/gen-java/com/netease/arctic/api/ColumnInfo.java index a46238e881..79cfe3777f 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/ColumnInfo.java +++ b/core/src/main/gen-java/com/netease/arctic/api/ColumnInfo.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class ColumnInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnInfo"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/CommitMetaProducer.java b/core/src/main/gen-java/com/netease/arctic/api/CommitMetaProducer.java similarity index 87% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/CommitMetaProducer.java rename to core/src/main/gen-java/com/netease/arctic/api/CommitMetaProducer.java index 378958d723..551f21b943 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/CommitMetaProducer.java +++ b/core/src/main/gen-java/com/netease/arctic/api/CommitMetaProducer.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-02-19") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public enum CommitMetaProducer implements org.apache.thrift.TEnum { OPTIMIZE(0), INGESTION(1), @@ -31,7 +31,7 @@ public int getValue() { * @return null if the value is not found. */ @org.apache.thrift.annotation.Nullable - public static CommitMetaProducer findByValue(int value) { + public static CommitMetaProducer findByValue(int value) { switch (value) { case 0: return OPTIMIZE; @@ -43,4 +43,4 @@ public static CommitMetaProducer findByValue(int value) { return null; } } -} \ No newline at end of file +} diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/DataFile.java b/core/src/main/gen-java/com/netease/arctic/api/DataFile.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/DataFile.java rename to core/src/main/gen-java/com/netease/arctic/api/DataFile.java index c9823299ff..640f8a8174 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/DataFile.java +++ b/core/src/main/gen-java/com/netease/arctic/api/DataFile.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class DataFile implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataFile"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/InvalidObjectException.java b/core/src/main/gen-java/com/netease/arctic/api/InvalidObjectException.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/InvalidObjectException.java rename to core/src/main/gen-java/com/netease/arctic/api/InvalidObjectException.java index 28a77e4b95..69aa7190de 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/InvalidObjectException.java +++ b/core/src/main/gen-java/com/netease/arctic/api/InvalidObjectException.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class InvalidObjectException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidObjectException"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/MetaException.java b/core/src/main/gen-java/com/netease/arctic/api/MetaException.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/MetaException.java rename to core/src/main/gen-java/com/netease/arctic/api/MetaException.java index a12652ae91..8a0fb09bee 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/MetaException.java +++ b/core/src/main/gen-java/com/netease/arctic/api/MetaException.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class MetaException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MetaException"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/NoSuchObjectException.java b/core/src/main/gen-java/com/netease/arctic/api/NoSuchObjectException.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/NoSuchObjectException.java rename to core/src/main/gen-java/com/netease/arctic/api/NoSuchObjectException.java index c3b26697d6..11d58c7fe4 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/NoSuchObjectException.java +++ b/core/src/main/gen-java/com/netease/arctic/api/NoSuchObjectException.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class NoSuchObjectException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchObjectException"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/NotSupportedException.java b/core/src/main/gen-java/com/netease/arctic/api/NotSupportedException.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/NotSupportedException.java rename to core/src/main/gen-java/com/netease/arctic/api/NotSupportedException.java index a9a2295587..459c2c5389 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/NotSupportedException.java +++ b/core/src/main/gen-java/com/netease/arctic/api/NotSupportedException.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class NotSupportedException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotSupportedException"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OperationConflictException.java b/core/src/main/gen-java/com/netease/arctic/api/OperationConflictException.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/OperationConflictException.java rename to core/src/main/gen-java/com/netease/arctic/api/OperationConflictException.java index 155ce554b7..c2d47f98b9 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OperationConflictException.java +++ b/core/src/main/gen-java/com/netease/arctic/api/OperationConflictException.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class OperationConflictException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OperationConflictException"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizerRegisterInfo.java b/core/src/main/gen-java/com/netease/arctic/api/OptimizerRegisterInfo.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizerRegisterInfo.java rename to core/src/main/gen-java/com/netease/arctic/api/OptimizerRegisterInfo.java index cc6ef90d6c..b0c0222818 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizerRegisterInfo.java +++ b/core/src/main/gen-java/com/netease/arctic/api/OptimizerRegisterInfo.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class OptimizerRegisterInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OptimizerRegisterInfo"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingService.java b/core/src/main/gen-java/com/netease/arctic/api/OptimizingService.java similarity index 96% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingService.java rename to core/src/main/gen-java/com/netease/arctic/api/OptimizingService.java index 8727000f9d..8cf5749244 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingService.java +++ b/core/src/main/gen-java/com/netease/arctic/api/OptimizingService.java @@ -4,25 +4,25 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class OptimizingService { public interface Iface { public void ping() throws org.apache.thrift.TException; - public void touch(java.lang.String authToken) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException; + public void touch(java.lang.String authToken) throws ArcticException, org.apache.thrift.TException; - public OptimizingTask pollTask(java.lang.String authToken, int threadId) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException; + public OptimizingTask pollTask(java.lang.String authToken, int threadId) throws ArcticException, org.apache.thrift.TException; - public void ackTask(java.lang.String authToken, int threadId, OptimizingTaskId taskId) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException; + public void ackTask(java.lang.String authToken, int threadId, OptimizingTaskId taskId) throws ArcticException, org.apache.thrift.TException; - public void completeTask(java.lang.String authToken, OptimizingTaskResult taskResult) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException; + public void completeTask(java.lang.String authToken, OptimizingTaskResult taskResult) throws ArcticException, org.apache.thrift.TException; - public java.lang.String authenticate(OptimizerRegisterInfo registerInfo) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException; + public java.lang.String authenticate(OptimizerRegisterInfo registerInfo) throws ArcticException, org.apache.thrift.TException; } @@ -81,7 +81,7 @@ public void recv_ping() throws org.apache.thrift.TException return; } - public void touch(java.lang.String authToken) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public void touch(java.lang.String authToken) throws ArcticException, org.apache.thrift.TException { send_touch(authToken); recv_touch(); @@ -94,7 +94,7 @@ public void send_touch(java.lang.String authToken) throws org.apache.thrift.TExc sendBase("touch", args); } - public void recv_touch() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public void recv_touch() throws ArcticException, org.apache.thrift.TException { touch_result result = new touch_result(); receiveBase(result, "touch"); @@ -104,7 +104,7 @@ public void recv_touch() throws com.netease.arctic.ams.api.ArcticException, org. return; } - public OptimizingTask pollTask(java.lang.String authToken, int threadId) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public OptimizingTask pollTask(java.lang.String authToken, int threadId) throws ArcticException, org.apache.thrift.TException { send_pollTask(authToken, threadId); return recv_pollTask(); @@ -118,7 +118,7 @@ public void send_pollTask(java.lang.String authToken, int threadId) throws org.a sendBase("pollTask", args); } - public OptimizingTask recv_pollTask() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public OptimizingTask recv_pollTask() throws ArcticException, org.apache.thrift.TException { pollTask_result result = new pollTask_result(); receiveBase(result, "pollTask"); @@ -131,7 +131,7 @@ public OptimizingTask recv_pollTask() throws com.netease.arctic.ams.api.ArcticEx throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "pollTask failed: unknown result"); } - public void ackTask(java.lang.String authToken, int threadId, OptimizingTaskId taskId) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public void ackTask(java.lang.String authToken, int threadId, OptimizingTaskId taskId) throws ArcticException, org.apache.thrift.TException { send_ackTask(authToken, threadId, taskId); recv_ackTask(); @@ -146,7 +146,7 @@ public void send_ackTask(java.lang.String authToken, int threadId, OptimizingTas sendBase("ackTask", args); } - public void recv_ackTask() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public void recv_ackTask() throws ArcticException, org.apache.thrift.TException { ackTask_result result = new ackTask_result(); receiveBase(result, "ackTask"); @@ -156,7 +156,7 @@ public void recv_ackTask() throws com.netease.arctic.ams.api.ArcticException, or return; } - public void completeTask(java.lang.String authToken, OptimizingTaskResult taskResult) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public void completeTask(java.lang.String authToken, OptimizingTaskResult taskResult) throws ArcticException, org.apache.thrift.TException { send_completeTask(authToken, taskResult); recv_completeTask(); @@ -170,7 +170,7 @@ public void send_completeTask(java.lang.String authToken, OptimizingTaskResult t sendBase("completeTask", args); } - public void recv_completeTask() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public void recv_completeTask() throws ArcticException, org.apache.thrift.TException { completeTask_result result = new completeTask_result(); receiveBase(result, "completeTask"); @@ -180,7 +180,7 @@ public void recv_completeTask() throws com.netease.arctic.ams.api.ArcticExceptio return; } - public java.lang.String authenticate(OptimizerRegisterInfo registerInfo) throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public java.lang.String authenticate(OptimizerRegisterInfo registerInfo) throws ArcticException, org.apache.thrift.TException { send_authenticate(registerInfo); return recv_authenticate(); @@ -193,7 +193,7 @@ public void send_authenticate(OptimizerRegisterInfo registerInfo) throws org.apa sendBase("authenticate", args); } - public java.lang.String recv_authenticate() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException + public java.lang.String recv_authenticate() throws ArcticException, org.apache.thrift.TException { authenticate_result result = new authenticate_result(); receiveBase(result, "authenticate"); @@ -275,7 +275,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException { + public Void getResult() throws ArcticException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -310,7 +310,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public OptimizingTask getResult() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException { + public OptimizingTask getResult() throws ArcticException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -348,7 +348,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException { + public Void getResult() throws ArcticException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -383,7 +383,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public Void getResult() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException { + public Void getResult() throws ArcticException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -415,7 +415,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa prot.writeMessageEnd(); } - public java.lang.String getResult() throws com.netease.arctic.ams.api.ArcticException, org.apache.thrift.TException { + public java.lang.String getResult() throws ArcticException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } @@ -494,7 +494,7 @@ public touch_result getResult(I iface, touch_args args) throws org.apache.thrift touch_result result = new touch_result(); try { iface.touch(args.authToken); - } catch (com.netease.arctic.ams.api.ArcticException e1) { + } catch (ArcticException e1) { result.e1 = e1; } return result; @@ -523,7 +523,7 @@ public pollTask_result getResult(I iface, pollTask_args args) throws org.apache. pollTask_result result = new pollTask_result(); try { result.success = iface.pollTask(args.authToken, args.threadId); - } catch (com.netease.arctic.ams.api.ArcticException e1) { + } catch (ArcticException e1) { result.e1 = e1; } return result; @@ -552,7 +552,7 @@ public ackTask_result getResult(I iface, ackTask_args args) throws org.apache.th ackTask_result result = new ackTask_result(); try { iface.ackTask(args.authToken, args.threadId, args.taskId); - } catch (com.netease.arctic.ams.api.ArcticException e1) { + } catch (ArcticException e1) { result.e1 = e1; } return result; @@ -581,7 +581,7 @@ public completeTask_result getResult(I iface, completeTask_args args) throws org completeTask_result result = new completeTask_result(); try { iface.completeTask(args.authToken, args.taskResult); - } catch (com.netease.arctic.ams.api.ArcticException e1) { + } catch (ArcticException e1) { result.e1 = e1; } return result; @@ -610,7 +610,7 @@ public authenticate_result getResult(I iface, authenticate_args args) throws org authenticate_result result = new authenticate_result(); try { result.success = iface.authenticate(args.registerInfo); - } catch (com.netease.arctic.ams.api.ArcticException e1) { + } catch (ArcticException e1) { result.e1 = e1; } return result; @@ -727,8 +727,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; touch_result result = new touch_result(); - if (e instanceof com.netease.arctic.ams.api.ArcticException) { - result.e1 = (com.netease.arctic.ams.api.ArcticException) e; + if (e instanceof ArcticException) { + result.e1 = (ArcticException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -792,8 +792,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; pollTask_result result = new pollTask_result(); - if (e instanceof com.netease.arctic.ams.api.ArcticException) { - result.e1 = (com.netease.arctic.ams.api.ArcticException) e; + if (e instanceof ArcticException) { + result.e1 = (ArcticException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -856,8 +856,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; ackTask_result result = new ackTask_result(); - if (e instanceof com.netease.arctic.ams.api.ArcticException) { - result.e1 = (com.netease.arctic.ams.api.ArcticException) e; + if (e instanceof ArcticException) { + result.e1 = (ArcticException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -920,8 +920,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; completeTask_result result = new completeTask_result(); - if (e instanceof com.netease.arctic.ams.api.ArcticException) { - result.e1 = (com.netease.arctic.ams.api.ArcticException) e; + if (e instanceof ArcticException) { + result.e1 = (ArcticException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -985,8 +985,8 @@ public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; authenticate_result result = new authenticate_result(); - if (e instanceof com.netease.arctic.ams.api.ArcticException) { - result.e1 = (com.netease.arctic.ams.api.ArcticException) e; + if (e instanceof ArcticException) { + result.e1 = (ArcticException) e; result.setE1IsSet(true); msg = result; } else if (e instanceof org.apache.thrift.transport.TTransportException) { @@ -1906,7 +1906,7 @@ public static class touch_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.ArcticException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ArcticException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(touch_result.class, metaDataMap); } @@ -1982,7 +1982,7 @@ public touch_result() { } public touch_result( - com.netease.arctic.ams.api.ArcticException e1) + ArcticException e1) { this(); this.e1 = e1; @@ -1993,7 +1993,7 @@ public touch_result( */ public touch_result(touch_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.ArcticException(other.e1); + this.e1 = new ArcticException(other.e1); } } @@ -2007,11 +2007,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.ArcticException getE1() { + public ArcticException getE1() { return this.e1; } - public touch_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.ArcticException e1) { + public touch_result setE1(@org.apache.thrift.annotation.Nullable ArcticException e1) { this.e1 = e1; return this; } @@ -2037,7 +2037,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.ArcticException)value); + setE1((ArcticException)value); } break; @@ -2196,7 +2196,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, touch_result struct switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.ArcticException(); + struct.e1 = new ArcticException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -2255,7 +2255,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, touch_result struct) org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.ArcticException(); + struct.e1 = new ArcticException(); struct.e1.read(iprot); struct.setE1IsSet(true); } @@ -2744,7 +2744,7 @@ public static class pollTask_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.ArcticException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ArcticException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ackTask_result.class, metaDataMap); } @@ -3874,7 +3874,7 @@ public ackTask_result() { } public ackTask_result( - com.netease.arctic.ams.api.ArcticException e1) + ArcticException e1) { this(); this.e1 = e1; @@ -3885,7 +3885,7 @@ public ackTask_result( */ public ackTask_result(ackTask_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.ArcticException(other.e1); + this.e1 = new ArcticException(other.e1); } } @@ -3899,11 +3899,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.ArcticException getE1() { + public ArcticException getE1() { return this.e1; } - public ackTask_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.ArcticException e1) { + public ackTask_result setE1(@org.apache.thrift.annotation.Nullable ArcticException e1) { this.e1 = e1; return this; } @@ -3929,7 +3929,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.ArcticException)value); + setE1((ArcticException)value); } break; @@ -4088,7 +4088,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ackTask_result stru switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.ArcticException(); + struct.e1 = new ArcticException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -4147,7 +4147,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ackTask_result struc org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.ArcticException(); + struct.e1 = new ArcticException(); struct.e1.read(iprot); struct.setE1IsSet(true); } @@ -4644,7 +4644,7 @@ public static class completeTask_result implements org.apache.thrift.TBase tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.E1, new org.apache.thrift.meta_data.FieldMetaData("e1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.ArcticException.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ArcticException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(completeTask_result.class, metaDataMap); } @@ -4720,7 +4720,7 @@ public completeTask_result() { } public completeTask_result( - com.netease.arctic.ams.api.ArcticException e1) + ArcticException e1) { this(); this.e1 = e1; @@ -4731,7 +4731,7 @@ public completeTask_result( */ public completeTask_result(completeTask_result other) { if (other.isSetE1()) { - this.e1 = new com.netease.arctic.ams.api.ArcticException(other.e1); + this.e1 = new ArcticException(other.e1); } } @@ -4745,11 +4745,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.ArcticException getE1() { + public ArcticException getE1() { return this.e1; } - public completeTask_result setE1(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.ArcticException e1) { + public completeTask_result setE1(@org.apache.thrift.annotation.Nullable ArcticException e1) { this.e1 = e1; return this; } @@ -4775,7 +4775,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetE1(); } else { - setE1((com.netease.arctic.ams.api.ArcticException)value); + setE1((ArcticException)value); } break; @@ -4934,7 +4934,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, completeTask_result switch (schemeField.id) { case 1: // E1 if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.e1 = new com.netease.arctic.ams.api.ArcticException(); + struct.e1 = new ArcticException(); struct.e1.read(iprot); struct.setE1IsSet(true); } else { @@ -4993,7 +4993,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, completeTask_result org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.e1 = new com.netease.arctic.ams.api.ArcticException(); + struct.e1 = new ArcticException(); struct.e1.read(iprot); struct.setE1IsSet(true); } @@ -5387,7 +5387,7 @@ public static class authenticate_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OptimizingTask"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingTaskId.java b/core/src/main/gen-java/com/netease/arctic/api/OptimizingTaskId.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingTaskId.java rename to core/src/main/gen-java/com/netease/arctic/api/OptimizingTaskId.java index 58a40b9381..6abb08c9d2 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingTaskId.java +++ b/core/src/main/gen-java/com/netease/arctic/api/OptimizingTaskId.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class OptimizingTaskId implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OptimizingTaskId"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingTaskResult.java b/core/src/main/gen-java/com/netease/arctic/api/OptimizingTaskResult.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingTaskResult.java rename to core/src/main/gen-java/com/netease/arctic/api/OptimizingTaskResult.java index 9297a081cd..e3e56ee2aa 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/OptimizingTaskResult.java +++ b/core/src/main/gen-java/com/netease/arctic/api/OptimizingTaskResult.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class OptimizingTaskResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OptimizingTaskResult"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/PartitionFieldData.java b/core/src/main/gen-java/com/netease/arctic/api/PartitionFieldData.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/PartitionFieldData.java rename to core/src/main/gen-java/com/netease/arctic/api/PartitionFieldData.java index 969c7acaea..fed0fdf580 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/PartitionFieldData.java +++ b/core/src/main/gen-java/com/netease/arctic/api/PartitionFieldData.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class PartitionFieldData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionFieldData"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/PrimaryKeySpec.java b/core/src/main/gen-java/com/netease/arctic/api/PrimaryKeySpec.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/PrimaryKeySpec.java rename to core/src/main/gen-java/com/netease/arctic/api/PrimaryKeySpec.java index 5229a6c47d..22b2ba5ec8 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/PrimaryKeySpec.java +++ b/core/src/main/gen-java/com/netease/arctic/api/PrimaryKeySpec.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class PrimaryKeySpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrimaryKeySpec"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/Schema.java b/core/src/main/gen-java/com/netease/arctic/api/Schema.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/Schema.java rename to core/src/main/gen-java/com/netease/arctic/api/Schema.java index f3741653e3..c2bb154eea 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/Schema.java +++ b/core/src/main/gen-java/com/netease/arctic/api/Schema.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class Schema implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Schema"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/SchemaUpdateMeta.java b/core/src/main/gen-java/com/netease/arctic/api/SchemaUpdateMeta.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/SchemaUpdateMeta.java rename to core/src/main/gen-java/com/netease/arctic/api/SchemaUpdateMeta.java index 2702266154..16d94bbb33 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/SchemaUpdateMeta.java +++ b/core/src/main/gen-java/com/netease/arctic/api/SchemaUpdateMeta.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class SchemaUpdateMeta implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SchemaUpdateMeta"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableChange.java b/core/src/main/gen-java/com/netease/arctic/api/TableChange.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableChange.java rename to core/src/main/gen-java/com/netease/arctic/api/TableChange.java index 5cd4bfdd18..3711136051 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableChange.java +++ b/core/src/main/gen-java/com/netease/arctic/api/TableChange.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class TableChange implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableChange"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableCommitMeta.java b/core/src/main/gen-java/com/netease/arctic/api/TableCommitMeta.java similarity index 97% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableCommitMeta.java rename to core/src/main/gen-java/com/netease/arctic/api/TableCommitMeta.java index 767e96e76b..a2241bf753 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableCommitMeta.java +++ b/core/src/main/gen-java/com/netease/arctic/api/TableCommitMeta.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class TableCommitMeta implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableCommitMeta"); @@ -22,7 +22,7 @@ public class TableCommitMeta implements org.apache.thrift.TBase changes; // required public long commitTime; // required @@ -115,7 +115,7 @@ public java.lang.String getFieldName() { static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); tmpMap.put(_Fields.ACTION, new org.apache.thrift.meta_data.FieldMetaData("action", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.CHANGES, new org.apache.thrift.meta_data.FieldMetaData("changes", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -139,7 +139,7 @@ public TableCommitMeta() { } public TableCommitMeta( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier, + TableIdentifier tableIdentifier, java.lang.String action, java.util.List changes, long commitTime, @@ -164,7 +164,7 @@ public TableCommitMeta( public TableCommitMeta(TableCommitMeta other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } if (other.isSetAction()) { this.action = other.action; @@ -206,11 +206,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public TableCommitMeta setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public TableCommitMeta setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -411,7 +411,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -833,7 +833,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TableCommitMeta str switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -897,7 +897,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TableCommitMeta str break; case 6: // COMMIT_META_PRODUCER if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.commitMetaProducer = com.netease.arctic.ams.api.CommitMetaProducer.findByValue(iprot.readI32()); + struct.commitMetaProducer = CommitMetaProducer.findByValue(iprot.readI32()); struct.setCommitMetaProducerIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1056,7 +1056,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TableCommitMeta stru org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } @@ -1098,7 +1098,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TableCommitMeta stru struct.setPropertiesIsSet(true); } if (incoming.get(5)) { - struct.commitMetaProducer = com.netease.arctic.ams.api.CommitMetaProducer.findByValue(iprot.readI32()); + struct.commitMetaProducer = CommitMetaProducer.findByValue(iprot.readI32()); struct.setCommitMetaProducerIsSet(true); } if (incoming.get(6)) { diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableIdentifier.java b/core/src/main/gen-java/com/netease/arctic/api/TableIdentifier.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableIdentifier.java rename to core/src/main/gen-java/com/netease/arctic/api/TableIdentifier.java index 25402f8927..d6572e0482 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableIdentifier.java +++ b/core/src/main/gen-java/com/netease/arctic/api/TableIdentifier.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class TableIdentifier implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableIdentifier"); diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableMeta.java b/core/src/main/gen-java/com/netease/arctic/api/TableMeta.java similarity index 97% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableMeta.java rename to core/src/main/gen-java/com/netease/arctic/api/TableMeta.java index e58104b7a2..115be61f18 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/TableMeta.java +++ b/core/src/main/gen-java/com/netease/arctic/api/TableMeta.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-06-29") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class TableMeta implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableMeta"); @@ -20,7 +20,7 @@ public class TableMeta implements org.apache.thrift.TBase properties; // optional public @org.apache.thrift.annotation.Nullable java.util.Map locations; // required @@ -104,7 +104,7 @@ public java.lang.String getFieldName() { static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("tableIdentifier", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, com.netease.arctic.ams.api.TableIdentifier.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))); tmpMap.put(_Fields.KEY_SPEC, new org.apache.thrift.meta_data.FieldMetaData("keySpec", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "PrimaryKeySpec"))); tmpMap.put(_Fields.PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("properties", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -125,7 +125,7 @@ public TableMeta() { } public TableMeta( - com.netease.arctic.ams.api.TableIdentifier tableIdentifier, + TableIdentifier tableIdentifier, PrimaryKeySpec keySpec, java.util.Map locations, java.lang.String format) @@ -142,7 +142,7 @@ public TableMeta( */ public TableMeta(TableMeta other) { if (other.isSetTableIdentifier()) { - this.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(other.tableIdentifier); + this.tableIdentifier = new TableIdentifier(other.tableIdentifier); } if (other.isSetKeySpec()) { this.keySpec = new PrimaryKeySpec(other.keySpec); @@ -174,11 +174,11 @@ public void clear() { } @org.apache.thrift.annotation.Nullable - public com.netease.arctic.ams.api.TableIdentifier getTableIdentifier() { + public TableIdentifier getTableIdentifier() { return this.tableIdentifier; } - public TableMeta setTableIdentifier(@org.apache.thrift.annotation.Nullable com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public TableMeta setTableIdentifier(@org.apache.thrift.annotation.Nullable TableIdentifier tableIdentifier) { this.tableIdentifier = tableIdentifier; return this; } @@ -326,7 +326,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetTableIdentifier(); } else { - setTableIdentifier((com.netease.arctic.ams.api.TableIdentifier)value); + setTableIdentifier((TableIdentifier)value); } break; @@ -666,7 +666,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TableMeta struct) t switch (schemeField.id) { case 1: // TABLE_IDENTIFIER if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } else { @@ -858,7 +858,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TableMeta struct) th org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { - struct.tableIdentifier = new com.netease.arctic.ams.api.TableIdentifier(); + struct.tableIdentifier = new TableIdentifier(); struct.tableIdentifier.read(iprot); struct.setTableIdentifierIsSet(true); } diff --git a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/UpdateColumn.java b/core/src/main/gen-java/com/netease/arctic/api/UpdateColumn.java similarity index 99% rename from ams/api/src/main/gen-java/com/netease/arctic/ams/api/UpdateColumn.java rename to core/src/main/gen-java/com/netease/arctic/api/UpdateColumn.java index 436ea3348e..441d37461d 100644 --- a/ams/api/src/main/gen-java/com/netease/arctic/ams/api/UpdateColumn.java +++ b/core/src/main/gen-java/com/netease/arctic/api/UpdateColumn.java @@ -4,10 +4,10 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package com.netease.arctic.ams.api; +package com.netease.arctic.api; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2023-05-16") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2024-03-10") public class UpdateColumn implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UpdateColumn"); diff --git a/core/src/main/java/com/netease/arctic/AmoroTable.java b/core/src/main/java/com/netease/arctic/AmoroTable.java index efda12a8d5..75a267667c 100644 --- a/core/src/main/java/com/netease/arctic/AmoroTable.java +++ b/core/src/main/java/com/netease/arctic/AmoroTable.java @@ -18,7 +18,6 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.table.TableIdentifier; import java.util.Map; diff --git a/core/src/main/java/com/netease/arctic/AmsClient.java b/core/src/main/java/com/netease/arctic/AmsClient.java index f658af28f2..c0ac3006cd 100644 --- a/core/src/main/java/com/netease/arctic/AmsClient.java +++ b/core/src/main/java/com/netease/arctic/AmsClient.java @@ -18,7 +18,7 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.ArcticTableMetastore; +import com.netease.arctic.api.ArcticTableMetastore; import java.io.Serializable; diff --git a/core/src/main/java/com/netease/arctic/CommonUnifiedCatalog.java b/core/src/main/java/com/netease/arctic/CommonUnifiedCatalog.java index 72b617305c..112fe8a5fa 100644 --- a/core/src/main/java/com/netease/arctic/CommonUnifiedCatalog.java +++ b/core/src/main/java/com/netease/arctic/CommonUnifiedCatalog.java @@ -18,11 +18,10 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.table.TableIdentifier; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import java.util.List; @@ -46,9 +45,9 @@ public class CommonUnifiedCatalog implements UnifiedCatalog { public CommonUnifiedCatalog( Supplier catalogMetaSupplier, Map properties) { CatalogMeta catalogMeta = catalogMetaSupplier.get(); - CatalogUtil.mergeCatalogProperties(catalogMeta, properties); + ArcticCatalogUtil.mergeCatalogProperties(catalogMeta, properties); this.meta = catalogMeta; - this.tableMetaStore = CatalogUtil.buildMetaStore(catalogMeta); + this.tableMetaStore = ArcticCatalogUtil.buildMetaStore(catalogMeta); this.properties.putAll(properties); this.metaSupplier = catalogMetaSupplier; initializeFormatCatalogs(); @@ -172,11 +171,11 @@ public boolean dropTable(String database, String table, boolean purge) { @Override public synchronized void refresh() { CatalogMeta newMeta = metaSupplier.get(); - CatalogUtil.mergeCatalogProperties(meta, properties); + ArcticCatalogUtil.mergeCatalogProperties(meta, properties); if (newMeta.equals(this.meta)) { return; } - this.tableMetaStore = CatalogUtil.buildMetaStore(newMeta); + this.tableMetaStore = ArcticCatalogUtil.buildMetaStore(newMeta); this.meta = newMeta; this.initializeFormatCatalogs(); } @@ -188,8 +187,8 @@ public Map properties() { protected void initializeFormatCatalogs() { ServiceLoader loader = ServiceLoader.load(FormatCatalogFactory.class); - Set formats = CatalogUtil.tableFormats(this.meta); - TableMetaStore store = CatalogUtil.buildMetaStore(this.meta); + Set formats = ArcticCatalogUtil.tableFormats(this.meta); + TableMetaStore store = ArcticCatalogUtil.buildMetaStore(this.meta); Map formatCatalogs = Maps.newConcurrentMap(); for (FormatCatalogFactory factory : loader) { if (formats.contains(factory.format())) { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/Constants.java b/core/src/main/java/com/netease/arctic/Constants.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/Constants.java rename to core/src/main/java/com/netease/arctic/Constants.java index 7d1da3d005..81720e794b 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/Constants.java +++ b/core/src/main/java/com/netease/arctic/Constants.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic; public class Constants { public static final String INNER_TABLE_BASE = "base"; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/ErrorCodes.java b/core/src/main/java/com/netease/arctic/ErrorCodes.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/ErrorCodes.java rename to core/src/main/java/com/netease/arctic/ErrorCodes.java index b978292de1..25ebef2ddf 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/ErrorCodes.java +++ b/core/src/main/java/com/netease/arctic/ErrorCodes.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic; public final class ErrorCodes { diff --git a/core/src/main/java/com/netease/arctic/FormatCatalogFactory.java b/core/src/main/java/com/netease/arctic/FormatCatalogFactory.java index 3454bc7c6c..fc6d7821bf 100644 --- a/core/src/main/java/com/netease/arctic/FormatCatalogFactory.java +++ b/core/src/main/java/com/netease/arctic/FormatCatalogFactory.java @@ -18,7 +18,6 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.table.TableMetaStore; import java.util.Map; diff --git a/core/src/main/java/com/netease/arctic/PooledAmsClient.java b/core/src/main/java/com/netease/arctic/PooledAmsClient.java index 4569261cd4..e5f648131f 100644 --- a/core/src/main/java/com/netease/arctic/PooledAmsClient.java +++ b/core/src/main/java/com/netease/arctic/PooledAmsClient.java @@ -18,14 +18,14 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.ArcticTableMetastore; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.Blocker; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableCommitMeta; -import com.netease.arctic.ams.api.TableIdentifier; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.client.AmsClientPools; +import com.netease.arctic.api.ArcticTableMetastore; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.Blocker; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableCommitMeta; +import com.netease.arctic.api.TableIdentifier; +import com.netease.arctic.api.TableMeta; +import com.netease.arctic.client.AmsClientPools; import org.apache.thrift.TException; import java.util.List; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/TableFormat.java b/core/src/main/java/com/netease/arctic/TableFormat.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/TableFormat.java rename to core/src/main/java/com/netease/arctic/TableFormat.java index 9d376df355..8b15767cbf 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/TableFormat.java +++ b/core/src/main/java/com/netease/arctic/TableFormat.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic; /** * Table formats Arctic supported diff --git a/core/src/main/java/com/netease/arctic/TableIDWithFormat.java b/core/src/main/java/com/netease/arctic/TableIDWithFormat.java index 69cfdcd0c7..6898b281ff 100644 --- a/core/src/main/java/com/netease/arctic/TableIDWithFormat.java +++ b/core/src/main/java/com/netease/arctic/TableIDWithFormat.java @@ -18,7 +18,6 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.table.TableIdentifier; public class TableIDWithFormat { diff --git a/core/src/main/java/com/netease/arctic/UnifiedCatalogLoader.java b/core/src/main/java/com/netease/arctic/UnifiedCatalogLoader.java index 4cb09d8f02..3f0808eee8 100644 --- a/core/src/main/java/com/netease/arctic/UnifiedCatalogLoader.java +++ b/core/src/main/java/com/netease/arctic/UnifiedCatalogLoader.java @@ -18,9 +18,9 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.NoSuchObjectException; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.NoSuchObjectException; +import com.netease.arctic.properties.CatalogMetaProperties; import java.util.Map; import java.util.function.Supplier; diff --git a/core/src/main/java/com/netease/arctic/catalog/BasicArcticCatalog.java b/core/src/main/java/com/netease/arctic/catalog/BasicArcticCatalog.java index 4ca8fcecee..c83b4cb8f4 100644 --- a/core/src/main/java/com/netease/arctic/catalog/BasicArcticCatalog.java +++ b/core/src/main/java/com/netease/arctic/catalog/BasicArcticCatalog.java @@ -18,43 +18,31 @@ package com.netease.arctic.catalog; -import static com.netease.arctic.table.TableProperties.LOG_STORE_STORAGE_TYPE_KAFKA; -import static com.netease.arctic.table.TableProperties.LOG_STORE_STORAGE_TYPE_PULSAR; -import static com.netease.arctic.table.TableProperties.LOG_STORE_TYPE; +import static com.netease.arctic.table.TableProperties.*; import com.netease.arctic.AmsClient; import com.netease.arctic.NoSuchDatabaseException; import com.netease.arctic.PooledAmsClient; -import com.netease.arctic.ams.api.AlreadyExistsException; -import com.netease.arctic.ams.api.NoSuchObjectException; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.AlreadyExistsException; +import com.netease.arctic.api.NoSuchObjectException; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.ArcticFileIOs; import com.netease.arctic.mixed.InternalMixedIcebergCatalog; import com.netease.arctic.op.ArcticHadoopTableOperations; import com.netease.arctic.op.CreateTableTransaction; -import com.netease.arctic.table.ArcticTable; -import com.netease.arctic.table.PrimaryKeySpec; -import com.netease.arctic.table.TableBuilder; -import com.netease.arctic.table.TableIdentifier; -import com.netease.arctic.table.TableMetaStore; +import com.netease.arctic.properties.CatalogMetaProperties; +import com.netease.arctic.table.*; import com.netease.arctic.table.TableProperties; import com.netease.arctic.table.blocker.BasicTableBlockerManager; import com.netease.arctic.table.blocker.TableBlockerManager; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.CompatiblePropertyUtil; import com.netease.arctic.utils.ConvertStructUtil; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.Path; -import org.apache.iceberg.PartitionSpec; -import org.apache.iceberg.Schema; -import org.apache.iceberg.SortOrder; -import org.apache.iceberg.TableMetadata; -import org.apache.iceberg.TableOperations; -import org.apache.iceberg.Transaction; -import org.apache.iceberg.Transactions; +import org.apache.iceberg.*; import org.apache.iceberg.exceptions.NoSuchTableException; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; @@ -213,7 +201,7 @@ public Map properties() { protected TableMeta getArcticTableMeta(TableIdentifier identifier) { TableMeta tableMeta; try { - tableMeta = getClient().getTable(CatalogUtil.amsTaleId(identifier)); + tableMeta = getClient().getTable(ArcticCatalogUtil.amsTaleId(identifier)); return tableMeta; } catch (NoSuchObjectException e) { throw new NoSuchTableException(e, "load table failed %s.", identifier); @@ -357,7 +345,7 @@ protected void doCreateCheck() { protected void checkProperties() { Map mergedProperties = - CatalogUtil.mergeCatalogPropertiesToTable(properties, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(properties, catalogProperties); boolean enableStream = CompatiblePropertyUtil.propertyAsBoolean( mergedProperties, diff --git a/core/src/main/java/com/netease/arctic/catalog/CatalogLoader.java b/core/src/main/java/com/netease/arctic/catalog/CatalogLoader.java index e6897cc3f7..06a7fefb06 100644 --- a/core/src/main/java/com/netease/arctic/catalog/CatalogLoader.java +++ b/core/src/main/java/com/netease/arctic/catalog/CatalogLoader.java @@ -18,26 +18,20 @@ package com.netease.arctic.catalog; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_AMS; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_CUSTOM; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_GLUE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HADOOP; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HIVE; - import com.netease.arctic.AmsClient; +import com.netease.arctic.Constants; import com.netease.arctic.PooledAmsClient; -import com.netease.arctic.ams.api.ArcticTableMetastore; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.NoSuchObjectException; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.client.AmsClientPools; -import com.netease.arctic.ams.api.client.ArcticThriftUrl; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.ArcticTableMetastore; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.NoSuchObjectException; +import com.netease.arctic.client.AmsClientPools; +import com.netease.arctic.client.ArcticThriftUrl; import com.netease.arctic.mixed.BasicMixedIcebergCatalog; import com.netease.arctic.mixed.InternalMixedIcebergCatalog; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.common.DynConstructors; import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; @@ -91,7 +85,8 @@ public static ArcticCatalog load(String catalogUrl) { * @return class name for catalog */ private static String catalogImpl(String metastoreType, Map catalogProperties) { - Set tableFormats = CatalogUtil.tableFormats(metastoreType, catalogProperties); + Set tableFormats = + ArcticCatalogUtil.tableFormats(metastoreType, catalogProperties); Preconditions.checkArgument( tableFormats.size() == 1, "Catalog support only one table format now."); TableFormat tableFormat = tableFormats.iterator().next(); @@ -102,23 +97,23 @@ private static String catalogImpl(String metastoreType, Map cata String catalogImpl; switch (metastoreType) { - case CATALOG_TYPE_HADOOP: - case CATALOG_TYPE_GLUE: - case CATALOG_TYPE_CUSTOM: + case CatalogMetaProperties.CATALOG_TYPE_HADOOP: + case CatalogMetaProperties.CATALOG_TYPE_GLUE: + case CatalogMetaProperties.CATALOG_TYPE_CUSTOM: Preconditions.checkArgument( TableFormat.MIXED_ICEBERG == tableFormat, "%s catalog support mixed-iceberg table only.", metastoreType); catalogImpl = MIXED_ICEBERG_CATALOG_IMP; break; - case CATALOG_TYPE_HIVE: + case CatalogMetaProperties.CATALOG_TYPE_HIVE: if (TableFormat.MIXED_HIVE == tableFormat) { catalogImpl = HIVE_CATALOG_IMPL; } else { catalogImpl = MIXED_ICEBERG_CATALOG_IMP; } break; - case CATALOG_TYPE_AMS: + case CatalogMetaProperties.CATALOG_TYPE_AMS: if (TableFormat.MIXED_ICEBERG == tableFormat) { catalogImpl = INTERNAL_CATALOG_IMPL; } else { @@ -180,12 +175,12 @@ private static ArcticCatalog loadCatalog( CatalogMeta catalogMeta = client.getCatalog(catalogName); String type = catalogMeta.getCatalogType(); catalogMeta.putToCatalogProperties(CatalogMetaProperties.AMS_URI, metaStoreUrl); - CatalogUtil.mergeCatalogProperties(catalogMeta, properties); + ArcticCatalogUtil.mergeCatalogProperties(catalogMeta, properties); return createCatalog( catalogName, type, catalogMeta.getCatalogProperties(), - CatalogUtil.buildMetaStore(catalogMeta)); + ArcticCatalogUtil.buildMetaStore(catalogMeta)); } catch (NoSuchObjectException e1) { throw new IllegalArgumentException("catalog not found, please check catalog name", e1); } catch (Exception e) { @@ -209,7 +204,8 @@ public static ArcticCatalog createCatalog( TableMetaStore metaStore) { String catalogImpl = catalogImpl(metastoreType, properties); properties = - CatalogUtil.withIcebergCatalogInitializeProperties(catalogName, metastoreType, properties); + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( + catalogName, metastoreType, properties); ArcticCatalog catalog = buildCatalog(catalogImpl); catalog.initialize(catalogName, properties, metaStore); return catalog; @@ -223,7 +219,8 @@ public static ArcticCatalog createCatalog( Map properties, TableMetaStore metaStore) { properties = - CatalogUtil.withIcebergCatalogInitializeProperties(catalogName, metastoreType, properties); + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( + catalogName, metastoreType, properties); ArcticCatalog catalog = buildCatalog(catalogImpl); catalog.initialize(catalogName, properties, metaStore); return catalog; diff --git a/core/src/main/java/com/netease/arctic/catalog/MixedTables.java b/core/src/main/java/com/netease/arctic/catalog/MixedTables.java index 5ed7523087..93f548fdcc 100644 --- a/core/src/main/java/com/netease/arctic/catalog/MixedTables.java +++ b/core/src/main/java/com/netease/arctic/catalog/MixedTables.java @@ -18,11 +18,11 @@ package com.netease.arctic.catalog; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.properties.MetaTableProperties; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.ArcticFileIOs; import com.netease.arctic.io.TableTrashManagers; +import com.netease.arctic.properties.MetaTableProperties; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.BaseTable; import com.netease.arctic.table.BasicKeyedTable; @@ -34,7 +34,7 @@ import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.TableProperties; import com.netease.arctic.table.UnkeyedTable; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.commons.lang3.StringUtils; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -52,6 +52,7 @@ * TODO: this class will be removed when we support using restCatalog as base store for * InternalCatalog */ +@Deprecated public class MixedTables { private static final Logger LOG = LoggerFactory.getLogger(MixedTables.class); @@ -93,7 +94,7 @@ protected KeyedTable loadKeyedTable(TableMeta tableMeta) { BaseTable baseTable = new BasicKeyedTable.BaseInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( baseIcebergTable, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); @@ -102,7 +103,7 @@ protected KeyedTable loadKeyedTable(TableMeta tableMeta) { ChangeTable changeTable = new BasicKeyedTable.ChangeInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( changeIcebergTable, changeLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); @@ -143,7 +144,7 @@ protected UnkeyedTable loadUnKeyedTable(TableMeta tableMeta) { catalogProperties); return new BasicUnkeyedTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( table, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); @@ -192,7 +193,7 @@ protected KeyedTable createKeyedTable( BaseTable baseTable = new BasicKeyedTable.BaseInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( baseIcebergTable, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); @@ -210,7 +211,7 @@ protected KeyedTable createKeyedTable( ChangeTable changeTable = new BasicKeyedTable.ChangeInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( changeIcebergTable, changeLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); @@ -256,7 +257,7 @@ protected UnkeyedTable createUnKeyedTable( catalogProperties); return new BasicUnkeyedTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( table, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/AmsClientPools.java b/core/src/main/java/com/netease/arctic/client/AmsClientPools.java similarity index 94% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/AmsClientPools.java rename to core/src/main/java/com/netease/arctic/client/AmsClientPools.java index 1db87de51e..676fab6504 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/AmsClientPools.java +++ b/core/src/main/java/com/netease/arctic/client/AmsClientPools.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import com.netease.arctic.ams.api.ArcticTableMetastore; -import com.netease.arctic.ams.api.Constants; +import com.netease.arctic.Constants; +import com.netease.arctic.api.ArcticTableMetastore; import org.apache.thrift.TException; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TMultiplexedProtocol; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/AmsServerInfo.java b/core/src/main/java/com/netease/arctic/client/AmsServerInfo.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/AmsServerInfo.java rename to core/src/main/java/com/netease/arctic/client/AmsServerInfo.java index 9ab65aa988..40f249de43 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/AmsServerInfo.java +++ b/core/src/main/java/com/netease/arctic/client/AmsServerInfo.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import java.util.Objects; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ArcticThriftUrl.java b/core/src/main/java/com/netease/arctic/client/ArcticThriftUrl.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ArcticThriftUrl.java rename to core/src/main/java/com/netease/arctic/client/ArcticThriftUrl.java index 43ac81472b..38bea8f709 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ArcticThriftUrl.java +++ b/core/src/main/java/com/netease/arctic/client/ArcticThriftUrl.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import com.alibaba.fastjson.JSONObject; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.properties.AmsHAProperties; +import com.netease.arctic.Constants; +import com.netease.arctic.properties.AmsHAProperties; import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ArcticZookeeperFactory.java b/core/src/main/java/com/netease/arctic/client/ArcticZookeeperFactory.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ArcticZookeeperFactory.java rename to core/src/main/java/com/netease/arctic/client/ArcticZookeeperFactory.java index ff86a94e57..383190c9da 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ArcticZookeeperFactory.java +++ b/core/src/main/java/com/netease/arctic/client/ArcticZookeeperFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.curator.utils.ZookeeperFactory; import org.apache.zookeeper.Watcher; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ConnectionFailException.java b/core/src/main/java/com/netease/arctic/client/ConnectionFailException.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ConnectionFailException.java rename to core/src/main/java/com/netease/arctic/client/ConnectionFailException.java index ed86e60bf7..39caa16718 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ConnectionFailException.java +++ b/core/src/main/java/com/netease/arctic/client/ConnectionFailException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; public class ConnectionFailException extends ThriftException { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/NoBackendServiceException.java b/core/src/main/java/com/netease/arctic/client/NoBackendServiceException.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/NoBackendServiceException.java rename to core/src/main/java/com/netease/arctic/client/NoBackendServiceException.java index 36ce266fd3..1a66ffed79 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/NoBackendServiceException.java +++ b/core/src/main/java/com/netease/arctic/client/NoBackendServiceException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; public class NoBackendServiceException extends ConnectionFailException { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/OptimizingClientPools.java b/core/src/main/java/com/netease/arctic/client/OptimizingClientPools.java similarity index 94% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/OptimizingClientPools.java rename to core/src/main/java/com/netease/arctic/client/OptimizingClientPools.java index a967680249..a4924d2f9a 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/OptimizingClientPools.java +++ b/core/src/main/java/com/netease/arctic/client/OptimizingClientPools.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.OptimizingService; +import com.netease.arctic.Constants; +import com.netease.arctic.api.OptimizingService; import org.apache.thrift.TException; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TMultiplexedProtocol; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/PoolConfig.java b/core/src/main/java/com/netease/arctic/client/PoolConfig.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/PoolConfig.java rename to core/src/main/java/com/netease/arctic/client/PoolConfig.java index f5a6ee758f..8f02fb3d1c 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/PoolConfig.java +++ b/core/src/main/java/com/netease/arctic/client/PoolConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ServiceInfo.java b/core/src/main/java/com/netease/arctic/client/ServiceInfo.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ServiceInfo.java rename to core/src/main/java/com/netease/arctic/client/ServiceInfo.java index 52cb904ed0..b470960b17 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ServiceInfo.java +++ b/core/src/main/java/com/netease/arctic/client/ServiceInfo.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; public class ServiceInfo { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClient.java b/core/src/main/java/com/netease/arctic/client/ThriftClient.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClient.java rename to core/src/main/java/com/netease/arctic/client/ThriftClient.java index 8a2bee1f24..52db636296 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClient.java +++ b/core/src/main/java/com/netease/arctic/client/ThriftClient.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.commons.pool2.ObjectPool; import org.apache.thrift.TServiceClient; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClientFactory.java b/core/src/main/java/com/netease/arctic/client/ThriftClientFactory.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClientFactory.java rename to core/src/main/java/com/netease/arctic/client/ThriftClientFactory.java index ffcc032681..75dd167721 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClientFactory.java +++ b/core/src/main/java/com/netease/arctic/client/ThriftClientFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.thrift.TServiceClient; import org.apache.thrift.transport.TTransport; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClientPool.java b/core/src/main/java/com/netease/arctic/client/ThriftClientPool.java similarity index 99% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClientPool.java rename to core/src/main/java/com/netease/arctic/client/ThriftClientPool.java index ca303b5945..e55fb3c871 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftClientPool.java +++ b/core/src/main/java/com/netease/arctic/client/ThriftClientPool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.commons.pool2.BasePooledObjectFactory; import org.apache.commons.pool2.PooledObject; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftException.java b/core/src/main/java/com/netease/arctic/client/ThriftException.java similarity index 96% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftException.java rename to core/src/main/java/com/netease/arctic/client/ThriftException.java index a40596c39c..919f3bfdee 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftException.java +++ b/core/src/main/java/com/netease/arctic/client/ThriftException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; public class ThriftException extends RuntimeException { diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftPingFactory.java b/core/src/main/java/com/netease/arctic/client/ThriftPingFactory.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftPingFactory.java rename to core/src/main/java/com/netease/arctic/client/ThriftPingFactory.java index f2c402975b..b745405633 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftPingFactory.java +++ b/core/src/main/java/com/netease/arctic/client/ThriftPingFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.thrift.TServiceClient; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftUtil.java b/core/src/main/java/com/netease/arctic/client/ThriftUtil.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftUtil.java rename to core/src/main/java/com/netease/arctic/client/ThriftUtil.java index c92b73df06..cea5fe7077 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ThriftUtil.java +++ b/core/src/main/java/com/netease/arctic/client/ThriftUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.thrift.TServiceClient; import org.apache.thrift.protocol.TProtocol; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ZookeeperService.java b/core/src/main/java/com/netease/arctic/client/ZookeeperService.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/client/ZookeeperService.java rename to core/src/main/java/com/netease/arctic/client/ZookeeperService.java index 98c2dfc344..c45e2d8ac6 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/client/ZookeeperService.java +++ b/core/src/main/java/com/netease/arctic/client/ZookeeperService.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.client; +package com.netease.arctic.client; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/core/src/main/java/com/netease/arctic/data/FileNameRules.java b/core/src/main/java/com/netease/arctic/data/FileNameRules.java index 007ac6fdf0..5e16efe084 100644 --- a/core/src/main/java/com/netease/arctic/data/FileNameRules.java +++ b/core/src/main/java/com/netease/arctic/data/FileNameRules.java @@ -18,7 +18,7 @@ package com.netease.arctic.data; -import com.netease.arctic.ams.api.Constants; +import com.netease.arctic.Constants; import com.netease.arctic.io.writer.TaskWriterKey; import com.netease.arctic.utils.IdGenerator; import com.netease.arctic.utils.TableFileUtil; diff --git a/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergCatalogFactory.java b/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergCatalogFactory.java index 77b6e60634..3bd760cdc2 100644 --- a/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergCatalogFactory.java +++ b/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergCatalogFactory.java @@ -20,8 +20,9 @@ import com.netease.arctic.FormatCatalog; import com.netease.arctic.FormatCatalogFactory; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.table.TableMetaStore; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.commons.lang3.StringUtils; import org.apache.iceberg.CatalogUtil; import org.apache.iceberg.catalog.Catalog; @@ -36,8 +37,7 @@ public FormatCatalog create( String name, String metastoreType, Map properties, TableMetaStore metaStore) { Preconditions.checkArgument(StringUtils.isNotBlank(metastoreType), "metastore type is blank"); properties = - com.netease.arctic.utils.CatalogUtil.withIcebergCatalogInitializeProperties( - name, metastoreType, properties); + ArcticCatalogUtil.withIcebergCatalogInitializeProperties(name, metastoreType, properties); Catalog icebergCatalog = CatalogUtil.buildIcebergCatalog(name, properties, metaStore.getConfiguration()); @@ -52,7 +52,7 @@ public TableFormat format() { @Override public Map convertCatalogProperties( String catalogName, String metastoreType, Map unifiedCatalogProperties) { - return com.netease.arctic.utils.CatalogUtil.withIcebergCatalogInitializeProperties( + return ArcticCatalogUtil.withIcebergCatalogInitializeProperties( catalogName, metastoreType, unifiedCatalogProperties); } } diff --git a/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergTable.java b/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergTable.java index 770ba83c1f..12c098e0ec 100644 --- a/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergTable.java +++ b/core/src/main/java/com/netease/arctic/formats/iceberg/IcebergTable.java @@ -19,15 +19,15 @@ package com.netease.arctic.formats.iceberg; import com.netease.arctic.AmoroTable; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableSnapshot; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.ArcticFileIOs; import com.netease.arctic.table.BasicUnkeyedTable; import com.netease.arctic.table.TableIdentifier; import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.UnkeyedTable; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.Snapshot; import org.apache.iceberg.Table; @@ -54,7 +54,7 @@ public static IcebergTable newIcebergTable( UnkeyedTable wrapped = new BasicUnkeyedTable( identifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( icebergTable, icebergTable.location(), io, metaStore.getConfiguration()), io, catalogProperties) { diff --git a/core/src/main/java/com/netease/arctic/formats/mixed/MixedCatalog.java b/core/src/main/java/com/netease/arctic/formats/mixed/MixedCatalog.java index 1ed99aa2ca..8ba46c2bc7 100644 --- a/core/src/main/java/com/netease/arctic/formats/mixed/MixedCatalog.java +++ b/core/src/main/java/com/netease/arctic/formats/mixed/MixedCatalog.java @@ -20,7 +20,7 @@ import com.netease.arctic.AmoroTable; import com.netease.arctic.FormatCatalog; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.TableIdentifier; diff --git a/core/src/main/java/com/netease/arctic/formats/mixed/MixedHiveCatalogFactory.java b/core/src/main/java/com/netease/arctic/formats/mixed/MixedHiveCatalogFactory.java index 5040f0a1ec..79082fc76d 100644 --- a/core/src/main/java/com/netease/arctic/formats/mixed/MixedHiveCatalogFactory.java +++ b/core/src/main/java/com/netease/arctic/formats/mixed/MixedHiveCatalogFactory.java @@ -18,7 +18,7 @@ package com.netease.arctic.formats.mixed; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; public class MixedHiveCatalogFactory extends MixedIcebergCatalogFactory { @Override diff --git a/core/src/main/java/com/netease/arctic/formats/mixed/MixedIcebergCatalogFactory.java b/core/src/main/java/com/netease/arctic/formats/mixed/MixedIcebergCatalogFactory.java index 88d86bbd55..0eb8174fb7 100644 --- a/core/src/main/java/com/netease/arctic/formats/mixed/MixedIcebergCatalogFactory.java +++ b/core/src/main/java/com/netease/arctic/formats/mixed/MixedIcebergCatalogFactory.java @@ -20,12 +20,12 @@ import com.netease.arctic.FormatCatalog; import com.netease.arctic.FormatCatalogFactory; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.CatalogLoader; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import java.util.Map; @@ -50,7 +50,7 @@ public TableFormat format() { public Map convertCatalogProperties( String catalogName, String metastoreType, Map unifiedCatalogProperties) { Map properties = - CatalogUtil.withIcebergCatalogInitializeProperties( + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( catalogName, metastoreType, unifiedCatalogProperties); properties.put(CatalogMetaProperties.TABLE_FORMATS, format().name()); return properties; diff --git a/core/src/main/java/com/netease/arctic/formats/mixed/MixedTable.java b/core/src/main/java/com/netease/arctic/formats/mixed/MixedTable.java index 30825b42b7..29a9ffe3cd 100644 --- a/core/src/main/java/com/netease/arctic/formats/mixed/MixedTable.java +++ b/core/src/main/java/com/netease/arctic/formats/mixed/MixedTable.java @@ -19,8 +19,8 @@ package com.netease.arctic.formats.mixed; import com.netease.arctic.AmoroTable; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableSnapshot; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.TableIdentifier; import org.apache.iceberg.Snapshot; diff --git a/core/src/main/java/com/netease/arctic/formats/paimon/PaimonCatalogFactory.java b/core/src/main/java/com/netease/arctic/formats/paimon/PaimonCatalogFactory.java index 81af9e2e10..2f62536fac 100644 --- a/core/src/main/java/com/netease/arctic/formats/paimon/PaimonCatalogFactory.java +++ b/core/src/main/java/com/netease/arctic/formats/paimon/PaimonCatalogFactory.java @@ -19,8 +19,8 @@ package com.netease.arctic.formats.paimon; import com.netease.arctic.FormatCatalogFactory; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.TableMetaStore; import org.apache.hadoop.conf.Configuration; import org.apache.iceberg.relocated.com.google.common.collect.Maps; diff --git a/core/src/main/java/com/netease/arctic/formats/paimon/PaimonTable.java b/core/src/main/java/com/netease/arctic/formats/paimon/PaimonTable.java index 6508b194d9..a319b7f89b 100644 --- a/core/src/main/java/com/netease/arctic/formats/paimon/PaimonTable.java +++ b/core/src/main/java/com/netease/arctic/formats/paimon/PaimonTable.java @@ -19,8 +19,8 @@ package com.netease.arctic.formats.paimon; import com.netease.arctic.AmoroTable; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableSnapshot; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.table.TableIdentifier; import org.apache.paimon.Snapshot; import org.apache.paimon.table.DataTable; diff --git a/core/src/main/java/com/netease/arctic/io/ArcticFileIOs.java b/core/src/main/java/com/netease/arctic/io/ArcticFileIOs.java index d670f1ab8a..3b8c66d136 100644 --- a/core/src/main/java/com/netease/arctic/io/ArcticFileIOs.java +++ b/core/src/main/java/com/netease/arctic/io/ArcticFileIOs.java @@ -21,7 +21,7 @@ import com.netease.arctic.table.TableIdentifier; import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.TableProperties; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.hadoop.HadoopFileIO; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.util.PropertyUtil; @@ -38,7 +38,8 @@ public static ArcticHadoopFileIO buildRecoverableHadoopFileIO( Map tableProperties, TableMetaStore tableMetaStore, Map catalogProperties) { - tableProperties = CatalogUtil.mergeCatalogPropertiesToTable(tableProperties, catalogProperties); + tableProperties = + ArcticCatalogUtil.mergeCatalogPropertiesToTable(tableProperties, catalogProperties); if (!CLOSE_TRASH && PropertyUtil.propertyAsBoolean( tableProperties, diff --git a/core/src/main/java/com/netease/arctic/mixed/BasicMixedIcebergCatalog.java b/core/src/main/java/com/netease/arctic/mixed/BasicMixedIcebergCatalog.java index 92eb50fa5b..a7d09dba3d 100644 --- a/core/src/main/java/com/netease/arctic/mixed/BasicMixedIcebergCatalog.java +++ b/core/src/main/java/com/netease/arctic/mixed/BasicMixedIcebergCatalog.java @@ -20,11 +20,11 @@ import com.netease.arctic.AmsClient; import com.netease.arctic.PooledAmsClient; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.TableTrashManagers; import com.netease.arctic.op.CreateTableTransaction; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableBuilder; diff --git a/core/src/main/java/com/netease/arctic/mixed/InternalMixedIcebergCatalog.java b/core/src/main/java/com/netease/arctic/mixed/InternalMixedIcebergCatalog.java index d3ac47328b..15d43a62de 100644 --- a/core/src/main/java/com/netease/arctic/mixed/InternalMixedIcebergCatalog.java +++ b/core/src/main/java/com/netease/arctic/mixed/InternalMixedIcebergCatalog.java @@ -19,7 +19,7 @@ package com.netease.arctic.mixed; import com.google.common.collect.Maps; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableMetaStore; import org.apache.hadoop.conf.Configuration; diff --git a/core/src/main/java/com/netease/arctic/mixed/MixedTables.java b/core/src/main/java/com/netease/arctic/mixed/MixedTables.java index 7735c91d52..63fc6933fe 100644 --- a/core/src/main/java/com/netease/arctic/mixed/MixedTables.java +++ b/core/src/main/java/com/netease/arctic/mixed/MixedTables.java @@ -18,10 +18,10 @@ package com.netease.arctic.mixed; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.ArcticFileIOs; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.BaseTable; import com.netease.arctic.table.BasicKeyedTable; @@ -30,7 +30,7 @@ import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.UnkeyedTable; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.TablePropertyUtil; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -274,7 +274,7 @@ private boolean tableStoreExists(TableIdentifier identifier) { } private Table useArcticTableOperation(Table table, ArcticFileIO io) { - return CatalogUtil.useArcticTableOperations( + return ArcticCatalogUtil.useArcticTableOperations( table, table.location(), io, tableMetaStore.getConfiguration()); } } diff --git a/core/src/main/java/com/netease/arctic/op/SnapshotSummary.java b/core/src/main/java/com/netease/arctic/op/SnapshotSummary.java index f991c76cdc..c3a3700a57 100644 --- a/core/src/main/java/com/netease/arctic/op/SnapshotSummary.java +++ b/core/src/main/java/com/netease/arctic/op/SnapshotSummary.java @@ -18,7 +18,7 @@ package com.netease.arctic.op; -import com.netease.arctic.ams.api.CommitMetaProducer; +import com.netease.arctic.api.CommitMetaProducer; public class SnapshotSummary { public static final String SNAPSHOT_PRODUCER = "snapshot.producer"; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/properties/AmsHAProperties.java b/core/src/main/java/com/netease/arctic/properties/AmsHAProperties.java similarity index 97% rename from ams/api/src/main/java/com/netease/arctic/ams/api/properties/AmsHAProperties.java rename to core/src/main/java/com/netease/arctic/properties/AmsHAProperties.java index 5d13a3a7d3..95dadca6df 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/properties/AmsHAProperties.java +++ b/core/src/main/java/com/netease/arctic/properties/AmsHAProperties.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.properties; +package com.netease.arctic.properties; import org.apache.iceberg.relocated.com.google.common.base.Strings; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/properties/CatalogMetaProperties.java b/core/src/main/java/com/netease/arctic/properties/CatalogMetaProperties.java similarity index 98% rename from ams/api/src/main/java/com/netease/arctic/ams/api/properties/CatalogMetaProperties.java rename to core/src/main/java/com/netease/arctic/properties/CatalogMetaProperties.java index 8e2544ea5f..ec4e835803 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/properties/CatalogMetaProperties.java +++ b/core/src/main/java/com/netease/arctic/properties/CatalogMetaProperties.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.properties; +package com.netease.arctic.properties; import java.util.concurrent.TimeUnit; diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/properties/MetaTableProperties.java b/core/src/main/java/com/netease/arctic/properties/MetaTableProperties.java similarity index 95% rename from ams/api/src/main/java/com/netease/arctic/ams/api/properties/MetaTableProperties.java rename to core/src/main/java/com/netease/arctic/properties/MetaTableProperties.java index e447a4ca64..ff56dcfa28 100644 --- a/ams/api/src/main/java/com/netease/arctic/ams/api/properties/MetaTableProperties.java +++ b/core/src/main/java/com/netease/arctic/properties/MetaTableProperties.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.netease.arctic.ams.api.properties; +package com.netease.arctic.properties; public class MetaTableProperties { public static final String LOCATION_KEY_TABLE = "table"; diff --git a/core/src/main/java/com/netease/arctic/table/ArcticTable.java b/core/src/main/java/com/netease/arctic/table/ArcticTable.java index 2e28b9f65d..507d8f7e09 100644 --- a/core/src/main/java/com/netease/arctic/table/ArcticTable.java +++ b/core/src/main/java/com/netease/arctic/table/ArcticTable.java @@ -18,7 +18,7 @@ package com.netease.arctic.table; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.io.ArcticFileIO; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/core/src/main/java/com/netease/arctic/table/BasicKeyedTable.java b/core/src/main/java/com/netease/arctic/table/BasicKeyedTable.java index fa039cf05f..4b4195fd58 100644 --- a/core/src/main/java/com/netease/arctic/table/BasicKeyedTable.java +++ b/core/src/main/java/com/netease/arctic/table/BasicKeyedTable.java @@ -18,7 +18,7 @@ package com.netease.arctic.table; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.op.KeyedPartitionRewrite; import com.netease.arctic.op.KeyedSchemaUpdate; diff --git a/core/src/main/java/com/netease/arctic/table/BasicTableBuilder.java b/core/src/main/java/com/netease/arctic/table/BasicTableBuilder.java index e8b8783fd1..a32ba70c10 100644 --- a/core/src/main/java/com/netease/arctic/table/BasicTableBuilder.java +++ b/core/src/main/java/com/netease/arctic/table/BasicTableBuilder.java @@ -18,7 +18,7 @@ package com.netease.arctic.table; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.SortOrder; diff --git a/core/src/main/java/com/netease/arctic/table/BasicUnkeyedTable.java b/core/src/main/java/com/netease/arctic/table/BasicUnkeyedTable.java index e60478ef00..5ddcd28eac 100644 --- a/core/src/main/java/com/netease/arctic/table/BasicUnkeyedTable.java +++ b/core/src/main/java/com/netease/arctic/table/BasicUnkeyedTable.java @@ -18,7 +18,7 @@ package com.netease.arctic.table; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.op.ArcticAppendFiles; import com.netease.arctic.op.ArcticDeleteFiles; @@ -29,7 +29,7 @@ import com.netease.arctic.op.ArcticTransaction; import com.netease.arctic.op.PartitionPropertiesUpdate; import com.netease.arctic.op.UpdatePartitionProperties; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.TablePropertyUtil; import org.apache.iceberg.AppendFiles; import org.apache.iceberg.DeleteFiles; @@ -160,7 +160,7 @@ public Map properties() { if (catalogProperties == null) { return icebergTable.properties(); } else { - return CatalogUtil.mergeCatalogPropertiesToTable( + return ArcticCatalogUtil.mergeCatalogPropertiesToTable( icebergTable.properties(), catalogProperties); } } diff --git a/core/src/main/java/com/netease/arctic/table/TableIdentifier.java b/core/src/main/java/com/netease/arctic/table/TableIdentifier.java index dc7a2e418d..7784c98365 100644 --- a/core/src/main/java/com/netease/arctic/table/TableIdentifier.java +++ b/core/src/main/java/com/netease/arctic/table/TableIdentifier.java @@ -44,20 +44,20 @@ public static TableIdentifier of(String catalog, String database, String tableNa return new TableIdentifier(catalog, database, tableName); } - public static TableIdentifier of(com.netease.arctic.ams.api.TableIdentifier identifier) { + public static TableIdentifier of(com.netease.arctic.api.TableIdentifier identifier) { return new TableIdentifier( identifier.getCatalog(), identifier.getDatabase(), identifier.getTableName()); } - public TableIdentifier(com.netease.arctic.ams.api.TableIdentifier tableIdentifier) { + public TableIdentifier(com.netease.arctic.api.TableIdentifier tableIdentifier) { this( tableIdentifier.getCatalog(), tableIdentifier.getDatabase(), tableIdentifier.getTableName()); } - public com.netease.arctic.ams.api.TableIdentifier buildTableIdentifier() { - return new com.netease.arctic.ams.api.TableIdentifier(catalog, database, tableName); + public com.netease.arctic.api.TableIdentifier buildTableIdentifier() { + return new com.netease.arctic.api.TableIdentifier(catalog, database, tableName); } public String getCatalog() { diff --git a/core/src/main/java/com/netease/arctic/table/blocker/BasicTableBlockerManager.java b/core/src/main/java/com/netease/arctic/table/blocker/BasicTableBlockerManager.java index cb0a61ef26..56b7c1edeb 100644 --- a/core/src/main/java/com/netease/arctic/table/blocker/BasicTableBlockerManager.java +++ b/core/src/main/java/com/netease/arctic/table/blocker/BasicTableBlockerManager.java @@ -19,8 +19,8 @@ package com.netease.arctic.table.blocker; import com.netease.arctic.AmsClient; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.OperationConflictException; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.OperationConflictException; import com.netease.arctic.table.TableIdentifier; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.relocated.com.google.common.collect.Maps; @@ -86,11 +86,11 @@ public TableIdentifier tableIdentifier() { return tableIdentifier; } - private Blocker buildBlocker(com.netease.arctic.ams.api.Blocker blocker) { + private Blocker buildBlocker(com.netease.arctic.api.Blocker blocker) { return buildBlocker(blocker, false); } - private Blocker buildBlocker(com.netease.arctic.ams.api.Blocker blocker, boolean needInit) { + private Blocker buildBlocker(com.netease.arctic.api.Blocker blocker, boolean needInit) { if (blocker.getProperties() != null && blocker.getProperties().get(RenewableBlocker.EXPIRATION_TIME_PROPERTY) != null && blocker.getProperties().get(RenewableBlocker.BLOCKER_TIMEOUT) != null) { diff --git a/core/src/main/java/com/netease/arctic/table/blocker/Blocker.java b/core/src/main/java/com/netease/arctic/table/blocker/Blocker.java index 688c695ba5..f5293feef6 100644 --- a/core/src/main/java/com/netease/arctic/table/blocker/Blocker.java +++ b/core/src/main/java/com/netease/arctic/table/blocker/Blocker.java @@ -18,7 +18,7 @@ package com.netease.arctic.table.blocker; -import com.netease.arctic.ams.api.BlockableOperation; +import com.netease.arctic.api.BlockableOperation; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/netease/arctic/table/blocker/RenewableBlocker.java b/core/src/main/java/com/netease/arctic/table/blocker/RenewableBlocker.java index 887b2e62fe..787ececfe5 100644 --- a/core/src/main/java/com/netease/arctic/table/blocker/RenewableBlocker.java +++ b/core/src/main/java/com/netease/arctic/table/blocker/RenewableBlocker.java @@ -19,8 +19,8 @@ package com.netease.arctic.table.blocker; import com.netease.arctic.AmsClient; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.NoSuchObjectException; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.NoSuchObjectException; import com.netease.arctic.table.TableIdentifier; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.relocated.com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/core/src/main/java/com/netease/arctic/table/blocker/TableBlockerManager.java b/core/src/main/java/com/netease/arctic/table/blocker/TableBlockerManager.java index 9cb897bca7..cf2e238af7 100644 --- a/core/src/main/java/com/netease/arctic/table/blocker/TableBlockerManager.java +++ b/core/src/main/java/com/netease/arctic/table/blocker/TableBlockerManager.java @@ -18,8 +18,8 @@ package com.netease.arctic.table.blocker; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.OperationConflictException; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.OperationConflictException; import com.netease.arctic.table.TableIdentifier; import java.util.Collections; diff --git a/core/src/main/java/com/netease/arctic/utils/CatalogUtil.java b/core/src/main/java/com/netease/arctic/utils/ArcticCatalogUtil.java similarity index 87% rename from core/src/main/java/com/netease/arctic/utils/CatalogUtil.java rename to core/src/main/java/com/netease/arctic/utils/ArcticCatalogUtil.java index 3a412c739b..f1cafc52b8 100644 --- a/core/src/main/java/com/netease/arctic/utils/CatalogUtil.java +++ b/core/src/main/java/com/netease/arctic/utils/ArcticCatalogUtil.java @@ -18,22 +18,13 @@ package com.netease.arctic.utils; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_AMS; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_CUSTOM; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_GLUE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HADOOP; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HIVE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_KEY_TYPE; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HADOOP; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HDFS_LEGACY; - -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.op.ArcticHadoopTableOperations; import com.netease.arctic.op.ArcticTableOperations; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.TableIdentifier; import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.TableProperties; @@ -59,9 +50,9 @@ import java.util.Set; import java.util.stream.Collectors; -public class CatalogUtil { +public class ArcticCatalogUtil { - private static final Logger LOG = LoggerFactory.getLogger(CatalogUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(ArcticCatalogUtil.class); /** Return table format set catalog supported. */ public static Set tableFormats(CatalogMeta meta) { @@ -82,13 +73,13 @@ public static Set tableFormats( } else { // Generate table format from catalog type for compatibility with older versions switch (metastoreType) { - case CATALOG_TYPE_AMS: + case CatalogMetaProperties.CATALOG_TYPE_AMS: return Sets.newHashSet(TableFormat.MIXED_ICEBERG); - case CATALOG_TYPE_CUSTOM: - case CATALOG_TYPE_HADOOP: - case CATALOG_TYPE_GLUE: + case CatalogMetaProperties.CATALOG_TYPE_CUSTOM: + case CatalogMetaProperties.CATALOG_TYPE_HADOOP: + case CatalogMetaProperties.CATALOG_TYPE_GLUE: return Sets.newHashSet(TableFormat.ICEBERG); - case CATALOG_TYPE_HIVE: + case CatalogMetaProperties.CATALOG_TYPE_HIVE: return Sets.newHashSet(TableFormat.MIXED_HIVE); default: throw new IllegalArgumentException("Unsupported catalog type:" + metastoreType); @@ -122,14 +113,14 @@ public static Map withIcebergCatalogInitializeProperties( if (CatalogMetaProperties.CATALOG_TYPE_GLUE.equals(metastoreType)) { icebergCatalogProperties.put(CatalogProperties.CATALOG_IMPL, GlueCatalog.class.getName()); } - if (CATALOG_TYPE_AMS.equalsIgnoreCase(metastoreType)) { + if (CatalogMetaProperties.CATALOG_TYPE_AMS.equalsIgnoreCase(metastoreType)) { icebergCatalogProperties.put(CatalogProperties.WAREHOUSE_LOCATION, catalogName); if (!icebergCatalogProperties.containsKey(CatalogProperties.CATALOG_IMPL)) { icebergCatalogProperties.put(CatalogProperties.CATALOG_IMPL, RESTCatalog.class.getName()); } } - if (CATALOG_TYPE_CUSTOM.equalsIgnoreCase(metastoreType)) { + if (CatalogMetaProperties.CATALOG_TYPE_CUSTOM.equalsIgnoreCase(metastoreType)) { Preconditions.checkArgument( icebergCatalogProperties.containsKey(CatalogProperties.CATALOG_IMPL), "Custom catalog properties must contains " + CatalogProperties.CATALOG_IMPL); @@ -149,7 +140,7 @@ public static TableMetaStore buildMetaStore(CatalogMeta catalogMeta) { if (catalogMeta.getStorageConfigs() != null) { Map storageConfigs = catalogMeta.getStorageConfigs(); if (CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HADOOP.equalsIgnoreCase( - CatalogUtil.getCompatibleStorageType(storageConfigs))) { + ArcticCatalogUtil.getCompatibleStorageType(storageConfigs))) { String coreSite = storageConfigs.get(CatalogMetaProperties.STORAGE_CONFIGS_KEY_CORE_SITE); String hdfsSite = storageConfigs.get(CatalogMetaProperties.STORAGE_CONFIGS_KEY_HDFS_SITE); String hiveSite = storageConfigs.get(CatalogMetaProperties.STORAGE_CONFIGS_KEY_HIVE_SITE); @@ -209,7 +200,6 @@ public static TableMetaStore buildMetaStore(CatalogMeta catalogMeta) { builder.withBase64KrbAuth(keytab, krb5, principal); } } - return builder.build(); } @@ -292,9 +282,8 @@ public static TableIdentifier tableId(TableMeta tableMeta) { tableMeta.getTableIdentifier().getTableName()); } - public static com.netease.arctic.ams.api.TableIdentifier amsTaleId( - TableIdentifier tableIdentifier) { - return new com.netease.arctic.ams.api.TableIdentifier( + public static com.netease.arctic.api.TableIdentifier amsTaleId(TableIdentifier tableIdentifier) { + return new com.netease.arctic.api.TableIdentifier( tableIdentifier.getCatalog(), tableIdentifier.getDatabase(), tableIdentifier.getTableName()); @@ -308,10 +297,11 @@ public static com.netease.arctic.ams.api.TableIdentifier amsTaleId( * `storage.type` not exist. */ public static String getCompatibleStorageType(Map conf) { - if (STORAGE_CONFIGS_VALUE_TYPE_HDFS_LEGACY.equals(conf.get(STORAGE_CONFIGS_KEY_TYPE))) { - return STORAGE_CONFIGS_VALUE_TYPE_HADOOP; + if (CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HDFS_LEGACY.equals( + conf.get(CatalogMetaProperties.STORAGE_CONFIGS_KEY_TYPE))) { + return CatalogMetaProperties.STORAGE_CONFIGS_VALUE_TYPE_HADOOP; } - return conf.get(STORAGE_CONFIGS_KEY_TYPE); + return conf.get(CatalogMetaProperties.STORAGE_CONFIGS_KEY_TYPE); } /** diff --git a/core/src/main/java/com/netease/arctic/utils/ArcticTableUtil.java b/core/src/main/java/com/netease/arctic/utils/ArcticTableUtil.java index ff7ca520a8..df1cd538bd 100644 --- a/core/src/main/java/com/netease/arctic/utils/ArcticTableUtil.java +++ b/core/src/main/java/com/netease/arctic/utils/ArcticTableUtil.java @@ -18,7 +18,7 @@ package com.netease.arctic.utils; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.KeyedTable; import com.netease.arctic.table.TableProperties; diff --git a/core/src/main/java/com/netease/arctic/utils/ConvertStructUtil.java b/core/src/main/java/com/netease/arctic/utils/ConvertStructUtil.java index 246b2372b9..2920d6b830 100644 --- a/core/src/main/java/com/netease/arctic/utils/ConvertStructUtil.java +++ b/core/src/main/java/com/netease/arctic/utils/ConvertStructUtil.java @@ -18,9 +18,9 @@ package com.netease.arctic.utils; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.properties.MetaTableProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.TableMeta; +import com.netease.arctic.properties.MetaTableProperties; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableIdentifier; import org.apache.iceberg.Schema; @@ -56,8 +56,8 @@ public TableMetaBuilder withPrimaryKeySpec(PrimaryKeySpec keySpec) { if (keySpec == null) { return this; } - com.netease.arctic.ams.api.PrimaryKeySpec primaryKeySpec = - new com.netease.arctic.ams.api.PrimaryKeySpec(); + com.netease.arctic.api.PrimaryKeySpec primaryKeySpec = + new com.netease.arctic.api.PrimaryKeySpec(); List fields = keySpec.primaryKeyStruct().fields().stream() .map(Types.NestedField::name) diff --git a/core/src/main/java/com/netease/arctic/utils/TablePropertyUtil.java b/core/src/main/java/com/netease/arctic/utils/TablePropertyUtil.java index 2cb7eca7dd..a1bceadf30 100644 --- a/core/src/main/java/com/netease/arctic/utils/TablePropertyUtil.java +++ b/core/src/main/java/com/netease/arctic/utils/TablePropertyUtil.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableProperties; diff --git a/core/src/main/thrift/arctic_commons.thrift b/core/src/main/thrift/arctic_commons.thrift new file mode 100644 index 0000000000..ce536a58ae --- /dev/null +++ b/core/src/main/thrift/arctic_commons.thrift @@ -0,0 +1,80 @@ +/* + * 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. + */ + +namespace java com.netease.arctic.api + +/** +* General definition of the arctic thrift interface. +* This file defines the type definitions that all of arctic's multiple thrift services depend on. +**/ + +exception AlreadyExistsException { + 1: string message +} + +exception InvalidObjectException { + 1: string message +} + +exception NoSuchObjectException { + 1: string message +} + +exception MetaException { + 1: string message +} + +exception NotSupportedException { + 1: string message +} + +exception OperationConflictException { + 1: string message +} + +exception ArcticException { + 1: i32 errorCode + 2: string errorName + 3: string message +} + +struct TableIdentifier { + 1:string catalog; + 2:string database; + 3:string tableName; +} + +// inner class begin + +struct ColumnInfo { + 1:optional i32 id; + 2:string name; + 3:optional string type; + 4:optional string doc; + 5:bool isOptional; +} + +struct Schema { + 1:list columns; + 2:optional list pks; + 3:optional list partitionColumns; + 4:optional list sortColumns; +} + + + diff --git a/core/src/main/thrift/arctic_optimizing_service.thrift b/core/src/main/thrift/arctic_optimizing_service.thrift new file mode 100644 index 0000000000..fe4150f787 --- /dev/null +++ b/core/src/main/thrift/arctic_optimizing_service.thrift @@ -0,0 +1,68 @@ +/* + * 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. + */ + +namespace java com.netease.arctic.api + +include "arctic_commons.thrift" + +struct OptimizingTask { + 1: OptimizingTaskId taskId; + 2: optional binary taskInput; + 3: optional map properties; +} + +struct OptimizingTaskId { + 1: i64 processId; + 2: i32 taskId; +} + +struct OptimizingTaskResult { + 1: OptimizingTaskId taskId; + 2: i32 threadId; + 3: optional binary taskOutput; + 4: optional string errorMessage; + 5: optional map summary; +} + +struct OptimizerRegisterInfo { + 1: optional string resourceId; + 2: i32 threadCount; + 3: i32 memoryMb; + 4: i64 startTime; + 5: string groupName; + 6: optional map properties; +} + +service OptimizingService { + + void ping() + + void touch(1: string authToken) throws(1: arctic_commons.ArcticException e1) + + OptimizingTask pollTask(1: string authToken, 2: i32 threadId) + throws (1: arctic_commons.ArcticException e1) + + void ackTask(1: string authToken, 2: i32 threadId, 3: OptimizingTaskId taskId) + throws(1: arctic_commons.ArcticException e1) + + void completeTask(1: string authToken, 2: OptimizingTaskResult taskResult) + throws (1: arctic_commons.ArcticException e1) + + string authenticate(1: OptimizerRegisterInfo registerInfo) + throws (1: arctic_commons.ArcticException e1) +} \ No newline at end of file diff --git a/core/src/main/thrift/arctic_table_metastore.thrift b/core/src/main/thrift/arctic_table_metastore.thrift new file mode 100644 index 0000000000..582e0eecc8 --- /dev/null +++ b/core/src/main/thrift/arctic_table_metastore.thrift @@ -0,0 +1,169 @@ +/* + * 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. + */ + +namespace java com.netease.arctic.api + +include "arctic_commons.thrift" + +struct CatalogMeta { + 1: required string catalogName; + 2: required string catalogType; + 3: map storageConfigs; + 4: map authConfigs; + 5: map catalogProperties; +} + +struct PartitionFieldData { + 1: string name; + 2: string value; +} + +struct DataFile { + // base_file, insert_file, delete_file + 1: string fileType; + 2: string path; + // file size in bytes + 3: i64 fileSize; + 4: i64 mask; + 5: i64 index; + 6: i64 specId; + 7: list partition; + 8: i64 recordCount; + // deprecated, may remove from v0.5 + 9: map upperBounds; +} + +struct TableChange { + // base, change + 1: string innerTable; + 2: list addFiles; + 3: list deleteFiles; + 4: i64 snapshotId; + 5: i64 snapshotSequence; + 6: i64 parentSnapshotId; +} + +// task commit info +struct TableCommitMeta { + 1: arctic_commons.TableIdentifier tableIdentifier; + 2: string action; + 3: list changes; + 4: i64 commitTime; + 5: map properties; + 6: CommitMetaProducer commitMetaProducer; + 7: SchemaUpdateMeta schemaUpdateMeta; +} + +struct UpdateColumn { + 1: string name; + 2: optional string parent; + 3: optional string type; + 4: optional string doc; + 5: string operate; + 6: optional string isOptional; + 7: optional string newName; +} + +struct SchemaUpdateMeta { + 1: i32 schemaId; + 2: list updateColumns; +} + +struct TableMeta { + 1:arctic_commons.TableIdentifier tableIdentifier; + 2:PrimaryKeySpec keySpec; + 3:optional map properties; + 4:map locations ; + 5:string format; +} + +struct PrimaryKeySpec { + 1: list fields; +} + +enum CommitMetaProducer { + OPTIMIZE, + INGESTION, + DATA_EXPIRATION +} + +struct Blocker { + 1:string blockerId; + 2:list operations; + 3:map properties; +} + +enum BlockableOperation { + OPTIMIZE, + BATCH_WRITE +} + + +/** +* replace TableContainer、ArcticTableItem +**/ +service ArcticTableMetastore { + + void ping() + + // catalog api + list getCatalogs() + + CatalogMeta getCatalog(1: string name) throws (1: arctic_commons.NoSuchObjectException e1) + + list getDatabases(1: string catalogName) throws (1: arctic_commons.NoSuchObjectException e) + + void createDatabase(1: string catalogName, 2: string database) throws ( + 1: arctic_commons.NoSuchObjectException e1, + 2: arctic_commons.AlreadyExistsException e2) + + void dropDatabase(1: string catalogName, 2: string database) throws ( + 1: arctic_commons.NoSuchObjectException e1, + 2: arctic_commons.NotSupportedException e2) + + void createTableMeta(1: TableMeta tableMeta) + throws( + 1: arctic_commons.AlreadyExistsException e1, + 2: arctic_commons.InvalidObjectException e2 + 3: arctic_commons.MetaException e3) + + list listTables(1: string catalogName, 2: string database) + throws(1: arctic_commons.NoSuchObjectException e); + + TableMeta getTable(1:arctic_commons.TableIdentifier tableIdentifier) + throws(1: arctic_commons.NoSuchObjectException e); + + void removeTable(1:arctic_commons.TableIdentifier tableIdentifier, 2:bool deleteData) + throws( + 1:arctic_commons.NoSuchObjectException e1, + 2:arctic_commons.MetaException e2) + + void tableCommit(1: TableCommitMeta commit) throws (1: arctic_commons.MetaException e1) + + i64 allocateTransactionId(1:arctic_commons.TableIdentifier tableIdentifier, 2:string transactionSignature) + + Blocker block(1:arctic_commons.TableIdentifier tableIdentifier, 2:list operations, 3:map properties) + throws (1: arctic_commons.OperationConflictException e1) + + void releaseBlocker(1:arctic_commons.TableIdentifier tableIdentifier, 2:string blockerId) + + i64 renewBlocker(1:arctic_commons.TableIdentifier tableIdentifier, 2:string blockerId) + throws(1: arctic_commons.NoSuchObjectException e) + + list getBlockers(1:arctic_commons.TableIdentifier tableIdentifier) +} diff --git a/ams/api/src/test/java/com/netease/arctic/ams/api/MockArcticMetastoreServer.java b/core/src/test/java/com/netease/arctic/MockArcticMetastoreServer.java similarity index 96% rename from ams/api/src/test/java/com/netease/arctic/ams/api/MockArcticMetastoreServer.java rename to core/src/test/java/com/netease/arctic/MockArcticMetastoreServer.java index 172d710f02..b530033e13 100644 --- a/ams/api/src/test/java/com/netease/arctic/ams/api/MockArcticMetastoreServer.java +++ b/core/src/test/java/com/netease/arctic/MockArcticMetastoreServer.java @@ -16,8 +16,10 @@ * limitations under the License. */ -package com.netease.arctic.ams.api; +package com.netease.arctic; +import com.netease.arctic.api.*; +import com.netease.arctic.api.AlreadyExistsException; import org.apache.thrift.TException; import org.apache.thrift.TMultiplexedProcessor; import org.apache.thrift.protocol.TBinaryProtocol; @@ -32,22 +34,8 @@ import java.net.BindException; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.Random; -import java.util.UUID; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.*; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; diff --git a/core/src/test/java/com/netease/arctic/TestAms.java b/core/src/test/java/com/netease/arctic/TestAms.java index af0b12d56a..ca8b2b9028 100644 --- a/core/src/test/java/com/netease/arctic/TestAms.java +++ b/core/src/test/java/com/netease/arctic/TestAms.java @@ -18,7 +18,6 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.MockArcticMetastoreServer; import org.junit.rules.ExternalResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/test/java/com/netease/arctic/TestUnifiedCatalog.java b/core/src/test/java/com/netease/arctic/TestUnifiedCatalog.java index d31e5e9027..6552275fd6 100644 --- a/core/src/test/java/com/netease/arctic/TestUnifiedCatalog.java +++ b/core/src/test/java/com/netease/arctic/TestUnifiedCatalog.java @@ -18,8 +18,7 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.CatalogTestHelper; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.junit.Assert; diff --git a/core/src/test/java/com/netease/arctic/TestedCatalogs.java b/core/src/test/java/com/netease/arctic/TestedCatalogs.java index f91331a979..c3df580a1f 100644 --- a/core/src/test/java/com/netease/arctic/TestedCatalogs.java +++ b/core/src/test/java/com/netease/arctic/TestedCatalogs.java @@ -18,10 +18,9 @@ package com.netease.arctic; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; +import com.netease.arctic.properties.CatalogMetaProperties; public class TestedCatalogs { public static CatalogTestHelper internalCatalog(TableFormat... format) { diff --git a/core/src/test/java/com/netease/arctic/catalog/BasicCatalogTestHelper.java b/core/src/test/java/com/netease/arctic/catalog/BasicCatalogTestHelper.java index 4496b6d7f8..528e96b427 100644 --- a/core/src/test/java/com/netease/arctic/catalog/BasicCatalogTestHelper.java +++ b/core/src/test/java/com/netease/arctic/catalog/BasicCatalogTestHelper.java @@ -18,17 +18,14 @@ package com.netease.arctic.catalog; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.CATALOG_TYPE_HADOOP; -import static org.apache.iceberg.CatalogUtil.ICEBERG_CATALOG_TYPE; -import static org.apache.iceberg.CatalogUtil.ICEBERG_CATALOG_TYPE_HADOOP; - import com.netease.arctic.CommonUnifiedCatalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.UnifiedCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.hadoop.conf.Configuration; +import org.apache.iceberg.CatalogUtil; import org.apache.iceberg.catalog.Catalog; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.relocated.com.google.common.collect.Maps; @@ -46,7 +43,7 @@ public BasicCatalogTestHelper(TableFormat tableFormat) { } public BasicCatalogTestHelper(TableFormat tableFormat, Map catalogProperties) { - this(CATALOG_TYPE_HADOOP, catalogProperties, tableFormat); + this(CatalogMetaProperties.CATALOG_TYPE_HADOOP, catalogProperties, tableFormat); } public BasicCatalogTestHelper( @@ -90,8 +87,9 @@ public Catalog buildIcebergCatalog(CatalogMeta catalogMeta) { "Cannot build iceberg catalog for table format:" + tableFormat); } Map catalogProperties = Maps.newHashMap(catalogMeta.getCatalogProperties()); - catalogProperties.put(ICEBERG_CATALOG_TYPE, ICEBERG_CATALOG_TYPE_HADOOP); - return org.apache.iceberg.CatalogUtil.buildIcebergCatalog( + catalogProperties.put( + CatalogUtil.ICEBERG_CATALOG_TYPE, CatalogUtil.ICEBERG_CATALOG_TYPE_HADOOP); + return CatalogUtil.buildIcebergCatalog( TEST_CATALOG_NAME, catalogProperties, new Configuration()); } @@ -102,7 +100,7 @@ public MixedTables buildMixedTables(CatalogMeta catalogMeta) { "Cannot build mixed-tables for table format:" + tableFormat); } return new MixedTables( - catalogMeta.getCatalogProperties(), CatalogUtil.buildMetaStore(catalogMeta)); + catalogMeta.getCatalogProperties(), ArcticCatalogUtil.buildMetaStore(catalogMeta)); } @Override diff --git a/core/src/test/java/com/netease/arctic/catalog/CatalogTestBase.java b/core/src/test/java/com/netease/arctic/catalog/CatalogTestBase.java index bc8d80c472..4ff65e0d20 100644 --- a/core/src/test/java/com/netease/arctic/catalog/CatalogTestBase.java +++ b/core/src/test/java/com/netease/arctic/catalog/CatalogTestBase.java @@ -18,12 +18,12 @@ package com.netease.arctic.catalog; +import com.netease.arctic.MockArcticMetastoreServer; +import com.netease.arctic.TableFormat; import com.netease.arctic.TestAms; import com.netease.arctic.UnifiedCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.MockArcticMetastoreServer; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.commons.lang3.SystemUtils; import org.apache.iceberg.catalog.Catalog; import org.junit.After; diff --git a/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelper.java b/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelper.java index 2c78ee6e40..b458f82f00 100644 --- a/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelper.java +++ b/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelper.java @@ -18,11 +18,11 @@ package com.netease.arctic.catalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; import com.netease.arctic.UnifiedCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.iceberg.catalog.Catalog; public interface CatalogTestHelper { diff --git a/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelpers.java b/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelpers.java index 2b4e17ff75..7431141ccb 100644 --- a/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelpers.java +++ b/core/src/test/java/com/netease/arctic/catalog/CatalogTestHelpers.java @@ -18,9 +18,9 @@ package com.netease.arctic.catalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.hadoop.conf.Configuration; import java.io.ByteArrayOutputStream; diff --git a/core/src/test/java/com/netease/arctic/catalog/TableTestBase.java b/core/src/test/java/com/netease/arctic/catalog/TableTestBase.java index cbf0d61aaf..5ed2e020d0 100644 --- a/core/src/test/java/com/netease/arctic/catalog/TableTestBase.java +++ b/core/src/test/java/com/netease/arctic/catalog/TableTestBase.java @@ -23,8 +23,8 @@ import com.netease.arctic.table.TableBuilder; import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.UnkeyedTable; +import com.netease.arctic.utils.ArcticCatalogUtil; import com.netease.arctic.utils.ArcticTableUtil; -import com.netease.arctic.utils.CatalogUtil; import org.junit.After; import org.junit.Before; @@ -41,7 +41,7 @@ public TableTestBase(CatalogTestHelper catalogTestHelper, TableTestHelper tableT @Before public void setupTable() { - this.tableMetaStore = CatalogUtil.buildMetaStore(getCatalogMeta()); + this.tableMetaStore = ArcticCatalogUtil.buildMetaStore(getCatalogMeta()); getUnifiedCatalog().createDatabase(TableTestHelper.TEST_DB_NAME); switch (getTestFormat()) { diff --git a/core/src/test/java/com/netease/arctic/catalog/TestCatalogLoader.java b/core/src/test/java/com/netease/arctic/catalog/TestCatalogLoader.java index bbfe26423b..ed47eab496 100644 --- a/core/src/test/java/com/netease/arctic/catalog/TestCatalogLoader.java +++ b/core/src/test/java/com/netease/arctic/catalog/TestCatalogLoader.java @@ -18,11 +18,11 @@ package com.netease.arctic.catalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.TestAms; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.mixed.BasicMixedIcebergCatalog; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.junit.Assert; import org.junit.ClassRule; diff --git a/core/src/test/java/com/netease/arctic/catalog/TestMixedCatalog.java b/core/src/test/java/com/netease/arctic/catalog/TestMixedCatalog.java index b6d9b6f2ab..5e834c8189 100644 --- a/core/src/test/java/com/netease/arctic/catalog/TestMixedCatalog.java +++ b/core/src/test/java/com/netease/arctic/catalog/TestMixedCatalog.java @@ -19,11 +19,11 @@ package com.netease.arctic.catalog; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.mixed.BasicMixedIcebergCatalog; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.ArcticTable; import com.netease.arctic.table.KeyedTable; import com.netease.arctic.table.TableBuilder; diff --git a/core/src/test/java/com/netease/arctic/data/TestDefaultKeyedFile.java b/core/src/test/java/com/netease/arctic/data/TestDefaultKeyedFile.java index df962f6627..ab9a02f27d 100644 --- a/core/src/test/java/com/netease/arctic/data/TestDefaultKeyedFile.java +++ b/core/src/test/java/com/netease/arctic/data/TestDefaultKeyedFile.java @@ -19,7 +19,7 @@ package com.netease.arctic.data; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.io.MixedDataTestHelpers; diff --git a/core/src/test/java/com/netease/arctic/data/TestUpsertPushDown.java b/core/src/test/java/com/netease/arctic/data/TestUpsertPushDown.java index 2cc93cc6be..70a7a875ef 100644 --- a/core/src/test/java/com/netease/arctic/data/TestUpsertPushDown.java +++ b/core/src/test/java/com/netease/arctic/data/TestUpsertPushDown.java @@ -19,7 +19,7 @@ package com.netease.arctic.data; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.io.MixedDataTestHelpers; diff --git a/core/src/test/java/com/netease/arctic/formats/AbstractFormatCatalogTestHelper.java b/core/src/test/java/com/netease/arctic/formats/AbstractFormatCatalogTestHelper.java index f175c40fb7..8561b7508a 100644 --- a/core/src/test/java/com/netease/arctic/formats/AbstractFormatCatalogTestHelper.java +++ b/core/src/test/java/com/netease/arctic/formats/AbstractFormatCatalogTestHelper.java @@ -19,10 +19,10 @@ package com.netease.arctic.formats; import com.netease.arctic.AmoroCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.CatalogTestHelpers; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.hadoop.conf.Configuration; import java.util.HashMap; diff --git a/core/src/test/java/com/netease/arctic/formats/AmoroCatalogTestHelper.java b/core/src/test/java/com/netease/arctic/formats/AmoroCatalogTestHelper.java index f1fe766e81..48b7cb2812 100644 --- a/core/src/test/java/com/netease/arctic/formats/AmoroCatalogTestHelper.java +++ b/core/src/test/java/com/netease/arctic/formats/AmoroCatalogTestHelper.java @@ -19,7 +19,7 @@ package com.netease.arctic.formats; import com.netease.arctic.AmoroCatalog; -import com.netease.arctic.ams.api.CatalogMeta; +import com.netease.arctic.api.CatalogMeta; import org.apache.hadoop.conf.Configuration; /** Helper Interface for testing AmoroCatalog. */ diff --git a/core/src/test/java/com/netease/arctic/formats/IcebergHadoopCatalogTestHelper.java b/core/src/test/java/com/netease/arctic/formats/IcebergHadoopCatalogTestHelper.java index a501565b9a..138466b381 100644 --- a/core/src/test/java/com/netease/arctic/formats/IcebergHadoopCatalogTestHelper.java +++ b/core/src/test/java/com/netease/arctic/formats/IcebergHadoopCatalogTestHelper.java @@ -21,10 +21,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.netease.arctic.AmoroCatalog; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.formats.iceberg.IcebergCatalogFactory; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.hadoop.conf.Configuration; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -73,7 +73,7 @@ public void initHiveConf(Configuration hiveConf) { @Override public AmoroCatalog amoroCatalog() { IcebergCatalogFactory icebergCatalogFactory = new IcebergCatalogFactory(); - TableMetaStore metaStore = CatalogUtil.buildMetaStore(getCatalogMeta()); + TableMetaStore metaStore = ArcticCatalogUtil.buildMetaStore(getCatalogMeta()); Map properties = icebergCatalogFactory.convertCatalogProperties( catalogName, getMetastoreType(), catalogProperties); @@ -83,9 +83,9 @@ public AmoroCatalog amoroCatalog() { @Override public Catalog originalCatalog() { Map props = - CatalogUtil.withIcebergCatalogInitializeProperties( + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( catalogName, getMetastoreType(), catalogProperties); - TableMetaStore metaStore = CatalogUtil.buildMetaStore(getCatalogMeta()); + TableMetaStore metaStore = ArcticCatalogUtil.buildMetaStore(getCatalogMeta()); return org.apache.iceberg.CatalogUtil.buildIcebergCatalog( catalogName, props, metaStore.getConfiguration()); } diff --git a/core/src/test/java/com/netease/arctic/formats/MixedIcebergHadoopCatalogTestHelper.java b/core/src/test/java/com/netease/arctic/formats/MixedIcebergHadoopCatalogTestHelper.java index 8579c0f78a..83ceaefc43 100644 --- a/core/src/test/java/com/netease/arctic/formats/MixedIcebergHadoopCatalogTestHelper.java +++ b/core/src/test/java/com/netease/arctic/formats/MixedIcebergHadoopCatalogTestHelper.java @@ -21,14 +21,14 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.netease.arctic.AmoroCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.CatalogLoader; import com.netease.arctic.formats.mixed.MixedIcebergCatalogFactory; import com.netease.arctic.table.TableIdentifier; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.types.Types; @@ -63,7 +63,7 @@ protected TableFormat format() { @Override public AmoroCatalog amoroCatalog() { MixedIcebergCatalogFactory mixedIcebergCatalogFactory = new MixedIcebergCatalogFactory(); - TableMetaStore metaStore = CatalogUtil.buildMetaStore(getCatalogMeta()); + TableMetaStore metaStore = ArcticCatalogUtil.buildMetaStore(getCatalogMeta()); Map properties = mixedIcebergCatalogFactory.convertCatalogProperties( catalogName, getMetastoreType(), catalogProperties); @@ -74,7 +74,7 @@ public AmoroCatalog amoroCatalog() { @Override public ArcticCatalog originalCatalog() { CatalogMeta meta = getCatalogMeta(); - TableMetaStore metaStore = CatalogUtil.buildMetaStore(meta); + TableMetaStore metaStore = ArcticCatalogUtil.buildMetaStore(meta); return CatalogLoader.createCatalog( catalogName(), meta.getCatalogType(), meta.getCatalogProperties(), metaStore); } diff --git a/core/src/test/java/com/netease/arctic/formats/PaimonHadoopCatalogTestHelper.java b/core/src/test/java/com/netease/arctic/formats/PaimonHadoopCatalogTestHelper.java index 682b2619a2..5a2e48d91a 100644 --- a/core/src/test/java/com/netease/arctic/formats/PaimonHadoopCatalogTestHelper.java +++ b/core/src/test/java/com/netease/arctic/formats/PaimonHadoopCatalogTestHelper.java @@ -20,10 +20,10 @@ import com.netease.arctic.AlreadyExistsException; import com.netease.arctic.AmoroCatalog; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.formats.paimon.PaimonCatalogFactory; import com.netease.arctic.table.TableMetaStore; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.hadoop.conf.Configuration; import org.apache.paimon.catalog.Catalog; import org.apache.paimon.catalog.Identifier; @@ -63,7 +63,7 @@ protected TableFormat format() { @Override public AmoroCatalog amoroCatalog() { PaimonCatalogFactory paimonCatalogFactory = new PaimonCatalogFactory(); - TableMetaStore metaStore = CatalogUtil.buildMetaStore(getCatalogMeta()); + TableMetaStore metaStore = ArcticCatalogUtil.buildMetaStore(getCatalogMeta()); Map paimonCatalogProperties = paimonCatalogFactory.convertCatalogProperties( catalogName, getMetastoreType(), getCatalogMeta().getCatalogProperties()); diff --git a/core/src/test/java/com/netease/arctic/io/TableDataTestBase.java b/core/src/test/java/com/netease/arctic/io/TableDataTestBase.java index 7b114c6c52..893d494cd8 100644 --- a/core/src/test/java/com/netease/arctic/io/TableDataTestBase.java +++ b/core/src/test/java/com/netease/arctic/io/TableDataTestBase.java @@ -19,8 +19,8 @@ package com.netease.arctic.io; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; diff --git a/core/src/test/java/com/netease/arctic/io/TestArcticTreeNodePosDeleteWriter.java b/core/src/test/java/com/netease/arctic/io/TestArcticTreeNodePosDeleteWriter.java index 6a90874a25..c7ba520b93 100644 --- a/core/src/test/java/com/netease/arctic/io/TestArcticTreeNodePosDeleteWriter.java +++ b/core/src/test/java/com/netease/arctic/io/TestArcticTreeNodePosDeleteWriter.java @@ -19,8 +19,8 @@ package com.netease.arctic.io; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; diff --git a/core/src/test/java/com/netease/arctic/io/TestBasicTableTrashManager.java b/core/src/test/java/com/netease/arctic/io/TestBasicTableTrashManager.java index 7bee82c2a9..04f68d4fad 100644 --- a/core/src/test/java/com/netease/arctic/io/TestBasicTableTrashManager.java +++ b/core/src/test/java/com/netease/arctic/io/TestBasicTableTrashManager.java @@ -22,7 +22,7 @@ import static com.netease.arctic.io.BasicTableTrashManager.getRelativeFileLocation; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.table.ArcticTable; diff --git a/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReader.java b/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReader.java index 77df7d8330..c8df11dd08 100644 --- a/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReader.java +++ b/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReader.java @@ -19,7 +19,7 @@ package com.netease.arctic.io; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.io.reader.CombinedDeleteFilter; diff --git a/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReaderVariousTypes.java b/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReaderVariousTypes.java index 73c9ce5f60..9080c58660 100644 --- a/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReaderVariousTypes.java +++ b/core/src/test/java/com/netease/arctic/io/TestIcebergCombinedReaderVariousTypes.java @@ -19,7 +19,7 @@ package com.netease.arctic.io; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.data.ChangeAction; diff --git a/core/src/test/java/com/netease/arctic/io/TestIcebergFanoutPosDeleteWriter.java b/core/src/test/java/com/netease/arctic/io/TestIcebergFanoutPosDeleteWriter.java index 2d1ed10119..792564dc82 100644 --- a/core/src/test/java/com/netease/arctic/io/TestIcebergFanoutPosDeleteWriter.java +++ b/core/src/test/java/com/netease/arctic/io/TestIcebergFanoutPosDeleteWriter.java @@ -19,7 +19,7 @@ package com.netease.arctic.io; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.io.writer.IcebergFanoutPosDeleteWriter; diff --git a/core/src/test/java/com/netease/arctic/io/TestRecoverableArcticFileIO.java b/core/src/test/java/com/netease/arctic/io/TestRecoverableArcticFileIO.java index f325869af1..d4ca623ced 100644 --- a/core/src/test/java/com/netease/arctic/io/TestRecoverableArcticFileIO.java +++ b/core/src/test/java/com/netease/arctic/io/TestRecoverableArcticFileIO.java @@ -19,7 +19,7 @@ package com.netease.arctic.io; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.table.ArcticTable; diff --git a/core/src/test/java/com/netease/arctic/io/TestTableTrashManagers.java b/core/src/test/java/com/netease/arctic/io/TestTableTrashManagers.java index ebda12e9c9..a3049545f4 100644 --- a/core/src/test/java/com/netease/arctic/io/TestTableTrashManagers.java +++ b/core/src/test/java/com/netease/arctic/io/TestTableTrashManagers.java @@ -18,14 +18,13 @@ package com.netease.arctic.io; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.KEY_WAREHOUSE; - import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.TableIdentifier; import org.junit.Assert; import org.junit.Test; @@ -84,7 +83,8 @@ public void testGetTrashParentLocation() { } protected String getTableTrashLocation(TableIdentifier id) { - String catalogDir = getCatalogMeta().getCatalogProperties().get(KEY_WAREHOUSE); + String catalogDir = + getCatalogMeta().getCatalogProperties().get(CatalogMetaProperties.KEY_WAREHOUSE); return String.format( "%s/%s/%s/%s", catalogDir, id.getDatabase(), id.getTableName(), TableTrashManagers.DEFAULT_TRASH_DIR); diff --git a/core/src/test/java/com/netease/arctic/io/TestTaskReader.java b/core/src/test/java/com/netease/arctic/io/TestTaskReader.java index bf96daa9ec..8bdb9bd589 100644 --- a/core/src/test/java/com/netease/arctic/io/TestTaskReader.java +++ b/core/src/test/java/com/netease/arctic/io/TestTaskReader.java @@ -21,8 +21,8 @@ import static com.netease.arctic.table.TableProperties.FILE_FORMAT_ORC; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.data.ChangeAction; diff --git a/core/src/test/java/com/netease/arctic/io/TestTaskWriter.java b/core/src/test/java/com/netease/arctic/io/TestTaskWriter.java index 07a7d9749a..546b6bc764 100644 --- a/core/src/test/java/com/netease/arctic/io/TestTaskWriter.java +++ b/core/src/test/java/com/netease/arctic/io/TestTaskWriter.java @@ -22,8 +22,8 @@ import com.netease.arctic.BasicTableTestHelper; import com.netease.arctic.DataFileTestHelpers; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; diff --git a/core/src/test/java/com/netease/arctic/op/TestUpdatePartitionProperties.java b/core/src/test/java/com/netease/arctic/op/TestUpdatePartitionProperties.java index 1d836d2e95..1455fb3c9b 100644 --- a/core/src/test/java/com/netease/arctic/op/TestUpdatePartitionProperties.java +++ b/core/src/test/java/com/netease/arctic/op/TestUpdatePartitionProperties.java @@ -19,7 +19,7 @@ package com.netease.arctic.op; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import org.apache.iceberg.StructLike; diff --git a/core/src/test/java/com/netease/arctic/op/TestUpdateTable.java b/core/src/test/java/com/netease/arctic/op/TestUpdateTable.java index d99ef57340..1e5fc5a2a2 100644 --- a/core/src/test/java/com/netease/arctic/op/TestUpdateTable.java +++ b/core/src/test/java/com/netease/arctic/op/TestUpdateTable.java @@ -22,7 +22,7 @@ import static org.apache.iceberg.types.Types.NestedField.required; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import org.apache.iceberg.UpdateProperties; diff --git a/core/src/test/java/com/netease/arctic/optimizing/IcebergRewriteExecutorTest.java b/core/src/test/java/com/netease/arctic/optimizing/IcebergRewriteExecutorTest.java index e0756dddf0..16e11477f5 100644 --- a/core/src/test/java/com/netease/arctic/optimizing/IcebergRewriteExecutorTest.java +++ b/core/src/test/java/com/netease/arctic/optimizing/IcebergRewriteExecutorTest.java @@ -19,7 +19,7 @@ package com.netease.arctic.optimizing; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.io.MixedDataTestHelpers; diff --git a/core/src/test/java/com/netease/arctic/table/blocker/TestBasicTableBlockerManager.java b/core/src/test/java/com/netease/arctic/table/blocker/TestBasicTableBlockerManager.java index a5b0b82305..9cd4236dd9 100644 --- a/core/src/test/java/com/netease/arctic/table/blocker/TestBasicTableBlockerManager.java +++ b/core/src/test/java/com/netease/arctic/table/blocker/TestBasicTableBlockerManager.java @@ -19,10 +19,10 @@ package com.netease.arctic.table.blocker; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.BlockableOperation; -import com.netease.arctic.ams.api.OperationConflictException; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.api.BlockableOperation; +import com.netease.arctic.api.OperationConflictException; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import org.junit.Assert; diff --git a/core/src/test/java/com/netease/arctic/trace/TestTableTracer.java b/core/src/test/java/com/netease/arctic/trace/TestTableTracer.java index fa76691ed9..04f11210e1 100644 --- a/core/src/test/java/com/netease/arctic/trace/TestTableTracer.java +++ b/core/src/test/java/com/netease/arctic/trace/TestTableTracer.java @@ -19,13 +19,13 @@ package com.netease.arctic.trace; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.Constants; import com.netease.arctic.DataFileTestHelpers; -import com.netease.arctic.ams.api.CommitMetaProducer; -import com.netease.arctic.ams.api.Constants; -import com.netease.arctic.ams.api.DataFile; -import com.netease.arctic.ams.api.TableChange; -import com.netease.arctic.ams.api.TableCommitMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.CommitMetaProducer; +import com.netease.arctic.api.DataFile; +import com.netease.arctic.api.TableChange; +import com.netease.arctic.api.TableCommitMeta; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.data.DataFileType; diff --git a/core/src/test/java/com/netease/arctic/trace/TestTableWatermark.java b/core/src/test/java/com/netease/arctic/trace/TestTableWatermark.java index 8c5c895566..2017ef0deb 100644 --- a/core/src/test/java/com/netease/arctic/trace/TestTableWatermark.java +++ b/core/src/test/java/com/netease/arctic/trace/TestTableWatermark.java @@ -19,7 +19,7 @@ package com.netease.arctic.trace; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.table.ArcticTable; diff --git a/core/src/test/java/com/netease/arctic/utils/TestCatalogUtil.java b/core/src/test/java/com/netease/arctic/utils/TestArcticCatalogUtil.java similarity index 92% rename from core/src/test/java/com/netease/arctic/utils/TestCatalogUtil.java rename to core/src/test/java/com/netease/arctic/utils/TestArcticCatalogUtil.java index 07289c0866..6bf92f6475 100644 --- a/core/src/test/java/com/netease/arctic/utils/TestCatalogUtil.java +++ b/core/src/test/java/com/netease/arctic/utils/TestArcticCatalogUtil.java @@ -18,7 +18,7 @@ package com.netease.arctic.utils; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.rest.RESTCatalog; @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; -public class TestCatalogUtil { +public class TestArcticCatalogUtil { /** * when log-store flag is on , fill up with default related props and other user-defined prop * should be keep @@ -54,7 +54,7 @@ public void testMergeCatalogPropertiesToTable() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -75,7 +75,7 @@ public void testMergeCatalogPropertiesToTable1() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -100,7 +100,7 @@ public void testMergeCatalogPropertiesToTable2() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -127,7 +127,7 @@ public void testMergeCatalogPropertiesToTable3() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -164,7 +164,7 @@ public void testMergeCatalogPropertiesToTable4() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -202,7 +202,7 @@ public void testMergeCatalogPropertiesToTable5() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -235,7 +235,7 @@ public void testMergeCatalogPropertiesToTable6() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -266,7 +266,7 @@ public void testMergeCatalogPropertiesToTable7() { catalogProperties.put("ams.address", "127.0.0.1"); Map result = - CatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); + ArcticCatalogUtil.mergeCatalogPropertiesToTable(userDefined, catalogProperties); Assert.assertEquals(expected, result); } @@ -284,13 +284,13 @@ public void testWithIcebergCatalogInitializeProperties() { // hive catalog props = - CatalogUtil.withIcebergCatalogInitializeProperties( + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( name, typeHadoop, ImmutableMap.of(keyWarehouse, path)); Assert.assertEquals(typeHadoop, props.get(type)); // custom props = - CatalogUtil.withIcebergCatalogInitializeProperties( + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( name, typeCustom, ImmutableMap.of(keyWarehouse, path, CatalogProperties.CATALOG_IMPL, restImpl)); @@ -299,13 +299,13 @@ public void testWithIcebergCatalogInitializeProperties() { Assert.assertThrows( IllegalArgumentException.class, () -> { - CatalogUtil.withIcebergCatalogInitializeProperties( + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( name, typeCustom, ImmutableMap.of(keyWarehouse, path)); }); // ams props = - CatalogUtil.withIcebergCatalogInitializeProperties( + ArcticCatalogUtil.withIcebergCatalogInitializeProperties( name, typeAms, ImmutableMap.of(keyWarehouse, path)); Assert.assertEquals(name, props.get(keyWarehouse)); Assert.assertFalse(props.containsKey(type)); diff --git a/core/src/test/java/com/netease/arctic/utils/TestKeyedExpressionUtil.java b/core/src/test/java/com/netease/arctic/utils/TestKeyedExpressionUtil.java index 08a585bbc0..e7a96999d0 100644 --- a/core/src/test/java/com/netease/arctic/utils/TestKeyedExpressionUtil.java +++ b/core/src/test/java/com/netease/arctic/utils/TestKeyedExpressionUtil.java @@ -19,7 +19,7 @@ package com.netease.arctic.utils; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.data.ChangeAction; diff --git a/core/src/test/java/com/netease/arctic/utils/TestStatisticsFileUtil.java b/core/src/test/java/com/netease/arctic/utils/TestStatisticsFileUtil.java index d319a39cb9..c084efa367 100644 --- a/core/src/test/java/com/netease/arctic/utils/TestStatisticsFileUtil.java +++ b/core/src/test/java/com/netease/arctic/utils/TestStatisticsFileUtil.java @@ -19,8 +19,8 @@ package com.netease.arctic.utils; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; diff --git a/core/src/test/java/com/netease/arctic/utils/TestUnkeyedExpressionUtil.java b/core/src/test/java/com/netease/arctic/utils/TestUnkeyedExpressionUtil.java index 81676e2303..2cc3896145 100644 --- a/core/src/test/java/com/netease/arctic/utils/TestUnkeyedExpressionUtil.java +++ b/core/src/test/java/com/netease/arctic/utils/TestUnkeyedExpressionUtil.java @@ -19,7 +19,7 @@ package com.netease.arctic.utils; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.io.IcebergDataTestHelpers; diff --git a/core/src/test/java/com/netease/arctic/utils/TestWatermarkGenerator.java b/core/src/test/java/com/netease/arctic/utils/TestWatermarkGenerator.java index 0ba7a1c8d1..c886c506f4 100644 --- a/core/src/test/java/com/netease/arctic/utils/TestWatermarkGenerator.java +++ b/core/src/test/java/com/netease/arctic/utils/TestWatermarkGenerator.java @@ -20,7 +20,7 @@ import com.netease.arctic.BasicTableTestHelper; import com.netease.arctic.DataFileTestHelpers; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.table.TableProperties; diff --git a/docs/admin-guides/deployment.md b/docs/admin-guides/deployment.md index b16207232e..8e42e5ee55 100644 --- a/docs/admin-guides/deployment.md +++ b/docs/admin-guides/deployment.md @@ -35,7 +35,7 @@ You can build based on the master branch without compiling Trino. The compilatio git clone https://github.com/NetEase/amoro.git cd amoro base_dir=$(pwd) -mvn clean package -DskipTests -pl '!mixed/trino' +mvn clean package -DskipTests -pl '!mixed-format/trino' cd ams/dist/target/ ls amoro-x.y.z-bin.zip # AMS release package @@ -44,19 +44,19 @@ dist-x.y.z.jar archive-tmp/ maven-archiver/ -cd ${base_dir}/mixed/flink/v1.15/flink-runtime/target +cd ${base_dir}/mixed-format/flink/v1.15/flink-runtime/target ls -amoro-mixed-flink-runtime-1.15-x.y.z-tests.jar -amoro-mixed-flink-runtime-1.15-x.y.z.jar # Flink 1.15 runtime package -original-amoro-mixed-flink-runtime-1.15-x.y.z.jar +amoro-mixed-format-flink-runtime-1.15-x.y.z-tests.jar +amoro-mixed-format-flink-runtime-1.15-x.y.z.jar # Flink 1.15 runtime package +original-amoro-mixed-format-flink-runtime-1.15-x.y.z.jar maven-archiver/ -cd ${base_dir}/mixed/spark/v3.2/spark-runtime/target +cd ${base_dir}/mixed-format/spark/v3.2/spark-runtime/target ls -amoro-mixed-spark-3.2-runtime-x.y.z.jar # Spark v3.2 runtime package) -amoro-mixed-spark-3.2-runtime-x.y.z-tests.jar -amoro-mixed-spark-3.2-runtime-x.y.z-sources.jar -original-amoro-mixed-spark-3.2-runtime-x.y.z.jar +amoro-mixed-format-spark-3.2-runtime-x.y.z.jar # Spark v3.2 runtime package) +amoro-mixed-format-spark-3.2-runtime-x.y.z-tests.jar +amoro-mixed-format-spark-3.2-runtime-x.y.z-sources.jar +original-amoro-mixed-format-spark-3.2-runtime-x.y.z.jar ``` If the Flink version in the ams/optimizer/flink-optimizer module you compiled is lower than 1.15, you must add the `-Pflink-pre-1.15` parameter before mvn. diff --git a/mixed/flink/flink-common-format/pom.xml b/mixed-format/flink/flink-common-format/pom.xml similarity index 94% rename from mixed/flink/flink-common-format/pom.xml rename to mixed-format/flink/flink-common-format/pom.xml index 9bd5996ef6..d80e8833c0 100644 --- a/mixed/flink/flink-common-format/pom.xml +++ b/mixed-format/flink/flink-common-format/pom.xml @@ -21,12 +21,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../pom.xml - amoro-mixed-flink-common-format + amoro-mixed-format-flink-common-format Amoro Project Mixed Format Flink Common Format https://amoro.netease.com diff --git a/mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java b/mixed-format/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java similarity index 100% rename from mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java rename to mixed-format/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java diff --git a/mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java b/mixed-format/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java similarity index 100% rename from mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java rename to mixed-format/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java diff --git a/mixed/flink/flink-common-iceberg-bridge/pom.xml b/mixed-format/flink/flink-common-iceberg-bridge/pom.xml similarity index 96% rename from mixed/flink/flink-common-iceberg-bridge/pom.xml rename to mixed-format/flink/flink-common-iceberg-bridge/pom.xml index 1901186fcf..ed6d5c1539 100644 --- a/mixed/flink/flink-common-iceberg-bridge/pom.xml +++ b/mixed-format/flink/flink-common-iceberg-bridge/pom.xml @@ -21,12 +21,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../pom.xml - amoro-mixed-flink-common-iceberg-bridge + amoro-mixed-format-flink-common-iceberg-bridge Amoro Project Mixed Format Flink Iceberg Bridge https://amoro.netease.com @@ -52,7 +52,7 @@ com.netease.amoro - amoro-mixed-hive + amoro-mixed-format-hive ${project.version} @@ -289,14 +289,6 @@ test - - com.netease.amoro - amoro-mixed-hive - ${project.version} - tests - test - - org.apache.flink flink-metrics-jmx diff --git a/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java b/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java similarity index 100% rename from mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java rename to mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java diff --git a/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java b/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java similarity index 100% rename from mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java rename to mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java diff --git a/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java b/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java similarity index 100% rename from mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java rename to mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java diff --git a/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java b/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java similarity index 100% rename from mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java rename to mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java diff --git a/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java b/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java similarity index 100% rename from mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java rename to mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java diff --git a/mixed/flink/flink-common/pom.xml b/mixed-format/flink/flink-common/pom.xml similarity index 97% rename from mixed/flink/flink-common/pom.xml rename to mixed-format/flink/flink-common/pom.xml index abdd717bc5..3428c0898e 100644 --- a/mixed/flink/flink-common/pom.xml +++ b/mixed-format/flink/flink-common/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../pom.xml - amoro-mixed-flink-common + amoro-mixed-format-flink-common Amoro Project Mixed Format Flink Common https://amoro.netease.com @@ -55,12 +55,12 @@ com.netease.amoro - amoro-mixed-hive + amoro-mixed-format-hive com.netease.amoro - amoro-mixed-flink-common-iceberg-bridge + amoro-mixed-format-flink-common-iceberg-bridge ${project.version} @@ -92,7 +92,7 @@ com.netease.amoro - amoro-mixed-flink-common-format + amoro-mixed-format-flink-common-format ${project.parent.version} @@ -319,7 +319,7 @@ com.netease.amoro - amoro-mixed-hive + amoro-mixed-format-hive ${project.version} tests test diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java similarity index 98% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java index 3d6afaece2..0e301d2d0f 100644 --- a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java +++ b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java @@ -18,9 +18,9 @@ package com.netease.arctic.flink; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.CatalogLoader; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.utils.ConfigurationFileUtil; import org.apache.commons.lang3.StringUtils; import org.apache.flink.table.catalog.exceptions.CatalogException; diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalog.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalog.java similarity index 91% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalog.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalog.java index 61bf6143a3..ed542a2245 100644 --- a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalog.java +++ b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalog.java @@ -18,42 +18,20 @@ package com.netease.arctic.flink.catalog; -import static com.netease.arctic.ams.api.Constants.THRIFT_TABLE_SERVICE_NAME; +import static com.netease.arctic.Constants.THRIFT_TABLE_SERVICE_NAME; import static com.netease.arctic.flink.catalog.factories.FlinkUnifiedCatalogFactory.SUPPORTED_FORMATS; import static com.netease.arctic.flink.table.descriptors.ArcticValidator.TABLE_FORMAT; -import com.netease.arctic.AlreadyExistsException; -import com.netease.arctic.AmoroTable; -import com.netease.arctic.NoSuchDatabaseException; -import com.netease.arctic.NoSuchTableException; -import com.netease.arctic.UnifiedCatalog; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.client.ArcticThriftUrl; +import com.netease.arctic.*; +import com.netease.arctic.client.ArcticThriftUrl; import com.netease.arctic.flink.catalog.factories.iceberg.IcebergFlinkCatalogFactory; import com.netease.arctic.flink.catalog.factories.mixed.MixedCatalogFactory; import com.netease.arctic.flink.catalog.factories.paimon.PaimonFlinkCatalogFactory; import com.netease.arctic.flink.table.AmoroDynamicTableFactory; import com.netease.arctic.table.TableIdentifier; import org.apache.flink.configuration.Configuration; -import org.apache.flink.table.catalog.AbstractCatalog; -import org.apache.flink.table.catalog.CatalogBaseTable; -import org.apache.flink.table.catalog.CatalogDatabase; -import org.apache.flink.table.catalog.CatalogFunction; -import org.apache.flink.table.catalog.CatalogPartition; -import org.apache.flink.table.catalog.CatalogPartitionSpec; -import org.apache.flink.table.catalog.CatalogTable; -import org.apache.flink.table.catalog.ObjectPath; -import org.apache.flink.table.catalog.exceptions.CatalogException; -import org.apache.flink.table.catalog.exceptions.DatabaseAlreadyExistException; -import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException; -import org.apache.flink.table.catalog.exceptions.FunctionNotExistException; -import org.apache.flink.table.catalog.exceptions.PartitionAlreadyExistsException; -import org.apache.flink.table.catalog.exceptions.PartitionNotExistException; -import org.apache.flink.table.catalog.exceptions.PartitionSpecInvalidException; -import org.apache.flink.table.catalog.exceptions.TableAlreadyExistException; -import org.apache.flink.table.catalog.exceptions.TableNotExistException; -import org.apache.flink.table.catalog.exceptions.TableNotPartitionedException; -import org.apache.flink.table.catalog.exceptions.TablePartitionedException; +import org.apache.flink.table.catalog.*; +import org.apache.flink.table.catalog.exceptions.*; import org.apache.flink.table.catalog.stats.CatalogColumnStatistics; import org.apache.flink.table.catalog.stats.CatalogTableStatistics; import org.apache.flink.table.expressions.Expression; diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/MixedCatalog.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/MixedCatalog.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/MixedCatalog.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/MixedCatalog.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/CatalogFactoryOptions.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/CatalogFactoryOptions.java similarity index 96% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/CatalogFactoryOptions.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/CatalogFactoryOptions.java index a5ad3fbacc..5d0637ad1c 100644 --- a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/CatalogFactoryOptions.java +++ b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/CatalogFactoryOptions.java @@ -18,12 +18,12 @@ package com.netease.arctic.flink.catalog.factories; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.TABLE_FORMATS; import static com.netease.arctic.flink.catalog.MixedCatalog.DEFAULT_DB; +import static com.netease.arctic.properties.CatalogMetaProperties.TABLE_FORMATS; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; import com.netease.arctic.flink.catalog.FlinkUnifiedCatalog; import com.netease.arctic.flink.catalog.MixedCatalog; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.flink.annotation.Internal; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/FlinkUnifiedCatalogFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/FlinkUnifiedCatalogFactory.java similarity index 90% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/FlinkUnifiedCatalogFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/FlinkUnifiedCatalogFactory.java index 483f4c0b80..a7343e3d91 100644 --- a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/FlinkUnifiedCatalogFactory.java +++ b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/FlinkUnifiedCatalogFactory.java @@ -18,17 +18,17 @@ package com.netease.arctic.flink.catalog.factories; -import static com.netease.arctic.ams.api.Constants.THRIFT_TABLE_SERVICE_NAME; -import static com.netease.arctic.ams.api.properties.CatalogMetaProperties.TABLE_FORMATS; +import static com.netease.arctic.Constants.THRIFT_TABLE_SERVICE_NAME; import static com.netease.arctic.flink.catalog.factories.CatalogFactoryOptions.DEFAULT_DATABASE; +import static com.netease.arctic.properties.CatalogMetaProperties.TABLE_FORMATS; import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION; +import com.netease.arctic.TableFormat; import com.netease.arctic.UnifiedCatalog; import com.netease.arctic.UnifiedCatalogLoader; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.client.ArcticThriftUrl; +import com.netease.arctic.client.ArcticThriftUrl; import com.netease.arctic.flink.catalog.FlinkUnifiedCatalog; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.table.catalog.Catalog; import org.apache.flink.table.factories.CatalogFactory; @@ -86,7 +86,7 @@ public Catalog createCatalog(Context context) { Configuration hadoopConf = unifiedCatalog.authenticationContext().getConfiguration(); Set tableFormats = - CatalogUtil.tableFormats(unifiedCatalog.metastoreType(), unifiedCatalog.properties()); + ArcticCatalogUtil.tableFormats(unifiedCatalog.metastoreType(), unifiedCatalog.properties()); validate(tableFormats); return new FlinkUnifiedCatalog( diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedCatalogFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedCatalogFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedCatalogFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedCatalogFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java similarity index 96% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java index abb8161692..7ff5ad1b05 100644 --- a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java +++ b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java @@ -18,7 +18,7 @@ package com.netease.arctic.flink.catalog.factories.paimon; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.paimon.catalog.FileSystemCatalogFactory; import org.apache.paimon.flink.FlinkCatalog; import org.apache.paimon.flink.FlinkCatalogFactory; diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/AmoroDynamicTableFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/AmoroDynamicTableFactory.java similarity index 99% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/AmoroDynamicTableFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/AmoroDynamicTableFactory.java index bbcfd9d17f..02f65989f4 100644 --- a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/AmoroDynamicTableFactory.java +++ b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/AmoroDynamicTableFactory.java @@ -21,7 +21,7 @@ import static com.netease.arctic.flink.catalog.factories.CatalogFactoryOptions.UNIFIED_IDENTIFIER; import static com.netease.arctic.flink.table.descriptors.ArcticValidator.TABLE_FORMAT; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.catalog.AbstractCatalog; diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java similarity index 99% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java index 06843545c6..58a79c4946 100644 --- a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java +++ b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java @@ -20,7 +20,7 @@ import static org.apache.flink.configuration.description.TextElement.text; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import org.apache.commons.lang.StringUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java diff --git a/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java b/mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java similarity index 100% rename from mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java rename to mixed-format/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java diff --git a/mixed/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/mixed-format/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from mixed/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to mixed-format/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/mixed/flink/flink-common/src/main/resources/log4j.properties b/mixed-format/flink/flink-common/src/main/resources/log4j.properties similarity index 100% rename from mixed/flink/flink-common/src/main/resources/log4j.properties rename to mixed-format/flink/flink-common/src/main/resources/log4j.properties diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkAmoroCatalogITCase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkAmoroCatalogITCase.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkAmoroCatalogITCase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkAmoroCatalogITCase.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkCatalogContext.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkCatalogContext.java similarity index 98% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkCatalogContext.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkCatalogContext.java index b852eaf0e5..d624691070 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkCatalogContext.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkCatalogContext.java @@ -21,9 +21,9 @@ import static com.netease.arctic.flink.catalog.factories.CatalogFactoryOptions.METASTORE_URL; import static com.netease.arctic.flink.table.descriptors.ArcticValidator.TABLE_FORMAT; +import com.netease.arctic.TableFormat; import com.netease.arctic.TestAms; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.flink.catalog.factories.FlinkUnifiedCatalogFactory; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalogITCase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalogITCase.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalogITCase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalogITCase.java index d732854773..d1260eba2d 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalogITCase.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/FlinkUnifiedCatalogITCase.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.flink.table.CatalogITCaseBase; import com.netease.arctic.hive.TestHMS; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestFlinkUnifiedCatalogs.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestFlinkUnifiedCatalogs.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestFlinkUnifiedCatalogs.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestFlinkUnifiedCatalogs.java index f474d11091..f9fa2c4d8b 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestFlinkUnifiedCatalogs.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestFlinkUnifiedCatalogs.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.Schema; import org.apache.flink.table.catalog.CatalogBaseTable; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestLegacyMixedCatalog.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestLegacyMixedCatalog.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestLegacyMixedCatalog.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestLegacyMixedCatalog.java index 6022d6339d..97eea1ba92 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestLegacyMixedCatalog.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestLegacyMixedCatalog.java @@ -18,7 +18,7 @@ package com.netease.arctic.flink.catalog; -import static com.netease.arctic.ams.api.MockArcticMetastoreServer.TEST_CATALOG_NAME; +import static com.netease.arctic.MockArcticMetastoreServer.TEST_CATALOG_NAME; import static com.netease.arctic.flink.FlinkSchemaUtil.COMPUTED_COLUMNS; import static com.netease.arctic.flink.FlinkSchemaUtil.FLINK_PREFIX; import static com.netease.arctic.flink.FlinkSchemaUtil.WATERMARK; @@ -30,8 +30,8 @@ import static org.apache.flink.table.descriptors.DescriptorProperties.WATERMARK_STRATEGY_DATA_TYPE; import static org.apache.flink.table.descriptors.DescriptorProperties.WATERMARK_STRATEGY_EXPR; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestBase; import com.netease.arctic.flink.catalog.factories.CatalogFactoryOptions; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestMixedCatalogTablePartitions.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestMixedCatalogTablePartitions.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestMixedCatalogTablePartitions.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestMixedCatalogTablePartitions.java index 1cad61a737..f1a30905b6 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestMixedCatalogTablePartitions.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestMixedCatalogTablePartitions.java @@ -24,7 +24,7 @@ import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.EQUALS; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.util.DataUtil; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java index 6c3d22d1f2..cb716bf134 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java @@ -18,8 +18,8 @@ package com.netease.arctic.flink.read; -import static com.netease.arctic.ams.api.MockArcticMetastoreServer.TEST_CATALOG_NAME; -import static com.netease.arctic.ams.api.MockArcticMetastoreServer.TEST_DB_NAME; +import static com.netease.arctic.MockArcticMetastoreServer.TEST_CATALOG_NAME; +import static com.netease.arctic.MockArcticMetastoreServer.TEST_DB_NAME; import static com.netease.arctic.flink.table.descriptors.ArcticValidator.SCAN_STARTUP_MODE_EARLIEST; import static com.netease.arctic.flink.table.descriptors.ArcticValidator.SCAN_STARTUP_MODE_LATEST; import static org.apache.flink.util.Preconditions.checkArgument; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java index 11c262aead..eeed29cf70 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java @@ -22,8 +22,8 @@ import static com.netease.arctic.flink.write.TestArcticFileWriter.createUnkeyedTaskWriter; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.table.ArcticTableLoader; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java index ff583722e4..3f8bcd43a1 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java @@ -21,8 +21,8 @@ import static org.apache.flink.util.Preconditions.checkState; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.read.FlinkSplitPlanner; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java index 8bc0f04af4..e2c3e2415e 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java @@ -19,8 +19,8 @@ package com.netease.arctic.flink.read.hybrid.enumerator; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java index ccdcb15f26..a6fef7ebf0 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.flink.read.MixedIncrementalLoader; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java index 57d34ae219..7a7714319b 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java @@ -19,7 +19,7 @@ package com.netease.arctic.flink.read.hybrid.reader; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.data.DataFileType; import com.netease.arctic.flink.read.FlinkSplitPlanner; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java index 26af3ffe4a..0dfc34743f 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java @@ -19,7 +19,7 @@ package com.netease.arctic.flink.shuffle; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.data.DataTreeNode; import com.netease.arctic.flink.FlinkTestBase; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/AmoroCatalogITCaseBase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/AmoroCatalogITCaseBase.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/AmoroCatalogITCaseBase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/AmoroCatalogITCaseBase.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java index baa16858f3..fe9f62a538 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java @@ -19,7 +19,7 @@ package com.netease.arctic.flink.table; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.util.DataUtil; import com.netease.arctic.flink.write.FlinkTaskWriterBaseTest; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java index c5fa7e1c82..a77d577b39 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java @@ -21,8 +21,8 @@ import static org.apache.flink.table.planner.factories.TestValuesTableFactory.registerData; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.util.ArcticUtils; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java index 4ab211c959..1caab7caf7 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java @@ -26,8 +26,8 @@ import static org.apache.flink.table.api.Expressions.$; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java index 1eb25fba24..c708121979 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java @@ -19,7 +19,7 @@ package com.netease.arctic.flink.table; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.util.DataUtil; import com.netease.arctic.flink.write.FlinkTaskWriterBaseTest; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java similarity index 98% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java index bea936a8d9..1d712482ea 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java @@ -22,8 +22,8 @@ import static com.netease.arctic.flink.table.descriptors.ArcticValidator.LOG_STORE_CATCH_UP_TIMESTAMP; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java index e710ad47fa..8dc08e1ae4 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java @@ -18,15 +18,15 @@ package com.netease.arctic.flink.table; -import static com.netease.arctic.ams.api.MockArcticMetastoreServer.TEST_CATALOG_NAME; +import static com.netease.arctic.MockArcticMetastoreServer.TEST_CATALOG_NAME; import static com.netease.arctic.flink.kafka.testutils.KafkaContainerTest.KAFKA_CONTAINER; import static com.netease.arctic.table.TableProperties.ENABLE_LOG_STORE; import static com.netease.arctic.table.TableProperties.LOG_STORE_ADDRESS; import static com.netease.arctic.table.TableProperties.LOG_STORE_MESSAGE_TOPIC; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java index af3844a755..d7564e1e9f 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java @@ -19,8 +19,8 @@ package com.netease.arctic.flink.table; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java similarity index 98% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java index 27b43ba150..752d987f14 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java @@ -18,11 +18,11 @@ package com.netease.arctic.flink.table; -import static com.netease.arctic.ams.api.MockArcticMetastoreServer.TEST_CATALOG_NAME; +import static com.netease.arctic.MockArcticMetastoreServer.TEST_CATALOG_NAME; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.util.ArcticUtils; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java index e30c410dba..1629b5c9b6 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java @@ -21,8 +21,8 @@ import static com.netease.arctic.flink.read.TestArcticSource.tableRecords; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.data.FileNameRules; import com.netease.arctic.flink.FlinkTestBase; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java index 76b54413e6..d22e123598 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java @@ -20,8 +20,8 @@ import static com.netease.arctic.table.TableProperties.FILE_FORMAT_ORC; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.flink.read.AdaptHiveFlinkParquetReaders; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java index 05e32636a7..167bb3edd2 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java @@ -21,8 +21,8 @@ import static com.netease.arctic.flink.write.TestArcticFileWriter.createArcticStreamWriter; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.table.ArcticTableLoader; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java index f0547f9eab..61d18eba5e 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java @@ -21,8 +21,8 @@ import static com.netease.arctic.flink.table.descriptors.ArcticValidator.SUBMIT_EMPTY_SNAPSHOTS; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.table.ArcticTableLoader; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java similarity index 98% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java index bf4e2a934f..6532e5729a 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java @@ -22,8 +22,8 @@ import static com.netease.arctic.flink.table.descriptors.ArcticValidator.LOG_STORE_CATCH_UP; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.table.ArcticTableLoader; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java index 8e2d2b033d..6f2e3b21c9 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java @@ -28,8 +28,8 @@ import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.kafka.testutils.KafkaConfigGenerate; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java similarity index 99% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java index 18572d9abe..53710cff2b 100644 --- a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java +++ b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java @@ -19,8 +19,8 @@ package com.netease.arctic.flink.write; import com.netease.arctic.BasicTableTestHelper; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.BasicCatalogTestHelper; import com.netease.arctic.flink.FlinkTestBase; import com.netease.arctic.flink.table.ArcticTableLoader; diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java diff --git a/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java b/mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java similarity index 100% rename from mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java rename to mixed-format/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java diff --git a/mixed/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory b/mixed-format/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from mixed/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to mixed-format/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/mixed/flink/flink-common/src/test/resources/log4j2-test.xml b/mixed-format/flink/flink-common/src/test/resources/log4j2-test.xml similarity index 100% rename from mixed/flink/flink-common/src/test/resources/log4j2-test.xml rename to mixed-format/flink/flink-common/src/test/resources/log4j2-test.xml diff --git a/mixed/flink/flink-common/src/test/resources/log4j2.component.properties b/mixed-format/flink/flink-common/src/test/resources/log4j2.component.properties similarity index 100% rename from mixed/flink/flink-common/src/test/resources/log4j2.component.properties rename to mixed-format/flink/flink-common/src/test/resources/log4j2.component.properties diff --git a/mixed/flink/pom.xml b/mixed-format/flink/pom.xml similarity index 95% rename from mixed/flink/pom.xml rename to mixed-format/flink/pom.xml index 3aad88c84e..8d948a5602 100644 --- a/mixed/flink/pom.xml +++ b/mixed-format/flink/pom.xml @@ -23,12 +23,12 @@ com.netease.amoro - amoro-mixed + amoro-mixed-format 0.7.0-SNAPSHOT ../pom.xml - amoro-mixed-flink + amoro-mixed-format-flink pom Amoro Project Mixed Format Flink Parent https://amoro.netease.com diff --git a/mixed/flink/v1.15/flink-runtime/pom.xml b/mixed-format/flink/v1.15/flink-runtime/pom.xml similarity index 99% rename from mixed/flink/v1.15/flink-runtime/pom.xml rename to mixed-format/flink/v1.15/flink-runtime/pom.xml index 70d6a0e709..28029c08f9 100644 --- a/mixed/flink/v1.15/flink-runtime/pom.xml +++ b/mixed-format/flink/v1.15/flink-runtime/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-mixed-flink-runtime-1.15 + amoro-mixed-format-flink-runtime-1.15 Amoro Project Mixed Format Flink 1.15 Runtime https://amoro.netease.com @@ -38,7 +38,7 @@ com.netease.amoro - amoro-mixed-flink-1.15 + amoro-mixed-format-flink-1.15 ${project.parent.version} @@ -107,7 +107,7 @@ - com.netease.amoro:amoro-mixed-hive + com.netease.amoro:amoro-mixed-format-hive org/apache/hadoop/hive/** diff --git a/mixed/flink/v1.15/flink/pom.xml b/mixed-format/flink/v1.15/flink/pom.xml similarity index 95% rename from mixed/flink/v1.15/flink/pom.xml rename to mixed-format/flink/v1.15/flink/pom.xml index 1b6e00a9bd..34f449f577 100644 --- a/mixed/flink/v1.15/flink/pom.xml +++ b/mixed-format/flink/v1.15/flink/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-mixed-flink-1.15 + amoro-mixed-format-flink-1.15 Amoro Project Mixed Format Flink 1.15 https://amoro.netease.com @@ -43,7 +43,7 @@ com.netease.amoro - amoro-mixed-flink-common + amoro-mixed-format-flink-common ${project.parent.version} diff --git a/mixed/flink/v1.16/flink-runtime/pom.xml b/mixed-format/flink/v1.16/flink-runtime/pom.xml similarity index 99% rename from mixed/flink/v1.16/flink-runtime/pom.xml rename to mixed-format/flink/v1.16/flink-runtime/pom.xml index 59e2760a14..433c757a02 100644 --- a/mixed/flink/v1.16/flink-runtime/pom.xml +++ b/mixed-format/flink/v1.16/flink-runtime/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-mixed-flink-runtime-1.16 + amoro-mixed-format-flink-runtime-1.16 Amoro Project Mixed Format Flink 1.16 Runtime https://amoro.netease.com @@ -38,7 +38,7 @@ com.netease.amoro - amoro-mixed-flink-1.16 + amoro-mixed-format-flink-1.16 ${project.parent.version} @@ -106,7 +106,7 @@ - com.netease.amoro:amoro-mixed-hive + com.netease.amoro:amoro-mixed-format-hive org/apache/hadoop/hive/** diff --git a/mixed/flink/v1.16/flink/pom.xml b/mixed-format/flink/v1.16/flink/pom.xml similarity index 95% rename from mixed/flink/v1.16/flink/pom.xml rename to mixed-format/flink/v1.16/flink/pom.xml index d4163ebe88..dd8762daec 100644 --- a/mixed/flink/v1.16/flink/pom.xml +++ b/mixed-format/flink/v1.16/flink/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-mixed-flink-1.16 + amoro-mixed-format-flink-1.16 Amoro Project Mixed Format Flink 1.16 https://amoro.netease.com @@ -43,7 +43,7 @@ com.netease.amoro - amoro-mixed-flink-common + amoro-mixed-format-flink-common ${project.parent.version} diff --git a/mixed/flink/v1.17/flink-runtime/pom.xml b/mixed-format/flink/v1.17/flink-runtime/pom.xml similarity index 99% rename from mixed/flink/v1.17/flink-runtime/pom.xml rename to mixed-format/flink/v1.17/flink-runtime/pom.xml index 92b53fe1c4..c43b56f39d 100644 --- a/mixed/flink/v1.17/flink-runtime/pom.xml +++ b/mixed-format/flink/v1.17/flink-runtime/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-mixed-flink-runtime-1.17 + amoro-mixed-format-flink-runtime-1.17 Amoro Project Mixed Format Flink 1.17 Runtime https://amoro.netease.com @@ -38,7 +38,7 @@ com.netease.amoro - amoro-mixed-flink-1.17 + amoro-mixed-format-flink-1.17 ${project.parent.version} @@ -107,7 +107,7 @@ - com.netease.amoro:amoro-mixed-hive + com.netease.amoro:amoro-mixed-format-hive org/apache/hadoop/hive/** diff --git a/mixed/flink/v1.17/flink/pom.xml b/mixed-format/flink/v1.17/flink/pom.xml similarity index 95% rename from mixed/flink/v1.17/flink/pom.xml rename to mixed-format/flink/v1.17/flink/pom.xml index f7d20558c8..43857e58ca 100644 --- a/mixed/flink/v1.17/flink/pom.xml +++ b/mixed-format/flink/v1.17/flink/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed-flink + amoro-mixed-format-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-mixed-flink-1.17 + amoro-mixed-format-flink-1.17 Amoro Project Mixed Format Flink 1.17 https://amoro.netease.com @@ -43,7 +43,7 @@ com.netease.amoro - amoro-mixed-flink-common + amoro-mixed-format-flink-common ${project.parent.version} diff --git a/mixed/hive/pom.xml b/mixed-format/hive/pom.xml similarity index 97% rename from mixed/hive/pom.xml rename to mixed-format/hive/pom.xml index 5b9bda00db..76c07924f5 100644 --- a/mixed/hive/pom.xml +++ b/mixed-format/hive/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-mixed + amoro-mixed-format 0.7.0-SNAPSHOT ../pom.xml - amoro-mixed-hive + amoro-mixed-format-hive Amoro Project Mixed Hive Format https://amoro.netease.com diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java similarity index 98% rename from mixed/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java index ba186e9238..b359dafb2d 100644 --- a/mixed/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java +++ b/mixed-format/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java @@ -20,7 +20,7 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.properties.CatalogMetaProperties; import com.netease.arctic.table.TableMetaStore; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.InvalidObjectException; diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/HMSClient.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/HMSClient.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/HMSClient.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/HMSClient.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java similarity index 98% rename from mixed/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java index 7c7ae3b827..8007e41266 100644 --- a/mixed/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java +++ b/mixed-format/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.catalog; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.catalog.BasicArcticCatalog; import com.netease.arctic.catalog.MixedTables; import com.netease.arctic.hive.CachedHiveClientPool; diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java similarity index 97% rename from mixed/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java index 321442064a..4223f7c17a 100644 --- a/mixed/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java +++ b/mixed-format/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java @@ -18,8 +18,7 @@ package com.netease.arctic.hive.catalog; -import com.netease.arctic.ams.api.TableMeta; -import com.netease.arctic.ams.api.properties.MetaTableProperties; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.catalog.MixedTables; import com.netease.arctic.hive.CachedHiveClientPool; import com.netease.arctic.hive.HiveTableProperties; @@ -30,13 +29,14 @@ import com.netease.arctic.io.ArcticFileIO; import com.netease.arctic.io.ArcticFileIOs; import com.netease.arctic.io.ArcticHadoopFileIO; +import com.netease.arctic.properties.MetaTableProperties; import com.netease.arctic.table.ChangeTable; import com.netease.arctic.table.KeyedTable; import com.netease.arctic.table.PrimaryKeySpec; import com.netease.arctic.table.TableIdentifier; import com.netease.arctic.table.TableMetaStore; import com.netease.arctic.table.TableProperties; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.hadoop.hive.metastore.TableType; import org.apache.iceberg.FileFormat; import org.apache.iceberg.PartitionSpec; @@ -85,7 +85,7 @@ protected KeyedHiveTable loadKeyedTable(TableMeta tableMeta) { UnkeyedHiveTable baseTable = new KeyedHiveTable.HiveBaseInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( baseIcebergTable, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, tableLocation, @@ -97,7 +97,7 @@ protected KeyedHiveTable loadKeyedTable(TableMeta tableMeta) { ChangeTable changeTable = new KeyedHiveTable.HiveChangeInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( changeIcebergTable, changeLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); @@ -136,7 +136,7 @@ protected UnkeyedHiveTable loadUnKeyedTable(TableMeta tableMeta) { Table table = tableMetaStore.doAs(() -> tables.load(baseLocation)); return new UnkeyedHiveTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( table, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, tableLocation, @@ -190,7 +190,7 @@ protected KeyedTable createKeyedTable( UnkeyedHiveTable baseTable = new KeyedHiveTable.HiveBaseInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( baseIcebergTable, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, tableLocation, @@ -218,7 +218,7 @@ protected KeyedTable createKeyedTable( ChangeTable changeTable = new KeyedHiveTable.HiveChangeInternalTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( changeIcebergTable, changeLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, catalogProperties); @@ -338,7 +338,7 @@ protected UnkeyedHiveTable createUnKeyedTable( catalogProperties); return new UnkeyedHiveTable( tableIdentifier, - CatalogUtil.useArcticTableOperations( + ArcticCatalogUtil.useArcticTableOperations( table, baseLocation, fileIO, tableMetaStore.getConfiguration()), fileIO, tableLocation, diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java similarity index 98% rename from mixed/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java index 4077fc7c96..610a3a617b 100644 --- a/mixed/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java +++ b/mixed-format/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.table; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.TableMeta; +import com.netease.arctic.TableFormat; +import com.netease.arctic.api.TableMeta; import com.netease.arctic.hive.HMSClientPool; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.op.BaseSchemaUpdate; diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java similarity index 99% rename from mixed/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java index af6e661b4e..fa0a9aae23 100644 --- a/mixed/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java +++ b/mixed-format/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java @@ -20,7 +20,7 @@ import static com.netease.arctic.hive.HiveTableProperties.BASE_HIVE_LOCATION_ROOT; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.hive.HMSClientPool; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.op.HiveOperationTransaction; diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java diff --git a/mixed/hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java b/mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java similarity index 100% rename from mixed/hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java rename to mixed-format/hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java diff --git a/mixed/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java b/mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java rename to mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java diff --git a/mixed/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java b/mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java rename to mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java b/mixed-format/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java b/mixed-format/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java b/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java b/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java b/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java b/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java diff --git a/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java b/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java similarity index 100% rename from mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java rename to mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/TestHMS.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/TestHMS.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/TestHMS.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/TestHMS.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java similarity index 92% rename from mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java index ff93363905..6e4358c17d 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java @@ -22,14 +22,14 @@ import static org.apache.iceberg.CatalogUtil.ICEBERG_CATALOG_TYPE_HIVE; import com.netease.arctic.CommonUnifiedCatalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.UnifiedCatalog; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.CatalogTestHelpers; import com.netease.arctic.catalog.MixedTables; -import com.netease.arctic.utils.CatalogUtil; +import com.netease.arctic.properties.CatalogMetaProperties; +import com.netease.arctic.utils.ArcticCatalogUtil; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.iceberg.CatalogProperties; @@ -91,7 +91,7 @@ public MixedTables buildMixedTables(CatalogMeta catalogMeta) { "Cannot build mixed-tables for table format:" + tableFormat); } return new MixedHiveTables( - catalogMeta.getCatalogProperties(), CatalogUtil.buildMetaStore(catalogMeta)); + catalogMeta.getCatalogProperties(), ArcticCatalogUtil.buildMetaStore(catalogMeta)); } @Override diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java similarity index 94% rename from mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java index 5bec97ec83..61d673e2a9 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java @@ -18,14 +18,14 @@ package com.netease.arctic.hive.catalog; +import com.netease.arctic.TableFormat; import com.netease.arctic.TestAms; -import com.netease.arctic.ams.api.CatalogMeta; -import com.netease.arctic.ams.api.TableFormat; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; +import com.netease.arctic.api.CatalogMeta; import com.netease.arctic.catalog.ArcticCatalog; import com.netease.arctic.catalog.CatalogLoader; import com.netease.arctic.catalog.CatalogTestHelpers; import com.netease.arctic.hive.TestHMS; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.junit.Assert; import org.junit.ClassRule; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java similarity index 98% rename from mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java index 3b1dddef91..4440e800a3 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java @@ -22,7 +22,7 @@ import static com.netease.arctic.hive.HiveTableProperties.ARCTIC_TABLE_ROOT_LOCATION; import com.netease.arctic.BasicTableTestHelper; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.TestMixedCatalog; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.table.ArcticTable; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java similarity index 96% rename from mixed/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java index db19ca15ee..29cce59cfd 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.formats; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; import com.netease.arctic.formats.IcebergHadoopCatalogTestHelper; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.iceberg.CatalogProperties; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java similarity index 96% rename from mixed/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java index 51b160b16f..f01181bc95 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.formats; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; import com.netease.arctic.formats.MixedIcebergHadoopCatalogTestHelper; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.iceberg.CatalogProperties; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java similarity index 96% rename from mixed/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java index c727496c51..0b0b76e292 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.formats; -import com.netease.arctic.ams.api.properties.CatalogMetaProperties; import com.netease.arctic.formats.PaimonHadoopCatalogTestHelper; +import com.netease.arctic.properties.CatalogMetaProperties; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.paimon.options.CatalogOptions; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java similarity index 97% rename from mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java index 90827888ea..a9bd1cf376 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java @@ -18,7 +18,7 @@ package com.netease.arctic.hive.io; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; import com.netease.arctic.hive.catalog.HiveTableTestHelper; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java index d930e2a569..3676faa2e5 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.io; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java similarity index 97% rename from mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java index bd12be9c85..2d3fe48a69 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.io; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.TestHMS; import com.netease.arctic.hive.catalog.HiveCatalogTestHelper; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java index f956548784..eea16532eb 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java @@ -22,8 +22,8 @@ import static com.netease.arctic.hive.catalog.HiveTableTestHelper.COLUMN_NAME_OP_DAY; import static com.netease.arctic.hive.catalog.HiveTableTestHelper.COLUMN_NAME_OP_TIME_WITH_ZONE; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.hive.TestHMS; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java index c3bba5407a..c941e1fbe7 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java @@ -20,8 +20,8 @@ import static com.netease.arctic.hive.op.UpdateHiveFiles.DELETE_UNTRACKED_HIVE_FILE; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.MixedHiveTableTestBase; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java index 04ccdaa04d..9c9a1cc10d 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java @@ -20,8 +20,8 @@ import static com.netease.arctic.hive.op.UpdateHiveFiles.DELETE_UNTRACKED_HIVE_FILE; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.MixedHiveTableTestBase; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java index 0fb8bb7a2f..bb5dc62746 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java @@ -20,8 +20,8 @@ import static com.netease.arctic.hive.op.UpdateHiveFiles.DELETE_UNTRACKED_HIVE_FILE; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.MixedHiveTableTestBase; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java index 1282a1e639..2e411723b8 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java @@ -18,8 +18,8 @@ package com.netease.arctic.hive.op; +import com.netease.arctic.TableFormat; import com.netease.arctic.TableTestHelper; -import com.netease.arctic.ams.api.TableFormat; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.hive.HiveTableProperties; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java index 0316f0a9d1..6262af011d 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java @@ -20,7 +20,7 @@ import static com.netease.arctic.utils.TablePropertyUtil.EMPTY_STRUCT; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.TableTestBase; import com.netease.arctic.hive.HiveTableProperties; import com.netease.arctic.hive.TestHMS; diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java similarity index 100% rename from mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java diff --git a/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java b/mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java similarity index 99% rename from mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java rename to mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java index e9ed272db4..46587641a1 100644 --- a/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java +++ b/mixed-format/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java @@ -18,7 +18,7 @@ package com.netease.arctic.hive.utils; -import com.netease.arctic.ams.api.TableFormat; +import com.netease.arctic.TableFormat; import com.netease.arctic.catalog.CatalogTestBase; import com.netease.arctic.catalog.CatalogTestHelper; import com.netease.arctic.hive.HiveTableProperties; diff --git a/mixed/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java b/mixed-format/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java similarity index 100% rename from mixed/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java rename to mixed-format/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java diff --git a/mixed/hive/src/test/resources/hive-schema-3.1.0.derby.sql b/mixed-format/hive/src/test/resources/hive-schema-3.1.0.derby.sql similarity index 100% rename from mixed/hive/src/test/resources/hive-schema-3.1.0.derby.sql rename to mixed-format/hive/src/test/resources/hive-schema-3.1.0.derby.sql diff --git a/mixed/hive/src/test/resources/hive.parquet b/mixed-format/hive/src/test/resources/hive.parquet similarity index 100% rename from mixed/hive/src/test/resources/hive.parquet rename to mixed-format/hive/src/test/resources/hive.parquet diff --git a/mixed/hive/src/test/resources/log4j2.xml b/mixed-format/hive/src/test/resources/log4j2.xml similarity index 100% rename from mixed/hive/src/test/resources/log4j2.xml rename to mixed-format/hive/src/test/resources/log4j2.xml diff --git a/mixed/hive/src/test/resources/string_is_bytes.parquet b/mixed-format/hive/src/test/resources/string_is_bytes.parquet similarity index 100% rename from mixed/hive/src/test/resources/string_is_bytes.parquet rename to mixed-format/hive/src/test/resources/string_is_bytes.parquet diff --git a/mixed/pom.xml b/mixed-format/pom.xml similarity index 95% rename from mixed/pom.xml rename to mixed-format/pom.xml index daae2847b3..3a7763e408 100644 --- a/mixed/pom.xml +++ b/mixed-format/pom.xml @@ -1,4 +1,5 @@ - + +