Skip to content

Commit 7579925

Browse files
MitchellGaleMitchellGale
committed
parent 496fe8e
author Mitchell Gale <[email protected]> 1691080710 -0700 committer Mitchell Gale <[email protected]> 1691080766 -0700 Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899) * Added setDefaultMediaType for create_index and create_index_with_IOException Signed-off-by: Mitchell Gale <[email protected]> (cherry picked from commit 7b932a7) Signed-off-by: Mitchell Gale <[email protected]> Resolving merge conflicts for pre tag in java docs. Signed-off-by: Mitchell Gale <[email protected]> running spotless check on newly pre tagged javadocs. Signed-off-by: Mitchell Gale <[email protected]> Converts java doc table to proper java doc table. Signed-off-by: Mitchell Gale <[email protected]> Resolving merge conflicts for pre tag in java docs 2 Signed-off-by: Mitchell Gale <[email protected]> running spotless check on newly pre tagged javadocs. Signed-off-by: Mitchell Gale <[email protected]> cherry pick 60c0018 Signed-off-by: Mitchell Gale <[email protected]> Addressed PR comment for table format in AbstractExprValue. Signed-off-by: Mitchell Gale <[email protected]> Removed pre tag from ExpressionReferenceOptimizer. Signed-off-by: Mitchell Gale <[email protected]> Removed pre tag from AstDSL.java Signed-off-by: Mitchell Gale <[email protected]> Removed pre tag from AstDSL.java Signed-off-by: Mitchell Gale <[email protected]> Removed pre tag from SelectExpressionAnalyzer.java Signed-off-by: Mitchell Gale <[email protected]> fixed java doc in QualifiedName.java Signed-off-by: Mitchell Gale <[email protected]> Removing checkstyle test for core and added spotless for relevant directories. Signed-off-by: Mitchell Gale <[email protected]> Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java Signed-off-by: Mitchell Gale <[email protected]> Fix breaking changes. Disable some flaky tests in legacy. Signed-off-by: Yury-Fridlyand <[email protected]> (cherry picked from commit 809e656) Signed-off-by: Mitchell Gale <[email protected]> Resolving merge conflicts for pre tag in java docs. Signed-off-by: Mitchell Gale <[email protected]> running spotless check on newly pre tagged javadocs. Signed-off-by: Mitchell Gale <[email protected]> Fixed java doc spelling and improving string concatination. Signed-off-by: Mitchell Gale <[email protected]> improving string concatination. Signed-off-by: Mitchell Gale <[email protected]> Improving failure format on some functions. Signed-off-by: Mitchell Gale <[email protected]> spotless apply and fix of build.gradle Signed-off-by: Mitchell Gale <[email protected]> Resolving merge conflicts for pre tag in java docs. Signed-off-by: Mitchell Gale <[email protected]> running spotless check on newly pre tagged javadocs. Signed-off-by: Mitchell Gale <[email protected]> Converts java doc table to proper java doc table. Signed-off-by: Mitchell Gale <[email protected]> Removing unused import in OpenSearchRestClientTest.java Signed-off-by: Mitchell Gale <[email protected]>
1 parent 496fe8e commit 7579925

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

‎core/src/main/java/org/opensearch/sql/analysis/SelectExpressionAnalyzer.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,18 @@ public List<NamedExpression> visitAlias(Alias node, AnalysisContext context) {
7070
}
7171

7272
/**
73-
* The Alias could be<br>
74-
* 1. SELECT name, AVG(age) FROM s BY name -><br>
75-
* Project(Alias("name", expr), Alias("AVG(age)", aggExpr))<br>
76-
* Agg(Alias("AVG(age)", aggExpr))<br>
77-
* 2. SELECT length(name), AVG(age) FROM s BY length(name)<br>
78-
* Project(Alias("name", expr), Alias("AVG(age)", aggExpr))<br>
79-
* Agg(Alias("AVG(age)", aggExpr))<br>
80-
* 3. SELECT length(name) as l, AVG(age) FROM s BY l<br>
81-
* Project(Alias("name", expr, l), Alias("AVG(age)", aggExpr))<br>
82-
* Agg(Alias("AVG(age)", aggExpr), Alias("length(name)", groupExpr))<br>
73+
* The Alias could be
74+
* <ol>
75+
* <li>1. SELECT name, AVG(age) FROM s BY name ->
76+
* Project(Alias("name", expr), Alias("AVG(age)", aggExpr))
77+
* Agg(Alias("AVG(age)", aggExpr))</li>
78+
* <li>SELECT length(name), AVG(age) FROM s BY length(name)
79+
* Project(Alias("name", expr), Alias("AVG(age)", aggExpr))
80+
* Agg(Alias("AVG(age)", aggExpr))</li>
81+
* <li>SELECT length(name) as l, AVG(age) FROM s BY l
82+
* Project(Alias("name", expr, l), Alias("AVG(age)", aggExpr))
83+
* Agg(Alias("AVG(age)", aggExpr), Alias("length(name)", groupExpr))</li>
84+
* </ol>
8385
*/
8486
private Expression referenceIfSymbolDefined(Alias expr, AnalysisContext context) {
8587
UnresolvedExpression delegatedExpr = expr.getDelegated();

‎core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@ public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
261261
}
262262

263263
/**
264-
* CASE case_value_expr<br>
265-
* &emsp; WHEN compare_expr THEN result_expr<br>
266-
* &emsp; [WHEN compare_expr THEN result_expr] ...<br>
267-
* &emsp; [ELSE result_expr]<br>
264+
* CASE case_value_expr
265+
* WHEN compare_expr THEN result_expr
266+
* [WHEN compare_expr THEN result_expr] ...
267+
* [ELSE result_expr]
268268
* END
269269
*/
270270
public UnresolvedExpression caseWhen(UnresolvedExpression caseValueExpr,

‎opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchRestClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import lombok.SneakyThrows;
3535
import org.apache.commons.lang3.reflect.FieldUtils;
3636
import org.apache.lucene.search.TotalHits;
37-
import org.junit.jupiter.api.BeforeAll;
3837
import org.junit.jupiter.api.BeforeEach;
3938
import org.junit.jupiter.api.DisplayNameGeneration;
4039
import org.junit.jupiter.api.DisplayNameGenerator;

0 commit comments

Comments
 (0)