Skip to content

Commit b77690d

Browse files
authored
chore: update repo to match v1.2.2 (#159)
Temporary disables C tests due to issue with Iceberg extension loading.
1 parent ec9f872 commit b77690d

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

.github/workflows/c_tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ jobs:
2626
run: make release_c_unit_test
2727

2828
- name: Run C unit tests
29+
# Disabled until iceberg can be loaded/installed again.
30+
if: false
2931
run: ./build/release/extension/substrait/test/c/test_substrait_exe

.github/workflows/distribution.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
name: Build extension binaries
2727
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
2828
with:
29-
duckdb_version: 8e52ec43959ab363643d63cb78ee214577111da4
30-
ci_tools_version: 58970c538d35919db875096460c05806056f4de0
29+
duckdb_version: bbdc794b99a41eb5da97ba9e7f09c621eee6f300
30+
ci_tools_version: cca140d4cc47f3f3e40f29b49c305bd92845771f
3131
exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw"
3232
extension_name: substrait
3333

@@ -37,8 +37,8 @@ jobs:
3737
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
3838
secrets: inherit
3939
with:
40-
duckdb_version: 8e52ec43959ab363643d63cb78ee214577111da4
41-
ci_tools_version: 58970c538d35919db875096460c05806056f4de0
40+
duckdb_version: bbdc794b99a41eb5da97ba9e7f09c621eee6f300
41+
ci_tools_version: cca140d4cc47f3f3e40f29b49c305bd92845771f
4242
exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw"
4343
extension_name: substrait
4444
deploy_latest: true

.github/workflows/main_distribution.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
name: Build extension binaries
2222
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
2323
with:
24-
duckdb_version: 8e52ec43959ab363643d63cb78ee214577111da4
25-
ci_tools_version: 58970c538d35919db875096460c05806056f4de0
24+
duckdb_version: bbdc794b99a41eb5da97ba9e7f09c621eee6f300
25+
ci_tools_version: cca140d4cc47f3f3e40f29b49c305bd92845771f
2626
exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_mingw;windows_amd64_rtools"
2727
extension_name: substrait
2828

duckdb

Submodule duckdb updated 1481 files

src/from_substrait.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,11 +904,11 @@ shared_ptr<Relation> SubstraitToDuckDB::TransformWriteOp(const substrait::Rel &s
904904
case RelationType::PROJECTION_RELATION: {
905905
auto project = std::move(input.get()->Cast<ProjectionRelation>());
906906
auto filter = std::move(project.child->Cast<FilterRelation>());
907-
return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), schema_name, table_name);
907+
return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), catalog_name, schema_name, table_name);
908908
}
909909
case RelationType::FILTER_RELATION: {
910910
auto filter = std::move(input.get()->Cast<FilterRelation>());
911-
return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), schema_name, table_name);
911+
return make_shared_ptr<DeleteRelation>(filter.context, std::move(filter.condition), catalog_name, schema_name, table_name);
912912
}
913913
default:
914914
throw NotImplementedException("Unsupported relation type for delete operation");

test/c/test_substrait_c_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,4 +667,4 @@ TEST_CASE("Test C Project with VirtualTable", "[substrait-api]") {
667667
auto json_plan = R"({"version":{"minorNumber":29, "producer":"substrait-go darwin/arm64"}, "relations":[{"root":{"input":{"project":{"common":{"emit":{"outputMapping":[2]}}, "input":{"read":{"common":{"direct":{}}, "baseSchema":{"names":["c1", "c2"], "struct":{"types":[{"fp64":{"nullability":"NULLABILITY_NULLABLE"}}, {"fp64":{"nullability":"NULLABILITY_NULLABLE"}}], "nullability":"NULLABILITY_REQUIRED"}}, "virtualTable":{"expressions":[{"fields":[{"literal":{"fp64":1, "nullable":true}}, {"literal":{"fp64":2, "nullable":true}}]}]}}}, "expressions":[{"literal":{"fp64":42}}]}}, "names":["p1"]}}]})";
668668
auto result = FromSubstraitJSON(con,json_plan);
669669
REQUIRE(CHECK_COLUMN(result, 0, {42}));
670-
}
670+
}

0 commit comments

Comments
 (0)