You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2020/10/19 13:30:32 UTC
[phoenix] branch master updated: PHOENIX-6195 : Import guava libs
from phoenix thirdparty
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 5b58d9b PHOENIX-6195 : Import guava libs from phoenix thirdparty
5b58d9b is described below
commit 5b58d9b08389fd34da440a2cbc345612d63da89d
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Mon Oct 19 17:11:28 2020 +0530
PHOENIX-6195 : Import guava libs from phoenix thirdparty
---
.../org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java | 7 ++++---
.../org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java | 3 +--
.../org/apache/phoenix/index/IndexRebuildRegionScannerTest.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java
index c9b01de..9c62245 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java
@@ -17,9 +17,6 @@
*/
package org.apache.phoenix.coprocessor;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
@@ -67,6 +64,9 @@ import org.apache.phoenix.mapreduce.index.IndexVerificationResultRepository;
import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.types.PVarbinary;
+import org.apache.phoenix.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+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.ServerUtil;
@@ -329,6 +329,7 @@ public abstract class GlobalIndexRegionScanner extends BaseRegionScanner {
byte[] qualifier = CellUtil.cloneQualifier(cell);
return set.contains(qualifier);
}
+
@VisibleForTesting
public boolean shouldVerify(IndexTool.IndexVerifyType verifyType,
byte[] indexRowKey, Scan scan, Region region, IndexMaintainer indexMaintainer,
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java
index 5e916e2..6d3d38d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.query.HBaseFactoryProvider;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.compile.ScanRanges;
import org.apache.phoenix.filter.SkipScanFilter;
@@ -61,8 +62,6 @@ import org.apache.phoenix.util.ServerUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Maps;
-
/**
* This is an index table region scanner which scans index table rows locally and then extracts data table row keys
* from them. Using the data table row keys, the data table rows are scanned using the HBase client available to
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java
index a4901f5..c59522c 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java
@@ -17,9 +17,9 @@
*/
package org.apache.phoenix.index;
-import com.google.common.collect.Maps;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.junit.Assert;
import org.junit.Test;
import java.util.List;