Merge changes from main

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @mengweieric @vamsimanohar @swiddis @penghuo @seankao-az @MaxKsyunz @Yury-Fridlyand @anirudha @forestmvey @acarbonetto @GumpacG @ykmr1224 @LantaoJin @noCharger @qianheng-aws @yuancu
+*   @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @mengweieric @vamsimanohar @swiddis @penghuo @seankao-az @MaxKsyunz @Yury-Fridlyand @anirudha @forestmvey @acarbonetto @GumpacG @ykmr1224 @LantaoJin @noCharger @qianheng-aws @yuancu @RyanL1997

.github/workflows/integ-tests-with-security.yml

@@ -9,6 +9,7 @@ on:
     paths:
       - 'integ-test/**'
       - '.github/workflows/integ-tests-with-security.yml'
+  merge_group:
 
 jobs:
   Get-CI-Image-Tag:

.github/workflows/sql-test-and-build-workflow.yml

@@ -16,6 +16,7 @@ on:
       - '**/*.jar'
       - '**/*.pom'
       - '.github/workflows/sql-test-and-build-workflow.yml'
+  merge_group:
 
 jobs:
   Get-CI-Image-Tag:

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+repos:
+  - repo: local
+    hooks:
+      - id: spotless-format
+        name: Spotless Format
+        entry: bash -c './gradlew spotlessApply && git add -u'
+        language: system
+        pass_filenames: false
+      - id: spotless-check
+        name: Spotless Post-format Check
+        entry: bash -c './gradlew spotlessCheck'
+        language: system
+        pass_filenames: false

DEVELOPER_GUIDE.rst

@@ -173,6 +173,7 @@ Here are other files and sub-folders that you are likely to touch:
 - ``build.gradle``: Gradle build script.
 - ``docs``: documentation for developers and reference manual for users.
 - ``doc-test``: code that run .rst docs in ``docs`` folder by Python doctest library.
+- ``language-grammar``: centralized package for ANTLR grammar files. See `Language Grammar Package`_ for details.
 
 Note that other related project code has already merged into this single repository together:
 
@@ -441,3 +442,29 @@ with an appropriate label `backport <backport-branch-name>` is merged to main wi
 PR. For example, if a PR on main needs to be backported to `1.x` branch, add a label `backport 1.x` to the PR and make sure the
 backport workflow runs on the PR along with other checks. Once this PR is merged to main, the workflow will create a backport PR
 to the `1.x` branch.
+
+Language Grammar Package
+========================
+
+The ``language-grammar`` package serves as a centralized repository for all ANTLR grammar files used throughout the OpenSearch SQL project. This package contains the definitive versions of grammar files for:
+
+- SQL parsing (``OpenSearchSQLParser.g4``, ``OpenSearchSQLLexer.g4``)
+- PPL parsing (``OpenSearchPPLParser.g4``, ``OpenSearchPPLLexer.g4``)
+- Legacy SQL parsing (``OpenSearchLegacySqlParser.g4``, ``OpenSearchLegacySqlLexer.g4``)
+- Spark SQL extensions (``SparkSqlBase.g4``, ``FlintSparkSqlExtensions.g4``, ``SqlBaseParser.g4``, ``SqlBaseLexer.g4``)
+
+Purpose
+-------
+
+The language-grammar package enables sharing of grammar files between the main SQL repository and the Spark repository, ensuring consistency and reducing duplication. Once updated, the package automatically triggers CI to upload the new version to Maven Central for consumption by other projects.
+
+Updating Grammar Files
+----------------------
+
+When grammar files are modified in their respective modules (``sql/``, ``ppl/``, ``legacy/``, ``async-query-core/``), they must be manually copied to the ``language-grammar/src/main/antlr4/`` directory.
+
+**Workflow:**
+
+1. Modify grammar files in their source locations (e.g., ``sql/src/main/antlr/``)
+2. Copy updated files to ``language-grammar/src/main/antlr4/``
+3. Commit changes to trigger automatic Maven publication via CI

MAINTAINERS.md

@@ -5,7 +5,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 ## Current Maintainers
 
 | Maintainer        | GitHub ID                                           | Affiliation |
