Update sargFromJson method in ExtendedRelJson

yuancu · yuancu · commit 235e1b3abd19 · 2025-12-03T14:45:26.000+08:00
- this fix testRand, where desrialization of sarg does not restore its type
- todo: update the toRex in ExtendedRelJson to the align with the latest version

Signed-off-by: Yuanchun Shen &lt;yuanchu@amazon.com&gt;
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serde/ExtendedRelJson.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serde/ExtendedRelJson.java
@@ -500,7 +500,7 @@ RexNode toRex(RelInput relInput, @PolyNull Object o) {
         }
         final RelDataType type = toType(typeFactory, get(map, "type"));
         if (literal instanceof Map && ((Map<?, ?>) literal).containsKey("rangeSet")) {
-          Sarg sarg = sargFromJson((Map) literal);
+          Sarg sarg = sargFromJson((Map) literal, type);
           return rexBuilder.makeSearchArgumentLiteral(sarg, type);
         }
         if (type.getSqlTypeName() == SqlTypeName.SYMBOL) {
@@ -515,7 +515,7 @@ RexNode toRex(RelInput relInput, @PolyNull Object o) {
           return rexBuilder.makeNullLiteral(type);
         }
         final RelDataType type = toType(typeFactory, get(map, "type"));
-        Sarg sarg = sargFromJson((Map) sargObject);
+        Sarg sarg = sargFromJson((Map) sargObject, type);
         return rexBuilder.makeSearchArgumentLiteral(sarg, type);
       }
       if (map.containsKey("dynamicParam")) {

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ RexNode toRex(RelInput relInput, @PolyNull Object o) {`
`500`	`500`	`}`
`501`	`501`	`final RelDataType type = toType(typeFactory, get(map, "type"));`
`502`	`502`	`if (literal instanceof Map && ((Map<?, ?>) literal).containsKey("rangeSet")) {`
`503`		`- Sarg sarg = sargFromJson((Map) literal);`
	`503`	`+ Sarg sarg = sargFromJson((Map) literal, type);`
`504`	`504`	`return rexBuilder.makeSearchArgumentLiteral(sarg, type);`
`505`	`505`	`}`
`506`	`506`	`if (type.getSqlTypeName() == SqlTypeName.SYMBOL) {`
`@@ -515,7 +515,7 @@ RexNode toRex(RelInput relInput, @PolyNull Object o) {`
`515`	`515`	`return rexBuilder.makeNullLiteral(type);`
`516`	`516`	`}`
`517`	`517`	`final RelDataType type = toType(typeFactory, get(map, "type"));`
`518`		`- Sarg sarg = sargFromJson((Map) sargObject);`
	`518`	`+ Sarg sarg = sargFromJson((Map) sargObject, type);`
`519`	`519`	`return rexBuilder.makeSearchArgumentLiteral(sarg, type);`
`520`	`520`	`}`
`521`	`521`	`if (map.containsKey("dynamicParam")) {`