You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2023/02/11 18:59:44 UTC
Change in asterixdb[neo]: Merge branch 'gerrit/stabilization-667a908755'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17378 )
Change subject: Merge branch 'gerrit/stabilization-667a908755'
......................................................................
Merge branch 'gerrit/stabilization-667a908755'
Change-Id: If423e3635d1342c8ded913ef628aaa642c10eb36
---
M hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
2 files changed, 20 insertions(+), 13 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/78/17378/1
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
index ce17da4..5f80165 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
@@ -160,22 +160,9 @@
int partitionFrameLimit = bufferManager.getConstrain().frameLimit(pid);
if (numFrames > partitionFrameLimit || (victimPartition = spillPolicy.selectVictimPartition(pid)) < 0) {
// insert request can never be satisfied
-<<<<<<< HEAD (928903 [ASTERIXDB-3105][COMP] Fix limit pushdown in views with uuid)
- if (numFrames > memSizeInFrames || recordSize < jobletCtx.getInitialFrameSize()) {
- // the tuple is greater than the memory budget or although the record is small we could not find
- // a frame for it (possibly due to a bug)
- String details = String.format(
- "partition %s, tuple size %s, needed # frames %s, partition frame limit %s, join "
- + "memory in frames %s, initial frame size %s",
- pid, recordSize, numFrames, partitionFrameLimit, memSizeInFrames,
- jobletCtx.getInitialFrameSize());
- LOGGER.debug("can't insert tuple in join memory. {}", details);
- LOGGER.debug("partitions status:\n{}", spillPolicy.partitionsStatus());
-=======
if (numFrames > memSizeInFrames) {
// the tuple is greater than the memory budget
logTupleInsertionFailure(tid, pid, numFrames, partitionFrameLimit);
->>>>>>> BRANCH (ec6742 [NO ISSUE] += com.fasterxml.woodstox:woodstox-core supplemen)
throw HyracksDataException.create(ErrorCode.INSUFFICIENT_MEMORY);
}
if (numFrames <= 1) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17378
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: If423e3635d1342c8ded913ef628aaa642c10eb36
Gerrit-Change-Number: 17378
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange