From a2dc57bcbe99d71733b36863c80f0ab2a0aa2e60 Mon Sep 17 00:00:00 2001 From: bianyucheng Date: Tue, 1 Aug 2023 15:08:33 +0800 Subject: [PATCH 1/4] add killprocess func --- sqle/driver/mysql/mysql.go | 14 +- sqle/driver/mysql/util/util.go | 16 ++ sqle/driver/plugin_adapter_v2.go | 9 +- sqle/driver/v2/driver_grpc_server.go | 8 + sqle/driver/v2/driver_interface.go | 1 + sqle/driver/v2/proto/driver_v2.pb.go | 384 +++++++++++++++------------ sqle/driver/v2/proto/driver_v2.proto | 6 + sqle/pkg/driver/impl.go | 5 + 8 files changed, 264 insertions(+), 179 deletions(-) diff --git a/sqle/driver/mysql/mysql.go b/sqle/driver/mysql/mysql.go index b112b030f4..5f920667c5 100644 --- a/sqle/driver/mysql/mysql.go +++ b/sqle/driver/mysql/mysql.go @@ -17,7 +17,6 @@ import ( driverV2 "github.com/actiontech/sqle/sqle/driver/v2" "github.com/actiontech/sqle/sqle/log" "github.com/actiontech/sqle/sqle/pkg/params" - "github.com/actiontech/sqle/sqle/utils" "github.com/pingcap/parser/ast" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -226,17 +225,8 @@ func (i *MysqlDriverImpl) KillProcess(ctx context.Context) error { } defer killConn.Db.Close() killSQL := fmt.Sprintf("KILL %v", connID) - killFunc := func() error { - _, err := killConn.Db.Exec(killSQL) - return err - } - err = utils.AsyncCallTimeout(ctx, killFunc) - if err != nil { - err = fmt.Errorf("exec sql(%v) failed, err: %v", killSQL, err) - return err - } - logEntry.Infof("exec sql(%v) successfully", killSQL) - return nil + err = util.KillProcess(ctx, killSQL, killConn, logEntry) + return err } func (i *MysqlDriverImpl) query(ctx context.Context, query string, args ...interface{}) ([]map[string]sql.NullString, error) { diff --git a/sqle/driver/mysql/util/util.go b/sqle/driver/mysql/util/util.go index 8e826a67f5..c533aa64f1 100644 --- a/sqle/driver/mysql/util/util.go +++ b/sqle/driver/mysql/util/util.go @@ -8,10 +8,12 @@ import ( "strings" "github.com/actiontech/sqle/sqle/driver/mysql/executor" + "github.com/actiontech/sqle/sqle/utils" "github.com/pingcap/parser/ast" "github.com/pingcap/parser/format" "github.com/pingcap/tidb/types" driver "github.com/pingcap/tidb/types/parser_driver" + "github.com/sirupsen/logrus" ) var ErrUnsupportedSqlType = errors.New("unsupported sql type") @@ -215,3 +217,17 @@ func checkSql(affectRowSql string) error { return nil } + +func KillProcess(ctx context.Context, killSQL string, killConn *executor.Executor, logEntry *logrus.Entry) error { + killFunc := func() error { + _, err := killConn.Db.Exec(killSQL) + return err + } + err := utils.AsyncCallTimeout(ctx, killFunc) + if err != nil { + err = fmt.Errorf("exec sql(%v) failed, err: %v", killSQL, err) + return err + } + logEntry.Infof("exec sql(%v) successfully", killSQL) + return nil +} diff --git a/sqle/driver/plugin_adapter_v2.go b/sqle/driver/plugin_adapter_v2.go index 3b6e028a2e..aed45c32ee 100644 --- a/sqle/driver/plugin_adapter_v2.go +++ b/sqle/driver/plugin_adapter_v2.go @@ -8,7 +8,6 @@ import ( driverV2 "github.com/actiontech/sqle/sqle/driver/v2" protoV2 "github.com/actiontech/sqle/sqle/driver/v2/proto" - "github.com/actiontech/sqle/sqle/errors" "github.com/actiontech/sqle/sqle/log" "github.com/actiontech/sqle/sqle/pkg/params" @@ -174,7 +173,13 @@ func (s *PluginImplV2) Close(ctx context.Context) { } func (s *PluginImplV2) KillProcess(ctx context.Context) error { - return errors.NewNotImplementedError("KillProcess not support yet") + api := "Kill Process" + s.preLog(api) + _, err := s.client.KillProcess(ctx, &protoV2.KillProcessRequest{ + Session: s.Session, + }) + s.afterLog(api, err) + return err } // audit diff --git a/sqle/driver/v2/driver_grpc_server.go b/sqle/driver/v2/driver_grpc_server.go index 0a8ec7de7d..97af564142 100644 --- a/sqle/driver/v2/driver_grpc_server.go +++ b/sqle/driver/v2/driver_grpc_server.go @@ -434,3 +434,11 @@ func (d *DriverGrpcServer) EstimateSQLAffectRows(ctx context.Context, req *proto ErrMessage: ar.ErrMessage, }, nil } + +func (d *DriverGrpcServer) KillProcess(ctx context.Context, req *protoV2.KillProcessRequest) (*protoV2.Empty, error) { + driver, err := d.getDriverBySession(req.Session) + if err != nil { + return &protoV2.Empty{}, err + } + return &protoV2.Empty{}, driver.KillProcess(ctx) +} diff --git a/sqle/driver/v2/driver_interface.go b/sqle/driver/v2/driver_interface.go index b7ed64e5a3..9ee4731f84 100644 --- a/sqle/driver/v2/driver_interface.go +++ b/sqle/driver/v2/driver_interface.go @@ -87,6 +87,7 @@ type Driver interface { GetTableMeta(ctx context.Context, table *Table) (*TableMeta, error) ExtractTableFromSQL(ctx context.Context, sql string) ([]*Table, error) EstimateSQLAffectRows(ctx context.Context, sql string) (*EstimatedAffectRows, error) + KillProcess(ctx context.Context) error } type Node struct { diff --git a/sqle/driver/v2/proto/driver_v2.pb.go b/sqle/driver/v2/proto/driver_v2.pb.go index 0d69120461..777254ffd4 100644 --- a/sqle/driver/v2/proto/driver_v2.pb.go +++ b/sqle/driver/v2/proto/driver_v2.pb.go @@ -17,6 +17,7 @@ It has these top-level messages: InitRequest InitResponse CloseRequest + KillProcessRequest ParsedSQL ParseRequest Node @@ -68,11 +69,11 @@ It has these top-level messages: */ package protoV2 -import ( - fmt "fmt" - math "math" +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" - proto "github.com/golang/protobuf/proto" +import ( context "golang.org/x/net/context" grpc "google.golang.org/grpc" ) @@ -412,6 +413,23 @@ func (m *CloseRequest) GetSession() *Session { return nil } +// Kill +type KillProcessRequest struct { + Session *Session `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"` +} + +func (m *KillProcessRequest) Reset() { *m = KillProcessRequest{} } +func (m *KillProcessRequest) String() string { return proto.CompactTextString(m) } +func (*KillProcessRequest) ProtoMessage() {} +func (*KillProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } + +func (m *KillProcessRequest) GetSession() *Session { + if m != nil { + return m.Session + } + return nil +} + // Parse type ParsedSQL struct { Query string `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"` @@ -420,7 +438,7 @@ type ParsedSQL struct { func (m *ParsedSQL) Reset() { *m = ParsedSQL{} } func (m *ParsedSQL) String() string { return proto.CompactTextString(m) } func (*ParsedSQL) ProtoMessage() {} -func (*ParsedSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } +func (*ParsedSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } func (m *ParsedSQL) GetQuery() string { if m != nil { @@ -437,7 +455,7 @@ type ParseRequest struct { func (m *ParseRequest) Reset() { *m = ParseRequest{} } func (m *ParseRequest) String() string { return proto.CompactTextString(m) } func (*ParseRequest) ProtoMessage() {} -func (*ParseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } +func (*ParseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } func (m *ParseRequest) GetSession() *Session { if m != nil { @@ -462,7 +480,7 @@ type Node struct { func (m *Node) Reset() { *m = Node{} } func (m *Node) String() string { return proto.CompactTextString(m) } func (*Node) ProtoMessage() {} -func (*Node) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } +func (*Node) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } func (m *Node) GetText() string { if m != nil { @@ -492,7 +510,7 @@ type ParseResponse struct { func (m *ParseResponse) Reset() { *m = ParseResponse{} } func (m *ParseResponse) String() string { return proto.CompactTextString(m) } func (*ParseResponse) ProtoMessage() {} -func (*ParseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } +func (*ParseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } func (m *ParseResponse) GetNodes() []*Node { if m != nil { @@ -509,7 +527,7 @@ type AuditSQL struct { func (m *AuditSQL) Reset() { *m = AuditSQL{} } func (m *AuditSQL) String() string { return proto.CompactTextString(m) } func (*AuditSQL) ProtoMessage() {} -func (*AuditSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } +func (*AuditSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } func (m *AuditSQL) GetQuery() string { if m != nil { @@ -526,7 +544,7 @@ type AuditRequest struct { func (m *AuditRequest) Reset() { *m = AuditRequest{} } func (m *AuditRequest) String() string { return proto.CompactTextString(m) } func (*AuditRequest) ProtoMessage() {} -func (*AuditRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } +func (*AuditRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } func (m *AuditRequest) GetSession() *Session { if m != nil { @@ -551,7 +569,7 @@ type AuditResult struct { func (m *AuditResult) Reset() { *m = AuditResult{} } func (m *AuditResult) String() string { return proto.CompactTextString(m) } func (*AuditResult) ProtoMessage() {} -func (*AuditResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } +func (*AuditResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } func (m *AuditResult) GetMessage() string { if m != nil { @@ -581,7 +599,7 @@ type AuditResults struct { func (m *AuditResults) Reset() { *m = AuditResults{} } func (m *AuditResults) String() string { return proto.CompactTextString(m) } func (*AuditResults) ProtoMessage() {} -func (*AuditResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } +func (*AuditResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } func (m *AuditResults) GetResults() []*AuditResult { if m != nil { @@ -597,7 +615,7 @@ type AuditResponse struct { func (m *AuditResponse) Reset() { *m = AuditResponse{} } func (m *AuditResponse) String() string { return proto.CompactTextString(m) } func (*AuditResponse) ProtoMessage() {} -func (*AuditResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } +func (*AuditResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } func (m *AuditResponse) GetAuditResults() []*AuditResults { if m != nil { @@ -614,7 +632,7 @@ type NeedRollbackSQL struct { func (m *NeedRollbackSQL) Reset() { *m = NeedRollbackSQL{} } func (m *NeedRollbackSQL) String() string { return proto.CompactTextString(m) } func (*NeedRollbackSQL) ProtoMessage() {} -func (*NeedRollbackSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } +func (*NeedRollbackSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} } func (m *NeedRollbackSQL) GetQuery() string { if m != nil { @@ -631,7 +649,7 @@ type GenRollbackSQLRequest struct { func (m *GenRollbackSQLRequest) Reset() { *m = GenRollbackSQLRequest{} } func (m *GenRollbackSQLRequest) String() string { return proto.CompactTextString(m) } func (*GenRollbackSQLRequest) ProtoMessage() {} -func (*GenRollbackSQLRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} } +func (*GenRollbackSQLRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} } func (m *GenRollbackSQLRequest) GetSession() *Session { if m != nil { @@ -655,7 +673,7 @@ type RollbackSQL struct { func (m *RollbackSQL) Reset() { *m = RollbackSQL{} } func (m *RollbackSQL) String() string { return proto.CompactTextString(m) } func (*RollbackSQL) ProtoMessage() {} -func (*RollbackSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} } +func (*RollbackSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} } func (m *RollbackSQL) GetQuery() string { if m != nil { @@ -678,7 +696,7 @@ type GenRollbackSQLResponse struct { func (m *GenRollbackSQLResponse) Reset() { *m = GenRollbackSQLResponse{} } func (m *GenRollbackSQLResponse) String() string { return proto.CompactTextString(m) } func (*GenRollbackSQLResponse) ProtoMessage() {} -func (*GenRollbackSQLResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} } +func (*GenRollbackSQLResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} } func (m *GenRollbackSQLResponse) GetSql() *RollbackSQL { if m != nil { @@ -695,7 +713,7 @@ type PingRequest struct { func (m *PingRequest) Reset() { *m = PingRequest{} } func (m *PingRequest) String() string { return proto.CompactTextString(m) } func (*PingRequest) ProtoMessage() {} -func (*PingRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} } +func (*PingRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} } func (m *PingRequest) GetSession() *Session { if m != nil { @@ -712,7 +730,7 @@ type ExecSQL struct { func (m *ExecSQL) Reset() { *m = ExecSQL{} } func (m *ExecSQL) String() string { return proto.CompactTextString(m) } func (*ExecSQL) ProtoMessage() {} -func (*ExecSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} } +func (*ExecSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} } func (m *ExecSQL) GetQuery() string { if m != nil { @@ -729,7 +747,7 @@ type ExecRequest struct { func (m *ExecRequest) Reset() { *m = ExecRequest{} } func (m *ExecRequest) String() string { return proto.CompactTextString(m) } func (*ExecRequest) ProtoMessage() {} -func (*ExecRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} } +func (*ExecRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} } func (m *ExecRequest) GetSession() *Session { if m != nil { @@ -755,7 +773,7 @@ type ExecResult struct { func (m *ExecResult) Reset() { *m = ExecResult{} } func (m *ExecResult) String() string { return proto.CompactTextString(m) } func (*ExecResult) ProtoMessage() {} -func (*ExecResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} } +func (*ExecResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} } func (m *ExecResult) GetLastInsertId() int64 { if m != nil { @@ -792,7 +810,7 @@ type ExecResponse struct { func (m *ExecResponse) Reset() { *m = ExecResponse{} } func (m *ExecResponse) String() string { return proto.CompactTextString(m) } func (*ExecResponse) ProtoMessage() {} -func (*ExecResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} } +func (*ExecResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} } func (m *ExecResponse) GetResult() *ExecResult { if m != nil { @@ -810,7 +828,7 @@ type TxRequest struct { func (m *TxRequest) Reset() { *m = TxRequest{} } func (m *TxRequest) String() string { return proto.CompactTextString(m) } func (*TxRequest) ProtoMessage() {} -func (*TxRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} } +func (*TxRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} } func (m *TxRequest) GetSession() *Session { if m != nil { @@ -833,7 +851,7 @@ type TxResponse struct { func (m *TxResponse) Reset() { *m = TxResponse{} } func (m *TxResponse) String() string { return proto.CompactTextString(m) } func (*TxResponse) ProtoMessage() {} -func (*TxResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} } +func (*TxResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} } func (m *TxResponse) GetResults() []*ExecResult { if m != nil { @@ -850,7 +868,7 @@ type QuerySQL struct { func (m *QuerySQL) Reset() { *m = QuerySQL{} } func (m *QuerySQL) String() string { return proto.CompactTextString(m) } func (*QuerySQL) ProtoMessage() {} -func (*QuerySQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} } +func (*QuerySQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} } func (m *QuerySQL) GetQuery() string { if m != nil { @@ -866,7 +884,7 @@ type QueryConf struct { func (m *QueryConf) Reset() { *m = QueryConf{} } func (m *QueryConf) String() string { return proto.CompactTextString(m) } func (*QueryConf) ProtoMessage() {} -func (*QueryConf) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} } +func (*QueryConf) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} } func (m *QueryConf) GetTimeoutSecond() uint32 { if m != nil { @@ -884,7 +902,7 @@ type QueryRequest struct { func (m *QueryRequest) Reset() { *m = QueryRequest{} } func (m *QueryRequest) String() string { return proto.CompactTextString(m) } func (*QueryRequest) ProtoMessage() {} -func (*QueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} } +func (*QueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} } func (m *QueryRequest) GetSession() *Session { if m != nil { @@ -915,7 +933,7 @@ type QueryResponse struct { func (m *QueryResponse) Reset() { *m = QueryResponse{} } func (m *QueryResponse) String() string { return proto.CompactTextString(m) } func (*QueryResponse) ProtoMessage() {} -func (*QueryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} } +func (*QueryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} } func (m *QueryResponse) GetColumn() []*Param { if m != nil { @@ -938,7 +956,7 @@ type QueryResultRow struct { func (m *QueryResultRow) Reset() { *m = QueryResultRow{} } func (m *QueryResultRow) String() string { return proto.CompactTextString(m) } func (*QueryResultRow) ProtoMessage() {} -func (*QueryResultRow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} } +func (*QueryResultRow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} } func (m *QueryResultRow) GetValues() []*QueryResultValue { if m != nil { @@ -954,7 +972,7 @@ type QueryResultValue struct { func (m *QueryResultValue) Reset() { *m = QueryResultValue{} } func (m *QueryResultValue) String() string { return proto.CompactTextString(m) } func (*QueryResultValue) ProtoMessage() {} -func (*QueryResultValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} } +func (*QueryResultValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} } func (m *QueryResultValue) GetValue() string { if m != nil { @@ -971,7 +989,7 @@ type ExplainSQL struct { func (m *ExplainSQL) Reset() { *m = ExplainSQL{} } func (m *ExplainSQL) String() string { return proto.CompactTextString(m) } func (*ExplainSQL) ProtoMessage() {} -func (*ExplainSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} } +func (*ExplainSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} } func (m *ExplainSQL) GetQuery() string { if m != nil { @@ -988,7 +1006,7 @@ type ExplainRequest struct { func (m *ExplainRequest) Reset() { *m = ExplainRequest{} } func (m *ExplainRequest) String() string { return proto.CompactTextString(m) } func (*ExplainRequest) ProtoMessage() {} -func (*ExplainRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} } +func (*ExplainRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} } func (m *ExplainRequest) GetSession() *Session { if m != nil { @@ -1011,7 +1029,7 @@ type ExplainResponse struct { func (m *ExplainResponse) Reset() { *m = ExplainResponse{} } func (m *ExplainResponse) String() string { return proto.CompactTextString(m) } func (*ExplainResponse) ProtoMessage() {} -func (*ExplainResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} } +func (*ExplainResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} } func (m *ExplainResponse) GetClassicResult() *ExplainClassicResult { if m != nil { @@ -1027,7 +1045,7 @@ type ExplainClassicResult struct { func (m *ExplainClassicResult) Reset() { *m = ExplainClassicResult{} } func (m *ExplainClassicResult) String() string { return proto.CompactTextString(m) } func (*ExplainClassicResult) ProtoMessage() {} -func (*ExplainClassicResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} } +func (*ExplainClassicResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} } func (m *ExplainClassicResult) GetData() *TabularData { if m != nil { @@ -1044,7 +1062,7 @@ type GetDatabasesRequest struct { func (m *GetDatabasesRequest) Reset() { *m = GetDatabasesRequest{} } func (m *GetDatabasesRequest) String() string { return proto.CompactTextString(m) } func (*GetDatabasesRequest) ProtoMessage() {} -func (*GetDatabasesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} } +func (*GetDatabasesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} } func (m *GetDatabasesRequest) GetSession() *Session { if m != nil { @@ -1060,7 +1078,7 @@ type Database struct { func (m *Database) Reset() { *m = Database{} } func (m *Database) String() string { return proto.CompactTextString(m) } func (*Database) ProtoMessage() {} -func (*Database) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} } +func (*Database) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} } func (m *Database) GetName() string { if m != nil { @@ -1076,7 +1094,7 @@ type GetDatabasesResponse struct { func (m *GetDatabasesResponse) Reset() { *m = GetDatabasesResponse{} } func (m *GetDatabasesResponse) String() string { return proto.CompactTextString(m) } func (*GetDatabasesResponse) ProtoMessage() {} -func (*GetDatabasesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} } +func (*GetDatabasesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} } func (m *GetDatabasesResponse) GetDatabases() []*Database { if m != nil { @@ -1094,7 +1112,7 @@ type Table struct { func (m *Table) Reset() { *m = Table{} } func (m *Table) String() string { return proto.CompactTextString(m) } func (*Table) ProtoMessage() {} -func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} } +func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} } func (m *Table) GetName() string { if m != nil { @@ -1118,7 +1136,7 @@ type GetTableMetaRequest struct { func (m *GetTableMetaRequest) Reset() { *m = GetTableMetaRequest{} } func (m *GetTableMetaRequest) String() string { return proto.CompactTextString(m) } func (*GetTableMetaRequest) ProtoMessage() {} -func (*GetTableMetaRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} } +func (*GetTableMetaRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{44} } func (m *GetTableMetaRequest) GetSession() *Session { if m != nil { @@ -1141,7 +1159,7 @@ type GetTableMetaResponse struct { func (m *GetTableMetaResponse) Reset() { *m = GetTableMetaResponse{} } func (m *GetTableMetaResponse) String() string { return proto.CompactTextString(m) } func (*GetTableMetaResponse) ProtoMessage() {} -func (*GetTableMetaResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{44} } +func (*GetTableMetaResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{45} } func (m *GetTableMetaResponse) GetTableMeta() *TableMeta { if m != nil { @@ -1160,7 +1178,7 @@ type TableMeta struct { func (m *TableMeta) Reset() { *m = TableMeta{} } func (m *TableMeta) String() string { return proto.CompactTextString(m) } func (*TableMeta) ProtoMessage() {} -func (*TableMeta) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{45} } +func (*TableMeta) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} } func (m *TableMeta) GetColumnsInfo() *ColumnsInfo { if m != nil { @@ -1197,7 +1215,7 @@ type ColumnsInfo struct { func (m *ColumnsInfo) Reset() { *m = ColumnsInfo{} } func (m *ColumnsInfo) String() string { return proto.CompactTextString(m) } func (*ColumnsInfo) ProtoMessage() {} -func (*ColumnsInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} } +func (*ColumnsInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} } func (m *ColumnsInfo) GetData() *TabularData { if m != nil { @@ -1213,7 +1231,7 @@ type IndexesInfo struct { func (m *IndexesInfo) Reset() { *m = IndexesInfo{} } func (m *IndexesInfo) String() string { return proto.CompactTextString(m) } func (*IndexesInfo) ProtoMessage() {} -func (*IndexesInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} } +func (*IndexesInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{48} } func (m *IndexesInfo) GetData() *TabularData { if m != nil { @@ -1230,7 +1248,7 @@ type TabularDataHead struct { func (m *TabularDataHead) Reset() { *m = TabularDataHead{} } func (m *TabularDataHead) String() string { return proto.CompactTextString(m) } func (*TabularDataHead) ProtoMessage() {} -func (*TabularDataHead) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{48} } +func (*TabularDataHead) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{49} } func (m *TabularDataHead) GetName() string { if m != nil { @@ -1253,7 +1271,7 @@ type TabularDataRows struct { func (m *TabularDataRows) Reset() { *m = TabularDataRows{} } func (m *TabularDataRows) String() string { return proto.CompactTextString(m) } func (*TabularDataRows) ProtoMessage() {} -func (*TabularDataRows) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{49} } +func (*TabularDataRows) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{50} } func (m *TabularDataRows) GetItems() []string { if m != nil { @@ -1270,7 +1288,7 @@ type TabularData struct { func (m *TabularData) Reset() { *m = TabularData{} } func (m *TabularData) String() string { return proto.CompactTextString(m) } func (*TabularData) ProtoMessage() {} -func (*TabularData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{50} } +func (*TabularData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51} } func (m *TabularData) GetColumns() []*TabularDataHead { if m != nil { @@ -1294,7 +1312,7 @@ type ExtractedSQL struct { func (m *ExtractedSQL) Reset() { *m = ExtractedSQL{} } func (m *ExtractedSQL) String() string { return proto.CompactTextString(m) } func (*ExtractedSQL) ProtoMessage() {} -func (*ExtractedSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51} } +func (*ExtractedSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{52} } func (m *ExtractedSQL) GetQuery() string { if m != nil { @@ -1311,7 +1329,7 @@ type ExtractTableFromSQLRequest struct { func (m *ExtractTableFromSQLRequest) Reset() { *m = ExtractTableFromSQLRequest{} } func (m *ExtractTableFromSQLRequest) String() string { return proto.CompactTextString(m) } func (*ExtractTableFromSQLRequest) ProtoMessage() {} -func (*ExtractTableFromSQLRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{52} } +func (*ExtractTableFromSQLRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{53} } func (m *ExtractTableFromSQLRequest) GetSession() *Session { if m != nil { @@ -1334,7 +1352,7 @@ type ExtractTableFromSQLResponse struct { func (m *ExtractTableFromSQLResponse) Reset() { *m = ExtractTableFromSQLResponse{} } func (m *ExtractTableFromSQLResponse) String() string { return proto.CompactTextString(m) } func (*ExtractTableFromSQLResponse) ProtoMessage() {} -func (*ExtractTableFromSQLResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{53} } +func (*ExtractTableFromSQLResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{54} } func (m *ExtractTableFromSQLResponse) GetTables() []*Table { if m != nil { @@ -1351,7 +1369,7 @@ type AffectRowsSQL struct { func (m *AffectRowsSQL) Reset() { *m = AffectRowsSQL{} } func (m *AffectRowsSQL) String() string { return proto.CompactTextString(m) } func (*AffectRowsSQL) ProtoMessage() {} -func (*AffectRowsSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{54} } +func (*AffectRowsSQL) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{55} } func (m *AffectRowsSQL) GetQuery() string { if m != nil { @@ -1368,7 +1386,7 @@ type EstimateSQLAffectRowsRequest struct { func (m *EstimateSQLAffectRowsRequest) Reset() { *m = EstimateSQLAffectRowsRequest{} } func (m *EstimateSQLAffectRowsRequest) String() string { return proto.CompactTextString(m) } func (*EstimateSQLAffectRowsRequest) ProtoMessage() {} -func (*EstimateSQLAffectRowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{55} } +func (*EstimateSQLAffectRowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56} } func (m *EstimateSQLAffectRowsRequest) GetSession() *Session { if m != nil { @@ -1392,7 +1410,7 @@ type EstimateSQLAffectRowsResponse struct { func (m *EstimateSQLAffectRowsResponse) Reset() { *m = EstimateSQLAffectRowsResponse{} } func (m *EstimateSQLAffectRowsResponse) String() string { return proto.CompactTextString(m) } func (*EstimateSQLAffectRowsResponse) ProtoMessage() {} -func (*EstimateSQLAffectRowsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56} } +func (*EstimateSQLAffectRowsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{57} } func (m *EstimateSQLAffectRowsResponse) GetCount() int64 { if m != nil { @@ -1418,6 +1436,7 @@ func init() { proto.RegisterType((*InitRequest)(nil), "protoV2.InitRequest") proto.RegisterType((*InitResponse)(nil), "protoV2.InitResponse") proto.RegisterType((*CloseRequest)(nil), "protoV2.CloseRequest") + proto.RegisterType((*KillProcessRequest)(nil), "protoV2.KillProcessRequest") proto.RegisterType((*ParsedSQL)(nil), "protoV2.ParsedSQL") proto.RegisterType((*ParseRequest)(nil), "protoV2.ParseRequest") proto.RegisterType((*Node)(nil), "protoV2.Node") @@ -1488,6 +1507,7 @@ type DriverClient interface { // We put all communication on gRPC for unification in the end. Init(ctx context.Context, in *InitRequest, opts ...grpc.CallOption) (*InitResponse, error) Close(ctx context.Context, in *CloseRequest, opts ...grpc.CallOption) (*Empty, error) + KillProcess(ctx context.Context, in *KillProcessRequest, opts ...grpc.CallOption) (*Empty, error) // db audit Parse(ctx context.Context, in *ParseRequest, opts ...grpc.CallOption) (*ParseResponse, error) Audit(ctx context.Context, in *AuditRequest, opts ...grpc.CallOption) (*AuditResponse, error) @@ -1540,6 +1560,15 @@ func (c *driverClient) Close(ctx context.Context, in *CloseRequest, opts ...grpc return out, nil } +func (c *driverClient) KillProcess(ctx context.Context, in *KillProcessRequest, opts ...grpc.CallOption) (*Empty, error) { + out := new(Empty) + err := grpc.Invoke(ctx, "/protoV2.Driver/KillProcess", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *driverClient) Parse(ctx context.Context, in *ParseRequest, opts ...grpc.CallOption) (*ParseResponse, error) { out := new(ParseResponse) err := grpc.Invoke(ctx, "/protoV2.Driver/Parse", in, out, c.cc, opts...) @@ -1659,6 +1688,7 @@ type DriverServer interface { // We put all communication on gRPC for unification in the end. Init(context.Context, *InitRequest) (*InitResponse, error) Close(context.Context, *CloseRequest) (*Empty, error) + KillProcess(context.Context, *KillProcessRequest) (*Empty, error) // db audit Parse(context.Context, *ParseRequest) (*ParseResponse, error) Audit(context.Context, *AuditRequest) (*AuditResponse, error) @@ -1734,6 +1764,24 @@ func _Driver_Close_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } +func _Driver_KillProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(KillProcessRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DriverServer).KillProcess(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/protoV2.Driver/KillProcess", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DriverServer).KillProcess(ctx, req.(*KillProcessRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Driver_Parse_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ParseRequest) if err := dec(in); err != nil { @@ -1966,6 +2014,10 @@ var _Driver_serviceDesc = grpc.ServiceDesc{ MethodName: "Close", Handler: _Driver_Close_Handler, }, + { + MethodName: "KillProcess", + Handler: _Driver_KillProcess_Handler, + }, { MethodName: "Parse", Handler: _Driver_Parse_Handler, @@ -2022,117 +2074,119 @@ var _Driver_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("driver_v2.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1787 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x5b, 0x53, 0x1b, 0xc9, - 0x15, 0x8e, 0x2e, 0x23, 0xa1, 0xa3, 0x0b, 0xda, 0x06, 0x8c, 0xac, 0x5d, 0xb3, 0xa4, 0xc1, 0x2c, - 0xe5, 0x75, 0xf0, 0xae, 0x48, 0x79, 0xcb, 0xeb, 0x24, 0xb5, 0x04, 0x88, 0x17, 0xc7, 0x10, 0x18, - 0x88, 0x53, 0xe5, 0x2a, 0x97, 0xdd, 0x68, 0x5a, 0x78, 0xca, 0xa3, 0x19, 0x31, 0xdd, 0xe2, 0xf2, - 0x9a, 0x97, 0xfc, 0x95, 0x3c, 0xe6, 0xc5, 0x8f, 0xf9, 0x09, 0xf9, 0x4f, 0xa9, 0xbe, 0xcc, 0x4c, - 0xcf, 0x68, 0xe4, 0x8b, 0x9e, 0x34, 0x7d, 0x6e, 0x7d, 0xfa, 0x3b, 0xa7, 0x4f, 0x9f, 0x23, 0x98, - 0x77, 0x42, 0xf7, 0x8a, 0x86, 0x6f, 0xae, 0x7a, 0x5b, 0xa3, 0x30, 0xe0, 0x01, 0xaa, 0xca, 0x9f, - 0x97, 0x3d, 0x5c, 0x05, 0x6b, 0x7f, 0x38, 0xe2, 0xb7, 0xf8, 0x2e, 0x54, 0x4f, 0x29, 0x63, 0x6e, - 0xe0, 0xa3, 0x16, 0x14, 0x5d, 0xa7, 0x53, 0x58, 0x2d, 0x6c, 0xd6, 0xec, 0xa2, 0xeb, 0xe0, 0x7f, - 0x80, 0x75, 0x4c, 0x42, 0x32, 0x44, 0x6d, 0x28, 0xbd, 0xa7, 0xb7, 0x9a, 0x23, 0x3e, 0xd1, 0x22, - 0x58, 0x57, 0xc4, 0x1b, 0xd3, 0x4e, 0x51, 0xd2, 0xd4, 0x02, 0x21, 0x28, 0x3b, 0x94, 0xf5, 0x3b, - 0x25, 0x49, 0x94, 0xdf, 0x82, 0xc6, 0x6f, 0x47, 0xb4, 0x53, 0x56, 0x34, 0xf1, 0x8d, 0x3f, 0x14, - 0xa0, 0xb4, 0x77, 0x7a, 0x24, 0x78, 0xef, 0x02, 0xc6, 0xb5, 0x61, 0xf9, 0x2d, 0x68, 0xa3, 0x20, - 0xe4, 0xda, 0xb0, 0xfc, 0x16, 0xb4, 0x31, 0xa3, 0x61, 0x64, 0x57, 0x7c, 0xa3, 0x2e, 0xcc, 0x8d, - 0x08, 0x63, 0xd7, 0x41, 0xe8, 0x68, 0xdb, 0xf1, 0x5a, 0xf0, 0x1c, 0xc2, 0xc9, 0x39, 0x61, 0xb4, - 0x63, 0x29, 0x5e, 0xb4, 0x46, 0x3f, 0x43, 0x9b, 0x38, 0x8e, 0xcb, 0xdd, 0xc0, 0x27, 0x9e, 0x3c, - 0x1e, 0xeb, 0x54, 0x56, 0x4b, 0x9b, 0xf5, 0x5e, 0x6b, 0x4b, 0x83, 0xb3, 0x25, 0xc9, 0xf6, 0x84, - 0x1c, 0xfe, 0x77, 0x01, 0xca, 0xf6, 0xd8, 0x93, 0x07, 0xf5, 0xc9, 0x90, 0x46, 0x8e, 0x8b, 0xef, - 0xf8, 0xf0, 0x45, 0xe3, 0xf0, 0x8b, 0x60, 0x79, 0xf4, 0x8a, 0x7a, 0xda, 0x73, 0xb5, 0x10, 0xee, - 0xf5, 0x09, 0xa7, 0x17, 0x41, 0x78, 0x1b, 0xb9, 0x1e, 0xad, 0xd1, 0x06, 0x54, 0x46, 0xca, 0x29, - 0x2b, 0xd7, 0x29, 0xcd, 0x45, 0x2b, 0x00, 0xc4, 0xf7, 0x03, 0x4e, 0x84, 0x83, 0x9d, 0x8a, 0xb4, - 0x62, 0x50, 0xf0, 0x87, 0x22, 0x34, 0x0f, 0x29, 0x27, 0xcc, 0xa6, 0x6c, 0x14, 0xf8, 0x8c, 0x0a, - 0x8d, 0x91, 0x37, 0xbe, 0x70, 0xfd, 0xa3, 0xc4, 0x73, 0x83, 0x82, 0x7e, 0x80, 0x85, 0x08, 0xa4, - 0x3d, 0x3a, 0x20, 0x63, 0x8f, 0x1f, 0x47, 0x71, 0x28, 0xd9, 0x79, 0x2c, 0xf4, 0x1c, 0x3a, 0x11, - 0x79, 0x27, 0x0b, 0x69, 0x29, 0xd7, 0xfb, 0xa9, 0xf2, 0x68, 0x0d, 0xac, 0x70, 0xec, 0x51, 0xd6, - 0x29, 0x4b, 0xc5, 0x66, 0xac, 0x28, 0xf0, 0xb6, 0x15, 0x0f, 0x1d, 0xc2, 0x12, 0xf5, 0xc9, 0xb9, - 0x47, 0x9d, 0xbf, 0x8d, 0x94, 0xf6, 0x61, 0xe0, 0x8c, 0x3d, 0x2a, 0xb1, 0x6a, 0xf5, 0x96, 0x63, - 0xa5, 0x34, 0xdb, 0xce, 0xd7, 0x12, 0x11, 0xf3, 0x82, 0x8b, 0x40, 0xa2, 0xd7, 0xb0, 0xe5, 0x37, - 0xb6, 0xa1, 0x7e, 0xe0, 0xbb, 0xdc, 0xa6, 0x97, 0x63, 0xca, 0x38, 0x5a, 0x81, 0x92, 0xc3, 0x7c, - 0x89, 0x56, 0xbd, 0xd7, 0x88, 0xed, 0xef, 0x9d, 0x1e, 0xd9, 0x82, 0x91, 0xb8, 0x5d, 0x9c, 0xee, - 0x36, 0xfe, 0x19, 0x1a, 0xca, 0xa6, 0x8e, 0xc4, 0x03, 0xa8, 0x32, 0x75, 0xe5, 0xb4, 0xe1, 0x76, - 0xac, 0xa6, 0xaf, 0xa2, 0x1d, 0x09, 0x08, 0xdd, 0x5d, 0x2f, 0x60, 0x34, 0x72, 0xe8, 0x4b, 0x74, - 0x7f, 0x0b, 0xb5, 0x63, 0x12, 0x32, 0xea, 0x9c, 0x9e, 0xbc, 0x10, 0xa9, 0x78, 0x39, 0xa6, 0x61, - 0x74, 0x8b, 0xd5, 0x02, 0xbf, 0x85, 0x86, 0x14, 0x99, 0xc1, 0x3c, 0x5a, 0x87, 0x12, 0xbb, 0xf4, - 0x64, 0x82, 0xd4, 0x7b, 0xc8, 0x8c, 0xb4, 0xda, 0xd2, 0x16, 0x6c, 0x7c, 0x0c, 0xe5, 0xa3, 0xc0, - 0x91, 0x60, 0x73, 0x7a, 0x13, 0xdf, 0x75, 0xf1, 0x1d, 0xd7, 0x86, 0x62, 0x52, 0x1b, 0xd0, 0x2a, - 0xd4, 0x07, 0xae, 0x7f, 0x41, 0xc3, 0x51, 0xe8, 0xfa, 0x5c, 0x5f, 0x1c, 0x93, 0x84, 0x7f, 0x0f, - 0x4d, 0xed, 0xb3, 0xc6, 0x73, 0x0d, 0x2c, 0x3f, 0x70, 0x28, 0xeb, 0x14, 0x32, 0x41, 0x10, 0x1b, - 0xdb, 0x8a, 0x87, 0x57, 0x61, 0x6e, 0x67, 0xec, 0xb8, 0x7c, 0x3a, 0x16, 0x04, 0x1a, 0x52, 0x62, - 0x16, 0x2c, 0xee, 0x43, 0x99, 0x5d, 0x7a, 0x51, 0x1a, 0x7c, 0x15, 0x0b, 0x46, 0x5b, 0xda, 0x92, - 0x8d, 0x5f, 0x41, 0x5d, 0x6f, 0xc1, 0xc6, 0x1e, 0x47, 0x1d, 0xa8, 0x0e, 0x29, 0x63, 0xe4, 0x22, - 0xba, 0x8f, 0xd1, 0x32, 0x29, 0x1c, 0x45, 0xb3, 0x70, 0x7c, 0x0d, 0x35, 0x91, 0x51, 0x6f, 0x64, - 0xed, 0x51, 0xc8, 0xcc, 0x09, 0x82, 0xb8, 0xbf, 0xf8, 0x4f, 0xb1, 0xfb, 0xc2, 0x36, 0x43, 0x5b, - 0x50, 0x0d, 0xd5, 0xa7, 0xc6, 0x65, 0x31, 0xed, 0x95, 0x92, 0xb3, 0x23, 0x21, 0xfc, 0x1c, 0x9a, - 0x11, 0x5d, 0xc1, 0xfa, 0x04, 0x1a, 0xc4, 0x30, 0xa8, 0xad, 0x2c, 0xe5, 0x59, 0x61, 0x76, 0x4a, - 0x14, 0x7f, 0x07, 0xf3, 0x47, 0x94, 0x3a, 0x76, 0xe0, 0x79, 0xe7, 0xa4, 0xff, 0x7e, 0x3a, 0xe6, - 0x01, 0x2c, 0x3d, 0xa3, 0xbe, 0x21, 0x37, 0x0b, 0xf8, 0x0f, 0xcc, 0x44, 0xec, 0x24, 0xd1, 0x4f, - 0x7b, 0xa0, 0xd2, 0xf1, 0x8f, 0x50, 0xff, 0xa4, 0x57, 0x66, 0x5c, 0x8a, 0xa9, 0xb8, 0xe0, 0x5f, - 0xe0, 0x4e, 0xd6, 0x5f, 0x8d, 0xd6, 0x86, 0x72, 0x42, 0x39, 0x9b, 0x40, 0x3d, 0xe1, 0xc0, 0x13, - 0xa8, 0x1f, 0xbb, 0xfe, 0xc5, 0x2c, 0xf7, 0xf9, 0x5b, 0xa8, 0xee, 0xdf, 0xd0, 0xfe, 0x74, 0x34, - 0x5f, 0x43, 0x5d, 0x08, 0xcc, 0x82, 0x21, 0x36, 0x31, 0x4c, 0xe4, 0xf4, 0x7e, 0xca, 0xf5, 0xff, - 0x14, 0x00, 0x94, 0x7d, 0x99, 0xbd, 0x18, 0x1a, 0x1e, 0x61, 0xfc, 0xc0, 0x67, 0x34, 0xe4, 0x07, - 0xaa, 0x71, 0x28, 0xd9, 0x29, 0x1a, 0x7a, 0x08, 0x5f, 0x99, 0xeb, 0xfd, 0x30, 0x0c, 0x42, 0x8d, - 0xe9, 0x24, 0x43, 0x58, 0x0c, 0x83, 0x6b, 0xb6, 0x33, 0x18, 0xd0, 0x3e, 0xa7, 0x8e, 0x4c, 0xf1, - 0x92, 0x9d, 0xa2, 0x09, 0x8b, 0xe6, 0x5a, 0x59, 0x54, 0xaf, 0xe8, 0x24, 0x03, 0x3f, 0x85, 0x86, - 0xf6, 0x58, 0x45, 0xe9, 0x7b, 0xa8, 0xa8, 0x7c, 0xd7, 0x88, 0x2c, 0xa4, 0x4e, 0xaa, 0xaf, 0x84, - 0x16, 0xc1, 0xaf, 0xa1, 0x76, 0x76, 0x33, 0x5b, 0x65, 0x34, 0xab, 0xc1, 0x24, 0x9a, 0xaa, 0x18, - 0x3c, 0x05, 0x10, 0xe6, 0xb5, 0x67, 0xbf, 0xcb, 0x5e, 0xd7, 0x5c, 0xd7, 0xe2, 0xdb, 0xba, 0x0a, - 0x73, 0x27, 0x22, 0xe6, 0xd3, 0x93, 0xe1, 0x47, 0xa8, 0x49, 0x89, 0xdd, 0xc0, 0x1f, 0xa0, 0x75, - 0x68, 0x72, 0x77, 0x48, 0x83, 0x31, 0x3f, 0xa5, 0xfd, 0xc0, 0x57, 0xc1, 0x6a, 0xda, 0x69, 0x22, - 0xfe, 0x57, 0x01, 0x1a, 0x52, 0x67, 0x96, 0x43, 0xaf, 0x99, 0x19, 0x94, 0x54, 0xc0, 0xc8, 0x4b, - 0x99, 0x42, 0x68, 0x03, 0xca, 0xfd, 0xc0, 0x1f, 0xc8, 0xc8, 0x9a, 0x8f, 0x46, 0xec, 0xa9, 0x2d, - 0xf9, 0xd8, 0x81, 0xa6, 0x76, 0x24, 0xbe, 0x5e, 0x95, 0x7e, 0xe0, 0x8d, 0x87, 0xbe, 0x46, 0x67, - 0xa2, 0x2f, 0x52, 0x5c, 0xf4, 0x3d, 0x94, 0x45, 0x16, 0x68, 0xe8, 0x97, 0xd3, 0x1b, 0x68, 0x10, - 0x83, 0x6b, 0x5b, 0x0a, 0xe1, 0x5d, 0x68, 0xa5, 0xe9, 0xe8, 0x47, 0xa8, 0xc8, 0x56, 0x36, 0x0a, - 0xc2, 0xdd, 0x3c, 0x03, 0x2f, 0x85, 0x84, 0xad, 0x05, 0xf1, 0x26, 0xb4, 0xb3, 0xbc, 0xa4, 0x3d, - 0x2e, 0x18, 0xed, 0x31, 0xc6, 0xe2, 0xfa, 0x8c, 0x3c, 0xe2, 0xfa, 0xd3, 0xa3, 0xd6, 0x87, 0x96, - 0x96, 0x99, 0xed, 0x19, 0x32, 0x62, 0x60, 0x26, 0x50, 0xb4, 0xab, 0xba, 0xc8, 0x2f, 0x61, 0x3e, - 0xde, 0x44, 0xe3, 0xbb, 0x0b, 0xcd, 0xbe, 0x47, 0x18, 0x73, 0x75, 0xa6, 0xe9, 0xbd, 0xee, 0x65, - 0x6d, 0xec, 0x9a, 0x42, 0x76, 0x5a, 0x07, 0xff, 0x02, 0x8b, 0x79, 0x62, 0x68, 0x13, 0xca, 0xa2, - 0xf1, 0x9b, 0x28, 0x8e, 0x67, 0xe4, 0x7c, 0xec, 0x91, 0x70, 0x8f, 0x70, 0x62, 0x4b, 0x09, 0xbc, - 0x03, 0x0b, 0xcf, 0x28, 0xdf, 0xd3, 0x5d, 0x22, 0x9b, 0xa5, 0x4a, 0xae, 0xc0, 0x5c, 0xa4, 0x9f, - 0xd7, 0xa7, 0xe3, 0x67, 0xb0, 0x98, 0xde, 0x42, 0x23, 0xf0, 0x08, 0x6a, 0x51, 0x77, 0x1a, 0x45, - 0x3f, 0xc9, 0xe2, 0x48, 0xdc, 0x4e, 0x64, 0xf0, 0x36, 0x58, 0x67, 0xa2, 0xad, 0xcc, 0x9d, 0x06, - 0xee, 0x40, 0x85, 0xf5, 0xdf, 0xd1, 0x21, 0xd1, 0xd5, 0x4e, 0xaf, 0xf0, 0x85, 0x3c, 0xa0, 0xd4, - 0x13, 0xed, 0xf9, 0x6c, 0xd5, 0xc5, 0xe2, 0x42, 0x5f, 0x87, 0xb9, 0x65, 0xc2, 0x29, 0x9a, 0x4e, - 0xc9, 0xc4, 0xbf, 0xca, 0x63, 0x1a, 0x1b, 0xe9, 0x63, 0xfe, 0x00, 0x35, 0x1e, 0x11, 0xf5, 0x5e, - 0x28, 0x6d, 0x41, 0x8a, 0x27, 0x42, 0xf8, 0xbf, 0x05, 0xa8, 0xc5, 0x0c, 0xf4, 0x18, 0xea, 0xea, - 0xaa, 0xb1, 0x03, 0x7f, 0x10, 0x4c, 0x84, 0x74, 0x37, 0xe1, 0xd9, 0xa6, 0xa0, 0xd0, 0x73, 0x7d, - 0x87, 0xde, 0x50, 0xa5, 0x57, 0xcc, 0xe8, 0x1d, 0x24, 0x3c, 0xdb, 0x14, 0x44, 0x1b, 0xd0, 0xea, - 0x87, 0x94, 0x70, 0x2a, 0x5d, 0x38, 0x3d, 0x79, 0xa1, 0x1b, 0x9f, 0x0c, 0xd5, 0x7c, 0xb3, 0xcb, - 0xe9, 0x37, 0xfb, 0x27, 0xa8, 0x1b, 0x5e, 0x7d, 0x41, 0x32, 0xfe, 0x24, 0x66, 0x81, 0xc4, 0x93, - 0xcf, 0x57, 0x7c, 0x02, 0xf3, 0x06, 0xf1, 0x57, 0x4a, 0x9c, 0xcf, 0x9d, 0x18, 0x45, 0xe7, 0x64, - 0xda, 0x0b, 0xae, 0x99, 0x28, 0x14, 0x2e, 0xa7, 0x43, 0x95, 0x94, 0x35, 0x5b, 0x2d, 0x70, 0x00, - 0x75, 0x43, 0x10, 0xf5, 0xa0, 0xaa, 0xd1, 0xd6, 0xb9, 0xdb, 0xc9, 0xf3, 0x4f, 0xb8, 0x62, 0x47, - 0x82, 0xe8, 0x61, 0xaa, 0x56, 0xe6, 0x2a, 0x08, 0x07, 0x74, 0xb1, 0x5c, 0x17, 0x4f, 0x29, 0x0f, - 0x89, 0x78, 0x5c, 0xa7, 0xd7, 0xaf, 0x4b, 0xe8, 0x6a, 0x29, 0x19, 0x99, 0xbf, 0x84, 0xc1, 0x70, - 0xc6, 0xae, 0xee, 0x3b, 0xb3, 0x96, 0x2d, 0x19, 0x75, 0x28, 0xf1, 0x41, 0x55, 0xb3, 0x7d, 0xf8, - 0x3a, 0x77, 0xcb, 0xe4, 0xe5, 0x90, 0xb9, 0xcc, 0x26, 0x5e, 0x0e, 0x75, 0x5f, 0x34, 0x17, 0xdf, - 0x87, 0xa6, 0xea, 0x1d, 0xc4, 0x99, 0xa7, 0x1f, 0x90, 0xc3, 0x37, 0xfb, 0x8c, 0xbb, 0x43, 0xc2, - 0x45, 0xda, 0x25, 0x1a, 0xb3, 0x1c, 0x71, 0xd3, 0x3c, 0xe2, 0x9d, 0xa4, 0xb1, 0x36, 0xdd, 0x50, - 0x67, 0xfc, 0x3b, 0xdc, 0x9b, 0xb2, 0xab, 0x3e, 0xe5, 0x22, 0x58, 0xfd, 0x60, 0xec, 0x73, 0xdd, - 0x85, 0xa9, 0x85, 0x98, 0xf9, 0x69, 0x18, 0x1e, 0xa6, 0x7a, 0x59, 0x83, 0xf2, 0xe0, 0x9f, 0x05, - 0x68, 0x4d, 0x0c, 0xc5, 0xad, 0x74, 0x87, 0xdb, 0xfe, 0x0d, 0xaa, 0x81, 0x25, 0x9f, 0xb8, 0x76, - 0x01, 0xd5, 0x45, 0x0f, 0x2a, 0x4b, 0x7c, 0xbb, 0x88, 0xda, 0xd0, 0x30, 0x6b, 0x4c, 0xbb, 0x84, - 0x96, 0x61, 0x21, 0x27, 0x16, 0xed, 0x32, 0xba, 0x0b, 0x4b, 0xb9, 0x07, 0x68, 0x5b, 0xbd, 0xff, - 0x55, 0xa1, 0xb2, 0x27, 0xff, 0xa7, 0x42, 0x8f, 0xc0, 0x92, 0x7f, 0x5a, 0xa0, 0x24, 0x48, 0xf2, - 0x5f, 0xaa, 0x6e, 0x02, 0x4e, 0xfa, 0x4f, 0x8d, 0x6d, 0x28, 0x8b, 0xd1, 0x1a, 0x99, 0x85, 0x24, - 0x9e, 0xe0, 0xba, 0x4b, 0x19, 0xaa, 0x56, 0xda, 0x02, 0x4b, 0xce, 0xd4, 0x28, 0xe1, 0x9b, 0x33, - 0x76, 0x37, 0xb3, 0x39, 0x7a, 0x2c, 0xff, 0x07, 0x4b, 0xc9, 0x9b, 0x43, 0xb3, 0xe1, 0x5c, 0x7a, - 0x2e, 0x7d, 0x0c, 0x96, 0x9c, 0x91, 0xd0, 0xc4, 0xcc, 0x94, 0xd5, 0x4b, 0x0f, 0x5e, 0x27, 0xd9, - 0x10, 0xa0, 0x95, 0x58, 0x32, 0x77, 0x5a, 0xea, 0x7e, 0x3b, 0x95, 0xaf, 0x4d, 0x3e, 0x84, 0xb2, - 0x98, 0x3a, 0x0c, 0x9c, 0x8c, 0x21, 0x64, 0xe2, 0xc0, 0xdb, 0x50, 0x16, 0x3d, 0xa7, 0x21, 0x6d, - 0x8c, 0x15, 0xdd, 0xa5, 0x6c, 0x63, 0x1a, 0x35, 0xb0, 0xc5, 0xb3, 0x1b, 0x64, 0xbc, 0x25, 0x51, - 0xeb, 0xdc, 0x5d, 0x48, 0xd1, 0x12, 0x70, 0x64, 0x4e, 0x19, 0xe0, 0x98, 0xad, 0xa7, 0x01, 0x4e, - 0xba, 0x11, 0xfc, 0x43, 0x9c, 0x80, 0x68, 0x39, 0xdb, 0x9c, 0x44, 0xba, 0x9d, 0x49, 0x86, 0xd6, - 0xfe, 0xab, 0xcc, 0xd8, 0xf8, 0xf1, 0x47, 0xdf, 0x18, 0xc0, 0x4d, 0xb4, 0x1d, 0xdd, 0x7b, 0x53, - 0xb8, 0x29, 0x63, 0xc9, 0xd3, 0x98, 0x32, 0x96, 0x7d, 0xe2, 0xd3, 0xc6, 0x26, 0xdf, 0xe5, 0xb7, - 0xb9, 0x37, 0x07, 0xad, 0x65, 0x0b, 0x5f, 0x4e, 0x59, 0xed, 0xae, 0x7f, 0x5c, 0x48, 0xef, 0x30, - 0x98, 0x72, 0x05, 0xd1, 0xfd, 0x44, 0xfd, 0x23, 0x95, 0xad, 0xbb, 0xf1, 0x29, 0x31, 0xb5, 0xcf, - 0x9f, 0x1b, 0xaf, 0x60, 0xeb, 0xd1, 0x53, 0x2d, 0x7b, 0x5e, 0x91, 0x1f, 0xdb, 0xff, 0x0f, 0x00, - 0x00, 0xff, 0xff, 0x64, 0x95, 0x04, 0x53, 0x8b, 0x16, 0x00, 0x00, + // 1813 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x5b, 0x73, 0x1b, 0xb7, + 0x15, 0x2e, 0x2f, 0x4b, 0x8a, 0x87, 0x17, 0x33, 0x90, 0x64, 0xd3, 0x74, 0xac, 0xa8, 0xb0, 0xad, + 0x68, 0x1c, 0x57, 0x4e, 0xe8, 0x8e, 0x33, 0xb6, 0xdb, 0x8e, 0x5d, 0x49, 0x75, 0x94, 0xc4, 0xaa, + 0xbc, 0x52, 0xdd, 0x99, 0xcc, 0x64, 0x12, 0x88, 0x0b, 0x2a, 0x3b, 0x59, 0x2e, 0xa8, 0x05, 0xa8, + 0xcb, 0x6b, 0x5f, 0x3a, 0xfd, 0x27, 0x7d, 0xec, 0x4b, 0x1e, 0xfb, 0xdf, 0x32, 0xb8, 0xec, 0x2e, + 0xf6, 0xc2, 0x24, 0xe6, 0x13, 0x17, 0xe7, 0x86, 0x0f, 0xe7, 0x1c, 0x1c, 0x9c, 0x43, 0xb8, 0xe1, + 0x45, 0xfe, 0x05, 0x8d, 0xbe, 0xbb, 0x18, 0xed, 0xcc, 0x22, 0x26, 0x18, 0x6a, 0xaa, 0x9f, 0x77, + 0x23, 0xdc, 0x04, 0x67, 0x7f, 0x3a, 0x13, 0xd7, 0xf8, 0x36, 0x34, 0x8f, 0x29, 0xe7, 0x3e, 0x0b, + 0x51, 0x0f, 0xaa, 0xbe, 0x37, 0xa8, 0x6c, 0x56, 0xb6, 0x5b, 0x6e, 0xd5, 0xf7, 0xf0, 0x3f, 0xc1, + 0x39, 0x22, 0x11, 0x99, 0xa2, 0x3e, 0xd4, 0x7e, 0xa4, 0xd7, 0x86, 0x23, 0x3f, 0xd1, 0x1a, 0x38, + 0x17, 0x24, 0x98, 0xd3, 0x41, 0x55, 0xd1, 0xf4, 0x02, 0x21, 0xa8, 0x7b, 0x94, 0x8f, 0x07, 0x35, + 0x45, 0x54, 0xdf, 0x92, 0x26, 0xae, 0x67, 0x74, 0x50, 0xd7, 0x34, 0xf9, 0x8d, 0x7f, 0xaa, 0x40, + 0x6d, 0xef, 0xf8, 0x50, 0xf2, 0x7e, 0x60, 0x5c, 0x18, 0xc3, 0xea, 0x5b, 0xd2, 0x66, 0x2c, 0x12, + 0xc6, 0xb0, 0xfa, 0x96, 0xb4, 0x39, 0xa7, 0x51, 0x6c, 0x57, 0x7e, 0xa3, 0x21, 0xac, 0xcc, 0x08, + 0xe7, 0x97, 0x2c, 0xf2, 0x8c, 0xed, 0x64, 0x2d, 0x79, 0x1e, 0x11, 0xe4, 0x94, 0x70, 0x3a, 0x70, + 0x34, 0x2f, 0x5e, 0xa3, 0xe7, 0xd0, 0x27, 0x9e, 0xe7, 0x0b, 0x9f, 0x85, 0x24, 0x50, 0xc7, 0xe3, + 0x83, 0xc6, 0x66, 0x6d, 0xbb, 0x3d, 0xea, 0xed, 0x18, 0xe7, 0xec, 0x28, 0xb2, 0x5b, 0x90, 0xc3, + 0xff, 0xad, 0x40, 0xdd, 0x9d, 0x07, 0xea, 0xa0, 0x21, 0x99, 0xd2, 0x18, 0xb8, 0xfc, 0x4e, 0x0e, + 0x5f, 0xb5, 0x0e, 0xbf, 0x06, 0x4e, 0x40, 0x2f, 0x68, 0x60, 0x90, 0xeb, 0x85, 0x84, 0x37, 0x26, + 0x82, 0x9e, 0xb1, 0xe8, 0x3a, 0x86, 0x1e, 0xaf, 0xd1, 0x16, 0x34, 0x66, 0x1a, 0x94, 0x53, 0x0a, + 0xca, 0x70, 0xd1, 0x06, 0x00, 0x09, 0x43, 0x26, 0x88, 0x04, 0x38, 0x68, 0x28, 0x2b, 0x16, 0x05, + 0xff, 0x54, 0x85, 0xee, 0x1b, 0x2a, 0x08, 0x77, 0x29, 0x9f, 0xb1, 0x90, 0x53, 0xa9, 0x31, 0x0b, + 0xe6, 0x67, 0x7e, 0x78, 0x98, 0x22, 0xb7, 0x28, 0xe8, 0x53, 0x58, 0x8d, 0x9d, 0xb4, 0x47, 0x27, + 0x64, 0x1e, 0x88, 0xa3, 0x38, 0x0e, 0x35, 0xb7, 0x8c, 0x85, 0xbe, 0x84, 0x41, 0x4c, 0x7e, 0x95, + 0x77, 0x69, 0xad, 0x14, 0xfd, 0x42, 0x79, 0x74, 0x0f, 0x9c, 0x68, 0x1e, 0x50, 0x3e, 0xa8, 0x2b, + 0xc5, 0x6e, 0xa2, 0x28, 0xfd, 0xed, 0x6a, 0x1e, 0x7a, 0x03, 0xeb, 0x34, 0x24, 0xa7, 0x01, 0xf5, + 0xfe, 0x3e, 0xd3, 0xda, 0x6f, 0x98, 0x37, 0x0f, 0xa8, 0xf2, 0x55, 0x6f, 0x74, 0x2b, 0x51, 0xca, + 0xb2, 0xdd, 0x72, 0x2d, 0x19, 0xb1, 0x80, 0x9d, 0x31, 0xe5, 0xbd, 0x8e, 0xab, 0xbe, 0xb1, 0x0b, + 0xed, 0x83, 0xd0, 0x17, 0x2e, 0x3d, 0x9f, 0x53, 0x2e, 0xd0, 0x06, 0xd4, 0x3c, 0x1e, 0x2a, 0x6f, + 0xb5, 0x47, 0x9d, 0xc4, 0xfe, 0xde, 0xf1, 0xa1, 0x2b, 0x19, 0x29, 0xec, 0xea, 0x62, 0xd8, 0xf8, + 0x39, 0x74, 0xb4, 0x4d, 0x13, 0x89, 0x87, 0xd0, 0xe4, 0xfa, 0xca, 0x19, 0xc3, 0xfd, 0x44, 0xcd, + 0x5c, 0x45, 0x37, 0x16, 0x90, 0xba, 0xbb, 0x01, 0xe3, 0x34, 0x06, 0xf4, 0x3e, 0xba, 0x2f, 0x01, + 0x7d, 0xe5, 0x07, 0xc1, 0x51, 0xc4, 0xc6, 0x94, 0xf3, 0x65, 0x2c, 0xfc, 0x1e, 0x5a, 0x47, 0x24, + 0xe2, 0xd4, 0x3b, 0x7e, 0xfb, 0xb5, 0x4c, 0xe6, 0xf3, 0x39, 0x8d, 0xe2, 0x3a, 0xa0, 0x17, 0xf8, + 0x7b, 0xe8, 0x28, 0x91, 0x25, 0xcc, 0xa3, 0xfb, 0x50, 0xe3, 0xe7, 0x81, 0x4a, 0xb1, 0xf6, 0x08, + 0xd9, 0xb9, 0xa2, 0xb7, 0x74, 0x25, 0x1b, 0x1f, 0x41, 0xfd, 0x90, 0x79, 0x2a, 0x5c, 0x82, 0x5e, + 0x25, 0xd5, 0x42, 0x7e, 0x27, 0xd5, 0xa5, 0x9a, 0x56, 0x17, 0xb4, 0x09, 0xed, 0x89, 0x1f, 0x9e, + 0xd1, 0x68, 0x16, 0xf9, 0xa1, 0x30, 0x57, 0xcf, 0x26, 0xe1, 0x3f, 0x42, 0xd7, 0x60, 0x36, 0x11, + 0xb9, 0x07, 0x4e, 0xc8, 0x3c, 0xca, 0x07, 0x95, 0x5c, 0x18, 0xe5, 0xc6, 0xae, 0xe6, 0xe1, 0x4d, + 0x58, 0x79, 0x35, 0xf7, 0x7c, 0xb1, 0xd8, 0x17, 0x04, 0x3a, 0x4a, 0x62, 0x19, 0x5f, 0x3c, 0x80, + 0x3a, 0x3f, 0x0f, 0xe2, 0x44, 0xfa, 0x20, 0x11, 0x8c, 0xb7, 0x74, 0x15, 0x1b, 0x7f, 0x03, 0x6d, + 0xb3, 0x05, 0x9f, 0x07, 0x02, 0x0d, 0xa0, 0x39, 0xa5, 0x9c, 0x93, 0xb3, 0xf8, 0x46, 0xc7, 0xcb, + 0xb4, 0xf4, 0x54, 0xed, 0xd2, 0x73, 0x07, 0x5a, 0x32, 0x27, 0xbf, 0x53, 0xd5, 0x4b, 0x7b, 0x66, + 0x45, 0x12, 0x64, 0x05, 0xc0, 0x7f, 0x49, 0xe0, 0x4b, 0xdb, 0x1c, 0xed, 0x40, 0x33, 0xd2, 0x9f, + 0xc6, 0x2f, 0x6b, 0x59, 0x54, 0x5a, 0xce, 0x8d, 0x85, 0xf0, 0x97, 0xd0, 0x8d, 0xe9, 0xda, 0xad, + 0xcf, 0xa0, 0x43, 0x2c, 0x83, 0xc6, 0xca, 0x7a, 0x99, 0x15, 0xee, 0x66, 0x44, 0xf1, 0xc7, 0x70, + 0xe3, 0x90, 0x52, 0xcf, 0x65, 0x41, 0x70, 0x4a, 0xc6, 0x3f, 0x2e, 0xf6, 0x39, 0x83, 0xf5, 0xd7, + 0x34, 0xb4, 0xe4, 0x96, 0x71, 0xfe, 0x43, 0x3b, 0x11, 0x07, 0x69, 0xf4, 0xb3, 0x08, 0x74, 0x3a, + 0xfe, 0x19, 0xda, 0xbf, 0x8a, 0xca, 0x8e, 0x4b, 0x35, 0x13, 0x17, 0xfc, 0x12, 0x6e, 0xe6, 0xf1, + 0x1a, 0x6f, 0x6d, 0x69, 0x10, 0x1a, 0x6c, 0xea, 0xea, 0x02, 0x80, 0x67, 0xd0, 0x3e, 0xf2, 0xc3, + 0xb3, 0x65, 0xee, 0xf3, 0x47, 0xd0, 0xdc, 0xbf, 0xa2, 0xe3, 0xc5, 0xde, 0xfc, 0x16, 0xda, 0x52, + 0x60, 0x19, 0x1f, 0x62, 0xdb, 0x87, 0xa9, 0x9c, 0xd9, 0x4f, 0x43, 0xff, 0x5f, 0x05, 0x40, 0xdb, + 0x57, 0xd9, 0x8b, 0xa1, 0x13, 0x10, 0x2e, 0x0e, 0x42, 0x4e, 0x23, 0x71, 0xa0, 0x5b, 0x8f, 0x9a, + 0x9b, 0xa1, 0xa1, 0x47, 0xf0, 0x81, 0xbd, 0xde, 0x8f, 0x22, 0x16, 0x19, 0x9f, 0x16, 0x19, 0xd2, + 0x62, 0xc4, 0x2e, 0xf9, 0xab, 0xc9, 0x84, 0x8e, 0x05, 0xf5, 0x54, 0x8a, 0xd7, 0xdc, 0x0c, 0x4d, + 0x5a, 0xb4, 0xd7, 0xda, 0xa2, 0x7e, 0x87, 0x8b, 0x0c, 0xfc, 0x02, 0x3a, 0x06, 0xb1, 0x8e, 0xd2, + 0x27, 0xd0, 0xd0, 0xf9, 0x6e, 0x3c, 0xb2, 0x9a, 0x39, 0xa9, 0xb9, 0x12, 0x46, 0x04, 0x7f, 0x0b, + 0xad, 0x93, 0xab, 0xe5, 0x2a, 0xa3, 0x5d, 0x0d, 0x8a, 0xde, 0xd4, 0xc5, 0xe0, 0x05, 0x80, 0x34, + 0x6f, 0x90, 0xfd, 0x21, 0x7f, 0x5d, 0x4b, 0xa1, 0x25, 0xb7, 0x75, 0x13, 0x56, 0xde, 0xca, 0x98, + 0x2f, 0x4e, 0x86, 0xcf, 0xa0, 0xa5, 0x24, 0x76, 0x59, 0x38, 0x41, 0xf7, 0xa1, 0x2b, 0xfc, 0x29, + 0x65, 0x73, 0x71, 0x4c, 0xc7, 0x2c, 0xd4, 0xc1, 0xea, 0xba, 0x59, 0x22, 0xfe, 0x77, 0x05, 0x3a, + 0x4a, 0x67, 0x99, 0x43, 0xdf, 0xb3, 0x33, 0x28, 0xad, 0x80, 0x31, 0x4a, 0x95, 0x42, 0x68, 0x0b, + 0xea, 0x63, 0x16, 0x4e, 0x54, 0x64, 0xed, 0x47, 0x23, 0x41, 0xea, 0x2a, 0x3e, 0xf6, 0xa0, 0x6b, + 0x80, 0x24, 0xd7, 0xab, 0x31, 0x66, 0xc1, 0x7c, 0x1a, 0x1a, 0xef, 0x14, 0x3a, 0x2b, 0xcd, 0x45, + 0x9f, 0x40, 0x5d, 0x66, 0x81, 0x71, 0xfd, 0xad, 0xec, 0x06, 0xc6, 0x89, 0xec, 0xd2, 0x55, 0x42, + 0x78, 0x17, 0x7a, 0x59, 0x3a, 0xfa, 0x0c, 0x1a, 0xaa, 0x19, 0x8e, 0x83, 0x70, 0xbb, 0xcc, 0xc0, + 0x3b, 0x29, 0xe1, 0x1a, 0x41, 0xbc, 0x0d, 0xfd, 0x3c, 0x2f, 0x6d, 0xb0, 0x2b, 0x56, 0x83, 0x8d, + 0xb1, 0xbc, 0x3e, 0xb3, 0x80, 0xf8, 0xe1, 0xe2, 0xa8, 0x8d, 0xa1, 0x67, 0x64, 0x96, 0x7b, 0x86, + 0xac, 0x18, 0xd8, 0x09, 0x14, 0xef, 0xaa, 0x2f, 0xf2, 0x3b, 0xb8, 0x91, 0x6c, 0x62, 0xfc, 0xbb, + 0x0b, 0xdd, 0x71, 0x40, 0x38, 0xf7, 0x4d, 0xa6, 0x99, 0xbd, 0xee, 0xe6, 0x6d, 0xec, 0xda, 0x42, + 0x6e, 0x56, 0x07, 0xbf, 0x84, 0xb5, 0x32, 0x31, 0xb4, 0x0d, 0x75, 0xd9, 0x3a, 0x16, 0x8a, 0xe3, + 0x09, 0x39, 0x9d, 0x07, 0x24, 0xda, 0x23, 0x82, 0xb8, 0x4a, 0x02, 0xbf, 0x82, 0xd5, 0xd7, 0x54, + 0xec, 0x99, 0x3e, 0x73, 0xa9, 0xae, 0x67, 0x03, 0x56, 0x62, 0xfd, 0xb2, 0x4e, 0x1f, 0xbf, 0x86, + 0xb5, 0xec, 0x16, 0xc6, 0x03, 0x8f, 0xa1, 0x15, 0xf7, 0xb7, 0x71, 0xf4, 0xd3, 0x2c, 0x8e, 0xc5, + 0xdd, 0x54, 0x06, 0x3f, 0x01, 0xe7, 0x44, 0x36, 0xa6, 0xa5, 0xf3, 0xc4, 0x4d, 0x68, 0xf0, 0xf1, + 0x0f, 0x74, 0x4a, 0x4c, 0xb5, 0x33, 0x2b, 0x7c, 0xa6, 0x0e, 0xa8, 0xf4, 0x64, 0x83, 0xbf, 0x5c, + 0x75, 0x71, 0x84, 0xd4, 0x37, 0x61, 0xee, 0xd9, 0xee, 0x94, 0x6d, 0xab, 0x62, 0xe2, 0x2f, 0xd4, + 0x31, 0xad, 0x8d, 0xcc, 0x31, 0x3f, 0x85, 0x96, 0x88, 0x89, 0x66, 0x2f, 0x94, 0xb5, 0xa0, 0xc4, + 0x53, 0x21, 0xfc, 0xff, 0x0a, 0xb4, 0x12, 0x06, 0x7a, 0x0a, 0x6d, 0x7d, 0xd5, 0xf8, 0x41, 0x38, + 0x61, 0x85, 0x90, 0xee, 0xa6, 0x3c, 0xd7, 0x16, 0x94, 0x7a, 0x7e, 0xe8, 0xd1, 0x2b, 0xaa, 0xf5, + 0xaa, 0x39, 0xbd, 0x83, 0x94, 0xe7, 0xda, 0x82, 0x68, 0x0b, 0x7a, 0xe3, 0x88, 0x12, 0x41, 0x15, + 0x84, 0xe3, 0xb7, 0x5f, 0x9b, 0xc6, 0x27, 0x47, 0xb5, 0xdf, 0xec, 0x7a, 0xf6, 0xcd, 0xfe, 0x1c, + 0xda, 0x16, 0xaa, 0xf7, 0x48, 0xc6, 0xcf, 0xe5, 0x34, 0x91, 0x22, 0xf9, 0xed, 0x8a, 0xcf, 0xe0, + 0x86, 0x45, 0xfc, 0x82, 0x12, 0xef, 0xb7, 0xce, 0x9c, 0xb2, 0x73, 0xb2, 0xed, 0xb1, 0x4b, 0x2e, + 0x0b, 0x85, 0x2f, 0xe8, 0x54, 0x27, 0x65, 0xcb, 0xd5, 0x0b, 0xcc, 0xa0, 0x6d, 0x09, 0xa2, 0x11, + 0x34, 0x8d, 0xb7, 0x4d, 0xee, 0x0e, 0xca, 0xf0, 0x49, 0x28, 0x6e, 0x2c, 0x88, 0x1e, 0x65, 0x6a, + 0x65, 0xa9, 0x82, 0x04, 0x60, 0x8a, 0xe5, 0x7d, 0xf9, 0x94, 0x8a, 0x88, 0xc8, 0xc7, 0x75, 0x71, + 0xfd, 0x3a, 0x87, 0xa1, 0x91, 0x52, 0x91, 0xf9, 0x5b, 0xc4, 0xa6, 0x4b, 0x76, 0x75, 0x1f, 0xdb, + 0xb5, 0x6c, 0xdd, 0xaa, 0x43, 0x29, 0x06, 0x5d, 0xcd, 0xf6, 0xe1, 0x4e, 0xe9, 0x96, 0xe9, 0xcb, + 0xa1, 0x72, 0x99, 0x17, 0x5e, 0x0e, 0x7d, 0x5f, 0x0c, 0x17, 0x3f, 0x80, 0xae, 0xee, 0x1d, 0xe4, + 0x99, 0x17, 0x1f, 0x50, 0xc0, 0x87, 0xfb, 0x5c, 0xf8, 0x53, 0x22, 0x64, 0xda, 0xa5, 0x1a, 0xcb, + 0x1c, 0x71, 0xdb, 0x3e, 0xe2, 0xcd, 0xb4, 0xb1, 0xb6, 0x61, 0xe8, 0x33, 0xfe, 0x03, 0xee, 0x2e, + 0xd8, 0xd5, 0x9c, 0x72, 0x0d, 0x9c, 0x31, 0x9b, 0x87, 0xc2, 0x74, 0x61, 0x7a, 0x81, 0x36, 0x00, + 0x68, 0x14, 0xbd, 0xc9, 0xf4, 0xb2, 0x16, 0xe5, 0xe1, 0xbf, 0x2a, 0xd0, 0x2b, 0x8c, 0xd5, 0xbd, + 0x6c, 0x87, 0xdb, 0xff, 0x1d, 0x6a, 0x81, 0xa3, 0x9e, 0xb8, 0x7e, 0x05, 0xb5, 0x65, 0x0f, 0xaa, + 0x4a, 0x7c, 0xbf, 0x8a, 0xfa, 0xd0, 0xb1, 0x6b, 0x4c, 0xbf, 0x86, 0x6e, 0xc1, 0x6a, 0x49, 0x2c, + 0xfa, 0x75, 0x74, 0x1b, 0xd6, 0x4b, 0x0f, 0xd0, 0x77, 0x46, 0xff, 0x59, 0x81, 0xc6, 0x9e, 0xfa, + 0xa7, 0x0b, 0x3d, 0x06, 0x47, 0xfd, 0xed, 0x81, 0xd2, 0x20, 0xa9, 0xff, 0xb9, 0x86, 0xa9, 0x73, + 0xb2, 0x7f, 0x8b, 0x3c, 0x81, 0xba, 0x1c, 0xce, 0x91, 0x5d, 0x48, 0x92, 0x09, 0x6e, 0xb8, 0x9e, + 0xa3, 0x1a, 0xa5, 0x1d, 0x70, 0xd4, 0x54, 0x8e, 0x52, 0xbe, 0x3d, 0xa5, 0x0f, 0x73, 0x9b, 0xa3, + 0xe7, 0xd0, 0xb6, 0x26, 0x71, 0x74, 0x27, 0x61, 0x17, 0xe7, 0xf3, 0x82, 0xee, 0x53, 0xf5, 0x2f, + 0x5c, 0x66, 0x2f, 0x7b, 0xe0, 0xb6, 0x0e, 0x96, 0x9d, 0x69, 0x9f, 0x82, 0xa3, 0xe6, 0x2b, 0x54, + 0x98, 0xb7, 0xf2, 0x7a, 0xd9, 0xa1, 0xed, 0x6d, 0x3e, 0x7c, 0x68, 0x23, 0x91, 0x2c, 0x9d, 0xb4, + 0x86, 0x1f, 0x2d, 0xe4, 0x1b, 0x93, 0x8f, 0xa0, 0x2e, 0x27, 0x16, 0xcb, 0xc7, 0xd6, 0x00, 0x53, + 0x38, 0xf0, 0x13, 0xa8, 0xcb, 0x7e, 0xd5, 0x92, 0xb6, 0x46, 0x92, 0xe1, 0x7a, 0xbe, 0xa9, 0x8d, + 0x9b, 0xdf, 0xea, 0xc9, 0x15, 0xb2, 0xde, 0xa1, 0xb8, 0xed, 0x1e, 0xae, 0x66, 0x68, 0xa9, 0x73, + 0x54, 0x3e, 0x5a, 0xce, 0xb1, 0xdb, 0x56, 0xcb, 0x39, 0xd9, 0x26, 0xf2, 0x4f, 0x49, 0xf2, 0xa2, + 0x5b, 0xf9, 0xc6, 0x26, 0xd6, 0x1d, 0x14, 0x19, 0x46, 0xfb, 0x2b, 0x95, 0xed, 0x49, 0xe3, 0x80, + 0x3e, 0xb4, 0x1c, 0x57, 0x68, 0x59, 0x86, 0x77, 0x17, 0x70, 0x33, 0xc6, 0xd2, 0x67, 0x35, 0x63, + 0x2c, 0xdf, 0x1e, 0x64, 0x8d, 0x15, 0xdf, 0xf4, 0xef, 0x4b, 0x6f, 0x1d, 0xba, 0x97, 0x2f, 0x9a, + 0x25, 0x25, 0x79, 0x78, 0xff, 0x97, 0x85, 0xcc, 0x0e, 0x93, 0x05, 0xd7, 0x17, 0x3d, 0x48, 0xd5, + 0x7f, 0xa1, 0x2a, 0x0e, 0xb7, 0x7e, 0x4d, 0x4c, 0xef, 0xf3, 0xd7, 0xce, 0x37, 0xb0, 0xf3, 0xf8, + 0x85, 0x91, 0x3d, 0x6d, 0xa8, 0x8f, 0x27, 0x3f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x66, 0x73, 0xaa, + 0xd4, 0x09, 0x17, 0x00, 0x00, } diff --git a/sqle/driver/v2/proto/driver_v2.proto b/sqle/driver/v2/proto/driver_v2.proto index 64edf37f7b..8b7c6151b8 100644 --- a/sqle/driver/v2/proto/driver_v2.proto +++ b/sqle/driver/v2/proto/driver_v2.proto @@ -12,6 +12,7 @@ service Driver { // We put all communication on gRPC for unification in the end. rpc Init(InitRequest) returns (InitResponse); rpc Close(CloseRequest) returns (Empty); + rpc KillProcess(KillProcessRequest) returns (Empty); // db audit rpc Parse(ParseRequest) returns (ParseResponse); @@ -97,6 +98,11 @@ message CloseRequest { Session session = 1; } +// Kill +message KillProcessRequest { + Session session = 1; +} + // Parse message ParsedSQL { string query = 1; diff --git a/sqle/pkg/driver/impl.go b/sqle/pkg/driver/impl.go index d19058fa3d..357aa9fffa 100644 --- a/sqle/pkg/driver/impl.go +++ b/sqle/pkg/driver/impl.go @@ -11,6 +11,7 @@ import ( "github.com/actiontech/sqle/sqle/pkg/params" "github.com/actiontech/sqle/sqle/utils" hclog "github.com/hashicorp/go-hclog" + sqleError "github.com/actiontech/sqle/sqle/errors" "github.com/percona/go-mysql/query" "github.com/pkg/errors" @@ -276,3 +277,7 @@ func (p *DriverImpl) ExtractTableFromSQL(ctx context.Context, sql string) ([]*dr func (p *DriverImpl) EstimateSQLAffectRows(ctx context.Context, sql string) (*driverV2.EstimatedAffectRows, error) { return &driverV2.EstimatedAffectRows{}, nil } + +func (p *DriverImpl) KillProcess(ctx context.Context) error { + return sqleError.NewNotImplementedError("KillProcess not support yet") +} From 614633517461b692a0aad165fad4895fb8cd5c54 Mon Sep 17 00:00:00 2001 From: bianyucheng Date: Wed, 2 Aug 2023 13:01:23 +0800 Subject: [PATCH 2/4] add killprocess response --- sqle/driver/v2/driver_grpc_server.go | 12 +- sqle/driver/v2/driver_interface.go | 6 +- sqle/driver/v2/proto/driver_v2.pb.go | 257 ++++++++++++++------------- sqle/driver/v2/proto/driver_v2.proto | 6 +- sqle/driver/v2/util.go | 3 + sqle/pkg/driver/impl.go | 7 +- 6 files changed, 163 insertions(+), 128 deletions(-) diff --git a/sqle/driver/v2/driver_grpc_server.go b/sqle/driver/v2/driver_grpc_server.go index 97af564142..d5b7803739 100644 --- a/sqle/driver/v2/driver_grpc_server.go +++ b/sqle/driver/v2/driver_grpc_server.go @@ -435,10 +435,16 @@ func (d *DriverGrpcServer) EstimateSQLAffectRows(ctx context.Context, req *proto }, nil } -func (d *DriverGrpcServer) KillProcess(ctx context.Context, req *protoV2.KillProcessRequest) (*protoV2.Empty, error) { +func (d *DriverGrpcServer) KillProcess(ctx context.Context, req *protoV2.KillProcessRequest) (*protoV2.KillProcessResponse, error) { driver, err := d.getDriverBySession(req.Session) if err != nil { - return &protoV2.Empty{}, err + return &protoV2.KillProcessResponse{}, err + } + info, err := driver.KillProcess(ctx) + if err != nil { + return &protoV2.KillProcessResponse{}, err } - return &protoV2.Empty{}, driver.KillProcess(ctx) + return &protoV2.KillProcessResponse{ + ErrMessage: info.ErrMessage, + }, nil } diff --git a/sqle/driver/v2/driver_interface.go b/sqle/driver/v2/driver_interface.go index 9ee4731f84..a8a51b864a 100644 --- a/sqle/driver/v2/driver_interface.go +++ b/sqle/driver/v2/driver_interface.go @@ -87,7 +87,7 @@ type Driver interface { GetTableMeta(ctx context.Context, table *Table) (*TableMeta, error) ExtractTableFromSQL(ctx context.Context, sql string) ([]*Table, error) EstimateSQLAffectRows(ctx context.Context, sql string) (*EstimatedAffectRows, error) - KillProcess(ctx context.Context) error + KillProcess(ctx context.Context) (*KillProcessInfo, error) } type Node struct { @@ -287,3 +287,7 @@ type EstimatedAffectRows struct { Count int64 ErrMessage string } + +type KillProcessInfo struct { + ErrMessage string +} diff --git a/sqle/driver/v2/proto/driver_v2.pb.go b/sqle/driver/v2/proto/driver_v2.pb.go index 777254ffd4..c25b6e7432 100644 --- a/sqle/driver/v2/proto/driver_v2.pb.go +++ b/sqle/driver/v2/proto/driver_v2.pb.go @@ -66,6 +66,7 @@ It has these top-level messages: AffectRowsSQL EstimateSQLAffectRowsRequest EstimateSQLAffectRowsResponse + KillProcessResponse */ package protoV2 @@ -1426,6 +1427,22 @@ func (m *EstimateSQLAffectRowsResponse) GetErrMessage() string { return "" } +type KillProcessResponse struct { + ErrMessage string `protobuf:"bytes,1,opt,name=errMessage" json:"errMessage,omitempty"` +} + +func (m *KillProcessResponse) Reset() { *m = KillProcessResponse{} } +func (m *KillProcessResponse) String() string { return proto.CompactTextString(m) } +func (*KillProcessResponse) ProtoMessage() {} +func (*KillProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{58} } + +func (m *KillProcessResponse) GetErrMessage() string { + if m != nil { + return m.ErrMessage + } + return "" +} + func init() { proto.RegisterType((*Empty)(nil), "protoV2.Empty") proto.RegisterType((*Session)(nil), "protoV2.Session") @@ -1485,6 +1502,7 @@ func init() { proto.RegisterType((*AffectRowsSQL)(nil), "protoV2.AffectRowsSQL") proto.RegisterType((*EstimateSQLAffectRowsRequest)(nil), "protoV2.EstimateSQLAffectRowsRequest") proto.RegisterType((*EstimateSQLAffectRowsResponse)(nil), "protoV2.EstimateSQLAffectRowsResponse") + proto.RegisterType((*KillProcessResponse)(nil), "protoV2.KillProcessResponse") proto.RegisterEnum("protoV2.OptionalModule", OptionalModule_name, OptionalModule_value) } @@ -1507,7 +1525,7 @@ type DriverClient interface { // We put all communication on gRPC for unification in the end. Init(ctx context.Context, in *InitRequest, opts ...grpc.CallOption) (*InitResponse, error) Close(ctx context.Context, in *CloseRequest, opts ...grpc.CallOption) (*Empty, error) - KillProcess(ctx context.Context, in *KillProcessRequest, opts ...grpc.CallOption) (*Empty, error) + KillProcess(ctx context.Context, in *KillProcessRequest, opts ...grpc.CallOption) (*KillProcessResponse, error) // db audit Parse(ctx context.Context, in *ParseRequest, opts ...grpc.CallOption) (*ParseResponse, error) Audit(ctx context.Context, in *AuditRequest, opts ...grpc.CallOption) (*AuditResponse, error) @@ -1560,8 +1578,8 @@ func (c *driverClient) Close(ctx context.Context, in *CloseRequest, opts ...grpc return out, nil } -func (c *driverClient) KillProcess(ctx context.Context, in *KillProcessRequest, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) +func (c *driverClient) KillProcess(ctx context.Context, in *KillProcessRequest, opts ...grpc.CallOption) (*KillProcessResponse, error) { + out := new(KillProcessResponse) err := grpc.Invoke(ctx, "/protoV2.Driver/KillProcess", in, out, c.cc, opts...) if err != nil { return nil, err @@ -1688,7 +1706,7 @@ type DriverServer interface { // We put all communication on gRPC for unification in the end. Init(context.Context, *InitRequest) (*InitResponse, error) Close(context.Context, *CloseRequest) (*Empty, error) - KillProcess(context.Context, *KillProcessRequest) (*Empty, error) + KillProcess(context.Context, *KillProcessRequest) (*KillProcessResponse, error) // db audit Parse(context.Context, *ParseRequest) (*ParseResponse, error) Audit(context.Context, *AuditRequest) (*AuditResponse, error) @@ -2074,119 +2092,120 @@ var _Driver_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("driver_v2.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1813 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x5b, 0x73, 0x1b, 0xb7, - 0x15, 0x2e, 0x2f, 0x4b, 0x8a, 0x87, 0x17, 0x33, 0x90, 0x64, 0xd3, 0x74, 0xac, 0xa8, 0xb0, 0xad, - 0x68, 0x1c, 0x57, 0x4e, 0xe8, 0x8e, 0x33, 0xb6, 0xdb, 0x8e, 0x5d, 0x49, 0x75, 0x94, 0xc4, 0xaa, - 0xbc, 0x52, 0xdd, 0x99, 0xcc, 0x64, 0x12, 0x88, 0x0b, 0x2a, 0x3b, 0x59, 0x2e, 0xa8, 0x05, 0xa8, - 0xcb, 0x6b, 0x5f, 0x3a, 0xfd, 0x27, 0x7d, 0xec, 0x4b, 0x1e, 0xfb, 0xdf, 0x32, 0xb8, 0xec, 0x2e, - 0xf6, 0xc2, 0x24, 0xe6, 0x13, 0x17, 0xe7, 0x86, 0x0f, 0xe7, 0x1c, 0x1c, 0x9c, 0x43, 0xb8, 0xe1, - 0x45, 0xfe, 0x05, 0x8d, 0xbe, 0xbb, 0x18, 0xed, 0xcc, 0x22, 0x26, 0x18, 0x6a, 0xaa, 0x9f, 0x77, - 0x23, 0xdc, 0x04, 0x67, 0x7f, 0x3a, 0x13, 0xd7, 0xf8, 0x36, 0x34, 0x8f, 0x29, 0xe7, 0x3e, 0x0b, - 0x51, 0x0f, 0xaa, 0xbe, 0x37, 0xa8, 0x6c, 0x56, 0xb6, 0x5b, 0x6e, 0xd5, 0xf7, 0xf0, 0x3f, 0xc1, - 0x39, 0x22, 0x11, 0x99, 0xa2, 0x3e, 0xd4, 0x7e, 0xa4, 0xd7, 0x86, 0x23, 0x3f, 0xd1, 0x1a, 0x38, - 0x17, 0x24, 0x98, 0xd3, 0x41, 0x55, 0xd1, 0xf4, 0x02, 0x21, 0xa8, 0x7b, 0x94, 0x8f, 0x07, 0x35, - 0x45, 0x54, 0xdf, 0x92, 0x26, 0xae, 0x67, 0x74, 0x50, 0xd7, 0x34, 0xf9, 0x8d, 0x7f, 0xaa, 0x40, - 0x6d, 0xef, 0xf8, 0x50, 0xf2, 0x7e, 0x60, 0x5c, 0x18, 0xc3, 0xea, 0x5b, 0xd2, 0x66, 0x2c, 0x12, - 0xc6, 0xb0, 0xfa, 0x96, 0xb4, 0x39, 0xa7, 0x51, 0x6c, 0x57, 0x7e, 0xa3, 0x21, 0xac, 0xcc, 0x08, - 0xe7, 0x97, 0x2c, 0xf2, 0x8c, 0xed, 0x64, 0x2d, 0x79, 0x1e, 0x11, 0xe4, 0x94, 0x70, 0x3a, 0x70, - 0x34, 0x2f, 0x5e, 0xa3, 0xe7, 0xd0, 0x27, 0x9e, 0xe7, 0x0b, 0x9f, 0x85, 0x24, 0x50, 0xc7, 0xe3, - 0x83, 0xc6, 0x66, 0x6d, 0xbb, 0x3d, 0xea, 0xed, 0x18, 0xe7, 0xec, 0x28, 0xb2, 0x5b, 0x90, 0xc3, - 0xff, 0xad, 0x40, 0xdd, 0x9d, 0x07, 0xea, 0xa0, 0x21, 0x99, 0xd2, 0x18, 0xb8, 0xfc, 0x4e, 0x0e, - 0x5f, 0xb5, 0x0e, 0xbf, 0x06, 0x4e, 0x40, 0x2f, 0x68, 0x60, 0x90, 0xeb, 0x85, 0x84, 0x37, 0x26, - 0x82, 0x9e, 0xb1, 0xe8, 0x3a, 0x86, 0x1e, 0xaf, 0xd1, 0x16, 0x34, 0x66, 0x1a, 0x94, 0x53, 0x0a, - 0xca, 0x70, 0xd1, 0x06, 0x00, 0x09, 0x43, 0x26, 0x88, 0x04, 0x38, 0x68, 0x28, 0x2b, 0x16, 0x05, - 0xff, 0x54, 0x85, 0xee, 0x1b, 0x2a, 0x08, 0x77, 0x29, 0x9f, 0xb1, 0x90, 0x53, 0xa9, 0x31, 0x0b, - 0xe6, 0x67, 0x7e, 0x78, 0x98, 0x22, 0xb7, 0x28, 0xe8, 0x53, 0x58, 0x8d, 0x9d, 0xb4, 0x47, 0x27, - 0x64, 0x1e, 0x88, 0xa3, 0x38, 0x0e, 0x35, 0xb7, 0x8c, 0x85, 0xbe, 0x84, 0x41, 0x4c, 0x7e, 0x95, - 0x77, 0x69, 0xad, 0x14, 0xfd, 0x42, 0x79, 0x74, 0x0f, 0x9c, 0x68, 0x1e, 0x50, 0x3e, 0xa8, 0x2b, - 0xc5, 0x6e, 0xa2, 0x28, 0xfd, 0xed, 0x6a, 0x1e, 0x7a, 0x03, 0xeb, 0x34, 0x24, 0xa7, 0x01, 0xf5, - 0xfe, 0x3e, 0xd3, 0xda, 0x6f, 0x98, 0x37, 0x0f, 0xa8, 0xf2, 0x55, 0x6f, 0x74, 0x2b, 0x51, 0xca, - 0xb2, 0xdd, 0x72, 0x2d, 0x19, 0xb1, 0x80, 0x9d, 0x31, 0xe5, 0xbd, 0x8e, 0xab, 0xbe, 0xb1, 0x0b, - 0xed, 0x83, 0xd0, 0x17, 0x2e, 0x3d, 0x9f, 0x53, 0x2e, 0xd0, 0x06, 0xd4, 0x3c, 0x1e, 0x2a, 0x6f, - 0xb5, 0x47, 0x9d, 0xc4, 0xfe, 0xde, 0xf1, 0xa1, 0x2b, 0x19, 0x29, 0xec, 0xea, 0x62, 0xd8, 0xf8, - 0x39, 0x74, 0xb4, 0x4d, 0x13, 0x89, 0x87, 0xd0, 0xe4, 0xfa, 0xca, 0x19, 0xc3, 0xfd, 0x44, 0xcd, - 0x5c, 0x45, 0x37, 0x16, 0x90, 0xba, 0xbb, 0x01, 0xe3, 0x34, 0x06, 0xf4, 0x3e, 0xba, 0x2f, 0x01, - 0x7d, 0xe5, 0x07, 0xc1, 0x51, 0xc4, 0xc6, 0x94, 0xf3, 0x65, 0x2c, 0xfc, 0x1e, 0x5a, 0x47, 0x24, - 0xe2, 0xd4, 0x3b, 0x7e, 0xfb, 0xb5, 0x4c, 0xe6, 0xf3, 0x39, 0x8d, 0xe2, 0x3a, 0xa0, 0x17, 0xf8, - 0x7b, 0xe8, 0x28, 0x91, 0x25, 0xcc, 0xa3, 0xfb, 0x50, 0xe3, 0xe7, 0x81, 0x4a, 0xb1, 0xf6, 0x08, - 0xd9, 0xb9, 0xa2, 0xb7, 0x74, 0x25, 0x1b, 0x1f, 0x41, 0xfd, 0x90, 0x79, 0x2a, 0x5c, 0x82, 0x5e, - 0x25, 0xd5, 0x42, 0x7e, 0x27, 0xd5, 0xa5, 0x9a, 0x56, 0x17, 0xb4, 0x09, 0xed, 0x89, 0x1f, 0x9e, - 0xd1, 0x68, 0x16, 0xf9, 0xa1, 0x30, 0x57, 0xcf, 0x26, 0xe1, 0x3f, 0x42, 0xd7, 0x60, 0x36, 0x11, - 0xb9, 0x07, 0x4e, 0xc8, 0x3c, 0xca, 0x07, 0x95, 0x5c, 0x18, 0xe5, 0xc6, 0xae, 0xe6, 0xe1, 0x4d, - 0x58, 0x79, 0x35, 0xf7, 0x7c, 0xb1, 0xd8, 0x17, 0x04, 0x3a, 0x4a, 0x62, 0x19, 0x5f, 0x3c, 0x80, - 0x3a, 0x3f, 0x0f, 0xe2, 0x44, 0xfa, 0x20, 0x11, 0x8c, 0xb7, 0x74, 0x15, 0x1b, 0x7f, 0x03, 0x6d, - 0xb3, 0x05, 0x9f, 0x07, 0x02, 0x0d, 0xa0, 0x39, 0xa5, 0x9c, 0x93, 0xb3, 0xf8, 0x46, 0xc7, 0xcb, - 0xb4, 0xf4, 0x54, 0xed, 0xd2, 0x73, 0x07, 0x5a, 0x32, 0x27, 0xbf, 0x53, 0xd5, 0x4b, 0x7b, 0x66, - 0x45, 0x12, 0x64, 0x05, 0xc0, 0x7f, 0x49, 0xe0, 0x4b, 0xdb, 0x1c, 0xed, 0x40, 0x33, 0xd2, 0x9f, - 0xc6, 0x2f, 0x6b, 0x59, 0x54, 0x5a, 0xce, 0x8d, 0x85, 0xf0, 0x97, 0xd0, 0x8d, 0xe9, 0xda, 0xad, - 0xcf, 0xa0, 0x43, 0x2c, 0x83, 0xc6, 0xca, 0x7a, 0x99, 0x15, 0xee, 0x66, 0x44, 0xf1, 0xc7, 0x70, - 0xe3, 0x90, 0x52, 0xcf, 0x65, 0x41, 0x70, 0x4a, 0xc6, 0x3f, 0x2e, 0xf6, 0x39, 0x83, 0xf5, 0xd7, - 0x34, 0xb4, 0xe4, 0x96, 0x71, 0xfe, 0x43, 0x3b, 0x11, 0x07, 0x69, 0xf4, 0xb3, 0x08, 0x74, 0x3a, - 0xfe, 0x19, 0xda, 0xbf, 0x8a, 0xca, 0x8e, 0x4b, 0x35, 0x13, 0x17, 0xfc, 0x12, 0x6e, 0xe6, 0xf1, - 0x1a, 0x6f, 0x6d, 0x69, 0x10, 0x1a, 0x6c, 0xea, 0xea, 0x02, 0x80, 0x67, 0xd0, 0x3e, 0xf2, 0xc3, - 0xb3, 0x65, 0xee, 0xf3, 0x47, 0xd0, 0xdc, 0xbf, 0xa2, 0xe3, 0xc5, 0xde, 0xfc, 0x16, 0xda, 0x52, - 0x60, 0x19, 0x1f, 0x62, 0xdb, 0x87, 0xa9, 0x9c, 0xd9, 0x4f, 0x43, 0xff, 0x5f, 0x05, 0x40, 0xdb, - 0x57, 0xd9, 0x8b, 0xa1, 0x13, 0x10, 0x2e, 0x0e, 0x42, 0x4e, 0x23, 0x71, 0xa0, 0x5b, 0x8f, 0x9a, - 0x9b, 0xa1, 0xa1, 0x47, 0xf0, 0x81, 0xbd, 0xde, 0x8f, 0x22, 0x16, 0x19, 0x9f, 0x16, 0x19, 0xd2, - 0x62, 0xc4, 0x2e, 0xf9, 0xab, 0xc9, 0x84, 0x8e, 0x05, 0xf5, 0x54, 0x8a, 0xd7, 0xdc, 0x0c, 0x4d, - 0x5a, 0xb4, 0xd7, 0xda, 0xa2, 0x7e, 0x87, 0x8b, 0x0c, 0xfc, 0x02, 0x3a, 0x06, 0xb1, 0x8e, 0xd2, - 0x27, 0xd0, 0xd0, 0xf9, 0x6e, 0x3c, 0xb2, 0x9a, 0x39, 0xa9, 0xb9, 0x12, 0x46, 0x04, 0x7f, 0x0b, - 0xad, 0x93, 0xab, 0xe5, 0x2a, 0xa3, 0x5d, 0x0d, 0x8a, 0xde, 0xd4, 0xc5, 0xe0, 0x05, 0x80, 0x34, - 0x6f, 0x90, 0xfd, 0x21, 0x7f, 0x5d, 0x4b, 0xa1, 0x25, 0xb7, 0x75, 0x13, 0x56, 0xde, 0xca, 0x98, - 0x2f, 0x4e, 0x86, 0xcf, 0xa0, 0xa5, 0x24, 0x76, 0x59, 0x38, 0x41, 0xf7, 0xa1, 0x2b, 0xfc, 0x29, - 0x65, 0x73, 0x71, 0x4c, 0xc7, 0x2c, 0xd4, 0xc1, 0xea, 0xba, 0x59, 0x22, 0xfe, 0x77, 0x05, 0x3a, - 0x4a, 0x67, 0x99, 0x43, 0xdf, 0xb3, 0x33, 0x28, 0xad, 0x80, 0x31, 0x4a, 0x95, 0x42, 0x68, 0x0b, - 0xea, 0x63, 0x16, 0x4e, 0x54, 0x64, 0xed, 0x47, 0x23, 0x41, 0xea, 0x2a, 0x3e, 0xf6, 0xa0, 0x6b, - 0x80, 0x24, 0xd7, 0xab, 0x31, 0x66, 0xc1, 0x7c, 0x1a, 0x1a, 0xef, 0x14, 0x3a, 0x2b, 0xcd, 0x45, - 0x9f, 0x40, 0x5d, 0x66, 0x81, 0x71, 0xfd, 0xad, 0xec, 0x06, 0xc6, 0x89, 0xec, 0xd2, 0x55, 0x42, - 0x78, 0x17, 0x7a, 0x59, 0x3a, 0xfa, 0x0c, 0x1a, 0xaa, 0x19, 0x8e, 0x83, 0x70, 0xbb, 0xcc, 0xc0, - 0x3b, 0x29, 0xe1, 0x1a, 0x41, 0xbc, 0x0d, 0xfd, 0x3c, 0x2f, 0x6d, 0xb0, 0x2b, 0x56, 0x83, 0x8d, - 0xb1, 0xbc, 0x3e, 0xb3, 0x80, 0xf8, 0xe1, 0xe2, 0xa8, 0x8d, 0xa1, 0x67, 0x64, 0x96, 0x7b, 0x86, - 0xac, 0x18, 0xd8, 0x09, 0x14, 0xef, 0xaa, 0x2f, 0xf2, 0x3b, 0xb8, 0x91, 0x6c, 0x62, 0xfc, 0xbb, - 0x0b, 0xdd, 0x71, 0x40, 0x38, 0xf7, 0x4d, 0xa6, 0x99, 0xbd, 0xee, 0xe6, 0x6d, 0xec, 0xda, 0x42, - 0x6e, 0x56, 0x07, 0xbf, 0x84, 0xb5, 0x32, 0x31, 0xb4, 0x0d, 0x75, 0xd9, 0x3a, 0x16, 0x8a, 0xe3, - 0x09, 0x39, 0x9d, 0x07, 0x24, 0xda, 0x23, 0x82, 0xb8, 0x4a, 0x02, 0xbf, 0x82, 0xd5, 0xd7, 0x54, - 0xec, 0x99, 0x3e, 0x73, 0xa9, 0xae, 0x67, 0x03, 0x56, 0x62, 0xfd, 0xb2, 0x4e, 0x1f, 0xbf, 0x86, - 0xb5, 0xec, 0x16, 0xc6, 0x03, 0x8f, 0xa1, 0x15, 0xf7, 0xb7, 0x71, 0xf4, 0xd3, 0x2c, 0x8e, 0xc5, - 0xdd, 0x54, 0x06, 0x3f, 0x01, 0xe7, 0x44, 0x36, 0xa6, 0xa5, 0xf3, 0xc4, 0x4d, 0x68, 0xf0, 0xf1, - 0x0f, 0x74, 0x4a, 0x4c, 0xb5, 0x33, 0x2b, 0x7c, 0xa6, 0x0e, 0xa8, 0xf4, 0x64, 0x83, 0xbf, 0x5c, - 0x75, 0x71, 0x84, 0xd4, 0x37, 0x61, 0xee, 0xd9, 0xee, 0x94, 0x6d, 0xab, 0x62, 0xe2, 0x2f, 0xd4, - 0x31, 0xad, 0x8d, 0xcc, 0x31, 0x3f, 0x85, 0x96, 0x88, 0x89, 0x66, 0x2f, 0x94, 0xb5, 0xa0, 0xc4, - 0x53, 0x21, 0xfc, 0xff, 0x0a, 0xb4, 0x12, 0x06, 0x7a, 0x0a, 0x6d, 0x7d, 0xd5, 0xf8, 0x41, 0x38, - 0x61, 0x85, 0x90, 0xee, 0xa6, 0x3c, 0xd7, 0x16, 0x94, 0x7a, 0x7e, 0xe8, 0xd1, 0x2b, 0xaa, 0xf5, - 0xaa, 0x39, 0xbd, 0x83, 0x94, 0xe7, 0xda, 0x82, 0x68, 0x0b, 0x7a, 0xe3, 0x88, 0x12, 0x41, 0x15, - 0x84, 0xe3, 0xb7, 0x5f, 0x9b, 0xc6, 0x27, 0x47, 0xb5, 0xdf, 0xec, 0x7a, 0xf6, 0xcd, 0xfe, 0x1c, - 0xda, 0x16, 0xaa, 0xf7, 0x48, 0xc6, 0xcf, 0xe5, 0x34, 0x91, 0x22, 0xf9, 0xed, 0x8a, 0xcf, 0xe0, - 0x86, 0x45, 0xfc, 0x82, 0x12, 0xef, 0xb7, 0xce, 0x9c, 0xb2, 0x73, 0xb2, 0xed, 0xb1, 0x4b, 0x2e, - 0x0b, 0x85, 0x2f, 0xe8, 0x54, 0x27, 0x65, 0xcb, 0xd5, 0x0b, 0xcc, 0xa0, 0x6d, 0x09, 0xa2, 0x11, - 0x34, 0x8d, 0xb7, 0x4d, 0xee, 0x0e, 0xca, 0xf0, 0x49, 0x28, 0x6e, 0x2c, 0x88, 0x1e, 0x65, 0x6a, - 0x65, 0xa9, 0x82, 0x04, 0x60, 0x8a, 0xe5, 0x7d, 0xf9, 0x94, 0x8a, 0x88, 0xc8, 0xc7, 0x75, 0x71, - 0xfd, 0x3a, 0x87, 0xa1, 0x91, 0x52, 0x91, 0xf9, 0x5b, 0xc4, 0xa6, 0x4b, 0x76, 0x75, 0x1f, 0xdb, - 0xb5, 0x6c, 0xdd, 0xaa, 0x43, 0x29, 0x06, 0x5d, 0xcd, 0xf6, 0xe1, 0x4e, 0xe9, 0x96, 0xe9, 0xcb, - 0xa1, 0x72, 0x99, 0x17, 0x5e, 0x0e, 0x7d, 0x5f, 0x0c, 0x17, 0x3f, 0x80, 0xae, 0xee, 0x1d, 0xe4, - 0x99, 0x17, 0x1f, 0x50, 0xc0, 0x87, 0xfb, 0x5c, 0xf8, 0x53, 0x22, 0x64, 0xda, 0xa5, 0x1a, 0xcb, - 0x1c, 0x71, 0xdb, 0x3e, 0xe2, 0xcd, 0xb4, 0xb1, 0xb6, 0x61, 0xe8, 0x33, 0xfe, 0x03, 0xee, 0x2e, - 0xd8, 0xd5, 0x9c, 0x72, 0x0d, 0x9c, 0x31, 0x9b, 0x87, 0xc2, 0x74, 0x61, 0x7a, 0x81, 0x36, 0x00, - 0x68, 0x14, 0xbd, 0xc9, 0xf4, 0xb2, 0x16, 0xe5, 0xe1, 0xbf, 0x2a, 0xd0, 0x2b, 0x8c, 0xd5, 0xbd, - 0x6c, 0x87, 0xdb, 0xff, 0x1d, 0x6a, 0x81, 0xa3, 0x9e, 0xb8, 0x7e, 0x05, 0xb5, 0x65, 0x0f, 0xaa, - 0x4a, 0x7c, 0xbf, 0x8a, 0xfa, 0xd0, 0xb1, 0x6b, 0x4c, 0xbf, 0x86, 0x6e, 0xc1, 0x6a, 0x49, 0x2c, - 0xfa, 0x75, 0x74, 0x1b, 0xd6, 0x4b, 0x0f, 0xd0, 0x77, 0x46, 0xff, 0x59, 0x81, 0xc6, 0x9e, 0xfa, - 0xa7, 0x0b, 0x3d, 0x06, 0x47, 0xfd, 0xed, 0x81, 0xd2, 0x20, 0xa9, 0xff, 0xb9, 0x86, 0xa9, 0x73, - 0xb2, 0x7f, 0x8b, 0x3c, 0x81, 0xba, 0x1c, 0xce, 0x91, 0x5d, 0x48, 0x92, 0x09, 0x6e, 0xb8, 0x9e, - 0xa3, 0x1a, 0xa5, 0x1d, 0x70, 0xd4, 0x54, 0x8e, 0x52, 0xbe, 0x3d, 0xa5, 0x0f, 0x73, 0x9b, 0xa3, - 0xe7, 0xd0, 0xb6, 0x26, 0x71, 0x74, 0x27, 0x61, 0x17, 0xe7, 0xf3, 0x82, 0xee, 0x53, 0xf5, 0x2f, - 0x5c, 0x66, 0x2f, 0x7b, 0xe0, 0xb6, 0x0e, 0x96, 0x9d, 0x69, 0x9f, 0x82, 0xa3, 0xe6, 0x2b, 0x54, - 0x98, 0xb7, 0xf2, 0x7a, 0xd9, 0xa1, 0xed, 0x6d, 0x3e, 0x7c, 0x68, 0x23, 0x91, 0x2c, 0x9d, 0xb4, - 0x86, 0x1f, 0x2d, 0xe4, 0x1b, 0x93, 0x8f, 0xa0, 0x2e, 0x27, 0x16, 0xcb, 0xc7, 0xd6, 0x00, 0x53, - 0x38, 0xf0, 0x13, 0xa8, 0xcb, 0x7e, 0xd5, 0x92, 0xb6, 0x46, 0x92, 0xe1, 0x7a, 0xbe, 0xa9, 0x8d, - 0x9b, 0xdf, 0xea, 0xc9, 0x15, 0xb2, 0xde, 0xa1, 0xb8, 0xed, 0x1e, 0xae, 0x66, 0x68, 0xa9, 0x73, - 0x54, 0x3e, 0x5a, 0xce, 0xb1, 0xdb, 0x56, 0xcb, 0x39, 0xd9, 0x26, 0xf2, 0x4f, 0x49, 0xf2, 0xa2, - 0x5b, 0xf9, 0xc6, 0x26, 0xd6, 0x1d, 0x14, 0x19, 0x46, 0xfb, 0x2b, 0x95, 0xed, 0x49, 0xe3, 0x80, - 0x3e, 0xb4, 0x1c, 0x57, 0x68, 0x59, 0x86, 0x77, 0x17, 0x70, 0x33, 0xc6, 0xd2, 0x67, 0x35, 0x63, - 0x2c, 0xdf, 0x1e, 0x64, 0x8d, 0x15, 0xdf, 0xf4, 0xef, 0x4b, 0x6f, 0x1d, 0xba, 0x97, 0x2f, 0x9a, - 0x25, 0x25, 0x79, 0x78, 0xff, 0x97, 0x85, 0xcc, 0x0e, 0x93, 0x05, 0xd7, 0x17, 0x3d, 0x48, 0xd5, - 0x7f, 0xa1, 0x2a, 0x0e, 0xb7, 0x7e, 0x4d, 0x4c, 0xef, 0xf3, 0xd7, 0xce, 0x37, 0xb0, 0xf3, 0xf8, - 0x85, 0x91, 0x3d, 0x6d, 0xa8, 0x8f, 0x27, 0x3f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x66, 0x73, 0xaa, - 0xd4, 0x09, 0x17, 0x00, 0x00, + // 1831 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x59, 0x73, 0x1b, 0xc7, + 0x11, 0x0e, 0x8e, 0x05, 0x88, 0xc6, 0x21, 0x78, 0x48, 0x4a, 0x10, 0x24, 0xd1, 0xcc, 0x48, 0xa2, + 0x59, 0xb2, 0x42, 0xd9, 0x50, 0x22, 0x97, 0xac, 0x24, 0x25, 0x85, 0x64, 0x24, 0xda, 0x16, 0x43, + 0x2d, 0x19, 0xa5, 0xca, 0x55, 0x2e, 0x7b, 0x88, 0x1d, 0xd0, 0x5b, 0x5e, 0xec, 0x80, 0x3b, 0x03, + 0x1e, 0xaf, 0x79, 0xc9, 0x4f, 0xc8, 0x5f, 0xc8, 0x63, 0x5e, 0xfc, 0x98, 0xff, 0x96, 0x9a, 0x63, + 0x77, 0x67, 0x0f, 0xf8, 0xc0, 0x13, 0x76, 0xfa, 0x9a, 0x9e, 0xaf, 0x7b, 0x7a, 0xba, 0x01, 0x37, + 0xbc, 0xc8, 0xbf, 0xa0, 0xd1, 0xb7, 0x17, 0xa3, 0x9d, 0x59, 0xc4, 0x04, 0x43, 0x4d, 0xf5, 0xf3, + 0x7e, 0x84, 0x9b, 0xe0, 0xec, 0x4f, 0x67, 0xe2, 0x1a, 0xdf, 0x86, 0xe6, 0x31, 0xe5, 0xdc, 0x67, + 0x21, 0xea, 0x41, 0xd5, 0xf7, 0x06, 0x95, 0xcd, 0xca, 0x76, 0xcb, 0xad, 0xfa, 0x1e, 0xfe, 0x07, + 0x38, 0x47, 0x24, 0x22, 0x53, 0xd4, 0x87, 0xda, 0x0f, 0xf4, 0xda, 0x70, 0xe4, 0x27, 0x5a, 0x03, + 0xe7, 0x82, 0x04, 0x73, 0x3a, 0xa8, 0x2a, 0x9a, 0x5e, 0x20, 0x04, 0x75, 0x8f, 0xf2, 0xf1, 0xa0, + 0xa6, 0x88, 0xea, 0x5b, 0xd2, 0xc4, 0xf5, 0x8c, 0x0e, 0xea, 0x9a, 0x26, 0xbf, 0xf1, 0x8f, 0x15, + 0xa8, 0xed, 0x1d, 0x1f, 0x4a, 0xde, 0xf7, 0x8c, 0x0b, 0x63, 0x58, 0x7d, 0x4b, 0xda, 0x8c, 0x45, + 0xc2, 0x18, 0x56, 0xdf, 0x92, 0x36, 0xe7, 0x34, 0x8a, 0xed, 0xca, 0x6f, 0x34, 0x84, 0x95, 0x19, + 0xe1, 0xfc, 0x92, 0x45, 0x9e, 0xb1, 0x9d, 0xac, 0x25, 0xcf, 0x23, 0x82, 0x9c, 0x12, 0x4e, 0x07, + 0x8e, 0xe6, 0xc5, 0x6b, 0xf4, 0x39, 0xf4, 0x89, 0xe7, 0xf9, 0xc2, 0x67, 0x21, 0x09, 0xd4, 0xf1, + 0xf8, 0xa0, 0xb1, 0x59, 0xdb, 0x6e, 0x8f, 0x7a, 0x3b, 0x06, 0x9c, 0x1d, 0x45, 0x76, 0x0b, 0x72, + 0xf8, 0x3f, 0x15, 0xa8, 0xbb, 0xf3, 0x40, 0x1d, 0x34, 0x24, 0x53, 0x1a, 0x3b, 0x2e, 0xbf, 0x93, + 0xc3, 0x57, 0xad, 0xc3, 0xaf, 0x81, 0x13, 0xd0, 0x0b, 0x1a, 0x18, 0xcf, 0xf5, 0x42, 0xba, 0x37, + 0x26, 0x82, 0x9e, 0xb1, 0xe8, 0x3a, 0x76, 0x3d, 0x5e, 0xa3, 0x2d, 0x68, 0xcc, 0xb4, 0x53, 0x4e, + 0xa9, 0x53, 0x86, 0x8b, 0x36, 0x00, 0x48, 0x18, 0x32, 0x41, 0xa4, 0x83, 0x83, 0x86, 0xb2, 0x62, + 0x51, 0xf0, 0x8f, 0x55, 0xe8, 0xbe, 0xa5, 0x82, 0x70, 0x97, 0xf2, 0x19, 0x0b, 0x39, 0x95, 0x1a, + 0xb3, 0x60, 0x7e, 0xe6, 0x87, 0x87, 0xa9, 0xe7, 0x16, 0x05, 0x7d, 0x02, 0xab, 0x31, 0x48, 0x7b, + 0x74, 0x42, 0xe6, 0x81, 0x38, 0x8a, 0xe3, 0x50, 0x73, 0xcb, 0x58, 0xe8, 0x0b, 0x18, 0xc4, 0xe4, + 0x57, 0x79, 0x48, 0x6b, 0xa5, 0xde, 0x2f, 0x94, 0x47, 0xf7, 0xc1, 0x89, 0xe6, 0x01, 0xe5, 0x83, + 0xba, 0x52, 0xec, 0x26, 0x8a, 0x12, 0x6f, 0x57, 0xf3, 0xd0, 0x5b, 0x58, 0xa7, 0x21, 0x39, 0x0d, + 0xa8, 0xf7, 0xb7, 0x99, 0xd6, 0x7e, 0xcb, 0xbc, 0x79, 0x40, 0x15, 0x56, 0xbd, 0xd1, 0xad, 0x44, + 0x29, 0xcb, 0x76, 0xcb, 0xb5, 0x64, 0xc4, 0x02, 0x76, 0xc6, 0x14, 0x7a, 0x1d, 0x57, 0x7d, 0x63, + 0x17, 0xda, 0x07, 0xa1, 0x2f, 0x5c, 0x7a, 0x3e, 0xa7, 0x5c, 0xa0, 0x0d, 0xa8, 0x79, 0x3c, 0x54, + 0x68, 0xb5, 0x47, 0x9d, 0xc4, 0xfe, 0xde, 0xf1, 0xa1, 0x2b, 0x19, 0xa9, 0xdb, 0xd5, 0xc5, 0x6e, + 0xe3, 0xcf, 0xa1, 0xa3, 0x6d, 0x9a, 0x48, 0x3c, 0x82, 0x26, 0xd7, 0x57, 0xce, 0x18, 0xee, 0x27, + 0x6a, 0xe6, 0x2a, 0xba, 0xb1, 0x80, 0xd4, 0xdd, 0x0d, 0x18, 0xa7, 0xb1, 0x43, 0xbf, 0x46, 0xf7, + 0x25, 0xa0, 0x2f, 0xfd, 0x20, 0x38, 0x8a, 0xd8, 0x98, 0x72, 0xbe, 0x8c, 0x85, 0xdf, 0x42, 0xeb, + 0x88, 0x44, 0x9c, 0x7a, 0xc7, 0xef, 0xbe, 0x92, 0xc9, 0x7c, 0x3e, 0xa7, 0x51, 0x5c, 0x07, 0xf4, + 0x02, 0x7f, 0x07, 0x1d, 0x25, 0xb2, 0x84, 0x79, 0xf4, 0x00, 0x6a, 0xfc, 0x3c, 0x50, 0x29, 0xd6, + 0x1e, 0x21, 0x3b, 0x57, 0xf4, 0x96, 0xae, 0x64, 0xe3, 0x23, 0xa8, 0x1f, 0x32, 0x4f, 0x85, 0x4b, + 0xd0, 0xab, 0xa4, 0x5a, 0xc8, 0xef, 0xa4, 0xba, 0x54, 0xd3, 0xea, 0x82, 0x36, 0xa1, 0x3d, 0xf1, + 0xc3, 0x33, 0x1a, 0xcd, 0x22, 0x3f, 0x14, 0xe6, 0xea, 0xd9, 0x24, 0xfc, 0x7b, 0xe8, 0x1a, 0x9f, + 0x4d, 0x44, 0xee, 0x83, 0x13, 0x32, 0x8f, 0xf2, 0x41, 0x25, 0x17, 0x46, 0xb9, 0xb1, 0xab, 0x79, + 0x78, 0x13, 0x56, 0x5e, 0xcd, 0x3d, 0x5f, 0x2c, 0xc6, 0x82, 0x40, 0x47, 0x49, 0x2c, 0x83, 0xc5, + 0x43, 0xa8, 0xf3, 0xf3, 0x20, 0x4e, 0xa4, 0x0f, 0x12, 0xc1, 0x78, 0x4b, 0x57, 0xb1, 0xf1, 0xd7, + 0xd0, 0x36, 0x5b, 0xf0, 0x79, 0x20, 0xd0, 0x00, 0x9a, 0x53, 0xca, 0x39, 0x39, 0x8b, 0x6f, 0x74, + 0xbc, 0x4c, 0x4b, 0x4f, 0xd5, 0x2e, 0x3d, 0x77, 0xa0, 0x25, 0x73, 0xf2, 0x5b, 0x55, 0xbd, 0x34, + 0x32, 0x2b, 0x92, 0x20, 0x2b, 0x00, 0xfe, 0x73, 0xe2, 0xbe, 0xb4, 0xcd, 0xd1, 0x0e, 0x34, 0x23, + 0xfd, 0x69, 0x70, 0x59, 0xcb, 0x7a, 0xa5, 0xe5, 0xdc, 0x58, 0x08, 0x7f, 0x01, 0xdd, 0x98, 0xae, + 0x61, 0x7d, 0x0e, 0x1d, 0x62, 0x19, 0x34, 0x56, 0xd6, 0xcb, 0xac, 0x70, 0x37, 0x23, 0x8a, 0x3f, + 0x82, 0x1b, 0x87, 0x94, 0x7a, 0x2e, 0x0b, 0x82, 0x53, 0x32, 0xfe, 0x61, 0x31, 0xe6, 0x0c, 0xd6, + 0x5f, 0xd3, 0xd0, 0x92, 0x5b, 0x06, 0xfc, 0x47, 0x76, 0x22, 0x0e, 0xd2, 0xe8, 0x67, 0x3d, 0xd0, + 0xe9, 0xf8, 0x27, 0x68, 0xff, 0xac, 0x57, 0x76, 0x5c, 0xaa, 0x99, 0xb8, 0xe0, 0x97, 0x70, 0x33, + 0xef, 0xaf, 0x41, 0x6b, 0x4b, 0x3b, 0xa1, 0x9d, 0x4d, 0xa1, 0x2e, 0x38, 0xf0, 0x1c, 0xda, 0x47, + 0x7e, 0x78, 0xb6, 0xcc, 0x7d, 0xfe, 0x10, 0x9a, 0xfb, 0x57, 0x74, 0xbc, 0x18, 0xcd, 0x6f, 0xa0, + 0x2d, 0x05, 0x96, 0xc1, 0x10, 0xdb, 0x18, 0xa6, 0x72, 0x66, 0x3f, 0xed, 0xfa, 0x7f, 0x2b, 0x00, + 0xda, 0xbe, 0xca, 0x5e, 0x0c, 0x9d, 0x80, 0x70, 0x71, 0x10, 0x72, 0x1a, 0x89, 0x03, 0xdd, 0x7a, + 0xd4, 0xdc, 0x0c, 0x0d, 0x3d, 0x86, 0x0f, 0xec, 0xf5, 0x7e, 0x14, 0xb1, 0xc8, 0x60, 0x5a, 0x64, + 0x48, 0x8b, 0x11, 0xbb, 0xe4, 0xaf, 0x26, 0x13, 0x3a, 0x16, 0xd4, 0x53, 0x29, 0x5e, 0x73, 0x33, + 0x34, 0x69, 0xd1, 0x5e, 0x6b, 0x8b, 0xfa, 0x1d, 0x2e, 0x32, 0xf0, 0x0b, 0xe8, 0x18, 0x8f, 0x75, + 0x94, 0x3e, 0x86, 0x86, 0xce, 0x77, 0x83, 0xc8, 0x6a, 0xe6, 0xa4, 0xe6, 0x4a, 0x18, 0x11, 0xfc, + 0x0d, 0xb4, 0x4e, 0xae, 0x96, 0xab, 0x8c, 0x76, 0x35, 0x28, 0xa2, 0xa9, 0x8b, 0xc1, 0x0b, 0x00, + 0x69, 0xde, 0x78, 0xf6, 0xbb, 0xfc, 0x75, 0x2d, 0x75, 0x2d, 0xb9, 0xad, 0x9b, 0xb0, 0xf2, 0x4e, + 0xc6, 0x7c, 0x71, 0x32, 0x7c, 0x0a, 0x2d, 0x25, 0xb1, 0xcb, 0xc2, 0x09, 0x7a, 0x00, 0x5d, 0xe1, + 0x4f, 0x29, 0x9b, 0x8b, 0x63, 0x3a, 0x66, 0xa1, 0x0e, 0x56, 0xd7, 0xcd, 0x12, 0xf1, 0xbf, 0x2a, + 0xd0, 0x51, 0x3a, 0xcb, 0x1c, 0xfa, 0xbe, 0x9d, 0x41, 0x69, 0x05, 0x8c, 0xbd, 0x54, 0x29, 0x84, + 0xb6, 0xa0, 0x3e, 0x66, 0xe1, 0x44, 0x45, 0xd6, 0x7e, 0x34, 0x12, 0x4f, 0x5d, 0xc5, 0xc7, 0x1e, + 0x74, 0x8d, 0x23, 0xc9, 0xf5, 0x6a, 0x8c, 0x59, 0x30, 0x9f, 0x86, 0x06, 0x9d, 0x42, 0x67, 0xa5, + 0xb9, 0xe8, 0x63, 0xa8, 0xcb, 0x2c, 0x30, 0xd0, 0xdf, 0xca, 0x6e, 0x60, 0x40, 0x64, 0x97, 0xae, + 0x12, 0xc2, 0xbb, 0xd0, 0xcb, 0xd2, 0xd1, 0xa7, 0xd0, 0x50, 0xcd, 0x70, 0x1c, 0x84, 0xdb, 0x65, + 0x06, 0xde, 0x4b, 0x09, 0xd7, 0x08, 0xe2, 0x6d, 0xe8, 0xe7, 0x79, 0x69, 0x83, 0x5d, 0xb1, 0x1a, + 0x6c, 0x8c, 0xe5, 0xf5, 0x99, 0x05, 0xc4, 0x0f, 0x17, 0x47, 0x6d, 0x0c, 0x3d, 0x23, 0xb3, 0xdc, + 0x33, 0x64, 0xc5, 0xc0, 0x4e, 0xa0, 0x78, 0x57, 0x7d, 0x91, 0xdf, 0xc3, 0x8d, 0x64, 0x13, 0x83, + 0xef, 0x2e, 0x74, 0xc7, 0x01, 0xe1, 0xdc, 0x37, 0x99, 0x66, 0xf6, 0xba, 0x97, 0xb7, 0xb1, 0x6b, + 0x0b, 0xb9, 0x59, 0x1d, 0xfc, 0x12, 0xd6, 0xca, 0xc4, 0xd0, 0x36, 0xd4, 0x65, 0xeb, 0x58, 0x28, + 0x8e, 0x27, 0xe4, 0x74, 0x1e, 0x90, 0x68, 0x8f, 0x08, 0xe2, 0x2a, 0x09, 0xfc, 0x0a, 0x56, 0x5f, + 0x53, 0xb1, 0x67, 0xfa, 0xcc, 0xa5, 0xba, 0x9e, 0x0d, 0x58, 0x89, 0xf5, 0xcb, 0x3a, 0x7d, 0xfc, + 0x1a, 0xd6, 0xb2, 0x5b, 0x18, 0x04, 0x9e, 0x40, 0x2b, 0xee, 0x6f, 0xe3, 0xe8, 0xa7, 0x59, 0x1c, + 0x8b, 0xbb, 0xa9, 0x0c, 0x7e, 0x0a, 0xce, 0x89, 0x6c, 0x4c, 0x4b, 0xe7, 0x89, 0x9b, 0xd0, 0xe0, + 0xe3, 0xef, 0xe9, 0x94, 0x98, 0x6a, 0x67, 0x56, 0xf8, 0x4c, 0x1d, 0x50, 0xe9, 0xc9, 0x06, 0x7f, + 0xb9, 0xea, 0xe2, 0x08, 0xa9, 0x6f, 0xc2, 0xdc, 0xb3, 0xe1, 0x94, 0x6d, 0xab, 0x62, 0xe2, 0x37, + 0xea, 0x98, 0xd6, 0x46, 0xe6, 0x98, 0x9f, 0x40, 0x4b, 0xc4, 0x44, 0xb3, 0x17, 0xca, 0x5a, 0x50, + 0xe2, 0xa9, 0x10, 0xfe, 0x5f, 0x05, 0x5a, 0x09, 0x03, 0x3d, 0x83, 0xb6, 0xbe, 0x6a, 0xfc, 0x20, + 0x9c, 0xb0, 0x42, 0x48, 0x77, 0x53, 0x9e, 0x6b, 0x0b, 0x4a, 0x3d, 0x3f, 0xf4, 0xe8, 0x15, 0xd5, + 0x7a, 0xd5, 0x9c, 0xde, 0x41, 0xca, 0x73, 0x6d, 0x41, 0xb4, 0x05, 0xbd, 0x71, 0x44, 0x89, 0xa0, + 0xca, 0x85, 0xe3, 0x77, 0x5f, 0x99, 0xc6, 0x27, 0x47, 0xb5, 0xdf, 0xec, 0x7a, 0xf6, 0xcd, 0xfe, + 0x0c, 0xda, 0x96, 0x57, 0xbf, 0x22, 0x19, 0x3f, 0x93, 0xd3, 0x44, 0xea, 0xc9, 0x2f, 0x57, 0x7c, + 0x0e, 0x37, 0x2c, 0xe2, 0x1b, 0x4a, 0xbc, 0x5f, 0x3a, 0x73, 0xca, 0xce, 0xc9, 0xb6, 0xc7, 0x2e, + 0xb9, 0x2c, 0x14, 0xbe, 0xa0, 0x53, 0x9d, 0x94, 0x2d, 0x57, 0x2f, 0x30, 0x83, 0xb6, 0x25, 0x88, + 0x46, 0xd0, 0x34, 0x68, 0x9b, 0xdc, 0x1d, 0x94, 0xf9, 0x27, 0x5d, 0x71, 0x63, 0x41, 0xf4, 0x38, + 0x53, 0x2b, 0x4b, 0x15, 0xa4, 0x03, 0xa6, 0x58, 0x3e, 0x90, 0x4f, 0xa9, 0x88, 0x88, 0x7c, 0x5c, + 0x17, 0xd7, 0xaf, 0x73, 0x18, 0x1a, 0x29, 0x15, 0x99, 0xbf, 0x46, 0x6c, 0xba, 0x64, 0x57, 0xf7, + 0x91, 0x5d, 0xcb, 0xd6, 0xad, 0x3a, 0x94, 0xfa, 0xa0, 0xab, 0xd9, 0x3e, 0xdc, 0x29, 0xdd, 0x32, + 0x7d, 0x39, 0x54, 0x2e, 0xf3, 0xc2, 0xcb, 0xa1, 0xef, 0x8b, 0xe1, 0xe2, 0x87, 0xd0, 0xd5, 0xbd, + 0x83, 0x3c, 0xf3, 0xe2, 0x03, 0x0a, 0xb8, 0xbb, 0xcf, 0x85, 0x3f, 0x25, 0x42, 0xa6, 0x5d, 0xaa, + 0xb1, 0xcc, 0x11, 0xb7, 0xed, 0x23, 0xde, 0x4c, 0x1b, 0x6b, 0xdb, 0x0d, 0x7d, 0xc6, 0xbf, 0xc3, + 0xbd, 0x05, 0xbb, 0x9a, 0x53, 0xae, 0x81, 0x33, 0x66, 0xf3, 0x50, 0x98, 0x2e, 0x4c, 0x2f, 0xd0, + 0x06, 0x00, 0x8d, 0xa2, 0xb7, 0x99, 0x5e, 0xd6, 0xa2, 0xe0, 0x3f, 0xc0, 0x6a, 0x66, 0xc6, 0x4c, + 0xff, 0x6c, 0xb0, 0xd4, 0x2a, 0x79, 0xb5, 0x47, 0xff, 0xac, 0x40, 0xaf, 0x30, 0x8d, 0xf7, 0xb2, + 0x8d, 0x71, 0xff, 0x37, 0xa8, 0x05, 0x8e, 0x7a, 0x19, 0xfb, 0x15, 0xd4, 0x96, 0xad, 0xab, 0x7a, + 0x19, 0xfa, 0x55, 0xd4, 0x87, 0x8e, 0x5d, 0x9a, 0xfa, 0x35, 0x74, 0x0b, 0x56, 0x4b, 0x42, 0xd8, + 0xaf, 0xa3, 0xdb, 0xb0, 0x5e, 0x7a, 0xee, 0xbe, 0x33, 0xfa, 0xf7, 0x0a, 0x34, 0xf6, 0xd4, 0x1f, + 0x64, 0xe8, 0x09, 0x38, 0xea, 0xdf, 0x12, 0x94, 0xc6, 0x56, 0xfd, 0x3d, 0x36, 0x4c, 0x31, 0xcd, + 0xfe, 0x9b, 0xf2, 0x14, 0xea, 0x72, 0xa6, 0x47, 0x76, 0xfd, 0x49, 0x06, 0xbf, 0xe1, 0x7a, 0x8e, + 0x6a, 0x94, 0x76, 0xc0, 0x51, 0xc3, 0x3c, 0x4a, 0xf9, 0xf6, 0x70, 0x3f, 0xcc, 0x6d, 0x8e, 0xde, + 0x40, 0xdb, 0x02, 0x17, 0xdd, 0x49, 0xd8, 0xc5, 0xb1, 0x7e, 0x78, 0xb7, 0x9c, 0x69, 0x76, 0x7e, + 0xa6, 0xfe, 0xca, 0xcb, 0xec, 0x6c, 0x4f, 0xed, 0xd6, 0x31, 0xb3, 0x83, 0xf1, 0x33, 0x70, 0xd4, + 0x90, 0x86, 0x0a, 0x43, 0x5b, 0x5e, 0x2f, 0x3b, 0xf9, 0xbd, 0xcb, 0x07, 0x13, 0x6d, 0x24, 0x92, + 0xa5, 0xe3, 0xda, 0xf0, 0xc3, 0x85, 0x7c, 0x63, 0xf2, 0x31, 0xd4, 0xe5, 0xd8, 0x63, 0x21, 0x6e, + 0x4d, 0x41, 0x05, 0xe8, 0x9e, 0x42, 0x5d, 0x36, 0xbd, 0x96, 0xb4, 0x35, 0xd7, 0x0c, 0xd7, 0xf3, + 0x9d, 0x71, 0xdc, 0x41, 0x57, 0x4f, 0xae, 0x90, 0xf5, 0x98, 0xc5, 0xbd, 0xfb, 0x70, 0x35, 0x43, + 0x4b, 0xc1, 0x51, 0xd9, 0x69, 0x81, 0x63, 0xf7, 0xbe, 0x16, 0x38, 0xd9, 0x4e, 0xf4, 0x8f, 0x49, + 0x2a, 0xa3, 0x5b, 0xf9, 0xee, 0x28, 0xd6, 0x1d, 0x14, 0x19, 0x46, 0xfb, 0x4b, 0x95, 0xfb, 0x49, + 0xf7, 0x81, 0xee, 0x5a, 0xc0, 0x15, 0xfa, 0x9e, 0xe1, 0xbd, 0x05, 0xdc, 0x8c, 0xb1, 0xf4, 0x6d, + 0xce, 0x18, 0xcb, 0xf7, 0x18, 0x59, 0x63, 0xc5, 0xc6, 0xe0, 0xbb, 0xd2, 0x3b, 0x88, 0xee, 0xe7, + 0x2b, 0x6f, 0x49, 0x5d, 0x1f, 0x3e, 0xf8, 0x69, 0x21, 0xb3, 0xc3, 0x64, 0xc1, 0x65, 0x46, 0x0f, + 0x53, 0xf5, 0x9f, 0x28, 0xad, 0xc3, 0xad, 0x9f, 0x13, 0xd3, 0xfb, 0xfc, 0xa5, 0xf3, 0x35, 0xec, + 0x3c, 0x79, 0x61, 0x64, 0x4f, 0x1b, 0xea, 0xe3, 0xe9, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0d, + 0xf9, 0x42, 0x9a, 0x4e, 0x17, 0x00, 0x00, } diff --git a/sqle/driver/v2/proto/driver_v2.proto b/sqle/driver/v2/proto/driver_v2.proto index 8b7c6151b8..2919849968 100644 --- a/sqle/driver/v2/proto/driver_v2.proto +++ b/sqle/driver/v2/proto/driver_v2.proto @@ -12,7 +12,7 @@ service Driver { // We put all communication on gRPC for unification in the end. rpc Init(InitRequest) returns (InitResponse); rpc Close(CloseRequest) returns (Empty); - rpc KillProcess(KillProcessRequest) returns (Empty); + rpc KillProcess(KillProcessRequest) returns (KillProcessResponse); // db audit rpc Parse(ParseRequest) returns (ParseResponse); @@ -333,3 +333,7 @@ message EstimateSQLAffectRowsResponse { int64 count = 1; string errMessage = 2; // 记录执行失败原因 } + +message KillProcessResponse { + string errMessage = 1; // 记录执行失败原因 +} diff --git a/sqle/driver/v2/util.go b/sqle/driver/v2/util.go index b8bb9135a1..ff9b6c8462 100644 --- a/sqle/driver/v2/util.go +++ b/sqle/driver/v2/util.go @@ -46,6 +46,7 @@ const ( OptionalModuleGetTableMeta OptionalModuleExtractTableFromSQL OptionalModuleEstimateSQLAffectRows + OptionalModuleKillProcess ) func (m OptionalModule) String() string { @@ -62,6 +63,8 @@ func (m OptionalModule) String() string { return "ExtractTableFromSQL" case OptionalModuleEstimateSQLAffectRows: return "EstimateSQLAffectRows" + case OptionalModuleKillProcess: + return "KillProcess" default: return "Unknown" } diff --git a/sqle/pkg/driver/impl.go b/sqle/pkg/driver/impl.go index 357aa9fffa..0d0d11b3ca 100644 --- a/sqle/pkg/driver/impl.go +++ b/sqle/pkg/driver/impl.go @@ -11,8 +11,7 @@ import ( "github.com/actiontech/sqle/sqle/pkg/params" "github.com/actiontech/sqle/sqle/utils" hclog "github.com/hashicorp/go-hclog" - sqleError "github.com/actiontech/sqle/sqle/errors" - + "github.com/percona/go-mysql/query" "github.com/pkg/errors" "vitess.io/vitess/go/vt/sqlparser" @@ -278,6 +277,6 @@ func (p *DriverImpl) EstimateSQLAffectRows(ctx context.Context, sql string) (*dr return &driverV2.EstimatedAffectRows{}, nil } -func (p *DriverImpl) KillProcess(ctx context.Context) error { - return sqleError.NewNotImplementedError("KillProcess not support yet") +func (p *DriverImpl) KillProcess(ctx context.Context) (*driverV2.KillProcessInfo, error) { + return &driverV2.KillProcessInfo{}, nil } From 863662be48c569d787c6a484f5b26e152642fd32 Mon Sep 17 00:00:00 2001 From: bianyucheng Date: Wed, 2 Aug 2023 14:51:37 +0800 Subject: [PATCH 3/4] add killprocess func check --- sqle/driver/plugin_adapter_v2.go | 10 +- sqle/driver/v2/proto/driver_v2.pb.go | 229 ++++++++++++++------------- sqle/driver/v2/proto/driver_v2.proto | 1 + sqle/server/sqled.go | 4 + 4 files changed, 129 insertions(+), 115 deletions(-) diff --git a/sqle/driver/plugin_adapter_v2.go b/sqle/driver/plugin_adapter_v2.go index aed45c32ee..8e44541902 100644 --- a/sqle/driver/plugin_adapter_v2.go +++ b/sqle/driver/plugin_adapter_v2.go @@ -175,11 +175,17 @@ func (s *PluginImplV2) Close(ctx context.Context) { func (s *PluginImplV2) KillProcess(ctx context.Context) error { api := "Kill Process" s.preLog(api) - _, err := s.client.KillProcess(ctx, &protoV2.KillProcessRequest{ + rs, err := s.client.KillProcess(ctx, &protoV2.KillProcessRequest{ Session: s.Session, }) s.afterLog(api, err) - return err + if err != nil { + return err + } + if rs.ErrMessage != "" { + return fmt.Errorf(rs.ErrMessage) + } + return nil } // audit diff --git a/sqle/driver/v2/proto/driver_v2.pb.go b/sqle/driver/v2/proto/driver_v2.pb.go index c25b6e7432..8849b4d18b 100644 --- a/sqle/driver/v2/proto/driver_v2.pb.go +++ b/sqle/driver/v2/proto/driver_v2.pb.go @@ -99,6 +99,7 @@ const ( OptionalModule_GetTableMeta OptionalModule = 3 OptionalModule_ExtractTableFromSQL OptionalModule = 4 OptionalModule_EstimateSQLAffectRows OptionalModule = 5 + OptionalModule_KillProcess OptionalModule = 6 ) var OptionalModule_name = map[int32]string{ @@ -108,6 +109,7 @@ var OptionalModule_name = map[int32]string{ 3: "GetTableMeta", 4: "ExtractTableFromSQL", 5: "EstimateSQLAffectRows", + 6: "KillProcess", } var OptionalModule_value = map[string]int32{ "GenRollbackSQL": 0, @@ -116,6 +118,7 @@ var OptionalModule_value = map[string]int32{ "GetTableMeta": 3, "ExtractTableFromSQL": 4, "EstimateSQLAffectRows": 5, + "KillProcess": 6, } func (x OptionalModule) String() string { @@ -2092,120 +2095,120 @@ var _Driver_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("driver_v2.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1831 bytes of a gzipped FileDescriptorProto + // 1837 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x59, 0x73, 0x1b, 0xc7, - 0x11, 0x0e, 0x8e, 0x05, 0x88, 0xc6, 0x21, 0x78, 0x48, 0x4a, 0x10, 0x24, 0xd1, 0xcc, 0x48, 0xa2, + 0x11, 0x0e, 0x8e, 0x05, 0x88, 0xc6, 0x41, 0x78, 0x48, 0x4a, 0x10, 0x24, 0xd1, 0xcc, 0x48, 0xa2, 0x59, 0xb2, 0x42, 0xd9, 0x50, 0x22, 0x97, 0xac, 0x24, 0x25, 0x85, 0x64, 0x24, 0xda, 0x16, 0x43, - 0x2d, 0x19, 0xa5, 0xca, 0x55, 0x2e, 0x7b, 0x88, 0x1d, 0xd0, 0x5b, 0x5e, 0xec, 0x80, 0x3b, 0x03, - 0x1e, 0xaf, 0x79, 0xc9, 0x4f, 0xc8, 0x5f, 0xc8, 0x63, 0x5e, 0xfc, 0x98, 0xff, 0x96, 0x9a, 0x63, - 0x77, 0x67, 0x0f, 0xf8, 0xc0, 0x13, 0x76, 0xfa, 0x9a, 0x9e, 0xaf, 0x7b, 0x7a, 0xba, 0x01, 0x37, - 0xbc, 0xc8, 0xbf, 0xa0, 0xd1, 0xb7, 0x17, 0xa3, 0x9d, 0x59, 0xc4, 0x04, 0x43, 0x4d, 0xf5, 0xf3, - 0x7e, 0x84, 0x9b, 0xe0, 0xec, 0x4f, 0x67, 0xe2, 0x1a, 0xdf, 0x86, 0xe6, 0x31, 0xe5, 0xdc, 0x67, - 0x21, 0xea, 0x41, 0xd5, 0xf7, 0x06, 0x95, 0xcd, 0xca, 0x76, 0xcb, 0xad, 0xfa, 0x1e, 0xfe, 0x07, - 0x38, 0x47, 0x24, 0x22, 0x53, 0xd4, 0x87, 0xda, 0x0f, 0xf4, 0xda, 0x70, 0xe4, 0x27, 0x5a, 0x03, - 0xe7, 0x82, 0x04, 0x73, 0x3a, 0xa8, 0x2a, 0x9a, 0x5e, 0x20, 0x04, 0x75, 0x8f, 0xf2, 0xf1, 0xa0, - 0xa6, 0x88, 0xea, 0x5b, 0xd2, 0xc4, 0xf5, 0x8c, 0x0e, 0xea, 0x9a, 0x26, 0xbf, 0xf1, 0x8f, 0x15, - 0xa8, 0xed, 0x1d, 0x1f, 0x4a, 0xde, 0xf7, 0x8c, 0x0b, 0x63, 0x58, 0x7d, 0x4b, 0xda, 0x8c, 0x45, - 0xc2, 0x18, 0x56, 0xdf, 0x92, 0x36, 0xe7, 0x34, 0x8a, 0xed, 0xca, 0x6f, 0x34, 0x84, 0x95, 0x19, - 0xe1, 0xfc, 0x92, 0x45, 0x9e, 0xb1, 0x9d, 0xac, 0x25, 0xcf, 0x23, 0x82, 0x9c, 0x12, 0x4e, 0x07, - 0x8e, 0xe6, 0xc5, 0x6b, 0xf4, 0x39, 0xf4, 0x89, 0xe7, 0xf9, 0xc2, 0x67, 0x21, 0x09, 0xd4, 0xf1, - 0xf8, 0xa0, 0xb1, 0x59, 0xdb, 0x6e, 0x8f, 0x7a, 0x3b, 0x06, 0x9c, 0x1d, 0x45, 0x76, 0x0b, 0x72, - 0xf8, 0x3f, 0x15, 0xa8, 0xbb, 0xf3, 0x40, 0x1d, 0x34, 0x24, 0x53, 0x1a, 0x3b, 0x2e, 0xbf, 0x93, - 0xc3, 0x57, 0xad, 0xc3, 0xaf, 0x81, 0x13, 0xd0, 0x0b, 0x1a, 0x18, 0xcf, 0xf5, 0x42, 0xba, 0x37, - 0x26, 0x82, 0x9e, 0xb1, 0xe8, 0x3a, 0x76, 0x3d, 0x5e, 0xa3, 0x2d, 0x68, 0xcc, 0xb4, 0x53, 0x4e, - 0xa9, 0x53, 0x86, 0x8b, 0x36, 0x00, 0x48, 0x18, 0x32, 0x41, 0xa4, 0x83, 0x83, 0x86, 0xb2, 0x62, - 0x51, 0xf0, 0x8f, 0x55, 0xe8, 0xbe, 0xa5, 0x82, 0x70, 0x97, 0xf2, 0x19, 0x0b, 0x39, 0x95, 0x1a, - 0xb3, 0x60, 0x7e, 0xe6, 0x87, 0x87, 0xa9, 0xe7, 0x16, 0x05, 0x7d, 0x02, 0xab, 0x31, 0x48, 0x7b, - 0x74, 0x42, 0xe6, 0x81, 0x38, 0x8a, 0xe3, 0x50, 0x73, 0xcb, 0x58, 0xe8, 0x0b, 0x18, 0xc4, 0xe4, - 0x57, 0x79, 0x48, 0x6b, 0xa5, 0xde, 0x2f, 0x94, 0x47, 0xf7, 0xc1, 0x89, 0xe6, 0x01, 0xe5, 0x83, - 0xba, 0x52, 0xec, 0x26, 0x8a, 0x12, 0x6f, 0x57, 0xf3, 0xd0, 0x5b, 0x58, 0xa7, 0x21, 0x39, 0x0d, - 0xa8, 0xf7, 0xb7, 0x99, 0xd6, 0x7e, 0xcb, 0xbc, 0x79, 0x40, 0x15, 0x56, 0xbd, 0xd1, 0xad, 0x44, - 0x29, 0xcb, 0x76, 0xcb, 0xb5, 0x64, 0xc4, 0x02, 0x76, 0xc6, 0x14, 0x7a, 0x1d, 0x57, 0x7d, 0x63, - 0x17, 0xda, 0x07, 0xa1, 0x2f, 0x5c, 0x7a, 0x3e, 0xa7, 0x5c, 0xa0, 0x0d, 0xa8, 0x79, 0x3c, 0x54, - 0x68, 0xb5, 0x47, 0x9d, 0xc4, 0xfe, 0xde, 0xf1, 0xa1, 0x2b, 0x19, 0xa9, 0xdb, 0xd5, 0xc5, 0x6e, - 0xe3, 0xcf, 0xa1, 0xa3, 0x6d, 0x9a, 0x48, 0x3c, 0x82, 0x26, 0xd7, 0x57, 0xce, 0x18, 0xee, 0x27, - 0x6a, 0xe6, 0x2a, 0xba, 0xb1, 0x80, 0xd4, 0xdd, 0x0d, 0x18, 0xa7, 0xb1, 0x43, 0xbf, 0x46, 0xf7, - 0x25, 0xa0, 0x2f, 0xfd, 0x20, 0x38, 0x8a, 0xd8, 0x98, 0x72, 0xbe, 0x8c, 0x85, 0xdf, 0x42, 0xeb, - 0x88, 0x44, 0x9c, 0x7a, 0xc7, 0xef, 0xbe, 0x92, 0xc9, 0x7c, 0x3e, 0xa7, 0x51, 0x5c, 0x07, 0xf4, - 0x02, 0x7f, 0x07, 0x1d, 0x25, 0xb2, 0x84, 0x79, 0xf4, 0x00, 0x6a, 0xfc, 0x3c, 0x50, 0x29, 0xd6, - 0x1e, 0x21, 0x3b, 0x57, 0xf4, 0x96, 0xae, 0x64, 0xe3, 0x23, 0xa8, 0x1f, 0x32, 0x4f, 0x85, 0x4b, - 0xd0, 0xab, 0xa4, 0x5a, 0xc8, 0xef, 0xa4, 0xba, 0x54, 0xd3, 0xea, 0x82, 0x36, 0xa1, 0x3d, 0xf1, - 0xc3, 0x33, 0x1a, 0xcd, 0x22, 0x3f, 0x14, 0xe6, 0xea, 0xd9, 0x24, 0xfc, 0x7b, 0xe8, 0x1a, 0x9f, - 0x4d, 0x44, 0xee, 0x83, 0x13, 0x32, 0x8f, 0xf2, 0x41, 0x25, 0x17, 0x46, 0xb9, 0xb1, 0xab, 0x79, - 0x78, 0x13, 0x56, 0x5e, 0xcd, 0x3d, 0x5f, 0x2c, 0xc6, 0x82, 0x40, 0x47, 0x49, 0x2c, 0x83, 0xc5, - 0x43, 0xa8, 0xf3, 0xf3, 0x20, 0x4e, 0xa4, 0x0f, 0x12, 0xc1, 0x78, 0x4b, 0x57, 0xb1, 0xf1, 0xd7, + 0x2d, 0x15, 0xa5, 0xca, 0x55, 0x2e, 0x7b, 0x88, 0x1d, 0xd0, 0x5b, 0x5e, 0xec, 0x80, 0x3b, 0x03, + 0x1e, 0xbf, 0x20, 0x3f, 0x20, 0x0f, 0xf9, 0x0b, 0x79, 0xcc, 0x8b, 0x1f, 0xf3, 0xdf, 0x52, 0x73, + 0xec, 0xee, 0xec, 0x01, 0x1f, 0x78, 0xc2, 0x4e, 0x5f, 0xf3, 0x4d, 0x77, 0x4f, 0x4f, 0x37, 0x60, + 0xd5, 0x8b, 0xfc, 0x0b, 0x1a, 0x7d, 0x7b, 0x31, 0xda, 0x9d, 0x45, 0x4c, 0x30, 0xd4, 0x54, 0x3f, + 0xef, 0x47, 0xb8, 0x09, 0xce, 0xc1, 0x74, 0x26, 0xae, 0xf1, 0x2d, 0x68, 0x9e, 0x50, 0xce, 0x7d, + 0x16, 0xa2, 0x1e, 0x54, 0x7d, 0x6f, 0x50, 0xd9, 0xaa, 0xec, 0xb4, 0xdc, 0xaa, 0xef, 0xe1, 0x7f, + 0x80, 0x73, 0x4c, 0x22, 0x32, 0x45, 0x7d, 0xa8, 0xfd, 0x40, 0xaf, 0x0d, 0x47, 0x7e, 0xa2, 0x75, + 0x70, 0x2e, 0x48, 0x30, 0xa7, 0x83, 0xaa, 0xa2, 0xe9, 0x05, 0x42, 0x50, 0xf7, 0x28, 0x1f, 0x0f, + 0x6a, 0x8a, 0xa8, 0xbe, 0x25, 0x4d, 0x5c, 0xcf, 0xe8, 0xa0, 0xae, 0x69, 0xf2, 0x1b, 0xff, 0x58, + 0x81, 0xda, 0xfe, 0xc9, 0x91, 0xe4, 0x7d, 0xcf, 0xb8, 0x30, 0x86, 0xd5, 0xb7, 0xa4, 0xcd, 0x58, + 0x24, 0x8c, 0x61, 0xf5, 0x2d, 0x69, 0x73, 0x4e, 0xa3, 0xd8, 0xae, 0xfc, 0x46, 0x43, 0x58, 0x99, + 0x11, 0xce, 0x2f, 0x59, 0xe4, 0x19, 0xdb, 0xc9, 0x5a, 0xf2, 0x3c, 0x22, 0xc8, 0x29, 0xe1, 0x74, + 0xe0, 0x68, 0x5e, 0xbc, 0x46, 0x9f, 0x43, 0x9f, 0x78, 0x9e, 0x2f, 0x7c, 0x16, 0x92, 0x40, 0x1d, + 0x8f, 0x0f, 0x1a, 0x5b, 0xb5, 0x9d, 0xf6, 0xa8, 0xb7, 0x6b, 0x9c, 0xb3, 0xab, 0xc8, 0x6e, 0x41, + 0x0e, 0xff, 0xa7, 0x02, 0x75, 0x77, 0x1e, 0xa8, 0x83, 0x86, 0x64, 0x4a, 0x63, 0xe0, 0xf2, 0x3b, + 0x39, 0x7c, 0xd5, 0x3a, 0xfc, 0x3a, 0x38, 0x01, 0xbd, 0xa0, 0x81, 0x41, 0xae, 0x17, 0x12, 0xde, + 0x98, 0x08, 0x7a, 0xc6, 0xa2, 0xeb, 0x18, 0x7a, 0xbc, 0x46, 0xdb, 0xd0, 0x98, 0x69, 0x50, 0x4e, + 0x29, 0x28, 0xc3, 0x45, 0x9b, 0x00, 0x24, 0x0c, 0x99, 0x20, 0x12, 0xe0, 0xa0, 0xa1, 0xac, 0x58, + 0x14, 0xfc, 0x63, 0x15, 0xba, 0x6f, 0xa8, 0x20, 0xdc, 0xa5, 0x7c, 0xc6, 0x42, 0x4e, 0xa5, 0xc6, + 0x2c, 0x98, 0x9f, 0xf9, 0xe1, 0x51, 0x8a, 0xdc, 0xa2, 0xa0, 0x4f, 0x60, 0x2d, 0x76, 0xd2, 0x3e, + 0x9d, 0x90, 0x79, 0x20, 0x8e, 0xe3, 0x38, 0xd4, 0xdc, 0x32, 0x16, 0xfa, 0x02, 0x06, 0x31, 0xf9, + 0x65, 0xde, 0xa5, 0xb5, 0x52, 0xf4, 0x0b, 0xe5, 0xd1, 0x3d, 0x70, 0xa2, 0x79, 0x40, 0xf9, 0xa0, + 0xae, 0x14, 0xbb, 0x89, 0xa2, 0xf4, 0xb7, 0xab, 0x79, 0xe8, 0x0d, 0x6c, 0xd0, 0x90, 0x9c, 0x06, + 0xd4, 0xfb, 0xdb, 0x4c, 0x6b, 0xbf, 0x61, 0xde, 0x3c, 0xa0, 0xca, 0x57, 0xbd, 0xd1, 0xcd, 0x44, + 0x29, 0xcb, 0x76, 0xcb, 0xb5, 0x64, 0xc4, 0x02, 0x76, 0xc6, 0x94, 0xf7, 0x3a, 0xae, 0xfa, 0xc6, + 0x2e, 0xb4, 0x0f, 0x43, 0x5f, 0xb8, 0xf4, 0x7c, 0x4e, 0xb9, 0x40, 0x9b, 0x50, 0xf3, 0x78, 0xa8, + 0xbc, 0xd5, 0x1e, 0x75, 0x12, 0xfb, 0xfb, 0x27, 0x47, 0xae, 0x64, 0xa4, 0xb0, 0xab, 0x8b, 0x61, + 0xe3, 0xcf, 0xa1, 0xa3, 0x6d, 0x9a, 0x48, 0x3c, 0x84, 0x26, 0xd7, 0x57, 0xce, 0x18, 0xee, 0x27, + 0x6a, 0xe6, 0x2a, 0xba, 0xb1, 0x80, 0xd4, 0xdd, 0x0b, 0x18, 0xa7, 0x31, 0xa0, 0x5f, 0xa3, 0xfb, + 0x02, 0xd0, 0x97, 0x7e, 0x10, 0x1c, 0x47, 0x6c, 0x4c, 0x39, 0x5f, 0xc6, 0xc2, 0x6f, 0xa1, 0x75, + 0x4c, 0x22, 0x4e, 0xbd, 0x93, 0xb7, 0x5f, 0xc9, 0x64, 0x3e, 0x9f, 0xd3, 0x28, 0xae, 0x03, 0x7a, + 0x81, 0xbf, 0x83, 0x8e, 0x12, 0x59, 0xc2, 0x3c, 0xba, 0x0f, 0x35, 0x7e, 0x1e, 0xa8, 0x14, 0x6b, + 0x8f, 0x90, 0x9d, 0x2b, 0x7a, 0x4b, 0x57, 0xb2, 0xf1, 0x31, 0xd4, 0x8f, 0x98, 0xa7, 0xc2, 0x25, + 0xe8, 0x55, 0x52, 0x2d, 0xe4, 0x77, 0x52, 0x5d, 0xaa, 0x69, 0x75, 0x41, 0x5b, 0xd0, 0x9e, 0xf8, + 0xe1, 0x19, 0x8d, 0x66, 0x91, 0x1f, 0x0a, 0x73, 0xf5, 0x6c, 0x12, 0xfe, 0x3d, 0x74, 0x0d, 0x66, + 0x13, 0x91, 0x7b, 0xe0, 0x84, 0xcc, 0xa3, 0x7c, 0x50, 0xc9, 0x85, 0x51, 0x6e, 0xec, 0x6a, 0x1e, + 0xde, 0x82, 0x95, 0x97, 0x73, 0xcf, 0x17, 0x8b, 0x7d, 0x41, 0xa0, 0xa3, 0x24, 0x96, 0xf1, 0xc5, + 0x03, 0xa8, 0xf3, 0xf3, 0x20, 0x4e, 0xa4, 0x0f, 0x12, 0xc1, 0x78, 0x4b, 0x57, 0xb1, 0xf1, 0xd7, 0xd0, 0x36, 0x5b, 0xf0, 0x79, 0x20, 0xd0, 0x00, 0x9a, 0x53, 0xca, 0x39, 0x39, 0x8b, 0x6f, 0x74, - 0xbc, 0x4c, 0x4b, 0x4f, 0xd5, 0x2e, 0x3d, 0x77, 0xa0, 0x25, 0x73, 0xf2, 0x5b, 0x55, 0xbd, 0x34, - 0x32, 0x2b, 0x92, 0x20, 0x2b, 0x00, 0xfe, 0x73, 0xe2, 0xbe, 0xb4, 0xcd, 0xd1, 0x0e, 0x34, 0x23, - 0xfd, 0x69, 0x70, 0x59, 0xcb, 0x7a, 0xa5, 0xe5, 0xdc, 0x58, 0x08, 0x7f, 0x01, 0xdd, 0x98, 0xae, - 0x61, 0x7d, 0x0e, 0x1d, 0x62, 0x19, 0x34, 0x56, 0xd6, 0xcb, 0xac, 0x70, 0x37, 0x23, 0x8a, 0x3f, - 0x82, 0x1b, 0x87, 0x94, 0x7a, 0x2e, 0x0b, 0x82, 0x53, 0x32, 0xfe, 0x61, 0x31, 0xe6, 0x0c, 0xd6, - 0x5f, 0xd3, 0xd0, 0x92, 0x5b, 0x06, 0xfc, 0x47, 0x76, 0x22, 0x0e, 0xd2, 0xe8, 0x67, 0x3d, 0xd0, - 0xe9, 0xf8, 0x27, 0x68, 0xff, 0xac, 0x57, 0x76, 0x5c, 0xaa, 0x99, 0xb8, 0xe0, 0x97, 0x70, 0x33, - 0xef, 0xaf, 0x41, 0x6b, 0x4b, 0x3b, 0xa1, 0x9d, 0x4d, 0xa1, 0x2e, 0x38, 0xf0, 0x1c, 0xda, 0x47, - 0x7e, 0x78, 0xb6, 0xcc, 0x7d, 0xfe, 0x10, 0x9a, 0xfb, 0x57, 0x74, 0xbc, 0x18, 0xcd, 0x6f, 0xa0, - 0x2d, 0x05, 0x96, 0xc1, 0x10, 0xdb, 0x18, 0xa6, 0x72, 0x66, 0x3f, 0xed, 0xfa, 0x7f, 0x2b, 0x00, - 0xda, 0xbe, 0xca, 0x5e, 0x0c, 0x9d, 0x80, 0x70, 0x71, 0x10, 0x72, 0x1a, 0x89, 0x03, 0xdd, 0x7a, - 0xd4, 0xdc, 0x0c, 0x0d, 0x3d, 0x86, 0x0f, 0xec, 0xf5, 0x7e, 0x14, 0xb1, 0xc8, 0x60, 0x5a, 0x64, - 0x48, 0x8b, 0x11, 0xbb, 0xe4, 0xaf, 0x26, 0x13, 0x3a, 0x16, 0xd4, 0x53, 0x29, 0x5e, 0x73, 0x33, - 0x34, 0x69, 0xd1, 0x5e, 0x6b, 0x8b, 0xfa, 0x1d, 0x2e, 0x32, 0xf0, 0x0b, 0xe8, 0x18, 0x8f, 0x75, - 0x94, 0x3e, 0x86, 0x86, 0xce, 0x77, 0x83, 0xc8, 0x6a, 0xe6, 0xa4, 0xe6, 0x4a, 0x18, 0x11, 0xfc, - 0x0d, 0xb4, 0x4e, 0xae, 0x96, 0xab, 0x8c, 0x76, 0x35, 0x28, 0xa2, 0xa9, 0x8b, 0xc1, 0x0b, 0x00, - 0x69, 0xde, 0x78, 0xf6, 0xbb, 0xfc, 0x75, 0x2d, 0x75, 0x2d, 0xb9, 0xad, 0x9b, 0xb0, 0xf2, 0x4e, - 0xc6, 0x7c, 0x71, 0x32, 0x7c, 0x0a, 0x2d, 0x25, 0xb1, 0xcb, 0xc2, 0x09, 0x7a, 0x00, 0x5d, 0xe1, - 0x4f, 0x29, 0x9b, 0x8b, 0x63, 0x3a, 0x66, 0xa1, 0x0e, 0x56, 0xd7, 0xcd, 0x12, 0xf1, 0xbf, 0x2a, - 0xd0, 0x51, 0x3a, 0xcb, 0x1c, 0xfa, 0xbe, 0x9d, 0x41, 0x69, 0x05, 0x8c, 0xbd, 0x54, 0x29, 0x84, - 0xb6, 0xa0, 0x3e, 0x66, 0xe1, 0x44, 0x45, 0xd6, 0x7e, 0x34, 0x12, 0x4f, 0x5d, 0xc5, 0xc7, 0x1e, - 0x74, 0x8d, 0x23, 0xc9, 0xf5, 0x6a, 0x8c, 0x59, 0x30, 0x9f, 0x86, 0x06, 0x9d, 0x42, 0x67, 0xa5, - 0xb9, 0xe8, 0x63, 0xa8, 0xcb, 0x2c, 0x30, 0xd0, 0xdf, 0xca, 0x6e, 0x60, 0x40, 0x64, 0x97, 0xae, - 0x12, 0xc2, 0xbb, 0xd0, 0xcb, 0xd2, 0xd1, 0xa7, 0xd0, 0x50, 0xcd, 0x70, 0x1c, 0x84, 0xdb, 0x65, - 0x06, 0xde, 0x4b, 0x09, 0xd7, 0x08, 0xe2, 0x6d, 0xe8, 0xe7, 0x79, 0x69, 0x83, 0x5d, 0xb1, 0x1a, - 0x6c, 0x8c, 0xe5, 0xf5, 0x99, 0x05, 0xc4, 0x0f, 0x17, 0x47, 0x6d, 0x0c, 0x3d, 0x23, 0xb3, 0xdc, - 0x33, 0x64, 0xc5, 0xc0, 0x4e, 0xa0, 0x78, 0x57, 0x7d, 0x91, 0xdf, 0xc3, 0x8d, 0x64, 0x13, 0x83, - 0xef, 0x2e, 0x74, 0xc7, 0x01, 0xe1, 0xdc, 0x37, 0x99, 0x66, 0xf6, 0xba, 0x97, 0xb7, 0xb1, 0x6b, - 0x0b, 0xb9, 0x59, 0x1d, 0xfc, 0x12, 0xd6, 0xca, 0xc4, 0xd0, 0x36, 0xd4, 0x65, 0xeb, 0x58, 0x28, - 0x8e, 0x27, 0xe4, 0x74, 0x1e, 0x90, 0x68, 0x8f, 0x08, 0xe2, 0x2a, 0x09, 0xfc, 0x0a, 0x56, 0x5f, - 0x53, 0xb1, 0x67, 0xfa, 0xcc, 0xa5, 0xba, 0x9e, 0x0d, 0x58, 0x89, 0xf5, 0xcb, 0x3a, 0x7d, 0xfc, - 0x1a, 0xd6, 0xb2, 0x5b, 0x18, 0x04, 0x9e, 0x40, 0x2b, 0xee, 0x6f, 0xe3, 0xe8, 0xa7, 0x59, 0x1c, - 0x8b, 0xbb, 0xa9, 0x0c, 0x7e, 0x0a, 0xce, 0x89, 0x6c, 0x4c, 0x4b, 0xe7, 0x89, 0x9b, 0xd0, 0xe0, - 0xe3, 0xef, 0xe9, 0x94, 0x98, 0x6a, 0x67, 0x56, 0xf8, 0x4c, 0x1d, 0x50, 0xe9, 0xc9, 0x06, 0x7f, - 0xb9, 0xea, 0xe2, 0x08, 0xa9, 0x6f, 0xc2, 0xdc, 0xb3, 0xe1, 0x94, 0x6d, 0xab, 0x62, 0xe2, 0x37, - 0xea, 0x98, 0xd6, 0x46, 0xe6, 0x98, 0x9f, 0x40, 0x4b, 0xc4, 0x44, 0xb3, 0x17, 0xca, 0x5a, 0x50, - 0xe2, 0xa9, 0x10, 0xfe, 0x5f, 0x05, 0x5a, 0x09, 0x03, 0x3d, 0x83, 0xb6, 0xbe, 0x6a, 0xfc, 0x20, - 0x9c, 0xb0, 0x42, 0x48, 0x77, 0x53, 0x9e, 0x6b, 0x0b, 0x4a, 0x3d, 0x3f, 0xf4, 0xe8, 0x15, 0xd5, - 0x7a, 0xd5, 0x9c, 0xde, 0x41, 0xca, 0x73, 0x6d, 0x41, 0xb4, 0x05, 0xbd, 0x71, 0x44, 0x89, 0xa0, - 0xca, 0x85, 0xe3, 0x77, 0x5f, 0x99, 0xc6, 0x27, 0x47, 0xb5, 0xdf, 0xec, 0x7a, 0xf6, 0xcd, 0xfe, - 0x0c, 0xda, 0x96, 0x57, 0xbf, 0x22, 0x19, 0x3f, 0x93, 0xd3, 0x44, 0xea, 0xc9, 0x2f, 0x57, 0x7c, - 0x0e, 0x37, 0x2c, 0xe2, 0x1b, 0x4a, 0xbc, 0x5f, 0x3a, 0x73, 0xca, 0xce, 0xc9, 0xb6, 0xc7, 0x2e, - 0xb9, 0x2c, 0x14, 0xbe, 0xa0, 0x53, 0x9d, 0x94, 0x2d, 0x57, 0x2f, 0x30, 0x83, 0xb6, 0x25, 0x88, - 0x46, 0xd0, 0x34, 0x68, 0x9b, 0xdc, 0x1d, 0x94, 0xf9, 0x27, 0x5d, 0x71, 0x63, 0x41, 0xf4, 0x38, - 0x53, 0x2b, 0x4b, 0x15, 0xa4, 0x03, 0xa6, 0x58, 0x3e, 0x90, 0x4f, 0xa9, 0x88, 0x88, 0x7c, 0x5c, - 0x17, 0xd7, 0xaf, 0x73, 0x18, 0x1a, 0x29, 0x15, 0x99, 0xbf, 0x46, 0x6c, 0xba, 0x64, 0x57, 0xf7, - 0x91, 0x5d, 0xcb, 0xd6, 0xad, 0x3a, 0x94, 0xfa, 0xa0, 0xab, 0xd9, 0x3e, 0xdc, 0x29, 0xdd, 0x32, - 0x7d, 0x39, 0x54, 0x2e, 0xf3, 0xc2, 0xcb, 0xa1, 0xef, 0x8b, 0xe1, 0xe2, 0x87, 0xd0, 0xd5, 0xbd, - 0x83, 0x3c, 0xf3, 0xe2, 0x03, 0x0a, 0xb8, 0xbb, 0xcf, 0x85, 0x3f, 0x25, 0x42, 0xa6, 0x5d, 0xaa, - 0xb1, 0xcc, 0x11, 0xb7, 0xed, 0x23, 0xde, 0x4c, 0x1b, 0x6b, 0xdb, 0x0d, 0x7d, 0xc6, 0xbf, 0xc3, - 0xbd, 0x05, 0xbb, 0x9a, 0x53, 0xae, 0x81, 0x33, 0x66, 0xf3, 0x50, 0x98, 0x2e, 0x4c, 0x2f, 0xd0, - 0x06, 0x00, 0x8d, 0xa2, 0xb7, 0x99, 0x5e, 0xd6, 0xa2, 0xe0, 0x3f, 0xc0, 0x6a, 0x66, 0xc6, 0x4c, - 0xff, 0x6c, 0xb0, 0xd4, 0x2a, 0x79, 0xb5, 0x47, 0xff, 0xac, 0x40, 0xaf, 0x30, 0x8d, 0xf7, 0xb2, - 0x8d, 0x71, 0xff, 0x37, 0xa8, 0x05, 0x8e, 0x7a, 0x19, 0xfb, 0x15, 0xd4, 0x96, 0xad, 0xab, 0x7a, - 0x19, 0xfa, 0x55, 0xd4, 0x87, 0x8e, 0x5d, 0x9a, 0xfa, 0x35, 0x74, 0x0b, 0x56, 0x4b, 0x42, 0xd8, - 0xaf, 0xa3, 0xdb, 0xb0, 0x5e, 0x7a, 0xee, 0xbe, 0x33, 0xfa, 0xf7, 0x0a, 0x34, 0xf6, 0xd4, 0x1f, - 0x64, 0xe8, 0x09, 0x38, 0xea, 0xdf, 0x12, 0x94, 0xc6, 0x56, 0xfd, 0x3d, 0x36, 0x4c, 0x31, 0xcd, - 0xfe, 0x9b, 0xf2, 0x14, 0xea, 0x72, 0xa6, 0x47, 0x76, 0xfd, 0x49, 0x06, 0xbf, 0xe1, 0x7a, 0x8e, - 0x6a, 0x94, 0x76, 0xc0, 0x51, 0xc3, 0x3c, 0x4a, 0xf9, 0xf6, 0x70, 0x3f, 0xcc, 0x6d, 0x8e, 0xde, - 0x40, 0xdb, 0x02, 0x17, 0xdd, 0x49, 0xd8, 0xc5, 0xb1, 0x7e, 0x78, 0xb7, 0x9c, 0x69, 0x76, 0x7e, - 0xa6, 0xfe, 0xca, 0xcb, 0xec, 0x6c, 0x4f, 0xed, 0xd6, 0x31, 0xb3, 0x83, 0xf1, 0x33, 0x70, 0xd4, - 0x90, 0x86, 0x0a, 0x43, 0x5b, 0x5e, 0x2f, 0x3b, 0xf9, 0xbd, 0xcb, 0x07, 0x13, 0x6d, 0x24, 0x92, - 0xa5, 0xe3, 0xda, 0xf0, 0xc3, 0x85, 0x7c, 0x63, 0xf2, 0x31, 0xd4, 0xe5, 0xd8, 0x63, 0x21, 0x6e, - 0x4d, 0x41, 0x05, 0xe8, 0x9e, 0x42, 0x5d, 0x36, 0xbd, 0x96, 0xb4, 0x35, 0xd7, 0x0c, 0xd7, 0xf3, - 0x9d, 0x71, 0xdc, 0x41, 0x57, 0x4f, 0xae, 0x90, 0xf5, 0x98, 0xc5, 0xbd, 0xfb, 0x70, 0x35, 0x43, - 0x4b, 0xc1, 0x51, 0xd9, 0x69, 0x81, 0x63, 0xf7, 0xbe, 0x16, 0x38, 0xd9, 0x4e, 0xf4, 0x8f, 0x49, - 0x2a, 0xa3, 0x5b, 0xf9, 0xee, 0x28, 0xd6, 0x1d, 0x14, 0x19, 0x46, 0xfb, 0x4b, 0x95, 0xfb, 0x49, - 0xf7, 0x81, 0xee, 0x5a, 0xc0, 0x15, 0xfa, 0x9e, 0xe1, 0xbd, 0x05, 0xdc, 0x8c, 0xb1, 0xf4, 0x6d, - 0xce, 0x18, 0xcb, 0xf7, 0x18, 0x59, 0x63, 0xc5, 0xc6, 0xe0, 0xbb, 0xd2, 0x3b, 0x88, 0xee, 0xe7, - 0x2b, 0x6f, 0x49, 0x5d, 0x1f, 0x3e, 0xf8, 0x69, 0x21, 0xb3, 0xc3, 0x64, 0xc1, 0x65, 0x46, 0x0f, - 0x53, 0xf5, 0x9f, 0x28, 0xad, 0xc3, 0xad, 0x9f, 0x13, 0xd3, 0xfb, 0xfc, 0xa5, 0xf3, 0x35, 0xec, - 0x3c, 0x79, 0x61, 0x64, 0x4f, 0x1b, 0xea, 0xe3, 0xe9, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0d, - 0xf9, 0x42, 0x9a, 0x4e, 0x17, 0x00, 0x00, + 0xbc, 0x4c, 0x4b, 0x4f, 0xd5, 0x2e, 0x3d, 0xb7, 0xa1, 0x25, 0x73, 0xf2, 0x5b, 0x55, 0xbd, 0xb4, + 0x67, 0x56, 0x24, 0x41, 0x56, 0x00, 0xfc, 0xe7, 0x04, 0xbe, 0xb4, 0xcd, 0xd1, 0x2e, 0x34, 0x23, + 0xfd, 0x69, 0xfc, 0xb2, 0x9e, 0x45, 0xa5, 0xe5, 0xdc, 0x58, 0x08, 0x7f, 0x01, 0xdd, 0x98, 0xae, + 0xdd, 0xfa, 0x0c, 0x3a, 0xc4, 0x32, 0x68, 0xac, 0x6c, 0x94, 0x59, 0xe1, 0x6e, 0x46, 0x14, 0x7f, + 0x04, 0xab, 0x47, 0x94, 0x7a, 0x2e, 0x0b, 0x82, 0x53, 0x32, 0xfe, 0x61, 0xb1, 0xcf, 0x19, 0x6c, + 0xbc, 0xa2, 0xa1, 0x25, 0xb7, 0x8c, 0xf3, 0x1f, 0xda, 0x89, 0x38, 0x48, 0xa3, 0x9f, 0x45, 0xa0, + 0xd3, 0xf1, 0x4f, 0xd0, 0xfe, 0x59, 0x54, 0x76, 0x5c, 0xaa, 0x99, 0xb8, 0xe0, 0x17, 0x70, 0x23, + 0x8f, 0xd7, 0x78, 0x6b, 0x5b, 0x83, 0xd0, 0x60, 0x53, 0x57, 0x17, 0x00, 0x3c, 0x83, 0xf6, 0xb1, + 0x1f, 0x9e, 0x2d, 0x73, 0x9f, 0x3f, 0x84, 0xe6, 0xc1, 0x15, 0x1d, 0x2f, 0xf6, 0xe6, 0x37, 0xd0, + 0x96, 0x02, 0xcb, 0xf8, 0x10, 0xdb, 0x3e, 0x4c, 0xe5, 0xcc, 0x7e, 0x1a, 0xfa, 0x7f, 0x2b, 0x00, + 0xda, 0xbe, 0xca, 0x5e, 0x0c, 0x9d, 0x80, 0x70, 0x71, 0x18, 0x72, 0x1a, 0x89, 0x43, 0xdd, 0x7a, + 0xd4, 0xdc, 0x0c, 0x0d, 0x3d, 0x82, 0x0f, 0xec, 0xf5, 0x41, 0x14, 0xb1, 0xc8, 0xf8, 0xb4, 0xc8, + 0x90, 0x16, 0x23, 0x76, 0xc9, 0x5f, 0x4e, 0x26, 0x74, 0x2c, 0xa8, 0xa7, 0x52, 0xbc, 0xe6, 0x66, + 0x68, 0xd2, 0xa2, 0xbd, 0xd6, 0x16, 0xf5, 0x3b, 0x5c, 0x64, 0xe0, 0xe7, 0xd0, 0x31, 0x88, 0x75, + 0x94, 0x3e, 0x86, 0x86, 0xce, 0x77, 0xe3, 0x91, 0xb5, 0xcc, 0x49, 0xcd, 0x95, 0x30, 0x22, 0xf8, + 0x1b, 0x68, 0xbd, 0xbb, 0x5a, 0xae, 0x32, 0xda, 0xd5, 0xa0, 0xe8, 0x4d, 0x5d, 0x0c, 0x9e, 0x03, + 0x48, 0xf3, 0x06, 0xd9, 0xef, 0xf2, 0xd7, 0xb5, 0x14, 0x5a, 0x72, 0x5b, 0xb7, 0x60, 0xe5, 0xad, + 0x8c, 0xf9, 0xe2, 0x64, 0xf8, 0x14, 0x5a, 0x4a, 0x62, 0x8f, 0x85, 0x13, 0x74, 0x1f, 0xba, 0xc2, + 0x9f, 0x52, 0x36, 0x17, 0x27, 0x74, 0xcc, 0x42, 0x1d, 0xac, 0xae, 0x9b, 0x25, 0xe2, 0x7f, 0x56, + 0xa0, 0xa3, 0x74, 0x96, 0x39, 0xf4, 0x3d, 0x3b, 0x83, 0xd2, 0x0a, 0x18, 0xa3, 0x54, 0x29, 0x84, + 0xb6, 0xa1, 0x3e, 0x66, 0xe1, 0x44, 0x45, 0xd6, 0x7e, 0x34, 0x12, 0xa4, 0xae, 0xe2, 0x63, 0x0f, + 0xba, 0x06, 0x48, 0x72, 0xbd, 0x1a, 0x63, 0x16, 0xcc, 0xa7, 0xa1, 0xf1, 0x4e, 0xa1, 0xb3, 0xd2, + 0x5c, 0xf4, 0x31, 0xd4, 0x65, 0x16, 0x18, 0xd7, 0xdf, 0xcc, 0x6e, 0x60, 0x9c, 0xc8, 0x2e, 0x5d, + 0x25, 0x84, 0xf7, 0xa0, 0x97, 0xa5, 0xa3, 0x4f, 0xa1, 0xa1, 0x9a, 0xe1, 0x38, 0x08, 0xb7, 0xca, + 0x0c, 0xbc, 0x97, 0x12, 0xae, 0x11, 0xc4, 0x3b, 0xd0, 0xcf, 0xf3, 0xd2, 0x06, 0xbb, 0x62, 0x35, + 0xd8, 0x18, 0xcb, 0xeb, 0x33, 0x0b, 0x88, 0x1f, 0x2e, 0x8e, 0xda, 0x18, 0x7a, 0x46, 0x66, 0xb9, + 0x67, 0xc8, 0x8a, 0x81, 0x9d, 0x40, 0xf1, 0xae, 0xfa, 0x22, 0xbf, 0x87, 0xd5, 0x64, 0x13, 0xe3, + 0xdf, 0x3d, 0xe8, 0x8e, 0x03, 0xc2, 0xb9, 0x6f, 0x32, 0xcd, 0xec, 0x75, 0x37, 0x6f, 0x63, 0xcf, + 0x16, 0x72, 0xb3, 0x3a, 0xf8, 0x05, 0xac, 0x97, 0x89, 0xa1, 0x1d, 0xa8, 0xcb, 0xd6, 0xb1, 0x50, + 0x1c, 0xdf, 0x91, 0xd3, 0x79, 0x40, 0xa2, 0x7d, 0x22, 0x88, 0xab, 0x24, 0xf0, 0x4b, 0x58, 0x7b, + 0x45, 0xc5, 0xbe, 0xe9, 0x33, 0x97, 0xea, 0x7a, 0x36, 0x61, 0x25, 0xd6, 0x2f, 0xeb, 0xf4, 0xf1, + 0x2b, 0x58, 0xcf, 0x6e, 0x61, 0x3c, 0xf0, 0x18, 0x5a, 0x71, 0x7f, 0x1b, 0x47, 0x3f, 0xcd, 0xe2, + 0x58, 0xdc, 0x4d, 0x65, 0xf0, 0x13, 0x70, 0xde, 0xc9, 0xc6, 0xb4, 0x74, 0x9e, 0xb8, 0x01, 0x0d, + 0x3e, 0xfe, 0x9e, 0x4e, 0x89, 0xa9, 0x76, 0x66, 0x85, 0xcf, 0xd4, 0x01, 0x95, 0x9e, 0x6c, 0xf0, + 0x97, 0xab, 0x2e, 0x8e, 0x90, 0xfa, 0x26, 0xcc, 0x3d, 0xdb, 0x9d, 0xb2, 0x6d, 0x55, 0x4c, 0xfc, + 0x5a, 0x1d, 0xd3, 0xda, 0xc8, 0x1c, 0xf3, 0x13, 0x68, 0x89, 0x98, 0x68, 0xf6, 0x42, 0x59, 0x0b, + 0x4a, 0x3c, 0x15, 0xc2, 0xff, 0xab, 0x40, 0x2b, 0x61, 0xa0, 0xa7, 0xd0, 0xd6, 0x57, 0x8d, 0x1f, + 0x86, 0x13, 0x56, 0x08, 0xe9, 0x5e, 0xca, 0x73, 0x6d, 0x41, 0xa9, 0xe7, 0x87, 0x1e, 0xbd, 0xa2, + 0x5a, 0xaf, 0x9a, 0xd3, 0x3b, 0x4c, 0x79, 0xae, 0x2d, 0x88, 0xb6, 0xa1, 0x37, 0x8e, 0x28, 0x11, + 0x54, 0x41, 0x38, 0x79, 0xfb, 0x95, 0x69, 0x7c, 0x72, 0x54, 0xfb, 0xcd, 0xae, 0x67, 0xdf, 0xec, + 0xcf, 0xa0, 0x6d, 0xa1, 0xfa, 0x15, 0xc9, 0xf8, 0x99, 0x9c, 0x26, 0x52, 0x24, 0xbf, 0x5c, 0xf1, + 0x19, 0xac, 0x5a, 0xc4, 0xd7, 0x94, 0x78, 0xbf, 0x74, 0xe6, 0x94, 0x9d, 0x93, 0x6d, 0x8f, 0x5d, + 0x72, 0x59, 0x28, 0x7c, 0x41, 0xa7, 0x3a, 0x29, 0x5b, 0xae, 0x5e, 0x60, 0x06, 0x6d, 0x4b, 0x10, + 0x8d, 0xa0, 0x69, 0xbc, 0x6d, 0x72, 0x77, 0x50, 0x86, 0x4f, 0x42, 0x71, 0x63, 0x41, 0xf4, 0x28, + 0x53, 0x2b, 0x4b, 0x15, 0x24, 0x00, 0x53, 0x2c, 0xef, 0xcb, 0xa7, 0x54, 0x44, 0x44, 0x3e, 0xae, + 0x8b, 0xeb, 0xd7, 0x39, 0x0c, 0x8d, 0x94, 0x8a, 0xcc, 0x5f, 0x23, 0x36, 0x5d, 0xb2, 0xab, 0xfb, + 0xc8, 0xae, 0x65, 0x1b, 0x56, 0x1d, 0x4a, 0x31, 0xe8, 0x6a, 0x76, 0x00, 0xb7, 0x4b, 0xb7, 0x4c, + 0x5f, 0x0e, 0x95, 0xcb, 0xbc, 0xf0, 0x72, 0xe8, 0xfb, 0x62, 0xb8, 0xf8, 0x01, 0x74, 0x75, 0xef, + 0x20, 0xcf, 0xbc, 0xf8, 0x80, 0x02, 0xee, 0x1c, 0x70, 0xe1, 0x4f, 0x89, 0x90, 0x69, 0x97, 0x6a, + 0x2c, 0x73, 0xc4, 0x1d, 0xfb, 0x88, 0x37, 0xd2, 0xc6, 0xda, 0x86, 0xa1, 0xcf, 0xf8, 0x77, 0xb8, + 0xbb, 0x60, 0x57, 0x73, 0xca, 0x75, 0x70, 0xc6, 0x6c, 0x1e, 0x0a, 0xd3, 0x85, 0xe9, 0x05, 0xda, + 0x04, 0xa0, 0x51, 0xf4, 0x26, 0xd3, 0xcb, 0x5a, 0x14, 0xfc, 0x07, 0x58, 0xcb, 0xcc, 0x98, 0xe9, + 0x9f, 0x0d, 0x96, 0x5a, 0x25, 0xaf, 0xf6, 0xf0, 0x5f, 0x15, 0xe8, 0x15, 0xa6, 0xf1, 0x5e, 0xb6, + 0x31, 0xee, 0xff, 0x06, 0xb5, 0xc0, 0x51, 0x2f, 0x63, 0xbf, 0x82, 0xda, 0xb2, 0x75, 0x55, 0x2f, + 0x43, 0xbf, 0x8a, 0xfa, 0xd0, 0xb1, 0x4b, 0x53, 0xbf, 0x86, 0x6e, 0xc2, 0x5a, 0x49, 0x08, 0xfb, + 0x75, 0x74, 0x0b, 0x36, 0x4a, 0xcf, 0xdd, 0x77, 0xd0, 0x2a, 0xb4, 0x2d, 0xec, 0xfd, 0xc6, 0xe8, + 0xdf, 0x2b, 0xd0, 0xd8, 0x57, 0xff, 0x98, 0xa1, 0xc7, 0xe0, 0xa8, 0xbf, 0x4f, 0x50, 0x1a, 0x6c, + 0xf5, 0x7f, 0xd9, 0x30, 0x75, 0x72, 0xf6, 0xef, 0x95, 0x27, 0x50, 0x97, 0x43, 0x3e, 0xb2, 0x0b, + 0x52, 0x32, 0x09, 0x0e, 0x37, 0x72, 0x54, 0xa3, 0xb4, 0x0b, 0x8e, 0x9a, 0xee, 0x51, 0xca, 0xb7, + 0xa7, 0xfd, 0x61, 0x6e, 0x73, 0xf4, 0x3a, 0x83, 0x18, 0xdd, 0x4e, 0xd8, 0xc5, 0x39, 0x7f, 0x78, + 0xa7, 0x9c, 0x69, 0x76, 0x7e, 0xaa, 0xfe, 0xdb, 0xcb, 0xec, 0x6c, 0x8f, 0xf1, 0xd6, 0x31, 0xb3, + 0x93, 0xf2, 0x53, 0x70, 0xd4, 0xd4, 0x86, 0x0a, 0x53, 0x5c, 0x5e, 0x2f, 0x3b, 0x0a, 0xbe, 0xcd, + 0x47, 0x17, 0x6d, 0x26, 0x92, 0xa5, 0xf3, 0xdb, 0xf0, 0xc3, 0x85, 0x7c, 0x63, 0xf2, 0x11, 0xd4, + 0xe5, 0x1c, 0x64, 0x79, 0xdc, 0x1a, 0x8b, 0x0a, 0xae, 0x7b, 0x02, 0x75, 0xd9, 0x05, 0x5b, 0xd2, + 0xd6, 0xa0, 0x33, 0xdc, 0xc8, 0xb7, 0xca, 0x71, 0x4b, 0x5d, 0x7d, 0x77, 0x85, 0xac, 0xd7, 0x2d, + 0x6e, 0xe6, 0x87, 0x6b, 0x19, 0x5a, 0xea, 0x1c, 0x95, 0xae, 0x96, 0x73, 0xec, 0x66, 0xd8, 0x72, + 0x4e, 0xb6, 0x35, 0xfd, 0x63, 0x92, 0xdb, 0xe8, 0x66, 0xbe, 0x5d, 0x8a, 0x75, 0x07, 0x45, 0x86, + 0xd1, 0xfe, 0x52, 0x5d, 0x86, 0xa4, 0x1d, 0x41, 0x77, 0x2c, 0xc7, 0x15, 0x1a, 0xa1, 0xe1, 0xdd, + 0x05, 0xdc, 0x8c, 0xb1, 0xf4, 0xb1, 0xce, 0x18, 0xcb, 0x37, 0x1d, 0x59, 0x63, 0xc5, 0x4e, 0xe1, + 0xbb, 0xd2, 0x4b, 0x89, 0xee, 0xe5, 0x4b, 0x71, 0x49, 0xa1, 0x1f, 0xde, 0xff, 0x69, 0x21, 0xb3, + 0xc3, 0x64, 0xc1, 0xed, 0x46, 0x0f, 0x52, 0xf5, 0x9f, 0xa8, 0xb5, 0xc3, 0xed, 0x9f, 0x13, 0xd3, + 0xfb, 0xfc, 0xa5, 0xf3, 0x35, 0xec, 0x3e, 0x7e, 0x6e, 0x64, 0x4f, 0x1b, 0xea, 0xe3, 0xc9, 0xff, + 0x03, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x08, 0xdc, 0x75, 0x5f, 0x17, 0x00, 0x00, } diff --git a/sqle/driver/v2/proto/driver_v2.proto b/sqle/driver/v2/proto/driver_v2.proto index 2919849968..4706c8a02c 100644 --- a/sqle/driver/v2/proto/driver_v2.proto +++ b/sqle/driver/v2/proto/driver_v2.proto @@ -46,6 +46,7 @@ enum OptionalModule { GetTableMeta = 3; ExtractTableFromSQL = 4; EstimateSQLAffectRows = 5; + KillProcess = 6; } message Param { diff --git a/sqle/server/sqled.go b/sqle/server/sqled.go index 05e81f21d1..b5d2622b4e 100644 --- a/sqle/server/sqled.go +++ b/sqle/server/sqled.go @@ -324,6 +324,10 @@ func (a *action) audit() (err error) { } func (a *action) terminateExecution(ctx context.Context) error { + if !driver.GetPluginManager(). + IsOptionalModuleEnabled(a.task.DBType, driverV2.OptionalModuleKillProcess) { + return driver.NewErrPluginAPINotImplement(driverV2.OptionalModuleKillProcess) + } return a.plugin.KillProcess(ctx) } From dcae3d9853946b609983f7f289b5fc67c05a3a14 Mon Sep 17 00:00:00 2001 From: bianyucheng Date: Wed, 2 Aug 2023 14:57:28 +0800 Subject: [PATCH 4/4] use errors new --- sqle/driver/plugin_adapter_v2.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sqle/driver/plugin_adapter_v2.go b/sqle/driver/plugin_adapter_v2.go index 8e44541902..702e5125e3 100644 --- a/sqle/driver/plugin_adapter_v2.go +++ b/sqle/driver/plugin_adapter_v2.go @@ -5,6 +5,7 @@ import ( sqlDriver "database/sql/driver" "fmt" "sync" + "errors" driverV2 "github.com/actiontech/sqle/sqle/driver/v2" protoV2 "github.com/actiontech/sqle/sqle/driver/v2/proto" @@ -183,7 +184,7 @@ func (s *PluginImplV2) KillProcess(ctx context.Context) error { return err } if rs.ErrMessage != "" { - return fmt.Errorf(rs.ErrMessage) + return errors.New(rs.ErrMessage) } return nil }