chore: remove sql_statement from bound query, dont populate proto query

Author: diegomarquezp

google/cloud/bigtable/bound_query.cc

@@ -19,14 +19,9 @@ namespace cloud {
 namespace bigtable {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-std::string BoundQuery::prepared_query() const { return sql_statement_->sql(); }
-
-StatusOr<google::bigtable::v2::ResultSetMetadata> BoundQuery::metadata() const {
-  auto response = query_plan_->response();
-  if (response.ok()) {
-    return response->metadata();
-  }
-  return response.status();
+StatusOr<google::bigtable::v2::PrepareQueryResponse> BoundQuery::response()
+    const {
+  return query_plan_->response();
 }
 
 std::unordered_map<std::string, Value> const& BoundQuery::parameters() const {
@@ -38,10 +33,6 @@ InstanceResource const& BoundQuery::instance() const { return instance_; }
 google::bigtable::v2::ExecuteQueryRequest BoundQuery::ToRequestProto() const {
   google::bigtable::v2::ExecuteQueryRequest result;
   *result.mutable_instance_name() = instance_.FullName();
-  auto response = query_plan_->response();
-  if (response.ok()) {
-    *result.mutable_prepared_query() = sql_statement_->sql();
-  }
 
   google::protobuf::Map<std::string, google::bigtable::v2::Value> parameters;
   for (auto const& kv : parameters_) {

google/cloud/bigtable/bound_query.h

@@ -43,8 +43,7 @@ class BoundQuery {
   BoundQuery& operator=(BoundQuery&&) = default;
 
   // Accessors
-  std::string prepared_query() const;
-  StatusOr<google::bigtable::v2::ResultSetMetadata> metadata() const;
+  StatusOr<google::bigtable::v2::PrepareQueryResponse> response() const;
   std::unordered_map<std::string, Value> const& parameters() const;
   InstanceResource const& instance() const;
 
@@ -54,19 +53,16 @@ class BoundQuery {
   friend class PreparedQuery;
   BoundQuery(InstanceResource instance,
              std::shared_ptr<bigtable_internal::QueryPlan> query_plan,
-             std::unordered_map<std::string, Value> parameters,
-             std::shared_ptr<SqlStatement> sql_statement)
+             std::unordered_map<std::string, Value> parameters)
       : instance_(std::move(instance)),
         query_plan_(std::move(query_plan)),
-        parameters_(std::move(parameters)),
-        sql_statement_(std::move(sql_statement)) {}
+        parameters_(std::move(parameters)) {}
 
   InstanceResource instance_;
   // Copy of the query_plan_ contained by the PreparedQuery that created
   // this BoundQuery.
   std::shared_ptr<bigtable_internal::QueryPlan> query_plan_;
   std::unordered_map<std::string, Value> parameters_;
-  std::shared_ptr<SqlStatement> sql_statement_;
 };
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

google/cloud/bigtable/bound_query_test.cc

@@ -56,12 +56,12 @@ TEST(BoundQuery, FromPreparedQuery) {
   PreparedQuery pq(instance, sql_statement, query_plan);
   auto bq = pq.BindParameters(parameters);
   EXPECT_EQ(instance.FullName(), bq.instance().FullName());
-  EXPECT_EQ(statement_contents, bq.prepared_query());
   EXPECT_EQ(parameters, bq.parameters());
-  EXPECT_STATUS_OK(bq.metadata());
-  EXPECT_TRUE(bq.metadata().value().has_proto_schema());
-  EXPECT_EQ(1, bq.metadata().value().proto_schema().columns_size());
-  EXPECT_EQ("col1", bq.metadata().value().proto_schema().columns()[0].name());
+  EXPECT_STATUS_OK(bq.response());
+  EXPECT_TRUE(bq.response()->metadata().has_proto_schema());
+  EXPECT_EQ(1, bq.response()->metadata().proto_schema().columns_size());
+  EXPECT_EQ("col1",
+            bq.response()->metadata().proto_schema().columns()[0].name());
 
   // Cancel all pending operations, satisfying any remaining futures.
   fake_cq_impl->SimulateCompletion(false);
@@ -87,7 +87,7 @@ TEST(BoundQuery, ToRequestProto) {
   auto bq = pq.BindParameters(parameters);
   google::bigtable::v2::ExecuteQueryRequest proto = bq.ToRequestProto();
   EXPECT_EQ(instance.FullName(), proto.instance_name());
-  EXPECT_EQ(statement_contents, proto.prepared_query());
+  EXPECT_EQ("", proto.prepared_query());
 
   // Test param contents.
   EXPECT_EQ(parameters.size(), proto.mutable_params()->size());

google/cloud/bigtable/internal/data_connection_impl.cc

@@ -840,7 +840,7 @@ StatusOr<bigtable::RowStream> DataConnectionImpl::ExecuteQuery(
     bigtable::ExecuteQueryParams const& params) {
   auto current = google::cloud::internal::SaveCurrentOptions();
   StatusOr<google::bigtable::v2::ResultSetMetadata> status_or_metadata =
-      params.bound_query.metadata();
+      params.bound_query.response()->metadata();
   google::bigtable::v2::ExecuteQueryRequest request =
       params.bound_query.ToRequestProto();
   request.set_app_profile_id(app_profile_id(*current));

google/cloud/bigtable/prepared_query.cc

@@ -22,12 +22,13 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 BoundQuery PreparedQuery::BindParameters(
     std::unordered_map<std::string, Value> params) const {
-  return BoundQuery(instance_, query_plan_, std::move(params), sql_statement_);
+  return BoundQuery(instance_, query_plan_, std::move(params));
 }
 
 InstanceResource const& PreparedQuery::instance() const { return instance_; }
+
 SqlStatement const& PreparedQuery::sql_statement() const {
-  return *sql_statement_;
+  return sql_statement_;
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

google/cloud/bigtable/prepared_query.h

@@ -47,13 +47,12 @@ class PreparedQuery {
   PreparedQuery(InstanceResource instance, SqlStatement sql_statement,
                 std::shared_ptr<bigtable_internal::QueryPlan> query_plan)
       : instance_(std::move(instance)),
-        sql_statement_(
-            std::make_shared<SqlStatement>(std::move(sql_statement))),
+        sql_statement_(std::move(sql_statement)),
         query_plan_(std::move(query_plan)) {}
 
  private:
   InstanceResource instance_;
-  std::shared_ptr<SqlStatement> sql_statement_;
+  SqlStatement sql_statement_;
   std::shared_ptr<bigtable_internal::QueryPlan> query_plan_;
 };