Skip to content

Commit

Permalink
Also coerce BigDecimal and BigInteger
Browse files Browse the repository at this point in the history
  • Loading branch information
@nbauernfeind
nbauernfeind committed Jun 25, 2024
1 parent f18e93e commit 45c4c35
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 25 deletions.
44 changes: 44 additions & 0 deletions engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,28 @@ Object convertStringLiteral(String str) {
}
return new BigDecimal(str);
}

@Override
Object convertParamValue(Object paramValue) {
paramValue = super.convertParamValue(paramValue);
if (paramValue instanceof BigDecimal || paramValue == null) {
return paramValue;
}
if (paramValue instanceof BigInteger) {
return new BigDecimal((BigInteger) paramValue);
}
// noinspection unchecked
final TypeUtils.TypeBoxer<Object> boxer =
(TypeUtils.TypeBoxer<Object>) TypeUtils.getTypeBoxer(paramValue.getClass());
final Object boxedValue = boxer.get(paramValue);
if (boxedValue == null) {
return null;
}
if (boxedValue instanceof Number) {
return BigDecimal.valueOf(((Number) boxedValue).doubleValue());
}
return paramValue;
}
};
}
if (cls == BigInteger.class) {
Expand All @@ -600,6 +622,28 @@ Object convertStringLiteral(String str) {
}
return new BigInteger(str);
}

@Override
Object convertParamValue(Object paramValue) {
paramValue = super.convertParamValue(paramValue);
if (paramValue instanceof BigInteger || paramValue == null) {
return paramValue;
}
if (paramValue instanceof BigDecimal) {
return ((BigDecimal) paramValue).toBigInteger();
}
// noinspection unchecked
final TypeUtils.TypeBoxer<Object> boxer =
(TypeUtils.TypeBoxer<Object>) TypeUtils.getTypeBoxer(paramValue.getClass());
final Object boxedValue = boxer.get(paramValue);
if (boxedValue == null) {
return null;
}
if (boxedValue instanceof Number) {
return BigInteger.valueOf(((Number) boxedValue).longValue());
}
return paramValue;
}
};
}
if (cls == String.class) {
Expand Down
102 changes: 77 additions & 25 deletions engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,31 +387,31 @@ public void testWhereDynamicIn() {
});
}

@Test
public void testWhereDynamicInIncremental() {
testWhereDynamicIncrementalInternal(false, false, true, true);
testWhereDynamicIncrementalInternal(false, false, true, false);
testWhereDynamicIncrementalInternal(false, false, false, true);
testWhereDynamicIncrementalInternal(false, false, false, false);
}

@Test
public void testWhereDynamicInIncrementalIndexed() {
testWhereDynamicIncrementalInternal(true, false, true, true);
testWhereDynamicIncrementalInternal(true, false, true, false);
testWhereDynamicIncrementalInternal(true, false, false, true);
testWhereDynamicIncrementalInternal(true, false, false, false);

testWhereDynamicIncrementalInternal(false, true, true, true);
testWhereDynamicIncrementalInternal(false, true, true, false);
testWhereDynamicIncrementalInternal(false, true, false, true);
testWhereDynamicIncrementalInternal(false, true, false, false);

testWhereDynamicIncrementalInternal(true, true, true, true);
testWhereDynamicIncrementalInternal(true, true, true, false);
testWhereDynamicIncrementalInternal(true, true, false, true);
testWhereDynamicIncrementalInternal(true, true, false, false);
}
// @Test
// public void testWhereDynamicInIncremental() {
// testWhereDynamicIncrementalInternal(false, false, true, true);
// testWhereDynamicIncrementalInternal(false, false, true, false);
// testWhereDynamicIncrementalInternal(false, false, false, true);
// testWhereDynamicIncrementalInternal(false, false, false, false);
// }
//
// @Test
// public void testWhereDynamicInIncrementalIndexed() {
// testWhereDynamicIncrementalInternal(true, false, true, true);
// testWhereDynamicIncrementalInternal(true, false, true, false);
// testWhereDynamicIncrementalInternal(true, false, false, true);
// testWhereDynamicIncrementalInternal(true, false, false, false);
//
// testWhereDynamicIncrementalInternal(false, true, true, true);
// testWhereDynamicIncrementalInternal(false, true, true, false);
// testWhereDynamicIncrementalInternal(false, true, false, true);
// testWhereDynamicIncrementalInternal(false, true, false, false);
//
// testWhereDynamicIncrementalInternal(true, true, true, true);
// testWhereDynamicIncrementalInternal(true, true, true, false);
// testWhereDynamicIncrementalInternal(true, true, false, true);
// testWhereDynamicIncrementalInternal(true, true, false, false);
// }

private static void testWhereDynamicIncrementalInternal(
boolean filterIndexed,
Expand Down Expand Up @@ -1575,4 +1575,56 @@ public void testIntToDoubleCoercion() {
final Table range_result = table.where("X >= val_5");
Assert.eq(range_result.size(), "range_result.size()", 3);
}

@Test
public void testBigIntegerCoercion() {
ExecutionContext.getContext().getQueryLibrary().importClass(BigInteger.class);

final Table table = emptyTable(11).update("X= ii % 2 == 0 ? BigInteger.valueOf(ii) : null");
final Class<Object> colType = table.getDefinition().getColumn("X").getDataType();
Assert.eq(colType, "colType", BigInteger.class);

ExecutionContext.getContext().getQueryScope().putParam("real_null", null);
ExecutionContext.getContext().getQueryScope().putParam("val_null", QueryConstants.NULL_INT);
ExecutionContext.getContext().getQueryScope().putParam("val_5", 5);

final Table real_null_result = table.where("X == real_null");
final Table null_result = table.where("X == val_null");
Assert.eq(null_result.size(), "null_result.size()", 5);
assertTableEquals(real_null_result, null_result);

final Table range_result = table.where("X >= val_5");
Assert.eq(range_result.size(), "range_result.size()", 3);

// let's also test BigDecimal -> BigInteger conversion; note that conversion does not round
ExecutionContext.getContext().getQueryScope().putParam("bd_5", BigDecimal.valueOf(5.8));
final Table bd_result = table.where("X >= bd_5");
assertTableEquals(range_result, bd_result);
}

@Test
public void testBigDecimalCoercion() {
ExecutionContext.getContext().getQueryLibrary().importClass(BigDecimal.class);

final Table table = emptyTable(11).update("X= ii % 2 == 0 ? BigDecimal.valueOf(ii) : null");
final Class<Object> colType = table.getDefinition().getColumn("X").getDataType();
Assert.eq(colType, "colType", BigDecimal.class);

ExecutionContext.getContext().getQueryScope().putParam("real_null", null);
ExecutionContext.getContext().getQueryScope().putParam("val_null", QueryConstants.NULL_INT);
ExecutionContext.getContext().getQueryScope().putParam("val_5", 5);

final Table real_null_result = table.where("X == real_null");
final Table null_result = table.where("X == val_null");
Assert.eq(null_result.size(), "null_result.size()", 5);
assertTableEquals(real_null_result, null_result);

final Table range_result = table.where("X >= val_5");
Assert.eq(range_result.size(), "range_result.size()", 3);

// let's also test BigInteger -> BigDecimal conversion
ExecutionContext.getContext().getQueryScope().putParam("bi_5", BigInteger.valueOf(5));
final Table bi_result = table.where("X >= bi_5");
assertTableEquals(range_result, bi_result);
}
}

0 comments on commit 45c4c35

Please sign in to comment.