Skip to content

Commit 94594b6

Browse files
committed
compile pass
Signed-off-by: Peng Huo <penghuo@gmail.com>
1 parent 041215d commit 94594b6

6 files changed

Lines changed: 10 additions & 12 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ public LogicalPlan visitWindow(Window node, AnalysisContext context) {
497497
TypeEnvironment curEnv = context.peek();
498498
LogicalWindow window = (LogicalWindow) child;
499499
curEnv.define(
500-
new Symbol(Namespace.FIELD_NAME, window.getWindowFunction().getNameOrAlias()),
500+
new Symbol(Namespace.FIELD_NAME, window.getWindowFunction().getName()),
501501
window.getWindowFunction().getDelegated().type());
502502

503503
return child;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,7 @@ public static Window window(
523523
new WindowFunction(
524524
new Function(patternMethod.name().toLowerCase(Locale.ROOT), funArgs),
525525
List.of(),
526-
List.of()),
527-
alias),
526+
List.of())),
528527
input);
529528
}
530529

integ-test/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,10 @@ integTest {
435435
}
436436

437437
dependsOn ':opensearch-sql-plugin:bundlePlugin'
438-
if(getOSFamilyType() != "windows") {
439-
dependsOn startPrometheus
440-
finalizedBy stopPrometheus
441-
}
438+
// if(getOSFamilyType() != "windows") {
439+
// dependsOn startPrometheus
440+
// finalizedBy stopPrometheus
441+
// }
442442

443443
// enable calcite codegen in IT
444444
systemProperty 'calcite.debug', 'false'

integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLIntegTestCase.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ private Settings defaultSettings() {
110110
private final Map<Key, Object> defaultSettings =
111111
new ImmutableMap.Builder<Key, Object>()
112112
.put(Key.QUERY_SIZE_LIMIT, 200)
113-
.put(Key.SQL_PAGINATION_API_SEARCH_AFTER, true)
114113
.put(Key.FIELD_TYPE_TOLERANCE, true)
115114
.put(Key.CALCITE_ENGINE_ENABLED, true)
116115
.put(Key.CALCITE_FALLBACK_ALLOWED, false)
@@ -135,7 +134,6 @@ protected Settings enablePushdown() {
135134
private final Map<Key, Object> defaultSettings =
136135
new ImmutableMap.Builder<Key, Object>()
137136
.put(Key.QUERY_SIZE_LIMIT, 200)
138-
.put(Key.SQL_PAGINATION_API_SEARCH_AFTER, true)
139137
.put(Key.FIELD_TYPE_TOLERANCE, true)
140138
.put(Key.CALCITE_ENGINE_ENABLED, true)
141139
.put(Key.CALCITE_FALLBACK_ALLOWED, false)

opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import lombok.NonNull;
99
import lombok.experimental.UtilityClass;
10-
import org.opensearch.client.node.NodeClient;
10+
import org.opensearch.transport.client.node.NodeClient;
1111
import org.opensearch.rest.RestChannel;
1212
import org.opensearch.rest.RestRequest;
1313

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ public class AstBuilder extends OpenSearchPPLParserBaseVisitor<UnresolvedPlan> {
9696
*/
9797
private final String query;
9898

99+
private final Settings settings = null;
100+
99101
public AstBuilder(String query) {
100102
this(query, null);
101103
}
@@ -430,8 +432,7 @@ public UnresolvedPlan visitPatternsCommand(OpenSearchPPLParser.PatternsCommandCo
430432
.toLowerCase(Locale.ROOT),
431433
unresolvedArguments),
432434
List.of(), // ignore partition by list for now as we haven't seen such requirement
433-
List.of()), // ignore sort by list for now as we haven't seen such requirement
434-
alias.get()));
435+
List.of())));
435436
}
436437

437438
@Override

0 commit comments

Comments
 (0)