From 9433411324547190daf91177065dfe590327510b Mon Sep 17 00:00:00 2001 From: Vivek Menezes Date: Mon, 24 Apr 2017 15:43:56 -0400 Subject: [PATCH] kv: rename UpdateStateOnRemoteRetryableErr to UpdateStateOnRetryableErr Also add a new RETRY_TABLE_FROM_FUTURE error for a transaction that encounters a lease on a table descriptor such that the write timestamp on the table descriptor is after the transaction timestamp. --- pkg/internal/client/db_test.go | 96 ++++++------ pkg/internal/client/txn.go | 18 +-- pkg/roachpb/errors.pb.go | 261 +++++++++++++++++---------------- pkg/roachpb/errors.proto | 4 + pkg/sql/distsql_running.go | 2 +- 5 files changed, 191 insertions(+), 190 deletions(-) diff --git a/pkg/internal/client/db_test.go b/pkg/internal/client/db_test.go index 8ca6b27cbca4..b98047a05bf2 100644 --- a/pkg/internal/client/db_test.go +++ b/pkg/internal/client/db_test.go @@ -359,54 +359,54 @@ func TestCommonMethods(t *testing.T) { // request with the information that this particular Get must be // unmarshaled, which didn't seem worth doing as we're not using // Batch.GetProto at the moment. - {dbType, "GetProto"}: {}, - {txnType, "GetProto"}: {}, - {batchType, "CheckConsistency"}: {}, - {batchType, "AddRawRequest"}: {}, - {batchType, "PutInline"}: {}, - {batchType, "RawResponse"}: {}, - {batchType, "MustPErr"}: {}, - {dbType, "AdminMerge"}: {}, - {dbType, "AdminSplit"}: {}, - {dbType, "AdminTransferLease"}: {}, - {dbType, "AdminChangeReplicas"}: {}, - {dbType, "CheckConsistency"}: {}, - {dbType, "Run"}: {}, - {dbType, "Txn"}: {}, - {dbType, "GetSender"}: {}, - {dbType, "PutInline"}: {}, - {dbType, "WriteBatch"}: {}, - {txnType, "AcceptUnhandledRetryableErrors"}: {}, - {txnType, "Commit"}: {}, - {txnType, "CommitInBatch"}: {}, - {txnType, "CommitOrCleanup"}: {}, - {txnType, "Rollback"}: {}, - {txnType, "CleanupOnError"}: {}, - {txnType, "DebugName"}: {}, - {txnType, "EnsureProto"}: {}, - {txnType, "InternalSetPriority"}: {}, - {txnType, "IsFinalized"}: {}, - {txnType, "NewBatch"}: {}, - {txnType, "Exec"}: {}, - {txnType, "GetDeadline"}: {}, - {txnType, "ResetDeadline"}: {}, - {txnType, "Run"}: {}, - {txnType, "SetDebugName"}: {}, - {txnType, "SetFixedTimestamp"}: {}, - {txnType, "SetIsolation"}: {}, - {txnType, "SetUserPriority"}: {}, - {txnType, "SetSystemConfigTrigger"}: {}, - {txnType, "SetTxnAnchorKey"}: {}, - {txnType, "UpdateDeadlineMaybe"}: {}, - {txnType, "UpdateStateOnRemoteRetryableErr"}: {}, - {txnType, "AddCommitTrigger"}: {}, - {txnType, "CommandCount"}: {}, - {txnType, "IsRetryableErrMeantForTxn"}: {}, - {txnType, "Isolation"}: {}, - {txnType, "OrigTimestamp"}: {}, - {txnType, "Proto"}: {}, - {txnType, "UserPriority"}: {}, - {txnType, "AnchorKey"}: {}, + {dbType, "GetProto"}: {}, + {txnType, "GetProto"}: {}, + {batchType, "CheckConsistency"}: {}, + {batchType, "AddRawRequest"}: {}, + {batchType, "PutInline"}: {}, + {batchType, "RawResponse"}: {}, + {batchType, "MustPErr"}: {}, + {dbType, "AdminMerge"}: {}, + {dbType, "AdminSplit"}: {}, + {dbType, "AdminTransferLease"}: {}, + {dbType, "AdminChangeReplicas"}: {}, + {dbType, "CheckConsistency"}: {}, + {dbType, "Run"}: {}, + {dbType, "Txn"}: {}, + {dbType, "GetSender"}: {}, + {dbType, "PutInline"}: {}, + {dbType, "WriteBatch"}: {}, + {txnType, "AcceptUnhandledRetryableErrors"}: {}, + {txnType, "Commit"}: {}, + {txnType, "CommitInBatch"}: {}, + {txnType, "CommitOrCleanup"}: {}, + {txnType, "Rollback"}: {}, + {txnType, "CleanupOnError"}: {}, + {txnType, "DebugName"}: {}, + {txnType, "EnsureProto"}: {}, + {txnType, "InternalSetPriority"}: {}, + {txnType, "IsFinalized"}: {}, + {txnType, "NewBatch"}: {}, + {txnType, "Exec"}: {}, + {txnType, "GetDeadline"}: {}, + {txnType, "ResetDeadline"}: {}, + {txnType, "Run"}: {}, + {txnType, "SetDebugName"}: {}, + {txnType, "SetFixedTimestamp"}: {}, + {txnType, "SetIsolation"}: {}, + {txnType, "SetUserPriority"}: {}, + {txnType, "SetSystemConfigTrigger"}: {}, + {txnType, "SetTxnAnchorKey"}: {}, + {txnType, "UpdateDeadlineMaybe"}: {}, + {txnType, "UpdateStateOnRetryableErr"}: {}, + {txnType, "AddCommitTrigger"}: {}, + {txnType, "CommandCount"}: {}, + {txnType, "IsRetryableErrMeantForTxn"}: {}, + {txnType, "Isolation"}: {}, + {txnType, "OrigTimestamp"}: {}, + {txnType, "Proto"}: {}, + {txnType, "UserPriority"}: {}, + {txnType, "AnchorKey"}: {}, } for b := range omittedChecks { diff --git a/pkg/internal/client/txn.go b/pkg/internal/client/txn.go index 01a6f0540390..bea5d24f8eed 100644 --- a/pkg/internal/client/txn.go +++ b/pkg/internal/client/txn.go @@ -975,12 +975,14 @@ func firstWriteIndex(ba roachpb.BatchRequest) (int, *roachpb.Error) { return firstWriteIdx, nil } -// UpdateStateOnRemoteRetryableErr updates the Txn, and the Transaction proto +// UpdateStateOnRetryableErr updates the Txn, and the Transaction proto // inside it, in response to an error encountered when running a request through // the txn. If the error is not a RetryableTxnError, then this is a no-op. For a // retryable error, the Transaction proto is either initialized with the updated // proto from the error, or a new Transaction proto is initialized. -func (txn *Txn) UpdateStateOnRemoteRetryableErr(ctx context.Context, pErr roachpb.Error) { +// This needs to be called when a SQL hits a retryable error outside of the +// TxnCoordSender, like in distSQL or retryable errors in SQL logic. +func (txn *Txn) UpdateStateOnRetryableErr(ctx context.Context, pErr roachpb.Error) { txn.mu.Lock() defer txn.mu.Unlock() @@ -993,18 +995,6 @@ func (txn *Txn) UpdateStateOnRemoteRetryableErr(ctx context.Context, pErr roachp log.Fatalf(ctx, "unexpected retryable error with no txn ran through DistSQL: %s", pErr) } - // Assert that the TxnCoordSender doesn't have any state for this transaction - // (and it shouldn't, since DistSQL isn't supposed to do any works in - // transaction that had performed writes and hence started being tracked). If - // the TxnCoordSender were to have state, it'd be a bad thing that we're not - // updating it. - // TODO(andrei): remove nil check once #15024 is merged. - if txnID := pErr.GetTxn().ID; txnID != nil { - if _, ok := txn.db.GetSender().(SenderWithDistSQLBackdoor).GetTxnState(*txnID); ok { - log.Fatalf(ctx, "unexpected state in TxnCoordSender for transaction in error: %s", pErr) - } - } - // Emulate the processing that the TxnCoordSender would have done on this // error. newTxn := roachpb.PrepareTransactionForRetry(ctx, &pErr, txn.mu.UserPriority) diff --git a/pkg/roachpb/errors.pb.go b/pkg/roachpb/errors.pb.go index 73bff2a70382..c56c5813a858 100644 --- a/pkg/roachpb/errors.pb.go +++ b/pkg/roachpb/errors.pb.go @@ -34,6 +34,10 @@ const ( // A possible replay caused by duplicate begin txn or out-of-order // txn sequence number. RETRY_POSSIBLE_REPLAY TransactionRetryReason = 4 + // A transaction encountered a lease on a table descriptor such + // that the write timestamp on the table descriptor is after the + // transaction timestamp. + RETRY_TABLE_FROM_FUTURE TransactionRetryReason = 5 ) var TransactionRetryReason_name = map[int32]string{ @@ -42,13 +46,15 @@ var TransactionRetryReason_name = map[int32]string{ 2: "RETRY_DELETE_RANGE", 3: "RETRY_SERIALIZABLE", 4: "RETRY_POSSIBLE_REPLAY", + 5: "RETRY_TABLE_FROM_FUTURE", } var TransactionRetryReason_value = map[string]int32{ - "RETRY_REASON_UNKNOWN": 0, - "RETRY_WRITE_TOO_OLD": 1, - "RETRY_DELETE_RANGE": 2, - "RETRY_SERIALIZABLE": 3, - "RETRY_POSSIBLE_REPLAY": 4, + "RETRY_REASON_UNKNOWN": 0, + "RETRY_WRITE_TOO_OLD": 1, + "RETRY_DELETE_RANGE": 2, + "RETRY_SERIALIZABLE": 3, + "RETRY_POSSIBLE_REPLAY": 4, + "RETRY_TABLE_FROM_FUTURE": 5, } func (x TransactionRetryReason) Enum() *TransactionRetryReason { @@ -5351,126 +5357,127 @@ var ( func init() { proto.RegisterFile("cockroach/pkg/roachpb/errors.proto", fileDescriptorErrors) } var fileDescriptorErrors = []byte{ - // 1933 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x4a, 0x94, 0x28, 0x3e, 0x8a, 0x22, 0x35, 0x96, 0xe5, 0xb5, 0x92, 0x50, 0xca, 0x26, - 0x4d, 0x15, 0x17, 0x10, 0x53, 0xa5, 0x2e, 0x10, 0xb7, 0x05, 0x42, 0x89, 0x94, 0x42, 0x4b, 0x22, - 0x85, 0x21, 0x15, 0x35, 0x49, 0x81, 0xed, 0x8a, 0x3b, 0x26, 0x37, 0x5e, 0xee, 0xd2, 0xb3, 0xb3, - 0x96, 0x74, 0xe9, 0xb9, 0xc7, 0x1e, 0x5b, 0xa0, 0x87, 0x00, 0x45, 0x6f, 0x45, 0xd1, 0x0f, 0xd1, - 0x83, 0x2f, 0x05, 0x7a, 0x2c, 0x7a, 0x10, 0x5a, 0x15, 0xe8, 0x87, 0xf0, 0x29, 0x98, 0x3f, 0x4b, - 0x2e, 0xa5, 0x25, 0x4d, 0xf8, 0xb6, 0x7c, 0xf3, 0xde, 0x6f, 0xde, 0xcc, 0xfb, 0xf3, 0x7b, 0x43, - 0x30, 0xda, 0x7e, 0xfb, 0x39, 0xf5, 0xad, 0x76, 0xb7, 0xd4, 0x7f, 0xde, 0x29, 0x89, 0xaf, 0xfe, - 0x79, 0x89, 0x50, 0xea, 0xd3, 0x60, 0xbb, 0x4f, 0x7d, 0xe6, 0xa3, 0x95, 0x81, 0xce, 0xb6, 0x5a, - 0x5f, 0xff, 0x30, 0xd9, 0xac, 0x47, 0x98, 0x65, 0x5b, 0xcc, 0x92, 0x86, 0xeb, 0x9b, 0xc9, 0x5a, - 0x31, 0x8d, 0x8f, 0x46, 0x35, 0x42, 0xe6, 0xb8, 0xa5, 0xae, 0xdb, 0x2e, 0x31, 0xa7, 0x47, 0x02, - 0x66, 0xf5, 0xfa, 0x4a, 0x6f, 0xb5, 0xe3, 0x77, 0x7c, 0xf1, 0x59, 0xe2, 0x5f, 0x52, 0x6a, 0xfc, - 0x6d, 0x16, 0xee, 0xd5, 0x7d, 0x76, 0x44, 0xac, 0x80, 0x7c, 0xe1, 0xbb, 0x36, 0xa1, 0x55, 0xee, - 0x37, 0xaa, 0x40, 0x9a, 0x92, 0xbe, 0xeb, 0xb4, 0x2d, 0x5d, 0xdb, 0xd4, 0xb6, 0xb2, 0x3b, 0x1f, - 0x6e, 0xdf, 0x39, 0xc2, 0x36, 0x96, 0x1a, 0x15, 0x12, 0xb4, 0xa9, 0xd3, 0x67, 0x3e, 0xdd, 0x4d, - 0xbd, 0xba, 0xde, 0x98, 0xc1, 0x91, 0x29, 0x3a, 0x80, 0x25, 0x97, 0x23, 0x9b, 0x5d, 0x01, 0xad, - 0xcf, 0x4e, 0x0f, 0x85, 0xb3, 0xee, 0xd0, 0x27, 0xf4, 0x18, 0x16, 0xa9, 0xe5, 0x75, 0x88, 0xe9, - 0xd8, 0xfa, 0xdc, 0xa6, 0xb6, 0x35, 0xb7, 0xbb, 0xce, 0x77, 0xba, 0xb9, 0xde, 0x48, 0x63, 0x2e, - 0xaf, 0x55, 0x5e, 0x0f, 0x3f, 0x71, 0x5a, 0xe8, 0xd6, 0x6c, 0xb4, 0x0d, 0xf3, 0x02, 0x45, 0x4f, - 0x89, 0x8d, 0xf5, 0x84, 0x8d, 0xc5, 0xc9, 0xb1, 0x54, 0x43, 0x1f, 0x00, 0xb4, 0xc3, 0x80, 0xf9, - 0x3d, 0xb3, 0x17, 0x74, 0xf4, 0xf9, 0x4d, 0x6d, 0x2b, 0xa3, 0x8e, 0x94, 0x91, 0xf2, 0xe3, 0xa0, - 0x63, 0xac, 0xc1, 0x6a, 0xdd, 0xb7, 0xc9, 0xa9, 0x67, 0xbd, 0xb4, 0x1c, 0xd7, 0x3a, 0x77, 0x89, - 0xb8, 0x32, 0xe3, 0x10, 0x90, 0x70, 0xa0, 0xee, 0xb3, 0x7d, 0x3f, 0xf4, 0x6c, 0x79, 0x91, 0x71, - 0xcf, 0xb5, 0xa9, 0x3d, 0x37, 0xfe, 0x30, 0x0b, 0xf7, 0x85, 0xf0, 0x90, 0x5c, 0x1d, 0x3b, 0x41, - 0xcf, 0x62, 0xed, 0xae, 0x04, 0xfc, 0x14, 0x56, 0x28, 0x79, 0x11, 0x92, 0x80, 0x99, 0x01, 0xb3, - 0x28, 0x33, 0x9f, 0x93, 0x2b, 0x81, 0xbc, 0xb4, 0x9b, 0x7e, 0x7d, 0xbd, 0x31, 0x77, 0x48, 0xae, - 0x70, 0x5e, 0x69, 0x34, 0xb9, 0xc2, 0x21, 0xb9, 0x42, 0x25, 0x88, 0x44, 0x26, 0xf1, 0x6c, 0x61, - 0x32, 0x3b, 0x6a, 0x92, 0x53, 0xeb, 0x55, 0xcf, 0xe6, 0x06, 0xc7, 0x50, 0xe8, 0xa9, 0x6d, 0x89, - 0x6d, 0x0a, 0xaf, 0xc4, 0xc5, 0x67, 0x77, 0x8c, 0xa4, 0xe8, 0xf1, 0xf5, 0x58, 0xec, 0xf2, 0x43, - 0x5b, 0xb1, 0x84, 0x0e, 0x21, 0x1f, 0x84, 0x9d, 0x0e, 0x09, 0xd8, 0x00, 0x2d, 0x35, 0x35, 0xda, - 0xf2, 0xc0, 0x54, 0xac, 0x18, 0x7f, 0xd7, 0xc0, 0xc0, 0xc4, 0xb2, 0xcf, 0x1c, 0xd6, 0x75, 0xbc, - 0x53, 0xaf, 0x4d, 0x28, 0xb3, 0x1c, 0x8f, 0x5d, 0xd5, 0x3c, 0x46, 0xe8, 0x4b, 0xcb, 0x95, 0x17, - 0xf5, 0x14, 0x96, 0x29, 0xb1, 0x6c, 0x73, 0x50, 0x08, 0x2a, 0x93, 0xdf, 0x8b, 0x6d, 0xc9, 0xab, - 0x65, 0xbb, 0xeb, 0xb6, 0xb7, 0x5b, 0x91, 0x92, 0x8a, 0x77, 0x8e, 0x9b, 0x0e, 0x84, 0x08, 0x03, - 0x22, 0x97, 0x4e, 0xc0, 0x1c, 0xaf, 0x13, 0xc3, 0x9b, 0x9d, 0x1e, 0x6f, 0x25, 0x32, 0x1f, 0x2c, - 0x18, 0x0f, 0xe1, 0x41, 0x8b, 0x5a, 0x5e, 0x60, 0xb5, 0x99, 0xe3, 0x7b, 0xe5, 0x73, 0x9f, 0x32, - 0x22, 0x93, 0xc6, 0xf8, 0x06, 0x56, 0x63, 0x4b, 0x27, 0x61, 0xa0, 0x62, 0xbf, 0x07, 0xd0, 0x0f, - 0x83, 0x2e, 0x21, 0x26, 0xbb, 0xf4, 0xd4, 0x71, 0x8a, 0x09, 0x37, 0x18, 0x33, 0x8e, 0xf2, 0x57, - 0xda, 0xb5, 0x2e, 0x3d, 0xe3, 0xd7, 0x70, 0x3f, 0xb6, 0x8e, 0x09, 0xa3, 0x57, 0x12, 0xfd, 0x00, - 0x16, 0x28, 0xb1, 0x02, 0x5f, 0x22, 0x2f, 0xef, 0x7c, 0x3c, 0x19, 0x59, 0x58, 0x62, 0x61, 0xa0, - 0x36, 0x51, 0xe6, 0x86, 0x0e, 0x6b, 0x23, 0x7a, 0x7d, 0xd7, 0x92, 0x5b, 0x18, 0x9f, 0x8c, 0xac, - 0x34, 0x99, 0xc5, 0xc2, 0x40, 0x6e, 0xbe, 0x06, 0x73, 0xbc, 0xe6, 0xb4, 0x58, 0xcd, 0x71, 0x81, - 0xd1, 0x84, 0xc2, 0x19, 0x75, 0x18, 0xe1, 0xb1, 0xf5, 0x98, 0xd4, 0xfd, 0x0c, 0xd2, 0x8e, 0xf8, - 0x19, 0xe8, 0xda, 0xe6, 0xdc, 0x56, 0x76, 0xe7, 0x61, 0x82, 0xa7, 0xd2, 0x20, 0xea, 0x48, 0x4a, - 0xff, 0x69, 0x6a, 0x71, 0xb6, 0x30, 0x67, 0xfc, 0x59, 0x53, 0xa8, 0x2d, 0xdf, 0x6f, 0xb8, 0xaa, - 0x52, 0xcb, 0x90, 0x79, 0xab, 0x54, 0x19, 0x5a, 0xa1, 0x3a, 0x14, 0xac, 0x36, 0x0b, 0x2d, 0xf7, - 0xed, 0x92, 0x24, 0x2f, 0x8d, 0x87, 0x29, 0xb2, 0x0a, 0xa8, 0xd1, 0xc7, 0xe4, 0x45, 0xe8, 0x50, - 0x12, 0xb4, 0x2e, 0x3d, 0x79, 0x89, 0x4d, 0x58, 0xdd, 0xf3, 0x3d, 0xdb, 0xe1, 0x57, 0xb8, 0x6f, - 0x39, 0xae, 0xca, 0x1a, 0xf4, 0x33, 0x58, 0x52, 0xbb, 0xbf, 0xb4, 0xdc, 0x90, 0xa8, 0x33, 0x24, - 0x35, 0xbd, 0x2f, 0xf9, 0x3a, 0xce, 0x4a, 0x6d, 0xf1, 0xc3, 0xf8, 0xab, 0x06, 0x48, 0xf6, 0x42, - 0xf2, 0x2d, 0x69, 0x47, 0x99, 0x88, 0x8a, 0x90, 0xee, 0x91, 0x20, 0xb0, 0x3a, 0x64, 0x24, 0x34, - 0x91, 0x10, 0xfd, 0x1c, 0x32, 0xaa, 0x71, 0x10, 0x5b, 0x1d, 0x75, 0x6c, 0x97, 0x8d, 0xee, 0x6b, - 0x60, 0x80, 0x9e, 0xc0, 0x62, 0x54, 0x17, 0xaa, 0xbb, 0xbc, 0xc9, 0x78, 0xa0, 0x6f, 0xfc, 0x18, - 0x32, 0x4d, 0xe2, 0x4d, 0xe7, 0xa6, 0x0a, 0xfb, 0x0b, 0x58, 0x2d, 0xf7, 0xce, 0x9d, 0x4e, 0xe8, - 0x87, 0x01, 0x26, 0x41, 0xe8, 0xb2, 0xe9, 0x0e, 0xf9, 0x19, 0x64, 0x2f, 0xa8, 0xd5, 0xef, 0x13, - 0xdb, 0x24, 0x94, 0x4e, 0x38, 0xa6, 0x80, 0xc3, 0xa0, 0x94, 0xab, 0x94, 0x1a, 0x0f, 0x78, 0x1b, - 0x7f, 0xc6, 0x0e, 0xa8, 0x1f, 0xf6, 0x2b, 0xc4, 0x25, 0x83, 0x12, 0x37, 0x61, 0x4d, 0x71, 0xde, - 0x9e, 0x4f, 0x69, 0xd8, 0xe7, 0xc1, 0x94, 0xde, 0xbc, 0x0f, 0x19, 0x31, 0x3b, 0x98, 0xb7, 0xeb, - 0x61, 0x51, 0x88, 0x8f, 0x83, 0x0e, 0x32, 0x20, 0xd3, 0xa7, 0x7e, 0x9b, 0x04, 0x81, 0xba, 0xf5, - 0xc5, 0x41, 0x99, 0x47, 0x62, 0xa3, 0x09, 0x48, 0x6d, 0x10, 0x4f, 0xf2, 0x5f, 0x00, 0x28, 0x72, - 0x8e, 0x08, 0x69, 0x7e, 0xb7, 0xa8, 0x08, 0x29, 0xa3, 0xf4, 0x05, 0x25, 0x0d, 0x7f, 0xf0, 0x80, - 0xc9, 0x4f, 0x9b, 0x73, 0x5c, 0x93, 0xf9, 0xf4, 0x2e, 0xc7, 0x05, 0x5c, 0x9a, 0xc0, 0x71, 0x42, - 0x5b, 0x72, 0x9c, 0xfa, 0xc4, 0x69, 0xa1, 0x5b, 0xb3, 0x8d, 0xff, 0x2f, 0x43, 0x56, 0x00, 0x54, - 0x08, 0xb3, 0x1c, 0x17, 0x9d, 0x40, 0xc1, 0xf3, 0x99, 0x39, 0x32, 0x31, 0xc8, 0x1c, 0xfe, 0x28, - 0xe1, 0xae, 0x13, 0xa6, 0x16, 0xbc, 0xec, 0x8d, 0x08, 0xd1, 0x31, 0xe4, 0x25, 0xf9, 0x72, 0xdc, - 0x67, 0xdc, 0x61, 0x15, 0xbc, 0x1f, 0x8c, 0xa3, 0x9d, 0x91, 0x83, 0xe1, 0x1c, 0x8d, 0xcb, 0xd0, - 0x97, 0x80, 0x24, 0xdc, 0x73, 0x72, 0x65, 0x46, 0x14, 0xa7, 0x12, 0x77, 0x6b, 0x1c, 0xe2, 0x6d, - 0x02, 0xc7, 0x05, 0x7a, 0x4b, 0x8c, 0x7e, 0x03, 0x9b, 0x82, 0xa9, 0x2e, 0x04, 0xa1, 0x99, 0xe1, - 0x90, 0xd1, 0x4c, 0x47, 0x51, 0x9a, 0xa2, 0xcb, 0xc7, 0x89, 0xa3, 0xd3, 0x9b, 0xa8, 0x10, 0xbf, - 0x47, 0x27, 0xe9, 0xa0, 0x6f, 0xe0, 0x1e, 0x1b, 0x76, 0x65, 0xd3, 0x92, 0x54, 0x24, 0xe6, 0x9f, - 0xec, 0xce, 0xa3, 0xc9, 0x2c, 0x10, 0xe7, 0x2d, 0x8c, 0xd8, 0x9d, 0x05, 0x84, 0xa1, 0x10, 0x07, - 0xe7, 0x3c, 0xa4, 0x2f, 0x08, 0xe4, 0x1f, 0x4e, 0x46, 0x1e, 0xd0, 0x1e, 0xce, 0xb3, 0x51, 0x29, - 0x3a, 0x85, 0x95, 0x38, 0x26, 0xe5, 0x4c, 0xa4, 0xa7, 0xc7, 0xc6, 0x21, 0x91, 0xee, 0x70, 0xdc, - 0x2d, 0x21, 0x46, 0xbf, 0x84, 0xf8, 0x01, 0xf8, 0x78, 0xc5, 0xc2, 0x40, 0x5f, 0x14, 0xb8, 0x6f, - 0x20, 0xc3, 0x18, 0x95, 0xe1, 0xb8, 0x6f, 0x52, 0x8e, 0xf6, 0x61, 0xe9, 0x82, 0xf3, 0x8d, 0x29, - 0x79, 0x48, 0xcf, 0x08, 0xcc, 0x0f, 0x12, 0x30, 0x6f, 0x93, 0x1d, 0xce, 0x5e, 0x0c, 0x25, 0xe8, - 0x00, 0x72, 0x12, 0x87, 0xf9, 0xbe, 0xe9, 0xbb, 0xb6, 0x0e, 0x93, 0x81, 0x62, 0xa5, 0xaf, 0x80, - 0xa4, 0x84, 0x57, 0x86, 0xdf, 0x37, 0xa9, 0xa2, 0x16, 0x31, 0x4e, 0x64, 0xc7, 0x56, 0xc6, 0x5d, - 0x0e, 0xc2, 0x39, 0x3f, 0x2e, 0xe3, 0x41, 0x6e, 0x47, 0x94, 0x64, 0x3e, 0x13, 0x9c, 0xa4, 0x2f, - 0x8d, 0x0d, 0x72, 0x12, 0x7b, 0xe1, 0x7c, 0x7b, 0x54, 0x8a, 0x8e, 0x60, 0x59, 0xb6, 0x02, 0xaa, - 0x18, 0x49, 0xcf, 0x8d, 0xf5, 0xf0, 0x2e, 0x73, 0xe1, 0x9c, 0x1b, 0x97, 0x71, 0x0f, 0x3d, 0xdf, - 0x26, 0x66, 0x38, 0x1c, 0xdb, 0xf5, 0xe5, 0xb1, 0x1e, 0x26, 0x0d, 0xf8, 0x38, 0xef, 0x8d, 0x4a, - 0xd1, 0x27, 0x90, 0x0a, 0x88, 0x67, 0xeb, 0x79, 0x81, 0xf3, 0x6e, 0x02, 0xce, 0x80, 0xa1, 0xb0, - 0xd0, 0x94, 0x1d, 0xe4, 0x19, 0x33, 0x3b, 0x9c, 0x0f, 0x4c, 0x5b, 0x12, 0x82, 0x5e, 0x98, 0xd0, - 0x41, 0x12, 0xb8, 0x83, 0x77, 0x90, 0x51, 0x31, 0xcf, 0xdc, 0xa8, 0xad, 0xb7, 0x07, 0x74, 0xa2, - 0xaf, 0x8c, 0xcd, 0xdc, 0x64, 0xea, 0xc1, 0x2b, 0xf4, 0xb6, 0x5c, 0xb4, 0x50, 0x85, 0x1c, 0xe5, - 0x1c, 0x1a, 0xdf, 0x42, 0xef, 0x10, 0x0e, 0x1f, 0xa4, 0x63, 0xb2, 0xdb, 0x25, 0x46, 0xc5, 0x6c, - 0xa8, 0xaf, 0x4d, 0x53, 0x62, 0xb1, 0x39, 0x72, 0xa4, 0xc4, 0xa4, 0x9c, 0x07, 0xd8, 0x8a, 0xc8, - 0xdd, 0xa4, 0x82, 0xdd, 0xf5, 0xf5, 0xb1, 0x01, 0x4e, 0x9a, 0x03, 0x70, 0xde, 0x1a, 0x95, 0xf2, - 0xc3, 0x4b, 0x62, 0x1b, 0xf2, 0xc7, 0x3b, 0x63, 0x0f, 0x7f, 0x97, 0x18, 0x71, 0x2e, 0x88, 0xcb, - 0xd0, 0xb7, 0xf0, 0x4e, 0xd7, 0xf2, 0x6c, 0x97, 0xbf, 0x81, 0x78, 0xc3, 0xe1, 0x49, 0xc4, 0x4b, - 0xcf, 0x14, 0xc4, 0xae, 0xbf, 0x2b, 0xa0, 0x7f, 0x94, 0x00, 0xfd, 0x85, 0xb4, 0xc2, 0x91, 0xd1, - 0xa0, 0x0c, 0xf5, 0xee, 0x98, 0x95, 0x27, 0xa9, 0x57, 0xdf, 0x6d, 0x68, 0x4f, 0x53, 0x8b, 0x0f, - 0x0b, 0xeb, 0xc6, 0xc7, 0x82, 0x67, 0x4f, 0xfc, 0x40, 0x94, 0x17, 0x5a, 0x87, 0x79, 0xc7, 0xb3, - 0xc9, 0xa5, 0xa2, 0x7f, 0x39, 0x39, 0x48, 0x91, 0xf1, 0x97, 0x39, 0x98, 0x9f, 0x6e, 0x28, 0xfa, - 0xd5, 0x28, 0x69, 0x50, 0x22, 0x5e, 0xa3, 0x82, 0x0d, 0x97, 0x13, 0xef, 0x67, 0x24, 0x94, 0x42, - 0x59, 0x41, 0x22, 0x76, 0x67, 0x05, 0xed, 0x41, 0x2e, 0xf4, 0xc8, 0x65, 0xdf, 0x0f, 0x88, 0x2d, - 0xba, 0x53, 0x6a, 0x9a, 0xc7, 0x0e, 0x5e, 0x1a, 0x18, 0xf1, 0xae, 0x54, 0x82, 0xac, 0x4f, 0x9d, - 0x8e, 0xe3, 0x99, 0xbc, 0x72, 0x05, 0x9f, 0xcd, 0xef, 0x2e, 0xf3, 0x3d, 0x5f, 0x5f, 0x6f, 0x2c, - 0xf0, 0x1a, 0xaf, 0x55, 0x30, 0x48, 0x15, 0xfe, 0x0b, 0xfd, 0x14, 0x16, 0x6c, 0x31, 0x8b, 0x28, - 0x86, 0x2a, 0x8e, 0x9b, 0xf1, 0xe4, 0xc4, 0x82, 0x95, 0x36, 0xfa, 0x49, 0x74, 0xa3, 0xe9, 0x49, - 0x66, 0x51, 0x00, 0xd4, 0x5d, 0xa3, 0xc7, 0x30, 0xe7, 0xf9, 0x17, 0x8a, 0x5f, 0xa6, 0x7a, 0x20, - 0x70, 0xfd, 0x27, 0xa9, 0xdf, 0x7f, 0xb7, 0x31, 0xa3, 0x26, 0xda, 0x63, 0x78, 0x70, 0xea, 0xdd, - 0xce, 0x01, 0x19, 0xbf, 0x1d, 0x48, 0xf5, 0xab, 0x94, 0x4e, 0x78, 0x05, 0x08, 0x3d, 0x85, 0x2c, - 0x74, 0x8d, 0x7f, 0x68, 0xa0, 0x8f, 0xcb, 0xb5, 0x71, 0x2f, 0x34, 0x74, 0x06, 0x0b, 0x3c, 0x87, - 0x1d, 0x5b, 0xfd, 0xa5, 0xf0, 0xf9, 0xbf, 0xaf, 0x37, 0x3e, 0xed, 0x38, 0xac, 0x1b, 0x9e, 0x6f, - 0xb7, 0xfd, 0x5e, 0x69, 0xb0, 0xb1, 0x7d, 0x5e, 0x4a, 0xf8, 0xaf, 0x2a, 0x0c, 0x1d, 0x7b, 0xfb, - 0xf4, 0xb4, 0x56, 0xb9, 0xb9, 0xde, 0x98, 0x6f, 0x5d, 0x7a, 0xb5, 0x0a, 0x9e, 0x67, 0x97, 0x5e, - 0xcd, 0x46, 0x9f, 0x43, 0x36, 0x96, 0x19, 0x6a, 0xce, 0x7a, 0x53, 0x06, 0xc4, 0x4d, 0x1e, 0xfd, - 0x51, 0xbb, 0xf5, 0x12, 0x1d, 0xbc, 0x58, 0x91, 0x0e, 0xab, 0xb8, 0xda, 0xc2, 0x5f, 0x99, 0xb8, - 0x5a, 0x6e, 0x36, 0xea, 0xe6, 0x69, 0xfd, 0xb0, 0xde, 0x38, 0xab, 0x17, 0x66, 0xd0, 0x03, 0xb8, - 0x27, 0x57, 0xce, 0x70, 0xad, 0x55, 0x35, 0x5b, 0x8d, 0x86, 0xd9, 0x38, 0xaa, 0x14, 0x34, 0xb4, - 0x06, 0x48, 0x2e, 0x54, 0xaa, 0x47, 0xd5, 0x56, 0xd5, 0xc4, 0xe5, 0xfa, 0x41, 0xb5, 0x30, 0x3b, - 0x94, 0x37, 0xab, 0xb8, 0x56, 0x3e, 0xaa, 0x7d, 0x5d, 0xde, 0x3d, 0xaa, 0x16, 0xe6, 0xd0, 0x43, - 0xb8, 0x2f, 0xe5, 0x27, 0x8d, 0x66, 0xb3, 0xb6, 0x7b, 0x54, 0x35, 0x71, 0xf5, 0xe4, 0xa8, 0xfc, - 0x55, 0x21, 0xb5, 0x9e, 0xfa, 0xed, 0x9f, 0x8a, 0x33, 0x8f, 0x9e, 0x00, 0xba, 0x5b, 0x14, 0x68, - 0x11, 0x52, 0xf5, 0x46, 0xbd, 0x5a, 0x98, 0x41, 0x59, 0x48, 0xef, 0x96, 0xf7, 0x0e, 0x1b, 0xfb, - 0xfb, 0x05, 0x0d, 0xe5, 0x20, 0x53, 0x3b, 0x3e, 0xae, 0x56, 0x6a, 0xe5, 0x56, 0xb5, 0x30, 0xbb, - 0xfb, 0xfe, 0xab, 0xff, 0x16, 0x67, 0x5e, 0xdd, 0x14, 0xb5, 0x7f, 0xde, 0x14, 0xb5, 0x7f, 0xdd, - 0x14, 0xb5, 0xff, 0xdc, 0x14, 0xb5, 0xdf, 0xfd, 0xaf, 0x38, 0xf3, 0x75, 0x5a, 0x5d, 0xcb, 0xf7, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x19, 0x93, 0x0e, 0x00, 0x99, 0x14, 0x00, 0x00, + // 1950 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xcb, 0x6f, 0x1b, 0xc7, + 0x19, 0xd7, 0x4a, 0x94, 0x29, 0x7e, 0x14, 0x45, 0x6a, 0x2c, 0xcb, 0x6b, 0x39, 0xa1, 0x94, 0x4d, + 0x9a, 0x3a, 0x2e, 0x20, 0xa6, 0x4a, 0x5d, 0x20, 0x6e, 0x0b, 0x84, 0x12, 0x57, 0x0a, 0x2d, 0x89, + 0x14, 0x86, 0x54, 0xd4, 0x24, 0x05, 0xb6, 0x2b, 0xee, 0x98, 0xdc, 0x78, 0xb9, 0x4b, 0xcf, 0xce, + 0x5a, 0xd2, 0xa5, 0xe7, 0x1e, 0x7b, 0x6c, 0x6f, 0x01, 0x8a, 0xde, 0x8a, 0xa2, 0xd7, 0xde, 0x7b, + 0xf0, 0xa5, 0x40, 0x8f, 0x45, 0x0f, 0x42, 0xab, 0x02, 0xfd, 0x23, 0x7c, 0x0a, 0xe6, 0xb1, 0xe4, + 0x52, 0x5a, 0xca, 0x44, 0x6e, 0xcb, 0xef, 0xf1, 0x9b, 0xc7, 0xf7, 0xf8, 0x7d, 0x43, 0x30, 0x3a, + 0x41, 0xe7, 0x05, 0x0d, 0xec, 0x4e, 0xaf, 0x32, 0x78, 0xd1, 0xad, 0x88, 0xaf, 0xc1, 0x69, 0x85, + 0x50, 0x1a, 0xd0, 0x70, 0x73, 0x40, 0x03, 0x16, 0xa0, 0xe5, 0xa1, 0xcd, 0xa6, 0xd2, 0xaf, 0x7d, + 0x90, 0xee, 0xd6, 0x27, 0xcc, 0x76, 0x6c, 0x66, 0x4b, 0xc7, 0xb5, 0x8d, 0x74, 0xab, 0x84, 0xc5, + 0x87, 0xe3, 0x16, 0x11, 0x73, 0xbd, 0x4a, 0xcf, 0xeb, 0x54, 0x98, 0xdb, 0x27, 0x21, 0xb3, 0xfb, + 0x03, 0x65, 0xb7, 0xd2, 0x0d, 0xba, 0x81, 0xf8, 0xac, 0xf0, 0x2f, 0x29, 0x35, 0xfe, 0x3a, 0x0b, + 0x77, 0x1b, 0x01, 0x3b, 0x20, 0x76, 0x48, 0x3e, 0x0f, 0x3c, 0x87, 0x50, 0x93, 0xef, 0x1b, 0xd5, + 0x20, 0x4b, 0xc9, 0xc0, 0x73, 0x3b, 0xb6, 0xae, 0x6d, 0x68, 0x8f, 0xf2, 0x5b, 0x1f, 0x6c, 0xde, + 0x38, 0xc2, 0x26, 0x96, 0x16, 0x35, 0x12, 0x76, 0xa8, 0x3b, 0x60, 0x01, 0xdd, 0xce, 0xbc, 0xbe, + 0x5c, 0x9f, 0xc1, 0xb1, 0x2b, 0xda, 0x83, 0x45, 0x8f, 0x23, 0x5b, 0x3d, 0x01, 0xad, 0xcf, 0x4e, + 0x0f, 0x85, 0xf3, 0xde, 0x68, 0x4f, 0xe8, 0x09, 0x2c, 0x50, 0xdb, 0xef, 0x12, 0xcb, 0x75, 0xf4, + 0xb9, 0x0d, 0xed, 0xd1, 0xdc, 0xf6, 0x1a, 0x5f, 0xe9, 0xea, 0x72, 0x3d, 0x8b, 0xb9, 0xbc, 0x5e, + 0x7b, 0x33, 0xfa, 0xc4, 0x59, 0x61, 0x5b, 0x77, 0xd0, 0x26, 0xcc, 0x0b, 0x14, 0x3d, 0x23, 0x16, + 0xd6, 0x53, 0x16, 0x16, 0x27, 0xc7, 0xd2, 0x0c, 0xbd, 0x0f, 0xd0, 0x89, 0x42, 0x16, 0xf4, 0xad, + 0x7e, 0xd8, 0xd5, 0xe7, 0x37, 0xb4, 0x47, 0x39, 0x75, 0xa4, 0x9c, 0x94, 0x1f, 0x86, 0x5d, 0x63, + 0x15, 0x56, 0x1a, 0x81, 0x43, 0x8e, 0x7d, 0xfb, 0x95, 0xed, 0x7a, 0xf6, 0xa9, 0x47, 0xc4, 0x95, + 0x19, 0xfb, 0x80, 0xc4, 0x06, 0x1a, 0x01, 0xdb, 0x0d, 0x22, 0xdf, 0x91, 0x17, 0x99, 0xdc, 0xb9, + 0x36, 0xf5, 0xce, 0x8d, 0x3f, 0xcc, 0xc2, 0x3d, 0x21, 0xdc, 0x27, 0x17, 0x87, 0x6e, 0xd8, 0xb7, + 0x59, 0xa7, 0x27, 0x01, 0x3f, 0x81, 0x65, 0x4a, 0x5e, 0x46, 0x24, 0x64, 0x56, 0xc8, 0x6c, 0xca, + 0xac, 0x17, 0xe4, 0x42, 0x20, 0x2f, 0x6e, 0x67, 0xdf, 0x5c, 0xae, 0xcf, 0xed, 0x93, 0x0b, 0x5c, + 0x54, 0x16, 0x2d, 0x6e, 0xb0, 0x4f, 0x2e, 0x50, 0x05, 0x62, 0x91, 0x45, 0x7c, 0x47, 0xb8, 0xcc, + 0x8e, 0xbb, 0x14, 0x94, 0xde, 0xf4, 0x1d, 0xee, 0x70, 0x08, 0xa5, 0xbe, 0x5a, 0x96, 0x38, 0x96, + 0xd8, 0x95, 0xb8, 0xf8, 0xfc, 0x96, 0x91, 0x16, 0x3d, 0xae, 0x4f, 0xc4, 0xae, 0x38, 0xf2, 0x15, + 0x2a, 0xb4, 0x0f, 0xc5, 0x30, 0xea, 0x76, 0x49, 0xc8, 0x86, 0x68, 0x99, 0xa9, 0xd1, 0x96, 0x86, + 0xae, 0x42, 0x63, 0xfc, 0x5d, 0x03, 0x03, 0x13, 0xdb, 0x39, 0x71, 0x59, 0xcf, 0xf5, 0x8f, 0xfd, + 0x0e, 0xa1, 0xcc, 0x76, 0x7d, 0x76, 0x51, 0xf7, 0x19, 0xa1, 0xaf, 0x6c, 0x4f, 0x5e, 0xd4, 0x33, + 0x58, 0xa2, 0xc4, 0x76, 0xac, 0x61, 0x21, 0xa8, 0x4c, 0x7e, 0x37, 0xb1, 0x24, 0xaf, 0x96, 0xcd, + 0x9e, 0xd7, 0xd9, 0x6c, 0xc7, 0x46, 0x2a, 0xde, 0x05, 0xee, 0x3a, 0x14, 0x22, 0x0c, 0x88, 0x9c, + 0xbb, 0x21, 0x73, 0xfd, 0x6e, 0x02, 0x6f, 0x76, 0x7a, 0xbc, 0xe5, 0xd8, 0x7d, 0xa8, 0x30, 0x1e, + 0xc0, 0xfd, 0x36, 0xb5, 0xfd, 0xd0, 0xee, 0x30, 0x37, 0xf0, 0xab, 0xa7, 0x01, 0x65, 0x44, 0x26, + 0x8d, 0xf1, 0x35, 0xac, 0x24, 0x54, 0x47, 0x51, 0xa8, 0x62, 0xbf, 0x03, 0x30, 0x88, 0xc2, 0x1e, + 0x21, 0x16, 0x3b, 0xf7, 0xd5, 0x71, 0xca, 0x29, 0x37, 0x98, 0x70, 0x8e, 0xf3, 0x57, 0xfa, 0xb5, + 0xcf, 0x7d, 0xe3, 0xd7, 0x70, 0x2f, 0xa1, 0xc7, 0x84, 0xd1, 0x0b, 0x89, 0xbe, 0x07, 0x77, 0x28, + 0xb1, 0xc3, 0x40, 0x22, 0x2f, 0x6d, 0x7d, 0x74, 0x3b, 0xb2, 0xf0, 0xc4, 0xc2, 0x41, 0x2d, 0xa2, + 0xdc, 0x0d, 0x1d, 0x56, 0xc7, 0xec, 0x06, 0x9e, 0x2d, 0x97, 0x30, 0x3e, 0x1e, 0xd3, 0xb4, 0x98, + 0xcd, 0xa2, 0x50, 0x2e, 0xbe, 0x0a, 0x73, 0xbc, 0xe6, 0xb4, 0x44, 0xcd, 0x71, 0x81, 0xd1, 0x82, + 0xd2, 0x09, 0x75, 0x19, 0xe1, 0xb1, 0xf5, 0x99, 0xb4, 0xfd, 0x14, 0xb2, 0xae, 0xf8, 0x19, 0xea, + 0xda, 0xc6, 0xdc, 0xa3, 0xfc, 0xd6, 0x83, 0x94, 0x9d, 0x4a, 0x87, 0xb8, 0x23, 0x29, 0xfb, 0x67, + 0x99, 0x85, 0xd9, 0xd2, 0x9c, 0xf1, 0x27, 0x4d, 0xa1, 0xb6, 0x83, 0xa0, 0xe9, 0xa9, 0x4a, 0xad, + 0x42, 0xee, 0x7b, 0xa5, 0xca, 0xc8, 0x0b, 0x35, 0xa0, 0x64, 0x77, 0x58, 0x64, 0x7b, 0xdf, 0x2f, + 0x49, 0x8a, 0xd2, 0x79, 0x94, 0x22, 0x2b, 0x80, 0x9a, 0x03, 0x4c, 0x5e, 0x46, 0x2e, 0x25, 0x61, + 0xfb, 0xdc, 0x97, 0x97, 0xd8, 0x82, 0x95, 0x9d, 0xc0, 0x77, 0x5c, 0x7e, 0x85, 0xbb, 0xb6, 0xeb, + 0xa9, 0xac, 0x41, 0x3f, 0x83, 0x45, 0xb5, 0xfa, 0x2b, 0xdb, 0x8b, 0x88, 0x3a, 0x43, 0x5a, 0xd3, + 0xfb, 0x82, 0xeb, 0x71, 0x5e, 0x5a, 0x8b, 0x1f, 0xc6, 0x5f, 0x34, 0x40, 0xb2, 0x17, 0x92, 0x6f, + 0x48, 0x27, 0xce, 0x44, 0x54, 0x86, 0x6c, 0x9f, 0x84, 0xa1, 0xdd, 0x25, 0x63, 0xa1, 0x89, 0x85, + 0xe8, 0xe7, 0x90, 0x53, 0x8d, 0x83, 0x38, 0xea, 0xa8, 0x13, 0xbb, 0x6c, 0x7c, 0x5f, 0x43, 0x07, + 0xf4, 0x14, 0x16, 0xe2, 0xba, 0x50, 0xdd, 0xe5, 0x6d, 0xce, 0x43, 0x7b, 0xe3, 0xc7, 0x90, 0x6b, + 0x11, 0x7f, 0xba, 0x6d, 0xaa, 0xb0, 0xbf, 0x84, 0x95, 0x6a, 0xff, 0xd4, 0xed, 0x46, 0x41, 0x14, + 0x62, 0x12, 0x46, 0x1e, 0x9b, 0xee, 0x90, 0x9f, 0x42, 0xfe, 0x8c, 0xda, 0x83, 0x01, 0x71, 0x2c, + 0x42, 0xe9, 0x2d, 0xc7, 0x14, 0x70, 0x18, 0x94, 0xb1, 0x49, 0xa9, 0x71, 0x9f, 0xb7, 0xf1, 0xe7, + 0x6c, 0x8f, 0x06, 0xd1, 0xa0, 0x46, 0x3c, 0x32, 0x2c, 0x71, 0x0b, 0x56, 0x15, 0xe7, 0xed, 0x04, + 0x94, 0x46, 0x03, 0x1e, 0x4c, 0xb9, 0x9b, 0xf7, 0x20, 0x27, 0x66, 0x07, 0xeb, 0x7a, 0x3d, 0x2c, + 0x08, 0xf1, 0x61, 0xd8, 0x45, 0x06, 0xe4, 0x06, 0x34, 0xe8, 0x90, 0x30, 0x54, 0xb7, 0xbe, 0x30, + 0x2c, 0xf3, 0x58, 0x6c, 0xb4, 0x00, 0xa9, 0x05, 0x92, 0x49, 0xfe, 0x0b, 0x00, 0x45, 0xce, 0x31, + 0x21, 0xcd, 0x6f, 0x97, 0x15, 0x21, 0xe5, 0x94, 0xbd, 0xa0, 0xa4, 0xd1, 0x0f, 0x1e, 0x30, 0xf9, + 0xe9, 0x70, 0x8e, 0x6b, 0xb1, 0x80, 0xde, 0xe4, 0xb8, 0x90, 0x4b, 0x53, 0x38, 0x4e, 0x58, 0x4b, + 0x8e, 0x53, 0x9f, 0x38, 0x2b, 0x6c, 0xeb, 0x8e, 0xf1, 0xff, 0x25, 0xc8, 0x0b, 0x80, 0x1a, 0x61, + 0xb6, 0xeb, 0xa1, 0x23, 0x28, 0xf9, 0x01, 0xb3, 0xc6, 0x26, 0x06, 0x99, 0xc3, 0x1f, 0xa6, 0xdc, + 0x75, 0xca, 0xd4, 0x82, 0x97, 0xfc, 0x31, 0x21, 0x3a, 0x84, 0xa2, 0x24, 0x5f, 0x8e, 0xfb, 0x9c, + 0x6f, 0x58, 0x05, 0xef, 0x07, 0x93, 0x68, 0x67, 0xec, 0x60, 0xb8, 0x40, 0x93, 0x32, 0xf4, 0x05, + 0x20, 0x09, 0xf7, 0x82, 0x5c, 0x58, 0x31, 0xc5, 0xa9, 0xc4, 0x7d, 0x34, 0x09, 0xf1, 0x3a, 0x81, + 0xe3, 0x12, 0xbd, 0x26, 0x46, 0xbf, 0x81, 0x0d, 0xc1, 0x54, 0x67, 0x82, 0xd0, 0xac, 0x68, 0xc4, + 0x68, 0x96, 0xab, 0x28, 0x4d, 0xd1, 0xe5, 0x93, 0xd4, 0xd1, 0xe9, 0x6d, 0x54, 0x88, 0xdf, 0xa5, + 0xb7, 0xd9, 0xa0, 0xaf, 0xe1, 0x2e, 0x1b, 0x75, 0x65, 0xcb, 0x96, 0x54, 0x24, 0xe6, 0x9f, 0xfc, + 0xd6, 0xe3, 0xdb, 0x59, 0x20, 0xc9, 0x5b, 0x18, 0xb1, 0x1b, 0x0a, 0x84, 0xa1, 0x94, 0x04, 0xe7, + 0x3c, 0xa4, 0xdf, 0x11, 0xc8, 0x3f, 0xbc, 0x1d, 0x79, 0x48, 0x7b, 0xb8, 0xc8, 0xc6, 0xa5, 0xe8, + 0x18, 0x96, 0x93, 0x98, 0x94, 0x33, 0x91, 0x9e, 0x9d, 0x18, 0x87, 0x54, 0xba, 0xc3, 0xc9, 0x6d, + 0x09, 0x31, 0xfa, 0x25, 0x24, 0x0f, 0xc0, 0xc7, 0x2b, 0x16, 0x85, 0xfa, 0x82, 0xc0, 0x7d, 0x0b, + 0x19, 0x26, 0xa8, 0x0c, 0x27, 0xf7, 0x26, 0xe5, 0x68, 0x17, 0x16, 0xcf, 0x38, 0xdf, 0x58, 0x92, + 0x87, 0xf4, 0x9c, 0xc0, 0x7c, 0x3f, 0x05, 0xf3, 0x3a, 0xd9, 0xe1, 0xfc, 0xd9, 0x48, 0x82, 0xf6, + 0xa0, 0x20, 0x71, 0x58, 0x10, 0x58, 0x81, 0xe7, 0xe8, 0x70, 0x3b, 0x50, 0xa2, 0xf4, 0x15, 0x90, + 0x94, 0xf0, 0xca, 0x08, 0x06, 0x16, 0x55, 0xd4, 0x22, 0xc6, 0x89, 0xfc, 0xc4, 0xca, 0xb8, 0xc9, + 0x41, 0xb8, 0x10, 0x24, 0x65, 0x3c, 0xc8, 0x9d, 0x98, 0x92, 0xac, 0xe7, 0x82, 0x93, 0xf4, 0xc5, + 0x89, 0x41, 0x4e, 0x63, 0x2f, 0x5c, 0xec, 0x8c, 0x4b, 0xd1, 0x01, 0x2c, 0xc9, 0x56, 0x40, 0x15, + 0x23, 0xe9, 0x85, 0x89, 0x3b, 0xbc, 0xc9, 0x5c, 0xb8, 0xe0, 0x25, 0x65, 0x7c, 0x87, 0x7e, 0xe0, + 0x10, 0x2b, 0x1a, 0x8d, 0xed, 0xfa, 0xd2, 0xc4, 0x1d, 0xa6, 0x0d, 0xf8, 0xb8, 0xe8, 0x8f, 0x4b, + 0xd1, 0xc7, 0x90, 0x09, 0x89, 0xef, 0xe8, 0x45, 0x81, 0xf3, 0x4e, 0x0a, 0xce, 0x90, 0xa1, 0xb0, + 0xb0, 0x94, 0x1d, 0xe4, 0x39, 0xb3, 0xba, 0x9c, 0x0f, 0x2c, 0x47, 0x12, 0x82, 0x5e, 0xba, 0xa5, + 0x83, 0xa4, 0x70, 0x07, 0xef, 0x20, 0xe3, 0x62, 0x9e, 0xb9, 0x71, 0x5b, 0xef, 0x0c, 0xe9, 0x44, + 0x5f, 0x9e, 0x98, 0xb9, 0xe9, 0xd4, 0x83, 0x97, 0xe9, 0x75, 0xb9, 0x68, 0xa1, 0x0a, 0x39, 0xce, + 0x39, 0x34, 0xb9, 0x85, 0xde, 0x20, 0x1c, 0x3e, 0x48, 0x27, 0x64, 0xd7, 0x4b, 0x8c, 0x8a, 0xd9, + 0x50, 0x5f, 0x9d, 0xa6, 0xc4, 0x12, 0x73, 0xe4, 0x58, 0x89, 0x49, 0x39, 0x0f, 0xb0, 0x1d, 0x93, + 0xbb, 0x45, 0x05, 0xbb, 0xeb, 0x6b, 0x13, 0x03, 0x9c, 0x36, 0x07, 0xe0, 0xa2, 0x3d, 0x2e, 0xe5, + 0x87, 0x97, 0xc4, 0x36, 0xe2, 0x8f, 0x87, 0x13, 0x0f, 0x7f, 0x93, 0x18, 0x71, 0x21, 0x4c, 0xca, + 0xd0, 0x37, 0xf0, 0xb0, 0x67, 0xfb, 0x8e, 0xc7, 0xdf, 0x40, 0xbc, 0xe1, 0xf0, 0x24, 0xe2, 0xa5, + 0x67, 0x09, 0x62, 0xd7, 0xdf, 0x11, 0xd0, 0x3f, 0x4a, 0x81, 0xfe, 0x5c, 0x7a, 0xe1, 0xd8, 0x69, + 0x58, 0x86, 0x7a, 0x6f, 0x82, 0xe6, 0x69, 0xe6, 0xf5, 0xb7, 0xeb, 0xda, 0xb3, 0xcc, 0xc2, 0x83, + 0xd2, 0x9a, 0xf1, 0x91, 0xe0, 0xd9, 0xa3, 0x20, 0x14, 0xe5, 0x85, 0xd6, 0x60, 0xde, 0xf5, 0x1d, + 0x72, 0xae, 0xe8, 0x5f, 0x4e, 0x0e, 0x52, 0x64, 0xfc, 0x79, 0x0e, 0xe6, 0xa7, 0x1b, 0x8a, 0x7e, + 0x35, 0x4e, 0x1a, 0x94, 0x88, 0xd7, 0xa8, 0x60, 0xc3, 0xa5, 0xd4, 0xfb, 0x19, 0x0b, 0xa5, 0x30, + 0x56, 0x90, 0x88, 0xdd, 0xd0, 0xa0, 0x1d, 0x28, 0x44, 0x3e, 0x39, 0x1f, 0x04, 0x21, 0x71, 0x44, + 0x77, 0xca, 0x4c, 0xf3, 0xd8, 0xc1, 0x8b, 0x43, 0x27, 0xde, 0x95, 0x2a, 0x90, 0x0f, 0xa8, 0xdb, + 0x75, 0x7d, 0x8b, 0x57, 0xae, 0xe0, 0xb3, 0xf9, 0xed, 0x25, 0xbe, 0xe6, 0x9b, 0xcb, 0xf5, 0x3b, + 0xbc, 0xc6, 0xeb, 0x35, 0x0c, 0xd2, 0x84, 0xff, 0x42, 0x3f, 0x85, 0x3b, 0x8e, 0x98, 0x45, 0x14, + 0x43, 0x95, 0x27, 0xcd, 0x78, 0x72, 0x62, 0xc1, 0xca, 0x1a, 0xfd, 0x24, 0xbe, 0xd1, 0xec, 0x6d, + 0x6e, 0x71, 0x00, 0xd4, 0x5d, 0xa3, 0x27, 0x30, 0xe7, 0x07, 0x67, 0x8a, 0x5f, 0xa6, 0x7a, 0x20, + 0x70, 0xfb, 0xa7, 0x99, 0xdf, 0x7f, 0xbb, 0x3e, 0xa3, 0x26, 0xda, 0x43, 0xb8, 0x7f, 0xec, 0x5f, + 0xcf, 0x01, 0x19, 0xbf, 0x2d, 0xc8, 0x0c, 0x4c, 0x4a, 0x6f, 0x79, 0x05, 0x08, 0x3b, 0x85, 0x2c, + 0x6c, 0x8d, 0x7f, 0x68, 0xa0, 0x4f, 0xca, 0xb5, 0x49, 0x2f, 0x34, 0x74, 0x02, 0x77, 0x78, 0x0e, + 0xbb, 0x8e, 0xfa, 0x4b, 0xe1, 0xb3, 0x7f, 0x5f, 0xae, 0x7f, 0xd2, 0x75, 0x59, 0x2f, 0x3a, 0xdd, + 0xec, 0x04, 0xfd, 0xca, 0x70, 0x61, 0xe7, 0xb4, 0x92, 0xf2, 0x5f, 0x55, 0x14, 0xb9, 0xce, 0xe6, + 0xf1, 0x71, 0xbd, 0x76, 0x75, 0xb9, 0x3e, 0xdf, 0x3e, 0xf7, 0xeb, 0x35, 0x3c, 0xcf, 0xce, 0xfd, + 0xba, 0x83, 0x3e, 0x83, 0x7c, 0x22, 0x33, 0xd4, 0x9c, 0xf5, 0xb6, 0x0c, 0x48, 0xba, 0x3c, 0xfe, + 0x9b, 0x76, 0xed, 0x25, 0x3a, 0x7c, 0xb1, 0x22, 0x1d, 0x56, 0xb0, 0xd9, 0xc6, 0x5f, 0x5a, 0xd8, + 0xac, 0xb6, 0x9a, 0x0d, 0xeb, 0xb8, 0xb1, 0xdf, 0x68, 0x9e, 0x34, 0x4a, 0x33, 0xe8, 0x3e, 0xdc, + 0x95, 0x9a, 0x13, 0x5c, 0x6f, 0x9b, 0x56, 0xbb, 0xd9, 0xb4, 0x9a, 0x07, 0xb5, 0x92, 0x86, 0x56, + 0x01, 0x49, 0x45, 0xcd, 0x3c, 0x30, 0xdb, 0xa6, 0x85, 0xab, 0x8d, 0x3d, 0xb3, 0x34, 0x3b, 0x92, + 0xb7, 0x4c, 0x5c, 0xaf, 0x1e, 0xd4, 0xbf, 0xaa, 0x6e, 0x1f, 0x98, 0xa5, 0x39, 0xf4, 0x00, 0xee, + 0x49, 0xf9, 0x51, 0xb3, 0xd5, 0xaa, 0x6f, 0x1f, 0x98, 0x16, 0x36, 0x8f, 0x0e, 0xaa, 0x5f, 0x96, + 0x32, 0xe8, 0x21, 0xdc, 0x97, 0xaa, 0x36, 0xb7, 0xb5, 0x76, 0x71, 0xf3, 0xd0, 0xda, 0x3d, 0x6e, + 0x1f, 0x63, 0xb3, 0x34, 0xbf, 0x96, 0xf9, 0xed, 0x1f, 0xcb, 0x33, 0x8f, 0x9f, 0x02, 0xba, 0x59, + 0x31, 0x68, 0x01, 0x32, 0x8d, 0x66, 0xc3, 0x2c, 0xcd, 0xa0, 0x3c, 0x64, 0xb7, 0xab, 0x3b, 0xfb, + 0xcd, 0xdd, 0xdd, 0x92, 0x86, 0x0a, 0x90, 0xab, 0x1f, 0x1e, 0x9a, 0xb5, 0x7a, 0xb5, 0x6d, 0x96, + 0x66, 0xb7, 0xdf, 0x7b, 0xfd, 0xdf, 0xf2, 0xcc, 0xeb, 0xab, 0xb2, 0xf6, 0xcf, 0xab, 0xb2, 0xf6, + 0xaf, 0xab, 0xb2, 0xf6, 0x9f, 0xab, 0xb2, 0xf6, 0xbb, 0xff, 0x95, 0x67, 0xbe, 0xca, 0xaa, 0x3b, + 0xfb, 0x2e, 0x00, 0x00, 0xff, 0xff, 0xd7, 0xa0, 0x51, 0xfb, 0xb6, 0x14, 0x00, 0x00, } diff --git a/pkg/roachpb/errors.proto b/pkg/roachpb/errors.proto index cc13318cc06b..13236a7b5331 100644 --- a/pkg/roachpb/errors.proto +++ b/pkg/roachpb/errors.proto @@ -122,6 +122,10 @@ enum TransactionRetryReason { // A possible replay caused by duplicate begin txn or out-of-order // txn sequence number. RETRY_POSSIBLE_REPLAY = 4; + // A transaction encountered a lease on a table descriptor such + // that the write timestamp on the table descriptor is after the + // transaction timestamp. + RETRY_TABLE_FROM_FUTURE = 5; } // A TransactionRetryError indicates that the transaction must be diff --git a/pkg/sql/distsql_running.go b/pkg/sql/distsql_running.go index cbc7924b2119..8f16a1f7c299 100644 --- a/pkg/sql/distsql_running.go +++ b/pkg/sql/distsql_running.go @@ -294,7 +294,7 @@ func (r *distSQLReceiver) Push( // itself in non-error cases. Those updates are not necessary if we're // just doing reads. Once DistSQL starts performing writes, we'll need // to perform such updates too. - r.txn.UpdateStateOnRemoteRetryableErr(r.ctx, retryErr.PErr) + r.txn.UpdateStateOnRetryableErr(r.ctx, retryErr.PErr) // Update the clock with information from the error. On non-DistSQL // code paths, the DistSender does this. // TODO(andrei): We don't propagate clock signals on success cases