Switched back to string from string_view to make it easier to use Goo…

…gle's zero copy stream.
substrait-io · Jul 27, 2023 · f6ed071 · f6ed071
1 parent 4526df7
commit f6ed071
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/src/substrait/common/Io.cpp b/src/substrait/common/Io.cpp
@@ -37,7 +37,7 @@ PlanFileEncoding detectEncoding(std::string_view content) {
 
 absl::StatusOr<::substrait::proto::Plan> loadPlanWithUnknownEncoding(
  std::string_view input_filename) {
- auto contentOrError = textplan::readFromFile(input_filename);
+ auto contentOrError = textplan::readFromFile(input_filename.data());
  if (!contentOrError.ok()) {
  return contentOrError.status();
  }

diff --git a/src/substrait/common/tests/IoTest.cpp b/src/substrait/common/tests/IoTest.cpp
@@ -25,6 +25,7 @@ constexpr const char* planFileEncodingToString(PlanFileEncoding e) noexcept {
  case PlanFileEncoding::kText:
  return "kText";
  }
+ return "IMPOSSIBLE";
 }
 
 } // namespace

diff --git a/src/substrait/textplan/converter/LoadBinary.cpp b/src/substrait/textplan/converter/LoadBinary.cpp
@@ -52,7 +52,7 @@ absl::StatusOr<std::string> readFromFile(std::string_view msgPath) {
  return buffer.str();
 }
 
-absl::StatusOr<::substrait::proto::Plan> loadFromJson(std::string_view json) {
+absl::StatusOr<::substrait::proto::Plan> loadFromJson(const std::string& json) {
  if (json.empty()) {
  return absl::InternalError("Provided JSON string was empty.");
  }
@@ -76,7 +76,7 @@ absl::StatusOr<::substrait::proto::Plan> loadFromJson(std::string_view json) {
 }
 
 absl::StatusOr<::substrait::proto::Plan> loadFromProtoText(
- std::string_view text) {
+ const std::string& text) {
  ::substrait::proto::Plan plan;
  ::google::protobuf::TextFormat::Parser parser;
  StringErrorCollector collector;
@@ -89,7 +89,7 @@ absl::StatusOr<::substrait::proto::Plan> loadFromProtoText(
 }
 
 absl::StatusOr<::substrait::proto::Plan> loadFromBinary(
- std::string_view bytes) {
+ const std::string& bytes) {
  ::substrait::proto::Plan plan;
  if (!plan.ParseFromString(bytes)) {
  return absl::InternalError("Failed to parse as a binary Substrait plan.");

diff --git a/src/substrait/textplan/converter/LoadBinary.h b/src/substrait/textplan/converter/LoadBinary.h
@@ -17,15 +17,16 @@ absl::StatusOr<std::string> readFromFile(std::string_view msgPath);
 
 // Reads a plan from a json-encoded text proto.
 // Returns a list of errors if the file cannot be parsed.
-absl::StatusOr<::substrait::proto::Plan> loadFromJson(std::string_view json);
+absl::StatusOr<::substrait::proto::Plan> loadFromJson(const std::string& json);
 
 // Reads a plan encoded as a text protobuf.
 // Returns a list of errors if the file cannot be parsed.
 absl::StatusOr<::substrait::proto::Plan> loadFromProtoText(
- std::string_view text);
+ const std::string& text);
 
 // Reads a plan serialized as a binary protobuf.
 // Returns a list of errors if the file cannot be parsed.
-absl::StatusOr<::substrait::proto::Plan> loadFromBinary(std::string_view bytes);
+absl::StatusOr<::substrait::proto::Plan> loadFromBinary(
+ const std::string& bytes);
 
 } // namespace io::substrait::textplan
diff --git a/src/substrait/textplan/parser/LoadText.cpp b/src/substrait/textplan/parser/LoadText.cpp
@@ -9,7 +9,7 @@
 
 namespace io::substrait::textplan {
 
-absl::StatusOr<::substrait::proto::Plan> loadFromText(std::string_view text) {
+absl::StatusOr<::substrait::proto::Plan> loadFromText(const std::string& text) {
  auto stream = loadTextString(text);
  auto parseResult = io::substrait::textplan::parseStream(stream);
  if (!parseResult.successful()) {

diff --git a/src/substrait/textplan/parser/LoadText.h b/src/substrait/textplan/parser/LoadText.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <absl/status/statusor.h>
-#include <string_view>
 
 namespace substrait::proto {
 class Plan;
@@ -13,6 +12,6 @@ namespace io::substrait::textplan {
 
 // Reads a plan encoded as a text protobuf.
 // Returns a list of errors if the text cannot be parsed.
-absl::StatusOr<::substrait::proto::Plan> loadFromText(std::string_view text);
+absl::StatusOr<::substrait::proto::Plan> loadFromText(const std::string& text);
 
 } // namespace io::substrait::textplan