[phoenix] branch master 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 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 0442ccf  PHOENIX-5731 Loading bulkload hfiles should not be blocked if 
the upsert select happening for differet table.(Rajeshbabu)-addendum
0442ccf is described below

commit 0442ccf03dd3932b7a178149ef65bfed09a1cb21
Author: Rajeshbabu Chintaguntla <raj...@apache.org>
AuthorDate: Fri Mar 13 15:06:05 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  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 d96956c..566fb59 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,11 +565,13 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
         if(buildLocalIndex) {
             checkForLocalIndexColumnFamilies(region, indexMaintainers);
         }
-        if (isDescRowKeyOrderUpgrade || isDelete ||
-                (isUpsert && (targetHTable == null ||
-                        
targetHTable.getName().equals(region.getTableDescriptor().getTableName())))
-                || (deleteCQ != null && deleteCF != null) || emptyCF != null 
|| buildLocalIndex) {
+        if (isDescRowKeyOrderUpgrade || isDelete || isUpsert ||
+                (deleteCQ != null && deleteCF != null) || emptyCF != null || 
buildLocalIndex) {
             needToWrite = true;
+            if(isUpsert && (targetHTable == null ||
+                    
!targetHTable.getName().equals(region.getTableDescriptor().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,