Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ARROW-17647: [C++] Using better namespace style when using protobuf with Substrait #14121

Merged
merged 2 commits into from
Sep 19, 2022
Merged

ARROW-17647: [C++] Using better namespace style when using protobuf with Substrait #14121

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
7a6b4ee
fix(initial): initial filter feature added to read_rel
vibhatha Sep 14, 2022
ddca04e
fix(namespace): update
vibhatha Sep 14, 2022
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 cpp/src/arrow/engine/substrait/expression_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
if (arguments[0]->has_selection() &&
arguments[0]->selection().has_direct_reference()) {
if (arguments[1]->has_literal() && arguments[1]->literal().literal_type_case() ==
substrait::Expression_Literal::kI32) {
substrait::Expression::Literal::kI32) {
return MakeListElementReference(std::move(arguments[0]),
arguments[1]->literal().i32());
}
Expand Down
23 changes: 12 additions & 11 deletions cpp/src/arrow/engine/substrait/relation_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,23 +159,23 @@ Result<DeclarationInfo> FromProto(const substrait::Rel& rel, const ExtensionSet&
for (const auto& item : read.local_files().items()) {
std::string path;
if (item.path_type_case() ==
substrait::ReadRel_LocalFiles_FileOrFiles::kUriPath) {
substrait::ReadRel::LocalFiles::FileOrFiles::kUriPath) {
path = item.uri_path();
} else if (item.path_type_case() ==
substrait::ReadRel_LocalFiles_FileOrFiles::kUriFile) {
substrait::ReadRel::LocalFiles::FileOrFiles::kUriFile) {
path = item.uri_file();
} else if (item.path_type_case() ==
substrait::ReadRel_LocalFiles_FileOrFiles::kUriFolder) {
substrait::ReadRel::LocalFiles::FileOrFiles::kUriFolder) {
path = item.uri_folder();
} else {
path = item.uri_path_glob();
}

switch (item.file_format_case()) {
case substrait::ReadRel_LocalFiles_FileOrFiles::kParquet:
case substrait::ReadRel::LocalFiles::FileOrFiles::kParquet:
format = std::make_shared<dataset::ParquetFileFormat>();
break;
case substrait::ReadRel_LocalFiles_FileOrFiles::kArrow:
case substrait::ReadRel::LocalFiles::FileOrFiles::kArrow:
format = std::make_shared<dataset::IpcFileFormat>();
break;
default:
Expand Down Expand Up @@ -206,7 +206,7 @@ Result<DeclarationInfo> FromProto(const substrait::Rel& rel, const ExtensionSet&

path = path.substr(7);
switch (item.path_type_case()) {
case substrait::ReadRel_LocalFiles_FileOrFiles::kUriPath: {
case substrait::ReadRel::LocalFiles::FileOrFiles::kUriPath: {
ARROW_ASSIGN_OR_RAISE(auto file, filesystem->GetFileInfo(path));
if (file.type() == fs::FileType::File) {
files.push_back(std::move(file));
Expand All @@ -220,11 +220,11 @@ Result<DeclarationInfo> FromProto(const substrait::Rel& rel, const ExtensionSet&
}
break;
}
case substrait::ReadRel_LocalFiles_FileOrFiles::kUriFile: {
case substrait::ReadRel::LocalFiles::FileOrFiles::kUriFile: {
files.emplace_back(path, fs::FileType::File);
break;
}
case substrait::ReadRel_LocalFiles_FileOrFiles::kUriFolder: {
case substrait::ReadRel::LocalFiles::FileOrFiles::kUriFolder: {
fs::FileSelector selector;
selector.base_dir = path;
selector.recursive = true;
Expand All @@ -234,7 +234,7 @@ Result<DeclarationInfo> FromProto(const substrait::Rel& rel, const ExtensionSet&
std::back_inserter(files));
break;
}
case substrait::ReadRel_LocalFiles_FileOrFiles::kUriPathGlob: {
case substrait::ReadRel::LocalFiles::FileOrFiles::kUriPathGlob: {
ARROW_ASSIGN_OR_RAISE(auto discovered_files,
fs::internal::GlobFiles(filesystem, path));
std::move(discovered_files.begin(), discovered_files.end(),
Expand Down Expand Up @@ -576,15 +576,16 @@ Result<std::unique_ptr<substrait::ReadRel>> ScanRelationConverter(
return Status::Invalid(
"Can only convert scan node with FileSystemDataset to a Substrait plan.");
}

// set schema
ARROW_ASSIGN_OR_RAISE(auto named_struct,
ToProto(*dataset->schema(), ext_set, conversion_options));
read_rel->set_allocated_base_schema(named_struct.release());

// set local files
auto read_rel_lfs = make_unique<substrait::ReadRel_LocalFiles>();
auto read_rel_lfs = make_unique<substrait::ReadRel::LocalFiles>();
for (const auto& file : dataset->files()) {
auto read_rel_lfs_ffs = make_unique<substrait::ReadRel_LocalFiles_FileOrFiles>();
auto read_rel_lfs_ffs = make_unique<substrait::ReadRel::LocalFiles::FileOrFiles>();
read_rel_lfs_ffs->set_uri_path(UriFromAbsolutePath(file));
// set file format
auto format_type_name = dataset->format()->type_name();
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/engine/substrait/type_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ struct DataTypeToProtoImpl {
template <typename T>
Status EncodeUserDefined(const T& t) {
ARROW_ASSIGN_OR_RAISE(auto anchor, ext_set_->EncodeType(t));
auto user_defined = internal::make_unique<::substrait::Type_UserDefined>();
auto user_defined = internal::make_unique<::substrait::Type::UserDefined>();
user_defined->set_type_reference(anchor);
user_defined->set_nullability(nullable_ ? ::substrait::Type::NULLABILITY_NULLABLE
: ::substrait::Type::NULLABILITY_REQUIRED);
Expand Down