Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify OA doRehash() functions to properly debit rehashCredits #3211

Merged
merged 4 commits into from
Dec 16, 2022
Merged

Modify OA doRehash() functions to properly debit rehashCredits #3211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c341f6e
Modify doRehash() function to prevent rehash starvation, add unit tes…
lbooker42 Dec 15, 2022
95d5a7f
reset rehashCredits before each chunk
lbooker42 Dec 15, 2022
7cdec41
subtract added entries from rehash equity
lbooker42 Dec 16, 2022
e1b8a64
cleanup and spotless
lbooker42 Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...o/deephaven/engine/table/impl/asofjoin/RightIncrementalAsOfJoinStateManagerTypedBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,14 +276,18 @@ protected void buildTable(

while (rsIt.hasMore()) {
final RowSequence chunkOk = rsIt.getNextRowSequenceWithLength(bc.chunkSize);

while (doRehash(initialBuild, bc.rehashCredits, chunkOk.intSize())) {
migrateFront();
}

getKeyChunks(buildSources, bc.getContexts, sourceKeyChunks, chunkOk);

final long oldEntries = numEntries;
buildHandler.doBuild(chunkOk, sourceKeyChunks);
final long entriesAdded = numEntries - oldEntries;
// if we actually added anything, then take away from the "equity" we've built up rehashing, otherwise
// don't penalize this build call with additional rehashing
bc.rehashCredits.subtract(entriesAdded);

bc.resetSharedContexts();
}
Expand Down
5 changes: 5 additions & 0 deletions .../deephaven/engine/table/impl/naturaljoin/IncrementalNaturalJoinStateManagerTypedBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,12 @@ protected void buildTable(

getKeyChunks(buildSources, bc.getContexts, sourceKeyChunks, chunkOk);

final long oldEntries = numEntries;
buildHandler.doBuild(chunkOk, sourceKeyChunks);
final long entriesAdded = numEntries - oldEntries;
// if we actually added anything, then take away from the "equity" we've built up rehashing, otherwise
// don't penalize this build call with additional rehashing
bc.rehashCredits.subtract(entriesAdded);

bc.resetSharedContexts();
}
Expand Down
6 changes: 5 additions & 1 deletion ...n/java/io/deephaven/engine/table/impl/updateby/hashing/UpdateByStateManagerTypedBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,18 @@ protected void buildTable(

while (rsIt.hasMore()) {
final RowSequence chunkOk = rsIt.getNextRowSequenceWithLength(bc.chunkSize);

while (doRehash(initialBuild, bc.rehashCredits, chunkOk.intSize(), outputPositions)) {
migrateFront(outputPositions);
}

getKeyChunks(buildSources, bc.getContexts, sourceKeyChunks, chunkOk);

final long oldEntries = numEntries;
buildHandler.doBuild(chunkOk, sourceKeyChunks);
final long entriesAdded = numEntries - oldEntries;
// if we actually added anything, then take away from the "equity" we've built up rehashing, otherwise
// don't penalize this build call with additional rehashing
bc.rehashCredits.subtract(entriesAdded);

bc.resetSharedContexts();
}
Expand Down
60 changes: 60 additions & 0 deletions engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableNaturalJoinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import java.util.function.BiConsumer;
import java.util.function.Function;

import static io.deephaven.engine.testutil.GenerateTableUpdates.generateAppends;
import static io.deephaven.engine.testutil.TstUtils.*;
import static io.deephaven.engine.util.TableTools.*;
import static io.deephaven.util.QueryConstants.NULL_INT;
Expand Down Expand Up @@ -1514,6 +1515,65 @@ public void testSymbolTableJoin() throws IOException {
});
}

/** Test #1 for DHC issue #3202 */
public void testDHC3202_v1() throws IOException {
// flood the hashtable with large updates
final Random random = new Random(0x31313131);

final ColumnInfo[] leftColumnInfo;
final QueryTable leftTable = getTable(true, 0, random,
leftColumnInfo = initColumnInfos(new String[] {"idx", "LeftValue"},
new UniqueIntGenerator(0, 100_000_000),
new IntGenerator(10_000_000, 10_010_000)));

final ColumnInfo[] rightColumnInfo;
final QueryTable rightTable = getTable(true, 0, random,
rightColumnInfo = initColumnInfos(new String[] {"idx", "RightValue"},
new UniqueIntGenerator(0, 100_000_000),
new IntGenerator(20_000_000, 20_010_000)));


final Table joinTable = leftTable.naturalJoin(rightTable, "idx=idx", "RightValue");

for (int ii = 0; ii < 10; ii++) {
UpdateGraphProcessor.DEFAULT.runWithinUnitTestCycle(
() -> {
generateAppends(10_000, random, leftTable, leftColumnInfo);
generateAppends(10_000, random, rightTable, rightColumnInfo);
});
}
}

/** Test #1 for DHC issue #3202 */
public void testDHC3202_v2() throws IOException {
// flood the hashtable with large updates
final Random random = new Random(0x31313131);

final ColumnInfo[] leftColumnInfo;
final QueryTable leftTable = getTable(true, 0, random,
leftColumnInfo = initColumnInfos(new String[] {"idx", "LeftValue"},
new UniqueIntGenerator(0, 100_000_000),
new IntGenerator(10_000_000, 10_010_000)));

final ColumnInfo[] rightColumnInfo;
final QueryTable rightTable = getTable(true, 0, random,
rightColumnInfo = initColumnInfos(new String[] {"idx", "RightValue"},
new UniqueIntGenerator(0, 100_000_000),
new IntGenerator(20_000_000, 20_010_000)));


final Table joinTable = leftTable.naturalJoin(rightTable, "idx=idx", "RightValue");

for (int ii = 0; ii < 10; ii++) {
UpdateGraphProcessor.DEFAULT.runWithinUnitTestCycle(
() -> {
generateAppends(100_000, random, leftTable, leftColumnInfo);
generateAppends(100_000, random, rightTable, rightColumnInfo);
});
}
}


private void diskBackedTestHarness(BiConsumer<Table, Table> testFunction) throws IOException {
final File leftDirectory = Files.createTempDirectory("QueryTableJoinTest-Left").toFile();
final File rightDirectory = Files.createTempDirectory("QueryTableJoinTest-Right").toFile();
Expand Down