chore: configure bazel and makefile

Author: diegomarquezp

google/cloud/bigtable/CMakeLists.txt

@@ -240,7 +240,6 @@ add_library(
     polling_policy.h
     prepared_query.cc
     prepared_query.h
-    query.cc
     query_row.cc
     query_row.h
     read_modify_write_rule.h
@@ -442,6 +441,7 @@ if (BUILD_TESTING)
         app_profile_config_test.cc
         async_read_stream_test.cc
         bigtable_version_test.cc
+        bound_query_test.cc
         bytes_test.cc
         cell_test.cc
         client_options_test.cc
@@ -499,8 +499,8 @@ if (BUILD_TESTING)
         mutation_batcher_test.cc
         mutations_test.cc
         polling_policy_test.cc
+        prepared_query_test.cc
         query_row_test.cc
-        query_test.cc
         read_modify_write_rule_test.cc
         row_range_test.cc
         row_reader_test.cc

google/cloud/bigtable/bound_query_test.cc

@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #include "google/cloud/bigtable/bound_query.h"
+#include "google/cloud/bigtable/prepared_query.h"
+#include "google/cloud/bigtable/sql_statement.h"
 #include "google/cloud/bigtable/value.h"
 #include "google/cloud/testing_util/status_matchers.h"
 #include <algorithm>

google/cloud/bigtable/google_cloud_cpp_bigtable.bzl

@@ -231,7 +231,6 @@ google_cloud_cpp_bigtable_srcs = [
     "mutations.cc",
     "polling_policy.cc",
     "prepared_query.cc",
-    "query.cc",
     "query_row.cc",
     "resource_names.cc",
     "row_range.cc",

google/cloud/bigtable/prepared_query.h

@@ -18,6 +18,7 @@
 #include "google/cloud/bigtable/bound_query.h"
 #include "google/cloud/bigtable/instance_resource.h"
 #include "google/cloud/bigtable/internal/query_plan.h"
+#include "google/cloud/bigtable/sql_statement.h"
 #include "google/cloud/bigtable/value.h"
 #include "google/cloud/bigtable/version.h"
 #include "google/cloud/completion_queue.h"

google/cloud/bigtable/prepared_query_test.cc

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "google/cloud/bigtable/query.h"
+#include "google/cloud/bigtable/prepared_query.h"
+#include "google/cloud/bigtable/sql_statement.h"
 #include "google/cloud/bigtable/value.h"
 #include "google/cloud/testing_util/status_matchers.h"
 #include <algorithm>