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

* 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
substrait-io · Nov 13, 2024 · 6ae6557 · 6ae6557
1 parent 82bad97
commit 6ae6557
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
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
diff --git a/extension-ci-tools b/extension-ci-tools
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);
+4 −5		.github/workflows/TestCITools.yml
+19 −11		.github/workflows/_extension_deploy.yml
+164 −65		.github/workflows/_extension_distribution.yml
+4 −1		README.md
+63 −0		config/distribution_matrix.json
+9 −2		docker/linux_amd64/Dockerfile
+8 −1		docker/linux_amd64_gcc4/Dockerfile
+9 −2		docker/linux_arm64/Dockerfile
+41 −8		makefiles/duckdb_extension.Makefile
+237 −0		makefiles/duckdb_extension_c_api.Makefile
+47 −0		makefiles/duckdb_extension_rs.Makefile
+64 −6		scripts/append_extension_metadata.py
+45 −0		scripts/configure_helper.py
+75 −0		scripts/modify_distribution_matrix.py