This is an automated email from the ASF dual-hosted git repository.
joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new d3814f445 IMPALA-14077: Remove references to shaded packages from
other projects
d3814f445 is described below
commit d3814f445fc45be294cd5a4ccaf61c7c76f6b26d
Author: Joe McDonnell <[email protected]>
AuthorDate: Thu May 15 14:14:04 2025 -0700
IMPALA-14077: Remove references to shaded packages from other projects
IDEs can mistakenly add imports that reference shaded versions of
classes that are available normally. For example, one might use
org.apache.curator.shaded.com.google.common.base.Preconditions
vs
com.google.common.base.Preconditions
Some of these usages have crept back into the codebase, so this
removes those obvious cases. Some commands to find these cases:
git grep import | grep com.google | grep -v "import com"
git grep import | grep shade
git grep import | grep relocate
Testing:
- Ran a build
Change-Id: I7d09c757cb2a29a8e3187f05f3f71984fa897810
Reviewed-on: http://gerrit.cloudera.org:8080/22904
Reviewed-by: Michael Smith <[email protected]>
Tested-by: Impala Public Jenkins <[email protected]>
---
fe/src/main/java/org/apache/impala/analysis/KillQueryStmt.java | 6 +++---
.../java/org/apache/impala/catalog/IcebergContentFileStore.java | 4 ++--
fe/src/main/java/org/apache/impala/planner/IcebergScanPlanner.java | 2 +-
.../java/org/apache/impala/util/ExecutorMembershipSnapshot.java | 2 +-
fe/src/main/java/org/apache/impala/util/ExprUtil.java | 2 +-
fe/src/main/java/org/apache/impala/util/IcebergSchemaConverter.java | 3 ++-
fe/src/main/java/org/apache/impala/util/MigrateTableUtil.java | 1 -
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/fe/src/main/java/org/apache/impala/analysis/KillQueryStmt.java
b/fe/src/main/java/org/apache/impala/analysis/KillQueryStmt.java
index b344d9ff6..50daf05b9 100644
--- a/fe/src/main/java/org/apache/impala/analysis/KillQueryStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/KillQueryStmt.java
@@ -17,6 +17,8 @@
package org.apache.impala.analysis;
+import com.google.common.base.Preconditions;
+
import org.apache.impala.analysis.AnalysisContext.AnalysisResult;
import org.apache.impala.authorization.AuthorizationConfig;
import org.apache.impala.authorization.User;
@@ -25,8 +27,6 @@ import org.apache.impala.thrift.TKillQueryReq;
import org.apache.impala.thrift.TUniqueId;
import org.apache.impala.util.TUniqueIdUtil;
-import hiveexec.com.google.common.base.Preconditions;
-
public final class KillQueryStmt extends StatementBase {
private final String queryIdString_;
private TUniqueId queryId_;
@@ -77,4 +77,4 @@ public final class KillQueryStmt extends StatementBase {
// Set to true to allow non-admin users to access the runtime profile.
analysisResult.setUserHasProfileAccess(true);
}
-}
\ No newline at end of file
+}
diff --git
a/fe/src/main/java/org/apache/impala/catalog/IcebergContentFileStore.java
b/fe/src/main/java/org/apache/impala/catalog/IcebergContentFileStore.java
index f7b381d43..c857897b6 100644
--- a/fe/src/main/java/org/apache/impala/catalog/IcebergContentFileStore.java
+++ b/fe/src/main/java/org/apache/impala/catalog/IcebergContentFileStore.java
@@ -17,6 +17,7 @@
package org.apache.impala.catalog;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -31,7 +32,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.curator.shaded.com.google.common.base.Preconditions;
import org.apache.hadoop.fs.Path;
import org.apache.iceberg.ContentFile;
import org.apache.iceberg.DataFile;
@@ -363,4 +363,4 @@ public class IcebergContentFileStore {
new HashSet<>(tFileStore.getMissing_files()) : Collections.emptySet();
return ret;
}
-}
\ No newline at end of file
+}
diff --git a/fe/src/main/java/org/apache/impala/planner/IcebergScanPlanner.java
b/fe/src/main/java/org/apache/impala/planner/IcebergScanPlanner.java
index eec0d3331..ee1e8de5e 100644
--- a/fe/src/main/java/org/apache/impala/planner/IcebergScanPlanner.java
+++ b/fe/src/main/java/org/apache/impala/planner/IcebergScanPlanner.java
@@ -18,6 +18,7 @@
package org.apache.impala.planner;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -33,7 +34,6 @@ import java.util.TreeSet;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
import org.apache.iceberg.ContentFile;
import org.apache.iceberg.DeleteFile;
import org.apache.iceberg.FileContent;
diff --git
a/fe/src/main/java/org/apache/impala/util/ExecutorMembershipSnapshot.java
b/fe/src/main/java/org/apache/impala/util/ExecutorMembershipSnapshot.java
index f363c4a67..dce4d8dc2 100644
--- a/fe/src/main/java/org/apache/impala/util/ExecutorMembershipSnapshot.java
+++ b/fe/src/main/java/org/apache/impala/util/ExecutorMembershipSnapshot.java
@@ -26,8 +26,8 @@ import org.apache.impala.thrift.TExecutorGroupSet;
import org.apache.impala.thrift.TNetworkAddress;
import org.apache.impala.thrift.TExecutorGroupSet;
import org.apache.impala.thrift.TUpdateExecutorMembershipRequest;
-import org.apache.kudu.shaded.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
/**
diff --git a/fe/src/main/java/org/apache/impala/util/ExprUtil.java
b/fe/src/main/java/org/apache/impala/util/ExprUtil.java
index 3ced390fe..d82a73201 100644
--- a/fe/src/main/java/org/apache/impala/util/ExprUtil.java
+++ b/fe/src/main/java/org/apache/impala/util/ExprUtil.java
@@ -18,8 +18,8 @@
package org.apache.impala.util;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
import org.apache.impala.analysis.Analyzer;
import org.apache.impala.analysis.BoolLiteral;
import org.apache.impala.analysis.Expr;
diff --git
a/fe/src/main/java/org/apache/impala/util/IcebergSchemaConverter.java
b/fe/src/main/java/org/apache/impala/util/IcebergSchemaConverter.java
index ecee330ab..8b68e36b7 100644
--- a/fe/src/main/java/org/apache/impala/util/IcebergSchemaConverter.java
+++ b/fe/src/main/java/org/apache/impala/util/IcebergSchemaConverter.java
@@ -24,13 +24,14 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.google.common.collect.Lists;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.Table;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.Schema;
import org.apache.iceberg.hive.HiveSchemaUtil;
-import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Types;
import org.apache.impala.analysis.IcebergPartitionField;
import org.apache.impala.analysis.IcebergPartitionSpec;
diff --git a/fe/src/main/java/org/apache/impala/util/MigrateTableUtil.java
b/fe/src/main/java/org/apache/impala/util/MigrateTableUtil.java
index 443233d18..58a977de7 100644
--- a/fe/src/main/java/org/apache/impala/util/MigrateTableUtil.java
+++ b/fe/src/main/java/org/apache/impala/util/MigrateTableUtil.java
@@ -40,7 +40,6 @@ import org.apache.iceberg.Schema;
import org.apache.iceberg.Table;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.data.TableMigrationUtil;
-import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.impala.analysis.TableName;
import org.apache.impala.catalog.FeCatalog;
import org.apache.impala.catalog.FeFsPartition;
