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

[rajeshbabu]

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

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


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

commit 07fba1545f5b1887a1c1de70ca79226cad183b61
Author: Rajeshbabu Chintaguntla <raj...@apache.org>
AuthorDate: Wed Feb 19 09:45:28 2020 +0530

    PHOENIX-5731 Loading bulkload hfiles should not be blocked if the upsert 
select happening for differet table-addendum.(Rajeshbabu)
---
 .../apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ea5cb91..e8a20dd 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
@@ -523,7 +523,7 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
         }
         if (isDescRowKeyOrderUpgrade || isDelete ||
                 (isUpsert && (targetHTable == null ||
-                        
targetHTable.getName().equals(region.getTableDescriptor().getTableName())))
+                        
targetHTable.getName().equals(region.getTableDesc().getTableName())))
                 || (deleteCQ != null && deleteCF != null) || emptyCF != null 
|| buildLocalIndex) {
             needToWrite = true;
             maxBatchSize = conf.getInt(MUTATE_BATCH_SIZE_ATTRIB, 
QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE);