Move ErrorCode and ErrorType to presto-common

chbhat10 · Oct 14, 2022 · b909051 · b909051
1 parent 05399bc
commit b909051
Show file tree

Hide file tree

Showing 67 changed files with 168 additions and 145 deletions.
diff --git a/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloErrorCode.java b/presto-accumulo/src/main/java/com/facebook/presto/accumulo/AccumuloErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.accumulo;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum AccumuloErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-atop/src/main/java/com/facebook/presto/atop/AtopErrorCode.java b/presto-atop/src/main/java/com/facebook/presto/atop/AtopErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.atop;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum AtopErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcErrorCode.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.plugin.jdbc;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum JdbcErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-benchmark-runner/pom.xml b/presto-benchmark-runner/pom.xml
@@ -67,6 +67,11 @@
             <artifactId>validation-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.facebook.presto</groupId>
+            <artifactId>presto-common</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.facebook.presto</groupId>
             <artifactId>presto-jdbc</artifactId>

diff --git a/...k-runner/src/main/java/com/facebook/presto/benchmark/framework/AbstractPhaseExecutor.java b/...k-runner/src/main/java/com/facebook/presto/benchmark/framework/AbstractPhaseExecutor.java
@@ -18,8 +18,8 @@
 import com.facebook.presto.benchmark.event.BenchmarkQueryEvent;
 import com.facebook.presto.benchmark.prestoaction.PrestoAction;
 import com.facebook.presto.benchmark.prestoaction.PrestoActionFactory;
+import com.facebook.presto.common.ErrorCode;
 import com.facebook.presto.jdbc.QueryStats;
-import com.facebook.presto.spi.ErrorCode;
 import com.facebook.presto.spi.ErrorCodeSupplier;
 import com.facebook.presto.sql.parser.ParsingOptions;
 import com.facebook.presto.sql.parser.SqlParser;

diff --git a/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryErrorCode.java b/presto-bigquery/src/main/java/com/facebook/presto/plugin/bigquery/BigQueryErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.plugin.bigquery;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum BigQueryErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraErrorCode.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.cassandra;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum CassandraErrorCode
         implements ErrorCodeSupplier

diff --git a/...o-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseErrorCode.java b/...o-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.plugin.clickhouse;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum ClickHouseErrorCode
         implements ErrorCodeSupplier

diff --git a/...va/com/facebook/presto/spi/ErrorCode.java → ...com/facebook/presto/common/ErrorCode.java b/...va/com/facebook/presto/spi/ErrorCode.java → ...com/facebook/presto/common/ErrorCode.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.facebook.presto.spi;
+package com.facebook.presto.common;
 
 import com.facebook.drift.annotations.ThriftConstructor;
 import com.facebook.drift.annotations.ThriftField;

diff --git a/...va/com/facebook/presto/spi/ErrorType.java → ...com/facebook/presto/common/ErrorType.java b/...va/com/facebook/presto/spi/ErrorType.java → ...com/facebook/presto/common/ErrorType.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.facebook.presto.spi;
+package com.facebook.presto.common;
 
 import com.facebook.drift.annotations.ThriftEnum;
 import com.facebook.drift.annotations.ThriftEnumValue;

diff --git a/presto-delta/src/main/java/com/facebook/presto/delta/DeltaErrorCode.java b/presto-delta/src/main/java/com/facebook/presto/delta/DeltaErrorCode.java
@@ -13,13 +13,13 @@
  */
 package com.facebook.presto.delta;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
-import static com.facebook.presto.spi.ErrorType.INTERNAL_ERROR;
-import static com.facebook.presto.spi.ErrorType.USER_ERROR;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.INTERNAL_ERROR;
+import static com.facebook.presto.common.ErrorType.USER_ERROR;
 
 public enum DeltaErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/DruidErrorCode.java b/presto-druid/src/main/java/com/facebook/presto/druid/DruidErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.druid;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum DruidErrorCode
         implements ErrorCodeSupplier

diff --git a/...elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchErrorCode.java b/...elasticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.elasticsearch;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum ElasticsearchErrorCode
         implements ErrorCodeSupplier

