Updated Google save methods to use creat.

substrait-io · Jul 27, 2023 · 0903f74 · 0903f74
1 parent 4b44d42
commit 0903f74
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/src/substrait/common/Io.cpp b/src/substrait/common/Io.cpp
@@ -13,8 +13,10 @@ namespace io::substrait {
 
 namespace {
 
+// TODO - Avoid capturing.
 const std::regex kIsJson(R"(("extensionUris"|"extensions"|"relations"))");
-const std::regex kIsProtoText(R"(potatoes)");
+const std::regex kIsProtoText(
+ R"((^|\n)((relations|extensions|extension_uris|expected_type_urls) \{))");
 const std::regex kIsText(
  R"((^|\n) *(pipelines|[a-z]+ *relation|schema|source|extension_space) *)");
 

diff --git a/src/substrait/common/tests/IoTest.cpp b/src/substrait/common/tests/IoTest.cpp
@@ -65,6 +65,7 @@ TEST_P(SaveAndLoadTestFixture, SaveAndLoad) {
  ::substrait::proto::Plan plan;
  auto root = plan.add_relations()->mutable_root();
  auto read = root->mutable_input()->mutable_read();
+ read->mutable_common()->mutable_direct();
  read->mutable_named_table()->add_names("table_name");
  auto status = ::io::substrait::savePlan(plan, tempFilename, encoding);
  ASSERT_TRUE(status.ok()) << "Save failed.\n" << status;

diff --git a/src/substrait/textplan/converter/CMakeLists.txt b/src/substrait/textplan/converter/CMakeLists.txt
@@ -26,7 +26,8 @@ target_link_libraries(
  substrait_proto
  symbol_table
  error_listener
- date::date)
+ date::date
+ fmt::fmt-header-only)
 
 if(${SUBSTRAIT_CPP_BUILD_TESTING})
  add_subdirectory(tests)

diff --git a/src/substrait/textplan/converter/SaveBinary.cpp b/src/substrait/textplan/converter/SaveBinary.cpp
@@ -2,6 +2,7 @@
 
 #include "substrait/textplan/converter/SaveBinary.h"
 
+#include <fmt/format.h>
 #include <libc.h>
 #include <fstream>
 #include <limits>
@@ -17,9 +18,11 @@ absl::Status savePlanToBinary(
  const ::substrait::proto::Plan& plan,
  const std::string_view& output_filename) {
  int outputFileDescriptor =
- open(std::string{output_filename}.c_str(), O_WRONLY);
+ creat(std::string{output_filename}.c_str(), S_IREAD | S_IWRITE);
  if (outputFileDescriptor == -1) {
- return absl::ErrnoToStatus(errno, "Failed to open file for writing");
+ return absl::ErrnoToStatus(
+ errno,
+ fmt::format("Failed to open file {} for writing", output_filename));
  }
  auto stream =
  new google::protobuf::io::FileOutputStream(outputFileDescriptor);
@@ -37,7 +40,12 @@ absl::Status savePlanToJson(
  const ::substrait::proto::Plan& plan,
  const std::string_view& output_filename) {
  int outputFileDescriptor =
- open(std::string{output_filename}.c_str(), O_WRONLY);
+ creat(std::string{output_filename}.c_str(), S_IREAD | S_IWRITE);
+ if (outputFileDescriptor == -1) {
+ return absl::ErrnoToStatus(
+ errno,
+ fmt::format("Failed to open file {} for writing", output_filename));
+ }
  auto stream =
  new google::protobuf::io::FileOutputStream(outputFileDescriptor);
 
@@ -76,7 +84,12 @@ absl::Status savePlanToProtoText(
  const ::substrait::proto::Plan& plan,
  const std::string_view& output_filename) {
  int outputFileDescriptor =
- open(std::string{output_filename}.c_str(), O_WRONLY);
+ creat(std::string{output_filename}.c_str(), S_IREAD | S_IWRITE);
+ if (outputFileDescriptor == -1) {
+ return absl::ErrnoToStatus(
+ errno,
+ fmt::format("Failed to open file {} for writing", output_filename));
+ }
  auto stream =
  new google::protobuf::io::FileOutputStream(outputFileDescriptor);