Skip to content

Commit 182b50c

Browse files
committed
Merge remote-tracking branch 'origin/feature/graphlookup' into poc/graphlookup
# Conflicts: # docs/user/ppl/index.md # opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/CalciteEnumerableGraphLookup.java
2 parents 50abb97 + 5eadcc5 commit 182b50c

131 files changed

Lines changed: 2083 additions & 5168 deletions

File tree

Some content is hidden

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

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

Lines changed: 0 additions & 86 deletions
This file was deleted.

common/src/test/java/org/opensearch/sql/common/utils/DebugUtilsTest.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
import org.opensearch.sql.ast.tree.Values;
108108
import org.opensearch.sql.ast.tree.Window;
109109
import org.opensearch.sql.common.antlr.SyntaxCheckException;
110-
import org.opensearch.sql.common.patterns.PatternUtils;
111110
import org.opensearch.sql.data.model.ExprMissingValue;
112111
import org.opensearch.sql.data.type.ExprCoreType;
113112
import org.opensearch.sql.datasource.DataSourceService;
@@ -527,6 +526,12 @@ public LogicalPlan visitEval(Eval node, AnalysisContext context) {
527526
return new LogicalEval(child, expressionsBuilder.build());
528527
}
529528

529+
/** Build {@link LogicalEval}. */
530+
@Override
531+
public LogicalPlan visitFieldFormat(Eval node, AnalysisContext context) {
532+
throw getOnlyForCalciteException("fieldformat");
533+
}
534+
530535
@Override
531536
public LogicalPlan visitAddTotals(AddTotals node, AnalysisContext context) {
532537
throw getOnlyForCalciteException("addtotals");
@@ -972,10 +977,10 @@ private Aggregation analyzePatternsAgg(Patterns node) {
972977
List<UnresolvedExpression> aggExprs =
973978
Stream.of(
974979
new Alias(
975-
PatternUtils.PATTERN_COUNT,
980+
"pattern_count",
976981
new AggregateFunction(BuiltinFunctionName.COUNT.name(), AllFields.of())),
977982
new Alias(
978-
PatternUtils.SAMPLE_LOGS,
983+
"sample_logs",
979984
new AggregateFunction(
980985
BuiltinFunctionName.TAKE.name(),
981986
node.getSourceField(),

core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,10 @@ public T visitEval(Eval node, C context) {
265265
return visitChildren(node, context);
266266
}
267267

268+
public T visitFieldFormat(Eval node, C context) {
269+
return visitChildren(node, context);
270+
}
271+
268272
public T visitParse(Parse node, C context) {
269273
return visitChildren(node, context);
270274
}

core/src/main/java/org/opensearch/sql/ast/AstNodeUtils.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

core/src/main/java/org/opensearch/sql/ast/analysis/FieldResolutionContext.java

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)