diff --git a/...anagers/src/main/java/com/facebook/presto/functionNamespace/execution/ExceptionUtils.java b/...anagers/src/main/java/com/facebook/presto/functionNamespace/execution/ExceptionUtils.java
@@ -13,8 +13,8 @@
  */
 package com.facebook.presto.functionNamespace.execution;
 
-import com.facebook.presto.spi.ErrorCode;
-import com.facebook.presto.spi.ErrorType;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.thrift.api.udf.ThriftUdfErrorCodeSupplier;
 import com.facebook.presto.thrift.api.udf.ThriftUdfServiceException;

diff --git a/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsErrorCode.java b/presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsErrorCode.java
@@ -13,13 +13,13 @@
  */
 package com.facebook.presto.google.sheets;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
-import static com.facebook.presto.spi.ErrorType.INTERNAL_ERROR;
-import static com.facebook.presto.spi.ErrorType.USER_ERROR;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.INTERNAL_ERROR;
+import static com.facebook.presto.common.ErrorType.USER_ERROR;
 
 public enum SheetsErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveErrorCode.java b/presto-hive-common/src/main/java/com/facebook/presto/hive/HiveErrorCode.java
@@ -13,13 +13,13 @@
  */
 package com.facebook.presto.hive;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
-import static com.facebook.presto.spi.ErrorType.INTERNAL_ERROR;
-import static com.facebook.presto.spi.ErrorType.USER_ERROR;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.INTERNAL_ERROR;
+import static com.facebook.presto.common.ErrorType.USER_ERROR;
 
 public enum HiveErrorCode
         implements ErrorCodeSupplier

diff --git a/...ion-namespace/src/main/java/com/facebook/presto/hive/functions/HiveFunctionErrorCode.java b/...ion-namespace/src/main/java/com/facebook/presto/hive/functions/HiveFunctionErrorCode.java
@@ -14,15 +14,15 @@
 
 package com.facebook.presto.hive.functions;
 
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeSignature;
-import com.facebook.presto.spi.ErrorCode;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 import com.facebook.presto.spi.PrestoException;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 import static com.facebook.presto.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
 import static java.lang.String.format;
 

diff --git a/...tore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java b/...tore/src/main/java/com/facebook/presto/hive/metastore/SemiTransactionalHiveMetastore.java
@@ -67,6 +67,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.facebook.airlift.concurrent.MoreFutures.getFutureValue;
+import static com.facebook.presto.common.ErrorType.USER_ERROR;
 import static com.facebook.presto.hive.HiveErrorCode.HIVE_CORRUPTED_COLUMN_STATISTICS;
 import static com.facebook.presto.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static com.facebook.presto.hive.HiveErrorCode.HIVE_METASTORE_ERROR;
@@ -93,7 +94,6 @@
 import static com.facebook.presto.hive.metastore.Statistics.ReduceOperator.SUBTRACT;
 import static com.facebook.presto.hive.metastore.Statistics.merge;
 import static com.facebook.presto.hive.metastore.Statistics.reduce;
-import static com.facebook.presto.spi.ErrorType.USER_ERROR;
 import static com.facebook.presto.spi.StandardErrorCode.ALREADY_EXISTS;
 import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
 import static com.facebook.presto.spi.StandardErrorCode.TRANSACTION_CONFLICT;

diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveTypeTranslator.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveTypeTranslator.java
@@ -13,8 +13,8 @@
  */
 package com.facebook.presto.hive;
 
+import com.facebook.presto.common.ErrorCode;
 import com.facebook.presto.common.type.Type;
-import com.facebook.presto.spi.ErrorCode;
 import com.facebook.presto.spi.PrestoException;
 import com.google.common.collect.ImmutableMap;
 import org.testng.annotations.Test;

diff --git a/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiErrorCode.java b/presto-hudi/src/main/java/com/facebook/presto/hudi/HudiErrorCode.java
@@ -14,12 +14,12 @@
 
 package com.facebook.presto.hudi;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
