[calcite] branch master updated: [CALCITE-3374] Error format check result for explain plan as json (Wang Yanlin)

[hyuan]

This is an automated email from the ASF dual-hosted git repository.

hyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new 2dc97e6  [CALCITE-3374] Error format check result for explain plan as 
json (Wang Yanlin)
2dc97e6 is described below

commit 2dc97e6723e1b5bf762540f87ffffb5cd1a848a1
Author: yanlin-Lynn <1989yanlinw...@163.com>
AuthorDate: Thu Sep 26 11:35:32 2019 +0800

    [CALCITE-3374] Error format check result for explain plan as json (Wang 
Yanlin)
---
 core/src/main/java/org/apache/calcite/sql/SqlExplain.java         | 2 +-
 .../test/java/org/apache/calcite/sql/parser/SqlParserTest.java    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/calcite/sql/SqlExplain.java 
b/core/src/main/java/org/apache/calcite/sql/SqlExplain.java
index 573e4a6..146b8c2 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlExplain.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlExplain.java
@@ -172,7 +172,7 @@ public class SqlExplain extends SqlCall {
    * Returns whether result is to be in JSON format.
    */
   public boolean isJson() {
-    return getFormat() == SqlExplainFormat.XML;
+    return getFormat() == SqlExplainFormat.JSON;
   }
 
   @Override public void unparse(SqlWriter writer, int leftPrec, int rightPrec) 
{
diff --git 
a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java 
b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
index 6b18efc..d2acca0 100644
--- a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
+++ b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
@@ -20,6 +20,7 @@ import org.apache.calcite.avatica.util.Casing;
 import org.apache.calcite.avatica.util.Quoting;
 import org.apache.calcite.sql.SqlCall;
 import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.SqlExplain;
 import org.apache.calcite.sql.SqlIdentifier;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.SqlNode;
@@ -3535,6 +3536,13 @@ public class SqlParserTest {
             + "(VALUES (ROW(TRUE)))");
   }
 
+  @Test public void testExplainJsonFormat() {
+    final String sql = "explain plan as json for select * from emps";
+    TesterImpl tester = (TesterImpl) getTester();
+    SqlExplain sqlExplain = (SqlExplain) 
tester.parseStmtsAndHandleEx(sql).get(0);
+    assertEquals(sqlExplain.isJson(), true);
+  }
+
   @Test public void testDescribeSchema() {
     sql("describe schema A")
         .ok("DESCRIBE SCHEMA `A`");