Merge branch 'master' into resharding

This commit is contained in:
Alain Jobart 2015-08-06 17:02:52 -07:00
Родитель cfa4c4b056 8d9479bf7c
Коммит 23572a3f85
28 изменённых файлов: 330 добавлений и 317 удалений

Просмотреть файл

@ -109,7 +109,12 @@ repos="github.com/golang/glog \
repos+=" github.com/modocache/gover github.com/mattn/goveralls"
# The cover tool needs to be installed into the Go toolchain, so it will fail
# if Go is installed somewhere that requires root access.
repos+=" golang.org/x/tools/cmd/cover"
source tools/shell_functions.inc
if goversion_min 1.4; then
repos+=" golang.org/x/tools/cmd/cover"
else
repos+=" code.google.com/p/go.tools/cmd/cover"
fi
go get -u $repos

Просмотреть файл

@ -19,33 +19,121 @@ import proto "github.com/golang/protobuf/proto"
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
// ErrorCode is the enum values for Errors
// ErrorCode is the enum values for Errors. Internally, errors should
// be created with one of these codes. These will then be translated over the wire
// by various RPC frameworks.
type ErrorCode int32
const (
// NoError means there was no error, and the message should be ignored.
ErrorCode_NoError ErrorCode = 0
// TabletError is the base VtTablet error. All VtTablet errors
// should be 4 digits, starting with 1.
ErrorCode_TabletError ErrorCode = 1000
// UnknownTabletError is the code for an unknown error that came
// from VtTablet.
ErrorCode_UnknownTabletError ErrorCode = 1999
// VtgateError is the base VTGate error code. All VTGate errors
// should be 4 digits, starting with 2.
ErrorCode_VtgateError ErrorCode = 2000
// UnknownVtgateError is the code for an unknown error that came from VTGate.
ErrorCode_UnknownVtgateError ErrorCode = 2999
// SUCCESS is returned from a successful call
ErrorCode_SUCCESS ErrorCode = 0
// CANCELLED means that the context was cancelled (and noticed in the app layer,
// as opposed to the RPC layer)
ErrorCode_CANCELLED ErrorCode = 1
// UNKNOWN_ERROR includes:
// 1. MySQL error codes that we don't explicitly handle
// 2. MySQL response that wasn't as expected. For example, we might expect a MySQL
// timestamp to be returned in a particular way, but it wasn't.
// 3. Anything else that doesn't fall into a different bucket.
ErrorCode_UNKNOWN_ERROR ErrorCode = 2
// BAD_INPUT is returned when an end-user either sends SQL that couldn't be parsed correctly,
// or tries a query that isn't supported by Vitess.
ErrorCode_BAD_INPUT ErrorCode = 3
// DEADLINE_EXCEEDED is returned when an action is taking longer than a given timeout.
ErrorCode_DEADLINE_EXCEEDED ErrorCode = 4
// INTEGRITY_ERROR is returned on integrity error from MySQL, usually due to
// duplicate primary keys
ErrorCode_INTEGRITY_ERROR ErrorCode = 5
// PERMISSION_DENIED errors are returned when a user requests access to something
// that they don't have permissions for.
ErrorCode_PERMISSION_DENIED ErrorCode = 6
// THROTTLED_ERROR is returned when a user exceeds their quota in some dimension and
// get throttled due to that.
ErrorCode_THROTTLED_ERROR ErrorCode = 7
// QUERY_NOT_SERVED means that a query could not be served right now.
// This could be due to various reasons: QueryService is not running,
// should not be running, wrong shard, wrong tablet type, etc. Clients that
// receive this error should usually re-resolve the topology, and then retry the query.
ErrorCode_QUERY_NOT_SERVED ErrorCode = 8
// NOT_IN_TX means that we're not currently in a transaction, but we should be.
ErrorCode_NOT_IN_TX ErrorCode = 9
// INTERNAL_ERROR is returned when:
// 1. Something is not configured correctly internally.
// 2. A necessary resource is not available
// 3. Some other internal error occures
// INTERNAL_ERRORs are not problems that are expected to fix themselves, and retrying
// the query will not help.
ErrorCode_INTERNAL_ERROR ErrorCode = 10
// RESOURCE_TEMPORARILY_UNAVAILABLE is used for when a resource limit has temporarily
// been reached. Trying this error, with an exponential backoff, should succeed.
// Various types of resources can be exhausted, including:
// 1. TxPool can be full
// 2. VtGate could have request backlog
// 3. MySQL could have a deadlock
ErrorCode_RESOURCE_TEMPORARILY_UNAVAILABLE ErrorCode = 11
)
var ErrorCode_name = map[int32]string{
0: "SUCCESS",
1: "CANCELLED",
2: "UNKNOWN_ERROR",
3: "BAD_INPUT",
4: "DEADLINE_EXCEEDED",
5: "INTEGRITY_ERROR",
6: "PERMISSION_DENIED",
7: "THROTTLED_ERROR",
8: "QUERY_NOT_SERVED",
9: "NOT_IN_TX",
10: "INTERNAL_ERROR",
11: "RESOURCE_TEMPORARILY_UNAVAILABLE",
}
var ErrorCode_value = map[string]int32{
"SUCCESS": 0,
"CANCELLED": 1,
"UNKNOWN_ERROR": 2,
"BAD_INPUT": 3,
"DEADLINE_EXCEEDED": 4,
"INTEGRITY_ERROR": 5,
"PERMISSION_DENIED": 6,
"THROTTLED_ERROR": 7,
"QUERY_NOT_SERVED": 8,
"NOT_IN_TX": 9,
"INTERNAL_ERROR": 10,
"RESOURCE_TEMPORARILY_UNAVAILABLE": 11,
}
func (x ErrorCode) String() string {
return proto.EnumName(ErrorCode_name, int32(x))
}
// ErrorCodeDeprecated is the enum values for Errors. These are deprecated errors, we
// should instead be using ErrorCode.
type ErrorCodeDeprecated int32
const (
// NoError means there was no error, and the message should be ignored.
ErrorCodeDeprecated_NoError ErrorCodeDeprecated = 0
// TabletError is the base VtTablet error. All VtTablet errors
// should be 4 digits, starting with 1.
ErrorCodeDeprecated_TabletError ErrorCodeDeprecated = 1000
// UnknownTabletError is the code for an unknown error that came
// from VtTablet.
ErrorCodeDeprecated_UnknownTabletError ErrorCodeDeprecated = 1999
// VtgateError is the base VTGate error code. All VTGate errors
// should be 4 digits, starting with 2.
ErrorCodeDeprecated_VtgateError ErrorCodeDeprecated = 2000
// UnknownVtgateError is the code for an unknown error that came from VTGate.
ErrorCodeDeprecated_UnknownVtgateError ErrorCodeDeprecated = 2999
)
var ErrorCodeDeprecated_name = map[int32]string{
0: "NoError",
1000: "TabletError",
1999: "UnknownTabletError",
2000: "VtgateError",
2999: "UnknownVtgateError",
}
var ErrorCode_value = map[string]int32{
var ErrorCodeDeprecated_value = map[string]int32{
"NoError": 0,
"TabletError": 1000,
"UnknownTabletError": 1999,
@ -53,8 +141,8 @@ var ErrorCode_value = map[string]int32{
"UnknownVtgateError": 2999,
}
func (x ErrorCode) String() string {
return proto.EnumName(ErrorCode_name, int32(x))
func (x ErrorCodeDeprecated) String() string {
return proto.EnumName(ErrorCodeDeprecated_name, int32(x))
}
// CallerID is passed along RPCs to identify the originating client
@ -91,8 +179,8 @@ func (*CallerID) ProtoMessage() {}
// We use this so the clients don't have to parse the error messages,
// but instead can depend on the value of the code.
type RPCError struct {
Code ErrorCode `protobuf:"varint,1,opt,name=code,enum=vtrpc.ErrorCode" json:"code,omitempty"`
Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
Code ErrorCodeDeprecated `protobuf:"varint,1,opt,name=code,enum=vtrpc.ErrorCodeDeprecated" json:"code,omitempty"`
Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
}
func (m *RPCError) Reset() { *m = RPCError{} }
@ -101,4 +189,5 @@ func (*RPCError) ProtoMessage() {}
func init() {
proto.RegisterEnum("vtrpc.ErrorCode", ErrorCode_name, ErrorCode_value)
proto.RegisterEnum("vtrpc.ErrorCodeDeprecated", ErrorCodeDeprecated_name, ErrorCodeDeprecated_value)
}

Просмотреть файл

@ -38,6 +38,12 @@ func (n *ActionNode) LockKeyspace(ctx context.Context, ts topo.Server, keyspace
// UnlockKeyspace unlocks a previously locked keyspace.
func (n *ActionNode) UnlockKeyspace(ctx context.Context, ts topo.Server, keyspace string, lockPath string, actionError error) error {
// Detach from the parent timeout, but copy the trace span.
// We need to still release the lock even if the parent context timed out.
ctx = trace.CopySpan(context.TODO(), ctx)
ctx, cancel := context.WithTimeout(ctx, DefaultLockTimeout)
defer cancel()
span := trace.NewSpanFromContext(ctx)
span.StartClient("TopoServer.UnlockKeyspaceForAction")
span.Annotate("action", n.Action)
@ -82,6 +88,12 @@ func (n *ActionNode) LockShard(ctx context.Context, ts topo.Server, keyspace, sh
// UnlockShard unlocks a previously locked shard.
func (n *ActionNode) UnlockShard(ctx context.Context, ts topo.Server, keyspace, shard string, lockPath string, actionError error) error {
// Detach from the parent timeout, but copy the trace span.
// We need to still release the lock even if the parent context timed out.
ctx = trace.CopySpan(context.TODO(), ctx)
ctx, cancel := context.WithTimeout(ctx, DefaultLockTimeout)
defer cancel()
span := trace.NewSpanFromContext(ctx)
span.StartClient("TopoServer.UnlockShardForAction")
span.Annotate("action", n.Action)
@ -128,6 +140,12 @@ func (n *ActionNode) LockSrvShard(ctx context.Context, ts topo.Server, cell, key
// UnlockSrvShard unlocks a previously locked serving shard.
func (n *ActionNode) UnlockSrvShard(ctx context.Context, ts topo.Server, cell, keyspace, shard string, lockPath string, actionError error) error {
// Detach from the parent timeout, but copy the trace span.
// We need to still release the lock even if the parent context timed out.
ctx = trace.CopySpan(context.TODO(), ctx)
ctx, cancel := context.WithTimeout(ctx, DefaultLockTimeout)
defer cancel()
span := trace.NewSpanFromContext(ctx)
span.StartClient("TopoServer.UnlockSrvShardForAction")
span.Annotate("action", n.Action)

Просмотреть файл

@ -329,7 +329,7 @@ func TabletErrorToRPCError(err error) *vtrpc.RPCError {
if terr, ok := err.(*TabletError); ok {
return &vtrpc.RPCError{
// Transform TabletError code to VitessError code
Code: vtrpc.ErrorCode(int64(terr.ErrorType) + vterrors.TabletError),
Code: vtrpc.ErrorCodeDeprecated(int64(terr.ErrorType) + vterrors.TabletError),
// Make sure the the VitessError message is identical to the TabletError
// err, so that downstream consumers will see identical messages no matter
// which endpoint they're using.
@ -337,7 +337,7 @@ func TabletErrorToRPCError(err error) *vtrpc.RPCError {
}
}
return &vtrpc.RPCError{
Code: vtrpc.ErrorCode_UnknownTabletError,
Code: vtrpc.ErrorCodeDeprecated_UnknownTabletError,
Message: err.Error(),
}
}

Просмотреть файл

@ -91,7 +91,7 @@ func VtGateErrorToVtRPCError(err error, errString string) *vtrpc.RPCError {
message = errString
}
return &vtrpc.RPCError{
Code: vtrpc.ErrorCode_UnknownVtgateError,
Code: vtrpc.ErrorCodeDeprecated_UnknownVtgateError,
Message: message,
}
}

Просмотреть файл

@ -33,8 +33,61 @@ message CallerID {
string subcomponent = 3;
}
// ErrorCode is the enum values for Errors
// ErrorCode is the enum values for Errors. Internally, errors should
// be created with one of these codes. These will then be translated over the wire
// by various RPC frameworks.
enum ErrorCode {
// SUCCESS is returned from a successful call
SUCCESS = 0;
// CANCELLED means that the context was cancelled (and noticed in the app layer,
// as opposed to the RPC layer)
CANCELLED = 1;
// UNKNOWN_ERROR includes:
// 1. MySQL error codes that we don't explicitly handle
// 2. MySQL response that wasn't as expected. For example, we might expect a MySQL
// timestamp to be returned in a particular way, but it wasn't.
// 3. Anything else that doesn't fall into a different bucket.
UNKNOWN_ERROR = 2;
// BAD_INPUT is returned when an end-user either sends SQL that couldn't be parsed correctly,
// or tries a query that isn't supported by Vitess.
BAD_INPUT = 3;
// DEADLINE_EXCEEDED is returned when an action is taking longer than a given timeout.
DEADLINE_EXCEEDED = 4;
// INTEGRITY_ERROR is returned on integrity error from MySQL, usually due to
// duplicate primary keys
INTEGRITY_ERROR = 5;
// PERMISSION_DENIED errors are returned when a user requests access to something
// that they don't have permissions for.
PERMISSION_DENIED = 6;
// THROTTLED_ERROR is returned when a user exceeds their quota in some dimension and
// get throttled due to that.
THROTTLED_ERROR = 7;
// QUERY_NOT_SERVED means that a query could not be served right now.
// This could be due to various reasons: QueryService is not running,
// should not be running, wrong shard, wrong tablet type, etc. Clients that
// receive this error should usually re-resolve the topology, and then retry the query.
QUERY_NOT_SERVED = 8;
// NOT_IN_TX means that we're not currently in a transaction, but we should be.
NOT_IN_TX = 9;
// INTERNAL_ERROR is returned when:
// 1. Something is not configured correctly internally.
// 2. A necessary resource is not available
// 3. Some other internal error occures
// INTERNAL_ERRORs are not problems that are expected to fix themselves, and retrying
// the query will not help.
INTERNAL_ERROR = 10;
// RESOURCE_TEMPORARILY_UNAVAILABLE is used for when a resource limit has temporarily
// been reached. Trying this error, with an exponential backoff, should succeed.
// Various types of resources can be exhausted, including:
// 1. TxPool can be full
// 2. VtGate could have request backlog
// 3. MySQL could have a deadlock
RESOURCE_TEMPORARILY_UNAVAILABLE = 11;
}
// ErrorCodeDeprecated is the enum values for Errors. These are deprecated errors, we
// should instead be using ErrorCode.
enum ErrorCodeDeprecated {
// NoError means there was no error, and the message should be ignored.
NoError = 0;
@ -59,6 +112,6 @@ enum ErrorCode {
// We use this so the clients don't have to parse the error messages,
// but instead can depend on the value of the code.
message RPCError {
ErrorCode code = 1;
ErrorCodeDeprecated code = 1;
string message = 2;
}

Просмотреть файл

@ -19,7 +19,6 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='automation.proto',
package='automation',
syntax='proto3',
serialized_pb=_b('\n\x10\x61utomation.proto\x12\nautomation\"\x90\x01\n\x10\x43lusterOperation\x12\n\n\x02id\x18\x01 \x01(\t\x12/\n\x0cserial_tasks\x18\x02 \x03(\x0b\x32\x19.automation.TaskContainer\x12\x30\n\x05state\x18\x03 \x01(\x0e\x32!.automation.ClusterOperationState\x12\r\n\x05\x65rror\x18\x04 \x01(\t\"N\n\rTaskContainer\x12(\n\x0eparallel_tasks\x18\x01 \x03(\x0b\x32\x10.automation.Task\x12\x13\n\x0b\x63oncurrency\x18\x02 \x01(\x05\"\xce\x01\n\x04Task\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x34\n\nparameters\x18\x02 \x03(\x0b\x32 .automation.Task.ParametersEntry\x12\n\n\x02id\x18\x03 \x01(\t\x12$\n\x05state\x18\x04 \x01(\x0e\x32\x15.automation.TaskState\x12\x0e\n\x06output\x18\x05 \x01(\t\x12\r\n\x05\x65rror\x18\x06 \x01(\t\x1a\x31\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xb1\x01\n\x1e\x45nqueueClusterOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12N\n\nparameters\x18\x02 \x03(\x0b\x32:.automation.EnqueueClusterOperationRequest.ParametersEntry\x1a\x31\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"-\n\x1f\x45nqueueClusterOperationResponse\x12\n\n\x02id\x18\x01 \x01(\t\"-\n\x1fGetClusterOperationStateRequest\x12\n\n\x02id\x18\x01 \x01(\t\"T\n GetClusterOperationStateResponse\x12\x30\n\x05state\x18\x01 \x01(\x0e\x32!.automation.ClusterOperationState\"/\n!GetClusterOperationDetailsRequest\x12\n\n\x02id\x18\x01 \x01(\t\"V\n\"GetClusterOperationDetailsResponse\x12\x30\n\ncluster_op\x18\x02 \x01(\x0b\x32\x1c.automation.ClusterOperation*\x9a\x01\n\x15\x43lusterOperationState\x12#\n\x1fUNKNOWN_CLUSTER_OPERATION_STATE\x10\x00\x12!\n\x1d\x43LUSTER_OPERATION_NOT_STARTED\x10\x01\x12\x1d\n\x19\x43LUSTER_OPERATION_RUNNING\x10\x02\x12\x1a\n\x16\x43LUSTER_OPERATION_DONE\x10\x03*K\n\tTaskState\x12\x16\n\x12UNKNOWN_TASK_STATE\x10\x00\x12\x0f\n\x0bNOT_STARTED\x10\x01\x12\x0b\n\x07RUNNING\x10\x02\x12\x08\n\x04\x44ONE\x10\x03\x62\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@ -140,7 +139,6 @@ _CLUSTEROPERATION = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -178,7 +176,6 @@ _TASKCONTAINER = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -216,7 +213,6 @@ _TASK_PARAMETERSENTRY = _descriptor.Descriptor(
],
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -281,7 +277,6 @@ _TASK = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -319,7 +314,6 @@ _ENQUEUECLUSTEROPERATIONREQUEST_PARAMETERSENTRY = _descriptor.Descriptor(
],
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -356,7 +350,6 @@ _ENQUEUECLUSTEROPERATIONREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -387,7 +380,6 @@ _ENQUEUECLUSTEROPERATIONRESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -418,7 +410,6 @@ _GETCLUSTEROPERATIONSTATEREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -449,7 +440,6 @@ _GETCLUSTEROPERATIONSTATERESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -480,7 +470,6 @@ _GETCLUSTEROPERATIONDETAILSREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -511,7 +500,6 @@ _GETCLUSTEROPERATIONDETAILSRESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Просмотреть файл

@ -19,7 +19,6 @@ import automation_pb2 as automation__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='automationservice.proto',
package='automationservice',
syntax='proto3',
serialized_pb=_b('\n\x17\x61utomationservice.proto\x12\x11\x61utomationservice\x1a\x10\x61utomation.proto2\x81\x02\n\nAutomation\x12t\n\x17\x45nqueueClusterOperation\x12*.automation.EnqueueClusterOperationRequest\x1a+.automation.EnqueueClusterOperationResponse\"\x00\x12}\n\x1aGetClusterOperationDetails\x12-.automation.GetClusterOperationDetailsRequest\x1a..automation.GetClusterOperationDetailsResponse\"\x00\x62\x06proto3')
,
dependencies=[automation__pb2.DESCRIPTOR,])
@ -61,7 +60,7 @@ class EarlyAdopterAutomationStub(object):
def GetClusterOperationDetails(self, request):
raise NotImplementedError()
GetClusterOperationDetails.async = None
def early_adopter_create_Automation_server(servicer, port, private_key=None, certificate_chain=None):
def early_adopter_create_Automation_server(servicer, port, root_certificates, key_chain_pairs):
import automation_pb2
import automation_pb2
import automation_pb2
@ -78,8 +77,8 @@ def early_adopter_create_Automation_server(servicer, port, private_key=None, cer
automation_pb2.GetClusterOperationDetailsResponse.SerializeToString,
),
}
return implementations.server("automationservice.Automation", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain)
def early_adopter_create_Automation_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None):
return implementations.secure_server("automationservice.Automation", method_service_descriptions, port, root_certificates, key_chain_pairs)
def early_adopter_create_Automation_stub(host, port):
import automation_pb2
import automation_pb2
import automation_pb2
@ -94,5 +93,5 @@ def early_adopter_create_Automation_stub(host, port, metadata_transformer=None,
automation_pb2.GetClusterOperationDetailsResponse.FromString,
),
}
return implementations.stub("automationservice.Automation", 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 implementations.insecure_stub("automationservice.Automation", method_invocation_descriptions, host, port)
# @@protoc_insertion_point(module_scope)

Просмотреть файл

@ -20,7 +20,6 @@ import topodata_pb2 as topodata__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='binlogdata.proto',
package='binlogdata',
syntax='proto3',
serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xf3\x02\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x16\n\x0etransaction_id\x18\x03 \x01(\t\x1a\xf5\x01\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x02 \x01(\x0c\"q\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\n\n\x06\x42L_DML\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\"\x9b\x02\n\x0bStreamEvent\x12\x32\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32 .binlogdata.StreamEvent.Category\x12\x12\n\ntable_name\x18\x02 \x01(\t\x12(\n\x12primary_key_fields\x18\x03 \x03(\x0b\x32\x0c.query.Field\x12&\n\x12primary_key_values\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x0b\n\x03sql\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\x03\x12\x16\n\x0etransaction_id\x18\x07 \x01(\t\":\n\x08\x43\x61tegory\x12\n\n\x06SE_ERR\x10\x00\x12\n\n\x06SE_DML\x10\x01\x12\n\n\x06SE_DDL\x10\x02\x12\n\n\x06SE_POS\x10\x03\"\'\n\x13StreamUpdateRequest\x12\x10\n\x08position\x18\x01 \x01(\t\"E\n\x14StreamUpdateResponse\x12-\n\x0cstream_event\x18\x01 \x01(\x0b\x32\x17.binlogdata.StreamEvent\"\xaa\x01\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x32\n\x10keyspace_id_type\x18\x02 \x01(\x0e\x32\x18.topodata.KeyspaceIdType\x12%\n\tkey_range\x18\x03 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x04 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransactionb\x06proto3')
,
dependencies=[query__pb2.DESCRIPTOR,topodata__pb2.DESCRIPTOR,])
@ -137,7 +136,6 @@ _CHARSET = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -183,7 +181,6 @@ _BINLOGTRANSACTION_STATEMENT = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -227,7 +224,6 @@ _BINLOGTRANSACTION = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -301,7 +297,6 @@ _STREAMEVENT = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -332,7 +327,6 @@ _STREAMUPDATEREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -363,7 +357,6 @@ _STREAMUPDATERESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -415,7 +408,6 @@ _STREAMKEYRANGEREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -446,7 +438,6 @@ _STREAMKEYRANGERESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -491,7 +482,6 @@ _STREAMTABLESREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -522,7 +512,6 @@ _STREAMTABLESRESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Просмотреть файл

@ -19,7 +19,6 @@ import binlogdata_pb2 as binlogdata__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='binlogservice.proto',
package='binlogservice',
syntax='proto3',
serialized_pb=_b('\n\x13\x62inlogservice.proto\x12\rbinlogservice\x1a\x10\x62inlogdata.proto2\x99\x02\n\x0cUpdateStream\x12U\n\x0cStreamUpdate\x12\x1f.binlogdata.StreamUpdateRequest\x1a .binlogdata.StreamUpdateResponse\"\x00\x30\x01\x12[\n\x0eStreamKeyRange\x12!.binlogdata.StreamKeyRangeRequest\x1a\".binlogdata.StreamKeyRangeResponse\"\x00\x30\x01\x12U\n\x0cStreamTables\x12\x1f.binlogdata.StreamTablesRequest\x1a .binlogdata.StreamTablesResponse\"\x00\x30\x01\x62\x06proto3')
,
dependencies=[binlogdata__pb2.DESCRIPTOR,])
@ -68,7 +67,7 @@ class EarlyAdopterUpdateStreamStub(object):
def StreamTables(self, request):
raise NotImplementedError()
StreamTables.async = None
def early_adopter_create_UpdateStream_server(servicer, port, private_key=None, certificate_chain=None):
def early_adopter_create_UpdateStream_server(servicer, port, root_certificates, key_chain_pairs):
import binlogdata_pb2
import binlogdata_pb2
import binlogdata_pb2
@ -92,8 +91,8 @@ def early_adopter_create_UpdateStream_server(servicer, port, private_key=None, c
binlogdata_pb2.StreamUpdateResponse.SerializeToString,
),
}
return implementations.server("binlogservice.UpdateStream", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain)
def early_adopter_create_UpdateStream_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None):
return implementations.secure_server("binlogservice.UpdateStream", method_service_descriptions, port, root_certificates, key_chain_pairs)
def early_adopter_create_UpdateStream_stub(host, port):
import binlogdata_pb2
import binlogdata_pb2
import binlogdata_pb2
@ -114,5 +113,5 @@ def early_adopter_create_UpdateStream_stub(host, port, metadata_transformer=None
binlogdata_pb2.StreamUpdateResponse.FromString,
),
}
return implementations.stub("binlogservice.UpdateStream", 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 implementations.insecure_stub("binlogservice.UpdateStream", method_invocation_descriptions, host, port)
# @@protoc_insertion_point(module_scope)

Просмотреть файл

@ -19,7 +19,6 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='logutil.proto',
package='logutil',
syntax='proto3',
serialized_pb=_b('\n\rlogutil.proto\x12\x07logutil\",\n\x04Time\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\x13\n\x0bnanoseconds\x18\x02 \x01(\x05\"n\n\x05\x45vent\x12\x1b\n\x04time\x18\x01 \x01(\x0b\x32\r.logutil.Time\x12\x1d\n\x05level\x18\x02 \x01(\x0e\x32\x0e.logutil.Level\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\x12\x0c\n\x04line\x18\x04 \x01(\x03\x12\r\n\x05value\x18\x05 \x01(\t*6\n\x05Level\x12\x08\n\x04INFO\x10\x00\x12\x0b\n\x07WARNING\x10\x01\x12\t\n\x05\x45RROR\x10\x02\x12\x0b\n\x07\x43ONSOLE\x10\x03\x62\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@ -91,7 +90,6 @@ _TIME = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -150,7 +148,6 @@ _EVENT = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Просмотреть файл

@ -18,7 +18,6 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='mysqlctl.proto',
package='mysqlctl',
syntax='proto3',
serialized_pb=_b('\n\x0emysqlctl.proto\x12\x08mysqlctl\"\x0e\n\x0cStartRequest\"\x0f\n\rStartResponse\"*\n\x0fShutdownRequest\x12\x17\n\x0fwait_for_mysqld\x18\x01 \x01(\x08\"\x12\n\x10ShutdownResponse\"\x18\n\x16RunMysqlUpgradeRequest\"\x19\n\x17RunMysqlUpgradeResponse2\xe5\x01\n\x08MysqlCtl\x12:\n\x05Start\x12\x16.mysqlctl.StartRequest\x1a\x17.mysqlctl.StartResponse\"\x00\x12\x43\n\x08Shutdown\x12\x19.mysqlctl.ShutdownRequest\x1a\x1a.mysqlctl.ShutdownResponse\"\x00\x12X\n\x0fRunMysqlUpgrade\x12 .mysqlctl.RunMysqlUpgradeRequest\x1a!.mysqlctl.RunMysqlUpgradeResponse\"\x00\x62\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@ -41,7 +40,6 @@ _STARTREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -65,7 +63,6 @@ _STARTRESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -96,7 +93,6 @@ _SHUTDOWNREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -120,7 +116,6 @@ _SHUTDOWNRESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -144,7 +139,6 @@ _RUNMYSQLUPGRADEREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -168,7 +162,6 @@ _RUNMYSQLUPGRADERESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -265,7 +258,7 @@ class EarlyAdopterMysqlCtlStub(object):
def RunMysqlUpgrade(self, request):
raise NotImplementedError()
RunMysqlUpgrade.async = None
def early_adopter_create_MysqlCtl_server(servicer, port, private_key=None, certificate_chain=None):
def early_adopter_create_MysqlCtl_server(servicer, port, root_certificates, key_chain_pairs):
import mysqlctl_pb2
import mysqlctl_pb2
import mysqlctl_pb2
@ -289,8 +282,8 @@ def early_adopter_create_MysqlCtl_server(servicer, port, private_key=None, certi
mysqlctl_pb2.StartResponse.SerializeToString,
),
}
return implementations.server("mysqlctl.MysqlCtl", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain)
def early_adopter_create_MysqlCtl_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None):
return implementations.secure_server("mysqlctl.MysqlCtl", method_service_descriptions, port, root_certificates, key_chain_pairs)
def early_adopter_create_MysqlCtl_stub(host, port):
import mysqlctl_pb2
import mysqlctl_pb2
import mysqlctl_pb2
@ -311,5 +304,5 @@ def early_adopter_create_MysqlCtl_stub(host, port, metadata_transformer=None, se
mysqlctl_pb2.StartResponse.FromString,
),
}
return implementations.stub("mysqlctl.MysqlCtl", 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 implementations.insecure_stub("mysqlctl.MysqlCtl", method_invocation_descriptions, host, port)
# @@protoc_insertion_point(module_scope)

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -19,7 +19,6 @@ import query_pb2 as query__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='queryservice.proto',
package='queryservice',
syntax='proto3',
serialized_pb=_b('\n\x12queryservice.proto\x12\x0cqueryservice\x1a\x0bquery.proto2\xe9\x04\n\x05Query\x12I\n\x0cGetSessionId\x12\x1a.query.GetSessionIdRequest\x1a\x1b.query.GetSessionIdResponse\"\x00\x12:\n\x07\x45xecute\x12\x15.query.ExecuteRequest\x1a\x16.query.ExecuteResponse\"\x00\x12I\n\x0c\x45xecuteBatch\x12\x1a.query.ExecuteBatchRequest\x1a\x1b.query.ExecuteBatchResponse\"\x00\x12N\n\rStreamExecute\x12\x1b.query.StreamExecuteRequest\x1a\x1c.query.StreamExecuteResponse\"\x00\x30\x01\x12\x34\n\x05\x42\x65gin\x12\x13.query.BeginRequest\x1a\x14.query.BeginResponse\"\x00\x12\x37\n\x06\x43ommit\x12\x14.query.CommitRequest\x1a\x15.query.CommitResponse\"\x00\x12=\n\x08Rollback\x12\x16.query.RollbackRequest\x1a\x17.query.RollbackResponse\"\x00\x12\x43\n\nSplitQuery\x12\x18.query.SplitQueryRequest\x1a\x19.query.SplitQueryResponse\"\x00\x12K\n\x0cStreamHealth\x12\x1a.query.StreamHealthRequest\x1a\x1b.query.StreamHealthResponse\"\x00\x30\x01\x62\x06proto3')
,
dependencies=[query__pb2.DESCRIPTOR,])
@ -110,7 +109,7 @@ class EarlyAdopterQueryStub(object):
def StreamHealth(self, request):
raise NotImplementedError()
StreamHealth.async = None
def early_adopter_create_Query_server(servicer, port, private_key=None, certificate_chain=None):
def early_adopter_create_Query_server(servicer, port, root_certificates, key_chain_pairs):
import query_pb2
import query_pb2
import query_pb2
@ -176,8 +175,8 @@ def early_adopter_create_Query_server(servicer, port, private_key=None, certific
query_pb2.StreamHealthResponse.SerializeToString,
),
}
return implementations.server("queryservice.Query", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain)
def early_adopter_create_Query_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None):
return implementations.secure_server("queryservice.Query", method_service_descriptions, port, root_certificates, key_chain_pairs)
def early_adopter_create_Query_stub(host, port):
import query_pb2
import query_pb2
import query_pb2
@ -234,5 +233,5 @@ def early_adopter_create_Query_stub(host, port, metadata_transformer=None, secur
query_pb2.StreamHealthResponse.FromString,
),
}
return implementations.stub("queryservice.Query", 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 implementations.insecure_stub("queryservice.Query", method_invocation_descriptions, host, port)
# @@protoc_insertion_point(module_scope)

Просмотреть файл

@ -18,7 +18,6 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='replicationdata.proto',
package='replicationdata',
syntax='proto3',
serialized_pb=_b('\n\x15replicationdata.proto\x12\x0freplicationdata\"\xb6\x01\n\x06Status\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x18\n\x10slave_io_running\x18\x02 \x01(\x08\x12\x19\n\x11slave_sql_running\x18\x03 \x01(\x08\x12\x1d\n\x15seconds_behind_master\x18\x04 \x01(\r\x12\x13\n\x0bmaster_host\x18\x05 \x01(\t\x12\x13\n\x0bmaster_port\x18\x06 \x01(\x05\x12\x1c\n\x14master_connect_retry\x18\x07 \x01(\x05\x62\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@ -90,7 +89,6 @@ _STATUS = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Просмотреть файл

@ -18,7 +18,6 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='tableacl.proto',
package='tableacl',
syntax='proto3',
serialized_pb=_b('\n\x0etableacl.proto\x12\x08tableacl\"q\n\x0eTableGroupSpec\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1f\n\x17table_names_or_prefixes\x18\x02 \x03(\t\x12\x0f\n\x07readers\x18\x03 \x03(\t\x12\x0f\n\x07writers\x18\x04 \x03(\t\x12\x0e\n\x06\x61\x64mins\x18\x05 \x03(\t\"8\n\x06\x43onfig\x12.\n\x0ctable_groups\x18\x01 \x03(\x0b\x32\x18.tableacl.TableGroupSpecb\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@ -76,7 +75,6 @@ _TABLEGROUPSPEC = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -107,7 +105,6 @@ _CONFIG = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -19,7 +19,6 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='topodata.proto',
package='topodata',
syntax='proto3',
serialized_pb=_b('\n\x0etopodata.proto\x12\x08topodata\"&\n\x08KeyRange\x12\r\n\x05start\x18\x01 \x01(\x0c\x12\x0b\n\x03\x65nd\x18\x02 \x01(\x0c\"(\n\x0bTabletAlias\x12\x0c\n\x04\x63\x65ll\x18\x01 \x01(\t\x12\x0b\n\x03uid\x18\x02 \x01(\r\"\xf1\x03\n\x06Tablet\x12$\n\x05\x61lias\x18\x01 \x01(\x0b\x32\x15.topodata.TabletAlias\x12\x10\n\x08hostname\x18\x02 \x01(\t\x12\n\n\x02ip\x18\x03 \x01(\t\x12/\n\x08port_map\x18\x04 \x03(\x0b\x32\x1d.topodata.Tablet.PortMapEntry\x12\x10\n\x08keyspace\x18\x05 \x01(\t\x12\r\n\x05shard\x18\x06 \x01(\t\x12%\n\tkey_range\x18\x07 \x01(\x0b\x32\x12.topodata.KeyRange\x12\"\n\x04type\x18\x08 \x01(\x0e\x32\x14.topodata.TabletType\x12\x18\n\x10\x64\x62_name_override\x18\t \x01(\t\x12(\n\x04tags\x18\n \x03(\x0b\x32\x1a.topodata.Tablet.TagsEntry\x12\x33\n\nhealth_map\x18\x0b \x03(\x0b\x32\x1f.topodata.Tablet.HealthMapEntry\x1a.\n\x0cPortMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a+\n\tTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x30\n\x0eHealthMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcb\x04\n\x05Shard\x12+\n\x0cmaster_alias\x18\x01 \x01(\x0b\x32\x15.topodata.TabletAlias\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x30\n\x0cserved_types\x18\x03 \x03(\x0b\x32\x1a.topodata.Shard.ServedType\x12\x32\n\rsource_shards\x18\x04 \x03(\x0b\x32\x1b.topodata.Shard.SourceShard\x12\r\n\x05\x63\x65lls\x18\x05 \x03(\t\x12\x36\n\x0ftablet_controls\x18\x06 \x03(\x0b\x32\x1d.topodata.Shard.TabletControl\x1a\x46\n\nServedType\x12)\n\x0btablet_type\x18\x01 \x01(\x0e\x32\x14.topodata.TabletType\x12\r\n\x05\x63\x65lls\x18\x02 \x03(\t\x1ar\n\x0bSourceShard\x12\x0b\n\x03uid\x18\x01 \x01(\r\x12\x10\n\x08keyspace\x18\x02 \x01(\t\x12\r\n\x05shard\x18\x03 \x01(\t\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x1a\x84\x01\n\rTabletControl\x12)\n\x0btablet_type\x18\x01 \x01(\x0e\x32\x14.topodata.TabletType\x12\r\n\x05\x63\x65lls\x18\x02 \x03(\t\x12\x1d\n\x15\x64isable_query_service\x18\x03 \x01(\x08\x12\x1a\n\x12\x62lacklisted_tables\x18\x04 \x03(\t\"\x8a\x02\n\x08Keyspace\x12\x1c\n\x14sharding_column_name\x18\x01 \x01(\t\x12\x36\n\x14sharding_column_type\x18\x02 \x01(\x0e\x32\x18.topodata.KeyspaceIdType\x12\x19\n\x11split_shard_count\x18\x03 \x01(\x05\x12\x33\n\x0cserved_froms\x18\x04 \x03(\x0b\x32\x1d.topodata.Keyspace.ServedFrom\x1aX\n\nServedFrom\x12)\n\x0btablet_type\x18\x01 \x01(\x0e\x32\x14.topodata.TabletType\x12\r\n\x05\x63\x65lls\x18\x02 \x03(\t\x12\x10\n\x08keyspace\x18\x03 \x01(\t\"w\n\x10ShardReplication\x12.\n\x05nodes\x18\x01 \x03(\x0b\x32\x1f.topodata.ShardReplication.Node\x1a\x33\n\x04Node\x12+\n\x0ctablet_alias\x18\x01 \x01(\x0b\x32\x15.topodata.TabletAlias\"\xf1\x01\n\x08\x45ndPoint\x12\x0b\n\x03uid\x18\x01 \x01(\r\x12\x0c\n\x04host\x18\x02 \x01(\t\x12\x31\n\x08port_map\x18\x03 \x03(\x0b\x32\x1f.topodata.EndPoint.PortMapEntry\x12\x35\n\nhealth_map\x18\x04 \x03(\x0b\x32!.topodata.EndPoint.HealthMapEntry\x1a.\n\x0cPortMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x30\n\x0eHealthMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"0\n\tEndPoints\x12#\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x12.topodata.EndPoint\"T\n\x08SrvShard\x12\x0c\n\x04name\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x13\n\x0bmaster_cell\x18\x03 \x01(\t\"E\n\x0eShardReference\x12\x0c\n\x04name\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\"\xb1\x03\n\x0bSrvKeyspace\x12;\n\npartitions\x18\x01 \x03(\x0b\x32\'.topodata.SrvKeyspace.KeyspacePartition\x12\x1c\n\x14sharding_column_name\x18\x02 \x01(\t\x12\x36\n\x14sharding_column_type\x18\x03 \x01(\x0e\x32\x18.topodata.KeyspaceIdType\x12\x35\n\x0bserved_from\x18\x04 \x03(\x0b\x32 .topodata.SrvKeyspace.ServedFrom\x12\x19\n\x11split_shard_count\x18\x05 \x01(\x05\x1ar\n\x11KeyspacePartition\x12)\n\x0bserved_type\x18\x01 \x01(\x0e\x32\x14.topodata.TabletType\x12\x32\n\x10shard_references\x18\x02 \x03(\x0b\x32\x18.topodata.ShardReference\x1aI\n\nServedFrom\x12)\n\x0btablet_type\x18\x01 \x01(\x0e\x32\x14.topodata.TabletType\x12\x10\n\x08keyspace\x18\x02 \x01(\t*2\n\x0eKeyspaceIdType\x12\t\n\x05UNSET\x10\x00\x12\n\n\x06UINT64\x10\x01\x12\t\n\x05\x42YTES\x10\x02*\xb8\x01\n\nTabletType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04IDLE\x10\x01\x12\n\n\x06MASTER\x10\x02\x12\x0b\n\x07REPLICA\x10\x03\x12\n\n\x06RDONLY\x10\x04\x12\t\n\x05\x42\x41TCH\x10\x04\x12\t\n\x05SPARE\x10\x05\x12\x10\n\x0c\x45XPERIMENTAL\x10\x06\x12\x12\n\x0eSCHEMA_UPGRADE\x10\x07\x12\n\n\x06\x42\x41\x43KUP\x10\x08\x12\x0b\n\x07RESTORE\x10\t\x12\n\n\x06WORKER\x10\n\x12\t\n\x05SCRAP\x10\x0b\x1a\x02\x10\x01\x42\x1a\n\x18\x63om.youtube.vitess.protob\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@ -166,7 +165,6 @@ _KEYRANGE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -204,7 +202,6 @@ _TABLETALIAS = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -242,7 +239,6 @@ _TABLET_PORTMAPENTRY = _descriptor.Descriptor(
],
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -279,7 +275,6 @@ _TABLET_TAGSENTRY = _descriptor.Descriptor(
],
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -316,7 +311,6 @@ _TABLET_HEALTHMAPENTRY = _descriptor.Descriptor(
],
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -416,7 +410,6 @@ _TABLET = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -454,7 +447,6 @@ _SHARD_SERVEDTYPE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -512,7 +504,6 @@ _SHARD_SOURCESHARD = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -563,7 +554,6 @@ _SHARD_TABLETCONTROL = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -628,7 +618,6 @@ _SHARD = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -673,7 +662,6 @@ _KEYSPACE_SERVEDFROM = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -724,7 +712,6 @@ _KEYSPACE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -755,7 +742,6 @@ _SHARDREPLICATION_NODE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -785,7 +771,6 @@ _SHARDREPLICATION = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -823,7 +808,6 @@ _ENDPOINT_PORTMAPENTRY = _descriptor.Descriptor(
],
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -860,7 +844,6 @@ _ENDPOINT_HEALTHMAPENTRY = _descriptor.Descriptor(
],
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -911,7 +894,6 @@ _ENDPOINT = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -942,7 +924,6 @@ _ENDPOINTS = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -987,7 +968,6 @@ _SRVSHARD = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -1025,7 +1005,6 @@ _SHARDREFERENCE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -1063,7 +1042,6 @@ _SRVKEYSPACE_KEYSPACEPARTITION = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -1100,7 +1078,6 @@ _SRVKEYSPACE_SERVEDFROM = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -1158,7 +1135,6 @@ _SRVKEYSPACE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Просмотреть файл

@ -19,7 +19,6 @@ import logutil_pb2 as logutil__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='vtctldata.proto',
package='vtctldata',
syntax='proto3',
serialized_pb=_b('\n\x0fvtctldata.proto\x12\tvtctldata\x1a\rlogutil.proto\"X\n\x1a\x45xecuteVtctlCommandRequest\x12\x0c\n\x04\x61rgs\x18\x01 \x03(\t\x12\x16\n\x0e\x61\x63tion_timeout\x18\x02 \x01(\x03\x12\x14\n\x0clock_timeout\x18\x03 \x01(\x03\"<\n\x1b\x45xecuteVtctlCommandResponse\x12\x1d\n\x05\x65vent\x18\x01 \x01(\x0b\x32\x0e.logutil.Eventb\x06proto3')
,
dependencies=[logutil__pb2.DESCRIPTOR,])
@ -64,7 +63,6 @@ _EXECUTEVTCTLCOMMANDREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -95,7 +93,6 @@ _EXECUTEVTCTLCOMMANDRESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Просмотреть файл

@ -19,7 +19,6 @@ import vtctldata_pb2 as vtctldata__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='vtctlservice.proto',
package='vtctlservice',
syntax='proto3',
serialized_pb=_b('\n\x12vtctlservice.proto\x12\x0cvtctlservice\x1a\x0fvtctldata.proto2q\n\x05Vtctl\x12h\n\x13\x45xecuteVtctlCommand\x12%.vtctldata.ExecuteVtctlCommandRequest\x1a&.vtctldata.ExecuteVtctlCommandResponse\"\x00\x30\x01\x62\x06proto3')
,
dependencies=[vtctldata__pb2.DESCRIPTOR,])
@ -54,7 +53,7 @@ class EarlyAdopterVtctlStub(object):
def ExecuteVtctlCommand(self, request):
raise NotImplementedError()
ExecuteVtctlCommand.async = None
def early_adopter_create_Vtctl_server(servicer, port, private_key=None, certificate_chain=None):
def early_adopter_create_Vtctl_server(servicer, port, root_certificates, key_chain_pairs):
import vtctldata_pb2
import vtctldata_pb2
method_service_descriptions = {
@ -64,8 +63,8 @@ def early_adopter_create_Vtctl_server(servicer, port, private_key=None, certific
vtctldata_pb2.ExecuteVtctlCommandResponse.SerializeToString,
),
}
return implementations.server("vtctlservice.Vtctl", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain)
def early_adopter_create_Vtctl_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None):
return implementations.secure_server("vtctlservice.Vtctl", method_service_descriptions, port, root_certificates, key_chain_pairs)
def early_adopter_create_Vtctl_stub(host, port):
import vtctldata_pb2
import vtctldata_pb2
method_invocation_descriptions = {
@ -74,5 +73,5 @@ def early_adopter_create_Vtctl_stub(host, port, metadata_transformer=None, secur
vtctldata_pb2.ExecuteVtctlCommandResponse.FromString,
),
}
return implementations.stub("vtctlservice.Vtctl", 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 implementations.insecure_stub("vtctlservice.Vtctl", method_invocation_descriptions, host, port)
# @@protoc_insertion_point(module_scope)

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -19,7 +19,6 @@ import vtgate_pb2 as vtgate__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='vtgateservice.proto',
package='vtgateservice',
syntax='proto3',
serialized_pb=_b('\n\x13vtgateservice.proto\x12\rvtgateservice\x1a\x0cvtgate.proto2\xd8\n\n\x06Vitess\x12<\n\x07\x45xecute\x12\x16.vtgate.ExecuteRequest\x1a\x17.vtgate.ExecuteResponse\"\x00\x12N\n\rExecuteShards\x12\x1c.vtgate.ExecuteShardsRequest\x1a\x1d.vtgate.ExecuteShardsResponse\"\x00\x12]\n\x12\x45xecuteKeyspaceIds\x12!.vtgate.ExecuteKeyspaceIdsRequest\x1a\".vtgate.ExecuteKeyspaceIdsResponse\"\x00\x12W\n\x10\x45xecuteKeyRanges\x12\x1f.vtgate.ExecuteKeyRangesRequest\x1a .vtgate.ExecuteKeyRangesResponse\"\x00\x12W\n\x10\x45xecuteEntityIds\x12\x1f.vtgate.ExecuteEntityIdsRequest\x1a .vtgate.ExecuteEntityIdsResponse\"\x00\x12]\n\x12\x45xecuteBatchShards\x12!.vtgate.ExecuteBatchShardsRequest\x1a\".vtgate.ExecuteBatchShardsResponse\"\x00\x12l\n\x17\x45xecuteBatchKeyspaceIds\x12&.vtgate.ExecuteBatchKeyspaceIdsRequest\x1a\'.vtgate.ExecuteBatchKeyspaceIdsResponse\"\x00\x12P\n\rStreamExecute\x12\x1c.vtgate.StreamExecuteRequest\x1a\x1d.vtgate.StreamExecuteResponse\"\x00\x30\x01\x12\x62\n\x13StreamExecuteShards\x12\".vtgate.StreamExecuteShardsRequest\x1a#.vtgate.StreamExecuteShardsResponse\"\x00\x30\x01\x12q\n\x18StreamExecuteKeyspaceIds\x12\'.vtgate.StreamExecuteKeyspaceIdsRequest\x1a(.vtgate.StreamExecuteKeyspaceIdsResponse\"\x00\x30\x01\x12k\n\x16StreamExecuteKeyRanges\x12%.vtgate.StreamExecuteKeyRangesRequest\x1a&.vtgate.StreamExecuteKeyRangesResponse\"\x00\x30\x01\x12\x36\n\x05\x42\x65gin\x12\x14.vtgate.BeginRequest\x1a\x15.vtgate.BeginResponse\"\x00\x12\x39\n\x06\x43ommit\x12\x15.vtgate.CommitRequest\x1a\x16.vtgate.CommitResponse\"\x00\x12?\n\x08Rollback\x12\x17.vtgate.RollbackRequest\x1a\x18.vtgate.RollbackResponse\"\x00\x12\x45\n\nSplitQuery\x12\x19.vtgate.SplitQueryRequest\x1a\x1a.vtgate.SplitQueryResponse\"\x00\x12Q\n\x0eGetSrvKeyspace\x12\x1d.vtgate.GetSrvKeyspaceRequest\x1a\x1e.vtgate.GetSrvKeyspaceResponse\"\x00\x42\x1f\n\x1d\x63om.youtube.vitess.proto.grpcb\x06proto3')
,
dependencies=[vtgate__pb2.DESCRIPTOR,])
@ -161,7 +160,7 @@ class EarlyAdopterVitessStub(object):
def GetSrvKeyspace(self, request):
raise NotImplementedError()
GetSrvKeyspace.async = None
def early_adopter_create_Vitess_server(servicer, port, private_key=None, certificate_chain=None):
def early_adopter_create_Vitess_server(servicer, port, root_certificates, key_chain_pairs):
import vtgate_pb2
import vtgate_pb2
import vtgate_pb2
@ -276,8 +275,8 @@ def early_adopter_create_Vitess_server(servicer, port, private_key=None, certifi
vtgate_pb2.StreamExecuteShardsResponse.SerializeToString,
),
}
return implementations.server("vtgateservice.Vitess", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain)
def early_adopter_create_Vitess_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None):
return implementations.secure_server("vtgateservice.Vitess", method_service_descriptions, port, root_certificates, key_chain_pairs)
def early_adopter_create_Vitess_stub(host, port):
import vtgate_pb2
import vtgate_pb2
import vtgate_pb2
@ -376,5 +375,5 @@ def early_adopter_create_Vitess_stub(host, port, metadata_transformer=None, secu
vtgate_pb2.StreamExecuteShardsResponse.FromString,
),
}
return implementations.stub("vtgateservice.Vitess", 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 implementations.insecure_stub("vtgateservice.Vitess", method_invocation_descriptions, host, port)
# @@protoc_insertion_point(module_scope)

Просмотреть файл

@ -19,8 +19,7 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='vtrpc.proto',
package='vtrpc',
syntax='proto3',
serialized_pb=_b('\n\x0bvtrpc.proto\x12\x05vtrpc\"F\n\x08\x43\x61llerID\x12\x11\n\tprincipal\x18\x01 \x01(\t\x12\x11\n\tcomponent\x18\x02 \x01(\t\x12\x14\n\x0csubcomponent\x18\x03 \x01(\t\";\n\x08RPCError\x12\x1e\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x10.vtrpc.ErrorCode\x12\x0f\n\x07message\x18\x02 \x01(\t*n\n\tErrorCode\x12\x0b\n\x07NoError\x10\x00\x12\x10\n\x0bTabletError\x10\xe8\x07\x12\x17\n\x12UnknownTabletError\x10\xcf\x0f\x12\x10\n\x0bVtgateError\x10\xd0\x0f\x12\x17\n\x12UnknownVtgateError\x10\xb7\x17\x42\x1a\n\x18\x63om.youtube.vitess.protob\x06proto3')
serialized_pb=_b('\n\x0bvtrpc.proto\x12\x05vtrpc\"F\n\x08\x43\x61llerID\x12\x11\n\tprincipal\x18\x01 \x01(\t\x12\x11\n\tcomponent\x18\x02 \x01(\t\x12\x14\n\x0csubcomponent\x18\x03 \x01(\t\"E\n\x08RPCError\x12(\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1a.vtrpc.ErrorCodeDeprecated\x12\x0f\n\x07message\x18\x02 \x01(\t*\x80\x02\n\tErrorCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\r\n\tCANCELLED\x10\x01\x12\x11\n\rUNKNOWN_ERROR\x10\x02\x12\r\n\tBAD_INPUT\x10\x03\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x04\x12\x13\n\x0fINTEGRITY_ERROR\x10\x05\x12\x15\n\x11PERMISSION_DENIED\x10\x06\x12\x13\n\x0fTHROTTLED_ERROR\x10\x07\x12\x14\n\x10QUERY_NOT_SERVED\x10\x08\x12\r\n\tNOT_IN_TX\x10\t\x12\x12\n\x0eINTERNAL_ERROR\x10\n\x12$\n RESOURCE_TEMPORARILY_UNAVAILABLE\x10\x0b*x\n\x13\x45rrorCodeDeprecated\x12\x0b\n\x07NoError\x10\x00\x12\x10\n\x0bTabletError\x10\xe8\x07\x12\x17\n\x12UnknownTabletError\x10\xcf\x0f\x12\x10\n\x0bVtgateError\x10\xd0\x0f\x12\x17\n\x12UnknownVtgateError\x10\xb7\x17\x42\x1a\n\x18\x63om.youtube.vitess.protob\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@ -29,6 +28,69 @@ _ERRORCODE = _descriptor.EnumDescriptor(
full_name='vtrpc.ErrorCode',
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(
name='SUCCESS', index=0, number=0,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='CANCELLED', index=1, number=1,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='UNKNOWN_ERROR', index=2, number=2,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='BAD_INPUT', index=3, number=3,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='DEADLINE_EXCEEDED', index=4, number=4,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='INTEGRITY_ERROR', index=5, number=5,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='PERMISSION_DENIED', index=6, number=6,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='THROTTLED_ERROR', index=7, number=7,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='QUERY_NOT_SERVED', index=8, number=8,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='NOT_IN_TX', index=9, number=9,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='INTERNAL_ERROR', index=10, number=10,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='RESOURCE_TEMPORARILY_UNAVAILABLE', index=11, number=11,
options=None,
type=None),
],
containing_type=None,
options=None,
serialized_start=166,
serialized_end=422,
)
_sym_db.RegisterEnumDescriptor(_ERRORCODE)
ErrorCode = enum_type_wrapper.EnumTypeWrapper(_ERRORCODE)
_ERRORCODEDEPRECATED = _descriptor.EnumDescriptor(
name='ErrorCodeDeprecated',
full_name='vtrpc.ErrorCodeDeprecated',
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(
name='NoError', index=0, number=0,
@ -53,12 +115,24 @@ _ERRORCODE = _descriptor.EnumDescriptor(
],
containing_type=None,
options=None,
serialized_start=155,
serialized_end=265,
serialized_start=424,
serialized_end=544,
)
_sym_db.RegisterEnumDescriptor(_ERRORCODE)
_sym_db.RegisterEnumDescriptor(_ERRORCODEDEPRECATED)
ErrorCode = enum_type_wrapper.EnumTypeWrapper(_ERRORCODE)
ErrorCodeDeprecated = enum_type_wrapper.EnumTypeWrapper(_ERRORCODEDEPRECATED)
SUCCESS = 0
CANCELLED = 1
UNKNOWN_ERROR = 2
BAD_INPUT = 3
DEADLINE_EXCEEDED = 4
INTEGRITY_ERROR = 5
PERMISSION_DENIED = 6
THROTTLED_ERROR = 7
QUERY_NOT_SERVED = 8
NOT_IN_TX = 9
INTERNAL_ERROR = 10
RESOURCE_TEMPORARILY_UNAVAILABLE = 11
NoError = 0
TabletError = 1000
UnknownTabletError = 1999
@ -103,7 +177,6 @@ _CALLERID = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -141,18 +214,18 @@ _RPCERROR = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
serialized_start=94,
serialized_end=153,
serialized_end=163,
)
_RPCERROR.fields_by_name['code'].enum_type = _ERRORCODE
_RPCERROR.fields_by_name['code'].enum_type = _ERRORCODEDEPRECATED
DESCRIPTOR.message_types_by_name['CallerID'] = _CALLERID
DESCRIPTOR.message_types_by_name['RPCError'] = _RPCERROR
DESCRIPTOR.enum_types_by_name['ErrorCode'] = _ERRORCODE
DESCRIPTOR.enum_types_by_name['ErrorCodeDeprecated'] = _ERRORCODEDEPRECATED
CallerID = _reflection.GeneratedProtocolMessageType('CallerID', (_message.Message,), dict(
DESCRIPTOR = _CALLERID,

Просмотреть файл

@ -19,7 +19,6 @@ import logutil_pb2 as logutil__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='vtworkerdata.proto',
package='vtworkerdata',
syntax='proto3',
serialized_pb=_b('\n\x12vtworkerdata.proto\x12\x0cvtworkerdata\x1a\rlogutil.proto\"-\n\x1d\x45xecuteVtworkerCommandRequest\x12\x0c\n\x04\x61rgs\x18\x01 \x03(\t\"?\n\x1e\x45xecuteVtworkerCommandResponse\x12\x1d\n\x05\x65vent\x18\x01 \x01(\x0b\x32\x0e.logutil.Eventb\x06proto3')
,
dependencies=[logutil__pb2.DESCRIPTOR,])
@ -50,7 +49,6 @@ _EXECUTEVTWORKERCOMMANDREQUEST = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
@ -81,7 +79,6 @@ _EXECUTEVTWORKERCOMMANDRESPONSE = _descriptor.Descriptor(
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],

Просмотреть файл

@ -19,7 +19,6 @@ import vtworkerdata_pb2 as vtworkerdata__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='vtworkerservice.proto',
package='vtworkerservice',
syntax='proto3',
serialized_pb=_b('\n\x15vtworkerservice.proto\x12\x0fvtworkerservice\x1a\x12vtworkerdata.proto2\x83\x01\n\x08Vtworker\x12w\n\x16\x45xecuteVtworkerCommand\x12+.vtworkerdata.ExecuteVtworkerCommandRequest\x1a,.vtworkerdata.ExecuteVtworkerCommandResponse\"\x00\x30\x01\x62\x06proto3')
,
dependencies=[vtworkerdata__pb2.DESCRIPTOR,])
@ -54,7 +53,7 @@ class EarlyAdopterVtworkerStub(object):
def ExecuteVtworkerCommand(self, request):
raise NotImplementedError()
ExecuteVtworkerCommand.async = None
def early_adopter_create_Vtworker_server(servicer, port, private_key=None, certificate_chain=None):
def early_adopter_create_Vtworker_server(servicer, port, root_certificates, key_chain_pairs):
import vtworkerdata_pb2
import vtworkerdata_pb2
method_service_descriptions = {
@ -64,8 +63,8 @@ def early_adopter_create_Vtworker_server(servicer, port, private_key=None, certi
vtworkerdata_pb2.ExecuteVtworkerCommandResponse.SerializeToString,
),
}
return implementations.server("vtworkerservice.Vtworker", method_service_descriptions, port, private_key=private_key, certificate_chain=certificate_chain)
def early_adopter_create_Vtworker_stub(host, port, metadata_transformer=None, secure=False, root_certificates=None, private_key=None, certificate_chain=None, server_host_override=None):
return implementations.secure_server("vtworkerservice.Vtworker", method_service_descriptions, port, root_certificates, key_chain_pairs)
def early_adopter_create_Vtworker_stub(host, port):
import vtworkerdata_pb2
import vtworkerdata_pb2
method_invocation_descriptions = {
@ -74,5 +73,5 @@ def early_adopter_create_Vtworker_stub(host, port, metadata_transformer=None, se
vtworkerdata_pb2.ExecuteVtworkerCommandResponse.FromString,
),
}
return implementations.stub("vtworkerservice.Vtworker", 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 implementations.insecure_stub("vtworkerservice.Vtworker", method_invocation_descriptions, host, port)
# @@protoc_insertion_point(module_scope)

Просмотреть файл

@ -1,18 +1,11 @@
#!/bin/bash
# goversion_min returns true if major.minor go version is at least some value.
function goversion_min() {
[[ "$(go version)" =~ go([0-9]+)\.([0-9]+) ]]
gotmajor=${BASH_REMATCH[1]}
gotminor=${BASH_REMATCH[2]}
[[ "$1" =~ ([0-9]+)\.([0-9]+) ]]
wantmajor=${BASH_REMATCH[1]}
wantminor=${BASH_REMATCH[2]}
[ "$gotmajor" -lt "$wantmajor" ] && return 1
[ "$gotmajor" -gt "$wantmajor" ] && return 0
[ "$gotminor" -lt "$wantminor" ] && return 1
return 0
}
# Copyright 2015, Google Inc. All rights reserved.
# Use of this source code is governed by a BSD-style license that can
# be found in the LICENSE file.
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source $DIR/shell_functions.inc
# Starting with Go 1.5, the syntax for the -X flag changed.
# Earlier Go versions don't support the new syntax.

19
tools/shell_functions.inc Normal file
Просмотреть файл

@ -0,0 +1,19 @@
# Copyright 2015, Google Inc. All rights reserved.
# Use of this source code is governed by a BSD-style license that can
# be found in the LICENSE file.
# Library of functions which are used by bootstrap.sh or the Makefile.
# goversion_min returns true if major.minor go version is at least some value.
function goversion_min() {
[[ "$(go version)" =~ go([0-9]+)\.([0-9]+) ]]
gotmajor=${BASH_REMATCH[1]}
gotminor=${BASH_REMATCH[2]}
[[ "$1" =~ ([0-9]+)\.([0-9]+) ]]
wantmajor=${BASH_REMATCH[1]}
wantminor=${BASH_REMATCH[2]}
[ "$gotmajor" -lt "$wantmajor" ] && return 1
[ "$gotmajor" -gt "$wantmajor" ] && return 0
[ "$gotminor" -lt "$wantminor" ] && return 1
return 0
}