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

fix: Add BigInteger and BigDecimal types to MatchFilter.java #4912

Merged
merged 4 commits into from
Dec 25, 2023
Merged

fix: Add BigInteger and BigDecimal types to MatchFilter.java #4912

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a28a31
Add BigInteger and BigDecimal types to MatchFilter.java
georgecwan Dec 4, 2023
02cab85
Add tests for BigInteger and BigDecimal MatchFilter
georgecwan Dec 12, 2023
8eda1b9
Update engine/table/src/test/java/io/deephaven/engine/table/impl/sele…
georgecwan Dec 22, 2023
f811e63
Update engine/table/src/test/java/io/deephaven/engine/table/impl/sele…
georgecwan Dec 22, 2023
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
18 changes: 18 additions & 0 deletions engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import org.jetbrains.annotations.NotNull;
import org.jpy.PyObject;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.Instant;
import java.util.*;

Expand Down Expand Up @@ -284,6 +286,22 @@ Object convertStringLiteral(String str) {
}
};
}
if (cls == BigDecimal.class) {
return new ColumnTypeConvertor() {
@Override
Object convertStringLiteral(String str) {
return new BigDecimal(str);
}
};
}
if (cls == BigInteger.class) {
return new ColumnTypeConvertor() {
@Override
Object convertStringLiteral(String str) {
return new BigInteger(str);
}
};
}
if (cls == String.class) {
return new ColumnTypeConvertor() {
@Override
Expand Down
78 changes: 78 additions & 0 deletions engine/table/src/test/java/io/deephaven/engine/table/impl/select/WhereFilterFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,84 @@ public void testInInstants() {
assertEquals(0, idx.size());
}

public void testBigDecimal() {
BigDecimal a = new BigDecimal("-914.9539"); // not in the table

BigDecimal b = new BigDecimal("618.2686");
BigDecimal c = new BigDecimal("89.3824");
BigDecimal d = new BigDecimal("-471.0881");
Table t = TableTools.newTable(TableTools.col("BigDecimal", b, c, d));
// match one item
WhereFilter f = WhereFilterFactory.getExpression("BigDecimal = " + b);
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
RowSet idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(1, idx.size());
assertEquals(b, DataAccessHelpers.getColumn(t, 0).get(idx.firstRowKey()));
// match one of two items
f = WhereFilterFactory.getExpression("BigDecimal in " + a + ", " + b + "");
georgecwan marked this conversation as resolved.
Show resolved Hide resolved
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(1, idx.size());
assertEquals(b, DataAccessHelpers.getColumn(t, 0).get(idx.firstRowKey()));

// match two of two items
f = WhereFilterFactory.getExpression("BigDecimal in " + c + ", " + d);
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(2, idx.size());
assertEquals(c, DataAccessHelpers.getColumn(t, 0).get(idx.firstRowKey()));
assertEquals(d, DataAccessHelpers.getColumn(t, 0).get(idx.lastRowKey()));

// match zero of one item
f = WhereFilterFactory.getExpression("BigDecimal == " + a);
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(0, idx.size());
}

public void testBigIntegerl() {
BigInteger a = new BigInteger("-914"); // not in the table

BigInteger b = new BigInteger("618");
BigInteger c = new BigInteger("89");
BigInteger d = new BigInteger("-471");
Table t = TableTools.newTable(TableTools.col("BigInteger", b, c, d));
// match one item
WhereFilter f = WhereFilterFactory.getExpression("BigInteger = " + b);
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
RowSet idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(1, idx.size());
assertEquals(b, DataAccessHelpers.getColumn(t, 0).get(idx.firstRowKey()));
// match one of two items
f = WhereFilterFactory.getExpression("BigInteger in " + a + ", " + b + "");
georgecwan marked this conversation as resolved.
Show resolved Hide resolved
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(1, idx.size());
assertEquals(b, DataAccessHelpers.getColumn(t, 0).get(idx.firstRowKey()));

// match two of two items
f = WhereFilterFactory.getExpression("BigInteger in " + c + ", " + d);
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(2, idx.size());
assertEquals(c, DataAccessHelpers.getColumn(t, 0).get(idx.firstRowKey()));
assertEquals(d, DataAccessHelpers.getColumn(t, 0).get(idx.lastRowKey()));

// match zero of one item
f = WhereFilterFactory.getExpression("BigInteger == " + a);
f.init(t.getDefinition());
assertEquals(MatchFilter.class, f.getClass());
idx = f.filter(t.getRowSet().copy(), t.getRowSet(), t, false);
assertEquals(0, idx.size());
}

public void testTypeInference() {
checkResult("1", true, true, true, true, true, true, false, true, true, (byte) 1, (short) 1, 1, 1,
new BigInteger("1"), 1.0, new BigDecimal("1"), '1');
Expand Down
Loading