This is an automated email from the ASF dual-hosted git repository. vjasani pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push: new c74ebc0 PHOENIX-6504 Restrict thirdparty guava imports to prevent RegionServer crash (#1260) c74ebc0 is described below commit c74ebc07b74765807d155e026d419c68e3cf2f04 Author: Viraj Jasani <vjas...@apache.org> AuthorDate: Wed Jul 7 11:59:40 2021 +0530 PHOENIX-6504 Restrict thirdparty guava imports to prevent RegionServer crash (#1260) Signed-off-by: Istvan Toth <st...@apache.org> --- .../phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java | 2 +- .../apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java | 2 +- .../org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java | 2 +- .../org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java | 2 +- .../src/main/java/org/apache/phoenix/util/MetaDataUtil.java | 2 +- pom.xml | 7 +++++++ 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java index 6e5d247..e2c94ea 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java @@ -18,10 +18,10 @@ package org.apache.phoenix.end2end; +import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.hadoop.hbase.regionserver.ScanInfoUtil; import org.apache.phoenix.query.QueryServices; -import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.RunUntilFailure; import org.apache.phoenix.util.TestUtil; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java index 376a7b9..cbf72c8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import com.google.common.collect.Maps; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -37,7 +38,6 @@ import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.schema.PIndexState; -import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; import org.apache.phoenix.util.EnvironmentEdgeManager; import org.apache.phoenix.util.IndexUtil; import org.apache.phoenix.util.PropertiesUtil; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java index a7a549b..d5ab88b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java @@ -25,12 +25,12 @@ import java.sql.SQLException; import java.util.Map; import java.util.Properties; +import com.google.common.collect.Maps; import org.apache.hadoop.hbase.client.Table; import org.apache.phoenix.coprocessor.SystemCatalogRegionObserver; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.query.QueryServices; -import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java index c264792..172d8cb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java @@ -39,6 +39,7 @@ import java.util.Properties; import java.util.Random; import java.util.UUID; +import com.google.common.collect.Maps; import org.apache.commons.collections.CollectionUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; @@ -68,7 +69,6 @@ import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil; import org.apache.phoenix.mapreduce.util.PhoenixMapReduceUtil; import org.apache.phoenix.schema.types.PDouble; import org.apache.phoenix.schema.types.PhoenixArray; -import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.Assert; import org.junit.Before; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java index fcbdd2a..238354a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java @@ -26,6 +26,7 @@ import java.sql.SQLException; import java.util.*; import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; @@ -72,7 +73,6 @@ import org.apache.phoenix.schema.types.PInteger; import org.apache.phoenix.schema.types.PLong; import org.apache.phoenix.schema.types.PSmallint; import org.apache.phoenix.schema.types.PUnsignedTinyint; -import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pom.xml b/pom.xml index 8daaead..023b326 100644 --- a/pom.xml +++ b/pom.xml @@ -420,6 +420,13 @@ <bannedImport>org.apache.commons.logging.LogFactory</bannedImport> </bannedImports> </restrictImports> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <reason>For Phoenix 4, do not use phoenix-thirdparty provided Guava</reason> + <bannedImports> + <bannedImport>org.apache.phoenix.thirdparty.com.google.**</bannedImport> + </bannedImports> + </restrictImports> </rules> </configuration> </execution>