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 1348603 PHOENIX-5731 Loading bulkload hfiles should not be blocked if the upsert select happening for differet table.(Rajeshbabu) 1348603 is described below commit 13486032db982687e4d5c1a1ae7246263fd39998 Author: Rajeshbabu Chintaguntla <raj...@apache.org> AuthorDate: Wed Feb 19 09:07:50 2020 +0530 PHOENIX-5731 Loading bulkload hfiles should not be blocked if the upsert select happening for differet table.(Rajeshbabu) --- .../apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java | 5 ++++- 1 file changed, 4 insertions(+), 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 8c3ac26..ea5cb91 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 @@ -521,7 +521,10 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver 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));