Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

<DRAFT> Not a actual commit to merge, this is to debug main_distribution failure #13

Closed
wants to merge 2 commits into from
Closed

<DRAFT> Not a actual commit to merge, this is to debug main_distribution failure #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0ed0a
Revert "Update Proto Source files with latest proto definitions (#12)"
anshuldata Nov 6, 2024
dc51f2a
Update duckdb submodule to latest
anshuldata Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 1900 files
2 changes: 1 addition & 1 deletion scripts/update_substrait.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import shutil
from os import walk

GITHUB_TAG = "a2df42c76282854d8674aa664d69dacd43630551"
GITHUB_TAG = "5fe2a16ac3a3e8deb970b757ea91dc33b7763a1d" # V0.53
# Change to substrait folder
sub_folder = os.path.join(os.path.dirname(os.path.realpath(__file__)),'..','third_party','substrait')
os.chdir(sub_folder)
Expand Down
16 changes: 2 additions & 14 deletions src/from_substrait.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,27 +430,15 @@ shared_ptr<Relation> SubstraitToDuckDB::TransformJoinOp(const substrait::Rel &so
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_RIGHT:
djointype = JoinType::RIGHT;
break;
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_LEFT_SINGLE:
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_SINGLE:
djointype = JoinType::SINGLE;
break;
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_LEFT_SEMI:
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_SEMI:
djointype = JoinType::SEMI;
break;
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_OUTER:
djointype = JoinType::OUTER;
break;
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_RIGHT_SEMI:
throw InternalException("Unsupported join type RIGHT_SEMI");
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_LEFT_ANTI:
throw InternalException("Unsupported join type LEFT_ANTI");
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_RIGHT_ANTI:
throw InternalException("Unsupported join type RIGHT_ANTI");
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_RIGHT_SINGLE:
throw InternalException("Unsupported join type RIGHT_SINGLE");
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_LEFT_MARK:
throw InternalException("Unsupported join type LEFT_MARK");
case substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_RIGHT_MARK:
throw InternalException("Unsupported join type RIGHT_MARK");
default:
throw InternalException("Unsupported join type");
}
Expand Down
9 changes: 2 additions & 7 deletions src/to_substrait.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,19 +963,14 @@ substrait::Rel *DuckDBToSubstrait::TransformComparisonJoin(LogicalOperator &dop)
sjoin->set_type(substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_RIGHT);
break;
case JoinType::SINGLE:
sjoin->set_type(substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_LEFT_SINGLE);
sjoin->set_type(substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_SINGLE);
break;
case JoinType::SEMI:
sjoin->set_type(substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_LEFT_SEMI);
sjoin->set_type(substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_SEMI);
break;
case JoinType::OUTER:
sjoin->set_type(substrait::JoinRel::JoinType::JoinRel_JoinType_JOIN_TYPE_OUTER);
break;
case JoinType::ANTI:
case JoinType::MARK:
case JoinType::RIGHT_SEMI:
case JoinType::RIGHT_ANTI:
throw NotImplementedException("Unsupported join type " + JoinTypeToString(djoin.join_type));
default:
throw NotImplementedException("Unsupported join type " + JoinTypeToString(djoin.join_type));
}
Expand Down
2 changes: 1 addition & 1 deletion substrait
Open in desktop
Submodule substrait updated 16 files
+4 −4 .github/workflows/pr.yml
+1 −1 .github/workflows/pr_breaking.yml
+1 −1 .github/workflows/release.yml
+0 −68 CHANGELOG.md
+1 −1 ci/release/dry_run.sh
+1 −1 ci/release/run.sh
+0 −14 core.go
+1 −1 extensions/functions_arithmetic.yaml
+1 −1 extensions/functions_geometry.yaml
+0 −3 go.mod
+5 −60 proto/substrait/algebra.proto
+1 −42 site/docs/faq.md
+4 −8 site/docs/governance.md
+1 −2 site/docs/relations/_config
+0 −26 site/docs/relations/common_fields.md
+20 −34 site/docs/relations/logical_relations.md
3,385 changes: 810 additions & 2,575 deletions third_party/substrait/substrait/algebra.pb.cc
View file
Open in desktop

Large diffs are not rendered by default.

2,459 changes: 158 additions & 2,301 deletions third_party/substrait/substrait/algebra.pb.h
View file
Open in desktop

Large diffs are not rendered by default.

1,195 changes: 283 additions & 912 deletions third_party/substrait/substrait/parameterized_types.pb.cc
View file
Open in desktop

Large diffs are not rendered by default.

806 changes: 33 additions & 773 deletions third_party/substrait/substrait/parameterized_types.pb.h
View file
Open in desktop

Large diffs are not rendered by default.

638 changes: 135 additions & 503 deletions third_party/substrait/substrait/type.pb.cc
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading