Skip to content

Commit c57732d

Browse files
SwiddisSwiddis
committed
Merge remote-tracking branch 'upstream/main' into feature/headtop-limit
2 parents 5dc69ad + f9cd7ee commit c57732d

File tree

356 files changed

+14367
-2311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

356 files changed

+14367
-2311
lines changed

‎.gitignore‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,7 @@ http-client.env.json
5252
/doctest/opensearch-job-scheduler/
5353
.factorypath
5454

55-
# Claude Code files
56-
.claude/
55+
# Coding agent files (could be symlinks)
56+
.claude
57+
.clinerules
58+
memory-bank

‎.pre-commit-config.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
repos:
2+
- repo: local
3+
hooks:
4+
- id: spotless-check
5+
name: Spotless Check
6+
entry: ./gradlew spotlessCheck
7+
language: system
8+
pass_filenames: false

‎async-query-core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id "io.freefair.lombok"
99
id 'jacoco'
1010
id 'antlr'
11-
id 'com.diffplug.spotless' version '6.22.0'
11+
id 'com.diffplug.spotless'
1212
id 'com.gradleup.shadow'
1313
}
1414

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ plugins {
8181
id 'java-library'
8282
id "io.freefair.lombok" version "8.14"
8383
id 'jacoco'
84-
id 'com.diffplug.spotless' version '6.22.0'
84+
id 'com.diffplug.spotless' version '7.2.1'
8585
}
8686

8787
// 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 {
105105
exclude '**/build/**', '**/build-*/**', '**/gen/**'
106106
}
107107
importOrder()
108-
// licenseHeader("/*\n" +
109-
// " * Copyright OpenSearch Contributors\n" +
110-
// " * SPDX-License-Identifier: Apache-2.0\n" +
111-
// " */\n\n")
108+
licenseHeader("/*\n" +
109+
" * Copyright OpenSearch Contributors\n" +
110+
" * SPDX-License-Identifier: Apache-2.0\n" +
111+
" */\n\n")
112112
removeUnusedImports()
113113
trimTrailingWhitespace()
114114
endWithNewline()

‎common/build.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
plugins {
2626
id 'java-library'
2727
id "io.freefair.lombok"
28-
id 'com.diffplug.spotless' version '6.22.0'
28+
id 'com.diffplug.spotless'
2929
}
3030

3131
repositories {
@@ -73,11 +73,10 @@ spotless {
7373
exclude '**/build/**', '**/build-*/**'
7474
}
7575
importOrder()
76-
// Needs https://github.com/opensearch-project/sql/issues/1893 to be addressed first
77-
// licenseHeader("/*\n" +
78-
// " * Copyright OpenSearch Contributors\n" +
79-
// " * SPDX-License-Identifier: Apache-2.0\n" +
80-
// " */\n\n")
76+
licenseHeader("/*\n" +
77+
" * Copyright OpenSearch Contributors\n" +
78+
" * SPDX-License-Identifier: Apache-2.0\n" +
79+
" */\n\n")
8180
removeUnusedImports()
8281
trimTrailingWhitespace()
8382
endWithNewline()

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package org.opensearch.sql.common.antlr;
27

38
import org.antlr.v4.runtime.tree.ParseTree;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/*
2-
*
3-
* * Copyright OpenSearch Contributors
4-
* * SPDX-License-Identifier: Apache-2.0
5-
*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
64
*/
75

86
package org.opensearch.sql.common.interceptors;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/*
2-
*
3-
* * Copyright OpenSearch Contributors
4-
* * SPDX-License-Identifier: Apache-2.0
5-
*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
64
*/
75

86
package org.opensearch.sql.common.interceptors;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/*
2-
*
3-
* * Copyright OpenSearch Contributors
4-
* * SPDX-License-Identifier: Apache-2.0
5-
*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
64
*/
75

86
package org.opensearch.sql.common.interceptors;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ public enum Key {
3030
PATTERN_MAX_SAMPLE_COUNT("plugins.ppl.pattern.max.sample.count"),
3131
PATTERN_BUFFER_LIMIT("plugins.ppl.pattern.buffer.limit"),
3232
PPL_REX_MAX_MATCH_LIMIT("plugins.ppl.rex.max_match.limit"),
33+
PPL_VALUES_MAX_LIMIT("plugins.ppl.values.max.limit"),
34+
PPL_SYNTAX_LEGACY_PREFERRED("plugins.ppl.syntax.legacy.preferred"),
3335

3436
/** Enable Calcite as execution engine */
3537
CALCITE_ENGINE_ENABLED("plugins.calcite.enabled"),
3638
CALCITE_FALLBACK_ALLOWED("plugins.calcite.fallback.allowed"),
3739
CALCITE_PUSHDOWN_ENABLED("plugins.calcite.pushdown.enabled"),
3840
CALCITE_PUSHDOWN_ROWCOUNT_ESTIMATION_FACTOR(
3941
"plugins.calcite.pushdown.rowcount.estimation.factor"),
42+
CALCITE_SUPPORT_ALL_JOIN_TYPES("plugins.calcite.all_join_types.allowed"),
4043

4144
/** Query Settings. */
4245
FIELD_TYPE_TOLERANCE("plugins.query.field_type_tolerance"),

0 commit comments

Comments
 (0)