From 3c7cdaeb31dcdbc016b67c1a9f78d125491412da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Pe=C3=B1a?= Date: Fri, 16 Aug 2019 14:12:26 -0500 Subject: [PATCH] fix: fix tests cases --- .../confluent/ksql/engine/KsqlEngineTest.java | 2 +- .../confluent/ksql/parser/SqlFormatter.java | 54 +++++++++++++++++++ .../ksql/parser/tree/AstVisitor.java | 20 +++++++ .../ksql/parser/tree/ListStreams.java | 5 ++ .../ksql/parser/tree/ListTables.java | 5 ++ .../ksql/parser/tree/SetProperty.java | 5 ++ .../ksql/parser/tree/TerminateQuery.java | 5 ++ .../ksql/parser/tree/UnsetProperty.java | 5 ++ 8 files changed, 100 insertions(+), 1 deletion(-) diff --git a/ksql-engine/src/test/java/io/confluent/ksql/engine/KsqlEngineTest.java b/ksql-engine/src/test/java/io/confluent/ksql/engine/KsqlEngineTest.java index 7dbc0a0931d5..73605d86f973 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/engine/KsqlEngineTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/engine/KsqlEngineTest.java @@ -595,7 +595,7 @@ public void shouldSetPropertyInRunScript() { final Map overriddenProperties = new HashMap<>(); KsqlEngineTestUtil.execute(ksqlEngine, - "SET 'auto.offset.reset' = 'earliest';", + "SET 'auto.offset.reset'='earliest';", KSQL_CONFIG, overriddenProperties); assertThat(overriddenProperties.get("auto.offset.reset"), equalTo("earliest")); diff --git a/ksql-parser/src/main/java/io/confluent/ksql/parser/SqlFormatter.java b/ksql-parser/src/main/java/io/confluent/ksql/parser/SqlFormatter.java index 14cddc1c8dd3..2eed6ad6a7ed 100644 --- a/ksql-parser/src/main/java/io/confluent/ksql/parser/SqlFormatter.java +++ b/ksql-parser/src/main/java/io/confluent/ksql/parser/SqlFormatter.java @@ -39,15 +39,20 @@ import io.confluent.ksql.parser.tree.JoinCriteria; import io.confluent.ksql.parser.tree.JoinOn; import io.confluent.ksql.parser.tree.ListFunctions; +import io.confluent.ksql.parser.tree.ListStreams; +import io.confluent.ksql.parser.tree.ListTables; import io.confluent.ksql.parser.tree.Node; import io.confluent.ksql.parser.tree.Query; import io.confluent.ksql.parser.tree.Relation; import io.confluent.ksql.parser.tree.Select; import io.confluent.ksql.parser.tree.SelectItem; +import io.confluent.ksql.parser.tree.SetProperty; import io.confluent.ksql.parser.tree.ShowColumns; import io.confluent.ksql.parser.tree.SingleColumn; import io.confluent.ksql.parser.tree.Table; import io.confluent.ksql.parser.tree.TableElement; +import io.confluent.ksql.parser.tree.TerminateQuery; +import io.confluent.ksql.parser.tree.UnsetProperty; import io.confluent.ksql.util.ParserUtil; import java.util.List; import java.util.Optional; @@ -421,6 +426,55 @@ protected Void visitDropTable(final DropTable node, final Integer context) { return null; } + @Override + protected Void visitTerminateQuery(final TerminateQuery node, final Integer context) { + builder.append("TERMINATE "); + builder.append(node.getQueryId().getId()); + return null; + } + + @Override + protected Void visitListTables(final ListTables node, final Integer context) { + builder.append("SHOW TABLES"); + if (node.getShowExtended()) { + visitExtended(); + } + return null; + } + + @Override + protected Void visitListStreams(final ListStreams node, final Integer context) { + builder.append("SHOW STREAMS"); + if (node.getShowExtended()) { + visitExtended(); + } + return null; + } + + @Override + protected Void visitUnsetProperty(final UnsetProperty node, final Integer context) { + builder.append("UNSET '"); + builder.append(node.getPropertyName()); + builder.append("'"); + + return null; + } + + @Override + protected Void visitSetProperty(final SetProperty node, final Integer context) { + builder.append("SET '"); + builder.append(node.getPropertyName()); + builder.append("'='"); + builder.append(node.getPropertyValue()); + builder.append("'"); + + return null; + } + + private void visitExtended() { + builder.append(" EXTENDED"); + } + private void visitDrop(final DropStatement node, final String sourceType) { builder.append("DROP "); builder.append(sourceType); diff --git a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/AstVisitor.java b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/AstVisitor.java index dc9412663b90..265b4c6ad289 100644 --- a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/AstVisitor.java +++ b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/AstVisitor.java @@ -299,4 +299,24 @@ protected R visitGroupingElement(final GroupingElement node, final C context) { protected R visitSimpleGroupBy(final SimpleGroupBy node, final C context) { return visitGroupingElement(node, context); } + + protected R visitTerminateQuery(final TerminateQuery node, final C context) { + return visitStatement(node, context); + } + + protected R visitListStreams(final ListStreams node, final C context) { + return visitStatement(node, context); + } + + protected R visitListTables(final ListTables node, final C context) { + return visitStatement(node, context); + } + + protected R visitUnsetProperty(final UnsetProperty node, final C context) { + return visitStatement(node, context); + } + + protected R visitSetProperty(final SetProperty node, final C context) { + return visitStatement(node, context); + } } diff --git a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListStreams.java b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListStreams.java index 251c03658102..028117f7bfba 100644 --- a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListStreams.java +++ b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListStreams.java @@ -35,6 +35,11 @@ public boolean getShowExtended() { return showExtended; } + @Override + public R accept(final AstVisitor visitor, final C context) { + return visitor.visitListStreams(this, context); + } + @Override public boolean equals(final Object o) { if (this == o) { diff --git a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListTables.java b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListTables.java index 739d5094f430..f4505314b6f0 100644 --- a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListTables.java +++ b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/ListTables.java @@ -35,6 +35,11 @@ public boolean getShowExtended() { return showExtended; } + @Override + public R accept(final AstVisitor visitor, final C context) { + return visitor.visitListTables(this, context); + } + @Override public boolean equals(final Object o) { if (this == o) { diff --git a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/SetProperty.java b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/SetProperty.java index 075f400b6ebe..5b74619a3dae 100644 --- a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/SetProperty.java +++ b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/SetProperty.java @@ -45,6 +45,11 @@ public String getPropertyValue() { return propertyValue; } + @Override + public R accept(final AstVisitor visitor, final C context) { + return visitor.visitSetProperty(this, context); + } + @Override public boolean equals(final Object o) { if (this == o) { diff --git a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/TerminateQuery.java b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/TerminateQuery.java index f99492cafef1..84ffda1c9b4c 100644 --- a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/TerminateQuery.java +++ b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/TerminateQuery.java @@ -38,6 +38,11 @@ public QueryId getQueryId() { return queryId; } + @Override + public R accept(final AstVisitor visitor, final C context) { + return visitor.visitTerminateQuery(this, context); + } + @Override public boolean equals(final Object o) { if (this == o) { diff --git a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/UnsetProperty.java b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/UnsetProperty.java index abef4b2a692b..7e198d2a69b0 100644 --- a/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/UnsetProperty.java +++ b/ksql-parser/src/main/java/io/confluent/ksql/parser/tree/UnsetProperty.java @@ -35,6 +35,11 @@ public String getPropertyName() { return propertyName; } + @Override + public R accept(final AstVisitor visitor, final C context) { + return visitor.visitUnsetProperty(this, context); + } + @Override public boolean equals(final Object o) { if (this == o) {