feat(isthmus): support for SQL expressions in CLI

.github/workflows/pr.yml

@@ -42,7 +42,7 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Build with Gradle
         run: gradle build
   isthmus-native-image-mac-linux:
@@ -63,7 +63,7 @@ jobs:
         # helps avoid rate-limiting issues
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
     - name: Report Java Version
       run: java -version
     - name: Install GraalVM native image

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
           # helps avoid rate-limiting issues
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Report Java Version
         run: java -version
       - name: Install GraalVM native image
@@ -66,7 +66,7 @@ jobs:
         with:
           node-version: '20'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Download isthmus-ubuntu-latest binary
         uses: actions/download-artifact@v4
         with:

isthmus/README.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-Substrait Isthmus is a Java library which enables serializing SQL to [Substrait Protobuf](https://substrait.io/serialization/binary_serialization/) via
+Substrait Isthmus is a Java library which enables serializing SQL queries to [Substrait Protobuf](https://substrait.io/serialization/binary_serialization/) and SQL expressions to [Extended Expressions](https://substrait.io/expressions/extended_expression/) via
 the Calcite SQL compiler. Optionally, you can leverage the Calcite RelNode to Substrait Plan translator as an IR translation.
 
 ## Build
@@ -15,20 +15,51 @@ Isthmus can be built as a native executable via Graal
 
 ## Usage
 
+### Version
+
+```
+$ ./isthmus/build/graal/isthmus --version
+
+isthmus 0.1
+```
+
+### Help
+
 ```
-$ ./isthmus/build/graal/isthmus
+$ ./isthmus/build/graal/isthmus --help
 
-Usage: isthmus [-m] [-c=<createStatements>]... <sql>
-Converts a SQL query to a Substrait Plan
-      <sql>              The sql we should parse.
+Usage: isthmus [-hmV] [--crossjoinpolicy=<crossJoinPolicy>]
+               [--outputformat=<outputFormat>]
+               [--sqlconformancemode=<sqlConformanceMode>]
+               [-c=<createStatements>]... [-e=<sqlExpressions>...]... [<sql>]
+Convert SQL Queries and SQL Expressions to Substrait
+      [<sql>]            A SQL query
   -c, --create=<createStatements>
                          One or multiple create table statements e.g. CREATE
                            TABLE T1(foo int, bar bigint)
+      --crossjoinpolicy=<crossJoinPolicy>
+                         One of built-in Calcite SQL compatibility modes:
+                           KEEP_AS_CROSS_JOIN, CONVERT_TO_INNER_JOIN
+  -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
+      --outputformat=<outputFormat>
+                         Set the output format for the generated plan:
+                           PROTOJSON, PROTOTEXT, BINARY
+      --sqlconformancemode=<sqlConformanceMode>
+                         One of built-in Calcite SQL compatibility modes:
+                           DEFAULT, LENIENT, BABEL, STRICT_92, STRICT_99,
+                           PRAGMATIC_99, BIG_QUERY, MYSQL_5, ORACLE_10,
+                           ORACLE_12, STRICT_2003, PRAGMATIC_2003, PRESTO,
+                           SQL_SERVER_2008
+  -V, --version          Print version information and exit.
 ```
 
 ## Example
 
+### SQL to Substrait Plan
+
 ```
 > $ ./isthmus/build/graal/isthmus \
   -c "CREATE TABLE Persons ( firstName VARCHAR, lastName VARCHAR, zip INT )" \
@@ -155,3 +186,205 @@ Converts a SQL query to a Substrait Plan
   "expectedTypeUrls": []
 }
 ```
+
+### SQL Expression to Substrait Extended Expression
+
+#### Projection
+
+```
+$ ./isthmus/build/graal/isthmus -c "CREATE TABLE NATION (N_NATIONKEY BIGINT NOT NULL, N_NAME CHAR(25), N_REGIONKEY BIGINT NOT NULL, N_COMMENT VARCHAR(152))" \
+    -e  "N_REGIONKEY + 10"
+
+{
+  "extensionUris": [{
+    "extensionUriAnchor": 1,
+    "uri": "/functions_arithmetic.yaml"
+  }],
+  "extensions": [{
+    "extensionFunction": {
+      "extensionUriReference": 1,
+      "functionAnchor": 0,
+      "name": "add:i64_i64"
+    }
+  }],
+  "referredExpr": [{
+    "expression": {
+      "scalarFunction": {
+        "functionReference": 0,
+        "args": [],
+        "outputType": {
+          "i64": {
+            "typeVariationReference": 0,
+            "nullability": "NULLABILITY_REQUIRED"
+          }
+        },
+        "arguments": [{
+          "value": {
+            "selection": {
+              "directReference": {
+                "structField": {
+                  "field": 2
+                }
+              },
+              "rootReference": {
+              }
+            }
+          }
+        }, {
+          "value": {
+            "cast": {
+              "type": {
+                "i64": {
+                  "typeVariationReference": 0,
+                  "nullability": "NULLABILITY_REQUIRED"
+                }
+              },
+              "input": {
+                "literal": {
+                  "i32": 10,
+                  "nullable": false,
+                  "typeVariationReference": 0
+                }
+              },
+              "failureBehavior": "FAILURE_BEHAVIOR_UNSPECIFIED"
+            }
+          }
+        }],
+        "options": []
+      }
+    },
+    "outputNames": ["new-column"]
+  }],
+  "baseSchema": {
+    "names": ["N_NATIONKEY", "N_NAME", "N_REGIONKEY", "N_COMMENT"],
+    "struct": {
+      "types": [{
+        "i64": {
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_REQUIRED"
+        }
+      }, {
+        "fixedChar": {
+          "length": 25,
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_NULLABLE"
+        }
+      }, {
+        "i64": {
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_REQUIRED"
+        }
+      }, {
+        "varchar": {
+          "length": 152,
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_NULLABLE"
+        }
+      }],
+      "typeVariationReference": 0,
+      "nullability": "NULLABILITY_REQUIRED"
+    }
+  },
+  "expectedTypeUrls": []
+}
+```
+
+#### Filter
+
+```
+$ ./isthmus/build/graal/isthmus -c "CREATE TABLE NATION (N_NATIONKEY BIGINT NOT NULL, N_NAME CHAR(25), N_REGIONKEY BIGINT NOT NULL, N_COMMENT VARCHAR(152))" \
+    -e  "N_REGIONKEY > 10"
+
+{
+  "extensionUris": [{
+    "extensionUriAnchor": 1,
+    "uri": "/functions_comparison.yaml"
+  }],
+  "extensions": [{
+    "extensionFunction": {
+      "extensionUriReference": 1,
+      "functionAnchor": 0,
+      "name": "gt:any_any"
+    }
+  }],
+  "referredExpr": [{
+    "expression": {
+      "scalarFunction": {
+        "functionReference": 0,
+        "args": [],
+        "outputType": {
+          "bool": {
+            "typeVariationReference": 0,
+            "nullability": "NULLABILITY_REQUIRED"
+          }
+        },
+        "arguments": [{
+          "value": {
+            "selection": {
+              "directReference": {
+                "structField": {
+                  "field": 2
+                }
+              },
+              "rootReference": {
+              }
+            }
+          }
+        }, {
+          "value": {
+            "cast": {
+              "type": {
+                "i64": {
+                  "typeVariationReference": 0,
+                  "nullability": "NULLABILITY_REQUIRED"
+                }
+              },
+              "input": {
+                "literal": {
+                  "i32": 10,
+                  "nullable": false,
+                  "typeVariationReference": 0
+                }
+              },
+              "failureBehavior": "FAILURE_BEHAVIOR_UNSPECIFIED"
+            }
+          }
+        }],
+        "options": []
+      }
+    },
+    "outputNames": ["new-column"]
+  }],
+  "baseSchema": {
+    "names": ["N_NATIONKEY", "N_NAME", "N_REGIONKEY", "N_COMMENT"],
+    "struct": {
+      "types": [{
+        "i64": {
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_REQUIRED"
+        }
+      }, {
+        "fixedChar": {
+          "length": 25,
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_NULLABLE"
+        }
+      }, {
+        "i64": {
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_REQUIRED"
+        }
+      }, {
+        "varchar": {
+          "length": 152,
+          "typeVariationReference": 0,
+          "nullability": "NULLABILITY_NULLABLE"
+        }
+      }],
+      "typeVariationReference": 0,
+      "nullability": "NULLABILITY_REQUIRED"
+    }
+  },
+  "expectedTypeUrls": []
+}
+```

isthmus/build.gradle.kts

@@ -81,7 +81,8 @@ dependencies {
   implementation("org.reflections:reflections:0.9.12")
   implementation("com.google.guava:guava:29.0-jre")
   implementation("org.graalvm.sdk:graal-sdk:22.1.0")
-  implementation("info.picocli:picocli:4.6.1")
+  implementation("info.picocli:picocli:4.7.5")
+  annotationProcessor("info.picocli:picocli-codegen:4.7.5")
   implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4")
   implementation("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4")
@@ -99,7 +100,7 @@ dependencies {
 }
 
 graal {
-  mainClass("io.substrait.isthmus.PlanEntryPoint")
+  mainClass("io.substrait.isthmus.IsthmusEntryPoint")
   outputName("isthmus")
   graalVersion("22.1.0")
   javaVersion("17")