-import static com.facebook.presto.spi.ErrorType.INTERNAL_ERROR;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.INTERNAL_ERROR;
 
 public enum HudiErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergErrorCode.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergErrorCode.java
@@ -13,13 +13,13 @@
  */
 package com.facebook.presto.iceberg;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
-import static com.facebook.presto.spi.ErrorType.INTERNAL_ERROR;
-import static com.facebook.presto.spi.ErrorType.USER_ERROR;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.INTERNAL_ERROR;
+import static com.facebook.presto.common.ErrorType.USER_ERROR;
 
 public enum IcebergErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaErrorCode.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaErrorCode.java
@@ -13,12 +13,12 @@
  */
 package com.facebook.presto.kafka;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
-import static com.facebook.presto.spi.ErrorType.INTERNAL_ERROR;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.INTERNAL_ERROR;
 
 /**
  * Kafka connector specific error codes.

diff --git a/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsErrorCode.java b/presto-lark-sheets/src/main/java/com/facebook/presto/lark/sheets/LarkSheetsErrorCode.java
@@ -13,12 +13,12 @@
  */
 package com.facebook.presto.lark.sheets;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
-import static com.facebook.presto.spi.ErrorType.USER_ERROR;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.USER_ERROR;
 
 public enum LarkSheetsErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileErrorCode.java b/presto-local-file/src/main/java/com/facebook/presto/localfile/LocalFileErrorCode.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.localfile;
 
-import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.common.ErrorCode;
+import com.facebook.presto.common.ErrorType;
 import com.facebook.presto.spi.ErrorCodeSupplier;
-import com.facebook.presto.spi.ErrorType;
 
-import static com.facebook.presto.spi.ErrorType.EXTERNAL;
+import static com.facebook.presto.common.ErrorType.EXTERNAL;
 
 public enum LocalFileErrorCode
         implements ErrorCodeSupplier

diff --git a/presto-main/src/main/java/com/facebook/presto/dispatcher/FailedDispatchQuery.java b/presto-main/src/main/java/com/facebook/presto/dispatcher/FailedDispatchQuery.java
@@ -14,11 +14,11 @@
 package com.facebook.presto.dispatcher;
 
 import com.facebook.presto.Session;
+import com.facebook.presto.common.ErrorCode;
 import com.facebook.presto.execution.ExecutionFailureInfo;
 import com.facebook.presto.execution.QueryState;
 import com.facebook.presto.execution.StateMachine.StateChangeListener;
 import com.facebook.presto.server.BasicQueryInfo;
-import com.facebook.presto.spi.ErrorCode;
 import com.facebook.presto.spi.QueryId;
 import com.facebook.presto.spi.resourceGroups.ResourceGroupId;
 import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits;

diff --git a/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java b/presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java
@@ -15,6 +15,7 @@
 
 import com.facebook.airlift.log.Logger;
 import com.facebook.presto.Session;
+import com.facebook.presto.common.ErrorCode;
 import com.facebook.presto.event.QueryMonitor;
 import com.facebook.presto.execution.ClusterSizeMonitor;
 import com.facebook.presto.execution.ExecutionFailureInfo;
@@ -23,7 +24,6 @@
 import com.facebook.presto.execution.QueryStateMachine;
 import com.facebook.presto.execution.StateMachine.StateChangeListener;
 import com.facebook.presto.server.BasicQueryInfo;
-import com.facebook.presto.spi.ErrorCode;
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.QueryId;
 import com.facebook.presto.spi.WarningCollector;

diff --git a/presto-main/src/main/java/com/facebook/presto/execution/ExecutionFailureInfo.java b/presto-main/src/main/java/com/facebook/presto/execution/ExecutionFailureInfo.java
@@ -18,8 +18,8 @@
 import com.facebook.drift.annotations.ThriftStruct;
 import com.facebook.presto.client.ErrorLocation;
 import com.facebook.presto.client.FailureInfo;
+import com.facebook.presto.common.ErrorCode;
 import com.facebook.presto.spi.ErrorCause;
-import com.facebook.presto.spi.ErrorCode;
 import com.facebook.presto.spi.HostAddress;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;