Support unixtimestamp (second) as a time modifier value

Signed-off-by: Yuanchun Shen <[email protected]>

Author: yuancu

core/src/test/java/org/opensearch/sql/utils/DateTimeUtilsTest.java

@@ -175,12 +175,6 @@ void testParseRelativeTimeNull() {
     assertNull(parseRelativeTime(""));
   }
 
-  @Test
-  void testParseRelativeTimeWithNow() {
-    assertEquals("now", parseRelativeTime("now"));
-    assertEquals("now", parseRelativeTime("now()"));
-  }
-
   @Test
   void testParseRelativeTimeWithDatetimeString() {
     assertEquals("2025-10-22", parseRelativeTime("2025-10-22"));

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java

@@ -5,8 +5,6 @@
 
 package org.opensearch.sql.calcite.remote;
 
-import static org.junit.Assert.assertTrue;
-import static org.opensearch.sql.legacy.TestUtils.*;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_LOGS;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_SIMPLE;

integ-test/src/test/java/org/opensearch/sql/ppl/ExplainIT.java

@@ -649,6 +649,15 @@ public void testSearchCommandWithRelativeTimeRange() throws IOException {
             String.format("source=%s earliest='-1q@year' latest=now", TEST_INDEX_TIME_DATA)));
   }
 
