Skip to content

Commit f06b5f7

Browse files
maretemarete
committed
Merge branch 'upstream_emulator' into pr_for_google
2 parents d9d2c64 + 041a27d commit f06b5f7

24 files changed

Lines changed: 180 additions & 33 deletions

‎google/cloud/bigtable/emulator/cluster.cc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,20 @@
1313
// limitations under the License.
1414

1515
#include "google/cloud/bigtable/emulator/cluster.h"
16+
#include "google/cloud/bigtable/emulator/table.h"
1617
#include "google/cloud/internal/make_status.h"
1718
#include "google/cloud/status.h"
1819
#include "google/cloud/status_or.h"
1920
#include "absl/strings/match.h"
21+
#include <google/bigtable/admin/v2/table.pb.h>
22+
#include <iostream>
23+
#include <map>
24+
#include <memory>
25+
#include <mutex>
26+
#include <ostream>
27+
#include <string>
28+
#include <utility>
29+
#include <vector>
2030

2131
namespace google {
2232
namespace cloud {

‎google/cloud/bigtable/emulator/cluster.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@
1616
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_EMULATOR_CLUSTER_H
1717

1818
#include "google/cloud/bigtable/emulator/table.h"
19+
#include "google/cloud/status.h"
1920
#include "google/cloud/status_or.h"
21+
#include <google/bigtable/admin/v2/table.pb.h>
22+
#include <map>
23+
#include <memory>
24+
#include <mutex>
25+
#include <string>
26+
#include <vector>
2027

2128
namespace google {
2229
namespace cloud {

‎google/cloud/bigtable/emulator/column_family.cc‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,26 @@
1313
// limitations under the License.
1414

1515
#include "google/cloud/bigtable/emulator/column_family.h"
16+
#include "google/cloud/bigtable/emulator/cell_view.h"
17+
#include "google/cloud/bigtable/emulator/filter.h"
18+
#include "google/cloud/bigtable/emulator/filtered_map.h"
1619
#include "google/cloud/internal/big_endian.h"
17-
#include <google/bigtable/v2/types.pb.h>
20+
#include "google/cloud/internal/make_status.h"
21+
#include "google/cloud/status_or.h"
22+
#include <google/bigtable/admin/v2/types.pb.h>
23+
#include <google/bigtable/v2/data.pb.h>
24+
#include <absl/strings/str_format.h>
1825
#include <absl/types/optional.h>
19-
#include <array>
26+
#include <absl/types/variant.h>
27+
#include <cassert>
2028
#include <chrono>
2129
#include <cstdint>
22-
#include <iterator>
30+
#include <functional>
2331
#include <map>
32+
#include <memory>
2433
#include <string>
2534
#include <utility>
35+
#include <vector>
2636

2737
namespace google {
2838
namespace cloud {

‎google/cloud/bigtable/emulator/column_family.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,23 @@
1515
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_EMULATOR_COLUMN_FAMILY_H
1616
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_EMULATOR_COLUMN_FAMILY_H
1717

18-
#include "google/cloud/bigtable/cell.h"
1918
#include "google/cloud/bigtable/emulator/cell_view.h"
2019
#include "google/cloud/bigtable/emulator/filter.h"
2120
#include "google/cloud/bigtable/emulator/filtered_map.h"
2221
#include "google/cloud/bigtable/emulator/range_set.h"
23-
#include "google/cloud/bigtable/read_modify_write_rule.h"
2422
#include "google/cloud/internal/big_endian.h"
25-
#include "google/cloud/internal/make_status.h"
2623
#include "google/cloud/status_or.h"
2724
#include "absl/types/optional.h"
28-
#include <google/bigtable/admin/v2/table.pb.h>
25+
#include <google/bigtable/admin/v2/types.pb.h>
2926
#include <google/bigtable/v2/data.pb.h>
30-
#include <google/bigtable/v2/types.pb.h>
31-
#include <absl/strings/str_format.h>
3227
#include <chrono>
3328
#include <cstddef>
3429
#include <cstdint>
30+
#include <functional>
3531
#include <map>
3632
#include <memory>
37-
#include <optional>
38-
#include <sstream>
33+
#include <string>
34+
#include <vector>
3935

4036
namespace google {
4137
namespace cloud {

‎google/cloud/bigtable/emulator/column_family_test.cc‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@
1313
// limitations under the License.
1414

1515
#include "google/cloud/bigtable/emulator/column_family.h"
16+
#include "google/cloud/bigtable/emulator/filter.h"
17+
#include "google/cloud/bigtable/emulator/range_set.h"
1618
#include "google/cloud/testing_util/chrono_literals.h"
17-
#include <google/protobuf/text_format.h>
18-
#include <gmock/gmock.h>
19-
#include <array>
20-
#include <cstdint>
19+
#include <google/bigtable/v2/data.pb.h>
20+
#include <gtest/gtest.h>
21+
#include <re2/re2.h>
22+
#include <iterator>
23+
#include <memory>
24+
#include <ostream>
25+
#include <sstream>
26+
#include <string>
2127

2228
namespace google {
2329
namespace cloud {

‎google/cloud/bigtable/emulator/conditional_mutations_test.cc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
#include "google/cloud/bigtable/emulator/table.h"
22
#include "google/cloud/internal/make_status.h"
3+
#include "google/cloud/status.h"
4+
#include "google/cloud/status_or.h"
35
#include "google/cloud/testing_util/status_matchers.h"
6+
#include <google/bigtable/admin/v2/table.pb.h>
47
#include <google/bigtable/v2/bigtable.pb.h>
58
#include <google/bigtable/v2/data.pb.h>
69
#include <absl/strings/str_format.h>
710
#include <gtest/gtest.h>
11+
#include <chrono>
12+
#include <cstdint>
13+
#include <memory>
14+
#include <string>
15+
#include <vector>
816

917
namespace google {
1018
namespace cloud {

‎google/cloud/bigtable/emulator/drop_row_range_test.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
#include "google/cloud/status.h"
1919
#include "google/cloud/status_or.h"
2020
#include "google/cloud/testing_util/status_matchers.h"
21-
#include <google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h>
2221
#include <google/bigtable/admin/v2/bigtable_table_admin.pb.h>
2322
#include <google/bigtable/admin/v2/table.pb.h>
24-
#include <google/bigtable/v2/bigtable.grpc.pb.h>
2523
#include <google/bigtable/v2/bigtable.pb.h>
2624
#include <google/bigtable/v2/data.pb.h>
2725
#include <absl/strings/match.h>
2826
#include <absl/strings/str_format.h>
2927
#include <gtest/gtest.h>
3028
#include <chrono>
3129
#include <cstdint>
30+
#include <map>
3231
#include <memory>
3332
#include <string>
3433
#include <vector>

‎google/cloud/bigtable/emulator/emulator.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "absl/flags/parse.h"
1818
#include "absl/flags/usage.h"
1919
#include <absl/strings/str_cat.h>
20-
#include <absl/strings/str_split.h>
2120
#include <cstdint>
2221
#include <cstdlib>
2322
#include <iostream>

‎google/cloud/bigtable/emulator/filter.cc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,22 @@
1818
#include "google/cloud/internal/invoke_result.h"
1919
#include "google/cloud/internal/make_status.h"
2020
#include "google/cloud/status_or.h"
21+
#include <google/bigtable/v2/data.pb.h>
22+
#include <absl/types/optional.h>
23+
#include <absl/types/variant.h>
2124
#include <re2/re2.h>
25+
#include <algorithm>
26+
#include <cassert>
27+
#include <cstddef>
28+
#include <cstdint>
29+
#include <functional>
30+
#include <iterator>
31+
#include <limits>
32+
#include <memory>
2233
#include <random>
34+
#include <string>
35+
#include <type_traits>
36+
#include <vector>
2337

2438
namespace google {
2539
namespace cloud {

‎google/cloud/bigtable/emulator/filter.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,14 @@
1717

1818
#include "google/cloud/bigtable/emulator/cell_view.h"
1919
#include "google/cloud/bigtable/emulator/range_set.h"
20+
#include "google/cloud/status_or.h"
2021
#include <google/bigtable/v2/data.pb.h>
22+
#include <absl/types/internal/variant.h>
23+
#include <functional>
24+
#include <memory>
25+
#include <string>
26+
#include <utility>
27+
#include <vector>
2128

2229
namespace re2 {
2330
class RE2;

0 commit comments

Comments
 (0)