commit c80059fa883288bcf774daef73329b8e0b2ba760
author Rajeshbabu Chintaguntla <rajesh@apache.org> Wed Feb 19 09:07:50 2020 +0530
committer Rajeshbabu Chintaguntla <rajesh@apache.org> Wed Feb 19 09:07:50 2020 +0530
tree 5070f737a3d8c235d9dbe8094df8d22cec7698b5
parent 9cddb61fd71f5e73901a20b7556b446d0c14fb56

PHOENIX-5731 Loading bulkload hfiles should not be blocked if the upsert select happening for differet table.(Rajeshbabu)

phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index b38e144..d96956c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -565,7 +565,10 @@
         if(buildLocalIndex) {
             checkForLocalIndexColumnFamilies(region, indexMaintainers);
         }
-        if (isDescRowKeyOrderUpgrade || isDelete || isUpsert || (deleteCQ != null && deleteCF != null) || emptyCF != null || buildLocalIndex) {
+        if (isDescRowKeyOrderUpgrade || isDelete ||
+                (isUpsert && (targetHTable == null ||
+                        targetHTable.getName().equals(region.getTableDescriptor().getTableName())))
+                || (deleteCQ != null && deleteCF != null) || emptyCF != null || buildLocalIndex) {
             needToWrite = true;
             maxBatchSize = conf.getInt(MUTATE_BATCH_SIZE_ATTRIB, QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE);
             mutations = new MutationList(Ints.saturatedCast(maxBatchSize + maxBatchSize / 10));