+  @Test
+  public void testSearchCommandWithNumericTimeRange() throws IOException {
+    String expected = loadExpectedPlan("explain_search_with_numeric_time_range.json");
+    assertJsonEqualsIgnoreId(
+        expected,
+        explainQueryToString(
+            String.format("source=%s earliest=1 latest=1754020061.123456", TEST_INDEX_TIME_DATA)));
+  }
+
   protected String loadExpectedPlan(String fileName) throws IOException {
     String prefix;
     if (isCalciteEnabled()) {

integ-test/src/test/java/org/opensearch/sql/ppl/SearchCommandIT.java

@@ -958,4 +958,15 @@ public void testSearchWithChainedRelativeTimeRange() throws IOException {
     verifySchema(result1, schema("@timestamp", "timestamp"));
     verifyDataRows(result1, rows("2025-08-01 03:47:41"));
   }
+
+  @Test
+  public void testSearchWithNumericTimeRange() throws IOException {
+    JSONObject result1 =
+        executeQuery(
+            String.format(
+                "search source=%s earliest=1754020060.123 latest=1754020061 | fields @timestamp",
+                TEST_INDEX_TIME_DATA));
+    verifySchema(result1, schema("@timestamp", "timestamp"));
+    verifyDataRows(result1, rows("2025-08-01 03:47:41"));
+  }
 }

integ-test/src/test/resources/expectedOutput/calcite/explain_search_with_numeric_time_range.json

@@ -0,0 +1,6 @@
+{
+  "calcite": {
+    "logical": "LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])\n  LogicalProject(@timestamp=[$0], category=[$1], value=[$2], timestamp=[$3])\n    LogicalFilter(condition=[query_string(MAP('query', '(@timestamp:>=1000) AND (@timestamp:<=1754020061123.456)':VARCHAR))])\n      CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]])\n",
+    "physical": "CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]], PushDownContext=[[PROJECT->[@timestamp, category, value, timestamp], FILTER->query_string(MAP('query', '(@timestamp:>=1000) AND (@timestamp:<=1754020061123.456)':VARCHAR)), LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"query_string\":{\"query\":\"(@timestamp:>=1000) AND (@timestamp:<=1754020061123.456)\",\"fields\":[],\"type\":\"best_fields\",\"default_operator\":\"or\",\"max_determinized_states\":10000,\"enable_position_increments\":true,\"fuzziness\":\"AUTO\",\"fuzzy_prefix_length\":0,\"fuzzy_max_expansions\":50,\"phrase_slop\":0,\"escape\":false,\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1.0}},\"_source\":{\"includes\":[\"@timestamp\",\"category\",\"value\",\"timestamp\"],\"excludes\":[]},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, requestedTotalSize=10000, pageSize=null, startFrom=0)])\n"
+  }
+}

integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_search_with_numeric_time_range.json

@@ -0,0 +1,6 @@
+{
+  "calcite": {
+    "logical": "LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])\n  LogicalProject(@timestamp=[$0], category=[$1], value=[$2], timestamp=[$3])\n    LogicalFilter(condition=[query_string(MAP('query', '(@timestamp:>=1000) AND (@timestamp:<=1754020061123.456)':VARCHAR))])\n      CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]])\n",
+    "physical": "EnumerableLimit(fetch=[10000])\n  EnumerableCalc(expr#0..9=[{inputs}], proj#0..3=[{exprs}])\n    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]], PushDownContext=[[FILTER->query_string(MAP('query', '(@timestamp:>=1000) AND (@timestamp:<=1754020061123.456)':VARCHAR))], OpenSearchRequestBuilder(sourceBuilder={\"from\":0,\"timeout\":\"1m\",\"query\":{\"query_string\":{\"query\":\"(@timestamp:>=1000) AND (@timestamp:<=1754020061123.456)\",\"fields\":[],\"type\":\"best_fields\",\"default_operator\":\"or\",\"max_determinized_states\":10000,\"enable_position_increments\":true,\"fuzziness\":\"AUTO\",\"fuzzy_prefix_length\":0,\"fuzzy_max_expansions\":50,\"phrase_slop\":0,\"escape\":false,\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1.0}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])\n"
+  }
+}

integ-test/src/test/resources/expectedOutput/ppl/explain_search_with_numeric_time_range.json

@@ -0,0 +1,17 @@
+{
+  "root": {
+    "name": "ProjectOperator",
+    "description": {
+      "fields": "[@timestamp, category, value, timestamp]"
+    },
+    "children": [
+      {
+        "name": "OpenSearchIndexScan",
+        "description": {
+          "request": "OpenSearchQueryRequest(indexName=opensearch-sql_test_index_time_data, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"query_string\":{\"query\":\"(@timestamp:>=1000) AND (@timestamp:<=1754020061123.456)\",\"fields\":[],\"type\":\"best_fields\",\"default_operator\":\"or\",\"max_determinized_states\":10000,\"enable_position_increments\":true,\"fuzziness\":\"AUTO\",\"fuzzy_prefix_length\":0,\"fuzzy_max_expansions\":50,\"phrase_slop\":0,\"escape\":false,\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1.0}},\"_source\":{\"includes\":[\"@timestamp\",\"category\",\"value\",\"timestamp\"],\"excludes\":[]},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, needClean=true, searchDone=false, pitId=*, cursorKeepAlive=1m, searchAfter=null, searchResponse=null)"
+        },
+        "children": []
+      }
+    ]
+  }
+}

ppl/src/main/antlr/OpenSearchPPLParser.g4

@@ -769,6 +769,8 @@ timeModifier
 timeModifierValue
    : NOW
    | NOW LT_PRTHS RT_PRTHS
+   | DECIMAL_LITERAL
+   | INTEGER_LITERAL
    | stringLiteral
    | timeSnap
    | (PLUS | MINUS) (integerLiteral)? timeModifierUnit (timeSnap)?

ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java

@@ -904,19 +904,48 @@ public SearchLiteral visitSearchLiteral(OpenSearchPPLParser.SearchLiteralContext
     return new SearchLiteral(new Literal(ctx.getText(), DataType.STRING), false);
   }
 
+  @Override
+  public UnresolvedExpression visitTimeModifierValue(
+      OpenSearchPPLParser.TimeModifierValueContext ctx) {
+    String osDateMathExpression;
+    // Convert unix timestamp from seconds to milliseconds for decimal and integer
+    // as OpenSearch time range accepts unix milliseconds in place of timestamp values
+    if (ctx.DECIMAL_LITERAL() != null) {
+      String decimal = ctx.DECIMAL_LITERAL().getText();
+      BigDecimal unixSecondDecimal = new BigDecimal(decimal);
+      BigDecimal unixMilliDecimal =
+          unixSecondDecimal.multiply(BigDecimal.valueOf(1000)).stripTrailingZeros();
+      osDateMathExpression = unixMilliDecimal.toString();
+    } else if (ctx.INTEGER_LITERAL() != null) {
+      String integer = ctx.INTEGER_LITERAL().getText();
+      osDateMathExpression = String.valueOf(Long.parseLong(integer) * 1000);
+    } else if (ctx.NOW() != null) { // Converts both NOW and NOW()
+      // OpenSearch time range accepts "now" as a reference to the current time
+      osDateMathExpression = ctx.NOW().getText().toLowerCase(Locale.ROOT);
+    } else {
+      // Process absolute and relative time modifier values
+      String pplTimeModifier =
+          ctx.stringLiteral() != null
+              ? (String) ((Literal) visit(ctx.stringLiteral())).getValue()
+              : ctx.getText().strip();
+      // Parse a PPL time modifier to OpenSearch date math expression
+      osDateMathExpression = DateTimeUtils.parseRelativeTime(pplTimeModifier);
+    }
+    return AstDSL.stringLiteral(osDateMathExpression);
+  }
+
   /**
    * Process time range expressions (EARLIEST='value' or LATEST='value') It creates a Comparison
    * filter like @timestamp >= timeModifierValue
    */
   @Override
   public UnresolvedExpression visitTimeModifierExpression(
       OpenSearchPPLParser.TimeModifierExpressionContext ctx) {
-    String pplTimeModifierExpression =
-        stripSingleQuote(ctx.timeModifier().timeModifierValue().getText().strip());
 
-    String osDateMathExpression = DateTimeUtils.parseRelativeTime(pplTimeModifierExpression);
-    SearchLiteral osDateMathLiteral =
-        new SearchLiteral(AstDSL.stringLiteral(osDateMathExpression), false);
+    Literal timeModifierValue =
+        (Literal) visitTimeModifierValue(ctx.timeModifier().timeModifierValue());
+
+    SearchLiteral osDateMathLiteral = new SearchLiteral(timeModifierValue, false);
 
     Field implicitTimestampField =
         new Field(new QualifiedName(OpenSearchConstants.IMPLICIT_FIELD_TIMESTAMP), List.of());
@@ -926,11 +955,4 @@ public UnresolvedExpression visitTimeModifierExpression(
             : SearchComparison.Operator.LESS_OR_EQUAL;
     return new SearchComparison(implicitTimestampField, operator, osDateMathLiteral);
   }
-
-  private static String stripSingleQuote(String text) {
-    if (text.length() >= 2 && text.startsWith("'") && text.endsWith("'")) {
-      return text.substring(1, text.length() - 1);
-    }
-    return text;
-  }
 }

ppl/src/test/java/org/opensearch/sql/ppl/parser/AstExpressionBuilderTest.java

@@ -1360,4 +1360,27 @@ public void testMedianAggFuncExpr() {
             emptyList(),
             defaultStatsArgs()));
   }
+
+  @Test
+  public void testTimeModifierEarliestWithNumericValue() {
+    assertEqual("source=t earliest=1", search(relation("t"), "@timestamp:>=1000"));
+
+    assertEqual(
+        "source=t earliest=1754020061.123456",
+        search(relation("t"), "@timestamp:>=1754020061123.456"));
+  }
+
+  @Test
+  public void testTimeModifierLatestWithNowValue() {
+    assertEqual(
+        "source=t earliest=now latest=now()",
+        search(relation("t"), "(@timestamp:>=now) AND (@timestamp:<=now)"));
+  }
+
+  @Test
+  public void testTimeModifierEarliestWithStringValue() {
+    assertEqual(
+        "source=t earliest='2025-12-10 14:00:00'",
+        search(relation("t"), "@timestamp:>=2025\\-12\\-10T14\\:00\\:00Z"));
+  }
 }