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

Jump to bottom

Port DH-11625: Improve Would Match Filtering #3318

Merged
merged 1 commit into from
Jan 18, 2023
Merged

Port DH-11625: Improve Would Match Filtering #3318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions engine/table/src/main/java/io/deephaven/engine/table/impl/WouldMatchOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,46 @@ public void fillPrevChunk(@NotNull FillContext context,
}
}

@Override
public WritableRowSet match(
boolean invertMatch, boolean usePrev, boolean caseInsensitive, RowSet mapper, Object... keys) {
boolean hasFalse = false;
boolean hasTrue = false;
boolean hasOther = false;

for (Object key : keys) {
if (key instanceof Boolean) {
if ((Boolean) key) {
hasTrue = true;
} else {
hasFalse = true;
}
} else {
hasOther = true;
}
}

if (hasTrue && hasFalse) {
return invertMatch ? RowSetFactory.empty() : mapper.copy();
} else if (!hasTrue && !hasFalse) {
return invertMatch ? mapper.copy() : RowSetFactory.empty();
}

try (final SafeCloseableList closer = new SafeCloseableList()) {
final WritableRowSet intersection;
if (usePrev) {
intersection = mapper.intersect(closer.add(source.copyPrev()));
} else {
intersection = mapper.intersect(source);
}
if (invertMatch ^ hasFalse) {
closer.add(intersection);
return mapper.minus(intersection);
}
return intersection;
}
}

/**
* Fill a chunk by walking the set of requested keys and the intersection of these keys together.
*
Expand Down
40 changes: 35 additions & 5 deletions engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWouldMatchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,23 @@
*/
package io.deephaven.engine.table.impl;

import io.deephaven.engine.context.QueryScope;
import io.deephaven.engine.table.ShiftObliviousListener;
import io.deephaven.engine.testutil.*;
import io.deephaven.engine.testutil.generator.*;
import io.deephaven.engine.updategraph.UpdateGraphProcessor;
import io.deephaven.engine.table.MatchPair;
import io.deephaven.engine.table.WouldMatchPair;
import io.deephaven.engine.table.impl.select.DynamicWhereFilter;
import io.deephaven.test.types.OutOfBandTest;
import junit.framework.TestCase;

import java.util.Arrays;
import java.util.Random;
import org.junit.experimental.categories.Category;

import static io.deephaven.engine.util.TableTools.col;
import static io.deephaven.engine.util.TableTools.show;
import static io.deephaven.engine.testutil.TstUtils.*;

@Category(OutOfBandTest.class)
public class QueryTableWouldMatchTest extends QueryTableTestBase {

public void testMatch() {
Expand Down Expand Up @@ -212,14 +210,46 @@ public void testMatchIterative() {

final QueryTable queryTable = getTable(500, random, columnInfo);

QueryScope.addParam("bogus", Arrays.asList(new Object[] {null}));

final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
EvalNugget.from(() -> queryTable.wouldMatch("hasAG=Sym.contains(`G`)",
"BigHero6=Stringy.length()>=6 && Booly", "Mathy=(Inty+Floaty)/2 > 40")),
};

for (int i = 0; i < 100; i++) {
simulateShiftAwareStep("step == " + i, 1000, random, queryTable, columnInfo, en);
}
}

public void testColumnSourceMatch() {
final Random random = new Random(0xDEADDEAD);
final ColumnInfo<?, ?>[] columnInfo = initColumnInfos(new String[] {"Sym", "Sentinel"},
new SetGenerator<>("AAPL", "GOOG", "GLD", "VXX"),
new IntGenerator(10, 100));

final QueryTable queryTable = getTable(500, random, columnInfo);

QueryScope.addParam("bogus", Arrays.asList(new Object[] {null}));

final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
new TableComparator(queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG"),
queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG == true")),
new TableComparator(queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("!hasAG"),
queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG == false")),
new TableComparator(queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("!hasAG"),
queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG not in true")),
new TableComparator(queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG"),
queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG not in false")),
new TableComparator(queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("true"),
queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG in true, false")),
new TableComparator(queryTable.wouldMatch("hasAG=Sym.contains(`G`)").head(0),
queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG in bogus")),
new TableComparator(queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("true"),
queryTable.wouldMatch("hasAG=Sym.contains(`G`)").where("hasAG not in bogus")),
};

for (int i = 0; i < 100; i++) {
for (int i = 0; i < 10; i++) {
simulateShiftAwareStep("step == " + i, 1000, random, queryTable, columnInfo, en);
}
}
Expand Down Expand Up @@ -262,7 +292,7 @@ public void testMatchDynamicIterative() {
};

try {
for (int i = 0; i < 1000; i++) {
for (int i = 0; i < 100; i++) {
final boolean modSet = random.nextInt(10) < 3;
final boolean modFiltered = random.nextBoolean();

Expand Down