feat(isthmus): always allow batch queries (#372)

BREAKING CHANGE: removed AllowsSqlBatch from FeatureBoard

Author: vbarua

isthmus-cli/README.md

@@ -27,25 +27,24 @@ isthmus 0.1
 ```
 $ ./isthmus-cli/build/graal/isthmus --help
 
-Usage: isthmus [-hmV] [--outputformat=<outputFormat>]
+Usage: isthmus [-hV] [--outputformat=<outputFormat>]
                [--unquotedcasing=<unquotedCasing>] [-c=<createStatements>]...
                [-e=<sqlExpressions>...]... [<sql>]
 Convert SQL Queries and SQL Expressions to Substrait
-      [<sql>]            A SQL query
+      [<sql>]     A SQL query
   -c, --create=<createStatements>
-                         One or multiple create table statements e.g. CREATE
-                           TABLE T1(foo int, bar bigint)
+                  One or multiple create table statements e.g. CREATE
+                    TABLE T1(foo int, bar bigint)
   -e, --expression=<sqlExpressions>...
-                         One or more SQL expressions e.g. col + 1
-  -h, --help             Show this help message and exit.
-  -m, --multistatement   Allow multiple statements terminated with a semicolon
+                  One or more SQL expressions e.g. col + 1
+  -h, --help      Show this help message and exit.
       --outputformat=<outputFormat>
-                         Set the output format for the generated plan:
-                           PROTOJSON, PROTOTEXT, BINARY
+                  Set the output format for the generated plan:
+                    PROTOJSON, PROTOTEXT, BINARY
       --unquotedcasing=<unquotedCasing>
-                         Calcite's casing policy for unquoted identifiers:
-                           UNCHANGED, TO_UPPER, TO_LOWER
-  -V, --version          Print version information and exit.
+                  Calcite's casing policy for unquoted identifiers:
+                    UNCHANGED, TO_UPPER, TO_LOWER
+  -V, --version   Print version information and exit.
 ```
 
 ## Example

isthmus-cli/src/main/java/io/substrait/isthmus/cli/IsthmusEntryPoint.java

@@ -42,11 +42,6 @@ public class IsthmusEntryPoint implements Callable<Integer> {
           "One or multiple create table statements e.g. CREATE TABLE T1(foo int, bar bigint)")
   private List<String> createStatements;
 
-  @Option(
-      names = {"-m", "--multistatement"},
-      description = "Allow multiple statements terminated with a semicolon")
-  private boolean allowMultiStatement;
-
   @Option(
       names = {"--outputformat"},
       defaultValue = "PROTOJSON",
@@ -112,9 +107,6 @@ private void printMessage(Message message) throws IOException {
 
   @VisibleForTesting
   FeatureBoard buildFeatureBoard() {
-    return ImmutableFeatureBoard.builder()
-        .allowsSqlBatch(allowMultiStatement)
-        .unquotedCasing(unquotedCasing)
-        .build();
+    return ImmutableFeatureBoard.builder().unquotedCasing(unquotedCasing).build();
   }
 }

isthmus-cli/src/test/java/io/substrait/isthmus/cli/IsthmusEntryPointTest.java

@@ -1,29 +1,17 @@
 package io.substrait.isthmus.cli;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import io.substrait.isthmus.FeatureBoard;
 import org.junit.jupiter.api.Test;
 import picocli.CommandLine;
 
 class IsthmusEntryPointTest {
 
-  /** Test that the default values are set correctly into the {@link FeatureBoard}. */
   @Test
-  void defaultFeatureBoard() {
+  void canProcessQuery() {
     IsthmusEntryPoint isthmusEntryPoint = new IsthmusEntryPoint();
-    new CommandLine(isthmusEntryPoint);
-    FeatureBoard features = isthmusEntryPoint.buildFeatureBoard();
-    assertFalse(features.allowsSqlBatch());
-  }
-
-  /** Test that the command line options are correctly parsed into the {@link FeatureBoard}. */
-  @Test
-  void customFeatureBoard() {
-    IsthmusEntryPoint isthmusEntryPoint = new IsthmusEntryPoint();
-    new CommandLine(isthmusEntryPoint).parseArgs("--multistatement", "SELECT * FROM foo");
-    FeatureBoard features = isthmusEntryPoint.buildFeatureBoard();
-    assertTrue(features.allowsSqlBatch());
+    CommandLine cli = new CommandLine(isthmusEntryPoint);
+    int statusCode = cli.execute("SELECT 1;");
+    assertEquals(0, statusCode);
   }
 }

isthmus/src/main/java/io/substrait/isthmus/FeatureBoard.java

@@ -10,14 +10,6 @@
 @Value.Immutable
 public abstract class FeatureBoard {
 
-  /**
-   * @return true if parsing sql batch (multiple input sql statements) is enabled
-   */
-  @Value.Default
-  public boolean allowsSqlBatch() {
-    return false;
-  }
-
   /**
    * @return Calcite's identifier casing policy for unquoted identifiers.
    */

isthmus/src/main/java/io/substrait/isthmus/SqlToSubstrait.java

@@ -85,9 +85,6 @@ private List<RelRoot> sqlToRelNode(
       throws SqlParseException {
     SqlParser parser = SqlParser.create(sql, parserConfig);
     var parsedList = parser.parseStmtList();
-    if (!featureBoard.allowsSqlBatch() && parsedList.size() > 1) {
-      throw new UnsupportedOperationException("SQL must contain only a single statement: " + sql);
-    }
     SqlToRelConverter converter = createSqlToRelConverter(validator, catalogReader);
     List<RelRoot> roots =
         parsedList.stream()

isthmus/src/test/java/io/substrait/isthmus/SimplePlansTest.java

@@ -1,7 +1,5 @@
 package io.substrait.isthmus;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import java.io.IOException;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.junit.jupiter.api.Test;
@@ -52,17 +50,9 @@ public void isNull() throws IOException, SqlParseException {
 
   @Test
   public void multiStatement() throws IOException, SqlParseException {
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> {
-          assertProtoPlanRoundrip(
-              "select l_orderkey from lineitem; select l_partkey from lineitem WHERE L_ORDERKEY > 20;");
-        },
-        "SQL must contain only a single statement");
-    var features = ImmutableFeatureBoard.builder().allowsSqlBatch(true).build();
     assertProtoPlanRoundrip(
         "select l_orderkey from lineitem; select l_partkey from lineitem WHERE L_ORDERKEY > 20;",
-        new SqlToSubstrait(features));
+        new SqlToSubstrait());
   }
 
   @Test