fix: handle version number field renames (substrait-io/substrait#362) (…

…#63)
substrait-io · Nov 21, 2022 · 5b4ff3a · 5b4ff3a
1 parent 84cdae1
commit 5b4ff3a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,8 @@ older version. Refer to the table below for the version compatibility matrix.
 
 | Substrait...   | ... is supported by validator ...    |
 | -------------- | ------------------------------------ |
-| 0.18.x         | current version                      |
+| 0.19.x         | current version                      |
+| 0.18.x         | 0.0.9                                |
 | 0.9.x - 0.17.x | 0.0.8                                |
 | 0.7.x - 0.8.x  | 0.0.7                                |
 | 0.5.x - 0.6.x  | 0.0.6                                |

diff --git a/py/tests/data.py b/py/tests/data.py
@@ -3,7 +3,7 @@
 BASIC_PLAN = """
 {
  "version": {
-  "minor": 1,
+  "minorNumber": 1,
   "producer": "validator-test"
  },
  "extensionUris": [],

diff --git a/py/tests/test_api.py b/py/tests/test_api.py
@@ -140,7 +140,7 @@ def resolver(s):
     sv.check_plan_valid(
         {
             "version": {
-                "minor": 1,
+                "minorNumber": 1,
                 "producer": "validator-test",
             },
             "extensionUris": [
@@ -160,7 +160,7 @@ def resolver(s):
         sv.check_plan_valid(
             {
                 "version": {
-                    "minor": 1,
+                    "minorNumber": 1,
                     "producer": "validator-test",
                 },
                 "extensionUris": [

diff --git a/rs/src/parse/plan.rs b/rs/src/parse/plan.rs
@@ -107,9 +107,15 @@ fn parse_producer_id(x: &String, y: &mut context::Context) -> diagnostic::Result
 /// Parse a version node.
 fn parse_version(x: &substrait::Version, y: &mut context::Context) -> diagnostic::Result<()> {
     // Parse the version information.
-    let major = proto_primitive_field!(x, y, major).1.unwrap_or_default() as u64;
-    let minor = proto_primitive_field!(x, y, minor).1.unwrap_or_default() as u64;
-    let patch = proto_primitive_field!(x, y, patch).1.unwrap_or_default() as u64;
+    let major = proto_primitive_field!(x, y, major_number)
+        .1
+        .unwrap_or_default() as u64;
+    let minor = proto_primitive_field!(x, y, minor_number)
+        .1
+        .unwrap_or_default() as u64;
+    let patch = proto_primitive_field!(x, y, patch_number)
+        .1
+        .unwrap_or_default() as u64;
     let version = semver::Version::new(major, minor, patch);
     if version == semver::Version::new(0, 0, 0) {
         diagnostic!(y, Error, Versioning, "invalid plan version (0.0.0)");

diff --git a/rs/src/resources/substrait-version b/rs/src/resources/substrait-version
@@ -1 +1 @@
-0.18.0
+0.19.0
diff --git a/substrait b/substrait
diff --git a/tests/tests/version/current-version.yaml b/tests/tests/version/current-version.yaml
@@ -6,5 +6,5 @@ plan:
   __test:
   - level: i
   version:
-    minor: 18
+    minorNumber: 19
     producer: validator-test
diff --git a/tests/tests/version/incompatible-version.yaml b/tests/tests/version/incompatible-version.yaml
@@ -6,6 +6,6 @@ plan:
   __test:
   - level: i
   version:
-    major: 1
+    majorNumber: 1
     producer: validator-test
     __test: [ diag: { level: w, code: 0007, msg: "*version*is not compatible*" } ]
diff --git a/tests/tests/version/invalid-hash.yaml b/tests/tests/version/invalid-hash.yaml
@@ -6,7 +6,7 @@ plan:
   __test:
   - level: iw
   version:
-    minor: 1
+    minorNumber: 1
     gitHash: foobar
     gitHash__test:
     - diag: { level: e, code: 0002, msg: "*40-character lowercase hexadecimal string*" }

diff --git a/tests/tests/version/unknown-version.yaml b/tests/tests/version/unknown-version.yaml
@@ -6,6 +6,6 @@ plan:
   __test:
   - level: i
   version:
-    minor: 1
+    minorNumber: 1
     producer: validator-test
     __test: [ diag: { level: w, code: 0007, msg: "*cannot automatically determine*compat*" } ]
diff --git a/tests/tests/version/valid-hash.yaml b/tests/tests/version/valid-hash.yaml
@@ -6,7 +6,7 @@ plan:
   __test:
   - level: iw
   version:
-    minor: 1
+    minorNumber: 1
     gitHash: "0123456789012345678901234567890123456789"
     gitHash__test:
     - diag: { level: w, code: 0007, msg: "*git hash was specified*" }
+12 −0		CHANGELOG.md
+97 −27		extensions/functions_string.yaml
+3 −3		proto/substrait/plan.proto