[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5731 Loading bulkload hfiles should not be blocked if the upsert select happening for differet table.(Rajeshbabu)-addendum

[rajeshbabu]

This is an automated email from the ASF dual-hosted git repository.

rajeshbabu pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push:
     new 17a796a  PHOENIX-5731 Loading bulkload hfiles should not be blocked if 
the upsert select happening for differet table.(Rajeshbabu)-addendum
17a796a is described below

commit 17a796aa9f1f4048a17b59fb9114cb45f791c742
Author: Rajeshbabu Chintaguntla <raj...@apache.org>
AuthorDate: Fri Mar 13 17:23:06 2020 +0530

    PHOENIX-5731 Loading bulkload hfiles should not be blocked if the upsert 
select happening for differet table.(Rajeshbabu)-addendum
---
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 4f21511..bd44634 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
@@ -528,11 +528,13 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
         if(buildLocalIndex) {
             checkForLocalIndexColumnFamilies(region, indexMaintainers);
         }
-        if (isDescRowKeyOrderUpgrade || isDelete ||
-                (isUpsert && (targetHTable == null ||
-                        
targetHTable.getName().equals(region.getTableDesc().getTableName())))
+        if (isDescRowKeyOrderUpgrade || isDelete || isUpsert
                 || (deleteCQ != null && deleteCF != null) || emptyCF != null 
|| buildLocalIndex) {
             needToWrite = true;
+            if(isUpsert && (targetHTable == null ||
+                    
!targetHTable.getName().equals(region.getTableDesc().getTableName()))) {
+                needToWrite = false;
+            }
             maxBatchSize = conf.getInt(MUTATE_BATCH_SIZE_ATTRIB, 
QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE);
             mutations = new MutationList(Ints.saturatedCast(maxBatchSize + 
maxBatchSize / 10));
             maxBatchSizeBytes = conf.getLong(MUTATE_BATCH_SIZE_BYTES_ATTRIB,