Skip to content

Commit 40039b6

Browse files
Yury-FridlyandMitchellGale
authored andcommitted
Statically init typeActionMap in OpenSearchExprValueFactory. (#310) (opensearch-project#1897)
Signed-off-by: Yury-Fridlyand <[email protected]> Added support of timestamp/date/time using curly brackets (opensearch-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <[email protected]> * improved failing tests Signed-off-by: Matthew Wells <[email protected]> * simplified tests for checking for failure Signed-off-by: Matthew Wells <[email protected]> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <[email protected]> --------- Signed-off-by: Matthew Wells <[email protected]> Bump bwc version (opensearch-project#1876) Signed-off-by: Vamsi Manohar <[email protected]> Prometheus Query Exemplars (opensearch-project#1782) Signed-off-by: Vamsi Manohar <[email protected]> Adding google code changes for core/src/main/java/org/opensearch/sql/analysis core/src/main/java/org/opensearch/sql/ast core/src/main/java/org/opensearch/sql/data core/src/main/java/org/opensearch/sql/datasource Signed-off-by: Mitchell Gale <[email protected]> Disable checkstyle fore core module and enable spotless check for the files being checked. Signed-off-by: Mitchell Gale <[email protected]> Added back core checkstyle test in sql-test-workflow.yml Signed-off-by: Mitchell Gale <[email protected]> Revert "Prometheus Query Exemplars (opensearch-project#1782)" This reverts commit 430d7a9. Revert "Bump bwc version (opensearch-project#1876)" This reverts commit 501392e. Revert "Added support of timestamp/date/time using curly brackets (opensearch-project#1894)" This reverts commit 1a7134b. Revert "Statically init `typeActionMap` in `OpenSearchExprValueFactory`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7. Revert "Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)" This reverts commit 7b932a7. Signed-off-by: Mitchell Gale <[email protected]>
1 parent 430d7a9 commit 40039b6

File tree

114 files changed

+769
-1257
lines changed

Some content is hidden

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

114 files changed

+769
-1257
lines changed

build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,12 @@ repositories {
8383
// Spotless checks will be added as PRs are applied to resolve each style issue is approved.
8484
spotless {
8585
java {
86-
// target fileTree('.') {
87-
// include '**/*.java', 'src/*/java/**/*.java'
88-
// exclude '**/build/**', '**/build-*/**'
89-
// }
86+
target fileTree('.') {
87+
include 'core/src/main/java/org/opensearch/sql/analysis/*.java',
88+
'core/src/main/java/org/opensearch/sql/data/*.java',
89+
'core/src/main/java/org/opensearch/sql/datasource/*.java'
90+
exclude '**/build/**', '**/build-*/**'
91+
}
9092
// importOrder()
9193
// licenseHeader("/*\n" +
9294
// " * Copyright OpenSearch Contributors\n" +
@@ -95,7 +97,7 @@ spotless {
9597
// removeUnusedImports()
9698
// trimTrailingWhitespace()
9799
// endWithNewline()
98-
// googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
100+
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
99101
}
100102
}
101103

core/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ repositories {
3434
mavenCentral()
3535
}
3636

37+
checkstyleTest.ignoreFailures = true
38+
checkstyleMain.ignoreFailures = true
39+
40+
3741
pitest {
3842
targetClasses = ['org.opensearch.sql.*']
3943
pitestVersion = '1.9.0'

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
76
package org.opensearch.sql.analysis;
87

98
import java.util.ArrayList;
@@ -13,26 +12,22 @@
1312
import org.opensearch.sql.expression.NamedExpression;
1413
import org.opensearch.sql.expression.function.FunctionProperties;
1514

16-
/**
17-
* The context used for Analyzer.
18-
*/
15+
/** The context used for Analyzer. */
1916
public class AnalysisContext {
20-
/**
21-
* Environment stack for symbol scope management.
22-
*/
17+
/** Environment stack for symbol scope management. */
2318
private TypeEnvironment environment;
24-
@Getter
25-
private final List<NamedExpression> namedParseExpressions;
2619

27-
@Getter
28-
private final FunctionProperties functionProperties;
20+
@Getter private final List<NamedExpression> namedParseExpressions;
21+
22+
@Getter private final FunctionProperties functionProperties;
2923

3024
public AnalysisContext() {
3125
this(new TypeEnvironment(null));
3226
}
3327

3428
/**
3529
* Class CTOR.
30+
*
3631
* @param environment Env to set to a new instance.
3732
*/
3833
public AnalysisContext(TypeEnvironment environment) {
@@ -41,9 +36,7 @@ public AnalysisContext(TypeEnvironment environment) {
4136
this.functionProperties = new FunctionProperties();
4237
}
4338

44-
/**
45-
* Push a new environment.
46-
*/
39+
/** Push a new environment. */
4740
public void push() {
4841
environment = new TypeEnvironment(environment);
4942
}

0 commit comments

Comments
 (0)