DO NOT MERGE: Debug CI

.github/workflows/test.yml

@@ -41,6 +41,13 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: recursive
+        fetch-tags: true
+
+    - name: Fetch history and tags of submodules
+      # This is needed for `substrait-java` or one of its submodules to determine its version.
+      run: |-
+        git submodule foreach --recursive 'git fetch --unshallow || true'
+        cd substrait-java/substrait; git describe --tags
 
     - name: Install Python
       uses: actions/setup-python@v5
@@ -62,6 +69,7 @@ jobs:
       if: ${{ matrix.producer == 'isthmus' }}
       uses: gradle/actions/setup-gradle@v4
       with:
+        cache-disabled: true
         gradle-version: 8.8
 
     - name: Build Isthmus
@@ -76,7 +84,7 @@ jobs:
         cp substrait-java/isthmus/build/libs/*all.jar ./jars
 
     - name: Run tests for ${{ matrix.producer }} producer
-      run: pytest -v -m produce_substrait_snapshot --producer=${{ matrix.producer }} substrait_consumer/
+      run: pytest -vs -m produce_substrait_snapshot --producer=${{ matrix.producer }} substrait_consumer/
 
     - name: Run Ibis expression tests
       if: ${{ matrix.producer == 'ibis' }}

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "substrait-java"]
 	path = substrait-java
-	url = https://github.com/substrait-io/substrait-java
+	url = https://github.com/ingomueller-net/substrait-java

build-and-copy-isthmus-shadow-jar.sh

@@ -3,7 +3,9 @@
 set -euo pipefail
 
 echo "Building Isthmus"
-cd substrait-java/isthmus; ../gradlew shadowJar
+cd substrait-java/isthmus
+../gradlew clean
+../gradlew shadowJar
 cd -
 mkdir -p jars
 cp substrait-java/isthmus/build/libs/*all.jar ./jars/

substrait_consumer/producers/isthmus_java.py

@@ -28,3 +28,4 @@
 ArrayListClass = jpype.JClass("java.util.ArrayList")
 ListClass = jpype.JClass("java.util.List")
 SqlToSubstraitClass = jpype.JClass("io.substrait.isthmus.SqlToSubstrait")
+VersionClass = jpype.JClass("io.substrait.plan.Plan")

substrait_consumer/producers/isthmus_producer.py

@@ -82,6 +82,9 @@ def _produce_isthmus_substrait(sql_string, schema_list, validate=False):
 
         from . import isthmus_java as java
 
+        version = java.VersionClass.class_.getPackage().getSpecificationVersion()
+        print("JPype version:", version)
+
         sql_to_substrait = java.SqlToSubstraitClass()
         java_sql_string = jpype.java.lang.String(sql_string)
         plan = sql_to_substrait.execute(java_sql_string, schema_list)

substrait_consumer/snapshots/producer/function/arithmetic/abs-isthmus_plan.json

@@ -98,5 +98,9 @@
       },
       "names": ["A", "ABS_A"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/acos-isthmus_plan.json

@@ -183,5 +183,9 @@
       },
       "names": ["ACOS_TAX"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/add-isthmus_plan.json

@@ -126,5 +126,9 @@
       },
       "names": ["PS_PARTKEY", "PS_SUPPKEY", "ADD_KEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/asin-isthmus_plan.json

@@ -183,5 +183,9 @@
       },
       "names": ["ASIN_TAX"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/atan-isthmus_plan.json

@@ -183,5 +183,9 @@
       },
       "names": ["ATAN_TAX"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/atan2-isthmus_plan.json

@@ -205,5 +205,9 @@
       },
       "names": ["ATAN2_TAX"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/cos-isthmus_plan.json

@@ -133,5 +133,9 @@
       },
       "names": ["COS_SUPPLY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/count-isthmus_plan.json

@@ -76,5 +76,9 @@
       },
       "names": ["COUNT_SUPPLYCOST"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/count_star-isthmus_plan.json

@@ -76,5 +76,9 @@
       },
       "names": ["EXPR$0"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/divide-isthmus_plan.json

@@ -120,5 +120,9 @@
       },
       "names": ["PS_PARTKEY", "DIVIDE_KEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/exp-isthmus_plan.json

@@ -141,5 +141,9 @@
       },
       "names": ["PS_PARTKEY", "EXP_KEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/max-isthmus_plan.json

@@ -110,5 +110,9 @@
       },
       "names": ["MAX_SUPPLYCOST"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/min-isthmus_plan.json

@@ -110,5 +110,9 @@
       },
       "names": ["MIN_SUPPLYCOST"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/modulus-isthmus_plan.json

@@ -120,5 +120,9 @@
       },
       "names": ["PS_PARTKEY", "MODULUS_KEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/multiply-isthmus_plan.json

@@ -120,5 +120,9 @@
       },
       "names": ["PS_PARTKEY", "MULTIPLY_KEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/sign-isthmus_plan.json

@@ -98,5 +98,9 @@
       },
       "names": ["A", "SIGN_A"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/sin-isthmus_plan.json

@@ -133,5 +133,9 @@
       },
       "names": ["SIN_SUPPLY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/sqrt-isthmus_plan.json

@@ -161,5 +161,9 @@
       },
       "names": ["PS_PARTKEY", "SQRT_KEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/subtract-isthmus_plan.json

@@ -126,5 +126,9 @@
       },
       "names": ["PS_PARTKEY", "PS_SUPPKEY", "SUBTRACT_KEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/sum-isthmus_plan.json

@@ -110,5 +110,9 @@
       },
       "names": ["SUM_SUPPLYCOST"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/arithmetic/tan-isthmus_plan.json

@@ -133,5 +133,9 @@
       },
       "names": ["TAN_SUPPLY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/boolean/and-isthmus_plan.json

@@ -170,5 +170,9 @@
       },
       "names": ["A", "B"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/boolean/not-isthmus_plan.json

@@ -57,5 +57,9 @@
       },
       "names": ["C"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/boolean/or-isthmus_plan.json

@@ -153,5 +153,9 @@
       },
       "names": ["A"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/comparison/between-isthmus_plan.json

@@ -180,5 +180,9 @@
       },
       "names": ["A"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/comparison/coalesce-isthmus_plan.json

@@ -54,5 +54,9 @@
       },
       "names": ["EXPR$0"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }

substrait_consumer/snapshots/producer/function/comparison/equal-isthmus_plan.json

@@ -125,5 +125,9 @@
       },
       "names": ["PS_AVAILQTY", "PS_PARTKEY"]
     }
-  }]
+  }],
+  "version": {
+    "minorNumber": 69,
+    "producer": "isthmus"
+  }
 }