Update missed valueOf calls in prometheus

Signed-off-by: Joshua Li <[email protected]>
opensearch-project · Nov 9, 2022 · f479a60 · f479a60
1 parent ef69e7e
commit f479a60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.../opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementation.java b/.../opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementation.java
@@ -83,7 +83,7 @@ private PrometheusQueryRequest buildQueryFromQueryRangeFunction(List<Expression>
     arguments.forEach(arg -> {
       String argName = ((NamedArgumentExpression) arg).getArgName();
       Expression argValue = ((NamedArgumentExpression) arg).getValue();
-      ExprValue literalValue = argValue.valueOf(null);
+      ExprValue literalValue = argValue.valueOf();
       switch (argName) {
         case QUERY:
           prometheusQueryRequest

diff --git a/.../java/org/opensearch/sql/prometheus/storage/querybuilder/TimeRangeParametersResolver.java b/.../java/org/opensearch/sql/prometheus/storage/querybuilder/TimeRangeParametersResolver.java
@@ -57,7 +57,7 @@ public Void visitFunction(FunctionExpression func, Object context) {
       ReferenceExpression ref = (ReferenceExpression) func.getArguments().get(0);
       Expression rightExpr = func.getArguments().get(1);
       if (ref.getAttr().equals("@timestamp")) {
-        ExprValue literalValue = rightExpr.valueOf(null);
+        ExprValue literalValue = rightExpr.valueOf();
         if (func.getFunctionName().getFunctionName().contains(">")) {
           startTime = literalValue.timestampValue().toEpochMilli() / 1000;
         }

diff --git a/...st/java/org/opensearch/sql/prometheus/functions/QueryRangeFunctionImplementationTest.java b/...st/java/org/opensearch/sql/prometheus/functions/QueryRangeFunctionImplementationTest.java
@@ -48,7 +48,7 @@ void testValueOfAndTypeAndToString() {
     QueryRangeFunctionImplementation queryRangeFunctionImplementation
         = new QueryRangeFunctionImplementation(functionName, namedArgumentExpressionList, client);
     UnsupportedOperationException exception = assertThrows(UnsupportedOperationException.class,
-        () -> queryRangeFunctionImplementation.valueOf(null));
+        () -> queryRangeFunctionImplementation.valueOf());
     assertEquals("Prometheus defined function [query_range] is only "
         + "supported in SOURCE clause with prometheus connector catalog", exception.getMessage());
     assertEquals("query_range(query=\"http_latency\", starttime=12345, endtime=12345, step=14)",