Fix: Update duckdb to get Latest Relation Definition (#122)

anshuldata · web-flow · commit 6ae6557bf942 · 2024-11-13T07:23:11.000-10:00
* Update duckdb to get Latest Relation
* Update Workflow definition to use fix commit for duckdb submodule
* Fix extension code required because of update of duckdb

* Exclude "windows_amd64_rtools" from archs
diff --git a/.github/workflows/main_distribution.yml b/.github/workflows/main_distribution.yml
@@ -21,8 +21,8 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: main
-      ci_tools_version: main
-      exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw"
+      duckdb_version: ca5af32c331f9d5ea49f7158d5c83a47f25b8b79
+      ci_tools_version: 5bdbe4d606d78dbd749f9578ba8ca639feece023
+      exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw;windows_amd64_rtools"
       extension_name: substrait
 
diff --git a/duckdb b/duckdb
@@ -1 +1 @@
-Subproject commit 131787252cc0506d0fdeb4e8b9de10b68118d156
+Subproject commit ca5af32c331f9d5ea49f7158d5c83a47f25b8b79
diff --git a/extension-ci-tools b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit 2c849c7a016eaf911d07ecb8eb9f6aed3d602e00
+Subproject commit 5bdbe4d606d78dbd749f9578ba8ca639feece023
diff --git a/src/to_substrait.cpp b/src/to_substrait.cpp
@@ -1317,7 +1317,7 @@ substrait::Rel *DuckDBToSubstrait::TransformGet(LogicalOperator &dop) {
 		auto &column_ids = dget.GetColumnIds();
 		for (auto col_idx : dget.projection_ids) {
 			auto struct_item = select->add_struct_items();
-			struct_item->set_field(static_cast<int32_t>(column_ids[col_idx]));
+			struct_item->set_field(static_cast<int32_t>(column_ids[col_idx].GetPrimaryIndex()));
 			// FIXME do we need to set the child? if yes, to what?
 		}
 		projection->set_allocated_select(select);

Original file line number	Diff line number	Diff line change
`@@ -1317,7 +1317,7 @@ substrait::Rel *DuckDBToSubstrait::TransformGet(LogicalOperator &dop) {`
`1317`	`1317`	`auto &column_ids = dget.GetColumnIds();`
`1318`	`1318`	`for (auto col_idx : dget.projection_ids) {`
`1319`	`1319`	`auto struct_item = select->add_struct_items();`
`1320`		`- struct_item->set_field(static_cast<int32_t>(column_ids[col_idx]));`
	`1320`	`+ struct_item->set_field(static_cast<int32_t>(column_ids[col_idx].GetPrimaryIndex()));`
`1321`	`1321`	`// FIXME do we need to set the child? if yes, to what?`
`1322`	`1322`	`}`
`1323`	`1323`	`projection->set_allocated_select(select);`