fix: SelectColumn Should Unbox Result Type

engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageFunctionUtils.java

@@ -20290,6 +20290,10 @@ public static boolean greaterEquals(float a, BigDecimal b) {
  return compareTo(a, b) >= 0;
  }
 
+ public static BigDecimal negate(BigDecimal a) {
+ return a == null ? null : a.negate();
+ }
+
  //
  // BigInteger ops
  //
@@ -21135,4 +21139,8 @@ public static boolean greaterEquals(BigInteger a, float b) {
  public static boolean greaterEquals(float a, BigInteger b) {
  return compareTo(a, b) >= 0;
  }
+
+ public static BigInteger negate(BigInteger a) {
+ return a == null ? null : a.negate();
+ }
 }

engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java

@@ -1717,10 +1717,11 @@ public Class<?> visit(UnaryExpr n, VisitArgs printer) {
  // since the original expression was visited by getTypeWithCaching at the beginning of this method.
  final Class<?> result = unaryOpOverloadMethod.accept(this, printer);
 
- // Verify that the operator overload method returns the original expected type:
- Assert.equals(ret, "ret", result, "result");
+ // Verify that the operator overload method returns the original expected type (or its unboxed form):
+ Assert.equals(TypeUtils.getUnboxedTypeIfBoxed(ret), "TypeUtils.getUnboxedTypeIfBoxed(ret)",
+ result, "result");
 
- return ret;
+ return result;
  }
 
  @Override

engine/table/src/main/java/io/deephaven/engine/table/impl/select/DhFormulaColumn.java

@@ -189,7 +189,7 @@ public List<String> initDef(
  .endl();
 
  applyUsedVariables(columnDefinitionMap, result.getVariablesUsed(), result.getPossibleParams());
- returnedType = result.getType();
+ returnedType = TypeUtils.getUnboxedTypeIfBoxed(result.getType());
  if (returnedType == boolean.class) {
  returnedType = Boolean.class;
  }

engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzer.java

@@ -111,12 +111,7 @@ public static AnalyzerContext createContext(
 
  // First pass to initialize all columns and to compile formulas in one batch.
  final QueryCompilerRequestProcessor.BatchProcessor compilationProcessor = QueryCompilerRequestProcessor.batch();
- for (Map.Entry<String, ColumnSource<?>> entry : columnSources.entrySet()) {
- final String name = entry.getKey();
- final ColumnSource<?> cs = entry.getValue();
- final ColumnDefinition<?> cd = ColumnDefinition.fromGenericType(name, cs.getType(), cs.getComponentType());
- columnDefinitions.put(name, cd);
- }
+ parentTable.getDefinition().getColumns().forEach(cd -> columnDefinitions.put(cd.getName(), cd));
 
  final Set<String> resultColumnNames = new HashSet<>();
  for (final SelectColumn sc : selectColumns) {

engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableSelectUpdateTest.java

@@ -42,6 +42,8 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
@@ -1300,4 +1302,28 @@ public void testPropagationOfAttributes() {
  Assert.assertTrue(result.isBlink());
  }
  }
+
+ @Test
+ public void testRegressionGH5998_BigDecimal_negate() {
+ ExecutionContext.getContext().getQueryScope().putParam("bd_val", BigDecimal.valueOf(123.456));
+ emptyTable(0).update("A = 0 < -bd_val");
+ }
+
+ @Test
+ public void testRegressionGH5998_BigInteger_negate() {
+ ExecutionContext.getContext().getQueryScope().putParam("bi_val", BigInteger.valueOf(123));
+ emptyTable(0).update("A = 0 < -bi_val");
+ }
+
+ @Test
+ public void testRegressionGH5998_Double_QSP() {
+ ExecutionContext.getContext().getQueryScope().putParam("d_val", 123.456);
+ emptyTable(0).update("A = 0 < -d_val");
+ }
+
+ @Test
+ public void testRegressionGH5998_Double_NewCol() {
+ ExecutionContext.getContext().getQueryScope().putParam("d_val", 123.456);
+ emptyTable(0).update("B = d_val", "A = 0 < -B");
+ }
 }