-|-------------------|-----------------------------------------------------| ----------- |
+|-------------------|-----------------------------------------------------|-------------|
 | Eric Wei          | [mengweieric](https://github.com/mengweieric)       | Amazon      |
 | Joshua Li         | [joshuali925](https://github.com/joshuali925)       | Amazon      |
 | Shenoy Pratik     | [ps48](https://github.com/ps48)                     | Amazon      |
@@ -23,6 +23,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Louis Chu         | [noCharger](https://github.com/noCharger)           | Amazon      |
 | Heng Qian         | [qianheng-aws](https://github.com/qianheng-aws)     | Amazon      |
 | Yuanchun Shen     | [yuancu](https://github.com/yuancu)                 | Amazon      |
+| Ryan Liang        | [RyanL1997](https://github.com/RyanL1997)           | Amazon      |
 | Max Ksyunz        | [MaxKsyunz](https://github.com/MaxKsyunz)           | Improving   |
 | Yury Fridlyand    | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | Improving   |
 | Andrew Carbonetto | [acarbonetto](https://github.com/acarbonetto)       | Improving   |

async-query-core/build.gradle

@@ -8,7 +8,7 @@ plugins {
     id "io.freefair.lombok"
     id 'jacoco'
     id 'antlr'
-    id 'com.diffplug.spotless' version '6.22.0'
+    id 'com.diffplug.spotless'
     id 'com.gradleup.shadow'
 }
 

build.gradle

@@ -81,7 +81,7 @@ plugins {
     id 'java-library'
     id "io.freefair.lombok" version "8.14"
     id 'jacoco'
-    id 'com.diffplug.spotless' version '6.22.0'
+    id 'com.diffplug.spotless' version '7.2.1'
 }
 
 // import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
@@ -105,10 +105,10 @@ spotless {
             exclude '**/build/**', '**/build-*/**', '**/gen/**'
         }
         importOrder()
-//        licenseHeader("/*\n" +
-//                " * Copyright OpenSearch Contributors\n" +
-//                " * SPDX-License-Identifier: Apache-2.0\n" +
-//                " */\n\n")
+        licenseHeader("/*\n" +
+                " * Copyright OpenSearch Contributors\n" +
+                " * SPDX-License-Identifier: Apache-2.0\n" +
+                " */\n\n")
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()

common/build.gradle

@@ -25,7 +25,7 @@
 plugins {
     id 'java-library'
     id "io.freefair.lombok"
-    id 'com.diffplug.spotless' version '6.22.0'
+    id 'com.diffplug.spotless'
 }
 
 repositories {
@@ -73,11 +73,10 @@ spotless {
             exclude '**/build/**', '**/build-*/**'
         }
         importOrder()
-// Needs https://github.com/opensearch-project/sql/issues/1893 to be addressed first
-//        licenseHeader("/*\n" +
-//                " * Copyright OpenSearch Contributors\n" +
-//                " * SPDX-License-Identifier: Apache-2.0\n" +
-//                " */\n\n")
+        licenseHeader("/*\n" +
+                " * Copyright OpenSearch Contributors\n" +
+                " * SPDX-License-Identifier: Apache-2.0\n" +
+                " */\n\n")
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()

common/src/main/java/org/opensearch/sql/common/antlr/Parser.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.opensearch.sql.common.antlr;
 
 import org.antlr.v4.runtime.tree.ParseTree;

common/src/main/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptor.java

@@ -1,8 +1,6 @@
 /*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.opensearch.sql.common.interceptors;

common/src/main/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptor.java

@@ -1,8 +1,6 @@
 /*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.opensearch.sql.common.interceptors;

common/src/main/java/org/opensearch/sql/common/interceptors/URIValidatorInterceptor.java

@@ -1,8 +1,6 @@
 /*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.opensearch.sql.common.interceptors;

common/src/main/java/org/opensearch/sql/common/setting/Settings.java

@@ -30,6 +30,7 @@ public enum Key {
     PATTERN_MAX_SAMPLE_COUNT("plugins.ppl.pattern.max.sample.count"),
     PATTERN_BUFFER_LIMIT("plugins.ppl.pattern.buffer.limit"),
     PPL_REX_MAX_MATCH_LIMIT("plugins.ppl.rex.max_match.limit"),
+    PPL_VALUES_MAX_LIMIT("plugins.ppl.values.max.limit"),
     PPL_SYNTAX_LEGACY_PREFERRED("plugins.ppl.syntax.legacy.preferred"),
 
     /** Enable Calcite as execution engine */

common/src/main/java/org/opensearch/sql/common/utils/URIValidationUtils.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.opensearch.sql.common.utils;
 
 import inet.ipaddr.IPAddressString;

common/src/test/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptorTest.java

@@ -1,8 +1,6 @@
 /*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.opensearch.sql.common.interceptors;

common/src/test/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptorTest.java

@@ -1,8 +1,6 @@
 /*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.opensearch.sql.common.interceptors;

core/build.gradle

@@ -28,7 +28,7 @@ plugins {
     id 'jacoco'
     id 'info.solidsoft.pitest' version '1.9.0'
     id 'java-test-fixtures'
-    id 'com.diffplug.spotless' version '6.22.0'
+    id 'com.diffplug.spotless'
 
 }
 
@@ -83,10 +83,11 @@ spotless {
             exclude '**/build/**', '**/build-*/**'
         }
         importOrder()
-//        licenseHeader("/*\n" +
-//                " * Copyright OpenSearch Contributors\n" +
-//                " * SPDX-License-Identifier: Apache-2.0\n" +
-//                " */\n\n")
+        licenseHeader("/*\n" +
+                " * Copyright OpenSearch Contributors\n" +
+                " * SPDX-License-Identifier: Apache-2.0\n" +
+                " */\n\n")
+                .onlyIfContentMatches("^((?!\\(original license below\\))[\\s\\S])*\$")
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()

core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java

@@ -1,8 +1,6 @@
 /*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.opensearch.sql;

core/src/main/java/org/opensearch/sql/analysis/DataSourceSchemaIdentifierNameResolver.java

@@ -1,8 +1,6 @@
 /*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.opensearch.sql.analysis;

core/src/main/java/org/opensearch/sql/ast/expression/PatternMode.java

@@ -1,9 +1,6 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
  */
 
 package org.opensearch.sql.ast.expression;

core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java

@@ -42,6 +42,11 @@ public enum SpanUnit {
     SPAN_UNITS = builder.add(SpanUnit.values()).build();
   }
 
+  /** Util method to check if the unit is time unit. */
+  public static boolean isTimeUnit(SpanUnit unit) {
+    return unit != UNKNOWN && unit != NONE;
+  }
+
   /** Util method to get span unit given the unit name. */
   public static SpanUnit of(String unit) {
     switch (unit) {

core/src/main/java/org/opensearch/sql/ast/statement/Explain.java

@@ -1,9 +1,6 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
  */
 
 package org.opensearch.sql.ast.statement;

core/src/main/java/org/opensearch/sql/ast/statement/Query.java

@@ -1,9 +1,6 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
  */
 
 package org.opensearch.sql.ast.statement;

core/src/main/java/org/opensearch/sql/ast/statement/Statement.java

@@ -1,9 +1,6 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
  */
 
 package org.opensearch.sql.ast.statement;