From bc76ea200028a1e8999fa40c72166023b221be03 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 23 Nov 2015 17:16:54 +0000 Subject: [PATCH 01/11] Adding generated code for gRPC beta. --- gcloud_bigtable/_generated/annotations_pb2.py | 13 +- gcloud_bigtable/_generated/any_pb2.py | 17 +- .../_generated/bigtable_cluster_data_pb2.py | 21 +- .../bigtable_cluster_service_messages_pb2.py | 27 +-- .../bigtable_cluster_service_pb2.py | 192 ++++++++++++++-- .../_generated/bigtable_data_pb2.py | 71 +++--- .../bigtable_service_messages_pb2.py | 35 +-- .../_generated/bigtable_service_pb2.py | 148 ++++++++++-- .../_generated/bigtable_table_data_pb2.py | 25 +- .../bigtable_table_service_messages_pb2.py | 33 +-- .../_generated/bigtable_table_service_pb2.py | 213 ++++++++++++++++-- gcloud_bigtable/_generated/duration_pb2.py | 13 +- gcloud_bigtable/_generated/empty_pb2.py | 13 +- gcloud_bigtable/_generated/http_pb2.py | 29 +-- gcloud_bigtable/_generated/operations_pb2.py | 145 ++++++++++-- gcloud_bigtable/_generated/status_pb2.py | 15 +- gcloud_bigtable/_generated/timestamp_pb2.py | 13 +- 17 files changed, 779 insertions(+), 244 deletions(-) diff --git a/gcloud_bigtable/_generated/annotations_pb2.py b/gcloud_bigtable/_generated/annotations_pb2.py index 64545bc..8f98861 100644 --- a/gcloud_bigtable/_generated/annotations_pb2.py +++ b/gcloud_bigtable/_generated/annotations_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/api/annotations.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -21,7 +19,7 @@ name='google/api/annotations.proto', package='google.api', syntax='proto3', - serialized_pb=_b('\n\x1cgoogle/api/annotations.proto\x12\ngoogle.api\x1a\x15google/api/http.proto\x1a google/protobuf/descriptor.proto:E\n\x04http\x12\x1e.google.protobuf.MethodOptions\x18\xb0\xca\xbc\" \x01(\x0b\x32\x14.google.api.HttpRuleB$\n\x0e\x63om.google.apiB\x10\x41nnotationsProtoP\x01\x62\x06proto3') + serialized_pb=b'\n\x1cgoogle/api/annotations.proto\x12\ngoogle.api\x1a\x15google/api/http.proto\x1a google/protobuf/descriptor.proto:E\n\x04http\x12\x1e.google.protobuf.MethodOptions\x18\xb0\xca\xbc\" \x01(\x0b\x32\x14.google.api.HttpRuleB$\n\x0e\x63om.google.apiB\x10\x41nnotationsProtoP\x01\x62\x06proto3' , dependencies=[google_dot_api_dot_http__pb2.DESCRIPTOR,google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -42,8 +40,11 @@ google_dot_protobuf_dot_descriptor__pb2.MethodOptions.RegisterExtension(http) DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\016com.google.apiB\020AnnotationsProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\016com.google.apiB\020AnnotationsProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/any_pb2.py b/gcloud_bigtable/_generated/any_pb2.py index 4c31a15..862ab1e 100644 --- a/gcloud_bigtable/_generated/any_pb2.py +++ b/gcloud_bigtable/_generated/any_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/protobuf/any.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -19,7 +17,7 @@ name='google/protobuf/any.proto', package='google.protobuf', syntax='proto3', - serialized_pb=_b('\n\x19google/protobuf/any.proto\x12\x0fgoogle.protobuf\"&\n\x03\x41ny\x12\x10\n\x08type_url\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\x42$\n\x13\x63om.google.protobufB\x08\x41nyProtoP\x01\xa0\x01\x01\x62\x06proto3') + serialized_pb=b'\n\x19google/protobuf/any.proto\x12\x0fgoogle.protobuf\"&\n\x03\x41ny\x12\x10\n\x08type_url\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\x42$\n\x13\x63om.google.protobufB\x08\x41nyProtoP\x01\xa0\x01\x01\x62\x06proto3' ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -36,14 +34,14 @@ _descriptor.FieldDescriptor( name='type_url', full_name='google.protobuf.Any.type_url', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='value', full_name='google.protobuf.Any.value', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -74,8 +72,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\010AnyProtoP\001\240\001\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\023com.google.protobufB\010AnyProtoP\001\240\001\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/bigtable_cluster_data_pb2.py b/gcloud_bigtable/_generated/bigtable_cluster_data_pb2.py index 544af89..6be8475 100644 --- a/gcloud_bigtable/_generated/bigtable_cluster_data_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_cluster_data_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message @@ -23,7 +21,7 @@ name='google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto', package='google.bigtable.admin.cluster.v1', syntax='proto3', - serialized_pb=_b('\n""" __metaclass__ = abc.ABCMeta @@ -118,43 +119,43 @@ def early_adopter_create_BigtableClusterService_server(servicer, port, private_k import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 import gcloud_bigtable._generated.operations_pb2 method_service_descriptions = { - "CreateCluster": utilities.unary_unary_service_description( + "CreateCluster": alpha_utilities.unary_unary_service_description( servicer.CreateCluster, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.CreateClusterRequest.FromString, gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, ), - "DeleteCluster": utilities.unary_unary_service_description( + "DeleteCluster": alpha_utilities.unary_unary_service_description( servicer.DeleteCluster, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.FromString, gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ), - "GetCluster": utilities.unary_unary_service_description( + "GetCluster": alpha_utilities.unary_unary_service_description( servicer.GetCluster, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.GetClusterRequest.FromString, gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, ), - "ListClusters": utilities.unary_unary_service_description( + "ListClusters": alpha_utilities.unary_unary_service_description( servicer.ListClusters, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersRequest.FromString, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersResponse.SerializeToString, ), - "ListZones": utilities.unary_unary_service_description( + "ListZones": alpha_utilities.unary_unary_service_description( servicer.ListZones, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesRequest.FromString, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesResponse.SerializeToString, ), - "UndeleteCluster": utilities.unary_unary_service_description( + "UndeleteCluster": alpha_utilities.unary_unary_service_description( servicer.UndeleteCluster, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.FromString, gcloud_bigtable._generated.operations_pb2.Operation.SerializeToString, ), - "UpdateCluster": utilities.unary_unary_service_description( + "UpdateCluster": alpha_utilities.unary_unary_service_description( servicer.UpdateCluster, gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, ), } - return implementations.server("google.bigtable.admin.cluster.v1.BigtableClusterService", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) + return early_adopter_implementations.server("google.bigtable.admin.cluster.v1.BigtableClusterService", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) def early_adopter_create_BigtableClusterService_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None): import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 @@ -171,34 +172,181 @@ def early_adopter_create_BigtableClusterService_stub(host, port, metadata_transf import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 import gcloud_bigtable._generated.operations_pb2 method_invocation_descriptions = { - "CreateCluster": utilities.unary_unary_invocation_description( + "CreateCluster": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.CreateClusterRequest.SerializeToString, gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, ), - "DeleteCluster": utilities.unary_unary_invocation_description( + "DeleteCluster": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.SerializeToString, gcloud_bigtable._generated.empty_pb2.Empty.FromString, ), - "GetCluster": utilities.unary_unary_invocation_description( + "GetCluster": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.GetClusterRequest.SerializeToString, gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, ), - "ListClusters": utilities.unary_unary_invocation_description( + "ListClusters": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersRequest.SerializeToString, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersResponse.FromString, ), - "ListZones": utilities.unary_unary_invocation_description( + "ListZones": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesRequest.SerializeToString, gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesResponse.FromString, ), - "UndeleteCluster": utilities.unary_unary_invocation_description( + "UndeleteCluster": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.SerializeToString, gcloud_bigtable._generated.operations_pb2.Operation.FromString, ), - "UpdateCluster": utilities.unary_unary_invocation_description( + "UpdateCluster": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, ), } - return implementations.stub("google.bigtable.admin.cluster.v1.BigtableClusterService", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + return early_adopter_implementations.stub("google.bigtable.admin.cluster.v1.BigtableClusterService", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + +class BetaBigtableClusterServiceServicer(object): + """""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def ListZones(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def GetCluster(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def ListClusters(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def CreateCluster(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def UpdateCluster(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def DeleteCluster(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def UndeleteCluster(self, request, context): + raise NotImplementedError() + +class BetaBigtableClusterServiceStub(object): + """The interface to which stubs will conform.""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def ListZones(self, request, timeout): + raise NotImplementedError() + ListZones.future = None + @abc.abstractmethod + def GetCluster(self, request, timeout): + raise NotImplementedError() + GetCluster.future = None + @abc.abstractmethod + def ListClusters(self, request, timeout): + raise NotImplementedError() + ListClusters.future = None + @abc.abstractmethod + def CreateCluster(self, request, timeout): + raise NotImplementedError() + CreateCluster.future = None + @abc.abstractmethod + def UpdateCluster(self, request, timeout): + raise NotImplementedError() + UpdateCluster.future = None + @abc.abstractmethod + def DeleteCluster(self, request, timeout): + raise NotImplementedError() + DeleteCluster.future = None + @abc.abstractmethod + def UndeleteCluster(self, request, timeout): + raise NotImplementedError() + UndeleteCluster.future = None + +def beta_create_BigtableClusterService_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None): + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.operations_pb2 + request_deserializers = { + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.CreateClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.GetClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, + } + response_serializers = { + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersResponse.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesResponse.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.longrunning.operations_pb2.Operation.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, + } + method_implementations = { + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): face_utilities.unary_unary_inline(servicer.CreateCluster), + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): face_utilities.unary_unary_inline(servicer.DeleteCluster), + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): face_utilities.unary_unary_inline(servicer.GetCluster), + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): face_utilities.unary_unary_inline(servicer.ListClusters), + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): face_utilities.unary_unary_inline(servicer.ListZones), + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): face_utilities.unary_unary_inline(servicer.UndeleteCluster), + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): face_utilities.unary_unary_inline(servicer.UpdateCluster), + } + server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout) + return beta_implementations.server(method_implementations, options=server_options) + +def beta_create_BigtableClusterService_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None): + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_data_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 + import gcloud_bigtable._generated.operations_pb2 + request_serializers = { + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.CreateClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.GetClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, + } + response_deserializers = { + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersResponse.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesResponse.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.longrunning.operations_pb2.Operation.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, + } + cardinalities = { + 'CreateCluster': cardinality.Cardinality.UNARY_UNARY, + 'DeleteCluster': cardinality.Cardinality.UNARY_UNARY, + 'GetCluster': cardinality.Cardinality.UNARY_UNARY, + 'ListClusters': cardinality.Cardinality.UNARY_UNARY, + 'ListZones': cardinality.Cardinality.UNARY_UNARY, + 'UndeleteCluster': cardinality.Cardinality.UNARY_UNARY, + 'UpdateCluster': cardinality.Cardinality.UNARY_UNARY, + } + stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size) + return beta_implementations.dynamic_stub(channel, 'google.bigtable.admin.cluster.v1.BigtableClusterService', cardinalities, options=stub_options) # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/bigtable_data_pb2.py b/gcloud_bigtable/_generated/bigtable_data_pb2.py index cb8f0b1..58a3b7b 100644 --- a/gcloud_bigtable/_generated/bigtable_data_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_data_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/bigtable/v1/bigtable_data.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -19,7 +17,7 @@ name='google/bigtable/v1/bigtable_data.proto', package='google.bigtable.v1', syntax='proto3', - serialized_pb=_b('\n&google/bigtable/v1/bigtable_data.proto\x12\x12google.bigtable.v1\"@\n\x03Row\x12\x0b\n\x03key\x18\x01 \x01(\x0c\x12,\n\x08\x66\x61milies\x18\x02 \x03(\x0b\x32\x1a.google.bigtable.v1.Family\"C\n\x06\x46\x61mily\x12\x0c\n\x04name\x18\x01 \x01(\t\x12+\n\x07\x63olumns\x18\x02 \x03(\x0b\x32\x1a.google.bigtable.v1.Column\"D\n\x06\x43olumn\x12\x11\n\tqualifier\x18\x01 \x01(\x0c\x12\'\n\x05\x63\x65lls\x18\x02 \x03(\x0b\x32\x18.google.bigtable.v1.Cell\"?\n\x04\x43\x65ll\x12\x18\n\x10timestamp_micros\x18\x01 \x01(\x03\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x0e\n\x06labels\x18\x03 \x03(\t\".\n\x08RowRange\x12\x11\n\tstart_key\x18\x02 \x01(\x0c\x12\x0f\n\x07\x65nd_key\x18\x03 \x01(\x0c\"\xd6\x01\n\x0b\x43olumnRange\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12#\n\x19start_qualifier_inclusive\x18\x02 \x01(\x0cH\x00\x12#\n\x19start_qualifier_exclusive\x18\x03 \x01(\x0cH\x00\x12!\n\x17\x65nd_qualifier_inclusive\x18\x04 \x01(\x0cH\x01\x12!\n\x17\x65nd_qualifier_exclusive\x18\x05 \x01(\x0cH\x01\x42\x11\n\x0fstart_qualifierB\x0f\n\rend_qualifier\"N\n\x0eTimestampRange\x12\x1e\n\x16start_timestamp_micros\x18\x01 \x01(\x03\x12\x1c\n\x14\x65nd_timestamp_micros\x18\x02 \x01(\x03\"\xa8\x01\n\nValueRange\x12\x1f\n\x15start_value_inclusive\x18\x01 \x01(\x0cH\x00\x12\x1f\n\x15start_value_exclusive\x18\x02 \x01(\x0cH\x00\x12\x1d\n\x13\x65nd_value_inclusive\x18\x03 \x01(\x0cH\x01\x12\x1d\n\x13\x65nd_value_exclusive\x18\x04 \x01(\x0cH\x01\x42\r\n\x0bstart_valueB\x0b\n\tend_value\"\xdf\x08\n\tRowFilter\x12\x34\n\x05\x63hain\x18\x01 \x01(\x0b\x32#.google.bigtable.v1.RowFilter.ChainH\x00\x12>\n\ninterleave\x18\x02 \x01(\x0b\x32(.google.bigtable.v1.RowFilter.InterleaveH\x00\x12<\n\tcondition\x18\x03 \x01(\x0b\x32\'.google.bigtable.v1.RowFilter.ConditionH\x00\x12\x0e\n\x04sink\x18\x10 \x01(\x08H\x00\x12\x19\n\x0fpass_all_filter\x18\x11 \x01(\x08H\x00\x12\x1a\n\x10\x62lock_all_filter\x18\x12 \x01(\x08H\x00\x12\x1e\n\x14row_key_regex_filter\x18\x04 \x01(\x0cH\x00\x12\x1b\n\x11row_sample_filter\x18\x0e \x01(\x01H\x00\x12\"\n\x18\x66\x61mily_name_regex_filter\x18\x05 \x01(\tH\x00\x12\'\n\x1d\x63olumn_qualifier_regex_filter\x18\x06 \x01(\x0cH\x00\x12>\n\x13\x63olumn_range_filter\x18\x07 \x01(\x0b\x32\x1f.google.bigtable.v1.ColumnRangeH\x00\x12\x44\n\x16timestamp_range_filter\x18\x08 \x01(\x0b\x32\".google.bigtable.v1.TimestampRangeH\x00\x12\x1c\n\x12value_regex_filter\x18\t \x01(\x0cH\x00\x12<\n\x12value_range_filter\x18\x0f \x01(\x0b\x32\x1e.google.bigtable.v1.ValueRangeH\x00\x12%\n\x1b\x63\x65lls_per_row_offset_filter\x18\n \x01(\x05H\x00\x12$\n\x1a\x63\x65lls_per_row_limit_filter\x18\x0b \x01(\x05H\x00\x12\'\n\x1d\x63\x65lls_per_column_limit_filter\x18\x0c \x01(\x05H\x00\x12!\n\x17strip_value_transformer\x18\r \x01(\x08H\x00\x12!\n\x17\x61pply_label_transformer\x18\x13 \x01(\tH\x00\x1a\x37\n\x05\x43hain\x12.\n\x07\x66ilters\x18\x01 \x03(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x1a<\n\nInterleave\x12.\n\x07\x66ilters\x18\x01 \x03(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x1a\xad\x01\n\tCondition\x12\x37\n\x10predicate_filter\x18\x01 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x32\n\x0btrue_filter\x18\x02 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x33\n\x0c\x66\x61lse_filter\x18\x03 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilterB\x08\n\x06\x66ilter\"\xc9\x04\n\x08Mutation\x12\x38\n\x08set_cell\x18\x01 \x01(\x0b\x32$.google.bigtable.v1.Mutation.SetCellH\x00\x12K\n\x12\x64\x65lete_from_column\x18\x02 \x01(\x0b\x32-.google.bigtable.v1.Mutation.DeleteFromColumnH\x00\x12K\n\x12\x64\x65lete_from_family\x18\x03 \x01(\x0b\x32-.google.bigtable.v1.Mutation.DeleteFromFamilyH\x00\x12\x45\n\x0f\x64\x65lete_from_row\x18\x04 \x01(\x0b\x32*.google.bigtable.v1.Mutation.DeleteFromRowH\x00\x1a\x61\n\x07SetCell\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_qualifier\x18\x02 \x01(\x0c\x12\x18\n\x10timestamp_micros\x18\x03 \x01(\x03\x12\r\n\x05value\x18\x04 \x01(\x0c\x1ay\n\x10\x44\x65leteFromColumn\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_qualifier\x18\x02 \x01(\x0c\x12\x36\n\ntime_range\x18\x03 \x01(\x0b\x32\".google.bigtable.v1.TimestampRange\x1a\'\n\x10\x44\x65leteFromFamily\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x1a\x0f\n\rDeleteFromRowB\n\n\x08mutation\"\x80\x01\n\x13ReadModifyWriteRule\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_qualifier\x18\x02 \x01(\x0c\x12\x16\n\x0c\x61ppend_value\x18\x03 \x01(\x0cH\x00\x12\x1a\n\x10increment_amount\x18\x04 \x01(\x03H\x00\x42\x06\n\x04ruleB-\n\x16\x63om.google.bigtable.v1B\x11\x42igtableDataProtoP\x01\x62\x06proto3') + serialized_pb=b'\n&google/bigtable/v1/bigtable_data.proto\x12\x12google.bigtable.v1\"@\n\x03Row\x12\x0b\n\x03key\x18\x01 \x01(\x0c\x12,\n\x08\x66\x61milies\x18\x02 \x03(\x0b\x32\x1a.google.bigtable.v1.Family\"C\n\x06\x46\x61mily\x12\x0c\n\x04name\x18\x01 \x01(\t\x12+\n\x07\x63olumns\x18\x02 \x03(\x0b\x32\x1a.google.bigtable.v1.Column\"D\n\x06\x43olumn\x12\x11\n\tqualifier\x18\x01 \x01(\x0c\x12\'\n\x05\x63\x65lls\x18\x02 \x03(\x0b\x32\x18.google.bigtable.v1.Cell\"?\n\x04\x43\x65ll\x12\x18\n\x10timestamp_micros\x18\x01 \x01(\x03\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x0e\n\x06labels\x18\x03 \x03(\t\".\n\x08RowRange\x12\x11\n\tstart_key\x18\x02 \x01(\x0c\x12\x0f\n\x07\x65nd_key\x18\x03 \x01(\x0c\"\xd6\x01\n\x0b\x43olumnRange\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12#\n\x19start_qualifier_inclusive\x18\x02 \x01(\x0cH\x00\x12#\n\x19start_qualifier_exclusive\x18\x03 \x01(\x0cH\x00\x12!\n\x17\x65nd_qualifier_inclusive\x18\x04 \x01(\x0cH\x01\x12!\n\x17\x65nd_qualifier_exclusive\x18\x05 \x01(\x0cH\x01\x42\x11\n\x0fstart_qualifierB\x0f\n\rend_qualifier\"N\n\x0eTimestampRange\x12\x1e\n\x16start_timestamp_micros\x18\x01 \x01(\x03\x12\x1c\n\x14\x65nd_timestamp_micros\x18\x02 \x01(\x03\"\xa8\x01\n\nValueRange\x12\x1f\n\x15start_value_inclusive\x18\x01 \x01(\x0cH\x00\x12\x1f\n\x15start_value_exclusive\x18\x02 \x01(\x0cH\x00\x12\x1d\n\x13\x65nd_value_inclusive\x18\x03 \x01(\x0cH\x01\x12\x1d\n\x13\x65nd_value_exclusive\x18\x04 \x01(\x0cH\x01\x42\r\n\x0bstart_valueB\x0b\n\tend_value\"\xdf\x08\n\tRowFilter\x12\x34\n\x05\x63hain\x18\x01 \x01(\x0b\x32#.google.bigtable.v1.RowFilter.ChainH\x00\x12>\n\ninterleave\x18\x02 \x01(\x0b\x32(.google.bigtable.v1.RowFilter.InterleaveH\x00\x12<\n\tcondition\x18\x03 \x01(\x0b\x32\'.google.bigtable.v1.RowFilter.ConditionH\x00\x12\x0e\n\x04sink\x18\x10 \x01(\x08H\x00\x12\x19\n\x0fpass_all_filter\x18\x11 \x01(\x08H\x00\x12\x1a\n\x10\x62lock_all_filter\x18\x12 \x01(\x08H\x00\x12\x1e\n\x14row_key_regex_filter\x18\x04 \x01(\x0cH\x00\x12\x1b\n\x11row_sample_filter\x18\x0e \x01(\x01H\x00\x12\"\n\x18\x66\x61mily_name_regex_filter\x18\x05 \x01(\tH\x00\x12\'\n\x1d\x63olumn_qualifier_regex_filter\x18\x06 \x01(\x0cH\x00\x12>\n\x13\x63olumn_range_filter\x18\x07 \x01(\x0b\x32\x1f.google.bigtable.v1.ColumnRangeH\x00\x12\x44\n\x16timestamp_range_filter\x18\x08 \x01(\x0b\x32\".google.bigtable.v1.TimestampRangeH\x00\x12\x1c\n\x12value_regex_filter\x18\t \x01(\x0cH\x00\x12<\n\x12value_range_filter\x18\x0f \x01(\x0b\x32\x1e.google.bigtable.v1.ValueRangeH\x00\x12%\n\x1b\x63\x65lls_per_row_offset_filter\x18\n \x01(\x05H\x00\x12$\n\x1a\x63\x65lls_per_row_limit_filter\x18\x0b \x01(\x05H\x00\x12\'\n\x1d\x63\x65lls_per_column_limit_filter\x18\x0c \x01(\x05H\x00\x12!\n\x17strip_value_transformer\x18\r \x01(\x08H\x00\x12!\n\x17\x61pply_label_transformer\x18\x13 \x01(\tH\x00\x1a\x37\n\x05\x43hain\x12.\n\x07\x66ilters\x18\x01 \x03(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x1a<\n\nInterleave\x12.\n\x07\x66ilters\x18\x01 \x03(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x1a\xad\x01\n\tCondition\x12\x37\n\x10predicate_filter\x18\x01 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x32\n\x0btrue_filter\x18\x02 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x33\n\x0c\x66\x61lse_filter\x18\x03 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilterB\x08\n\x06\x66ilter\"\xc9\x04\n\x08Mutation\x12\x38\n\x08set_cell\x18\x01 \x01(\x0b\x32$.google.bigtable.v1.Mutation.SetCellH\x00\x12K\n\x12\x64\x65lete_from_column\x18\x02 \x01(\x0b\x32-.google.bigtable.v1.Mutation.DeleteFromColumnH\x00\x12K\n\x12\x64\x65lete_from_family\x18\x03 \x01(\x0b\x32-.google.bigtable.v1.Mutation.DeleteFromFamilyH\x00\x12\x45\n\x0f\x64\x65lete_from_row\x18\x04 \x01(\x0b\x32*.google.bigtable.v1.Mutation.DeleteFromRowH\x00\x1a\x61\n\x07SetCell\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_qualifier\x18\x02 \x01(\x0c\x12\x18\n\x10timestamp_micros\x18\x03 \x01(\x03\x12\r\n\x05value\x18\x04 \x01(\x0c\x1ay\n\x10\x44\x65leteFromColumn\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_qualifier\x18\x02 \x01(\x0c\x12\x36\n\ntime_range\x18\x03 \x01(\x0b\x32\".google.bigtable.v1.TimestampRange\x1a\'\n\x10\x44\x65leteFromFamily\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x1a\x0f\n\rDeleteFromRowB\n\n\x08mutation\"\x80\x01\n\x13ReadModifyWriteRule\x12\x13\n\x0b\x66\x61mily_name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_qualifier\x18\x02 \x01(\x0c\x12\x16\n\x0c\x61ppend_value\x18\x03 \x01(\x0cH\x00\x12\x1a\n\x10increment_amount\x18\x04 \x01(\x03H\x00\x42\x06\n\x04ruleB-\n\x16\x63om.google.bigtable.v1B\x11\x42igtableDataProtoP\x01\x62\x06proto3' ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -36,7 +34,7 @@ _descriptor.FieldDescriptor( name='key', full_name='google.bigtable.v1.Row.key', index=0, number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -74,7 +72,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.v1.Family.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -112,7 +110,7 @@ _descriptor.FieldDescriptor( name='qualifier', full_name='google.bigtable.v1.Column.qualifier', index=0, number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -157,7 +155,7 @@ _descriptor.FieldDescriptor( name='value', full_name='google.bigtable.v1.Cell.value', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -195,14 +193,14 @@ _descriptor.FieldDescriptor( name='start_key', full_name='google.bigtable.v1.RowRange.start_key', index=0, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='end_key', full_name='google.bigtable.v1.RowRange.end_key', index=1, number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -233,35 +231,35 @@ _descriptor.FieldDescriptor( name='family_name', full_name='google.bigtable.v1.ColumnRange.family_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='start_qualifier_inclusive', full_name='google.bigtable.v1.ColumnRange.start_qualifier_inclusive', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='start_qualifier_exclusive', full_name='google.bigtable.v1.ColumnRange.start_qualifier_exclusive', index=2, number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='end_qualifier_inclusive', full_name='google.bigtable.v1.ColumnRange.end_qualifier_inclusive', index=3, number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='end_qualifier_exclusive', full_name='google.bigtable.v1.ColumnRange.end_qualifier_exclusive', index=4, number=5, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -336,28 +334,28 @@ _descriptor.FieldDescriptor( name='start_value_inclusive', full_name='google.bigtable.v1.ValueRange.start_value_inclusive', index=0, number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='start_value_exclusive', full_name='google.bigtable.v1.ValueRange.start_value_exclusive', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='end_value_inclusive', full_name='google.bigtable.v1.ValueRange.end_value_inclusive', index=2, number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='end_value_exclusive', full_name='google.bigtable.v1.ValueRange.end_value_exclusive', index=3, number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -540,7 +538,7 @@ _descriptor.FieldDescriptor( name='row_key_regex_filter', full_name='google.bigtable.v1.RowFilter.row_key_regex_filter', index=6, number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -554,14 +552,14 @@ _descriptor.FieldDescriptor( name='family_name_regex_filter', full_name='google.bigtable.v1.RowFilter.family_name_regex_filter', index=8, number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='column_qualifier_regex_filter', full_name='google.bigtable.v1.RowFilter.column_qualifier_regex_filter', index=9, number=6, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -582,7 +580,7 @@ _descriptor.FieldDescriptor( name='value_regex_filter', full_name='google.bigtable.v1.RowFilter.value_regex_filter', index=12, number=9, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -624,7 +622,7 @@ _descriptor.FieldDescriptor( name='apply_label_transformer', full_name='google.bigtable.v1.RowFilter.apply_label_transformer', index=18, number=19, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -658,14 +656,14 @@ _descriptor.FieldDescriptor( name='family_name', full_name='google.bigtable.v1.Mutation.SetCell.family_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='column_qualifier', full_name='google.bigtable.v1.Mutation.SetCell.column_qualifier', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -679,7 +677,7 @@ _descriptor.FieldDescriptor( name='value', full_name='google.bigtable.v1.Mutation.SetCell.value', index=3, number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -709,14 +707,14 @@ _descriptor.FieldDescriptor( name='family_name', full_name='google.bigtable.v1.Mutation.DeleteFromColumn.family_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='column_qualifier', full_name='google.bigtable.v1.Mutation.DeleteFromColumn.column_qualifier', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -753,7 +751,7 @@ _descriptor.FieldDescriptor( name='family_name', full_name='google.bigtable.v1.Mutation.DeleteFromFamily.family_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -861,21 +859,21 @@ _descriptor.FieldDescriptor( name='family_name', full_name='google.bigtable.v1.ReadModifyWriteRule.family_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='column_qualifier', full_name='google.bigtable.v1.ReadModifyWriteRule.column_qualifier', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='append_value', full_name='google.bigtable.v1.ReadModifyWriteRule.append_value', index=2, number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -1177,8 +1175,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026com.google.bigtable.v1B\021BigtableDataProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\026com.google.bigtable.v1B\021BigtableDataProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/bigtable_service_messages_pb2.py b/gcloud_bigtable/_generated/bigtable_service_messages_pb2.py index c07deac..9b5b5d4 100644 --- a/gcloud_bigtable/_generated/bigtable_service_messages_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_service_messages_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/bigtable/v1/bigtable_service_messages.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -20,7 +18,7 @@ name='google/bigtable/v1/bigtable_service_messages.proto', package='google.bigtable.v1', syntax='proto3', - serialized_pb=_b('\n2google/bigtable/v1/bigtable_service_messages.proto\x12\x12google.bigtable.v1\x1a&google/bigtable/v1/bigtable_data.proto\"\xdc\x01\n\x0fReadRowsRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x11\n\x07row_key\x18\x02 \x01(\x0cH\x00\x12\x31\n\trow_range\x18\x03 \x01(\x0b\x32\x1c.google.bigtable.v1.RowRangeH\x00\x12-\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x1e\n\x16\x61llow_row_interleaving\x18\x06 \x01(\x08\x12\x16\n\x0enum_rows_limit\x18\x07 \x01(\x03\x42\x08\n\x06target\"\xd0\x01\n\x10ReadRowsResponse\x12\x0f\n\x07row_key\x18\x01 \x01(\x0c\x12:\n\x06\x63hunks\x18\x02 \x03(\x0b\x32*.google.bigtable.v1.ReadRowsResponse.Chunk\x1ao\n\x05\x43hunk\x12\x32\n\x0crow_contents\x18\x01 \x01(\x0b\x32\x1a.google.bigtable.v1.FamilyH\x00\x12\x13\n\treset_row\x18\x02 \x01(\x08H\x00\x12\x14\n\ncommit_row\x18\x03 \x01(\x08H\x00\x42\x07\n\x05\x63hunk\"*\n\x14SampleRowKeysRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\">\n\x15SampleRowKeysResponse\x12\x0f\n\x07row_key\x18\x01 \x01(\x0c\x12\x14\n\x0coffset_bytes\x18\x02 \x01(\x03\"h\n\x10MutateRowRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x0f\n\x07row_key\x18\x02 \x01(\x0c\x12/\n\tmutations\x18\x03 \x03(\x0b\x32\x1c.google.bigtable.v1.Mutation\"\xe5\x01\n\x18\x43heckAndMutateRowRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x0f\n\x07row_key\x18\x02 \x01(\x0c\x12\x37\n\x10predicate_filter\x18\x06 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x34\n\x0etrue_mutations\x18\x04 \x03(\x0b\x32\x1c.google.bigtable.v1.Mutation\x12\x35\n\x0f\x66\x61lse_mutations\x18\x05 \x03(\x0b\x32\x1c.google.bigtable.v1.Mutation\"6\n\x19\x43heckAndMutateRowResponse\x12\x19\n\x11predicate_matched\x18\x01 \x01(\x08\"x\n\x19ReadModifyWriteRowRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x0f\n\x07row_key\x18\x02 \x01(\x0c\x12\x36\n\x05rules\x18\x03 \x03(\x0b\x32\'.google.bigtable.v1.ReadModifyWriteRuleB8\n\x16\x63om.google.bigtable.v1B\x1c\x42igtableServiceMessagesProtoP\x01\x62\x06proto3') + serialized_pb=b'\n2google/bigtable/v1/bigtable_service_messages.proto\x12\x12google.bigtable.v1\x1a&google/bigtable/v1/bigtable_data.proto\"\xdc\x01\n\x0fReadRowsRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x11\n\x07row_key\x18\x02 \x01(\x0cH\x00\x12\x31\n\trow_range\x18\x03 \x01(\x0b\x32\x1c.google.bigtable.v1.RowRangeH\x00\x12-\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x1e\n\x16\x61llow_row_interleaving\x18\x06 \x01(\x08\x12\x16\n\x0enum_rows_limit\x18\x07 \x01(\x03\x42\x08\n\x06target\"\xd0\x01\n\x10ReadRowsResponse\x12\x0f\n\x07row_key\x18\x01 \x01(\x0c\x12:\n\x06\x63hunks\x18\x02 \x03(\x0b\x32*.google.bigtable.v1.ReadRowsResponse.Chunk\x1ao\n\x05\x43hunk\x12\x32\n\x0crow_contents\x18\x01 \x01(\x0b\x32\x1a.google.bigtable.v1.FamilyH\x00\x12\x13\n\treset_row\x18\x02 \x01(\x08H\x00\x12\x14\n\ncommit_row\x18\x03 \x01(\x08H\x00\x42\x07\n\x05\x63hunk\"*\n\x14SampleRowKeysRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\">\n\x15SampleRowKeysResponse\x12\x0f\n\x07row_key\x18\x01 \x01(\x0c\x12\x14\n\x0coffset_bytes\x18\x02 \x01(\x03\"h\n\x10MutateRowRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x0f\n\x07row_key\x18\x02 \x01(\x0c\x12/\n\tmutations\x18\x03 \x03(\x0b\x32\x1c.google.bigtable.v1.Mutation\"\xe5\x01\n\x18\x43heckAndMutateRowRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x0f\n\x07row_key\x18\x02 \x01(\x0c\x12\x37\n\x10predicate_filter\x18\x06 \x01(\x0b\x32\x1d.google.bigtable.v1.RowFilter\x12\x34\n\x0etrue_mutations\x18\x04 \x03(\x0b\x32\x1c.google.bigtable.v1.Mutation\x12\x35\n\x0f\x66\x61lse_mutations\x18\x05 \x03(\x0b\x32\x1c.google.bigtable.v1.Mutation\"6\n\x19\x43heckAndMutateRowResponse\x12\x19\n\x11predicate_matched\x18\x01 \x01(\x08\"x\n\x19ReadModifyWriteRowRequest\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x0f\n\x07row_key\x18\x02 \x01(\x0c\x12\x36\n\x05rules\x18\x03 \x03(\x0b\x32\'.google.bigtable.v1.ReadModifyWriteRuleB8\n\x16\x63om.google.bigtable.v1B\x1c\x42igtableServiceMessagesProtoP\x01\x62\x06proto3' , dependencies=[google_dot_bigtable_dot_v1_dot_bigtable__data__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -38,14 +36,14 @@ _descriptor.FieldDescriptor( name='table_name', full_name='google.bigtable.v1.ReadRowsRequest.table_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='row_key', full_name='google.bigtable.v1.ReadRowsRequest.row_key', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -154,7 +152,7 @@ _descriptor.FieldDescriptor( name='row_key', full_name='google.bigtable.v1.ReadRowsResponse.row_key', index=0, number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -192,7 +190,7 @@ _descriptor.FieldDescriptor( name='table_name', full_name='google.bigtable.v1.SampleRowKeysRequest.table_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -223,7 +221,7 @@ _descriptor.FieldDescriptor( name='row_key', full_name='google.bigtable.v1.SampleRowKeysResponse.row_key', index=0, number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -261,14 +259,14 @@ _descriptor.FieldDescriptor( name='table_name', full_name='google.bigtable.v1.MutateRowRequest.table_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='row_key', full_name='google.bigtable.v1.MutateRowRequest.row_key', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -306,14 +304,14 @@ _descriptor.FieldDescriptor( name='table_name', full_name='google.bigtable.v1.CheckAndMutateRowRequest.table_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='row_key', full_name='google.bigtable.v1.CheckAndMutateRowRequest.row_key', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -396,14 +394,14 @@ _descriptor.FieldDescriptor( name='table_name', full_name='google.bigtable.v1.ReadModifyWriteRowRequest.table_name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='row_key', full_name='google.bigtable.v1.ReadModifyWriteRowRequest.row_key', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -530,8 +528,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026com.google.bigtable.v1B\034BigtableServiceMessagesProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\026com.google.bigtable.v1B\034BigtableServiceMessagesProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/bigtable_service_pb2.py b/gcloud_bigtable/_generated/bigtable_service_pb2.py index 4e7e7e4..bd0900f 100644 --- a/gcloud_bigtable/_generated/bigtable_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_service_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/bigtable/v1/bigtable_service.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -23,7 +21,7 @@ name='google/bigtable/v1/bigtable_service.proto', package='google.bigtable.v1', syntax='proto3', - serialized_pb=_b('\n)google/bigtable/v1/bigtable_service.proto\x12\x12google.bigtable.v1\x1a\x1cgoogle/api/annotations.proto\x1a&google/bigtable/v1/bigtable_data.proto\x1a\x32google/bigtable/v1/bigtable_service_messages.proto\x1a\x1bgoogle/protobuf/empty.proto2\xb0\x07\n\x0f\x42igtableService\x12\xa5\x01\n\x08ReadRows\x12#.google.bigtable.v1.ReadRowsRequest\x1a$.google.bigtable.v1.ReadRowsResponse\"L\x82\xd3\xe4\x93\x02\x46\"A/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows:read:\x01*0\x01\x12\xb7\x01\n\rSampleRowKeys\x12(.google.bigtable.v1.SampleRowKeysRequest\x1a).google.bigtable.v1.SampleRowKeysResponse\"O\x82\xd3\xe4\x93\x02I\x12G/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows:sampleKeys0\x01\x12\xa3\x01\n\tMutateRow\x12$.google.bigtable.v1.MutateRowRequest\x1a\x16.google.protobuf.Empty\"X\x82\xd3\xe4\x93\x02R\"M/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:mutate:\x01*\x12\xd2\x01\n\x11\x43heckAndMutateRow\x12,.google.bigtable.v1.CheckAndMutateRowRequest\x1a-.google.bigtable.v1.CheckAndMutateRowResponse\"`\x82\xd3\xe4\x93\x02Z\"U/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:checkAndMutate:\x01*\x12\xbf\x01\n\x12ReadModifyWriteRow\x12-.google.bigtable.v1.ReadModifyWriteRowRequest\x1a\x17.google.bigtable.v1.Row\"a\x82\xd3\xe4\x93\x02[\"V/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:readModifyWrite:\x01*B4\n\x16\x63om.google.bigtable.v1B\x15\x42igtableServicesProtoP\x01\x88\x01\x01\x62\x06proto3') + serialized_pb=b'\n)google/bigtable/v1/bigtable_service.proto\x12\x12google.bigtable.v1\x1a\x1cgoogle/api/annotations.proto\x1a&google/bigtable/v1/bigtable_data.proto\x1a\x32google/bigtable/v1/bigtable_service_messages.proto\x1a\x1bgoogle/protobuf/empty.proto2\xb0\x07\n\x0f\x42igtableService\x12\xa5\x01\n\x08ReadRows\x12#.google.bigtable.v1.ReadRowsRequest\x1a$.google.bigtable.v1.ReadRowsResponse\"L\x82\xd3\xe4\x93\x02\x46\"A/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows:read:\x01*0\x01\x12\xb7\x01\n\rSampleRowKeys\x12(.google.bigtable.v1.SampleRowKeysRequest\x1a).google.bigtable.v1.SampleRowKeysResponse\"O\x82\xd3\xe4\x93\x02I\x12G/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows:sampleKeys0\x01\x12\xa3\x01\n\tMutateRow\x12$.google.bigtable.v1.MutateRowRequest\x1a\x16.google.protobuf.Empty\"X\x82\xd3\xe4\x93\x02R\"M/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:mutate:\x01*\x12\xd2\x01\n\x11\x43heckAndMutateRow\x12,.google.bigtable.v1.CheckAndMutateRowRequest\x1a-.google.bigtable.v1.CheckAndMutateRowResponse\"`\x82\xd3\xe4\x93\x02Z\"U/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:checkAndMutate:\x01*\x12\xbf\x01\n\x12ReadModifyWriteRow\x12-.google.bigtable.v1.ReadModifyWriteRowRequest\x1a\x17.google.bigtable.v1.Row\"a\x82\xd3\xe4\x93\x02[\"V/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:readModifyWrite:\x01*B4\n\x16\x63om.google.bigtable.v1B\x15\x42igtableServicesProtoP\x01\x88\x01\x01\x62\x06proto3' , dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_bigtable_dot_v1_dot_bigtable__data__pb2.DESCRIPTOR,google_dot_bigtable_dot_v1_dot_bigtable__service__messages__pb2.DESCRIPTOR,google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -33,10 +31,13 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026com.google.bigtable.v1B\025BigtableServicesProtoP\001\210\001\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\026com.google.bigtable.v1B\025BigtableServicesProtoP\001\210\001\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities class EarlyAdopterBigtableServiceServicer(object): """""" __metaclass__ = abc.ABCMeta @@ -99,33 +100,33 @@ def early_adopter_create_BigtableService_server(servicer, port, private_key=None import gcloud_bigtable._generated.bigtable_service_messages_pb2 import gcloud_bigtable._generated.bigtable_data_pb2 method_service_descriptions = { - "CheckAndMutateRow": utilities.unary_unary_service_description( + "CheckAndMutateRow": alpha_utilities.unary_unary_service_description( servicer.CheckAndMutateRow, gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowRequest.FromString, gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowResponse.SerializeToString, ), - "MutateRow": utilities.unary_unary_service_description( + "MutateRow": alpha_utilities.unary_unary_service_description( servicer.MutateRow, gcloud_bigtable._generated.bigtable_service_messages_pb2.MutateRowRequest.FromString, gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ), - "ReadModifyWriteRow": utilities.unary_unary_service_description( + "ReadModifyWriteRow": alpha_utilities.unary_unary_service_description( servicer.ReadModifyWriteRow, gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.FromString, gcloud_bigtable._generated.bigtable_data_pb2.Row.SerializeToString, ), - "ReadRows": utilities.unary_stream_service_description( + "ReadRows": alpha_utilities.unary_stream_service_description( servicer.ReadRows, gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsRequest.FromString, gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsResponse.SerializeToString, ), - "SampleRowKeys": utilities.unary_stream_service_description( + "SampleRowKeys": alpha_utilities.unary_stream_service_description( servicer.SampleRowKeys, gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysRequest.FromString, gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysResponse.SerializeToString, ), } - return implementations.server("google.bigtable.v1.BigtableService", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) + return early_adopter_implementations.server("google.bigtable.v1.BigtableService", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) def early_adopter_create_BigtableService_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None): import gcloud_bigtable._generated.bigtable_service_messages_pb2 import gcloud_bigtable._generated.bigtable_service_messages_pb2 @@ -138,26 +139,137 @@ def early_adopter_create_BigtableService_stub(host, port, metadata_transformer=N import gcloud_bigtable._generated.bigtable_service_messages_pb2 import gcloud_bigtable._generated.bigtable_data_pb2 method_invocation_descriptions = { - "CheckAndMutateRow": utilities.unary_unary_invocation_description( + "CheckAndMutateRow": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowRequest.SerializeToString, gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowResponse.FromString, ), - "MutateRow": utilities.unary_unary_invocation_description( + "MutateRow": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_service_messages_pb2.MutateRowRequest.SerializeToString, gcloud_bigtable._generated.empty_pb2.Empty.FromString, ), - "ReadModifyWriteRow": utilities.unary_unary_invocation_description( + "ReadModifyWriteRow": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.SerializeToString, gcloud_bigtable._generated.bigtable_data_pb2.Row.FromString, ), - "ReadRows": utilities.unary_stream_invocation_description( + "ReadRows": alpha_utilities.unary_stream_invocation_description( gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsRequest.SerializeToString, gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsResponse.FromString, ), - "SampleRowKeys": utilities.unary_stream_invocation_description( + "SampleRowKeys": alpha_utilities.unary_stream_invocation_description( gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysRequest.SerializeToString, gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysResponse.FromString, ), } - return implementations.stub("google.bigtable.v1.BigtableService", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + return early_adopter_implementations.stub("google.bigtable.v1.BigtableService", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + +class BetaBigtableServiceServicer(object): + """""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def ReadRows(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def SampleRowKeys(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def MutateRow(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def CheckAndMutateRow(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def ReadModifyWriteRow(self, request, context): + raise NotImplementedError() + +class BetaBigtableServiceStub(object): + """The interface to which stubs will conform.""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def ReadRows(self, request, timeout): + raise NotImplementedError() + @abc.abstractmethod + def SampleRowKeys(self, request, timeout): + raise NotImplementedError() + @abc.abstractmethod + def MutateRow(self, request, timeout): + raise NotImplementedError() + MutateRow.future = None + @abc.abstractmethod + def CheckAndMutateRow(self, request, timeout): + raise NotImplementedError() + CheckAndMutateRow.future = None + @abc.abstractmethod + def ReadModifyWriteRow(self, request, timeout): + raise NotImplementedError() + ReadModifyWriteRow.future = None + +def beta_create_BigtableService_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None): + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_data_pb2 + request_deserializers = { + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowRequest.FromString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.MutateRowRequest.FromString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.FromString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsRequest.FromString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysRequest.FromString, + } + response_serializers = { + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowResponse.SerializeToString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_data_pb2.Row.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsResponse.SerializeToString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysResponse.SerializeToString, + } + method_implementations = { + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): face_utilities.unary_unary_inline(servicer.CheckAndMutateRow), + ('google.bigtable.v1.BigtableService', 'MutateRow'): face_utilities.unary_unary_inline(servicer.MutateRow), + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): face_utilities.unary_unary_inline(servicer.ReadModifyWriteRow), + ('google.bigtable.v1.BigtableService', 'ReadRows'): face_utilities.unary_stream_inline(servicer.ReadRows), + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): face_utilities.unary_stream_inline(servicer.SampleRowKeys), + } + server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout) + return beta_implementations.server(method_implementations, options=server_options) + +def beta_create_BigtableService_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None): + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_data_pb2 + request_serializers = { + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.MutateRowRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysRequest.SerializeToString, + } + response_deserializers = { + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowResponse.FromString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_data_pb2.Row.FromString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsResponse.FromString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysResponse.FromString, + } + cardinalities = { + 'CheckAndMutateRow': cardinality.Cardinality.UNARY_UNARY, + 'MutateRow': cardinality.Cardinality.UNARY_UNARY, + 'ReadModifyWriteRow': cardinality.Cardinality.UNARY_UNARY, + 'ReadRows': cardinality.Cardinality.UNARY_STREAM, + 'SampleRowKeys': cardinality.Cardinality.UNARY_STREAM, + } + stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size) + return beta_implementations.dynamic_stub(channel, 'google.bigtable.v1.BigtableService', cardinalities, options=stub_options) # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/bigtable_table_data_pb2.py b/gcloud_bigtable/_generated/bigtable_table_data_pb2.py index 22cc067..5cbc242 100644 --- a/gcloud_bigtable/_generated/bigtable_table_data_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_table_data_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/bigtable/admin/table/v1/bigtable_table_data.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -21,7 +19,7 @@ name='google/bigtable/admin/table/v1/bigtable_table_data.proto', package='google.bigtable.admin.table.v1', syntax='proto3', - serialized_pb=_b('\n8google/bigtable/admin/table/v1/bigtable_table_data.proto\x12\x1egoogle.bigtable.admin.table.v1\x1a#google/longrunning/operations.proto\x1a\x1egoogle/protobuf/duration.proto\"\xfd\x02\n\x05Table\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x38\n\x11\x63urrent_operation\x18\x02 \x01(\x0b\x32\x1d.google.longrunning.Operation\x12R\n\x0f\x63olumn_families\x18\x03 \x03(\x0b\x32\x39.google.bigtable.admin.table.v1.Table.ColumnFamiliesEntry\x12O\n\x0bgranularity\x18\x04 \x01(\x0e\x32:.google.bigtable.admin.table.v1.Table.TimestampGranularity\x1a\x63\n\x13\x43olumnFamiliesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12;\n\x05value\x18\x02 \x01(\x0b\x32,.google.bigtable.admin.table.v1.ColumnFamily:\x02\x38\x01\"\"\n\x14TimestampGranularity\x12\n\n\x06MILLIS\x10\x00\"l\n\x0c\x43olumnFamily\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rgc_expression\x18\x02 \x01(\t\x12\x37\n\x07gc_rule\x18\x03 \x01(\x0b\x32&.google.bigtable.admin.table.v1.GcRule\"\xed\x02\n\x06GcRule\x12\x1a\n\x10max_num_versions\x18\x01 \x01(\x05H\x00\x12,\n\x07max_age\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12K\n\x0cintersection\x18\x03 \x01(\x0b\x32\x33.google.bigtable.admin.table.v1.GcRule.IntersectionH\x00\x12=\n\x05union\x18\x04 \x01(\x0b\x32,.google.bigtable.admin.table.v1.GcRule.UnionH\x00\x1a\x45\n\x0cIntersection\x12\x35\n\x05rules\x18\x01 \x03(\x0b\x32&.google.bigtable.admin.table.v1.GcRule\x1a>\n\x05Union\x12\x35\n\x05rules\x18\x01 \x03(\x0b\x32&.google.bigtable.admin.table.v1.GcRuleB\x06\n\x04ruleB>\n\"com.google.bigtable.admin.table.v1B\x16\x42igtableTableDataProtoP\x01\x62\x06proto3') + serialized_pb=b'\n8google/bigtable/admin/table/v1/bigtable_table_data.proto\x12\x1egoogle.bigtable.admin.table.v1\x1a#google/longrunning/operations.proto\x1a\x1egoogle/protobuf/duration.proto\"\xfd\x02\n\x05Table\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x38\n\x11\x63urrent_operation\x18\x02 \x01(\x0b\x32\x1d.google.longrunning.Operation\x12R\n\x0f\x63olumn_families\x18\x03 \x03(\x0b\x32\x39.google.bigtable.admin.table.v1.Table.ColumnFamiliesEntry\x12O\n\x0bgranularity\x18\x04 \x01(\x0e\x32:.google.bigtable.admin.table.v1.Table.TimestampGranularity\x1a\x63\n\x13\x43olumnFamiliesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12;\n\x05value\x18\x02 \x01(\x0b\x32,.google.bigtable.admin.table.v1.ColumnFamily:\x02\x38\x01\"\"\n\x14TimestampGranularity\x12\n\n\x06MILLIS\x10\x00\"l\n\x0c\x43olumnFamily\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rgc_expression\x18\x02 \x01(\t\x12\x37\n\x07gc_rule\x18\x03 \x01(\x0b\x32&.google.bigtable.admin.table.v1.GcRule\"\xed\x02\n\x06GcRule\x12\x1a\n\x10max_num_versions\x18\x01 \x01(\x05H\x00\x12,\n\x07max_age\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00\x12K\n\x0cintersection\x18\x03 \x01(\x0b\x32\x33.google.bigtable.admin.table.v1.GcRule.IntersectionH\x00\x12=\n\x05union\x18\x04 \x01(\x0b\x32,.google.bigtable.admin.table.v1.GcRule.UnionH\x00\x1a\x45\n\x0cIntersection\x12\x35\n\x05rules\x18\x01 \x03(\x0b\x32&.google.bigtable.admin.table.v1.GcRule\x1a>\n\x05Union\x12\x35\n\x05rules\x18\x01 \x03(\x0b\x32&.google.bigtable.admin.table.v1.GcRuleB\x06\n\x04ruleB>\n\"com.google.bigtable.admin.table.v1B\x16\x42igtableTableDataProtoP\x01\x62\x06proto3' , dependencies=[google_dot_longrunning_dot_operations__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -57,7 +55,7 @@ _descriptor.FieldDescriptor( name='key', full_name='google.bigtable.admin.table.v1.Table.ColumnFamiliesEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -74,7 +72,7 @@ nested_types=[], enum_types=[ ], - options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')), + options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), b'8\001'), is_extendable=False, syntax='proto3', extension_ranges=[], @@ -94,7 +92,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.Table.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -147,14 +145,14 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.ColumnFamily.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='gc_expression', full_name='google.bigtable.admin.table.v1.ColumnFamily.gc_expression', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -373,10 +371,13 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"com.google.bigtable.admin.table.v1B\026BigtableTableDataProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\"com.google.bigtable.admin.table.v1B\026BigtableTableDataProtoP\001') _TABLE_COLUMNFAMILIESENTRY.has_options = True -_TABLE_COLUMNFAMILIESENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) +_TABLE_COLUMNFAMILIESENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), b'8\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/bigtable_table_service_messages_pb2.py b/gcloud_bigtable/_generated/bigtable_table_service_messages_pb2.py index 30d8703..245a0f0 100644 --- a/gcloud_bigtable/_generated/bigtable_table_service_messages_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_table_service_messages_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/bigtable/admin/table/v1/bigtable_table_service_messages.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -20,7 +18,7 @@ name='google/bigtable/admin/table/v1/bigtable_table_service_messages.proto', package='google.bigtable.admin.table.v1', syntax='proto3', - serialized_pb=_b('\nDgoogle/bigtable/admin/table/v1/bigtable_table_service_messages.proto\x12\x1egoogle.bigtable.admin.table.v1\x1a\x38google/bigtable/admin/table/v1/bigtable_table_data.proto\"\x86\x01\n\x12\x43reateTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08table_id\x18\x02 \x01(\t\x12\x34\n\x05table\x18\x03 \x01(\x0b\x32%.google.bigtable.admin.table.v1.Table\x12\x1a\n\x12initial_split_keys\x18\x04 \x03(\t\"!\n\x11ListTablesRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"K\n\x12ListTablesResponse\x12\x35\n\x06tables\x18\x01 \x03(\x0b\x32%.google.bigtable.admin.table.v1.Table\"\x1f\n\x0fGetTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\"\n\x12\x44\x65leteTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"2\n\x12RenameTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06new_id\x18\x02 \x01(\t\"\x88\x01\n\x19\x43reateColumnFamilyRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_family_id\x18\x02 \x01(\t\x12\x43\n\rcolumn_family\x18\x03 \x01(\x0b\x32,.google.bigtable.admin.table.v1.ColumnFamily\")\n\x19\x44\x65leteColumnFamilyRequest\x12\x0c\n\x04name\x18\x01 \x01(\tBI\n\"com.google.bigtable.admin.table.v1B!BigtableTableServiceMessagesProtoP\x01\x62\x06proto3') + serialized_pb=b'\nDgoogle/bigtable/admin/table/v1/bigtable_table_service_messages.proto\x12\x1egoogle.bigtable.admin.table.v1\x1a\x38google/bigtable/admin/table/v1/bigtable_table_data.proto\"\x86\x01\n\x12\x43reateTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08table_id\x18\x02 \x01(\t\x12\x34\n\x05table\x18\x03 \x01(\x0b\x32%.google.bigtable.admin.table.v1.Table\x12\x1a\n\x12initial_split_keys\x18\x04 \x03(\t\"!\n\x11ListTablesRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"K\n\x12ListTablesResponse\x12\x35\n\x06tables\x18\x01 \x03(\x0b\x32%.google.bigtable.admin.table.v1.Table\"\x1f\n\x0fGetTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\"\n\x12\x44\x65leteTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"2\n\x12RenameTableRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06new_id\x18\x02 \x01(\t\"\x88\x01\n\x19\x43reateColumnFamilyRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x18\n\x10\x63olumn_family_id\x18\x02 \x01(\t\x12\x43\n\rcolumn_family\x18\x03 \x01(\x0b\x32,.google.bigtable.admin.table.v1.ColumnFamily\")\n\x19\x44\x65leteColumnFamilyRequest\x12\x0c\n\x04name\x18\x01 \x01(\tBI\n\"com.google.bigtable.admin.table.v1B!BigtableTableServiceMessagesProtoP\x01\x62\x06proto3' , dependencies=[google_dot_bigtable_dot_admin_dot_table_dot_v1_dot_bigtable__table__data__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -38,14 +36,14 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.CreateTableRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='table_id', full_name='google.bigtable.admin.table.v1.CreateTableRequest.table_id', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -90,7 +88,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.ListTablesRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -152,7 +150,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.GetTableRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -183,7 +181,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.DeleteTableRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -214,14 +212,14 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.RenameTableRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='new_id', full_name='google.bigtable.admin.table.v1.RenameTableRequest.new_id', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -252,14 +250,14 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.CreateColumnFamilyRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='column_family_id', full_name='google.bigtable.admin.table.v1.CreateColumnFamilyRequest.column_family_id', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -297,7 +295,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.bigtable.admin.table.v1.DeleteColumnFamilyRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -387,8 +385,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"com.google.bigtable.admin.table.v1B!BigtableTableServiceMessagesProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\"com.google.bigtable.admin.table.v1B!BigtableTableServiceMessagesProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/bigtable_table_service_pb2.py b/gcloud_bigtable/_generated/bigtable_table_service_pb2.py index 5dbf54e..4567385 100644 --- a/gcloud_bigtable/_generated/bigtable_table_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_table_service_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/bigtable/admin/table/v1/bigtable_table_service.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -23,7 +21,7 @@ name='google/bigtable/admin/table/v1/bigtable_table_service.proto', package='google.bigtable.admin.table.v1', syntax='proto3', - serialized_pb=_b('\n;google/bigtable/admin/table/v1/bigtable_table_service.proto\x12\x1egoogle.bigtable.admin.table.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x38google/bigtable/admin/table/v1/bigtable_table_data.proto\x1a\x44google/bigtable/admin/table/v1/bigtable_table_service_messages.proto\x1a\x1bgoogle/protobuf/empty.proto2\x89\x0b\n\x14\x42igtableTableService\x12\xa4\x01\n\x0b\x43reateTable\x12\x32.google.bigtable.admin.table.v1.CreateTableRequest\x1a%.google.bigtable.admin.table.v1.Table\":\x82\xd3\xe4\x93\x02\x34\"//v1/{name=projects/*/zones/*/clusters/*}/tables:\x01*\x12\xac\x01\n\nListTables\x12\x31.google.bigtable.admin.table.v1.ListTablesRequest\x1a\x32.google.bigtable.admin.table.v1.ListTablesResponse\"7\x82\xd3\xe4\x93\x02\x31\x12//v1/{name=projects/*/zones/*/clusters/*}/tables\x12\x9d\x01\n\x08GetTable\x12/.google.bigtable.admin.table.v1.GetTableRequest\x1a%.google.bigtable.admin.table.v1.Table\"9\x82\xd3\xe4\x93\x02\x33\x12\x31/v1/{name=projects/*/zones/*/clusters/*/tables/*}\x12\x94\x01\n\x0b\x44\x65leteTable\x12\x32.google.bigtable.admin.table.v1.DeleteTableRequest\x1a\x16.google.protobuf.Empty\"9\x82\xd3\xe4\x93\x02\x33*1/v1/{name=projects/*/zones/*/clusters/*/tables/*}\x12\x9e\x01\n\x0bRenameTable\x12\x32.google.bigtable.admin.table.v1.RenameTableRequest\x1a\x16.google.protobuf.Empty\"C\x82\xd3\xe4\x93\x02=\"8/v1/{name=projects/*/zones/*/clusters/*/tables/*}:rename:\x01*\x12\xca\x01\n\x12\x43reateColumnFamily\x12\x39.google.bigtable.admin.table.v1.CreateColumnFamilyRequest\x1a,.google.bigtable.admin.table.v1.ColumnFamily\"K\x82\xd3\xe4\x93\x02\x45\"@/v1/{name=projects/*/zones/*/clusters/*/tables/*}/columnFamilies:\x01*\x12\xbf\x01\n\x12UpdateColumnFamily\x12,.google.bigtable.admin.table.v1.ColumnFamily\x1a,.google.bigtable.admin.table.v1.ColumnFamily\"M\x82\xd3\xe4\x93\x02G\x1a\x42/v1/{name=projects/*/zones/*/clusters/*/tables/*/columnFamilies/*}:\x01*\x12\xb3\x01\n\x12\x44\x65leteColumnFamily\x12\x39.google.bigtable.admin.table.v1.DeleteColumnFamilyRequest\x1a\x16.google.protobuf.Empty\"J\x82\xd3\xe4\x93\x02\x44*B/v1/{name=projects/*/zones/*/clusters/*/tables/*/columnFamilies/*}BB\n\"com.google.bigtable.admin.table.v1B\x1a\x42igtableTableServicesProtoP\x01\x62\x06proto3') + serialized_pb=b'\n;google/bigtable/admin/table/v1/bigtable_table_service.proto\x12\x1egoogle.bigtable.admin.table.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x38google/bigtable/admin/table/v1/bigtable_table_data.proto\x1a\x44google/bigtable/admin/table/v1/bigtable_table_service_messages.proto\x1a\x1bgoogle/protobuf/empty.proto2\x89\x0b\n\x14\x42igtableTableService\x12\xa4\x01\n\x0b\x43reateTable\x12\x32.google.bigtable.admin.table.v1.CreateTableRequest\x1a%.google.bigtable.admin.table.v1.Table\":\x82\xd3\xe4\x93\x02\x34\"//v1/{name=projects/*/zones/*/clusters/*}/tables:\x01*\x12\xac\x01\n\nListTables\x12\x31.google.bigtable.admin.table.v1.ListTablesRequest\x1a\x32.google.bigtable.admin.table.v1.ListTablesResponse\"7\x82\xd3\xe4\x93\x02\x31\x12//v1/{name=projects/*/zones/*/clusters/*}/tables\x12\x9d\x01\n\x08GetTable\x12/.google.bigtable.admin.table.v1.GetTableRequest\x1a%.google.bigtable.admin.table.v1.Table\"9\x82\xd3\xe4\x93\x02\x33\x12\x31/v1/{name=projects/*/zones/*/clusters/*/tables/*}\x12\x94\x01\n\x0b\x44\x65leteTable\x12\x32.google.bigtable.admin.table.v1.DeleteTableRequest\x1a\x16.google.protobuf.Empty\"9\x82\xd3\xe4\x93\x02\x33*1/v1/{name=projects/*/zones/*/clusters/*/tables/*}\x12\x9e\x01\n\x0bRenameTable\x12\x32.google.bigtable.admin.table.v1.RenameTableRequest\x1a\x16.google.protobuf.Empty\"C\x82\xd3\xe4\x93\x02=\"8/v1/{name=projects/*/zones/*/clusters/*/tables/*}:rename:\x01*\x12\xca\x01\n\x12\x43reateColumnFamily\x12\x39.google.bigtable.admin.table.v1.CreateColumnFamilyRequest\x1a,.google.bigtable.admin.table.v1.ColumnFamily\"K\x82\xd3\xe4\x93\x02\x45\"@/v1/{name=projects/*/zones/*/clusters/*/tables/*}/columnFamilies:\x01*\x12\xbf\x01\n\x12UpdateColumnFamily\x12,.google.bigtable.admin.table.v1.ColumnFamily\x1a,.google.bigtable.admin.table.v1.ColumnFamily\"M\x82\xd3\xe4\x93\x02G\x1a\x42/v1/{name=projects/*/zones/*/clusters/*/tables/*/columnFamilies/*}:\x01*\x12\xb3\x01\n\x12\x44\x65leteColumnFamily\x12\x39.google.bigtable.admin.table.v1.DeleteColumnFamilyRequest\x1a\x16.google.protobuf.Empty\"J\x82\xd3\xe4\x93\x02\x44*B/v1/{name=projects/*/zones/*/clusters/*/tables/*/columnFamilies/*}BB\n\"com.google.bigtable.admin.table.v1B\x1a\x42igtableTableServicesProtoP\x01\x62\x06proto3' , dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_bigtable_dot_admin_dot_table_dot_v1_dot_bigtable__table__data__pb2.DESCRIPTOR,google_dot_bigtable_dot_admin_dot_table_dot_v1_dot_bigtable__table__service__messages__pb2.DESCRIPTOR,google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -33,10 +31,13 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"com.google.bigtable.admin.table.v1B\032BigtableTableServicesProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\"com.google.bigtable.admin.table.v1B\032BigtableTableServicesProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities class EarlyAdopterBigtableTableServiceServicer(object): """""" __metaclass__ = abc.ABCMeta @@ -126,48 +127,48 @@ def early_adopter_create_BigtableTableService_server(servicer, port, private_key import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 import gcloud_bigtable._generated.empty_pb2 method_service_descriptions = { - "CreateColumnFamily": utilities.unary_unary_service_description( + "CreateColumnFamily": alpha_utilities.unary_unary_service_description( servicer.CreateColumnFamily, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.FromString, gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.SerializeToString, ), - "CreateTable": utilities.unary_unary_service_description( + "CreateTable": alpha_utilities.unary_unary_service_description( servicer.CreateTable, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateTableRequest.FromString, gcloud_bigtable._generated.bigtable_table_data_pb2.Table.SerializeToString, ), - "DeleteColumnFamily": utilities.unary_unary_service_description( + "DeleteColumnFamily": alpha_utilities.unary_unary_service_description( servicer.DeleteColumnFamily, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.FromString, gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ), - "DeleteTable": utilities.unary_unary_service_description( + "DeleteTable": alpha_utilities.unary_unary_service_description( servicer.DeleteTable, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteTableRequest.FromString, gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ), - "GetTable": utilities.unary_unary_service_description( + "GetTable": alpha_utilities.unary_unary_service_description( servicer.GetTable, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.GetTableRequest.FromString, gcloud_bigtable._generated.bigtable_table_data_pb2.Table.SerializeToString, ), - "ListTables": utilities.unary_unary_service_description( + "ListTables": alpha_utilities.unary_unary_service_description( servicer.ListTables, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesRequest.FromString, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesResponse.SerializeToString, ), - "RenameTable": utilities.unary_unary_service_description( + "RenameTable": alpha_utilities.unary_unary_service_description( servicer.RenameTable, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.RenameTableRequest.FromString, gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ), - "UpdateColumnFamily": utilities.unary_unary_service_description( + "UpdateColumnFamily": alpha_utilities.unary_unary_service_description( servicer.UpdateColumnFamily, gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.FromString, gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.SerializeToString, ), } - return implementations.server("google.bigtable.admin.table.v1.BigtableTableService", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) + return early_adopter_implementations.server("google.bigtable.admin.table.v1.BigtableTableService", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) def early_adopter_create_BigtableTableService_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None): import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 import gcloud_bigtable._generated.bigtable_table_data_pb2 @@ -186,38 +187,202 @@ def early_adopter_create_BigtableTableService_stub(host, port, metadata_transfor import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 import gcloud_bigtable._generated.empty_pb2 method_invocation_descriptions = { - "CreateColumnFamily": utilities.unary_unary_invocation_description( + "CreateColumnFamily": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.SerializeToString, gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.FromString, ), - "CreateTable": utilities.unary_unary_invocation_description( + "CreateTable": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateTableRequest.SerializeToString, gcloud_bigtable._generated.bigtable_table_data_pb2.Table.FromString, ), - "DeleteColumnFamily": utilities.unary_unary_invocation_description( + "DeleteColumnFamily": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.SerializeToString, gcloud_bigtable._generated.empty_pb2.Empty.FromString, ), - "DeleteTable": utilities.unary_unary_invocation_description( + "DeleteTable": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteTableRequest.SerializeToString, gcloud_bigtable._generated.empty_pb2.Empty.FromString, ), - "GetTable": utilities.unary_unary_invocation_description( + "GetTable": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_service_messages_pb2.GetTableRequest.SerializeToString, gcloud_bigtable._generated.bigtable_table_data_pb2.Table.FromString, ), - "ListTables": utilities.unary_unary_invocation_description( + "ListTables": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesRequest.SerializeToString, gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesResponse.FromString, ), - "RenameTable": utilities.unary_unary_invocation_description( + "RenameTable": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_service_messages_pb2.RenameTableRequest.SerializeToString, gcloud_bigtable._generated.empty_pb2.Empty.FromString, ), - "UpdateColumnFamily": utilities.unary_unary_invocation_description( + "UpdateColumnFamily": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.SerializeToString, gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.FromString, ), } - return implementations.stub("google.bigtable.admin.table.v1.BigtableTableService", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + return early_adopter_implementations.stub("google.bigtable.admin.table.v1.BigtableTableService", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + +class BetaBigtableTableServiceServicer(object): + """""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def CreateTable(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def ListTables(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def GetTable(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def DeleteTable(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def RenameTable(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def CreateColumnFamily(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def UpdateColumnFamily(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def DeleteColumnFamily(self, request, context): + raise NotImplementedError() + +class BetaBigtableTableServiceStub(object): + """The interface to which stubs will conform.""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def CreateTable(self, request, timeout): + raise NotImplementedError() + CreateTable.future = None + @abc.abstractmethod + def ListTables(self, request, timeout): + raise NotImplementedError() + ListTables.future = None + @abc.abstractmethod + def GetTable(self, request, timeout): + raise NotImplementedError() + GetTable.future = None + @abc.abstractmethod + def DeleteTable(self, request, timeout): + raise NotImplementedError() + DeleteTable.future = None + @abc.abstractmethod + def RenameTable(self, request, timeout): + raise NotImplementedError() + RenameTable.future = None + @abc.abstractmethod + def CreateColumnFamily(self, request, timeout): + raise NotImplementedError() + CreateColumnFamily.future = None + @abc.abstractmethod + def UpdateColumnFamily(self, request, timeout): + raise NotImplementedError() + UpdateColumnFamily.future = None + @abc.abstractmethod + def DeleteColumnFamily(self, request, timeout): + raise NotImplementedError() + DeleteColumnFamily.future = None + +def beta_create_BigtableTableService_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None): + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + request_deserializers = { + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.GetTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.RenameTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, + } + response_serializers = { + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesResponse.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, + } + method_implementations = { + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): face_utilities.unary_unary_inline(servicer.CreateColumnFamily), + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): face_utilities.unary_unary_inline(servicer.CreateTable), + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): face_utilities.unary_unary_inline(servicer.DeleteColumnFamily), + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): face_utilities.unary_unary_inline(servicer.DeleteTable), + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): face_utilities.unary_unary_inline(servicer.GetTable), + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): face_utilities.unary_unary_inline(servicer.ListTables), + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): face_utilities.unary_unary_inline(servicer.RenameTable), + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): face_utilities.unary_unary_inline(servicer.UpdateColumnFamily), + } + server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout) + return beta_implementations.server(method_implementations, options=server_options) + +def beta_create_BigtableTableService_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None): + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_data_pb2 + import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 + import gcloud_bigtable._generated.empty_pb2 + request_serializers = { + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.GetTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.RenameTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, + } + response_deserializers = { + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesResponse.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, + } + cardinalities = { + 'CreateColumnFamily': cardinality.Cardinality.UNARY_UNARY, + 'CreateTable': cardinality.Cardinality.UNARY_UNARY, + 'DeleteColumnFamily': cardinality.Cardinality.UNARY_UNARY, + 'DeleteTable': cardinality.Cardinality.UNARY_UNARY, + 'GetTable': cardinality.Cardinality.UNARY_UNARY, + 'ListTables': cardinality.Cardinality.UNARY_UNARY, + 'RenameTable': cardinality.Cardinality.UNARY_UNARY, + 'UpdateColumnFamily': cardinality.Cardinality.UNARY_UNARY, + } + stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size) + return beta_implementations.dynamic_stub(channel, 'google.bigtable.admin.table.v1.BigtableTableService', cardinalities, options=stub_options) # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/duration_pb2.py b/gcloud_bigtable/_generated/duration_pb2.py index 7be5b3c..ddb81a7 100644 --- a/gcloud_bigtable/_generated/duration_pb2.py +++ b/gcloud_bigtable/_generated/duration_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/protobuf/duration.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -19,7 +17,7 @@ name='google/protobuf/duration.proto', package='google.protobuf', syntax='proto3', - serialized_pb=_b('\n\x1egoogle/protobuf/duration.proto\x12\x0fgoogle.protobuf\"*\n\x08\x44uration\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\x42)\n\x13\x63om.google.protobufB\rDurationProtoP\x01\xa0\x01\x01\x62\x06proto3') + serialized_pb=b'\n\x1egoogle/protobuf/duration.proto\x12\x0fgoogle.protobuf\"*\n\x08\x44uration\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\x42)\n\x13\x63om.google.protobufB\rDurationProtoP\x01\xa0\x01\x01\x62\x06proto3' ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -74,8 +72,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\rDurationProtoP\001\240\001\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\023com.google.protobufB\rDurationProtoP\001\240\001\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/empty_pb2.py b/gcloud_bigtable/_generated/empty_pb2.py index 976dfb9..701a9a6 100644 --- a/gcloud_bigtable/_generated/empty_pb2.py +++ b/gcloud_bigtable/_generated/empty_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/protobuf/empty.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -19,7 +17,7 @@ name='google/protobuf/empty.proto', package='google.protobuf', syntax='proto3', - serialized_pb=_b('\n\x1bgoogle/protobuf/empty.proto\x12\x0fgoogle.protobuf\"\x07\n\x05\x45mptyB#\n\x13\x63om.google.protobufB\nEmptyProtoP\x01\x62\x06proto3') + serialized_pb=b'\n\x1bgoogle/protobuf/empty.proto\x12\x0fgoogle.protobuf\"\x07\n\x05\x45mptyB#\n\x13\x63om.google.protobufB\nEmptyProtoP\x01\x62\x06proto3' ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -60,8 +58,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\nEmptyProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\023com.google.protobufB\nEmptyProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/http_pb2.py b/gcloud_bigtable/_generated/http_pb2.py index f755e4c..44885b8 100644 --- a/gcloud_bigtable/_generated/http_pb2.py +++ b/gcloud_bigtable/_generated/http_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/api/http.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -19,7 +17,7 @@ name='google/api/http.proto', package='google.api', syntax='proto3', - serialized_pb=_b('\n\x15google/api/http.proto\x12\ngoogle.api\"\xd8\x01\n\x08HttpRule\x12\r\n\x03get\x18\x02 \x01(\tH\x00\x12\r\n\x03put\x18\x03 \x01(\tH\x00\x12\x0e\n\x04post\x18\x04 \x01(\tH\x00\x12\x10\n\x06\x64\x65lete\x18\x05 \x01(\tH\x00\x12\x0f\n\x05patch\x18\x06 \x01(\tH\x00\x12/\n\x06\x63ustom\x18\x08 \x01(\x0b\x32\x1d.google.api.CustomHttpPatternH\x00\x12\x0c\n\x04\x62ody\x18\x07 \x01(\t\x12\x31\n\x13\x61\x64\x64itional_bindings\x18\x0b \x03(\x0b\x32\x14.google.api.HttpRuleB\t\n\x07pattern\"/\n\x11\x43ustomHttpPattern\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\tB\x1d\n\x0e\x63om.google.apiB\tHttpProtoP\x01\x62\x06proto3') + serialized_pb=b'\n\x15google/api/http.proto\x12\ngoogle.api\"\xd8\x01\n\x08HttpRule\x12\r\n\x03get\x18\x02 \x01(\tH\x00\x12\r\n\x03put\x18\x03 \x01(\tH\x00\x12\x0e\n\x04post\x18\x04 \x01(\tH\x00\x12\x10\n\x06\x64\x65lete\x18\x05 \x01(\tH\x00\x12\x0f\n\x05patch\x18\x06 \x01(\tH\x00\x12/\n\x06\x63ustom\x18\x08 \x01(\x0b\x32\x1d.google.api.CustomHttpPatternH\x00\x12\x0c\n\x04\x62ody\x18\x07 \x01(\t\x12\x31\n\x13\x61\x64\x64itional_bindings\x18\x0b \x03(\x0b\x32\x14.google.api.HttpRuleB\t\n\x07pattern\"/\n\x11\x43ustomHttpPattern\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\tB\x1d\n\x0e\x63om.google.apiB\tHttpProtoP\x01\x62\x06proto3' ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -36,35 +34,35 @@ _descriptor.FieldDescriptor( name='get', full_name='google.api.HttpRule.get', index=0, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='put', full_name='google.api.HttpRule.put', index=1, number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='post', full_name='google.api.HttpRule.post', index=2, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='delete', full_name='google.api.HttpRule.delete', index=3, number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='patch', full_name='google.api.HttpRule.patch', index=4, number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -78,7 +76,7 @@ _descriptor.FieldDescriptor( name='body', full_name='google.api.HttpRule.body', index=6, number=7, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -119,14 +117,14 @@ _descriptor.FieldDescriptor( name='kind', full_name='google.api.CustomHttpPattern.kind', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='path', full_name='google.api.CustomHttpPattern.path', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -185,8 +183,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\016com.google.apiB\tHttpProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\016com.google.apiB\tHttpProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/operations_pb2.py b/gcloud_bigtable/_generated/operations_pb2.py index b31048c..adbe718 100644 --- a/gcloud_bigtable/_generated/operations_pb2.py +++ b/gcloud_bigtable/_generated/operations_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/longrunning/operations.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -23,7 +21,7 @@ name='google/longrunning/operations.proto', package='google.longrunning', syntax='proto3', - serialized_pb=_b('\n#google/longrunning/operations.proto\x12\x12google.longrunning\x1a\x1cgoogle/api/annotations.proto\x1a\x19google/protobuf/any.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x17google/rpc/status.proto\"\xa8\x01\n\tOperation\x12\x0c\n\x04name\x18\x01 \x01(\t\x12&\n\x08metadata\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04\x64one\x18\x03 \x01(\x08\x12#\n\x05\x65rror\x18\x04 \x01(\x0b\x32\x12.google.rpc.StatusH\x00\x12(\n\x08response\x18\x05 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x42\x08\n\x06result\"#\n\x13GetOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\\\n\x15ListOperationsRequest\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x01 \x01(\t\x12\x11\n\tpage_size\x18\x02 \x01(\x05\x12\x12\n\npage_token\x18\x03 \x01(\t\"d\n\x16ListOperationsResponse\x12\x31\n\noperations\x18\x01 \x03(\x0b\x32\x1d.google.longrunning.Operation\x12\x17\n\x0fnext_page_token\x18\x02 \x01(\t\"&\n\x16\x43\x61ncelOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"&\n\x16\x44\x65leteOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t2\x8c\x04\n\nOperations\x12x\n\x0cGetOperation\x12\'.google.longrunning.GetOperationRequest\x1a\x1d.google.longrunning.Operation\" \x82\xd3\xe4\x93\x02\x1a\x12\x18/v1/{name=operations/**}\x12\x86\x01\n\x0eListOperations\x12).google.longrunning.ListOperationsRequest\x1a*.google.longrunning.ListOperationsResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/v1/{name=operations}\x12\x81\x01\n\x0f\x43\x61ncelOperation\x12*.google.longrunning.CancelOperationRequest\x1a\x16.google.protobuf.Empty\"*\x82\xd3\xe4\x93\x02$\"\x1f/v1/{name=operations/**}:cancel:\x01*\x12w\n\x0f\x44\x65leteOperation\x12*.google.longrunning.DeleteOperationRequest\x1a\x16.google.protobuf.Empty\" \x82\xd3\xe4\x93\x02\x1a*\x18/v1/{name=operations/**}B+\n\x16\x63om.google.longrunningB\x0fOperationsProtoP\x01\x62\x06proto3') + serialized_pb=b'\n#google/longrunning/operations.proto\x12\x12google.longrunning\x1a\x1cgoogle/api/annotations.proto\x1a\x19google/protobuf/any.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x17google/rpc/status.proto\"\xa8\x01\n\tOperation\x12\x0c\n\x04name\x18\x01 \x01(\t\x12&\n\x08metadata\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04\x64one\x18\x03 \x01(\x08\x12#\n\x05\x65rror\x18\x04 \x01(\x0b\x32\x12.google.rpc.StatusH\x00\x12(\n\x08response\x18\x05 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x42\x08\n\x06result\"#\n\x13GetOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\\\n\x15ListOperationsRequest\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x01 \x01(\t\x12\x11\n\tpage_size\x18\x02 \x01(\x05\x12\x12\n\npage_token\x18\x03 \x01(\t\"d\n\x16ListOperationsResponse\x12\x31\n\noperations\x18\x01 \x03(\x0b\x32\x1d.google.longrunning.Operation\x12\x17\n\x0fnext_page_token\x18\x02 \x01(\t\"&\n\x16\x43\x61ncelOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"&\n\x16\x44\x65leteOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t2\x8c\x04\n\nOperations\x12x\n\x0cGetOperation\x12\'.google.longrunning.GetOperationRequest\x1a\x1d.google.longrunning.Operation\" \x82\xd3\xe4\x93\x02\x1a\x12\x18/v1/{name=operations/**}\x12\x86\x01\n\x0eListOperations\x12).google.longrunning.ListOperationsRequest\x1a*.google.longrunning.ListOperationsResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/v1/{name=operations}\x12\x81\x01\n\x0f\x43\x61ncelOperation\x12*.google.longrunning.CancelOperationRequest\x1a\x16.google.protobuf.Empty\"*\x82\xd3\xe4\x93\x02$\"\x1f/v1/{name=operations/**}:cancel:\x01*\x12w\n\x0f\x44\x65leteOperation\x12*.google.longrunning.DeleteOperationRequest\x1a\x16.google.protobuf.Empty\" \x82\xd3\xe4\x93\x02\x1a*\x18/v1/{name=operations/**}B+\n\x16\x63om.google.longrunningB\x0fOperationsProtoP\x01\x62\x06proto3' , dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -41,7 +39,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.longrunning.Operation.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -103,7 +101,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.longrunning.GetOperationRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -134,14 +132,14 @@ _descriptor.FieldDescriptor( name='name', full_name='google.longrunning.ListOperationsRequest.name', index=0, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='filter', full_name='google.longrunning.ListOperationsRequest.filter', index=1, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -155,7 +153,7 @@ _descriptor.FieldDescriptor( name='page_token', full_name='google.longrunning.ListOperationsRequest.page_token', index=3, number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -193,7 +191,7 @@ _descriptor.FieldDescriptor( name='next_page_token', full_name='google.longrunning.ListOperationsResponse.next_page_token', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -224,7 +222,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.longrunning.CancelOperationRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -255,7 +253,7 @@ _descriptor.FieldDescriptor( name='name', full_name='google.longrunning.DeleteOperationRequest.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -336,10 +334,13 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026com.google.longrunningB\017OperationsProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\026com.google.longrunningB\017OperationsProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities class EarlyAdopterOperationsServicer(object): """""" __metaclass__ = abc.ABCMeta @@ -393,28 +394,28 @@ def early_adopter_create_Operations_server(servicer, port, private_key=None, cer import gcloud_bigtable._generated.operations_pb2 import gcloud_bigtable._generated.empty_pb2 method_service_descriptions = { - "CancelOperation": utilities.unary_unary_service_description( + "CancelOperation": alpha_utilities.unary_unary_service_description( servicer.CancelOperation, gcloud_bigtable._generated.operations_pb2.CancelOperationRequest.FromString, gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ), - "DeleteOperation": utilities.unary_unary_service_description( + "DeleteOperation": alpha_utilities.unary_unary_service_description( servicer.DeleteOperation, gcloud_bigtable._generated.operations_pb2.DeleteOperationRequest.FromString, gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ), - "GetOperation": utilities.unary_unary_service_description( + "GetOperation": alpha_utilities.unary_unary_service_description( servicer.GetOperation, gcloud_bigtable._generated.operations_pb2.GetOperationRequest.FromString, gcloud_bigtable._generated.operations_pb2.Operation.SerializeToString, ), - "ListOperations": utilities.unary_unary_service_description( + "ListOperations": alpha_utilities.unary_unary_service_description( servicer.ListOperations, gcloud_bigtable._generated.operations_pb2.ListOperationsRequest.FromString, gcloud_bigtable._generated.operations_pb2.ListOperationsResponse.SerializeToString, ), } - return implementations.server("google.longrunning.Operations", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) + return early_adopter_implementations.server("google.longrunning.Operations", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain) def early_adopter_create_Operations_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None): import gcloud_bigtable._generated.operations_pb2 import gcloud_bigtable._generated.operations_pb2 @@ -425,22 +426,118 @@ def early_adopter_create_Operations_stub(host, port, metadata_transformer=None, import gcloud_bigtable._generated.operations_pb2 import gcloud_bigtable._generated.empty_pb2 method_invocation_descriptions = { - "CancelOperation": utilities.unary_unary_invocation_description( + "CancelOperation": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.operations_pb2.CancelOperationRequest.SerializeToString, gcloud_bigtable._generated.empty_pb2.Empty.FromString, ), - "DeleteOperation": utilities.unary_unary_invocation_description( + "DeleteOperation": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.operations_pb2.DeleteOperationRequest.SerializeToString, gcloud_bigtable._generated.empty_pb2.Empty.FromString, ), - "GetOperation": utilities.unary_unary_invocation_description( + "GetOperation": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.operations_pb2.GetOperationRequest.SerializeToString, gcloud_bigtable._generated.operations_pb2.Operation.FromString, ), - "ListOperations": utilities.unary_unary_invocation_description( + "ListOperations": alpha_utilities.unary_unary_invocation_description( gcloud_bigtable._generated.operations_pb2.ListOperationsRequest.SerializeToString, gcloud_bigtable._generated.operations_pb2.ListOperationsResponse.FromString, ), } - return implementations.stub("google.longrunning.Operations", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + return early_adopter_implementations.stub("google.longrunning.Operations", method_invocation_descriptions, host, port, metadata_transformer=metadata_transformer, secure=secure, root_certificates=root_certificates, private_key=private_key, certificate_chain=certificate_chain, server_host_override=server_host_override) + +class BetaOperationsServicer(object): + """""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def GetOperation(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def ListOperations(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def CancelOperation(self, request, context): + raise NotImplementedError() + @abc.abstractmethod + def DeleteOperation(self, request, context): + raise NotImplementedError() + +class BetaOperationsStub(object): + """The interface to which stubs will conform.""" + __metaclass__ = abc.ABCMeta + @abc.abstractmethod + def GetOperation(self, request, timeout): + raise NotImplementedError() + GetOperation.future = None + @abc.abstractmethod + def ListOperations(self, request, timeout): + raise NotImplementedError() + ListOperations.future = None + @abc.abstractmethod + def CancelOperation(self, request, timeout): + raise NotImplementedError() + CancelOperation.future = None + @abc.abstractmethod + def DeleteOperation(self, request, timeout): + raise NotImplementedError() + DeleteOperation.future = None + +def beta_create_Operations_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None): + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.empty_pb2 + request_deserializers = { + ('google.longrunning.Operations', 'CancelOperation'): google.longrunning.operations_pb2.CancelOperationRequest.FromString, + ('google.longrunning.Operations', 'DeleteOperation'): google.longrunning.operations_pb2.DeleteOperationRequest.FromString, + ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.GetOperationRequest.FromString, + ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsRequest.FromString, + } + response_serializers = { + ('google.longrunning.Operations', 'CancelOperation'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.longrunning.Operations', 'DeleteOperation'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.Operation.SerializeToString, + ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsResponse.SerializeToString, + } + method_implementations = { + ('google.longrunning.Operations', 'CancelOperation'): face_utilities.unary_unary_inline(servicer.CancelOperation), + ('google.longrunning.Operations', 'DeleteOperation'): face_utilities.unary_unary_inline(servicer.DeleteOperation), + ('google.longrunning.Operations', 'GetOperation'): face_utilities.unary_unary_inline(servicer.GetOperation), + ('google.longrunning.Operations', 'ListOperations'): face_utilities.unary_unary_inline(servicer.ListOperations), + } + server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout) + return beta_implementations.server(method_implementations, options=server_options) + +def beta_create_Operations_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None): + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.empty_pb2 + import gcloud_bigtable._generated.operations_pb2 + import gcloud_bigtable._generated.empty_pb2 + request_serializers = { + ('google.longrunning.Operations', 'CancelOperation'): google.longrunning.operations_pb2.CancelOperationRequest.SerializeToString, + ('google.longrunning.Operations', 'DeleteOperation'): google.longrunning.operations_pb2.DeleteOperationRequest.SerializeToString, + ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.GetOperationRequest.SerializeToString, + ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsRequest.SerializeToString, + } + response_deserializers = { + ('google.longrunning.Operations', 'CancelOperation'): google.protobuf.empty_pb2.Empty.FromString, + ('google.longrunning.Operations', 'DeleteOperation'): google.protobuf.empty_pb2.Empty.FromString, + ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.Operation.FromString, + ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsResponse.FromString, + } + cardinalities = { + 'CancelOperation': cardinality.Cardinality.UNARY_UNARY, + 'DeleteOperation': cardinality.Cardinality.UNARY_UNARY, + 'GetOperation': cardinality.Cardinality.UNARY_UNARY, + 'ListOperations': cardinality.Cardinality.UNARY_UNARY, + } + stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size) + return beta_implementations.dynamic_stub(channel, 'google.longrunning.Operations', cardinalities, options=stub_options) # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/status_pb2.py b/gcloud_bigtable/_generated/status_pb2.py index 643f286..a715af1 100644 --- a/gcloud_bigtable/_generated/status_pb2.py +++ b/gcloud_bigtable/_generated/status_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/rpc/status.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -20,7 +18,7 @@ name='google/rpc/status.proto', package='google.rpc', syntax='proto3', - serialized_pb=_b('\n\x17google/rpc/status.proto\x12\ngoogle.rpc\x1a\x19google/protobuf/any.proto\"N\n\x06Status\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\x12%\n\x07\x64\x65tails\x18\x03 \x03(\x0b\x32\x14.google.protobuf.AnyB\x1f\n\x0e\x63om.google.rpcB\x0bStatusProtoP\x01\x62\x06proto3') + serialized_pb=b'\n\x17google/rpc/status.proto\x12\ngoogle.rpc\x1a\x19google/protobuf/any.proto\"N\n\x06Status\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\x12%\n\x07\x64\x65tails\x18\x03 \x03(\x0b\x32\x14.google.protobuf.AnyB\x1f\n\x0e\x63om.google.rpcB\x0bStatusProtoP\x01\x62\x06proto3' , dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -45,7 +43,7 @@ _descriptor.FieldDescriptor( name='message', full_name='google.rpc.Status.message', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -84,8 +82,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\016com.google.rpcB\013StatusProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\016com.google.rpcB\013StatusProtoP\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) diff --git a/gcloud_bigtable/_generated/timestamp_pb2.py b/gcloud_bigtable/_generated/timestamp_pb2.py index 6baa9b4..66a6cf6 100644 --- a/gcloud_bigtable/_generated/timestamp_pb2.py +++ b/gcloud_bigtable/_generated/timestamp_pb2.py @@ -1,8 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/protobuf/timestamp.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -19,7 +17,7 @@ name='google/protobuf/timestamp.proto', package='google.protobuf', syntax='proto3', - serialized_pb=_b('\n\x1fgoogle/protobuf/timestamp.proto\x12\x0fgoogle.protobuf\"+\n\tTimestamp\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\x42*\n\x13\x63om.google.protobufB\x0eTimestampProtoP\x01\xa0\x01\x01\x62\x06proto3') + serialized_pb=b'\n\x1fgoogle/protobuf/timestamp.proto\x12\x0fgoogle.protobuf\"+\n\tTimestamp\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\x42*\n\x13\x63om.google.protobufB\x0eTimestampProtoP\x01\xa0\x01\x01\x62\x06proto3' ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -74,8 +72,11 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\016TimestampProtoP\001\240\001\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'\n\023com.google.protobufB\016TimestampProtoP\001\240\001\001') import abc -from grpc.early_adopter import implementations -from grpc.framework.alpha import utilities +from grpc.beta import implementations as beta_implementations +from grpc.early_adopter import implementations as early_adopter_implementations +from grpc.framework.alpha import utilities as alpha_utilities +from grpc.framework.common import cardinality +from grpc.framework.interfaces.face import utilities as face_utilities # @@protoc_insertion_point(module_scope) From 5ef92d0b318a99c7c748dbe7e59b762947e16b86 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 23 Nov 2015 09:52:32 -0800 Subject: [PATCH 02/11] Adding fake test modules for gRPC. --- _fake_grpc/grpc/beta/__init__.py | 13 +++++++++++++ _fake_grpc/grpc/beta/implementations.py | 13 +++++++++++++ _fake_grpc/grpc/framework/common/__init__.py | 13 +++++++++++++ _fake_grpc/grpc/framework/common/cardinality.py | 13 +++++++++++++ _fake_grpc/grpc/framework/interfaces/__init__.py | 13 +++++++++++++ .../grpc/framework/interfaces/face/__init__.py | 13 +++++++++++++ .../grpc/framework/interfaces/face/utilities.py | 13 +++++++++++++ 7 files changed, 91 insertions(+) create mode 100644 _fake_grpc/grpc/beta/__init__.py create mode 100644 _fake_grpc/grpc/beta/implementations.py create mode 100644 _fake_grpc/grpc/framework/common/__init__.py create mode 100644 _fake_grpc/grpc/framework/common/cardinality.py create mode 100644 _fake_grpc/grpc/framework/interfaces/__init__.py create mode 100644 _fake_grpc/grpc/framework/interfaces/face/__init__.py create mode 100644 _fake_grpc/grpc/framework/interfaces/face/utilities.py diff --git a/_fake_grpc/grpc/beta/__init__.py b/_fake_grpc/grpc/beta/__init__.py new file mode 100644 index 0000000..61e4b79 --- /dev/null +++ b/_fake_grpc/grpc/beta/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/_fake_grpc/grpc/beta/implementations.py b/_fake_grpc/grpc/beta/implementations.py new file mode 100644 index 0000000..61e4b79 --- /dev/null +++ b/_fake_grpc/grpc/beta/implementations.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/_fake_grpc/grpc/framework/common/__init__.py b/_fake_grpc/grpc/framework/common/__init__.py new file mode 100644 index 0000000..61e4b79 --- /dev/null +++ b/_fake_grpc/grpc/framework/common/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/_fake_grpc/grpc/framework/common/cardinality.py b/_fake_grpc/grpc/framework/common/cardinality.py new file mode 100644 index 0000000..61e4b79 --- /dev/null +++ b/_fake_grpc/grpc/framework/common/cardinality.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/_fake_grpc/grpc/framework/interfaces/__init__.py b/_fake_grpc/grpc/framework/interfaces/__init__.py new file mode 100644 index 0000000..61e4b79 --- /dev/null +++ b/_fake_grpc/grpc/framework/interfaces/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/_fake_grpc/grpc/framework/interfaces/face/__init__.py b/_fake_grpc/grpc/framework/interfaces/face/__init__.py new file mode 100644 index 0000000..61e4b79 --- /dev/null +++ b/_fake_grpc/grpc/framework/interfaces/face/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/_fake_grpc/grpc/framework/interfaces/face/utilities.py b/_fake_grpc/grpc/framework/interfaces/face/utilities.py new file mode 100644 index 0000000..61e4b79 --- /dev/null +++ b/_fake_grpc/grpc/framework/interfaces/face/utilities.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. From d355c97b548cd4afdf296b7a70c80606a743f1ab Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 24 Nov 2015 08:56:06 -0800 Subject: [PATCH 03/11] Dropping dependence on Homebrew/Linuxbrew. Also upgrading version of grpcio in system tests. The library supports backwards compatibility, so the code runs fine without change. --- Makefile | 4 +--- scripts/nose_with_env.sh | 23 ----------------------- scripts/sphinx_with_env.sh | 23 ----------------------- tox.ini | 12 ++++++------ 4 files changed, 7 insertions(+), 55 deletions(-) delete mode 100755 scripts/nose_with_env.sh delete mode 100755 scripts/sphinx_with_env.sh diff --git a/Makefile b/Makefile index 7a8b6d8..11cb68b 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ GENERATED_DIR=$(shell pwd)/generated_python FINAL_DIR=gcloud_bigtable/_generated -BREW_PREFIX=$(shell brew --prefix) -LD_LIBRARY_PATH=$(BREW_PREFIX)/lib -GRPC_PLUGIN=$(BREW_PREFIX)/bin/grpc_python_plugin +GRPC_PLUGIN=grpc_python_plugin help: @echo 'Makefile for a gcloud-python-bigtable ' diff --git a/scripts/nose_with_env.sh b/scripts/nose_with_env.sh deleted file mode 100755 index d83e01d..0000000 --- a/scripts/nose_with_env.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ev - -if [[ -n "$(which brew)" ]]; then - export LD_LIBRARY_PATH=$(brew --prefix)/lib -fi - -nosetests ${@} diff --git a/scripts/sphinx_with_env.sh b/scripts/sphinx_with_env.sh deleted file mode 100755 index f2ff46f..0000000 --- a/scripts/sphinx_with_env.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ev - -if [[ -n "$(which brew)" ]]; then - export LD_LIBRARY_PATH=$(brew --prefix)/lib -fi - -sphinx-build ${@} diff --git a/tox.ini b/tox.ini index 8d64601..ee054c5 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist = [testenv] commands = - {toxinidir}/scripts/nose_with_env.sh + nosetests deps = nose unittest2 @@ -15,7 +15,7 @@ setenv = basepython = python2.7 commands = - {toxinidir}/scripts/nose_with_env.sh --with-xunit --with-xcoverage --cover-package=gcloud_bigtable --nocapture --cover-erase --cover-tests --cover-branches --cover-min-percentage=100 + nosetests --with-xunit --with-xcoverage --cover-package=gcloud_bigtable --nocapture --cover-erase --cover-tests --cover-branches --cover-min-percentage=100 deps = {[testenv]deps} coverage @@ -41,10 +41,10 @@ passenv = GCLOUD_* basepython = python2.7 commands = - {toxinidir}/scripts/nose_with_env.sh -v {toxinidir}/system_tests/run.py - {toxinidir}/scripts/nose_with_env.sh -v {toxinidir}/system_tests/run_happybase.py + nosetests -v {toxinidir}/system_tests/run.py + nosetests -v {toxinidir}/system_tests/run_happybase.py deps = - grpcio==0.10.0a0 + grpcio==0.11.0b1 nose unittest2 passenv = GOOGLE_* GCLOUD_* GRPC_TRACE @@ -55,7 +55,7 @@ basepython = python2.7 commands = python -c "import shutil; shutil.rmtree('docs/_build', ignore_errors=True)" - {toxinidir}/scripts/sphinx_with_env.sh -W -b html -d docs/_build/doctrees docs docs/_build/html + sphinx-build -W -b html -d docs/_build/doctrees docs docs/_build/html deps = Sphinx passenv = SPHINX_RELEASE From 53cd7aca1e05a057ce348848ea8030c18e8a9763 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 24 Nov 2015 10:11:11 -0800 Subject: [PATCH 04/11] Switching operations stub from alpha to beta impl. In order to actually execute the code, some rewritten imports had to be dealt with (they were referenced by the original import name in a function call). Ran some `sed` commands to avoid adding extra hacks to `rewrite_imports.py`: git grep -l ' google\.longrunning\.' | xargs sed -i 's/ google\.longrunning\./ gcloud_bigtable\._generated\./g' git grep -l ' google\.protobuf\.empty_pb2\.' | xargs sed -i 's/ google\.protobuf\.empty_pb2\./ gcloud_bigtable\._generated\.empty_pb2\./g' --- .../bigtable_cluster_service_pb2.py | 8 +-- .../_generated/bigtable_service_pb2.py | 4 +- .../_generated/bigtable_table_service_pb2.py | 12 ++--- gcloud_bigtable/_generated/operations_pb2.py | 32 ++++++------ gcloud_bigtable/_grpc_mocks.py | 3 ++ gcloud_bigtable/_helpers.py | 37 +++++++++++++- gcloud_bigtable/client.py | 9 ++-- gcloud_bigtable/cluster.py | 5 +- gcloud_bigtable/test__helpers.py | 49 +++++++++++++++++++ gcloud_bigtable/test_client.py | 5 +- 10 files changed, 126 insertions(+), 38 deletions(-) diff --git a/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py b/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py index 43be17d..b5d5100 100644 --- a/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py @@ -286,11 +286,11 @@ def beta_create_BigtableClusterService_server(servicer, pool=None, pool_size=Non } response_serializers = { ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersResponse.SerializeToString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesResponse.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.longrunning.operations_pb2.Operation.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): gcloud_bigtable._generated.operations_pb2.Operation.SerializeToString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, } method_implementations = { @@ -331,11 +331,11 @@ def beta_create_BigtableClusterService_stub(channel, host=None, metadata_transfo } response_deserializers = { ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersResponse.FromString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesResponse.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.longrunning.operations_pb2.Operation.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): gcloud_bigtable._generated.operations_pb2.Operation.FromString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, } cardinalities = { diff --git a/gcloud_bigtable/_generated/bigtable_service_pb2.py b/gcloud_bigtable/_generated/bigtable_service_pb2.py index bd0900f..01724ce 100644 --- a/gcloud_bigtable/_generated/bigtable_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_service_pb2.py @@ -223,7 +223,7 @@ def beta_create_BigtableService_server(servicer, pool=None, pool_size=None, defa } response_serializers = { ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowResponse.SerializeToString, - ('google.bigtable.v1.BigtableService', 'MutateRow'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_data_pb2.Row.SerializeToString, ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsResponse.SerializeToString, ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysResponse.SerializeToString, @@ -258,7 +258,7 @@ def beta_create_BigtableService_stub(channel, host=None, metadata_transformer=No } response_deserializers = { ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowResponse.FromString, - ('google.bigtable.v1.BigtableService', 'MutateRow'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_data_pb2.Row.FromString, ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsResponse.FromString, ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysResponse.FromString, diff --git a/gcloud_bigtable/_generated/bigtable_table_service_pb2.py b/gcloud_bigtable/_generated/bigtable_table_service_pb2.py index 4567385..e17e1da 100644 --- a/gcloud_bigtable/_generated/bigtable_table_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_table_service_pb2.py @@ -316,11 +316,11 @@ def beta_create_BigtableTableService_server(servicer, pool=None, pool_size=None, response_serializers = { ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.protobuf.empty_pb2.Empty.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.SerializeToString, ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesResponse.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.protobuf.empty_pb2.Empty.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, } method_implementations = { @@ -366,11 +366,11 @@ def beta_create_BigtableTableService_stub(channel, host=None, metadata_transform response_deserializers = { ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.protobuf.empty_pb2.Empty.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.FromString, ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesResponse.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.protobuf.empty_pb2.Empty.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, } cardinalities = { diff --git a/gcloud_bigtable/_generated/operations_pb2.py b/gcloud_bigtable/_generated/operations_pb2.py index adbe718..069453b 100644 --- a/gcloud_bigtable/_generated/operations_pb2.py +++ b/gcloud_bigtable/_generated/operations_pb2.py @@ -491,16 +491,16 @@ def beta_create_Operations_server(servicer, pool=None, pool_size=None, default_t import gcloud_bigtable._generated.operations_pb2 import gcloud_bigtable._generated.empty_pb2 request_deserializers = { - ('google.longrunning.Operations', 'CancelOperation'): google.longrunning.operations_pb2.CancelOperationRequest.FromString, - ('google.longrunning.Operations', 'DeleteOperation'): google.longrunning.operations_pb2.DeleteOperationRequest.FromString, - ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.GetOperationRequest.FromString, - ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsRequest.FromString, + ('google.longrunning.Operations', 'CancelOperation'): gcloud_bigtable._generated.operations_pb2.CancelOperationRequest.FromString, + ('google.longrunning.Operations', 'DeleteOperation'): gcloud_bigtable._generated.operations_pb2.DeleteOperationRequest.FromString, + ('google.longrunning.Operations', 'GetOperation'): gcloud_bigtable._generated.operations_pb2.GetOperationRequest.FromString, + ('google.longrunning.Operations', 'ListOperations'): gcloud_bigtable._generated.operations_pb2.ListOperationsRequest.FromString, } response_serializers = { - ('google.longrunning.Operations', 'CancelOperation'): google.protobuf.empty_pb2.Empty.SerializeToString, - ('google.longrunning.Operations', 'DeleteOperation'): google.protobuf.empty_pb2.Empty.SerializeToString, - ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.Operation.SerializeToString, - ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsResponse.SerializeToString, + ('google.longrunning.Operations', 'CancelOperation'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, + ('google.longrunning.Operations', 'DeleteOperation'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, + ('google.longrunning.Operations', 'GetOperation'): gcloud_bigtable._generated.operations_pb2.Operation.SerializeToString, + ('google.longrunning.Operations', 'ListOperations'): gcloud_bigtable._generated.operations_pb2.ListOperationsResponse.SerializeToString, } method_implementations = { ('google.longrunning.Operations', 'CancelOperation'): face_utilities.unary_unary_inline(servicer.CancelOperation), @@ -521,16 +521,16 @@ def beta_create_Operations_stub(channel, host=None, metadata_transformer=None, p import gcloud_bigtable._generated.operations_pb2 import gcloud_bigtable._generated.empty_pb2 request_serializers = { - ('google.longrunning.Operations', 'CancelOperation'): google.longrunning.operations_pb2.CancelOperationRequest.SerializeToString, - ('google.longrunning.Operations', 'DeleteOperation'): google.longrunning.operations_pb2.DeleteOperationRequest.SerializeToString, - ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.GetOperationRequest.SerializeToString, - ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsRequest.SerializeToString, + ('google.longrunning.Operations', 'CancelOperation'): gcloud_bigtable._generated.operations_pb2.CancelOperationRequest.SerializeToString, + ('google.longrunning.Operations', 'DeleteOperation'): gcloud_bigtable._generated.operations_pb2.DeleteOperationRequest.SerializeToString, + ('google.longrunning.Operations', 'GetOperation'): gcloud_bigtable._generated.operations_pb2.GetOperationRequest.SerializeToString, + ('google.longrunning.Operations', 'ListOperations'): gcloud_bigtable._generated.operations_pb2.ListOperationsRequest.SerializeToString, } response_deserializers = { - ('google.longrunning.Operations', 'CancelOperation'): google.protobuf.empty_pb2.Empty.FromString, - ('google.longrunning.Operations', 'DeleteOperation'): google.protobuf.empty_pb2.Empty.FromString, - ('google.longrunning.Operations', 'GetOperation'): google.longrunning.operations_pb2.Operation.FromString, - ('google.longrunning.Operations', 'ListOperations'): google.longrunning.operations_pb2.ListOperationsResponse.FromString, + ('google.longrunning.Operations', 'CancelOperation'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, + ('google.longrunning.Operations', 'DeleteOperation'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, + ('google.longrunning.Operations', 'GetOperation'): gcloud_bigtable._generated.operations_pb2.Operation.FromString, + ('google.longrunning.Operations', 'ListOperations'): gcloud_bigtable._generated.operations_pb2.ListOperationsResponse.FromString, } cardinalities = { 'CancelOperation': cardinality.Cardinality.UNARY_UNARY, diff --git a/gcloud_bigtable/_grpc_mocks.py b/gcloud_bigtable/_grpc_mocks.py index b8c2fe2..27b2e47 100644 --- a/gcloud_bigtable/_grpc_mocks.py +++ b/gcloud_bigtable/_grpc_mocks.py @@ -29,6 +29,9 @@ def result(self): class MethodMock(object): """Mock for :class:`grpc.framework.alpha._reexport._UnaryUnarySyncAsync`. + Can also be used for beta equivalent: + :class:`grpc.framework.crust.implementations._UnaryUnaryMultiCallable` + May need to be callable and needs to (in our use) have an ``async`` method. """ diff --git a/gcloud_bigtable/_helpers.py b/gcloud_bigtable/_helpers.py index 806cbd2..d0e6499 100644 --- a/gcloud_bigtable/_helpers.py +++ b/gcloud_bigtable/_helpers.py @@ -23,6 +23,8 @@ import pytz import six +from grpc.beta import implementations + from gcloud_bigtable._generated import ( bigtable_cluster_service_messages_pb2 as messages_pb2) from gcloud_bigtable._generated import bigtable_cluster_data_pb2 as data_pb2 @@ -272,7 +274,7 @@ def get_certs(): def make_stub(client, stub_factory, host, port): - """Makes a stub for the an API. + """Makes a stub for an RPC service. :type client: :class:`.client.Client` :param client: The client that owns the cluster. Provides authorization and @@ -299,6 +301,39 @@ def make_stub(client, stub_factory, host, port): root_certificates=get_certs()) +def make_beta_stub(client, stub_factory, host, port): + """Makes a (beta) stub for an RPC service. + + Uses the beta implementation of gRPC. + + :type client: :class:`.client.Client` + :param client: The client that owns the cluster. Provides authorization and + user agent. + + :type stub_factory: callable + :param stub_factory: A factory which will create a gRPC stub for + a given service. + + :type host: str + :param host: The host for the service. + + :type port: int + :param port: The port for the service. + + :rtype: :class:`grpc.beta._stub._AutoIntermediary` + :returns: The stub object used to make gRPC requests to the + Data API. + """ + root_certificates = get_certs() + client_credentials = implementations.ssl_client_credentials( + root_certificates, private_key=None, certificate_chain=None) + channel = implementations.secure_channel( + host, port, client_credentials) + custom_metadata_transformer = MetadataTransformer(client) + return stub_factory(channel, host=host, + metadata_transformer=custom_metadata_transformer) + + def _parse_family_pb(family_pb): """Parses a Family protobuf into a dictionary. diff --git a/gcloud_bigtable/client.py b/gcloud_bigtable/client.py index 549eb49..b114536 100644 --- a/gcloud_bigtable/client.py +++ b/gcloud_bigtable/client.py @@ -49,6 +49,7 @@ from gcloud_bigtable._generated import bigtable_table_service_pb2 from gcloud_bigtable._generated import operations_pb2 from gcloud_bigtable._helpers import make_stub +from gcloud_bigtable._helpers import make_beta_stub from gcloud_bigtable.cluster import Cluster @@ -73,7 +74,7 @@ DATA_API_PORT = 443 """Data API request port.""" -OPERATIONS_STUB_FACTORY = operations_pb2.early_adopter_create_Operations_stub +OPERATIONS_STUB_FACTORY = operations_pb2.beta_create_Operations_stub ADMIN_SCOPE = 'https://www.googleapis.com/auth/cloud-bigtable.admin' """Scope for interacting with the Cluster Admin and Table Admin APIs.""" @@ -467,11 +468,11 @@ def _make_operations_stub(self): These are for long-running operations of the Cluster Admin API, hence the host and port matching. - :rtype: :class:`grpc.early_adopter.implementations._Stub` + :rtype: :class:`grpc.beta._stub._AutoIntermediary` :returns: A gRPC stub object. """ - return make_stub(self, OPERATIONS_STUB_FACTORY, - CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) + return make_beta_stub(self, OPERATIONS_STUB_FACTORY, + CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) def _make_table_stub(self): """Creates gRPC stub to make requests to the Table Admin API. diff --git a/gcloud_bigtable/cluster.py b/gcloud_bigtable/cluster.py index 00a9c72..fd22041 100644 --- a/gcloud_bigtable/cluster.py +++ b/gcloud_bigtable/cluster.py @@ -294,10 +294,9 @@ def operation_finished(self, timeout_seconds=None): '/operations/%d' % (self._operation_id,)) request_pb = operations_pb2.GetOperationRequest(name=operation_name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._operations_stub.GetOperation.async( - request_pb, timeout_seconds) # We expact a `._generated.operations_pb2.Operation`. - operation_pb = response.result() + operation_pb = self.client._operations_stub.GetOperation( + request_pb, timeout_seconds) if operation_pb.done: self._operation_type = None diff --git a/gcloud_bigtable/test__helpers.py b/gcloud_bigtable/test__helpers.py index ef98615..6039a53 100644 --- a/gcloud_bigtable/test__helpers.py +++ b/gcloud_bigtable/test__helpers.py @@ -444,6 +444,55 @@ def test_it(self): self.assertEqual(client._called, []) +class Test_make_beta_stub(unittest2.TestCase): + + def _callFUT(self, credentials, stub_factory, host, port): + from gcloud_bigtable._helpers import make_beta_stub + return make_beta_stub(credentials, stub_factory, host, port) + + def test_it(self): + from gcloud_bigtable._testing import _MockCalled + from gcloud_bigtable._testing import _MockWithAttachedMethods + from gcloud_bigtable._testing import _Monkey + from gcloud_bigtable import _helpers as MUT + + mock_result = object() + custom_factory = _MockCalled(mock_result) + transformed = object() + transformer = _MockCalled(transformed) + + client_creds = object() + channel = object() + implementations_mod = _MockWithAttachedMethods(client_creds, channel) + + host = 'HOST' + port = 1025 + certs = 'FOOBAR' + client = _MockWithAttachedMethods() + with _Monkey(MUT, get_certs=lambda: certs, + implementations=implementations_mod, + MetadataTransformer=transformer): + result = self._callFUT(client, custom_factory, host, port) + + self.assertTrue(result is mock_result) + custom_factory.check_called( + self, + [(channel,)], + [{ + 'host': host, + 'metadata_transformer': transformed, + }], + ) + transformer.check_called(self, [(client,)]) + self.assertEqual(client._called, []) + # Check what was called on the module. + self.assertEqual(implementations_mod._called, [ + ('ssl_client_credentials', (certs,), + {'private_key': None, 'certificate_chain': None}), + ('secure_channel', (host, port, client_creds), {}), + ]) + + class Test__parse_family_pb(unittest2.TestCase): def _callFUT(self, family_pb): diff --git a/gcloud_bigtable/test_client.py b/gcloud_bigtable/test_client.py index 324914c..8086a9b 100644 --- a/gcloud_bigtable/test_client.py +++ b/gcloud_bigtable/test_client.py @@ -611,7 +611,7 @@ def test__make_operations_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_stub=mock_make_stub): + with _Monkey(MUT, make_beta_stub=mock_make_stub): result = client._make_operations_stub() self.assertTrue(result is expected_result) @@ -677,7 +677,8 @@ def _start_method_helper(self, admin): credentials=credentials, admin=admin) stub = _FakeStub() mock_make_stub = _MockCalled(stub) - with _Monkey(MUT, make_stub=mock_make_stub): + with _Monkey(MUT, make_stub=mock_make_stub, + make_beta_stub=mock_make_stub): client.start() self.assertTrue(client._data_stub_internal is stub) From 308fd8bcf58145d9e896d22b703e085c2040f7ba Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 24 Nov 2015 10:24:19 -0800 Subject: [PATCH 05/11] Switching cluster API stub from alpha to beta impl. Again ran some `sed` commands to avoid adding extra hacks to `rewrite_imports.py`: git grep -l ' google\.bigtable\.admin\.cluster\.v1\.' | xargs sed -i 's/ google\.bigtable\.admin\.cluster\.v1\./ gcloud_bigtable\._generated\./g' --- .../bigtable_cluster_service_pb2.py | 48 +++++++++---------- gcloud_bigtable/client.py | 18 ++++--- gcloud_bigtable/cluster.py | 24 ++++------ gcloud_bigtable/test_client.py | 2 +- 4 files changed, 42 insertions(+), 50 deletions(-) diff --git a/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py b/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py index b5d5100..7a5bad8 100644 --- a/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_cluster_service_pb2.py @@ -276,22 +276,22 @@ def beta_create_BigtableClusterService_server(servicer, pool=None, pool_size=Non import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 import gcloud_bigtable._generated.operations_pb2 request_deserializers = { - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.CreateClusterRequest.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.GetClusterRequest.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersRequest.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesRequest.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.CreateClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.GetClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, } response_serializers = { - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersResponse.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesResponse.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersResponse.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesResponse.SerializeToString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): gcloud_bigtable._generated.operations_pb2.Operation.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, } method_implementations = { ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): face_utilities.unary_unary_inline(servicer.CreateCluster), @@ -321,22 +321,22 @@ def beta_create_BigtableClusterService_stub(channel, host=None, metadata_transfo import gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2 import gcloud_bigtable._generated.operations_pb2 request_serializers = { - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.CreateClusterRequest.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.GetClusterRequest.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersRequest.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesRequest.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.SerializeToString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.CreateClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.DeleteClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.GetClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.UndeleteClusterRequest.SerializeToString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.SerializeToString, } response_deserializers = { - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'CreateCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'DeleteCluster'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListClustersResponse.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): google.bigtable.admin.cluster.v1.bigtable_cluster_service_messages_pb2.ListZonesResponse.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'GetCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListClusters'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListClustersResponse.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'ListZones'): gcloud_bigtable._generated.bigtable_cluster_service_messages_pb2.ListZonesResponse.FromString, ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UndeleteCluster'): gcloud_bigtable._generated.operations_pb2.Operation.FromString, - ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): google.bigtable.admin.cluster.v1.bigtable_cluster_data_pb2.Cluster.FromString, + ('google.bigtable.admin.cluster.v1.BigtableClusterService', 'UpdateCluster'): gcloud_bigtable._generated.bigtable_cluster_data_pb2.Cluster.FromString, } cardinalities = { 'CreateCluster': cardinality.Cardinality.UNARY_UNARY, diff --git a/gcloud_bigtable/client.py b/gcloud_bigtable/client.py index b114536..ec7a225 100644 --- a/gcloud_bigtable/client.py +++ b/gcloud_bigtable/client.py @@ -60,8 +60,8 @@ TABLE_ADMIN_PORT = 443 """Table Admin API request port.""" -CLUSTER_STUB_FACTORY = (bigtable_cluster_service_pb2. - early_adopter_create_BigtableClusterService_stub) +CLUSTER_STUB_FACTORY = ( + bigtable_cluster_service_pb2.beta_create_BigtableClusterService_stub) CLUSTER_ADMIN_HOST = 'bigtableclusteradmin.googleapis.com' """Cluster Admin API request host.""" CLUSTER_ADMIN_PORT = 443 @@ -459,8 +459,8 @@ def _make_cluster_stub(self): :rtype: :class:`grpc.early_adopter.implementations._Stub` :returns: A gRPC stub object. """ - return make_stub(self, CLUSTER_STUB_FACTORY, - CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) + return make_beta_stub(self, CLUSTER_STUB_FACTORY, + CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) def _make_operations_stub(self): """Creates gRPC stub to make requests to the Operations API. @@ -568,10 +568,9 @@ def list_zones(self, timeout_seconds=None): """ request_pb = messages_pb2.ListZonesRequest(name=self.project_name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self._cluster_stub.ListZones.async(request_pb, - timeout_seconds) # We expect a `.messages_pb2.ListZonesResponse` - list_zones_response = response.result() + list_zones_response = self._cluster_stub.ListZones(request_pb, + timeout_seconds) result = [] for zone in list_zones_response.zones: @@ -595,10 +594,9 @@ def list_clusters(self, timeout_seconds=None): """ request_pb = messages_pb2.ListClustersRequest(name=self.project_name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self._cluster_stub.ListClusters.async(request_pb, - timeout_seconds) # We expect a `.messages_pb2.ListClustersResponse` - list_clusters_response = response.result() + list_clusters_response = self._cluster_stub.ListClusters( + request_pb, timeout_seconds) failed_zones = [zone.display_name for zone in list_clusters_response.failed_zones] diff --git a/gcloud_bigtable/cluster.py b/gcloud_bigtable/cluster.py index fd22041..c282742 100644 --- a/gcloud_bigtable/cluster.py +++ b/gcloud_bigtable/cluster.py @@ -265,10 +265,9 @@ def reload(self, timeout_seconds=None): """ request_pb = messages_pb2.GetClusterRequest(name=self.name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._cluster_stub.GetCluster.async(request_pb, - timeout_seconds) # We expect a `._generated.bigtable_cluster_data_pb2.Cluster`. - cluster_pb = response.result() + cluster_pb = self.client._cluster_stub.GetCluster(request_pb, + timeout_seconds) # NOTE: _update_from_pb does not check that the project, zone and # cluster ID on the response match the request. @@ -330,10 +329,9 @@ def create(self, timeout_seconds=None): """ request_pb = _prepare_create_request(self) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._cluster_stub.CreateCluster.async( - request_pb, timeout_seconds) # We expect an `operations_pb2.Operation`. - cluster_pb = response.result() + cluster_pb = self.client._cluster_stub.CreateCluster( + request_pb, timeout_seconds) self._operation_type = 'create' self._operation_id, self._operation_begin = _process_operation( @@ -365,10 +363,9 @@ def update(self, timeout_seconds=None): serve_nodes=self.serve_nodes, ) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._cluster_stub.UpdateCluster.async( - request_pb, timeout_seconds) # We expect a `._generated.bigtable_cluster_data_pb2.Cluster`. - cluster_pb = response.result() + cluster_pb = self.client._cluster_stub.UpdateCluster( + request_pb, timeout_seconds) self._operation_type = 'update' self._operation_id, self._operation_begin = _process_operation( @@ -384,10 +381,8 @@ def delete(self, timeout_seconds=None): """ request_pb = messages_pb2.DeleteClusterRequest(name=self.name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._cluster_stub.DeleteCluster.async( - request_pb, timeout_seconds) # We expect a `._generated.empty_pb2.Empty` - response.result() + self.client._cluster_stub.DeleteCluster(request_pb, timeout_seconds) def undelete(self, timeout_seconds=None): """Undelete this cluster. @@ -399,10 +394,9 @@ def undelete(self, timeout_seconds=None): """ request_pb = messages_pb2.UndeleteClusterRequest(name=self.name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._cluster_stub.UndeleteCluster.async( - request_pb, timeout_seconds) # We expect a `._generated.operations_pb2.Operation` - operation_pb2 = response.result() + operation_pb2 = self.client._cluster_stub.UndeleteCluster( + request_pb, timeout_seconds) self._operation_type = 'undelete' self._operation_id, self._operation_begin = _process_operation( diff --git a/gcloud_bigtable/test_client.py b/gcloud_bigtable/test_client.py index 8086a9b..5ad7dd2 100644 --- a/gcloud_bigtable/test_client.py +++ b/gcloud_bigtable/test_client.py @@ -583,7 +583,7 @@ def test__make_cluster_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_stub=mock_make_stub): + with _Monkey(MUT, make_beta_stub=mock_make_stub): result = client._make_cluster_stub() self.assertTrue(result is expected_result) From 14c49440a45b64699770df226320df7ff62bc45a Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 24 Nov 2015 15:45:04 -0800 Subject: [PATCH 06/11] Switching table API stub from alpha to beta impl. Again ran some `sed` commands to avoid adding extra hacks to `rewrite_imports.py`: git grep -l ' google\.bigtable\.admin\.table\.v1\.' | xargs sed -i 's/ google\.bigtable\.admin\.table\.v1\./ gcloud_bigtable\._generated\./g' --- .../_generated/bigtable_table_service_pb2.py | 52 +++++++++---------- gcloud_bigtable/client.py | 12 ++--- gcloud_bigtable/cluster.py | 5 +- gcloud_bigtable/column_family.py | 15 +++--- gcloud_bigtable/table.py | 17 ++---- gcloud_bigtable/test_client.py | 2 +- 6 files changed, 46 insertions(+), 57 deletions(-) diff --git a/gcloud_bigtable/_generated/bigtable_table_service_pb2.py b/gcloud_bigtable/_generated/bigtable_table_service_pb2.py index e17e1da..50c51a9 100644 --- a/gcloud_bigtable/_generated/bigtable_table_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_table_service_pb2.py @@ -304,24 +304,24 @@ def beta_create_BigtableTableService_server(servicer, pool=None, pool_size=None, import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 import gcloud_bigtable._generated.empty_pb2 request_deserializers = { - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateTableRequest.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteTableRequest.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.GetTableRequest.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesRequest.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.RenameTableRequest.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.GetTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.RenameTableRequest.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.FromString, } response_serializers = { - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): gcloud_bigtable._generated.bigtable_table_data_pb2.Table.SerializeToString, ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesResponse.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): gcloud_bigtable._generated.bigtable_table_data_pb2.Table.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesResponse.SerializeToString, ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.SerializeToString, } method_implementations = { ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): face_utilities.unary_unary_inline(servicer.CreateColumnFamily), @@ -354,24 +354,24 @@ def beta_create_BigtableTableService_stub(channel, host=None, metadata_transform import gcloud_bigtable._generated.bigtable_table_service_messages_pb2 import gcloud_bigtable._generated.empty_pb2 request_serializers = { - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.CreateTableRequest.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.DeleteTableRequest.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.GetTableRequest.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesRequest.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.RenameTableRequest.SerializeToString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateColumnFamilyRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.CreateTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteColumnFamilyRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.DeleteTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.GetTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.RenameTableRequest.SerializeToString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.SerializeToString, } response_deserializers = { - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateColumnFamily'): gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'CreateTable'): gcloud_bigtable._generated.bigtable_table_data_pb2.Table.FromString, ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteColumnFamily'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, ('google.bigtable.admin.table.v1.BigtableTableService', 'DeleteTable'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.Table.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): google.bigtable.admin.table.v1.bigtable_table_service_messages_pb2.ListTablesResponse.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'GetTable'): gcloud_bigtable._generated.bigtable_table_data_pb2.Table.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'ListTables'): gcloud_bigtable._generated.bigtable_table_service_messages_pb2.ListTablesResponse.FromString, ('google.bigtable.admin.table.v1.BigtableTableService', 'RenameTable'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, - ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): google.bigtable.admin.table.v1.bigtable_table_data_pb2.ColumnFamily.FromString, + ('google.bigtable.admin.table.v1.BigtableTableService', 'UpdateColumnFamily'): gcloud_bigtable._generated.bigtable_table_data_pb2.ColumnFamily.FromString, } cardinalities = { 'CreateColumnFamily': cardinality.Cardinality.UNARY_UNARY, diff --git a/gcloud_bigtable/client.py b/gcloud_bigtable/client.py index ec7a225..bd12d01 100644 --- a/gcloud_bigtable/client.py +++ b/gcloud_bigtable/client.py @@ -53,8 +53,8 @@ from gcloud_bigtable.cluster import Cluster -TABLE_STUB_FACTORY = (bigtable_table_service_pb2. - early_adopter_create_BigtableTableService_stub) +TABLE_STUB_FACTORY = ( + bigtable_table_service_pb2.beta_create_BigtableTableService_stub) TABLE_ADMIN_HOST = 'bigtabletableadmin.googleapis.com' """Table Admin API request host.""" TABLE_ADMIN_PORT = 443 @@ -456,7 +456,7 @@ def _make_data_stub(self): def _make_cluster_stub(self): """Creates gRPC stub to make requests to the Cluster Admin API. - :rtype: :class:`grpc.early_adopter.implementations._Stub` + :rtype: :class:`grpc.beta._stub._AutoIntermediary` :returns: A gRPC stub object. """ return make_beta_stub(self, CLUSTER_STUB_FACTORY, @@ -477,11 +477,11 @@ def _make_operations_stub(self): def _make_table_stub(self): """Creates gRPC stub to make requests to the Table Admin API. - :rtype: :class:`grpc.early_adopter.implementations._Stub` + :rtype: :class:`grpc.beta._stub._AutoIntermediary` :returns: A gRPC stub object. """ - return make_stub(self, TABLE_STUB_FACTORY, - TABLE_ADMIN_HOST, TABLE_ADMIN_PORT) + return make_beta_stub(self, TABLE_STUB_FACTORY, + TABLE_ADMIN_HOST, TABLE_ADMIN_PORT) def is_started(self): """Check if the client has been started. diff --git a/gcloud_bigtable/cluster.py b/gcloud_bigtable/cluster.py index c282742..9a15611 100644 --- a/gcloud_bigtable/cluster.py +++ b/gcloud_bigtable/cluster.py @@ -417,10 +417,9 @@ def list_tables(self, timeout_seconds=None): """ request_pb = table_messages_pb2.ListTablesRequest(name=self.name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.ListTables.async(request_pb, - timeout_seconds) # We expect a `table_messages_pb2.ListTablesResponse` - table_list_pb = response.result() + table_list_pb = self.client._table_stub.ListTables(request_pb, + timeout_seconds) result = [] for table_pb in table_list_pb.tables: diff --git a/gcloud_bigtable/column_family.py b/gcloud_bigtable/column_family.py index 58b3973..c85d2d5 100644 --- a/gcloud_bigtable/column_family.py +++ b/gcloud_bigtable/column_family.py @@ -255,10 +255,9 @@ def create(self, timeout_seconds=None): column_family=column_family, ) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.CreateColumnFamily.async( - request_pb, timeout_seconds) # We expect a `.data_pb2.ColumnFamily` - response.result() + self.client._table_stub.CreateColumnFamily(request_pb, + timeout_seconds) def update(self, timeout_seconds=None): """Update this column family. @@ -282,10 +281,9 @@ def update(self, timeout_seconds=None): request_kwargs['gc_rule'] = self.gc_rule.to_pb() request_pb = data_pb2.ColumnFamily(**request_kwargs) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.UpdateColumnFamily.async( - request_pb, timeout_seconds) # We expect a `.data_pb2.ColumnFamily` - response.result() + self.client._table_stub.UpdateColumnFamily(request_pb, + timeout_seconds) def delete(self, timeout_seconds=None): """Delete this column family. @@ -297,10 +295,9 @@ def delete(self, timeout_seconds=None): """ request_pb = messages_pb2.DeleteColumnFamilyRequest(name=self.name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.DeleteColumnFamily.async( - request_pb, timeout_seconds) # We expect a `._generated.empty_pb2.Empty` - response.result() + self.client._table_stub.DeleteColumnFamily(request_pb, + timeout_seconds) def _gc_rule_from_pb(gc_rule_pb): diff --git a/gcloud_bigtable/table.py b/gcloud_bigtable/table.py index b5fbec1..d471e6b 100644 --- a/gcloud_bigtable/table.py +++ b/gcloud_bigtable/table.py @@ -189,10 +189,8 @@ def create(self, initial_split_keys=None, timeout_seconds=None): table_id=self.table_id, ) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.CreateTable.async(request_pb, - timeout_seconds) # We expect a `._generated.bigtable_table_data_pb2.Table` - response.result() + self.client._table_stub.CreateTable(request_pb, timeout_seconds) def rename(self, new_table_id, timeout_seconds=None): """Rename this table. @@ -223,10 +221,8 @@ def rename(self, new_table_id, timeout_seconds=None): new_id=new_table_id, ) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.RenameTable.async(request_pb, - timeout_seconds) # We expect a `._generated.empty_pb2.Empty` - response.result() + self.client._table_stub.RenameTable(request_pb, timeout_seconds) self.table_id = new_table_id @@ -239,10 +235,8 @@ def delete(self, timeout_seconds=None): """ request_pb = messages_pb2.DeleteTableRequest(name=self.name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.DeleteTable.async(request_pb, - timeout_seconds) # We expect a `._generated.empty_pb2.Empty` - response.result() + self.client._table_stub.DeleteTable(request_pb, timeout_seconds) def list_column_families(self, timeout_seconds=None): """Check if this table exists. @@ -260,10 +254,9 @@ def list_column_families(self, timeout_seconds=None): """ request_pb = messages_pb2.GetTableRequest(name=self.name) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._table_stub.GetTable.async(request_pb, - timeout_seconds) # We expect a `._generated.bigtable_table_data_pb2.Table` - table_pb = response.result() + table_pb = self.client._table_stub.GetTable(request_pb, + timeout_seconds) result = {} for column_family_id, value_pb in table_pb.column_families.items(): diff --git a/gcloud_bigtable/test_client.py b/gcloud_bigtable/test_client.py index 5ad7dd2..8f6b57b 100644 --- a/gcloud_bigtable/test_client.py +++ b/gcloud_bigtable/test_client.py @@ -639,7 +639,7 @@ def test__make_table_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_stub=mock_make_stub): + with _Monkey(MUT, make_beta_stub=mock_make_stub): result = client._make_table_stub() self.assertTrue(result is expected_result) From 5cf16baaf5559a8326a8ced32a3976b2ddcbb1a6 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 24 Nov 2015 15:49:59 -0800 Subject: [PATCH 07/11] Switching data API stub from alpha to beta impl. Again ran some `sed` commands to avoid adding extra hacks to `rewrite_imports.py`: git grep -l ' google\.bigtable\.v1\.' | xargs sed -i 's/ google\.bigtable\.v1\./ gcloud_bigtable\._generated\./g' --- .../_generated/bigtable_service_pb2.py | 36 +++++++++---------- gcloud_bigtable/_grpc_mocks.py | 18 ---------- gcloud_bigtable/client.py | 8 ++--- gcloud_bigtable/row.py | 16 ++++----- gcloud_bigtable/test_client.py | 5 ++- 5 files changed, 29 insertions(+), 54 deletions(-) diff --git a/gcloud_bigtable/_generated/bigtable_service_pb2.py b/gcloud_bigtable/_generated/bigtable_service_pb2.py index 01724ce..3b0163c 100644 --- a/gcloud_bigtable/_generated/bigtable_service_pb2.py +++ b/gcloud_bigtable/_generated/bigtable_service_pb2.py @@ -215,18 +215,18 @@ def beta_create_BigtableService_server(servicer, pool=None, pool_size=None, defa import gcloud_bigtable._generated.bigtable_service_messages_pb2 import gcloud_bigtable._generated.bigtable_data_pb2 request_deserializers = { - ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowRequest.FromString, - ('google.bigtable.v1.BigtableService', 'MutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.MutateRowRequest.FromString, - ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.FromString, - ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsRequest.FromString, - ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysRequest.FromString, + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowRequest.FromString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.MutateRowRequest.FromString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.FromString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsRequest.FromString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysRequest.FromString, } response_serializers = { - ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowResponse.SerializeToString, + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowResponse.SerializeToString, ('google.bigtable.v1.BigtableService', 'MutateRow'): gcloud_bigtable._generated.empty_pb2.Empty.SerializeToString, - ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_data_pb2.Row.SerializeToString, - ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsResponse.SerializeToString, - ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysResponse.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): gcloud_bigtable._generated.bigtable_data_pb2.Row.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsResponse.SerializeToString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysResponse.SerializeToString, } method_implementations = { ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): face_utilities.unary_unary_inline(servicer.CheckAndMutateRow), @@ -250,18 +250,18 @@ def beta_create_BigtableService_stub(channel, host=None, metadata_transformer=No import gcloud_bigtable._generated.bigtable_service_messages_pb2 import gcloud_bigtable._generated.bigtable_data_pb2 request_serializers = { - ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowRequest.SerializeToString, - ('google.bigtable.v1.BigtableService', 'MutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.MutateRowRequest.SerializeToString, - ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.SerializeToString, - ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsRequest.SerializeToString, - ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'MutateRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.MutateRowRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadModifyWriteRowRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsRequest.SerializeToString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysRequest.SerializeToString, } response_deserializers = { - ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): google.bigtable.v1.bigtable_service_messages_pb2.CheckAndMutateRowResponse.FromString, + ('google.bigtable.v1.BigtableService', 'CheckAndMutateRow'): gcloud_bigtable._generated.bigtable_service_messages_pb2.CheckAndMutateRowResponse.FromString, ('google.bigtable.v1.BigtableService', 'MutateRow'): gcloud_bigtable._generated.empty_pb2.Empty.FromString, - ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): google.bigtable.v1.bigtable_data_pb2.Row.FromString, - ('google.bigtable.v1.BigtableService', 'ReadRows'): google.bigtable.v1.bigtable_service_messages_pb2.ReadRowsResponse.FromString, - ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): google.bigtable.v1.bigtable_service_messages_pb2.SampleRowKeysResponse.FromString, + ('google.bigtable.v1.BigtableService', 'ReadModifyWriteRow'): gcloud_bigtable._generated.bigtable_data_pb2.Row.FromString, + ('google.bigtable.v1.BigtableService', 'ReadRows'): gcloud_bigtable._generated.bigtable_service_messages_pb2.ReadRowsResponse.FromString, + ('google.bigtable.v1.BigtableService', 'SampleRowKeys'): gcloud_bigtable._generated.bigtable_service_messages_pb2.SampleRowKeysResponse.FromString, } cardinalities = { 'CheckAndMutateRow': cardinality.Cardinality.UNARY_UNARY, diff --git a/gcloud_bigtable/_grpc_mocks.py b/gcloud_bigtable/_grpc_mocks.py index 27b2e47..06a6cc9 100644 --- a/gcloud_bigtable/_grpc_mocks.py +++ b/gcloud_bigtable/_grpc_mocks.py @@ -15,17 +15,6 @@ """Testing mocks for grpc.""" -class AsyncResult(object): - """Result returned from a ``MethodMock.async`` call.""" - - def __init__(self, result): - self._result = result - - def result(self): - """Result method on an asyc object.""" - return self._result - - class MethodMock(object): """Mock for :class:`grpc.framework.alpha._reexport._UnaryUnarySyncAsync`. @@ -40,13 +29,6 @@ def __init__(self, name, factory): self._name = name self._factory = factory - def async(self, *args, **kwargs): - """Async method meant to mock a gRPC stub request.""" - self._factory.method_calls.append((self._name, args, kwargs)) - curr_result = self._factory.results[0] - self._factory.results = self._factory.results[1:] - return AsyncResult(curr_result) - def __call__(self, *args, **kwargs): """Sync method meant to mock a gRPC stub request.""" self._factory.method_calls.append((self._name, args, kwargs)) diff --git a/gcloud_bigtable/client.py b/gcloud_bigtable/client.py index bd12d01..2b47deb 100644 --- a/gcloud_bigtable/client.py +++ b/gcloud_bigtable/client.py @@ -48,7 +48,6 @@ from gcloud_bigtable._generated import bigtable_service_pb2 from gcloud_bigtable._generated import bigtable_table_service_pb2 from gcloud_bigtable._generated import operations_pb2 -from gcloud_bigtable._helpers import make_stub from gcloud_bigtable._helpers import make_beta_stub from gcloud_bigtable.cluster import Cluster @@ -67,8 +66,7 @@ CLUSTER_ADMIN_PORT = 443 """Cluster Admin API request port.""" -DATA_STUB_FACTORY = (bigtable_service_pb2. - early_adopter_create_BigtableService_stub) +DATA_STUB_FACTORY = bigtable_service_pb2.beta_create_BigtableService_stub DATA_API_HOST = 'bigtable.googleapis.com' """Data API request host.""" DATA_API_PORT = 443 @@ -450,8 +448,8 @@ def _make_data_stub(self): :rtype: :class:`grpc.early_adopter.implementations._Stub` :returns: A gRPC stub object. """ - return make_stub(self, DATA_STUB_FACTORY, - DATA_API_HOST, DATA_API_PORT) + return make_beta_stub(self, DATA_STUB_FACTORY, + DATA_API_HOST, DATA_API_PORT) def _make_cluster_stub(self): """Creates gRPC stub to make requests to the Cluster Admin API. diff --git a/gcloud_bigtable/row.py b/gcloud_bigtable/row.py index 5d26c49..35ed9c4 100644 --- a/gcloud_bigtable/row.py +++ b/gcloud_bigtable/row.py @@ -416,10 +416,8 @@ def _commit_mutate(self, timeout_seconds=None): mutations=mutations_list, ) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._data_stub.MutateRow.async(request_pb, - timeout_seconds) # We expect a `._generated.empty_pb2.Empty`. - response.result() + self.client._data_stub.MutateRow(request_pb, timeout_seconds) def _commit_check_and_mutate(self, timeout_seconds=None): """Makes a ``CheckAndMutateRow`` API request. @@ -458,11 +456,10 @@ def _commit_check_and_mutate(self, timeout_seconds=None): false_mutations=false_mutations, ) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._data_stub.CheckAndMutateRow.async( - request_pb, timeout_seconds) # We expect a `.messages_pb2.CheckAndMutateRowResponse` - check_and_mutate_row_response = response.result() - return check_and_mutate_row_response.predicate_matched + resp = self.client._data_stub.CheckAndMutateRow( + request_pb, timeout_seconds) + return resp.predicate_matched def clear_mutations(self): """Removes all currently accumulated mutations on the current row.""" @@ -566,10 +563,9 @@ def commit_modifications(self, timeout_seconds=None): rules=self._rule_pb_list, ) timeout_seconds = timeout_seconds or self.timeout_seconds - response = self.client._data_stub.ReadModifyWriteRow.async( - request_pb, timeout_seconds) # We expect a `.data_pb2.Row` - row_response = response.result() + row_response = self.client._data_stub.ReadModifyWriteRow( + request_pb, timeout_seconds) # Reset modifications after commit-ing request. self.clear_modification_rules() diff --git a/gcloud_bigtable/test_client.py b/gcloud_bigtable/test_client.py index 8f6b57b..bbd777a 100644 --- a/gcloud_bigtable/test_client.py +++ b/gcloud_bigtable/test_client.py @@ -555,7 +555,7 @@ def test__make_data_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_stub=mock_make_stub): + with _Monkey(MUT, make_beta_stub=mock_make_stub): result = client._make_data_stub() self.assertTrue(result is expected_result) @@ -677,8 +677,7 @@ def _start_method_helper(self, admin): credentials=credentials, admin=admin) stub = _FakeStub() mock_make_stub = _MockCalled(stub) - with _Monkey(MUT, make_stub=mock_make_stub, - make_beta_stub=mock_make_stub): + with _Monkey(MUT, make_beta_stub=mock_make_stub): client.start() self.assertTrue(client._data_stub_internal is stub) From ca4f708e980d488386525c9ef64eb30295aeb6df Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 24 Nov 2015 15:53:17 -0800 Subject: [PATCH 08/11] Renaming make_beta_stub() as make_stub(). The alias is no longer needed since all stubs have been converted to the new implementation. --- gcloud_bigtable/_helpers.py | 30 +----------------------- gcloud_bigtable/client.py | 18 +++++++-------- gcloud_bigtable/test__helpers.py | 39 -------------------------------- gcloud_bigtable/test_client.py | 10 ++++---- 4 files changed, 15 insertions(+), 82 deletions(-) diff --git a/gcloud_bigtable/_helpers.py b/gcloud_bigtable/_helpers.py index d0e6499..32c5652 100644 --- a/gcloud_bigtable/_helpers.py +++ b/gcloud_bigtable/_helpers.py @@ -276,35 +276,7 @@ def get_certs(): def make_stub(client, stub_factory, host, port): """Makes a stub for an RPC service. - :type client: :class:`.client.Client` - :param client: The client that owns the cluster. Provides authorization and - user agent. - - :type stub_factory: callable - :param stub_factory: A factory which will create a gRPC stub for - a given service. - - :type host: str - :param host: The host for the service. - - :type port: int - :param port: The port for the service. - - :rtype: :class:`grpc.early_adopter.implementations._Stub` - :returns: The stub object used to make gRPC requests to the - Data API. - """ - custom_metadata_transformer = MetadataTransformer(client) - return stub_factory(host, port, - metadata_transformer=custom_metadata_transformer, - secure=True, - root_certificates=get_certs()) - - -def make_beta_stub(client, stub_factory, host, port): - """Makes a (beta) stub for an RPC service. - - Uses the beta implementation of gRPC. + Uses / depends on the beta implementation of gRPC. :type client: :class:`.client.Client` :param client: The client that owns the cluster. Provides authorization and diff --git a/gcloud_bigtable/client.py b/gcloud_bigtable/client.py index 2b47deb..1a9df15 100644 --- a/gcloud_bigtable/client.py +++ b/gcloud_bigtable/client.py @@ -48,7 +48,7 @@ from gcloud_bigtable._generated import bigtable_service_pb2 from gcloud_bigtable._generated import bigtable_table_service_pb2 from gcloud_bigtable._generated import operations_pb2 -from gcloud_bigtable._helpers import make_beta_stub +from gcloud_bigtable._helpers import make_stub from gcloud_bigtable.cluster import Cluster @@ -448,8 +448,8 @@ def _make_data_stub(self): :rtype: :class:`grpc.early_adopter.implementations._Stub` :returns: A gRPC stub object. """ - return make_beta_stub(self, DATA_STUB_FACTORY, - DATA_API_HOST, DATA_API_PORT) + return make_stub(self, DATA_STUB_FACTORY, + DATA_API_HOST, DATA_API_PORT) def _make_cluster_stub(self): """Creates gRPC stub to make requests to the Cluster Admin API. @@ -457,8 +457,8 @@ def _make_cluster_stub(self): :rtype: :class:`grpc.beta._stub._AutoIntermediary` :returns: A gRPC stub object. """ - return make_beta_stub(self, CLUSTER_STUB_FACTORY, - CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) + return make_stub(self, CLUSTER_STUB_FACTORY, + CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) def _make_operations_stub(self): """Creates gRPC stub to make requests to the Operations API. @@ -469,8 +469,8 @@ def _make_operations_stub(self): :rtype: :class:`grpc.beta._stub._AutoIntermediary` :returns: A gRPC stub object. """ - return make_beta_stub(self, OPERATIONS_STUB_FACTORY, - CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) + return make_stub(self, OPERATIONS_STUB_FACTORY, + CLUSTER_ADMIN_HOST, CLUSTER_ADMIN_PORT) def _make_table_stub(self): """Creates gRPC stub to make requests to the Table Admin API. @@ -478,8 +478,8 @@ def _make_table_stub(self): :rtype: :class:`grpc.beta._stub._AutoIntermediary` :returns: A gRPC stub object. """ - return make_beta_stub(self, TABLE_STUB_FACTORY, - TABLE_ADMIN_HOST, TABLE_ADMIN_PORT) + return make_stub(self, TABLE_STUB_FACTORY, + TABLE_ADMIN_HOST, TABLE_ADMIN_PORT) def is_started(self): """Check if the client has been started. diff --git a/gcloud_bigtable/test__helpers.py b/gcloud_bigtable/test__helpers.py index 6039a53..9dd2106 100644 --- a/gcloud_bigtable/test__helpers.py +++ b/gcloud_bigtable/test__helpers.py @@ -411,45 +411,6 @@ def _callFUT(self, credentials, stub_factory, host, port): from gcloud_bigtable._helpers import make_stub return make_stub(credentials, stub_factory, host, port) - def test_it(self): - from gcloud_bigtable._testing import _MockCalled - from gcloud_bigtable._testing import _MockWithAttachedMethods - from gcloud_bigtable._testing import _Monkey - from gcloud_bigtable import _helpers as MUT - - mock_result = object() - custom_factory = _MockCalled(mock_result) - transformed = object() - transformer = _MockCalled(transformed) - - host = 'HOST' - port = 1025 - certs = 'FOOBAR' - client = _MockWithAttachedMethods() - with _Monkey(MUT, get_certs=lambda: certs, - MetadataTransformer=transformer): - result = self._callFUT(client, custom_factory, host, port) - - self.assertTrue(result is mock_result) - custom_factory.check_called( - self, - [(host, port)], - [{ - 'metadata_transformer': transformed, - 'secure': True, - 'root_certificates': certs, - }], - ) - transformer.check_called(self, [(client,)]) - self.assertEqual(client._called, []) - - -class Test_make_beta_stub(unittest2.TestCase): - - def _callFUT(self, credentials, stub_factory, host, port): - from gcloud_bigtable._helpers import make_beta_stub - return make_beta_stub(credentials, stub_factory, host, port) - def test_it(self): from gcloud_bigtable._testing import _MockCalled from gcloud_bigtable._testing import _MockWithAttachedMethods diff --git a/gcloud_bigtable/test_client.py b/gcloud_bigtable/test_client.py index bbd777a..324914c 100644 --- a/gcloud_bigtable/test_client.py +++ b/gcloud_bigtable/test_client.py @@ -555,7 +555,7 @@ def test__make_data_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_beta_stub=mock_make_stub): + with _Monkey(MUT, make_stub=mock_make_stub): result = client._make_data_stub() self.assertTrue(result is expected_result) @@ -583,7 +583,7 @@ def test__make_cluster_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_beta_stub=mock_make_stub): + with _Monkey(MUT, make_stub=mock_make_stub): result = client._make_cluster_stub() self.assertTrue(result is expected_result) @@ -611,7 +611,7 @@ def test__make_operations_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_beta_stub=mock_make_stub): + with _Monkey(MUT, make_stub=mock_make_stub): result = client._make_operations_stub() self.assertTrue(result is expected_result) @@ -639,7 +639,7 @@ def test__make_table_stub(self): client = self._makeOne(project=PROJECT, credentials=credentials) expected_result = object() mock_make_stub = _MockCalled(expected_result) - with _Monkey(MUT, make_beta_stub=mock_make_stub): + with _Monkey(MUT, make_stub=mock_make_stub): result = client._make_table_stub() self.assertTrue(result is expected_result) @@ -677,7 +677,7 @@ def _start_method_helper(self, admin): credentials=credentials, admin=admin) stub = _FakeStub() mock_make_stub = _MockCalled(stub) - with _Monkey(MUT, make_beta_stub=mock_make_stub): + with _Monkey(MUT, make_stub=mock_make_stub): client.start() self.assertTrue(client._data_stub_internal is stub) From f5e54692f7925174d07259c53e68530f68986eaf Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 24 Nov 2015 15:55:45 -0800 Subject: [PATCH 09/11] Adding stray comment. --- gcloud_bigtable/client.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gcloud_bigtable/client.py b/gcloud_bigtable/client.py index 1a9df15..482ba32 100644 --- a/gcloud_bigtable/client.py +++ b/gcloud_bigtable/client.py @@ -498,6 +498,11 @@ def start(self): if self.is_started(): return + # NOTE: We __enter__ the stubs more-or-less permanently. This is + # because only after entering the context managers is the + # connection created. We don't want to immediately close + # those connections since the client will make many + # requests with it over HTTP/2. self._data_stub_internal = self._make_data_stub() self._data_stub_internal.__enter__() if self._admin: From 75a857cd816625e40f087a60f00a1889f4978018 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Wed, 25 Nov 2015 08:36:20 -0800 Subject: [PATCH 10/11] Allowing happybase system test to create cluster. If it doesn't exist, the test setup catches an error and then creates the cluster. Also fixing tll->ttl typo. --- system_tests/run_happybase.py | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/system_tests/run_happybase.py b/system_tests/run_happybase.py index 082f171..b17fa07 100644 --- a/system_tests/run_happybase.py +++ b/system_tests/run_happybase.py @@ -50,6 +50,7 @@ class Config(object): connection = None table = None + delete_cluster = False def set_hbase_connection(): @@ -58,19 +59,29 @@ def set_hbase_connection(): def set_cloud_bigtable_connection(): + from grpc.framework.interfaces.face.face import NetworkError from gcloud_bigtable import client as client_mod from gcloud_bigtable.happybase import Connection - # NOTE: This assumes that the "gcloud-python" cluster in the - # "us-central1-c" zone already exists for this project. - # We are avoided checking "client.reload()" since the - # alpha version of grcpio does not correctly handle - # request timeouts. client_mod.PROJECT_ENV_VAR = 'GCLOUD_TESTS_PROJECT_ID' client = client_mod.Client(admin=True) zone = 'us-central1-c' cluster_id = 'gcloud-python' cluster = client.cluster(zone, cluster_id) + client.start() + try: + cluster.reload() + except NetworkError: + cluster.create() + count = 0 + while not cluster.operation_finished(): + count += 1 + if count > 5: + raise NetworkError('Create cluster timed out') + time.sleep(0.5) + # If our test run created a new cluster, then we tell the + # config to clean it up when done. + Config.delete_cluster = True Config.connection = Connection(cluster=cluster) @@ -102,6 +113,8 @@ def tearDownModule(): connection = get_connection() if not USING_HBASE: connection.delete_table(TABLE_NAME) + if Config.delete_cluster: + connection._cluster.delete() connection.close() @@ -740,9 +753,9 @@ def test_put_ttl_eviction(self): else: families = table.families() - cell_tll = TTL_FOR_TEST + cell_ttl = TTL_FOR_TEST chosen_fam = COL_FAM2 - self.assertEqual(families[chosen_fam]['time_to_live'], cell_tll) + self.assertEqual(families[chosen_fam]['time_to_live'], cell_ttl) chosen_col = COL3 self.assertTrue(chosen_col.startswith(chosen_fam + ':')) @@ -756,9 +769,9 @@ def test_put_ttl_eviction(self): self.assertEqual(all_values_before, [value1]) # Make sure we don't sleep for a problematic length. - self.assertTrue(cell_tll < 10) + self.assertTrue(cell_ttl < 10) # Wait for time-to-live eviction to occur. - time.sleep(cell_tll + 0.5) + time.sleep(cell_ttl + 0.5) all_values_after = table.cells(ROW_KEY1, chosen_col) self.assertEqual(all_values_after, []) From 148a002d90258cb0cc3459a8c8ee71590f8ca909 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Wed, 25 Nov 2015 08:59:41 -0800 Subject: [PATCH 11/11] Updating CONTRIB/README to drop linuxbrew referencs. --- CONTRIBUTING.md | 17 ++++++----------- README.md | 46 +++++++++++----------------------------------- 2 files changed, 17 insertions(+), 46 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 28876e3..1396f1d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,23 +43,18 @@ $ # [sudo] ldconfig ## Testing -Unfortunately, `tox` will fail by default due to the absence of -`grpcio` from `setup.py`. In order to successfully set up a `tox` -test environment (e.g `ENV=py27`), run +`tox` should work without modification, assuming you've installed +on Linux via ```bash -tox -e ${ENV} +$ apt-get install libgrpc-dev ``` -and watch the install fail (missing dependencies), then with the partially -set up environment, execute: +or on Mac OS X via ```bash -BREW_PREFIX=$(brew --prefix) -VERSION=0.10.0a0 -CFLAGS=-I${BREW_PREFIX}/include LDFLAGS=-L${BREW_PREFIX}/lib \ - .tox/${ENV}/bin/pip install grpcio==${VERSION} -unset BREW_PREFIX +$ brew tap grpc/grpc +$ brew install grpc ``` ## False Starts diff --git a/README.md b/README.md index a629913..f8e70a6 100644 --- a/README.md +++ b/README.md @@ -16,54 +16,31 @@ to support via HTTP/1.1. ## Installing gRPC -**NOTE**: These are out-of-date (as of November 18, 2015). - -Make sure you have downloaded [`homebrew`][6] on OS X or -[`linuxbrew`][7] on Linux. (On Linux, also be sure to -add `brew` to `${PATH}` as instructed.) - -First, install the gRPC core (C/C++) library +Before you can install the Python library (`grpcio`) you'll need the +gRPC core library on your system. To install this on Debian Linux: ```bash -curl -fsSL https://goo.gl/getgrpc | bash +$ apt-get install libgrpc-dev ``` -Since this uses `brew` to install, this cannot be run as -root (via `sudo`). - -Next, install the [Python][11] `grpcio` [library][12] via: +or on Mac OS X: ```bash -BREW_PREFIX=$(brew --prefix) -[sudo] CFLAGS=-I${BREW_PREFIX}/include LDFLAGS=-L${BREW_PREFIX}/lib \ -pip install --upgrade grpcio +$ brew tap grpc/grpc +$ brew install grpc ``` -You may wish to run this as root (via `sudo`) so it can be included with -your machine's Python libraries. If not, you'll need to use a Python -[virtual environment][13] so that non-privileged (i.e. non-`sudo`) installs -are allowed. - -Finally, you can install this library via +Once you've installed the system library, install the Python +library via: ```bash -[sudo] pip install -e git+https://github.com/dhermes/gcloud-python-bigtable#egg=gcloud-bigtable +$ pip install --upgrade grpcio ``` -Again, you may wish to install as root or in a virtual environment. - -## Running `gcloud_bigtable` code - -Since the gRPC core is installed via `brew`, the system libraries -are not in a place that Python can readily find them. - -In order to run code that uses `gcloud_bigtable` with these -libraries, you'll need to set the `LD_LIBRARY_PATH` environment -variable: +Finally, you can install this library via ```bash -BREW_PREFIX=$(brew --prefix) -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BREW_PREFIX}/lib +pip install -e git+https://github.com/dhermes/gcloud-python-bigtable#egg=gcloud-bigtable ``` ## Authorization @@ -167,5 +144,4 @@ See [`CONTRIBUTING.md`][3] for instructions on development. [10]: https://github.com/grpc/grpc/issues/2611 [11]: https://github.com/grpc/grpc/tree/master/src/python [12]: https://pypi.python.org/pypi/grpcio -[13]: http://docs.python-guide.org/en/latest/dev/virtualenvs/ [14]: https://console.developers.google.com/