refactor(bigtable): reorganize query public types and files

Author: scotthart

google/cloud/bigtable/CMakeLists.txt

@@ -249,7 +249,7 @@ add_library(
     read_modify_write_rule.h
     resource_names.cc
     resource_names.h
-    results.h
+    result_source_interface.h
     retry_policy.h
     row.h
     row_key.h
@@ -260,6 +260,8 @@ add_library(
     row_reader.h
     row_set.cc
     row_set.h
+    row_stream.cc
+    row_stream.h
     rpc_backoff_policy.cc
     rpc_backoff_policy.h
     rpc_retry_policy.cc
@@ -511,6 +513,7 @@ if (BUILD_TESTING)
         row_range_test.cc
         row_reader_test.cc
         row_set_test.cc
+        row_stream_test.cc
         row_test.cc
         rpc_backoff_policy_test.cc
         rpc_retry_policy_test.cc

google/cloud/bigtable/bigtable_client_unit_tests.bzl

@@ -87,6 +87,7 @@ bigtable_client_unit_tests = [
     "row_range_test.cc",
     "row_reader_test.cc",
     "row_set_test.cc",
+    "row_stream_test.cc",
     "row_test.cc",
     "rpc_backoff_policy_test.cc",
     "rpc_retry_policy_test.cc",

google/cloud/bigtable/data_connection.cc

@@ -21,7 +21,7 @@
 #include "google/cloud/bigtable/internal/partial_result_set_source.h"
 #include "google/cloud/bigtable/internal/row_reader_impl.h"
 #include "google/cloud/bigtable/options.h"
-#include "google/cloud/bigtable/results.h"
+#include "google/cloud/bigtable/result_source_interface.h"
 #include "google/cloud/background_threads.h"
 #include "google/cloud/common_options.h"
 #include "google/cloud/credentials.h"

google/cloud/bigtable/data_connection.h

@@ -20,11 +20,12 @@
 #include "google/cloud/bigtable/mutation_branch.h"
 #include "google/cloud/bigtable/mutations.h"
 #include "google/cloud/bigtable/prepared_query.h"
-#include "google/cloud/bigtable/results.h"
+#include "google/cloud/bigtable/result_source_interface.h"
 #include "google/cloud/bigtable/row.h"
 #include "google/cloud/bigtable/row_key_sample.h"
 #include "google/cloud/bigtable/row_reader.h"
 #include "google/cloud/bigtable/row_set.h"
+#include "google/cloud/bigtable/row_stream.h"
 #include "google/cloud/bigtable/sql_statement.h"
 #include "google/cloud/backoff_policy.h"
 #include "google/cloud/options.h"

google/cloud/bigtable/google_cloud_cpp_bigtable.bzl

@@ -128,14 +128,15 @@ google_cloud_cpp_bigtable_hdrs = [
     "query_row.h",
     "read_modify_write_rule.h",
     "resource_names.h",
-    "results.h",
+    "result_source_interface.h",
     "retry_policy.h",
     "row.h",
     "row_key.h",
     "row_key_sample.h",
     "row_range.h",
     "row_reader.h",
     "row_set.h",
+    "row_stream.h",
     "rpc_backoff_policy.h",
     "rpc_retry_policy.h",
     "sql_statement.h",
@@ -240,6 +241,7 @@ google_cloud_cpp_bigtable_srcs = [
     "row_range.cc",
     "row_reader.cc",
     "row_set.cc",
+    "row_stream.cc",
     "rpc_backoff_policy.cc",
     "rpc_retry_policy.cc",
     "sql_statement.cc",

google/cloud/bigtable/internal/data_connection_impl.cc

@@ -27,7 +27,7 @@
 #include "google/cloud/bigtable/internal/retry_traits.h"
 #include "google/cloud/bigtable/internal/rpc_policy_parameters.h"
 #include "google/cloud/bigtable/options.h"
-#include "google/cloud/bigtable/results.h"
+#include "google/cloud/bigtable/result_source_interface.h"
 #include "google/cloud/bigtable/retry_policy.h"
 #include "google/cloud/background_threads.h"
 #include "google/cloud/grpc_options.h"

google/cloud/bigtable/internal/data_connection_impl.h

@@ -21,7 +21,7 @@
 #include "google/cloud/bigtable/internal/operation_context_factory.h"
 #include "google/cloud/bigtable/internal/partial_result_set_reader.h"
 #include "google/cloud/bigtable/prepared_query.h"
-#include "google/cloud/bigtable/results.h"
+#include "google/cloud/bigtable/result_source_interface.h"
 #include "google/cloud/background_threads.h"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"

google/cloud/bigtable/internal/partial_result_set_source.h

@@ -17,7 +17,7 @@
 
 #include "google/cloud/bigtable/internal/operation_context.h"
 #include "google/cloud/bigtable/internal/partial_result_set_reader.h"
-#include "google/cloud/bigtable/results.h"
+#include "google/cloud/bigtable/result_source_interface.h"
 #include "google/cloud/bigtable/value.h"
 #include "google/cloud/bigtable/version.h"
 #include "google/cloud/options.h"

google/cloud/bigtable/query_row.cc

@@ -65,49 +65,6 @@ bool operator==(QueryRow const& a, QueryRow const& b) {
   return a.values_ == b.values_ && *a.columns_ == *b.columns_;
 }
 
-//
-// RowStreamIterator
-//
-
-RowStreamIterator::RowStreamIterator() = default;
-
-RowStreamIterator::RowStreamIterator(Source source)
-    : source_(std::move(source)) {
-  ++*this;
-}
-
-RowStreamIterator& RowStreamIterator::operator++() {
-  if (!row_ok_) {
-    source_ = nullptr;  // Last row was an error; become "end"
-    return *this;
-  }
-  row_ = source_();
-  row_ok_ = row_.ok();
-  if (row_ && row_->size() == 0) {
-    source_ = nullptr;  // No more Rows to consume; become "end"
-    return *this;
-  }
-  return *this;
-}
-
-RowStreamIterator RowStreamIterator::operator++(int) {
-  auto old = *this;
-  ++*this;
-  return old;
-}
-
-bool operator==(RowStreamIterator const& a, RowStreamIterator const& b) {
-  // Input iterators may only be compared to (copies of) themselves and end.
-  // See https://en.cppreference.com/w/cpp/named_req/InputIterator. Therefore,
-  // by definition, all input iterators are equal unless one is end and the
-  // other is not.
-  return !a.source_ == !b.source_;
-}
-
-bool operator!=(RowStreamIterator const& a, RowStreamIterator const& b) {
-  return !(a == b);
-}
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigtable
 }  // namespace cloud