Change package name for module core (#2767)

* Change package name for module core * fix package name in LICENSE
apache · Apr 18, 2024 · d844bf0 · d844bf0
1 parent dc84d2a
commit d844bf0
Show file tree

Hide file tree

Showing 843 changed files with 3,609 additions and 3,611 deletions.
diff --git a/LICENSE b/LICENSE
@@ -205,8 +205,8 @@
 
 This product includes code from Apache Iceberg.
 
-* org.apache.iceberg.data.DeleteFilter copied and modified to com.netease.arctic.io.reader.DeleteFilter
-* org.apache.iceberg.deletes.Deletes copied and modified to com.netease.arctic.io.reader.Deletes
+* org.apache.iceberg.data.DeleteFilter copied and modified to org.apache.amoro.io.reader.DeleteFilter
+* org.apache.iceberg.deletes.Deletes copied and modified to org.apache.amoro.io.reader.Deletes
 * org.apache.iceberg.data.parquet.BaseParquetReaders copied and modified to org.apache.iceberg.data.parquet.AdaptHiveBaseParquetReaders
 * org.apache.iceberg.data.parquet.BaseParquetWriter copied and modified to org.apache.iceberg.data.parquet.AdaptHiveBaseParquetWriter
 * org.apache.iceberg.data.parquet.GenericParquetReaders copied and modified to org.apache.iceberg.data.parquet.AdaptHiveGenericParquetReaders

diff --git a/ams/api/src/main/java/org/apache/amoro/api/ServerTableIdentifier.java b/ams/api/src/main/java/org/apache/amoro/api/ServerTableIdentifier.java
@@ -18,8 +18,7 @@
 
 package org.apache.amoro.api;
 
-import com.netease.arctic.TableFormat;
-import com.netease.arctic.api.TableIdentifier;
+import org.apache.amoro.TableFormat;
 
 import java.util.Objects;
 

diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/DataExpirationConfig.java b/ams/api/src/main/java/org/apache/amoro/api/config/DataExpirationConfig.java
@@ -20,9 +20,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.netease.arctic.table.ArcticTable;
-import com.netease.arctic.table.TableProperties;
-import com.netease.arctic.utils.CompatiblePropertyUtil;
+import org.apache.amoro.table.ArcticTable;
+import org.apache.amoro.table.TableProperties;
+import org.apache.amoro.utils.CompatiblePropertyUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting;
 import org.apache.iceberg.relocated.com.google.common.base.Objects;

diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java b/ams/api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
@@ -19,9 +19,9 @@
 package org.apache.amoro.api.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.netease.arctic.properties.HiveTableProperties;
-import com.netease.arctic.table.TableProperties;
-import com.netease.arctic.utils.CompatiblePropertyUtil;
+import org.apache.amoro.properties.HiveTableProperties;
+import org.apache.amoro.table.TableProperties;
+import org.apache.amoro.utils.CompatiblePropertyUtil;
 import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
 import org.apache.iceberg.relocated.com.google.common.base.Objects;
 import org.apache.iceberg.util.PropertyUtil;

diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/TableConfiguration.java b/ams/api/src/main/java/org/apache/amoro/api/config/TableConfiguration.java
@@ -19,8 +19,8 @@
 package org.apache.amoro.api.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.netease.arctic.table.TableProperties;
-import com.netease.arctic.utils.CompatiblePropertyUtil;
+import org.apache.amoro.table.TableProperties;
+import org.apache.amoro.utils.CompatiblePropertyUtil;
 import org.apache.iceberg.relocated.com.google.common.base.Objects;
 
 import java.util.Map;

diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/TagConfiguration.java b/ams/api/src/main/java/org/apache/amoro/api/config/TagConfiguration.java
@@ -19,8 +19,8 @@
 package org.apache.amoro.api.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.netease.arctic.table.TableProperties;
-import com.netease.arctic.utils.CompatiblePropertyUtil;
+import org.apache.amoro.table.TableProperties;
+import org.apache.amoro.utils.CompatiblePropertyUtil;
 import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
 import org.apache.iceberg.relocated.com.google.common.base.Objects;
 

diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/Resource.java b/ams/api/src/main/java/org/apache/amoro/api/resource/Resource.java
@@ -18,7 +18,7 @@
 
 package org.apache.amoro.api.resource;
 
-import com.netease.arctic.api.OptimizerRegisterInfo;
+import org.apache.amoro.api.OptimizerRegisterInfo;
 import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
 
 import java.math.BigInteger;

diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/ResourceGroup.java b/ams/api/src/main/java/org/apache/amoro/api/resource/ResourceGroup.java
@@ -18,7 +18,7 @@
 
 package org.apache.amoro.api.resource;
 
-import com.netease.arctic.Constants;
+import org.apache.amoro.Constants;
 import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
 
 import java.util.HashMap;

diff --git a/...zer/common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java b/...zer/common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
@@ -18,10 +18,10 @@
 
 package org.apache.amoro.optimizer.common;
 
-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.amoro.ErrorCodes;
+import org.apache.amoro.api.ArcticException;
+import org.apache.amoro.api.OptimizingService;
+import org.apache.amoro.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/org/apache/amoro/optimizer/common/OptimizerExecutor.java b/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
@@ -18,14 +18,14 @@
 
 package org.apache.amoro.optimizer.common;
 
-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;
-import com.netease.arctic.optimizing.TableOptimizing;
-import com.netease.arctic.utils.ExceptionUtil;
-import com.netease.arctic.utils.SerializationUtil;
+import org.apache.amoro.api.OptimizingTask;
+import org.apache.amoro.api.OptimizingTaskResult;
+import org.apache.amoro.optimizing.OptimizingExecutor;
+import org.apache.amoro.optimizing.OptimizingExecutorFactory;
+import org.apache.amoro.optimizing.OptimizingInputProperties;
+import org.apache.amoro.optimizing.TableOptimizing;
+import org.apache.amoro.utils.ExceptionUtil;
+import org.apache.amoro.utils.SerializationUtil;
 import org.apache.iceberg.common.DynConstructors;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;

diff --git a/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java b/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
@@ -18,10 +18,10 @@
 
 package org.apache.amoro.optimizer.common;
 
-import com.netease.arctic.ErrorCodes;
-import com.netease.arctic.api.ArcticException;
-import com.netease.arctic.api.OptimizerRegisterInfo;
+import org.apache.amoro.ErrorCodes;
+import org.apache.amoro.api.ArcticException;
 import org.apache.amoro.api.OptimizerProperties;
+import org.apache.amoro.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/org/apache/amoro/optimizer/common/OptimizerTestBase.java b/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
@@ -18,7 +18,7 @@
 
 package org.apache.amoro.optimizer.common;
 
-import com.netease.arctic.TestAms;
+import org.apache.amoro.TestAms;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;

diff --git a/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java b/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
@@ -18,7 +18,7 @@
 
 package org.apache.amoro.optimizer.common;
 
-import com.netease.arctic.api.OptimizingTaskResult;
+import org.apache.amoro.api.OptimizingTaskResult;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;

diff --git a/...timizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java b/...timizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
@@ -18,16 +18,16 @@
 
 package org.apache.amoro.optimizer.common;
 
-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;
-import com.netease.arctic.optimizing.OptimizingInputProperties;
-import com.netease.arctic.optimizing.TableOptimizing;
-import com.netease.arctic.utils.SerializationUtil;
+import org.apache.amoro.api.OptimizerRegisterInfo;
+import org.apache.amoro.api.OptimizingTask;
+import org.apache.amoro.api.OptimizingTaskId;
+import org.apache.amoro.api.OptimizingTaskResult;
+import org.apache.amoro.optimizing.BaseOptimizingInput;
+import org.apache.amoro.optimizing.OptimizingExecutor;
+import org.apache.amoro.optimizing.OptimizingExecutorFactory;
+import org.apache.amoro.optimizing.OptimizingInputProperties;
+import org.apache.amoro.optimizing.TableOptimizing;
+import org.apache.amoro.utils.SerializationUtil;
 import org.apache.iceberg.relocated.com.google.common.collect.Maps;
 import org.apache.thrift.TException;
 import org.junit.After;

diff --git a/...ptimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java b/...ptimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
@@ -18,8 +18,8 @@
 
 package org.apache.amoro.optimizer.common;
 
-import com.netease.arctic.api.OptimizerRegisterInfo;
 import org.apache.amoro.api.OptimizerProperties;
+import org.apache.amoro.api.OptimizerRegisterInfo;
 import org.apache.iceberg.relocated.com.google.common.collect.Lists;
 import org.apache.iceberg.relocated.com.google.common.collect.Maps;
 import org.junit.Assert;

diff --git a/...link-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java b/...link-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
@@ -18,8 +18,8 @@
 
 package org.apache.amoro.optimizer.flink;
 
-import com.netease.arctic.api.OptimizingTask;
-import com.netease.arctic.api.OptimizingTaskResult;
+import org.apache.amoro.api.OptimizingTask;
+import org.apache.amoro.api.OptimizingTaskResult;
 import org.apache.amoro.optimizer.common.OptimizerConfig;
 import org.apache.amoro.optimizer.common.OptimizerExecutor;
 import org.apache.flink.metrics.Counter;

diff --git a/ams/optimizer/spark-optimizer/pom.xml b/ams/optimizer/spark-optimizer/pom.xml
@@ -138,7 +138,7 @@
                             <relocations>
                                 <relocation>
                                     <pattern>org.apache.parquet</pattern>
-                                    <shadedPattern>com.netease.arctic.shade.org.apache.parquet</shadedPattern>
+                                    <shadedPattern>org.apache.amoro.shade.org.apache.parquet</shadedPattern>
                                 </relocation>
                             </relocations>
                             <finalName>${project.artifactId}-${project.version}-jar-with-dependencies</finalName>

diff --git a/...park-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java b/...park-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
@@ -18,14 +18,14 @@
 
 package org.apache.amoro.optimizer.spark;
 
-import com.netease.arctic.api.OptimizingTask;
-import com.netease.arctic.api.OptimizingTaskResult;
-import com.netease.arctic.optimizing.RewriteFilesInput;
-import com.netease.arctic.optimizing.TableOptimizing;
-import com.netease.arctic.utils.ExceptionUtil;
-import com.netease.arctic.utils.SerializationUtil;
+import org.apache.amoro.api.OptimizingTask;
+import org.apache.amoro.api.OptimizingTaskResult;
 import org.apache.amoro.optimizer.common.OptimizerConfig;
 import org.apache.amoro.optimizer.common.OptimizerExecutor;
+import org.apache.amoro.optimizing.RewriteFilesInput;
+import org.apache.amoro.optimizing.TableOptimizing;
+import org.apache.amoro.utils.ExceptionUtil;
+import org.apache.amoro.utils.SerializationUtil;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
 import org.apache.spark.api.java.JavaSparkContext;
 import org.slf4j.Logger;

diff --git a/...optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java b/...optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
@@ -18,8 +18,8 @@
 
 package org.apache.amoro.optimizer.spark;
 
-import com.netease.arctic.api.OptimizingTask;
-import com.netease.arctic.api.OptimizingTaskResult;
+import org.apache.amoro.api.OptimizingTask;
+import org.apache.amoro.api.OptimizingTaskResult;
 import org.apache.amoro.optimizer.common.OptimizerConfig;
 import org.apache.amoro.optimizer.common.OptimizerExecutor;
 import org.apache.spark.api.java.function.Function;

diff --git a/ams/server/src/main/java/org/apache/amoro/server/ArcticServiceContainer.java b/ams/server/src/main/java/org/apache/amoro/server/ArcticServiceContainer.java
@@ -18,13 +18,12 @@
 
 package org.apache.amoro.server;
 
-import com.netease.arctic.Constants;
-import com.netease.arctic.api.ArcticTableMetastore;
-import com.netease.arctic.api.OptimizingService;
-import com.netease.arctic.utils.JacksonUtil;
 import io.javalin.Javalin;
 import io.javalin.http.HttpCode;
+import org.apache.amoro.Constants;
+import org.apache.amoro.api.ArcticTableMetastore;
 import org.apache.amoro.api.OptimizerProperties;
+import org.apache.amoro.api.OptimizingService;
 import org.apache.amoro.api.config.ConfigHelpers;
 import org.apache.amoro.api.config.Configurations;
 import org.apache.amoro.server.dashboard.DashboardServer;
@@ -44,6 +43,7 @@
 import org.apache.amoro.server.table.executor.AsyncTableExecutors;
 import org.apache.amoro.server.terminal.TerminalManager;
 import org.apache.amoro.server.utils.ThriftServiceProxy;
+import org.apache.amoro.utils.JacksonUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.iceberg.SystemProperties;
 import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting;

diff --git a/ams/server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java b/ams/server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
@@ -18,21 +18,20 @@
 
 package org.apache.amoro.server;
 
-import com.netease.arctic.AmoroTable;
-import com.netease.arctic.api.CatalogMeta;
-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.properties.CatalogMetaProperties;
-import com.netease.arctic.table.TableProperties;
+import org.apache.amoro.AmoroTable;
+import org.apache.amoro.api.CatalogMeta;
 import org.apache.amoro.api.OptimizerProperties;
+import org.apache.amoro.api.OptimizerRegisterInfo;
+import org.apache.amoro.api.OptimizingService;
+import org.apache.amoro.api.OptimizingTask;
+import org.apache.amoro.api.OptimizingTaskId;
+import org.apache.amoro.api.OptimizingTaskResult;
 import org.apache.amoro.api.ServerTableIdentifier;
 import org.apache.amoro.api.config.Configurations;
 import org.apache.amoro.api.config.TableConfiguration;
 import org.apache.amoro.api.resource.Resource;
 import org.apache.amoro.api.resource.ResourceGroup;
+import org.apache.amoro.properties.CatalogMetaProperties;
 import org.apache.amoro.server.exception.ForbiddenException;
 import org.apache.amoro.server.exception.ObjectNotExistsException;
 import org.apache.amoro.server.exception.PluginRetryAuthException;
@@ -52,6 +51,7 @@
 import org.apache.amoro.server.table.TableRuntime;
 import org.apache.amoro.server.table.TableRuntimeMeta;
 import org.apache.amoro.server.table.TableService;
+import org.apache.amoro.table.TableProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;

diff --git a/ams/server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java b/ams/server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java
@@ -18,10 +18,10 @@
 
 package org.apache.amoro.server;
 
-import com.netease.arctic.client.AmsServerInfo;
-import com.netease.arctic.properties.AmsHAProperties;
-import com.netease.arctic.utils.JacksonUtil;
 import org.apache.amoro.api.config.Configurations;
+import org.apache.amoro.client.AmsServerInfo;
+import org.apache.amoro.properties.AmsHAProperties;
+import org.apache.amoro.utils.JacksonUtil;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.recipes.leader.LeaderLatch;

diff --git a/ams/server/src/main/java/org/apache/amoro/server/RestCatalogService.java b/ams/server/src/main/java/org/apache/amoro/server/RestCatalogService.java
@@ -29,17 +29,15 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.netease.arctic.TableFormat;
-import com.netease.arctic.properties.CatalogMetaProperties;
-import com.netease.arctic.utils.ArcticCatalogUtil;
-import com.netease.arctic.utils.TablePropertyUtil;
 import io.javalin.apibuilder.EndpointGroup;
 import io.javalin.http.ContentType;
 import io.javalin.http.Context;
 import io.javalin.http.HttpCode;
 import io.javalin.plugin.json.JavalinJackson;
+import org.apache.amoro.TableFormat;
 import org.apache.amoro.api.ServerTableIdentifier;
 import org.apache.amoro.api.events.IcebergReportEvent;
+import org.apache.amoro.properties.CatalogMetaProperties;
 import org.apache.amoro.server.catalog.InternalCatalog;
 import org.apache.amoro.server.catalog.ServerCatalog;
 import org.apache.amoro.server.exception.ObjectNotExistsException;
@@ -48,6 +46,8 @@
 import org.apache.amoro.server.table.TableService;
 import org.apache.amoro.server.table.internal.InternalTableCreator;
 import org.apache.amoro.server.table.internal.InternalTableHandler;
+import org.apache.amoro.utils.ArcticCatalogUtil;
+import org.apache.amoro.utils.TablePropertyUtil;
 import org.apache.iceberg.TableMetadata;
 import org.apache.iceberg.TableOperations;
 import org.apache.iceberg.catalog.Namespace;

diff --git a/ams/server/src/main/java/org/apache/amoro/server/TableManagementService.java b/ams/server/src/main/java/org/apache/amoro/server/TableManagementService.java
@@ -18,17 +18,17 @@
 
 package org.apache.amoro.server;
 
-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 org.apache.amoro.TableFormat;
+import org.apache.amoro.api.ArcticTableMetastore;
+import org.apache.amoro.api.BlockableOperation;
+import org.apache.amoro.api.Blocker;
+import org.apache.amoro.api.CatalogMeta;
+import org.apache.amoro.api.NoSuchObjectException;
+import org.apache.amoro.api.OperationConflictException;
 import org.apache.amoro.api.ServerTableIdentifier;
+import org.apache.amoro.api.TableCommitMeta;
+import org.apache.amoro.api.TableIdentifier;
+import org.apache.amoro.api.TableMeta;
 import org.apache.amoro.server.table.TableMetadata;
 import org.apache.amoro.server.table.TableService;
 import org.apache.amoro.server.utils.InternalTableUtil;