>From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19871 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/ionic'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/ionic'
Ext-ref: MB-66663,MB-66818
Change-Id: Iae698ac197d9148b5f29c8c77249d71d60021857
---
M
hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/VariableDeletableTupleMemoryManager.java
M
hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/HashSpillableTableFactory.java
M
hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
4 files changed, 17 insertions(+), 81 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
Anon. E. Moose #1000171:
diff --git
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/VariableDeletableTupleMemoryManager.java
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/VariableDeletableTupleMemoryManager.java
index 2b705bc..40ff2e4 100644
---
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/VariableDeletableTupleMemoryManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/VariableDeletableTupleMemoryManager.java
@@ -161,13 +161,7 @@
policy.close();
frames.clear();
numTuples = 0;
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOG.isTraceEnabled()) {
- LOG.trace("VariableTupleMemoryManager has reorganized {} times",
statsReOrg);
- }
-=======
LOG.trace("VariableTupleMemoryManager has reorganized {} times",
statsReOrg);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
statsReOrg = 0;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/HashSpillableTableFactory.java
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/HashSpillableTableFactory.java
index 4870f33..2f2153b 100644
---
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/HashSpillableTableFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/HashSpillableTableFactory.java
@@ -131,15 +131,8 @@
final int numPartitions = getNumOfPartitions(inputDataBytesSize /
ctx.getInitialFrameSize(), memoryBudget);
final int entriesPerPartition = (int) Math.ceil(1.0 * tableSize /
numPartitions);
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("created hashtable, table size:{} file size:{}
#partitions:{}", tableSize, inputDataBytesSize,
- numPartitions);
- }
-=======
LOGGER.trace("created hashtable, table size:{} file size:{}
#partitions:{}", tableSize, inputDataBytesSize,
numPartitions);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
final ArrayTupleBuilder outputTupleBuilder = new
ArrayTupleBuilder(outRecordDescriptor.getFields().length);
@@ -190,15 +183,8 @@
if (force ||
hashTableForTuplePointer.isGarbageCollectionNeeded()) {
int numberOfFramesReclaimed =
hashTableForTuplePointer.collectGarbage(bufferAccessor, tpcIntermediate);
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("Garbage Collection on Hash table is
done. Deallocated frames:{}",
- numberOfFramesReclaimed);
- }
-=======
LOGGER.trace("Garbage Collection on Hash table is done.
Deallocated frames:{}",
numberOfFramesReclaimed);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
return numberOfFramesReclaimed != -1;
}
return false;
diff --git
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
index 9821458..d79af79 100644
---
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
+++
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
@@ -506,19 +506,12 @@
stats.getLevel().set(level);
}
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"\n>>>Joining Partition Pairs (thread_id {})
(pid ) - (level {}) - BuildSize:\t{}\tProbeSize:\t{} - MemForJoin {} -
LeftOuter is {}",
Thread.currentThread().getId(), level,
buildPartSize, probePartSize, state.memForJoin,
isLeftOuter);
}
-=======
- LOGGER.trace(
- "\n>>>Joining Partition Pairs (thread_id {}) (pid
) - (level {}) - BuildSize:\t{}\tProbeSize:\t{} - MemForJoin {} - LeftOuter is
{}",
- Thread.currentThread().getId(), level,
buildPartSize, probePartSize, state.memForJoin,
- isLeftOuter);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
// Calculate the expected hash table size for the both
side.
long expectedHashTableSizeForBuildInFrame =
@@ -534,16 +527,8 @@
int tabSize = -1;
if ((isLeftOuter || (buildPartSize < probePartSize))) {
//Case 1.1 - InMemHJ (without Role-Reversal)
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(
- "\t>>>Case 1.1 (IsLeftOuter ||
buildSize<probe) AND ApplyInMemHJ - [Level {}]",
- level);
- }
-=======
LOGGER.trace("\t>>>Case 1.1 (IsLeftOuter ||
buildSize<probe) AND ApplyInMemHJ - [Level {}]",
level);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
tabSize = buildSizeInTuple;
if (tabSize == 0) {
throw new HyracksDataException(
@@ -553,17 +538,9 @@
applyInMemHashJoin(buildKeys, probeKeys, tabSize,
buildRd, probeRd, buildHpc, probeHpc,
buildSideReader, probeSideReader,
probComp); // checked-confirmed
} else { //Case 1.2 - InMemHJ with Role Reversal
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(
- "\t>>>Case 1.2. (NoIsLeftOuter ||
probe<build) AND ApplyInMemHJWITH RoleReversal - [Level {}]",
- level);
- }
-=======
LOGGER.trace(
"\t>>>Case 1.2. (NoIsLeftOuter ||
probe<build) AND ApplyInMemHJWITH RoleReversal - [Level {}]",
level);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
tabSize = probeSizeInTuple;
if (tabSize == 0) {
throw new HyracksDataException(
@@ -576,39 +553,18 @@
}
//Apply (Recursive) HHJ
else {
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("\t>>>Case 2. ApplyRecursiveHHJ -
[Level {}]", level);
- }
- if ((isLeftOuter || buildPartSize < probePartSize)) {
-=======
LOGGER.trace("\t>>>Case 2. ApplyRecursiveHHJ - [Level
{}]", level);
- if (!forceRoleReversal && (isLeftOuter ||
buildPartSize < probePartSize)) {
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ if ((isLeftOuter || buildPartSize < probePartSize)) {
//Case 2.1 - Recursive HHJ (without Role-Reversal)
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(
- "\t\t>>>Case 2.1 - RecursiveHHJ WITH
(isLeftOuter || build<probe) - [Level {}]",
- level);
- }
-=======
LOGGER.trace(
"\t\t>>>Case 2.1 - RecursiveHHJ WITH
(isLeftOuter || build<probe) - [Level {}]",
level);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
applyHybridHashJoin((int) buildPartSize,
PROBE_REL, BUILD_REL, probeKeys, buildKeys,
probeRd, buildRd, probeHpc, buildHpc,
probeSideReader, buildSideReader, level,
beforeMax, probComp);
} else { //Case 2.2 - Recursive HHJ (with
Role-Reversal)
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("\t\t>>>Case 2.2. - RecursiveHHJ
WITH RoleReversal - [Level {}]", level);
- }
-=======
LOGGER.trace("\t\t>>>Case 2.2. - RecursiveHHJ WITH
RoleReversal - [Level {}]", level);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
applyHybridHashJoin((int) probePartSize,
BUILD_REL, PROBE_REL, buildKeys, probeKeys,
buildRd, probeRd, buildHpc, probeHpc,
buildSideReader, probeSideReader, level,
@@ -674,17 +630,9 @@
BitSet rPStatus = rHHj.getPartitionStatus();
if ((afterMax < (NLJ_SWITCH_THRESHOLD * beforeMax))) {
//Case 2.1.1 - Keep applying HHJ
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(
- "\t\t>>>Case 2.1.1 - KEEP APPLYING
RecursiveHHJ WITH (isLeftOuter || build<probe) - [Level {}]",
- level);
- }
-=======
LOGGER.trace(
"\t\t>>>Case 2.1.1 - KEEP APPLYING
RecursiveHHJ WITH (isLeftOuter || build<probe) - [Level {}]",
level);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
for (int rPid = rPStatus.nextSetBit(0); rPid >= 0;
rPid = rPStatus.nextSetBit(rPid + 1)) {
RunFileReader rbrfw =
rHHj.getBuildRFReader(rPid);
RunFileReader rprfw =
rHHj.getProbeRFReader(rPid);
@@ -713,17 +661,9 @@
}
} else { //Case 2.1.2 - Switch to NLJ
-<<<<<<< HEAD (07074e [ASTERIXDB-3615][FUN]: lpad and rpad func follow-up)
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(
- "\t\t>>>Case 2.1.2 - SWITCHED to NLJ
RecursiveHHJ WITH (isLeftOuter || build<probe) - [Level {}]",
- level);
- }
-=======
LOGGER.trace(
"\t\t>>>Case 2.1.2 - SWITCHED to NLJ
RecursiveHHJ WITH (isLeftOuter || build<probe) - [Level {}]",
level);
->>>>>>> BRANCH (9ffb42 Merge branch 'gerrit/neo' into 'gerrit/trinity')
for (int rPid = rPStatus.nextSetBit(0); rPid >= 0;
rPid = rPStatus.nextSetBit(rPid + 1)) {
RunFileReader rbrfw =
rHHj.getBuildRFReader(rPid);
RunFileReader rprfw =
rHHj.getProbeRFReader(rPid);
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19871
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: Iae698ac197d9148b5f29c8c77249d71d60021857
Gerrit-Change-Number: 19871
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-MessageType: merged
