Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: use Range for command tracking and remove v1 SheetPayload (#18532)
Danny Xu5a1107fbc76c
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex df86c14c14..74685326ce 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -15654,27 +15654,12 @@ components:title: content_sizeformat: int64description: content_size is the full size of the content, may not match the size of the `content` field.- payload:- title: payload- description: Parsed metadata about SQL commands in the sheet.- $ref: '#/components/schemas/bytebase.v1.SheetPayload'engine:title: enginedescription: The SQL dialect.$ref: '#/components/schemas/bytebase.v1.Engine'title: SheetadditionalProperties: false- bytebase.v1.SheetPayload:- type: object- properties:- commands:- type: array- items:- $ref: '#/components/schemas/bytebase.v1.Range'- title: commands- description: The start and end position of each command in the sheet statement.- title: SheetPayload- additionalProperties: falsebytebase.v1.SpatialIndexConfig:type: objectproperties:@@ -16683,15 +16668,10 @@ components:title: log_timedescription: When the command was logged.$ref: '#/components/schemas/google.protobuf.Timestamp'- commandIndexes:- type: array- items:- type: integer- format: int32- title: command_indexes- description: |-- Either `command_indexes` or `statement` is set.- The indexes of the executed commands.+ range:+ title: range+ description: The byte offset range of the executed command in the sheet.+ $ref: '#/components/schemas/bytebase.v1.Range'statement:type: stringtitle: statementdiff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.goindex 974265eb9c..315f3b85de 100644--- a/backend/api/v1/rollout_service_converter.go+++ b/backend/api/v1/rollout_service_converter.go@@ -505,9 +505,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrLogTime: timestamppb.New(l.T),DeployId: l.Payload.DeployId,CommandExecute: &v1pb.TaskRunLogEntry_CommandExecute{- LogTime: timestamppb.New(l.T),- CommandIndexes: l.Payload.CommandExecute.CommandIndexes,- Statement: l.Payload.CommandExecute.Statement,+ LogTime: timestamppb.New(l.T),+ Range: convertToRange(l.Payload.CommandExecute.Range),+ Statement: l.Payload.CommandExecute.Statement,},}entries = append(entries, e)@@ -659,3 +659,13 @@ func convertTaskRunLogTransactionControlType(t storepb.TaskRunLog_TransactionConreturn v1pb.TaskRunLogEntry_TransactionControl_TYPE_UNSPECIFIED}}++func convertToRange(r *storepb.Range) *v1pb.Range {+ if r == nil {+ return nil+ }+ return &v1pb.Range{+ Start: r.Start,+ End: r.End,+ }+}diff --git a/backend/api/v1/sheet_service.go b/backend/api/v1/sheet_service.goindex 6181461f95..92d1b47ba1 100644--- a/backend/api/v1/sheet_service.go+++ b/backend/api/v1/sheet_service.go@@ -195,14 +195,6 @@ func (s *SheetService) convertToAPISheetMessage(ctx context.Context, sheet *storif project == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project with id %s not found", sheet.ProjectID))}- v1SheetPayload := &v1pb.SheetPayload{}- if len(sheet.Payload.GetCommands()) > 0 {- v1SheetPayload.Commands = convertToRanges(sheet.Payload.GetCommands())- } else {- v1SheetPayload.Commands = []*v1pb.Range{- {Start: 0, End: int32(sheet.Size)},- }- }return &v1pb.Sheet{Name: common.FormatSheet(project.ResourceID, sheet.UID),@@ -211,7 +203,6 @@ func (s *SheetService) convertToAPISheetMessage(ctx context.Context, sheet *storCreateTime: timestamppb.New(sheet.CreatedAt),Content: []byte(sheet.Statement),ContentSize: sheet.Size,- Payload: v1SheetPayload,Engine: convertToEngine(sheet.Payload.GetEngine()),}, nil}@@ -228,15 +219,3 @@ func convertToStoreSheetMessage(projectID string, creator string, sheet *v1pb.Shreturn sheetMessage}--func convertToRanges(commands []*storepb.Range) []*v1pb.Range {- var cs []*v1pb.Range- for _, command := range commands {- c := &v1pb.Range{- Start: command.Start,- End: command.End,- }- cs = append(cs, c)- }- return cs-}diff --git a/backend/generated-go/store/task_run_log.pb.go b/backend/generated-go/store/task_run_log.pb.goindex 4f83ad0a13..c8ecad2c7b 100644--- a/backend/generated-go/store/task_run_log.pb.go+++ b/backend/generated-go/store/task_run_log.pb.go@@ -444,9 +444,8 @@ func (x *TaskRunLog_SchemaDumpEnd) GetError() string {type TaskRunLog_CommandExecute struct {state protoimpl.MessageState `protogen:"open.v1"`- // Either `command_indexes` or `statement` is set.- // The indexes of the executed commands.- CommandIndexes []int32 `protobuf:"varint,1,rep,packed,name=command_indexes,json=commandIndexes,proto3" json:"command_indexes,omitempty"`+ // The byte offset range of the executed command in the sheet.+ Range *Range `protobuf:"bytes,1,opt,name=range,proto3" json:"range,omitempty"`// The statement to be executed.Statement string `protobuf:"bytes,2,opt,name=statement,proto3" json:"statement,omitempty"`unknownFields protoimpl.UnknownFields@@ -483,9 +482,9 @@ func (*TaskRunLog_CommandExecute) Descriptor() ([]byte, []int) {return file_store_task_run_log_proto_rawDescGZIP(), []int{0, 2}}-func (x *TaskRunLog_CommandExecute) GetCommandIndexes() []int32 {+func (x *TaskRunLog_CommandExecute) GetRange() *Range {if x != nil {- return x.CommandIndexes+ return x.Range}return nil}@@ -967,7 +966,7 @@ var File_store_task_run_log_proto protoreflect.FileDescriptorconst file_store_task_run_log_proto_rawDesc = "" +"\n" +- "\x18store/task_run_log.proto\x12\x0ebytebase.store\x1a\x14store/task_run.proto\"\x88\x14\n" ++ "\x18store/task_run_log.proto\x12\x0ebytebase.store\x1a\x12store/common.proto\x1a\x14store/task_run.proto\"\x8c\x14\n" +"\n" +"TaskRunLog\x123\n" +"\x04type\x18\x01 \x01(\x0e2\x1f.bytebase.store.TaskRunLog.TypeR\x04type\x12\x1b\n" +@@ -989,9 +988,9 @@ const file_store_task_run_log_proto_rawDesc = "" +"\x10compute_diff_end\x18\x0f \x01(\v2).bytebase.store.TaskRunLog.ComputeDiffEndR\x0ecomputeDiffEnd\x1a\x11\n" +"\x0fSchemaDumpStart\x1a%\n" +"\rSchemaDumpEnd\x12\x14\n" +- "\x05error\x18\x01 \x01(\tR\x05error\x1aW\n" +- "\x0eCommandExecute\x12'\n" +- "\x0fcommand_indexes\x18\x01 \x03(\x05R\x0ecommandIndexes\x12\x1c\n" ++ "\x05error\x18\x01 \x01(\tR\x05error\x1a[\n" ++ "\x0eCommandExecute\x12+\n" ++ "\x05range\x18\x01 \x01(\v2\x15.bytebase.store.RangeR\x05range\x12\x1c\n" +"\tstatement\x18\x02 \x01(\tR\tstatement\x1ax\n" +"\x0fCommandResponse\x12\x14\n" +"\x05error\x18\x02 \x01(\tR\x05error\x12#\n" +@@ -1078,7 +1077,8 @@ var file_store_task_run_log_proto_goTypes = []any{(*TaskRunLog_RetryInfo)(nil), // 14: bytebase.store.TaskRunLog.RetryInfo(*TaskRunLog_ComputeDiffStart)(nil), // 15: bytebase.store.TaskRunLog.ComputeDiffStart(*TaskRunLog_ComputeDiffEnd)(nil), // 16: bytebase.store.TaskRunLog.ComputeDiffEnd- (*PriorBackupDetail)(nil), // 17: bytebase.store.PriorBackupDetail+ (*Range)(nil), // 17: bytebase.store.Range+ (*PriorBackupDetail)(nil), // 18: bytebase.store.PriorBackupDetail}var file_store_task_run_log_proto_depIdxs = []int32{0, // 0: bytebase.store.TaskRunLog.type:type_name -> bytebase.store.TaskRunLog.Type@@ -1095,14 +1095,15 @@ var file_store_task_run_log_proto_depIdxs = []int32{14, // 11: bytebase.store.TaskRunLog.retry_info:type_name -> bytebase.store.TaskRunLog.RetryInfo15, // 12: bytebase.store.TaskRunLog.compute_diff_start:type_name -> bytebase.store.TaskRunLog.ComputeDiffStart16, // 13: bytebase.store.TaskRunLog.compute_diff_end:type_name -> bytebase.store.TaskRunLog.ComputeDiffEnd- 1, // 14: bytebase.store.TaskRunLog.TaskRunStatusUpdate.status:type_name -> bytebase.store.TaskRunLog.TaskRunStatusUpdate.Status- 2, // 15: bytebase.store.TaskRunLog.TransactionControl.type:type_name -> bytebase.store.TaskRunLog.TransactionControl.Type- 17, // 16: bytebase.store.TaskRunLog.PriorBackupEnd.prior_backup_detail:type_name -> bytebase.store.PriorBackupDetail- 17, // [17:17] is the sub-list for method output_type- 17, // [17:17] is the sub-list for method input_type- 17, // [17:17] is the sub-list for extension type_name- 17, // [17:17] is the sub-list for extension extendee- 0, // [0:17] is the sub-list for field type_name+ 17, // 14: bytebase.store.TaskRunLog.CommandExecute.range:type_name -> bytebase.store.Range+ 1, // 15: bytebase.store.TaskRunLog.TaskRunStatusUpdate.status:type_name -> bytebase.store.TaskRunLog.TaskRunStatusUpdate.Status+ 2, // 16: bytebase.store.TaskRunLog.TransactionControl.type:type_name -> bytebase.store.TaskRunLog.TransactionControl.Type+ 18, // 17: bytebase.store.TaskRunLog.PriorBackupEnd.prior_backup_detail:type_name -> bytebase.store.PriorBackupDetail+ 18, // [18:18] is the sub-list for method output_type+ 18, // [18:18] is the sub-list for method input_type+ 18, // [18:18] is the sub-list for extension type_name+ 18, // [18:18] is the sub-list for extension extendee+ 0, // [0:18] is the sub-list for field type_name}func init() { file_store_task_run_log_proto_init() }@@ -1110,6 +1111,7 @@ func file_store_task_run_log_proto_init() {if File_store_task_run_log_proto != nil {return}+ file_store_common_proto_init()file_store_task_run_proto_init()type x struct{}out := protoimpl.TypeBuilder{diff --git a/backend/generated-go/store/task_run_log_equal.pb.go b/backend/generated-go/store/task_run_log_equal.pb.goindex cd5fdf8036..59be0c5bc1 100644--- a/backend/generated-go/store/task_run_log_equal.pb.go+++ b/backend/generated-go/store/task_run_log_equal.pb.go@@ -33,14 +33,9 @@ func (x *TaskRunLog_CommandExecute) Equal(y *TaskRunLog_CommandExecute) bool {if x == nil || y == nil {return x == nil && y == nil}- if len(x.CommandIndexes) != len(y.CommandIndexes) {+ if !x.Range.Equal(y.Range) {return false}- for i := 0; i < len(x.CommandIndexes); i++ {- if x.CommandIndexes[i] != y.CommandIndexes[i] {- return false- }- }if x.Statement != y.Statement {return false}diff --git a/backend/generated-go/v1/rollout_service.pb.go b/backend/generated-go/v1/rollout_service.pb.goindex 264ea0f66a..b1b4a3f862 100644--- a/backend/generated-go/v1/rollout_service.pb.go+++ b/backend/generated-go/v1/rollout_service.pb.go@@ -2895,9 +2895,8 @@ type TaskRunLogEntry_CommandExecute struct {state protoimpl.MessageState `protogen:"open.v1"`// When the command was logged.LogTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=log_time,json=logTime,proto3" json:"log_time,omitempty"`- // Either `command_indexes` or `statement` is set.- // The indexes of the executed commands.- CommandIndexes []int32 `protobuf:"varint,2,rep,packed,name=command_indexes,json=commandIndexes,proto3" json:"command_indexes,omitempty"`+ // The byte offset range of the executed command in the sheet.+ Range *Range `protobuf:"bytes,2,opt,name=range,proto3" json:"range,omitempty"`// The executed statement.Statement string `protobuf:"bytes,4,opt,name=statement,proto3" json:"statement,omitempty"`// The response from executing the command.@@ -2943,9 +2942,9 @@ func (x *TaskRunLogEntry_CommandExecute) GetLogTime() *timestamppb.Timestamp {return nil}-func (x *TaskRunLogEntry_CommandExecute) GetCommandIndexes() []int32 {+func (x *TaskRunLogEntry_CommandExecute) GetRange() *Range {if x != nil {- return x.CommandIndexes+ return x.Range}return nil}@@ -3816,7 +3815,7 @@ const file_v1_rollout_service_proto_rawDesc = "" +"TaskRunLog\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x126\n" +"\aentries\x18\x02 \x03(\v2\x1c.bytebase.v1.TaskRunLogEntryR\aentries:v\xeaAs\n" +- "\x17bytebase.com/TaskRunLog\x12Xprojects/{project}/rollouts/{rollout}/stages/{stage}/tasks/{task}/taskRuns/{taskRun}/log\"\xa7\x14\n" ++ "\x17bytebase.com/TaskRunLog\x12Xprojects/{project}/rollouts/{rollout}/stages/{stage}/tasks/{task}/taskRuns/{taskRun}/log\"\xa8\x14\n" +"\x0fTaskRunLogEntry\x125\n" +"\x04type\x18\x01 \x01(\x0e2!.bytebase.v1.TaskRunLogEntry.TypeR\x04type\x125\n" +"\blog_time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\alogTime\x12\x1b\n" +@@ -3837,10 +3836,10 @@ const file_v1_rollout_service_proto_rawDesc = "" +"\n" +"start_time\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\tstartTime\x125\n" +"\bend_time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\aendTime\x12\x14\n" +- "\x05error\x18\x03 \x01(\tR\x05error\x1a\x99\x03\n" ++ "\x05error\x18\x03 \x01(\tR\x05error\x1a\x9a\x03\n" +"\x0eCommandExecute\x125\n" +- "\blog_time\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\alogTime\x12'\n" +- "\x0fcommand_indexes\x18\x02 \x03(\x05R\x0ecommandIndexes\x12\x1c\n" ++ "\blog_time\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\alogTime\x12(\n" ++ "\x05range\x18\x02 \x01(\v2\x12.bytebase.v1.RangeR\x05range\x12\x1c\n" +"\tstatement\x18\x04 \x01(\tR\tstatement\x12W\n" +"\bresponse\x18\x03 \x01(\v2;.bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponseR\bresponse\x1a\xaf\x01\n" +"\x0fCommandResponse\x125\n" +@@ -4033,6 +4032,7 @@ var file_v1_rollout_service_proto_goTypes = []any{(DatabaseChangeType)(0), // 54: bytebase.v1.DatabaseChangeType(ExportFormat)(0), // 55: bytebase.v1.ExportFormat(*Position)(nil), // 56: bytebase.v1.Position+ (*Range)(nil), // 57: bytebase.v1.Range}var file_v1_rollout_service_proto_depIdxs = []int32{52, // 0: bytebase.v1.BatchRunTasksRequest.run_time:type_name -> google.protobuf.Timestamp@@ -4084,52 +4084,53 @@ var file_v1_rollout_service_proto_depIdxs = []int32{52, // 46: bytebase.v1.TaskRunLogEntry.SchemaDump.start_time:type_name -> google.protobuf.Timestamp52, // 47: bytebase.v1.TaskRunLogEntry.SchemaDump.end_time:type_name -> google.protobuf.Timestamp52, // 48: bytebase.v1.TaskRunLogEntry.CommandExecute.log_time:type_name -> google.protobuf.Timestamp- 49, // 49: bytebase.v1.TaskRunLogEntry.CommandExecute.response:type_name -> bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse- 52, // 50: bytebase.v1.TaskRunLogEntry.DatabaseSync.start_time:type_name -> google.protobuf.Timestamp- 52, // 51: bytebase.v1.TaskRunLogEntry.DatabaseSync.end_time:type_name -> google.protobuf.Timestamp- 5, // 52: bytebase.v1.TaskRunLogEntry.TaskRunStatusUpdate.status:type_name -> bytebase.v1.TaskRunLogEntry.TaskRunStatusUpdate.Status- 6, // 53: bytebase.v1.TaskRunLogEntry.TransactionControl.type:type_name -> bytebase.v1.TaskRunLogEntry.TransactionControl.Type- 52, // 54: bytebase.v1.TaskRunLogEntry.PriorBackup.start_time:type_name -> google.protobuf.Timestamp- 52, // 55: bytebase.v1.TaskRunLogEntry.PriorBackup.end_time:type_name -> google.protobuf.Timestamp- 35, // 56: bytebase.v1.TaskRunLogEntry.PriorBackup.prior_backup_detail:type_name -> bytebase.v1.TaskRun.PriorBackupDetail- 52, // 57: bytebase.v1.TaskRunLogEntry.ComputeDiff.start_time:type_name -> google.protobuf.Timestamp- 52, // 58: bytebase.v1.TaskRunLogEntry.ComputeDiff.end_time:type_name -> google.protobuf.Timestamp- 52, // 59: bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse.log_time:type_name -> google.protobuf.Timestamp- 51, // 60: bytebase.v1.TaskRunSession.Postgres.session:type_name -> bytebase.v1.TaskRunSession.Postgres.Session- 51, // 61: bytebase.v1.TaskRunSession.Postgres.blocking_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session- 51, // 62: bytebase.v1.TaskRunSession.Postgres.blocked_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session- 52, // 63: bytebase.v1.TaskRunSession.Postgres.Session.backend_start:type_name -> google.protobuf.Timestamp- 52, // 64: bytebase.v1.TaskRunSession.Postgres.Session.xact_start:type_name -> google.protobuf.Timestamp- 52, // 65: bytebase.v1.TaskRunSession.Postgres.Session.query_start:type_name -> google.protobuf.Timestamp- 13, // 66: bytebase.v1.RolloutService.GetRollout:input_type -> bytebase.v1.GetRolloutRequest- 14, // 67: bytebase.v1.RolloutService.ListRollouts:input_type -> bytebase.v1.ListRolloutsRequest- 16, // 68: bytebase.v1.RolloutService.CreateRollout:input_type -> bytebase.v1.CreateRolloutRequest- 17, // 69: bytebase.v1.RolloutService.PreviewRollout:input_type -> bytebase.v1.PreviewRolloutRequest- 18, // 70: bytebase.v1.RolloutService.ListTaskRuns:input_type -> bytebase.v1.ListTaskRunsRequest- 20, // 71: bytebase.v1.RolloutService.GetTaskRun:input_type -> bytebase.v1.GetTaskRunRequest- 21, // 72: bytebase.v1.RolloutService.GetTaskRunLog:input_type -> bytebase.v1.GetTaskRunLogRequest- 28, // 73: bytebase.v1.RolloutService.GetTaskRunSession:input_type -> bytebase.v1.GetTaskRunSessionRequest- 7, // 74: bytebase.v1.RolloutService.BatchRunTasks:input_type -> bytebase.v1.BatchRunTasksRequest- 9, // 75: bytebase.v1.RolloutService.BatchSkipTasks:input_type -> bytebase.v1.BatchSkipTasksRequest- 11, // 76: bytebase.v1.RolloutService.BatchCancelTaskRuns:input_type -> bytebase.v1.BatchCancelTaskRunsRequest- 30, // 77: bytebase.v1.RolloutService.PreviewTaskRunRollback:input_type -> bytebase.v1.PreviewTaskRunRollbackRequest- 22, // 78: bytebase.v1.RolloutService.GetRollout:output_type -> bytebase.v1.Rollout- 15, // 79: bytebase.v1.RolloutService.ListRollouts:output_type -> bytebase.v1.ListRolloutsResponse- 22, // 80: bytebase.v1.RolloutService.CreateRollout:output_type -> bytebase.v1.Rollout- 22, // 81: bytebase.v1.RolloutService.PreviewRollout:output_type -> bytebase.v1.Rollout- 19, // 82: bytebase.v1.RolloutService.ListTaskRuns:output_type -> bytebase.v1.ListTaskRunsResponse- 25, // 83: bytebase.v1.RolloutService.GetTaskRun:output_type -> bytebase.v1.TaskRun- 26, // 84: bytebase.v1.RolloutService.GetTaskRunLog:output_type -> bytebase.v1.TaskRunLog- 29, // 85: bytebase.v1.RolloutService.GetTaskRunSession:output_type -> bytebase.v1.TaskRunSession- 8, // 86: bytebase.v1.RolloutService.BatchRunTasks:output_type -> bytebase.v1.BatchRunTasksResponse- 10, // 87: bytebase.v1.RolloutService.BatchSkipTasks:output_type -> bytebase.v1.BatchSkipTasksResponse- 12, // 88: bytebase.v1.RolloutService.BatchCancelTaskRuns:output_type -> bytebase.v1.BatchCancelTaskRunsResponse- 31, // 89: bytebase.v1.RolloutService.PreviewTaskRunRollback:output_type -> bytebase.v1.PreviewTaskRunRollbackResponse- 78, // [78:90] is the sub-list for method output_type- 66, // [66:78] is the sub-list for method input_type- 66, // [66:66] is the sub-list for extension type_name- 66, // [66:66] is the sub-list for extension extendee- 0, // [0:66] is the sub-list for field type_name+ 57, // 49: bytebase.v1.TaskRunLogEntry.CommandExecute.range:type_name -> bytebase.v1.Range+ 49, // 50: bytebase.v1.TaskRunLogEntry.CommandExecute.response:type_name -> bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse+ 52, // 51: bytebase.v1.TaskRunLogEntry.DatabaseSync.start_time:type_name -> google.protobuf.Timestamp+ 52, // 52: bytebase.v1.TaskRunLogEntry.DatabaseSync.end_time:type_name -> google.protobuf.Timestamp+ 5, // 53: bytebase.v1.TaskRunLogEntry.TaskRunStatusUpdate.status:type_name -> bytebase.v1.TaskRunLogEntry.TaskRunStatusUpdate.Status+ 6, // 54: bytebase.v1.TaskRunLogEntry.TransactionControl.type:type_name -> bytebase.v1.TaskRunLogEntry.TransactionControl.Type+ 52, // 55: bytebase.v1.TaskRunLogEntry.PriorBackup.start_time:type_name -> google.protobuf.Timestamp+ 52, // 56: bytebase.v1.TaskRunLogEntry.PriorBackup.end_time:type_name -> google.protobuf.Timestamp+ 35, // 57: bytebase.v1.TaskRunLogEntry.PriorBackup.prior_backup_detail:type_name -> bytebase.v1.TaskRun.PriorBackupDetail+ 52, // 58: bytebase.v1.TaskRunLogEntry.ComputeDiff.start_time:type_name -> google.protobuf.Timestamp+ 52, // 59: bytebase.v1.TaskRunLogEntry.ComputeDiff.end_time:type_name -> google.protobuf.Timestamp+ 52, // 60: bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse.log_time:type_name -> google.protobuf.Timestamp+ 51, // 61: bytebase.v1.TaskRunSession.Postgres.session:type_name -> bytebase.v1.TaskRunSession.Postgres.Session+ 51, // 62: bytebase.v1.TaskRunSession.Postgres.blocking_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session+ 51, // 63: bytebase.v1.TaskRunSession.Postgres.blocked_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session+ 52, // 64: bytebase.v1.TaskRunSession.Postgres.Session.backend_start:type_name -> google.protobuf.Timestamp+ 52, // 65: bytebase.v1.TaskRunSession.Postgres.Session.xact_start:type_name -> google.protobuf.Timestamp+ 52, // 66: bytebase.v1.TaskRunSession.Postgres.Session.query_start:type_name -> google.protobuf.Timestamp+ 13, // 67: bytebase.v1.RolloutService.GetRollout:input_type -> bytebase.v1.GetRolloutRequest+ 14, // 68: bytebase.v1.RolloutService.ListRollouts:input_type -> bytebase.v1.ListRolloutsRequest+ 16, // 69: bytebase.v1.RolloutService.CreateRollout:input_type -> bytebase.v1.CreateRolloutRequest+ 17, // 70: bytebase.v1.RolloutService.PreviewRollout:input_type -> bytebase.v1.PreviewRolloutRequest+ 18, // 71: bytebase.v1.RolloutService.ListTaskRuns:input_type -> bytebase.v1.ListTaskRunsRequest+ 20, // 72: bytebase.v1.RolloutService.GetTaskRun:input_type -> bytebase.v1.GetTaskRunRequest+ 21, // 73: bytebase.v1.RolloutService.GetTaskRunLog:input_type -> bytebase.v1.GetTaskRunLogRequest+ 28, // 74: bytebase.v1.RolloutService.GetTaskRunSession:input_type -> bytebase.v1.GetTaskRunSessionRequest+ 7, // 75: bytebase.v1.RolloutService.BatchRunTasks:input_type -> bytebase.v1.BatchRunTasksRequest+ 9, // 76: bytebase.v1.RolloutService.BatchSkipTasks:input_type -> bytebase.v1.BatchSkipTasksRequest+ 11, // 77: bytebase.v1.RolloutService.BatchCancelTaskRuns:input_type -> bytebase.v1.BatchCancelTaskRunsRequest+ 30, // 78: bytebase.v1.RolloutService.PreviewTaskRunRollback:input_type -> bytebase.v1.PreviewTaskRunRollbackRequest+ 22, // 79: bytebase.v1.RolloutService.GetRollout:output_type -> bytebase.v1.Rollout+ 15, // 80: bytebase.v1.RolloutService.ListRollouts:output_type -> bytebase.v1.ListRolloutsResponse+ 22, // 81: bytebase.v1.RolloutService.CreateRollout:output_type -> bytebase.v1.Rollout+ 22, // 82: bytebase.v1.RolloutService.PreviewRollout:output_type -> bytebase.v1.Rollout+ 19, // 83: bytebase.v1.RolloutService.ListTaskRuns:output_type -> bytebase.v1.ListTaskRunsResponse+ 25, // 84: bytebase.v1.RolloutService.GetTaskRun:output_type -> bytebase.v1.TaskRun+ 26, // 85: bytebase.v1.RolloutService.GetTaskRunLog:output_type -> bytebase.v1.TaskRunLog+ 29, // 86: bytebase.v1.RolloutService.GetTaskRunSession:output_type -> bytebase.v1.TaskRunSession+ 8, // 87: bytebase.v1.RolloutService.BatchRunTasks:output_type -> bytebase.v1.BatchRunTasksResponse+ 10, // 88: bytebase.v1.RolloutService.BatchSkipTasks:output_type -> bytebase.v1.BatchSkipTasksResponse+ 12, // 89: bytebase.v1.RolloutService.BatchCancelTaskRuns:output_type -> bytebase.v1.BatchCancelTaskRunsResponse+ 31, // 90: bytebase.v1.RolloutService.PreviewTaskRunRollback:output_type -> bytebase.v1.PreviewTaskRunRollbackResponse+ 79, // [79:91] is the sub-list for method output_type+ 67, // [67:79] is the sub-list for method input_type+ 67, // [67:67] is the sub-list for extension type_name+ 67, // [67:67] is the sub-list for extension extendee+ 0, // [0:67] is the sub-list for field type_name}func init() { file_v1_rollout_service_proto_init() }diff --git a/backend/generated-go/v1/rollout_service_equal.pb.go b/backend/generated-go/v1/rollout_service_equal.pb.goindex 24af376cc5..3cd8bd08b3 100644--- a/backend/generated-go/v1/rollout_service_equal.pb.go+++ b/backend/generated-go/v1/rollout_service_equal.pb.go@@ -670,14 +670,9 @@ func (x *TaskRunLogEntry_CommandExecute) Equal(y *TaskRunLogEntry_CommandExecuteif p, q := x.LogTime, y.LogTime; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {return false}- if len(x.CommandIndexes) != len(y.CommandIndexes) {+ if !x.Range.Equal(y.Range) {return false}- for i := 0; i < len(x.CommandIndexes); i++ {- if x.CommandIndexes[i] != y.CommandIndexes[i] {- return false- }- }if x.Statement != y.Statement {return false}diff --git a/backend/generated-go/v1/sheet_service.pb.go b/backend/generated-go/v1/sheet_service.pb.goindex 43e19f6381..353fb10fb1 100644--- a/backend/generated-go/v1/sheet_service.pb.go+++ b/backend/generated-go/v1/sheet_service.pb.go@@ -251,8 +251,6 @@ type Sheet struct {Content []byte `protobuf:"bytes,5,opt,name=content,proto3" json:"content,omitempty"`// content_size is the full size of the content, may not match the size of the `content` field.ContentSize int64 `protobuf:"varint,6,opt,name=content_size,json=contentSize,proto3" json:"content_size,omitempty"`- // Parsed metadata about SQL commands in the sheet.- Payload *SheetPayload `protobuf:"bytes,7,opt,name=payload,proto3" json:"payload,omitempty"`// The SQL dialect.Engine Engine `protobuf:"varint,8,opt,name=engine,proto3,enum=bytebase.v1.Engine" json:"engine,omitempty"`unknownFields protoimpl.UnknownFields@@ -331,13 +329,6 @@ func (x *Sheet) GetContentSize() int64 {return 0}-func (x *Sheet) GetPayload() *SheetPayload {- if x != nil {- return x.Payload- }- return nil-}-func (x *Sheet) GetEngine() Engine {if x != nil {return x.Engine@@ -345,51 +336,6 @@ func (x *Sheet) GetEngine() Engine {return Engine_ENGINE_UNSPECIFIED}-type SheetPayload struct {- state protoimpl.MessageState `protogen:"open.v1"`- // The start and end position of each command in the sheet statement.- Commands []*Range `protobuf:"bytes,1,rep,name=commands,proto3" json:"commands,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache-}--func (x *SheetPayload) Reset() {- *x = SheetPayload{}- mi := &file_v1_sheet_service_proto_msgTypes[5]- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- ms.StoreMessageInfo(mi)-}--func (x *SheetPayload) String() string {- return protoimpl.X.MessageStringOf(x)-}--func (*SheetPayload) ProtoMessage() {}--func (x *SheetPayload) ProtoReflect() protoreflect.Message {- mi := &file_v1_sheet_service_proto_msgTypes[5]- if x != nil {- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- if ms.LoadMessageInfo() == nil {- ms.StoreMessageInfo(mi)- }- return ms- }- return mi.MessageOf(x)-}--// Deprecated: Use SheetPayload.ProtoReflect.Descriptor instead.-func (*SheetPayload) Descriptor() ([]byte, []int) {- return file_v1_sheet_service_proto_rawDescGZIP(), []int{5}-}--func (x *SheetPayload) GetCommands() []*Range {- if x != nil {- return x.Commands- }- return nil-}-var File_v1_sheet_service_proto protoreflect.FileDescriptorconst file_v1_sheet_service_proto_rawDesc = "" +@@ -408,7 +354,7 @@ const file_v1_sheet_service_proto_rawDesc = "" +"\x0fGetSheetRequest\x12.\n" +"\x04name\x18\x01 \x01(\tB\x1a\xe0A\x02\xfaA\x14\n" +"\x12bytebase.com/SheetR\x04name\x12\x10\n" +- "\x03raw\x18\x02 \x01(\bR\x03raw\"\x96\x03\n" ++ "\x03raw\x18\x02 \x01(\bR\x03raw\"\xdc\x02\n" +"\x05Sheet\x12\x1a\n" +"\x04name\x18\x01 \x01(\tB\x06\xe0A\x02\xe0A\x05R\x04name\x12!\n" +"\x05title\x18\x02 \x01(\tB\v\xe0A\x02\xbaH\x05r\x03\x18\xc8\x01R\x05title\x12\x1d\n" +@@ -416,12 +362,9 @@ const file_v1_sheet_service_proto_rawDesc = "" +"\vcreate_time\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +"createTime\x12\x1d\n" +"\acontent\x18\x05 \x01(\fB\x03\xe0A\x02R\acontent\x12&\n" +- "\fcontent_size\x18\x06 \x01(\x03B\x03\xe0A\x03R\vcontentSize\x128\n" +- "\apayload\x18\a \x01(\v2\x19.bytebase.v1.SheetPayloadB\x03\xe0A\x03R\apayload\x120\n" ++ "\fcontent_size\x18\x06 \x01(\x03B\x03\xe0A\x03R\vcontentSize\x120\n" +"\x06engine\x18\b \x01(\x0e2\x13.bytebase.v1.EngineB\x03\xe0A\x02R\x06engine::\xeaA7\n" +- "\x12bytebase.com/Sheet\x12!projects/{project}/sheets/{sheet}\">\n" +- "\fSheetPayload\x12.\n" +- "\bcommands\x18\x01 \x03(\v2\x12.bytebase.v1.RangeR\bcommands2\xe0\x03\n" ++ "\x12bytebase.com/Sheet\x12!projects/{project}/sheets/{sheet}2\xe0\x03\n" +"\fSheetService\x12\x98\x01\n" +"\vCreateSheet\x12\x1f.bytebase.v1.CreateSheetRequest\x1a\x12.bytebase.v1.Sheet\"T\xdaA\fparent,sheet\x8a\xea0\x10bb.sheets.create\x90\xea0\x01\x82\xd3\xe4\x93\x02':\x05sheet\"\x1e/v1/{parent=projects/*}/sheets\x12\xb1\x01\n" +"\x11BatchCreateSheets\x12%.bytebase.v1.BatchCreateSheetsRequest\x1a&.bytebase.v1.BatchCreateSheetsResponse\"M\x8a\xea0\x10bb.sheets.create\x90\xea0\x01\x82\xd3\xe4\x93\x02/:\x01*\"*/v1/{parent=projects/*}/sheets:batchCreate\x12\x80\x01\n" +@@ -440,37 +383,33 @@ func file_v1_sheet_service_proto_rawDescGZIP() []byte {return file_v1_sheet_service_proto_rawDescData}-var file_v1_sheet_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)+var file_v1_sheet_service_proto_msgTypes = make([]protoimpl.MessageInfo, 5)var file_v1_sheet_service_proto_goTypes = []any{(*CreateSheetRequest)(nil), // 0: bytebase.v1.CreateSheetRequest(*BatchCreateSheetsRequest)(nil), // 1: bytebase.v1.BatchCreateSheetsRequest(*BatchCreateSheetsResponse)(nil), // 2: bytebase.v1.BatchCreateSheetsResponse(*GetSheetRequest)(nil), // 3: bytebase.v1.GetSheetRequest(*Sheet)(nil), // 4: bytebase.v1.Sheet- (*SheetPayload)(nil), // 5: bytebase.v1.SheetPayload- (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp- (Engine)(0), // 7: bytebase.v1.Engine- (*Range)(nil), // 8: bytebase.v1.Range+ (*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp+ (Engine)(0), // 6: bytebase.v1.Engine}var file_v1_sheet_service_proto_depIdxs = []int32{- 4, // 0: bytebase.v1.CreateSheetRequest.sheet:type_name -> bytebase.v1.Sheet- 0, // 1: bytebase.v1.BatchCreateSheetsRequest.requests:type_name -> bytebase.v1.CreateSheetRequest- 4, // 2: bytebase.v1.BatchCreateSheetsResponse.sheets:type_name -> bytebase.v1.Sheet- 6, // 3: bytebase.v1.Sheet.create_time:type_name -> google.protobuf.Timestamp- 5, // 4: bytebase.v1.Sheet.payload:type_name -> bytebase.v1.SheetPayload- 7, // 5: bytebase.v1.Sheet.engine:type_name -> bytebase.v1.Engine- 8, // 6: bytebase.v1.SheetPayload.commands:type_name -> bytebase.v1.Range- 0, // 7: bytebase.v1.SheetService.CreateSheet:input_type -> bytebase.v1.CreateSheetRequest- 1, // 8: bytebase.v1.SheetService.BatchCreateSheets:input_type -> bytebase.v1.BatchCreateSheetsRequest- 3, // 9: bytebase.v1.SheetService.GetSheet:input_type -> bytebase.v1.GetSheetRequest- 4, // 10: bytebase.v1.SheetService.CreateSheet:output_type -> bytebase.v1.Sheet- 2, // 11: bytebase.v1.SheetService.BatchCreateSheets:output_type -> bytebase.v1.BatchCreateSheetsResponse- 4, // 12: bytebase.v1.SheetService.GetSheet:output_type -> bytebase.v1.Sheet- 10, // [10:13] is the sub-list for method output_type- 7, // [7:10] is the sub-list for method input_type- 7, // [7:7] is the sub-list for extension type_name- 7, // [7:7] is the sub-list for extension extendee- 0, // [0:7] is the sub-list for field type_name+ 4, // 0: bytebase.v1.CreateSheetRequest.sheet:type_name -> bytebase.v1.Sheet+ 0, // 1: bytebase.v1.BatchCreateSheetsRequest.requests:type_name -> bytebase.v1.CreateSheetRequest+ 4, // 2: bytebase.v1.BatchCreateSheetsResponse.sheets:type_name -> bytebase.v1.Sheet+ 5, // 3: bytebase.v1.Sheet.create_time:type_name -> google.protobuf.Timestamp+ 6, // 4: bytebase.v1.Sheet.engine:type_name -> bytebase.v1.Engine+ 0, // 5: bytebase.v1.SheetService.CreateSheet:input_type -> bytebase.v1.CreateSheetRequest+ 1, // 6: bytebase.v1.SheetService.BatchCreateSheets:input_type -> bytebase.v1.BatchCreateSheetsRequest+ 3, // 7: bytebase.v1.SheetService.GetSheet:input_type -> bytebase.v1.GetSheetRequest+ 4, // 8: bytebase.v1.SheetService.CreateSheet:output_type -> bytebase.v1.Sheet+ 2, // 9: bytebase.v1.SheetService.BatchCreateSheets:output_type -> bytebase.v1.BatchCreateSheetsResponse+ 4, // 10: bytebase.v1.SheetService.GetSheet:output_type -> bytebase.v1.Sheet+ 8, // [8:11] is the sub-list for method output_type+ 5, // [5:8] is the sub-list for method input_type+ 5, // [5:5] is the sub-list for extension type_name+ 5, // [5:5] is the sub-list for extension extendee+ 0, // [0:5] is the sub-list for field type_name}func init() { file_v1_sheet_service_proto_init() }@@ -486,7 +425,7 @@ func file_v1_sheet_service_proto_init() {GoPackagePath: reflect.TypeOf(x{}).PkgPath(),RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_sheet_service_proto_rawDesc), len(file_v1_sheet_service_proto_rawDesc)),NumEnums: 0,- NumMessages: 6,+ NumMessages: 5,NumExtensions: 0,NumServices: 1,},diff --git a/backend/generated-go/v1/sheet_service_equal.pb.go b/backend/generated-go/v1/sheet_service_equal.pb.goindex 4a614ce434..2d92dcc092 100644--- a/backend/generated-go/v1/sheet_service_equal.pb.go+++ b/backend/generated-go/v1/sheet_service_equal.pb.go@@ -99,29 +99,8 @@ func (x *Sheet) Equal(y *Sheet) bool {if x.ContentSize != y.ContentSize {return false}- if !x.Payload.Equal(y.Payload) {- return false- }if x.Engine != y.Engine {return false}return true}--func (x *SheetPayload) Equal(y *SheetPayload) bool {- if x == y {- return true- }- if x == nil || y == nil {- return x == nil && y == nil- }- if len(x.Commands) != len(y.Commands) {- return false- }- for i := 0; i < len(x.Commands); i++ {- if !x.Commands[i].Equal(y.Commands[i]) {- return false- }- }- return true-}diff --git a/backend/plugin/db/clickhouse/clickhouse.go b/backend/plugin/db/clickhouse/clickhouse.goindex 09cec5d166..91ad5dd820 100644--- a/backend/plugin/db/clickhouse/clickhouse.go+++ b/backend/plugin/db/clickhouse/clickhouse.go@@ -172,8 +172,8 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, singleSQLs []baseopts.LogTransactionControl(storepb.TaskRunLog_TransactionControl_BEGIN, "")totalRowsAffected := int64(0)- for i, singleSQL := range singleSQLs {- opts.LogCommandExecute([]int32{int32(i)}, singleSQL.Text)+ for _, singleSQL := range singleSQLs {+ opts.LogCommandExecute(singleSQL.Range, singleSQL.Text)sqlResult, err := tx.ExecContext(ctx, singleSQL.Text)if err != nil {opts.LogCommandResponse(0, nil, err.Error())@@ -204,8 +204,8 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, singleSQLs []basefunc (d *Driver) executeInAutoCommitMode(ctx context.Context, singleSQLs []base.Statement, opts db.ExecuteOptions) (int64, error) {totalRowsAffected := int64(0)- for i, singleSQL := range singleSQLs {- opts.LogCommandExecute([]int32{int32(i)}, singleSQL.Text)+ for _, singleSQL := range singleSQLs {+ opts.LogCommandExecute(singleSQL.Range, singleSQL.Text)sqlResult, err := d.db.ExecContext(ctx, singleSQL.Text)if err != nil {opts.LogCommandResponse(0, nil, err.Error())diff --git a/backend/plugin/db/cockroachdb/cockroachdb.go b/backend/plugin/db/cockroachdb/cockroachdb.goindex 76c509eff2..2052816377 100644--- a/backend/plugin/db/cockroachdb/cockroachdb.go+++ b/backend/plugin/db/cockroachdb/cockroachdb.go@@ -265,18 +265,15 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO}var commands []base.Statement- var originalIndex []int32- var nonTransactionAndSetRoleStmts []string- var nonTransactionAndSetRoleStmtsIndex []int32+ var nonTransactionAndSetRoleStmts []base.Statementvar isPlsql boolsingleSQLs, err := crdbparser.SplitSQLStatement(statement)if err != nil {return 0, err}- for i, singleSQL := range singleSQLs {+ for _, singleSQL := range singleSQLs {commands = append(commands, base.Statement{Text: singleSQL})- originalIndex = append(originalIndex, int32(i))}// If the statement is a single statement and is a PL/pgSQL block,@@ -288,15 +285,12 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO}var tmpCommands []base.Statement- var tmpOriginalIndex []int32- for i, command := range commands {+ for _, command := range commands {switch {case isSetRoleStatement(command.Text):- nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command.Text)- nonTransactionAndSetRoleStmtsIndex = append(nonTransactionAndSetRoleStmtsIndex, originalIndex[i])+ nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command)case IsNonTransactionStatement(command.Text):- nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command.Text)- nonTransactionAndSetRoleStmtsIndex = append(nonTransactionAndSetRoleStmtsIndex, originalIndex[i])+ nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command)continuecase isSuperuserStatement(command.Text):// Use superuser privilege to run privileged statements.@@ -310,15 +304,14 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO// Regular statements, keep as is}tmpCommands = append(tmpCommands, command)- tmpOriginalIndex = append(tmpOriginalIndex, originalIndex[i])}- commands, originalIndex = tmpCommands, tmpOriginalIndex+ commands = tmpCommands// Execute based on transaction modeif transactionMode == common.TransactionModeOff {- return d.executeInAutoCommitMode(ctx, owner, statement, commands, originalIndex, nonTransactionAndSetRoleStmts, nonTransactionAndSetRoleStmtsIndex, opts, isPlsql)+ return d.executeInAutoCommitMode(ctx, owner, statement, commands, nonTransactionAndSetRoleStmts, opts, isPlsql)}- return d.executeInTransactionMode(ctx, owner, statement, commands, originalIndex, nonTransactionAndSetRoleStmts, nonTransactionAndSetRoleStmtsIndex, opts, isPlsql)+ return d.executeInTransactionMode(ctx, owner, statement, commands, nonTransactionAndSetRoleStmts, opts, isPlsql)}func (d *Driver) executeInTransactionMode(@@ -326,9 +319,7 @@ func (d *Driver) executeInTransactionMode(owner string,statement string,commands []base.Statement,- originalIndex []int32,- nonTransactionAndSetRoleStmts []string,- nonTransactionAndSetRoleStmtsIndex []int32,+ nonTransactionAndSetRoleStmts []base.Statement,opts db.ExecuteOptions,isPlsql bool,) (int64, error) {@@ -358,7 +349,7 @@ func (d *Driver) executeInTransactionMode(}); err != nil {return 0, errors.Wrapf(err, "failed to set role to database owner %q", owner)}- opts.LogCommandExecute([]int32{0}, statement)+ opts.LogCommandExecute(&storepb.Range{Start: 0, End: int32(len(statement))}, statement)if err := crdb.Execute(func() error {_, err := conn.ExecContext(ctx, statement)return err@@ -403,9 +394,8 @@ func (d *Driver) executeInTransactionMode(return err}- for i, command := range commands {- indexes := []int32{originalIndex[i]}- opts.LogCommandExecute(indexes, command.Text)+ for _, command := range commands {+ opts.LogCommandExecute(command.Range, command.Text)rr := tx.Conn().PgConn().Exec(ctx, command.Text)results, err := rr.ReadAll()@@ -453,11 +443,10 @@ func (d *Driver) executeInTransactionMode(return 0, errors.Wrapf(err, "failed to set role to database owner %q", owner)}// Run non-transaction statements at the end.- for i, stmt := range nonTransactionAndSetRoleStmts {- indexes := []int32{nonTransactionAndSetRoleStmtsIndex[i]}- opts.LogCommandExecute(indexes, stmt)+ for _, stmt := range nonTransactionAndSetRoleStmts {+ opts.LogCommandExecute(stmt.Range, stmt.Text)if err := crdb.Execute(func() error {- _, err := conn.ExecContext(ctx, stmt)+ _, err := conn.ExecContext(ctx, stmt.Text)return err}); err != nil {opts.LogCommandResponse(0, []int64{0}, err.Error())@@ -473,17 +462,12 @@ func (d *Driver) executeInAutoCommitMode(owner string,statement string,commands []base.Statement,- originalIndex []int32,- nonTransactionAndSetRoleStmts []string,- nonTransactionAndSetRoleStmtsIndex []int32,+ nonTransactionAndSetRoleStmts []base.Statement,opts db.ExecuteOptions,isPlsql bool,) (int64, error) {// For auto-commit mode, treat all statements as non-transactional- for i, command := range commands {- nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command.Text)- nonTransactionAndSetRoleStmtsIndex = append(nonTransactionAndSetRoleStmtsIndex, originalIndex[i])- }+ nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, commands...)conn, err := d.db.Conn(ctx)if err != nil {@@ -511,7 +495,7 @@ func (d *Driver) executeInAutoCommitMode(}); err != nil {return 0, errors.Wrapf(err, "failed to set role to database owner %q", owner)}- opts.LogCommandExecute([]int32{0}, statement)+ opts.LogCommandExecute(&storepb.Range{Start: 0, End: int32(len(statement))}, statement)if err := crdb.Execute(func() error {_, err := conn.ExecContext(ctx, statement)return err@@ -532,12 +516,11 @@ func (d *Driver) executeInAutoCommitMode(totalRowsAffected := int64(0)// Execute all statements individually in auto-commit mode- for i, stmt := range nonTransactionAndSetRoleStmts {- indexes := []int32{nonTransactionAndSetRoleStmtsIndex[i]}- opts.LogCommandExecute(indexes, stmt)+ for _, stmt := range nonTransactionAndSetRoleStmts {+ opts.LogCommandExecute(stmt.Range, stmt.Text)if err := crdb.Execute(func() error {- sqlResult, err := conn.ExecContext(ctx, stmt)+ sqlResult, err := conn.ExecContext(ctx, stmt.Text)if err != nil {opts.LogCommandResponse(0, []int64{0}, err.Error())return errdiff --git a/backend/plugin/db/driver.go b/backend/plugin/db/driver.goindex fcb01db83d..7c2aca49a9 100644--- a/backend/plugin/db/driver.go+++ b/backend/plugin/db/driver.go@@ -286,7 +286,7 @@ func (o *ExecuteOptions) LogSchemaDumpEnd(derr string) {}// LogCommandExecute logs the execution of a command.-func (o *ExecuteOptions) LogCommandExecute(commandIndexes []int32, commandText string) {+func (o *ExecuteOptions) LogCommandExecute(commandRange *storepb.Range, commandText string) {if o == nil || o.CreateTaskRunLog == nil {return}@@ -294,7 +294,7 @@ func (o *ExecuteOptions) LogCommandExecute(commandIndexes []int32, commandText sif o.LogCommandStatement {ce.Statement = commandText} else {- ce.CommandIndexes = commandIndexes+ ce.Range = commandRange}err := o.CreateTaskRunLog(time.Now(), &storepb.TaskRunLog{Type: storepb.TaskRunLog_COMMAND_EXECUTE,diff --git a/backend/plugin/db/dynamodb/dynamodb.go b/backend/plugin/db/dynamodb/dynamodb.goindex 89e4c9c696..7cff11b0a1 100644--- a/backend/plugin/db/dynamodb/dynamodb.go+++ b/backend/plugin/db/dynamodb/dynamodb.go@@ -101,10 +101,10 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOif err != nil {return 0, errors.Wrapf(err, "failed to split multi statement")}- nonEmptyStatements, idxMap := base.FilterEmptyStatementsWithIndexes(statements)+ nonEmptyStatements := base.FilterEmptyStatements(statements)- for currentIndex, statement := range nonEmptyStatements {- opts.LogCommandExecute([]int32{int32(idxMap[currentIndex])}, statement.Text)+ for _, statement := range nonEmptyStatements {+ opts.LogCommandExecute(statement.Range, statement.Text)_, err := d.client.ExecuteTransaction(ctx, &dynamodb.ExecuteTransactionInput{TransactStatements: []types.ParameterizedStatement{{diff --git a/backend/plugin/db/mssql/mssql.go b/backend/plugin/db/mssql/mssql.goindex 21ac689ad0..8a21332c81 100644--- a/backend/plugin/db/mssql/mssql.go+++ b/backend/plugin/db/mssql/mssql.go@@ -215,8 +215,7 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, statement string,// Try send the last batch to server.v := batch.Batch()if v != nil && len(v.Text) > 0 {- indexes := []int32{int32(idx)}- opts.LogCommandExecute(indexes, v.Text)+ opts.LogCommandExecute(&storepb.Range{Start: int32(v.Start), End: int32(v.End)}, v.Text)rowsAffected, err := execute(ctx, tx, v.Text)if err != nil {opts.LogCommandResponse(0, nil, err.Error())@@ -236,10 +235,9 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, statement string,case *tsqlbatch.GoCommand:b := batch.Batch()// Try send the batch to server.- indexes := []int32{int32(idx)}idx++for i := uint(0); i < v.Count; i++ {- opts.LogCommandExecute(indexes, b.Text)+ opts.LogCommandExecute(&storepb.Range{Start: int32(b.Start), End: int32(b.End)}, b.Text)rowsAffected, err := execute(ctx, tx, b.Text)if err != nil {opts.LogCommandResponse(0, nil, err.Error())@@ -276,8 +274,7 @@ func (d *Driver) executeInAutoCommitMode(ctx context.Context, statement string,// Try send the last batch to server.v := batch.Batch()if v != nil && len(v.Text) > 0 {- indexes := []int32{int32(idx)}- opts.LogCommandExecute(indexes, v.Text)+ opts.LogCommandExecute(&storepb.Range{Start: int32(v.Start), End: int32(v.End)}, v.Text)rowsAffected, err := d.executeAutoCommit(ctx, v.Text)if err != nil {opts.LogCommandResponse(0, nil, err.Error())@@ -297,10 +294,9 @@ func (d *Driver) executeInAutoCommitMode(ctx context.Context, statement string,case *tsqlbatch.GoCommand:b := batch.Batch()// Execute the batch in auto-commit mode- indexes := []int32{int32(idx)}idx++for i := uint(0); i < v.Count; i++ {- opts.LogCommandExecute(indexes, b.Text)+ opts.LogCommandExecute(&storepb.Range{Start: int32(b.Start), End: int32(b.End)}, b.Text)rowsAffected, err := d.executeAutoCommit(ctx, b.Text)if err != nil {opts.LogCommandResponse(0, nil, err.Error())diff --git a/backend/plugin/db/mysql/mysql.go b/backend/plugin/db/mysql/mysql.goindex 2561814312..5f2c8192c2 100644--- a/backend/plugin/db/mysql/mysql.go+++ b/backend/plugin/db/mysql/mysql.go@@ -337,14 +337,13 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOvar totalCommands intvar commands []base.Statement- var originalIndex []int32oneshot := trueif len(statement) <= common.MaxSheetCheckSize {singleSQLs, err := mysqlparser.SplitSQL(statement)if err != nil {return 0, errors.Wrapf(err, "failed to split sql")}- singleSQLs, originalIndex = base.FilterEmptyStatementsWithIndexes(singleSQLs)+ singleSQLs = base.FilterEmptyStatements(singleSQLs)if len(singleSQLs) == 0 {return 0, nil}@@ -360,7 +359,6 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOText: statement,},}- originalIndex = []int32{0}}// Validate isolation level for MySQL if specified@@ -378,13 +376,13 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO// Execute based on transaction modeif transactionConfig.Mode == common.TransactionModeOff {- return d.executeInAutoCommitMode(ctx, conn, commands, originalIndex, opts, connectionID)+ return d.executeInAutoCommitMode(ctx, conn, commands, opts, connectionID)}- return d.executeInTransactionMode(ctx, conn, commands, originalIndex, opts, connectionID, transactionConfig.Isolation)+ return d.executeInTransactionMode(ctx, conn, commands, opts, connectionID, transactionConfig.Isolation)}// executeInTransactionMode executes statements within a single transaction-func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, originalIndex []int32, opts db.ExecuteOptions, connectionID string, isolationLevel common.IsolationLevel) (int64, error) {+func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, opts db.ExecuteOptions, connectionID string, isolationLevel common.IsolationLevel) (int64, error) {var totalRowsAffected int64if err := conn.Raw(func(driverConn any) error {@@ -420,9 +418,8 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, copts.LogTransactionControl(storepb.TaskRunLog_TransactionControl_ROLLBACK, rerr)}()- for i, command := range commands {- indexes := []int32{originalIndex[i]}- opts.LogCommandExecute(indexes, command.Text)+ for _, command := range commands {+ opts.LogCommandExecute(command.Range, command.Text)sqlWithBytebaseAppComment := util.MySQLPrependBytebaseAppComment(command.Text)sqlResult, err := exer.ExecContext(ctx, sqlWithBytebaseAppComment, nil)@@ -471,7 +468,7 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, c}// executeInAutoCommitMode executes statements sequentially in auto-commit mode-func (d *Driver) executeInAutoCommitMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, originalIndex []int32, opts db.ExecuteOptions, connectionID string) (int64, error) {+func (d *Driver) executeInAutoCommitMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, opts db.ExecuteOptions, connectionID string) (int64, error) {var totalRowsAffected int64if err := conn.Raw(func(driverConn any) error {@@ -479,8 +476,7 @@ func (d *Driver) executeInAutoCommitMode(ctx context.Context, conn *sql.Conn, coexer := driverConn.(driver.ExecerContext)for i, command := range commands {- indexes := []int32{originalIndex[i]}- opts.LogCommandExecute(indexes, command.Text)+ opts.LogCommandExecute(command.Range, command.Text)sqlWithBytebaseAppComment := util.MySQLPrependBytebaseAppComment(command.Text)sqlResult, err := exer.ExecContext(ctx, sqlWithBytebaseAppComment, nil)diff --git a/backend/plugin/db/oracle/oracle.go b/backend/plugin/db/oracle/oracle.goindex 989dd11ff7..78d4ea8854 100644--- a/backend/plugin/db/oracle/oracle.go+++ b/backend/plugin/db/oracle/oracle.go@@ -118,14 +118,13 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO}var commands []base.Statement- var originalIndex []int32if len(statement) <= common.MaxSheetCheckSize {// Use Oracle sql parser.singleSQLs, err := plsqlparser.SplitSQL(statement)if err != nil {return 0, errors.Wrapf(err, "failed to split sql")}- singleSQLs, originalIndex = base.FilterEmptyStatementsWithIndexes(singleSQLs)+ singleSQLs = base.FilterEmptyStatements(singleSQLs)if len(singleSQLs) == 0 {return 0, nil}@@ -136,7 +135,6 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOText: statement,},}- originalIndex = []int32{0}}conn, err := d.db.Conn(ctx)@@ -147,13 +145,13 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO// Execute based on transaction modeif transactionMode == common.TransactionModeOff {- return d.executeInAutoCommitMode(ctx, conn, commands, originalIndex, opts)+ return d.executeInAutoCommitMode(ctx, conn, commands, opts)}- return d.executeInTransactionMode(ctx, conn, commands, originalIndex, opts)+ return d.executeInTransactionMode(ctx, conn, commands, opts)}// executeInTransactionMode executes statements within a single transaction-func (*Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, originalIndex []int32, opts db.ExecuteOptions) (int64, error) {+func (*Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, opts db.ExecuteOptions) (int64, error) {tx, err := conn.BeginTx(ctx, nil)if err != nil {opts.LogTransactionControl(storepb.TaskRunLog_TransactionControl_BEGIN, err.Error())@@ -175,9 +173,8 @@ func (*Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, com}()totalRowsAffected := int64(0)- for i, command := range commands {- indexes := []int32{originalIndex[i]}- opts.LogCommandExecute(indexes, command.Text)+ for _, command := range commands {+ opts.LogCommandExecute(command.Range, command.Text)sqlResult, err := tx.ExecContext(ctx, command.Text)if err != nil {@@ -208,11 +205,10 @@ func (*Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, com}// executeInAutoCommitMode executes statements sequentially in auto-commit mode-func (*Driver) executeInAutoCommitMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, originalIndex []int32, opts db.ExecuteOptions) (int64, error) {+func (*Driver) executeInAutoCommitMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, opts db.ExecuteOptions) (int64, error) {totalRowsAffected := int64(0)for i, command := range commands {- indexes := []int32{originalIndex[i]}- opts.LogCommandExecute(indexes, command.Text)+ opts.LogCommandExecute(command.Range, command.Text)sqlResult, err := conn.ExecContext(ctx, command.Text)if err != nil {diff --git a/backend/plugin/db/pg/pg.go b/backend/plugin/db/pg/pg.goindex 7ca9783f2f..eff1b35253 100644--- a/backend/plugin/db/pg/pg.go+++ b/backend/plugin/db/pg/pg.go@@ -380,9 +380,7 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO}var commands []base.Statement- var originalIndex []int32- var nonTransactionAndSetRoleStmts []string- var nonTransactionAndSetRoleStmtsIndex []int32+ var nonTransactionAndSetRoleStmts []base.Statementvar isPlsql bool// HACK(p0ny): always split for pg//nolint@@ -391,7 +389,7 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOif err != nil {return 0, err}- commands, originalIndex = base.FilterEmptyStatementsWithIndexes(singleSQLs)+ commands = base.FilterEmptyStatements(singleSQLs)// If the statement is a single statement and is a PL/pgSQL block,// we should execute it as a single statement without transaction.@@ -402,15 +400,12 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO}var tmpCommands []base.Statement- var tmpOriginalIndex []int32- for i, command := range commands {+ for _, command := range commands {switch {case isSetRoleStatement(command.Text):- nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command.Text)- nonTransactionAndSetRoleStmtsIndex = append(nonTransactionAndSetRoleStmtsIndex, originalIndex[i])+ nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command)case IsNonTransactionStatement(command.Text):- nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command.Text)- nonTransactionAndSetRoleStmtsIndex = append(nonTransactionAndSetRoleStmtsIndex, originalIndex[i])+ nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command)continuecase isSuperuserStatement(command.Text) && d.connectionCtx.UseDatabaseOwner:// Use superuser privilege to run privileged statements.@@ -422,17 +417,16 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOcommand.Text = fmt.Sprintf("SET LOCAL ROLE NONE;%sSET LOCAL ROLE '%s';", ct, owner)}tmpCommands = append(tmpCommands, command)- tmpOriginalIndex = append(tmpOriginalIndex, originalIndex[i])}- commands, originalIndex = tmpCommands, tmpOriginalIndex+ commands = tmpCommands}// Execute based on transaction modevar affectedRows int64if transactionMode == common.TransactionModeOff {- affectedRows, err = d.executeInAutoCommitMode(ctx, owner, statement, commands, originalIndex, nonTransactionAndSetRoleStmts, nonTransactionAndSetRoleStmtsIndex, opts, isPlsql)+ affectedRows, err = d.executeInAutoCommitMode(ctx, owner, statement, commands, nonTransactionAndSetRoleStmts, opts, isPlsql)} else {- affectedRows, err = d.executeInTransactionMode(ctx, owner, statement, commands, originalIndex, nonTransactionAndSetRoleStmts, nonTransactionAndSetRoleStmtsIndex, opts, isPlsql)+ affectedRows, err = d.executeInTransactionMode(ctx, owner, statement, commands, nonTransactionAndSetRoleStmts, opts, isPlsql)}if err == nil {return affectedRows, nil@@ -453,9 +447,9 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO// Do retry.if transactionMode == common.TransactionModeOff {- affectedRows, err = d.executeInAutoCommitMode(ctx, owner, statement, commands, originalIndex, nonTransactionAndSetRoleStmts, nonTransactionAndSetRoleStmtsIndex, opts, isPlsql)+ affectedRows, err = d.executeInAutoCommitMode(ctx, owner, statement, commands, nonTransactionAndSetRoleStmts, opts, isPlsql)} else {- affectedRows, err = d.executeInTransactionMode(ctx, owner, statement, commands, originalIndex, nonTransactionAndSetRoleStmts, nonTransactionAndSetRoleStmtsIndex, opts, isPlsql)+ affectedRows, err = d.executeInTransactionMode(ctx, owner, statement, commands, nonTransactionAndSetRoleStmts, opts, isPlsql)}if err == nil {break@@ -485,9 +479,7 @@ func (d *Driver) executeInTransactionMode(owner string,statement string,commands []base.Statement,- originalIndex []int32,- nonTransactionAndSetRoleStmts []string,- nonTransactionAndSetRoleStmtsIndex []int32,+ nonTransactionAndSetRoleStmts []base.Statement,opts db.ExecuteOptions,isPlsql bool,) (int64, error) {@@ -516,7 +508,7 @@ func (d *Driver) executeInTransactionMode(return 0, errors.Wrapf(err, "failed to set role to database owner %q", owner)}}- opts.LogCommandExecute([]int32{0}, statement)+ opts.LogCommandExecute(&storepb.Range{Start: 0, End: int32(len(statement))}, statement)if _, err := conn.ExecContext(ctx, statement); err != nil {opts.LogCommandResponse(0, []int64{0}, err.Error())return 0, err@@ -560,9 +552,8 @@ func (d *Driver) executeInTransactionMode(}}- for i, command := range commands {- indexes := []int32{originalIndex[i]}- opts.LogCommandExecute(indexes, command.Text)+ for _, command := range commands {+ opts.LogCommandExecute(command.Range, command.Text)rr := tx.Conn().PgConn().Exec(ctx, command.Text)results, err := rr.ReadAll()@@ -614,10 +605,9 @@ func (d *Driver) executeInTransactionMode(}}// Run non-transaction statements at the end.- for i, stmt := range nonTransactionAndSetRoleStmts {- indexes := []int32{nonTransactionAndSetRoleStmtsIndex[i]}- opts.LogCommandExecute(indexes, stmt)- if _, err := conn.ExecContext(ctx, stmt); err != nil {+ for _, stmt := range nonTransactionAndSetRoleStmts {+ opts.LogCommandExecute(stmt.Range, stmt.Text)+ if _, err := conn.ExecContext(ctx, stmt.Text); err != nil {opts.LogCommandResponse(0, []int64{0}, err.Error())return 0, err}@@ -631,17 +621,12 @@ func (d *Driver) executeInAutoCommitMode(owner string,statement string,commands []base.Statement,- originalIndex []int32,- nonTransactionAndSetRoleStmts []string,- nonTransactionAndSetRoleStmtsIndex []int32,+ nonTransactionAndSetRoleStmts []base.Statement,opts db.ExecuteOptions,isPlsql bool,) (int64, error) {// For auto-commit mode, treat all statements as non-transactional- for i, command := range commands {- nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command.Text)- nonTransactionAndSetRoleStmtsIndex = append(nonTransactionAndSetRoleStmtsIndex, originalIndex[i])- }+ nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, commands...)conn, err := d.db.Conn(ctx)if err != nil {@@ -669,7 +654,7 @@ func (d *Driver) executeInAutoCommitMode(}if isPlsql {- opts.LogCommandExecute([]int32{0}, statement)+ opts.LogCommandExecute(&storepb.Range{Start: 0, End: int32(len(statement))}, statement)if _, err := conn.ExecContext(ctx, statement); err != nil {opts.LogCommandResponse(0, []int64{0}, err.Error())return 0, err@@ -680,11 +665,10 @@ func (d *Driver) executeInAutoCommitMode(totalRowsAffected := int64(0)// Execute all statements individually in auto-commit mode- for i, stmt := range nonTransactionAndSetRoleStmts {- indexes := []int32{nonTransactionAndSetRoleStmtsIndex[i]}- opts.LogCommandExecute(indexes, stmt)+ for _, stmt := range nonTransactionAndSetRoleStmts {+ opts.LogCommandExecute(stmt.Range, stmt.Text)- sqlResult, err := conn.ExecContext(ctx, stmt)+ sqlResult, err := conn.ExecContext(ctx, stmt.Text)if err != nil {opts.LogCommandResponse(0, []int64{0}, err.Error())if isLockTimeoutError(err.Error()) {diff --git a/backend/plugin/db/redshift/redshift.go b/backend/plugin/db/redshift/redshift.goindex c6398e53d2..c6c783b6ed 100644--- a/backend/plugin/db/redshift/redshift.go+++ b/backend/plugin/db/redshift/redshift.go@@ -256,7 +256,7 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, commands []base.S}()for i, command := range commands {- opts.LogCommandExecute([]int32{int32(i)}, command.Text)+ opts.LogCommandExecute(command.Range, command.Text)// Log the query statement in char code to see if there are some control characters that cause issues.var charCode []runefor _, r := range command.Text {@@ -296,7 +296,7 @@ func (d *Driver) executeInAutoCommitMode(ctx context.Context, commands []base.SttotalRowsAffected := int64(0)for i, command := range commands {- opts.LogCommandExecute([]int32{int32(i)}, command.Text)+ opts.LogCommandExecute(command.Range, command.Text)// Log the query statement in char code to see if there are some control characters that cause issues.var charCode []runefor _, r := range command.Text {diff --git a/backend/plugin/db/snowflake/snowflake.go b/backend/plugin/db/snowflake/snowflake.goindex 3ddef740cb..fb5e56bfd4 100644--- a/backend/plugin/db/snowflake/snowflake.go+++ b/backend/plugin/db/snowflake/snowflake.go@@ -277,7 +277,7 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, statement string,}// Log the entire multi-statement execution- opts.LogCommandExecute([]int32{0}, statement)+ opts.LogCommandExecute(&storepb.Range{Start: 0, End: int32(len(statement))}, statement)result, err := tx.ExecContext(mctx, statement)if err != nil {@@ -313,7 +313,7 @@ func (d *Driver) executeInAutoCommitMode(ctx context.Context, statement string,}// Log the entire multi-statement execution- opts.LogCommandExecute([]int32{0}, statement)+ opts.LogCommandExecute(&storepb.Range{Start: 0, End: int32(len(statement))}, statement)result, err := d.db.ExecContext(mctx, statement)if err != nil {diff --git a/backend/plugin/db/tidb/tidb.go b/backend/plugin/db/tidb/tidb.goindex 70e6add143..7d732c7fbb 100644--- a/backend/plugin/db/tidb/tidb.go+++ b/backend/plugin/db/tidb/tidb.go@@ -183,18 +183,16 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO}slog.Debug("connectionID", slog.String("connectionID", connectionID))- var remainingSQLsIndex, nonTransactionStmtsIndex []intvar nonTransactionStmts []base.Statementvar totalCommands intvar commands []base.Statement- var originalIndex []int32oneshot := trueif len(statement) <= common.MaxSheetCheckSize {singleSQLs, err := tidbparser.SplitSQL(statement)if err != nil {return 0, errors.Wrapf(err, "failed to split sql")}- singleSQLs, originalIndex = base.FilterEmptyStatementsWithIndexes(singleSQLs)+ singleSQLs = base.FilterEmptyStatements(singleSQLs)if len(singleSQLs) == 0 {return 0, nil}@@ -204,14 +202,12 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO// Find non-transactional statements.// TiDB cannot run create table and create index in a single transaction.var remainingSQLs []base.Statement- for i, singleSQL := range singleSQLs {+ for _, singleSQL := range singleSQLs {if isNonTransactionStatement(singleSQL.Text) {nonTransactionStmts = append(nonTransactionStmts, singleSQL)- nonTransactionStmtsIndex = append(nonTransactionStmtsIndex, i)continue}remainingSQLs = append(remainingSQLs, singleSQL)- remainingSQLsIndex = append(remainingSQLsIndex, i)}commands = remainingSQLs}@@ -222,19 +218,17 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOText: statement,},}- originalIndex = []int32{0}- remainingSQLsIndex = []int{0}}// Execute based on transaction modeif transactionMode == common.TransactionModeOff {- return d.executeInAutoCommitMode(ctx, conn, commands, nonTransactionStmts, remainingSQLsIndex, nonTransactionStmtsIndex, originalIndex, opts, connectionID)+ return d.executeInAutoCommitMode(ctx, conn, commands, nonTransactionStmts, opts, connectionID)}- return d.executeInTransactionMode(ctx, conn, commands, nonTransactionStmts, remainingSQLsIndex, nonTransactionStmtsIndex, originalIndex, opts, connectionID)+ return d.executeInTransactionMode(ctx, conn, commands, nonTransactionStmts, opts, connectionID)}// executeInTransactionMode executes statements within a single transaction-func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, nonTransactionStmts []base.Statement, remainingSQLsIndex, nonTransactionStmtsIndex []int, originalIndex []int32, opts db.ExecuteOptions, connectionID string) (int64, error) {+func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, nonTransactionStmts []base.Statement, opts db.ExecuteOptions, connectionID string) (int64, error) {var totalRowsAffected int64if err := conn.Raw(func(driverConn any) error {@@ -263,9 +257,8 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, copts.LogTransactionControl(storepb.TaskRunLog_TransactionControl_ROLLBACK, rerr)}()- for i, command := range commands {- indexes := []int32{originalIndex[remainingSQLsIndex[i]]}- opts.LogCommandExecute(indexes, command.Text)+ for _, command := range commands {+ opts.LogCommandExecute(command.Range, command.Text)sqlWithBytebaseAppComment := util.MySQLPrependBytebaseAppComment(command.Text)sqlResult, err := exer.ExecContext(ctx, sqlWithBytebaseAppComment, nil)@@ -311,9 +304,8 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, c}// Run non-transaction statements at the end.- for i, stmt := range nonTransactionStmts {- indexes := []int32{originalIndex[nonTransactionStmtsIndex[i]]}- opts.LogCommandExecute(indexes, stmt.Text)+ for _, stmt := range nonTransactionStmts {+ opts.LogCommandExecute(stmt.Range, stmt.Text)if _, err := d.db.ExecContext(ctx, stmt.Text); err != nil {opts.LogCommandResponse(0, []int64{0}, err.Error())return 0, err@@ -324,42 +316,21 @@ func (d *Driver) executeInTransactionMode(ctx context.Context, conn *sql.Conn, c}// executeInAutoCommitMode executes statements sequentially in auto-commit mode-func (d *Driver) executeInAutoCommitMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, nonTransactionStmts []base.Statement, remainingSQLsIndex, nonTransactionStmtsIndex []int, originalIndex []int32, opts db.ExecuteOptions, connectionID string) (int64, error) {+func (d *Driver) executeInAutoCommitMode(ctx context.Context, conn *sql.Conn, commands []base.Statement, nonTransactionStmts []base.Statement, opts db.ExecuteOptions, connectionID string) (int64, error) {var totalRowsAffected int64- // Execute all statements (including non-transactional ones) in order+ // Execute all statements (including non-transactional ones)+ // In auto-commit mode, execute commands followed by non-transactional statementsallCommands := make([]base.Statement, 0, len(commands)+len(nonTransactionStmts))- allIndexes := make([]int, 0, len(commands)+len(nonTransactionStmts))-- // Merge commands and non-transactional statements while preserving original order- cmdIdx, nonTxIdx := 0, 0- for cmdIdx < len(commands) || nonTxIdx < len(nonTransactionStmts) {- if cmdIdx >= len(commands) {- allCommands = append(allCommands, nonTransactionStmts[nonTxIdx])- allIndexes = append(allIndexes, nonTransactionStmtsIndex[nonTxIdx])- nonTxIdx++- } else if nonTxIdx >= len(nonTransactionStmts) {- allCommands = append(allCommands, commands[cmdIdx])- allIndexes = append(allIndexes, remainingSQLsIndex[cmdIdx])- cmdIdx++- } else if remainingSQLsIndex[cmdIdx] < nonTransactionStmtsIndex[nonTxIdx] {- allCommands = append(allCommands, commands[cmdIdx])- allIndexes = append(allIndexes, remainingSQLsIndex[cmdIdx])- cmdIdx++- } else {- allCommands = append(allCommands, nonTransactionStmts[nonTxIdx])- allIndexes = append(allIndexes, nonTransactionStmtsIndex[nonTxIdx])- nonTxIdx++- }- }+ allCommands = append(allCommands, commands...)+ allCommands = append(allCommands, nonTransactionStmts...)if err := conn.Raw(func(driverConn any) error {//nolintexer := driverConn.(driver.ExecerContext)for i, command := range allCommands {- indexes := []int32{originalIndex[allIndexes[i]]}- opts.LogCommandExecute(indexes, command.Text)+ opts.LogCommandExecute(command.Range, command.Text)sqlWithBytebaseAppComment := util.MySQLPrependBytebaseAppComment(command.Text)sqlResult, err := exer.ExecContext(ctx, sqlWithBytebaseAppComment, nil)diff --git a/backend/plugin/db/trino/trino.go b/backend/plugin/db/trino/trino.goindex 02ba24c867..51050b2101 100644--- a/backend/plugin/db/trino/trino.go+++ b/backend/plugin/db/trino/trino.go@@ -173,7 +173,7 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteOsingleSQLs[i] = base.Statement{Text: stmt}}- commands, originalIndex := base.FilterEmptyStatementsWithIndexes(singleSQLs)+ commands := base.FilterEmptyStatements(singleSQLs)if len(commands) == 0 {return 0, nil}@@ -186,9 +186,8 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO// but we still parse and respect the transaction mode directive for consistencyvar totalRowsAffected int64- for i, command := range commands {- indexes := []int32{originalIndex[i]}- opts.LogCommandExecute(indexes, command.Text)+ for _, command := range commands {+ opts.LogCommandExecute(command.Range, command.Text)result, err := conn.ExecContext(ctx, command.Text)if err != nil {diff --git a/backend/plugin/parser/base/statement.go b/backend/plugin/parser/base/statement.goindex 5097811dbe..7f1469b6d5 100644--- a/backend/plugin/parser/base/statement.go+++ b/backend/plugin/parser/base/statement.go@@ -44,19 +44,6 @@ func FilterEmptyStatements(list []Statement) []Statement {return result}-// FilterEmptyStatementsWithIndexes removes empty statements and returns original indexes.-func FilterEmptyStatementsWithIndexes(list []Statement) ([]Statement, []int32) {- var result []Statement- var originalIndex []int32- for i, stmt := range list {- if !stmt.Empty {- result = append(result, stmt)- originalIndex = append(originalIndex, int32(i))- }- }- return result, originalIndex-}-// FilterEmptyParsedStatements removes empty parsed statements from the list.func FilterEmptyParsedStatements(list []ParsedStatement) []ParsedStatement {var result []ParsedStatement@@ -68,19 +55,6 @@ func FilterEmptyParsedStatements(list []ParsedStatement) []ParsedStatement {return result}-// FilterEmptyParsedStatementsWithIndexes removes empty parsed statements and returns original indexes.-func FilterEmptyParsedStatementsWithIndexes(list []ParsedStatement) ([]ParsedStatement, []int32) {- var result []ParsedStatement- var originalIndex []int32- for i, stmt := range list {- if !stmt.Empty {- result = append(result, stmt)- originalIndex = append(originalIndex, int32(i))- }- }- return result, originalIndex-}-// ExtractASTs extracts non-nil ASTs from a slice of ParsedStatements.// Empty statements (with nil AST) are skipped.// Returns nil if no ASTs are found (preserves nil-check compatibility).diff --git a/backend/plugin/parser/base/statement_test.go b/backend/plugin/parser/base/statement_test.goindex 1a0bb9acfd..e046db345a 100644--- a/backend/plugin/parser/base/statement_test.go+++ b/backend/plugin/parser/base/statement_test.go@@ -23,19 +23,6 @@ func TestFilterEmptyStatements(t *testing.T) {require.Equal(t, "SELECT 2", result[1].Text)}-func TestFilterEmptyStatementsWithIndexes(t *testing.T) {- statements := []Statement{- {Text: "SELECT 1", Empty: false},- {Text: "", Empty: true},- {Text: "SELECT 2", Empty: false},- }-- result, indexes := FilterEmptyStatementsWithIndexes(statements)-- require.Len(t, result, 2)- require.Equal(t, []int32{0, 2}, indexes)-}-func TestFilterEmptyParsedStatements(t *testing.T) {statements := []ParsedStatement{{Statement: Statement{Text: "SELECT 1", Empty: false}, AST: &ANTLRAST{}},@@ -50,19 +37,6 @@ func TestFilterEmptyParsedStatements(t *testing.T) {require.Equal(t, "SELECT 2", result[1].Text)}-func TestFilterEmptyParsedStatementsWithIndexes(t *testing.T) {- statements := []ParsedStatement{- {Statement: Statement{Text: "SELECT 1", Empty: false}, AST: &ANTLRAST{}},- {Statement: Statement{Text: "", Empty: true}, AST: &ANTLRAST{}},- {Statement: Statement{Text: "SELECT 2", Empty: false}, AST: &ANTLRAST{}},- }-- result, indexes := FilterEmptyParsedStatementsWithIndexes(statements)-- require.Len(t, result, 2)- require.Equal(t, []int32{0, 2}, indexes)-}-func TestExtractASTs(t *testing.T) {ast1 := &ANTLRAST{StartPosition: &storepb.Position{Line: 1}}ast2 := &ANTLRAST{StartPosition: &storepb.Position{Line: 2}}diff --git a/frontend/src/components/Plan/components/RolloutView/v2/TaskRunLogViewer/useTaskRunLogSections.ts b/frontend/src/components/Plan/components/RolloutView/v2/TaskRunLogViewer/useTaskRunLogSections.tsindex 6afc362c6a..ee3a3f11f7 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/TaskRunLogViewer/useTaskRunLogSections.ts+++ b/frontend/src/components/Plan/components/RolloutView/v2/TaskRunLogViewer/useTaskRunLogSections.ts@@ -14,7 +14,6 @@ import {TaskRunLogEntry_Type,} from "@/types/proto-es/v1/rollout_service_pb";import type { Sheet } from "@/types/proto-es/v1/sheet_service_pb";-import { extractSheetCommandByIndex } from "@/utils";import { addToSet, deleteFromSet } from "../utils/reactivity";import type { DeployGroup, DisplayItem, Section, SectionStatus } from "./types";import {@@ -97,13 +96,14 @@ export const useTaskRunLogSections = (let statement: string | undefined;if (cmd.statement) {statement = cmd.statement;- } else if (cmd.commandIndexes.length > 0) {+ } else if (cmd.range) {const sheetValue = toValue(sheet);if (sheetValue) {- statement = extractSheetCommandByIndex(- sheetValue,- cmd.commandIndexes[0]+ const subarray = sheetValue.content.subarray(+ cmd.range.start,+ cmd.range.end);+ statement = new TextDecoder().decode(subarray);}}if (statement) {diff --git a/frontend/src/store/modules/v1/localSheet.ts b/frontend/src/store/modules/v1/localSheet.tsindex d9328c56ad..187a32f006 100644--- a/frontend/src/store/modules/v1/localSheet.ts+++ b/frontend/src/store/modules/v1/localSheet.ts@@ -29,7 +29,6 @@ export const useLocalSheetStore = defineStore("local_sheet", () => {content: defaults.content || new Uint8Array(),contentSize: defaults.contentSize || BigInt(0),engine: defaults.engine,- payload: defaults.payload,createTime: defaults.createTime,});return reactive(sheet);diff --git a/frontend/src/store/modules/v1/sheet.ts b/frontend/src/store/modules/v1/sheet.tsindex fb9bafb843..8cbae41e41 100644--- a/frontend/src/store/modules/v1/sheet.ts+++ b/frontend/src/store/modules/v1/sheet.ts@@ -45,7 +45,6 @@ export const useSheetV1Store = defineStore("sheet_v1", () => {content: sheet.content || new Uint8Array(),contentSize: sheet.contentSize || BigInt(0),engine: sheet.engine || Engine.MYSQL,- payload: sheet.payload,createTime: sheet.createTime,});const request = create(CreateSheetRequestSchema, {diff --git a/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts b/frontend/src/types/proto-es/v1/rollout_service_pb.d.tsindex 3ad5041c60..86b15b8fb4 100644--- a/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts@@ -6,7 +6,7 @@ import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuimport type { Message } from "@bufbuild/protobuf";import type { Timestamp } from "@bufbuild/protobuf/wkt";import type { Plan } from "./plan_service_pb";-import type { DatabaseChangeType, ExportFormat, Position } from "./common_pb";+import type { DatabaseChangeType, ExportFormat, Position, Range } from "./common_pb";/*** Describes the file v1/rollout_service.proto.@@ -1398,12 +1398,11 @@ export declare type TaskRunLogEntry_CommandExecute = Message<"bytebase.v1.TaskRulogTime?: Timestamp;/**- * Either `command_indexes` or `statement` is set.- * The indexes of the executed commands.+ * The byte offset range of the executed command in the sheet.*- * @generated from field: repeated int32 command_indexes = 2;+ * @generated from field: bytebase.v1.Range range = 2;*/- commandIndexes: number[];+ range?: Range;/*** The executed statement.diff --git a/frontend/src/types/proto-es/v1/rollout_service_pb.js b/frontend/src/types/proto-es/v1/rollout_service_pb.jsindex b9507b0159..0e0dc06806 100644--- a/frontend/src/types/proto-es/v1/rollout_service_pb.js+++ b/frontend/src/types/proto-es/v1/rollout_service_pb.js@@ -17,7 +17,7 @@ import { file_v1_plan_service } from "./plan_service_pb";* Describes the file v1/rollout_service.proto.*/export const file_v1_rollout_service = /*@__PURE__*/- fileDesc("Chh2MS9yb2xsb3V0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxInUKFEJhdGNoUnVuVGFza3NSZXF1ZXN0Eg4KBnBhcmVudBgBIAEoCRINCgV0YXNrcxgCIAMoCRIxCghydW5fdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBIAIgBAUILCglfcnVuX3RpbWUiFwoVQmF0Y2hSdW5UYXNrc1Jlc3BvbnNlIlAKFUJhdGNoU2tpcFRhc2tzUmVxdWVzdBIOCgZwYXJlbnQYASABKAkSDQoFdGFza3MYAiADKAkSGAoGcmVhc29uGAMgASgJQgi6SAVyAxjoByIYChZCYXRjaFNraXBUYXNrc1Jlc3BvbnNlIj8KGkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0Eg4KBnBhcmVudBgBIAEoCRIRCgl0YXNrX3J1bnMYAiADKAkiHQobQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlIj8KEUdldFJvbGxvdXRSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1JvbGxvdXQiegoTTGlzdFJvbGxvdXRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RSb2xsb3V0c1Jlc3BvbnNlEiYKCHJvbGxvdXRzGAEgAygLMhQuYnl0ZWJhc2UudjEuUm9sbG91dBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkipwEKFENyZWF0ZVJvbGxvdXRSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIqCgdyb2xsb3V0GAIgASgLMhQuYnl0ZWJhc2UudjEuUm9sbG91dEID4EECEhMKBnRhcmdldBgDIAEoCUgAiAEBEhUKDXZhbGlkYXRlX29ubHkYBCABKAhCCQoHX3RhcmdldCJnChVQcmV2aWV3Um9sbG91dFJlcXVlc3QSLQoHcHJvamVjdBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIfCgRwbGFuGAIgASgLMhEuYnl0ZWJhc2UudjEuUGxhbiJAChNMaXN0VGFza1J1bnNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVGFzayI/ChRMaXN0VGFza1J1bnNSZXNwb25zZRInCgl0YXNrX3J1bnMYASADKAsyFC5ieXRlYmFzZS52MS5UYXNrUnVuIj8KEUdldFRhc2tSdW5SZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4iRAoUR2V0VGFza1J1bkxvZ1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIroCCgdSb2xsb3V0EgwKBG5hbWUYASABKAkSEQoEcGxhbhgCIAEoCUID4EECEhIKBXRpdGxlGAMgASgJQgPgQQMSIgoGc3RhZ2VzGAQgAygLMhIuYnl0ZWJhc2UudjEuU3RhZ2USFAoHY3JlYXRvchgFIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhIKBWlzc3VlGAggASgJQgPgQQM6QOpBPQoUYnl0ZWJhc2UuY29tL1JvbGxvdXQSJXByb2plY3RzL3twcm9qZWN0fS9yb2xsb3V0cy97cm9sbG91dH0irAEKBVN0YWdlEgwKBG5hbWUYASABKAkSDwoCaWQYAiABKAlCA+BBAxITCgtlbnZpcm9ubWVudBgDIAEoCRIgCgV0YXNrcxgEIAMoCzIRLmJ5dGViYXNlLnYxLlRhc2s6TepBSgoSYnl0ZWJhc2UuY29tL1N0YWdlEjRwcm9qZWN0cy97cHJvamVjdH0vcm9sbG91dHMve3JvbGxvdXR9L3N0YWdlcy97c3RhZ2V9It4JCgRUYXNrEgwKBG5hbWUYASABKAkSDwoHc3BlY19pZBgCIAEoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5UYXNrLlN0YXR1cxIWCg5za2lwcGVkX3JlYXNvbhgEIAEoCRIkCgR0eXBlGAUgASgOMhYuYnl0ZWJhc2UudjEuVGFzay5UeXBlEg4KBnRhcmdldBgGIAEoCRI7Cg9kYXRhYmFzZV9jcmVhdGUYByABKAsyIC5ieXRlYmFzZS52MS5UYXNrLkRhdGFiYXNlQ3JlYXRlSAASOwoPZGF0YWJhc2VfdXBkYXRlGAggASgLMiAuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZVVwZGF0ZUgAEkQKFGRhdGFiYXNlX2RhdGFfZXhwb3J0GAkgASgLMiQuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZURhdGFFeHBvcnRIABI5Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gBiAEBEjYKCHJ1bl90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDSAKIAQEakAEKDkRhdGFiYXNlQ3JlYXRlEg8KB3Byb2plY3QYASABKAkSEAoIZGF0YWJhc2UYAiABKAkSDQoFdGFibGUYAyABKAkSDQoFc2hlZXQYBCABKAkSFQoNY2hhcmFjdGVyX3NldBgFIAEoCRIRCgljb2xsYXRpb24YBiABKAkSEwoLZW52aXJvbm1lbnQYByABKAkadgoORGF0YWJhc2VVcGRhdGUSDQoFc2hlZXQYASABKAkSFgoOc2NoZW1hX3ZlcnNpb24YAiABKAkSPQoUZGF0YWJhc2VfY2hhbmdlX3R5cGUYAyABKA4yHy5ieXRlYmFzZS52MS5EYXRhYmFzZUNoYW5nZVR5cGUaggEKEkRhdGFiYXNlRGF0YUV4cG9ydBIOCgZ0YXJnZXQYASABKAkSDQoFc2hlZXQYAiABKAkSKQoGZm9ybWF0GAMgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0EhUKCHBhc3N3b3JkGAQgASgJSACIAQFCCwoJX3Bhc3N3b3JkInwKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABIPCgtOT1RfU1RBUlRFRBABEgsKB1BFTkRJTkcQAhILCgdSVU5OSU5HEAMSCAoERE9ORRAEEgoKBkZBSUxFRBAFEgwKCENBTkNFTEVEEAYSCwoHU0tJUFBFRBAHInsKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgsKB0dFTkVSQUwQARITCg9EQVRBQkFTRV9DUkVBVEUQAhIUChBEQVRBQkFTRV9NSUdSQVRFEAMSEwoPREFUQUJBU0VfRVhQT1JUEAQSEAoMREFUQUJBU0VfU0RMEAU6WepBVgoRYnl0ZWJhc2UuY29tL1Rhc2sSQXByb2plY3RzL3twcm9qZWN0fS9yb2xsb3V0cy97cm9sbG91dH0vc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9QgkKB3BheWxvYWRCDgoMX3VwZGF0ZV90aW1lQgsKCV9ydW5fdGltZSLGDAoHVGFza1J1bhIMCgRuYW1lGAEgASgJEg8KB2NyZWF0b3IYAiABKAkSNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSKwoGc3RhdHVzGAUgASgOMhsuYnl0ZWJhc2UudjEuVGFza1J1bi5TdGF0dXMSDgoGZGV0YWlsGAYgASgJEhYKCWNoYW5nZWxvZxgHIAEoCUID4EEDEhYKDnNjaGVtYV92ZXJzaW9uGAggASgJEjMKCnN0YXJ0X3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSRwoVZXhwb3J0X2FyY2hpdmVfc3RhdHVzGAogASgOMiguYnl0ZWJhc2UudjEuVGFza1J1bi5FeHBvcnRBcmNoaXZlU3RhdHVzEkMKE3ByaW9yX2JhY2t1cF9kZXRhaWwYCyABKAsyJi5ieXRlYmFzZS52MS5UYXNrUnVuLlByaW9yQmFja3VwRGV0YWlsEj8KDnNjaGVkdWxlcl9pbmZvGAwgASgLMiIuYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvQgPgQQMSEgoFc2hlZXQYDSABKAlCA+BBAxI2CghydW5fdGltZRgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gAiAEBGoADChFQcmlvckJhY2t1cERldGFpbBI6CgVpdGVtcxgBIAMoCzIrLmJ5dGViYXNlLnYxLlRhc2tSdW4uUHJpb3JCYWNrdXBEZXRhaWwuSXRlbRquAgoESXRlbRJHCgxzb3VyY2VfdGFibGUYASABKAsyMS5ieXRlYmFzZS52MS5UYXNrUnVuLlByaW9yQmFja3VwRGV0YWlsLkl0ZW0uVGFibGUSRwoMdGFyZ2V0X3RhYmxlGAIgASgLMjEuYnl0ZWJhc2UudjEuVGFza1J1bi5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlEi0KDnN0YXJ0X3Bvc2l0aW9uGAMgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAQgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24aOAoFVGFibGUSEAoIZGF0YWJhc2UYASABKAkSDgoGc2NoZW1hGAIgASgJEg0KBXRhYmxlGAMgASgJGroCCg1TY2hlZHVsZXJJbmZvEi8KC3JlcG9ydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJGCg13YWl0aW5nX2NhdXNlGAIgASgLMi8uYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZRqvAQoMV2FpdGluZ0NhdXNlEhoKEGNvbm5lY3Rpb25fbGltaXQYASABKAhIABJECgR0YXNrGAIgASgLMjQuYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZS5UYXNrSAASHgoUcGFyYWxsZWxfdGFza3NfbGltaXQYAyABKAhIABoUCgRUYXNrEgwKBHRhc2sYASABKAlCBwoFY2F1c2UiXgoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARILCgdSVU5OSU5HEAISCAoERE9ORRADEgoKBkZBSUxFRBAEEgwKCENBTkNFTEVEEAUiVQoTRXhwb3J0QXJjaGl2ZVN0YXR1cxIlCiFFWFBPUlRfQVJDSElWRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIJCgVSRUFEWRABEgwKCEVYUE9SVEVEEAI6b+pBbAoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4SVHByb2plY3RzL3twcm9qZWN0fS9yb2xsb3V0cy97cm9sbG91dH0vc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9L3Rhc2tSdW5zL3t0YXNrUnVufUILCglfcnVuX3RpbWUiwQEKClRhc2tSdW5Mb2cSDAoEbmFtZRgBIAEoCRItCgdlbnRyaWVzGAIgAygLMhwuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5OnbqQXMKF2J5dGViYXNlLmNvbS9UYXNrUnVuTG9nElhwcm9qZWN0cy97cHJvamVjdH0vcm9sbG91dHMve3JvbGxvdXR9L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vbG9nIv8QCg9UYXNrUnVuTG9nRW50cnkSLwoEdHlwZRgBIAEoDjIhLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UeXBlEiwKCGxvZ190aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIRCglkZXBsb3lfaWQYAyABKAkSPAoLc2NoZW1hX2R1bXAYBCABKAsyJy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuU2NoZW1hRHVtcBJECg9jb21tYW5kX2V4ZWN1dGUYBSABKAsyKy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tbWFuZEV4ZWN1dGUSQAoNZGF0YWJhc2Vfc3luYxgGIAEoCzIpLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5EYXRhYmFzZVN5bmMSUAoWdGFza19ydW5fc3RhdHVzX3VwZGF0ZRgHIAEoCzIwLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UYXNrUnVuU3RhdHVzVXBkYXRlEkwKE3RyYW5zYWN0aW9uX2NvbnRyb2wYCCABKAsyLy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuVHJhbnNhY3Rpb25Db250cm9sEj4KDHByaW9yX2JhY2t1cBgJIAEoCzIoLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cBI6CgpyZXRyeV9pbmZvGAogASgLMiYuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlJldHJ5SW5mbxI+Cgxjb21wdXRlX2RpZmYYCyABKAsyKC5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tcHV0ZURpZmYaeQoKU2NoZW1hRHVtcBIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAyABKAkavAIKDkNvbW1hbmRFeGVjdXRlEiwKCGxvZ190aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIXCg9jb21tYW5kX2luZGV4ZXMYAiADKAUSEQoJc3RhdGVtZW50GAQgASgJEk0KCHJlc3BvbnNlGAMgASgLMjsuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LkNvbW1hbmRFeGVjdXRlLkNvbW1hbmRSZXNwb25zZRqAAQoPQ29tbWFuZFJlc3BvbnNlEiwKCGxvZ190aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBINCgVlcnJvchgCIAEoCRIVCg1hZmZlY3RlZF9yb3dzGAMgASgDEhkKEWFsbF9hZmZlY3RlZF9yb3dzGAQgAygDGnsKDERhdGFiYXNlU3luYxIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAyABKAkaqgEKE1Rhc2tSdW5TdGF0dXNVcGRhdGUSRwoGc3RhdHVzGAEgASgOMjcuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlRhc2tSdW5TdGF0dXNVcGRhdGUuU3RhdHVzIkoKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABITCg9SVU5OSU5HX1dBSVRJTkcQARITCg9SVU5OSU5HX1JVTk5JTkcQAhqqAQoSVHJhbnNhY3Rpb25Db250cm9sEkIKBHR5cGUYASABKA4yNC5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuVHJhbnNhY3Rpb25Db250cm9sLlR5cGUSDQoFZXJyb3IYAiABKAkiQQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFQkVHSU4QARIKCgZDT01NSVQQAhIMCghST0xMQkFDSxADGr8BCgtQcmlvckJhY2t1cBIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASQwoTcHJpb3JfYmFja3VwX2RldGFpbBgDIAEoCzImLmJ5dGViYXNlLnYxLlRhc2tSdW4uUHJpb3JCYWNrdXBEZXRhaWwSDQoFZXJyb3IYBCABKAkaSAoJUmV0cnlJbmZvEg0KBWVycm9yGAEgASgJEhMKC3JldHJ5X2NvdW50GAIgASgFEhcKD21heGltdW1fcmV0cmllcxgDIAEoBRp6CgtDb21wdXRlRGlmZhIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAyABKAkivgEKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEg8KC1NDSEVNQV9EVU1QEAESEwoPQ09NTUFORF9FWEVDVVRFEAISEQoNREFUQUJBU0VfU1lOQxADEhoKFlRBU0tfUlVOX1NUQVRVU19VUERBVEUQBBIXChNUUkFOU0FDVElPTl9DT05UUk9MEAUSEAoMUFJJT1JfQkFDS1VQEAYSDgoKUkVUUllfSU5GTxAHEhAKDENPTVBVVEVfRElGRhAIIkgKGEdldFRhc2tSdW5TZXNzaW9uUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4i6AcKDlRhc2tSdW5TZXNzaW9uEgwKBG5hbWUYASABKAkSOAoIcG9zdGdyZXMYAiABKAsyJC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlc0gAGoIGCghQb3N0Z3JlcxI9CgdzZXNzaW9uGAEgASgLMiwuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24uUG9zdGdyZXMuU2Vzc2lvbhJHChFibG9ja2luZ19zZXNzaW9ucxgCIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24SRgoQYmxvY2tlZF9zZXNzaW9ucxgDIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24apQQKB1Nlc3Npb24SCwoDcGlkGAEgASgJEhcKD2Jsb2NrZWRfYnlfcGlkcxgCIAMoCRINCgVxdWVyeRgDIAEoCRISCgVzdGF0ZRgEIAEoCUgAiAEBEhwKD3dhaXRfZXZlbnRfdHlwZRgFIAEoCUgBiAEBEhcKCndhaXRfZXZlbnQYBiABKAlIAogBARIUCgdkYXRuYW1lGAcgASgJSAOIAQESFAoHdXNlbmFtZRgIIAEoCUgEiAEBEhgKEGFwcGxpY2F0aW9uX25hbWUYCSABKAkSGAoLY2xpZW50X2FkZHIYCiABKAlIBYgBARIYCgtjbGllbnRfcG9ydBgLIAEoCUgGiAEBEjEKDWJhY2tlbmRfc3RhcnQYDCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjMKCnhhY3Rfc3RhcnQYDSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAeIAQESNAoLcXVlcnlfc3RhcnQYDiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAiIAQFCCAoGX3N0YXRlQhIKEF93YWl0X2V2ZW50X3R5cGVCDQoLX3dhaXRfZXZlbnRCCgoIX2RhdG5hbWVCCgoIX3VzZW5hbWVCDgoMX2NsaWVudF9hZGRyQg4KDF9jbGllbnRfcG9ydEINCgtfeGFjdF9zdGFydEIOCgxfcXVlcnlfc3RhcnQ6fupBewobYnl0ZWJhc2UuY29tL1Rhc2tSdW5TZXNzaW9uElxwcm9qZWN0cy97cHJvamVjdH0vcm9sbG91dHMve3JvbGxvdXR9L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vc2Vzc2lvbkIJCgdzZXNzaW9uIksKHVByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4iMwoeUHJldmlld1Rhc2tSdW5Sb2xsYmFja1Jlc3BvbnNlEhEKCXN0YXRlbWVudBgBIAEoCTKSEQoOUm9sbG91dFNlcnZpY2USigEKCkdldFJvbGxvdXQSHi5ieXRlYmFzZS52MS5HZXRSb2xsb3V0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlJvbGxvdXQiRtpBBG5hbWWK6jAPYmIucm9sbG91dHMuZ2V0kOowAYLT5JMCIhIgL3YxL3tuYW1lPXByb2plY3RzLyovcm9sbG91dHMvKn0SngEKDExpc3RSb2xsb3V0cxIgLmJ5dGViYXNlLnYxLkxpc3RSb2xsb3V0c1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0Um9sbG91dHNSZXNwb25zZSJJ2kEGcGFyZW50iuowEGJiLnJvbGxvdXRzLmxpc3SQ6jABgtPkkwIiEiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9yb2xsb3V0cxKqAQoNQ3JlYXRlUm9sbG91dBIhLmJ5dGViYXNlLnYxLkNyZWF0ZVJvbGxvdXRSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUm9sbG91dCJg2kEOcGFyZW50LHJvbGxvdXSK6jASYmIucm9sbG91dHMuY3JlYXRlkOowAZjqMAGC0+STAis6B3JvbGxvdXQiIC92MS97cGFyZW50PXByb2plY3RzLyp9L3JvbGxvdXRzEqABCg5QcmV2aWV3Um9sbG91dBIiLmJ5dGViYXNlLnYxLlByZXZpZXdSb2xsb3V0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlJvbGxvdXQiVNpBBG5hbWWK6jATYmIucm9sbG91dHMucHJldmlld5DqMAGC0+STAiw6ASoiJy92MS97cHJvamVjdD1wcm9qZWN0cy8qfTpwcmV2aWV3Um9sbG91dBK6AQoMTGlzdFRhc2tSdW5zEiAuYnl0ZWJhc2UudjEuTGlzdFRhc2tSdW5zUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RUYXNrUnVuc1Jlc3BvbnNlImXaQQZwYXJlbnSK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAj4SPC92MS97cGFyZW50PXByb2plY3RzLyovcm9sbG91dHMvKi9zdGFnZXMvKi90YXNrcy8qfS90YXNrUnVucxKnAQoKR2V0VGFza1J1bhIeLmJ5dGViYXNlLnYxLkdldFRhc2tSdW5SZXF1ZXN0GhQuYnl0ZWJhc2UudjEuVGFza1J1biJj2kEEbmFtZYrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCPhI8L3YxL3tuYW1lPXByb2plY3RzLyovcm9sbG91dHMvKi9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9ErgBCg1HZXRUYXNrUnVuTG9nEiEuYnl0ZWJhc2UudjEuR2V0VGFza1J1bkxvZ1JlcXVlc3QaFy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nImvaQQZwYXJlbnSK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAkQSQi92MS97cGFyZW50PXByb2plY3RzLyovcm9sbG91dHMvKi9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9L2xvZxLIAQoRR2V0VGFza1J1blNlc3Npb24SJS5ieXRlYmFzZS52MS5HZXRUYXNrUnVuU2Vzc2lvblJlcXVlc3QaGy5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbiJv2kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJIEkYvdjEve3BhcmVudD1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfS9zZXNzaW9uEqoBCg1CYXRjaFJ1blRhc2tzEiEuYnl0ZWJhc2UudjEuQmF0Y2hSdW5UYXNrc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5CYXRjaFJ1blRhc2tzUmVzcG9uc2UiUtpBBnBhcmVudJDqMAKC0+STAj86ASoiOi92MS97cGFyZW50PXByb2plY3RzLyovcm9sbG91dHMvKi9zdGFnZXMvKn0vdGFza3M6YmF0Y2hSdW4SrgEKDkJhdGNoU2tpcFRhc2tzEiIuYnl0ZWJhc2UudjEuQmF0Y2hTa2lwVGFza3NSZXF1ZXN0GiMuYnl0ZWJhc2UudjEuQmF0Y2hTa2lwVGFza3NSZXNwb25zZSJT2kEGcGFyZW50kOowAoLT5JMCQDoBKiI7L3YxL3twYXJlbnQ9cHJvamVjdHMvKi9yb2xsb3V0cy8qL3N0YWdlcy8qfS90YXNrczpiYXRjaFNraXASygEKE0JhdGNoQ2FuY2VsVGFza1J1bnMSJy5ieXRlYmFzZS52MS5CYXRjaENhbmNlbFRhc2tSdW5zUmVxdWVzdBooLmJ5dGViYXNlLnYxLkJhdGNoQ2FuY2VsVGFza1J1bnNSZXNwb25zZSJg2kEGcGFyZW50kOowAoLT5JMCTToBKiJIL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9yb2xsb3V0cy8qL3N0YWdlcy8qL3Rhc2tzLyp9L3Rhc2tSdW5zOmJhdGNoQ2FuY2VsEukBChZQcmV2aWV3VGFza1J1blJvbGxiYWNrEiouYnl0ZWJhc2UudjEuUHJldmlld1Rhc2tSdW5Sb2xsYmFja1JlcXVlc3QaKy5ieXRlYmFzZS52MS5QcmV2aWV3VGFza1J1blJvbGxiYWNrUmVzcG9uc2UidtpBBG5hbWWK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAlE6ASoiTC92MS97bmFtZT1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfTpwcmV2aWV3Um9sbGJhY2tCqQEKD2NvbS5ieXRlYmFzZS52MUITUm9sbG91dFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_plan_service]);+ fileDesc("Chh2MS9yb2xsb3V0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxInUKFEJhdGNoUnVuVGFza3NSZXF1ZXN0Eg4KBnBhcmVudBgBIAEoCRINCgV0YXNrcxgCIAMoCRIxCghydW5fdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBIAIgBAUILCglfcnVuX3RpbWUiFwoVQmF0Y2hSdW5UYXNrc1Jlc3BvbnNlIlAKFUJhdGNoU2tpcFRhc2tzUmVxdWVzdBIOCgZwYXJlbnQYASABKAkSDQoFdGFza3MYAiADKAkSGAoGcmVhc29uGAMgASgJQgi6SAVyAxjoByIYChZCYXRjaFNraXBUYXNrc1Jlc3BvbnNlIj8KGkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0Eg4KBnBhcmVudBgBIAEoCRIRCgl0YXNrX3J1bnMYAiADKAkiHQobQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlIj8KEUdldFJvbGxvdXRSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1JvbGxvdXQiegoTTGlzdFJvbGxvdXRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RSb2xsb3V0c1Jlc3BvbnNlEiYKCHJvbGxvdXRzGAEgAygLMhQuYnl0ZWJhc2UudjEuUm9sbG91dBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkipwEKFENyZWF0ZVJvbGxvdXRSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIqCgdyb2xsb3V0GAIgASgLMhQuYnl0ZWJhc2UudjEuUm9sbG91dEID4EECEhMKBnRhcmdldBgDIAEoCUgAiAEBEhUKDXZhbGlkYXRlX29ubHkYBCABKAhCCQoHX3RhcmdldCJnChVQcmV2aWV3Um9sbG91dFJlcXVlc3QSLQoHcHJvamVjdBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIfCgRwbGFuGAIgASgLMhEuYnl0ZWJhc2UudjEuUGxhbiJAChNMaXN0VGFza1J1bnNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVGFzayI/ChRMaXN0VGFza1J1bnNSZXNwb25zZRInCgl0YXNrX3J1bnMYASADKAsyFC5ieXRlYmFzZS52MS5UYXNrUnVuIj8KEUdldFRhc2tSdW5SZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4iRAoUR2V0VGFza1J1bkxvZ1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIroCCgdSb2xsb3V0EgwKBG5hbWUYASABKAkSEQoEcGxhbhgCIAEoCUID4EECEhIKBXRpdGxlGAMgASgJQgPgQQMSIgoGc3RhZ2VzGAQgAygLMhIuYnl0ZWJhc2UudjEuU3RhZ2USFAoHY3JlYXRvchgFIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhIKBWlzc3VlGAggASgJQgPgQQM6QOpBPQoUYnl0ZWJhc2UuY29tL1JvbGxvdXQSJXByb2plY3RzL3twcm9qZWN0fS9yb2xsb3V0cy97cm9sbG91dH0irAEKBVN0YWdlEgwKBG5hbWUYASABKAkSDwoCaWQYAiABKAlCA+BBAxITCgtlbnZpcm9ubWVudBgDIAEoCRIgCgV0YXNrcxgEIAMoCzIRLmJ5dGViYXNlLnYxLlRhc2s6TepBSgoSYnl0ZWJhc2UuY29tL1N0YWdlEjRwcm9qZWN0cy97cHJvamVjdH0vcm9sbG91dHMve3JvbGxvdXR9L3N0YWdlcy97c3RhZ2V9It4JCgRUYXNrEgwKBG5hbWUYASABKAkSDwoHc3BlY19pZBgCIAEoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5UYXNrLlN0YXR1cxIWCg5za2lwcGVkX3JlYXNvbhgEIAEoCRIkCgR0eXBlGAUgASgOMhYuYnl0ZWJhc2UudjEuVGFzay5UeXBlEg4KBnRhcmdldBgGIAEoCRI7Cg9kYXRhYmFzZV9jcmVhdGUYByABKAsyIC5ieXRlYmFzZS52MS5UYXNrLkRhdGFiYXNlQ3JlYXRlSAASOwoPZGF0YWJhc2VfdXBkYXRlGAggASgLMiAuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZVVwZGF0ZUgAEkQKFGRhdGFiYXNlX2RhdGFfZXhwb3J0GAkgASgLMiQuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZURhdGFFeHBvcnRIABI5Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gBiAEBEjYKCHJ1bl90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDSAKIAQEakAEKDkRhdGFiYXNlQ3JlYXRlEg8KB3Byb2plY3QYASABKAkSEAoIZGF0YWJhc2UYAiABKAkSDQoFdGFibGUYAyABKAkSDQoFc2hlZXQYBCABKAkSFQoNY2hhcmFjdGVyX3NldBgFIAEoCRIRCgljb2xsYXRpb24YBiABKAkSEwoLZW52aXJvbm1lbnQYByABKAkadgoORGF0YWJhc2VVcGRhdGUSDQoFc2hlZXQYASABKAkSFgoOc2NoZW1hX3ZlcnNpb24YAiABKAkSPQoUZGF0YWJhc2VfY2hhbmdlX3R5cGUYAyABKA4yHy5ieXRlYmFzZS52MS5EYXRhYmFzZUNoYW5nZVR5cGUaggEKEkRhdGFiYXNlRGF0YUV4cG9ydBIOCgZ0YXJnZXQYASABKAkSDQoFc2hlZXQYAiABKAkSKQoGZm9ybWF0GAMgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0EhUKCHBhc3N3b3JkGAQgASgJSACIAQFCCwoJX3Bhc3N3b3JkInwKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABIPCgtOT1RfU1RBUlRFRBABEgsKB1BFTkRJTkcQAhILCgdSVU5OSU5HEAMSCAoERE9ORRAEEgoKBkZBSUxFRBAFEgwKCENBTkNFTEVEEAYSCwoHU0tJUFBFRBAHInsKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgsKB0dFTkVSQUwQARITCg9EQVRBQkFTRV9DUkVBVEUQAhIUChBEQVRBQkFTRV9NSUdSQVRFEAMSEwoPREFUQUJBU0VfRVhQT1JUEAQSEAoMREFUQUJBU0VfU0RMEAU6WepBVgoRYnl0ZWJhc2UuY29tL1Rhc2sSQXByb2plY3RzL3twcm9qZWN0fS9yb2xsb3V0cy97cm9sbG91dH0vc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9QgkKB3BheWxvYWRCDgoMX3VwZGF0ZV90aW1lQgsKCV9ydW5fdGltZSLGDAoHVGFza1J1bhIMCgRuYW1lGAEgASgJEg8KB2NyZWF0b3IYAiABKAkSNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSKwoGc3RhdHVzGAUgASgOMhsuYnl0ZWJhc2UudjEuVGFza1J1bi5TdGF0dXMSDgoGZGV0YWlsGAYgASgJEhYKCWNoYW5nZWxvZxgHIAEoCUID4EEDEhYKDnNjaGVtYV92ZXJzaW9uGAggASgJEjMKCnN0YXJ0X3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSRwoVZXhwb3J0X2FyY2hpdmVfc3RhdHVzGAogASgOMiguYnl0ZWJhc2UudjEuVGFza1J1bi5FeHBvcnRBcmNoaXZlU3RhdHVzEkMKE3ByaW9yX2JhY2t1cF9kZXRhaWwYCyABKAsyJi5ieXRlYmFzZS52MS5UYXNrUnVuLlByaW9yQmFja3VwRGV0YWlsEj8KDnNjaGVkdWxlcl9pbmZvGAwgASgLMiIuYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvQgPgQQMSEgoFc2hlZXQYDSABKAlCA+BBAxI2CghydW5fdGltZRgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gAiAEBGoADChFQcmlvckJhY2t1cERldGFpbBI6CgVpdGVtcxgBIAMoCzIrLmJ5dGViYXNlLnYxLlRhc2tSdW4uUHJpb3JCYWNrdXBEZXRhaWwuSXRlbRquAgoESXRlbRJHCgxzb3VyY2VfdGFibGUYASABKAsyMS5ieXRlYmFzZS52MS5UYXNrUnVuLlByaW9yQmFja3VwRGV0YWlsLkl0ZW0uVGFibGUSRwoMdGFyZ2V0X3RhYmxlGAIgASgLMjEuYnl0ZWJhc2UudjEuVGFza1J1bi5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlEi0KDnN0YXJ0X3Bvc2l0aW9uGAMgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAQgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24aOAoFVGFibGUSEAoIZGF0YWJhc2UYASABKAkSDgoGc2NoZW1hGAIgASgJEg0KBXRhYmxlGAMgASgJGroCCg1TY2hlZHVsZXJJbmZvEi8KC3JlcG9ydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJGCg13YWl0aW5nX2NhdXNlGAIgASgLMi8uYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZRqvAQoMV2FpdGluZ0NhdXNlEhoKEGNvbm5lY3Rpb25fbGltaXQYASABKAhIABJECgR0YXNrGAIgASgLMjQuYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZS5UYXNrSAASHgoUcGFyYWxsZWxfdGFza3NfbGltaXQYAyABKAhIABoUCgRUYXNrEgwKBHRhc2sYASABKAlCBwoFY2F1c2UiXgoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARILCgdSVU5OSU5HEAISCAoERE9ORRADEgoKBkZBSUxFRBAEEgwKCENBTkNFTEVEEAUiVQoTRXhwb3J0QXJjaGl2ZVN0YXR1cxIlCiFFWFBPUlRfQVJDSElWRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIJCgVSRUFEWRABEgwKCEVYUE9SVEVEEAI6b+pBbAoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4SVHByb2plY3RzL3twcm9qZWN0fS9yb2xsb3V0cy97cm9sbG91dH0vc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9L3Rhc2tSdW5zL3t0YXNrUnVufUILCglfcnVuX3RpbWUiwQEKClRhc2tSdW5Mb2cSDAoEbmFtZRgBIAEoCRItCgdlbnRyaWVzGAIgAygLMhwuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5OnbqQXMKF2J5dGViYXNlLmNvbS9UYXNrUnVuTG9nElhwcm9qZWN0cy97cHJvamVjdH0vcm9sbG91dHMve3JvbGxvdXR9L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vbG9nIokRCg9UYXNrUnVuTG9nRW50cnkSLwoEdHlwZRgBIAEoDjIhLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UeXBlEiwKCGxvZ190aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIRCglkZXBsb3lfaWQYAyABKAkSPAoLc2NoZW1hX2R1bXAYBCABKAsyJy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuU2NoZW1hRHVtcBJECg9jb21tYW5kX2V4ZWN1dGUYBSABKAsyKy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tbWFuZEV4ZWN1dGUSQAoNZGF0YWJhc2Vfc3luYxgGIAEoCzIpLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5EYXRhYmFzZVN5bmMSUAoWdGFza19ydW5fc3RhdHVzX3VwZGF0ZRgHIAEoCzIwLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UYXNrUnVuU3RhdHVzVXBkYXRlEkwKE3RyYW5zYWN0aW9uX2NvbnRyb2wYCCABKAsyLy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuVHJhbnNhY3Rpb25Db250cm9sEj4KDHByaW9yX2JhY2t1cBgJIAEoCzIoLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cBI6CgpyZXRyeV9pbmZvGAogASgLMiYuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlJldHJ5SW5mbxI+Cgxjb21wdXRlX2RpZmYYCyABKAsyKC5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tcHV0ZURpZmYaeQoKU2NoZW1hRHVtcBIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAyABKAkaxgIKDkNvbW1hbmRFeGVjdXRlEiwKCGxvZ190aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIhCgVyYW5nZRgCIAEoCzISLmJ5dGViYXNlLnYxLlJhbmdlEhEKCXN0YXRlbWVudBgEIAEoCRJNCghyZXNwb25zZRgDIAEoCzI7LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5Db21tYW5kRXhlY3V0ZS5Db21tYW5kUmVzcG9uc2UagAEKD0NvbW1hbmRSZXNwb25zZRIsCghsb2dfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAiABKAkSFQoNYWZmZWN0ZWRfcm93cxgDIAEoAxIZChFhbGxfYWZmZWN0ZWRfcm93cxgEIAMoAxp7CgxEYXRhYmFzZVN5bmMSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGqoBChNUYXNrUnVuU3RhdHVzVXBkYXRlEkcKBnN0YXR1cxgBIAEoDjI3LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UYXNrUnVuU3RhdHVzVXBkYXRlLlN0YXR1cyJKCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASEwoPUlVOTklOR19XQUlUSU5HEAESEwoPUlVOTklOR19SVU5OSU5HEAIaqgEKElRyYW5zYWN0aW9uQ29udHJvbBJCCgR0eXBlGAEgASgOMjQuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlRyYW5zYWN0aW9uQ29udHJvbC5UeXBlEg0KBWVycm9yGAIgASgJIkEKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgkKBUJFR0lOEAESCgoGQ09NTUlUEAISDAoIUk9MTEJBQ0sQAxq/AQoLUHJpb3JCYWNrdXASLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEkMKE3ByaW9yX2JhY2t1cF9kZXRhaWwYAyABKAsyJi5ieXRlYmFzZS52MS5UYXNrUnVuLlByaW9yQmFja3VwRGV0YWlsEg0KBWVycm9yGAQgASgJGkgKCVJldHJ5SW5mbxINCgVlcnJvchgBIAEoCRITCgtyZXRyeV9jb3VudBgCIAEoBRIXCg9tYXhpbXVtX3JldHJpZXMYAyABKAUaegoLQ29tcHV0ZURpZmYSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJIr4BCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIPCgtTQ0hFTUFfRFVNUBABEhMKD0NPTU1BTkRfRVhFQ1VURRACEhEKDURBVEFCQVNFX1NZTkMQAxIaChZUQVNLX1JVTl9TVEFUVVNfVVBEQVRFEAQSFwoTVFJBTlNBQ1RJT05fQ09OVFJPTBAFEhAKDFBSSU9SX0JBQ0tVUBAGEg4KClJFVFJZX0lORk8QBxIQCgxDT01QVVRFX0RJRkYQCCJIChhHZXRUYXNrUnVuU2Vzc2lvblJlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIugHCg5UYXNrUnVuU2Vzc2lvbhIMCgRuYW1lGAEgASgJEjgKCHBvc3RncmVzGAIgASgLMiQuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24uUG9zdGdyZXNIABqCBgoIUG9zdGdyZXMSPQoHc2Vzc2lvbhgBIAEoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24SRwoRYmxvY2tpbmdfc2Vzc2lvbnMYAiADKAsyLC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlcy5TZXNzaW9uEkYKEGJsb2NrZWRfc2Vzc2lvbnMYAyADKAsyLC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlcy5TZXNzaW9uGqUECgdTZXNzaW9uEgsKA3BpZBgBIAEoCRIXCg9ibG9ja2VkX2J5X3BpZHMYAiADKAkSDQoFcXVlcnkYAyABKAkSEgoFc3RhdGUYBCABKAlIAIgBARIcCg93YWl0X2V2ZW50X3R5cGUYBSABKAlIAYgBARIXCgp3YWl0X2V2ZW50GAYgASgJSAKIAQESFAoHZGF0bmFtZRgHIAEoCUgDiAEBEhQKB3VzZW5hbWUYCCABKAlIBIgBARIYChBhcHBsaWNhdGlvbl9uYW1lGAkgASgJEhgKC2NsaWVudF9hZGRyGAogASgJSAWIAQESGAoLY2xpZW50X3BvcnQYCyABKAlIBogBARIxCg1iYWNrZW5kX3N0YXJ0GAwgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIzCgp4YWN0X3N0YXJ0GA0gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgHiAEBEjQKC3F1ZXJ5X3N0YXJ0GA4gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgIiAEBQggKBl9zdGF0ZUISChBfd2FpdF9ldmVudF90eXBlQg0KC193YWl0X2V2ZW50QgoKCF9kYXRuYW1lQgoKCF91c2VuYW1lQg4KDF9jbGllbnRfYWRkckIOCgxfY2xpZW50X3BvcnRCDQoLX3hhY3Rfc3RhcnRCDgoMX3F1ZXJ5X3N0YXJ0On7qQXsKG2J5dGViYXNlLmNvbS9UYXNrUnVuU2Vzc2lvbhJccHJvamVjdHMve3Byb2plY3R9L3JvbGxvdXRzL3tyb2xsb3V0fS9zdGFnZXMve3N0YWdlfS90YXNrcy97dGFza30vdGFza1J1bnMve3Rhc2tSdW59L3Nlc3Npb25CCQoHc2Vzc2lvbiJLCh1QcmV2aWV3VGFza1J1blJvbGxiYWNrUmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIjMKHlByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXNwb25zZRIRCglzdGF0ZW1lbnQYASABKAkykhEKDlJvbGxvdXRTZXJ2aWNlEooBCgpHZXRSb2xsb3V0Eh4uYnl0ZWJhc2UudjEuR2V0Um9sbG91dFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Sb2xsb3V0IkbaQQRuYW1liuowD2JiLnJvbGxvdXRzLmdldJDqMAGC0+STAiISIC92MS97bmFtZT1wcm9qZWN0cy8qL3JvbGxvdXRzLyp9Ep4BCgxMaXN0Um9sbG91dHMSIC5ieXRlYmFzZS52MS5MaXN0Um9sbG91dHNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFJvbGxvdXRzUmVzcG9uc2UiSdpBBnBhcmVudIrqMBBiYi5yb2xsb3V0cy5saXN0kOowAYLT5JMCIhIgL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcm9sbG91dHMSqgEKDUNyZWF0ZVJvbGxvdXQSIS5ieXRlYmFzZS52MS5DcmVhdGVSb2xsb3V0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlJvbGxvdXQiYNpBDnBhcmVudCxyb2xsb3V0iuowEmJiLnJvbGxvdXRzLmNyZWF0ZZDqMAGY6jABgtPkkwIrOgdyb2xsb3V0IiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9yb2xsb3V0cxKgAQoOUHJldmlld1JvbGxvdXQSIi5ieXRlYmFzZS52MS5QcmV2aWV3Um9sbG91dFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Sb2xsb3V0IlTaQQRuYW1liuowE2JiLnJvbGxvdXRzLnByZXZpZXeQ6jABgtPkkwIsOgEqIicvdjEve3Byb2plY3Q9cHJvamVjdHMvKn06cHJldmlld1JvbGxvdXQSugEKDExpc3RUYXNrUnVucxIgLmJ5dGViYXNlLnYxLkxpc3RUYXNrUnVuc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0VGFza1J1bnNSZXNwb25zZSJl2kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwI+EjwvdjEve3BhcmVudD1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyovdGFza3MvKn0vdGFza1J1bnMSpwEKCkdldFRhc2tSdW4SHi5ieXRlYmFzZS52MS5HZXRUYXNrUnVuUmVxdWVzdBoULmJ5dGViYXNlLnYxLlRhc2tSdW4iY9pBBG5hbWWK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAj4SPC92MS97bmFtZT1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfRK4AQoNR2V0VGFza1J1bkxvZxIhLmJ5dGViYXNlLnYxLkdldFRhc2tSdW5Mb2dSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuVGFza1J1bkxvZyJr2kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJEEkIvdjEve3BhcmVudD1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfS9sb2cSyAEKEUdldFRhc2tSdW5TZXNzaW9uEiUuYnl0ZWJhc2UudjEuR2V0VGFza1J1blNlc3Npb25SZXF1ZXN0GhsuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24ib9pBBnBhcmVudIrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCSBJGL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9yb2xsb3V0cy8qL3N0YWdlcy8qL3Rhc2tzLyovdGFza1J1bnMvKn0vc2Vzc2lvbhKqAQoNQmF0Y2hSdW5UYXNrcxIhLmJ5dGViYXNlLnYxLkJhdGNoUnVuVGFza3NSZXF1ZXN0GiIuYnl0ZWJhc2UudjEuQmF0Y2hSdW5UYXNrc1Jlc3BvbnNlIlLaQQZwYXJlbnSQ6jACgtPkkwI/OgEqIjovdjEve3BhcmVudD1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyp9L3Rhc2tzOmJhdGNoUnVuEq4BCg5CYXRjaFNraXBUYXNrcxIiLmJ5dGViYXNlLnYxLkJhdGNoU2tpcFRhc2tzUmVxdWVzdBojLmJ5dGViYXNlLnYxLkJhdGNoU2tpcFRhc2tzUmVzcG9uc2UiU9pBBnBhcmVudJDqMAKC0+STAkA6ASoiOy92MS97cGFyZW50PXByb2plY3RzLyovcm9sbG91dHMvKi9zdGFnZXMvKn0vdGFza3M6YmF0Y2hTa2lwEsoBChNCYXRjaENhbmNlbFRhc2tSdW5zEicuYnl0ZWJhc2UudjEuQmF0Y2hDYW5jZWxUYXNrUnVuc1JlcXVlc3QaKC5ieXRlYmFzZS52MS5CYXRjaENhbmNlbFRhc2tSdW5zUmVzcG9uc2UiYNpBBnBhcmVudJDqMAKC0+STAk06ASoiSC92MS97cGFyZW50PXByb2plY3RzLyovcm9sbG91dHMvKi9zdGFnZXMvKi90YXNrcy8qfS90YXNrUnVuczpiYXRjaENhbmNlbBLpAQoWUHJldmlld1Rhc2tSdW5Sb2xsYmFjaxIqLmJ5dGViYXNlLnYxLlByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXF1ZXN0GisuYnl0ZWJhc2UudjEuUHJldmlld1Rhc2tSdW5Sb2xsYmFja1Jlc3BvbnNlInbaQQRuYW1liuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJROgEqIkwvdjEve25hbWU9cHJvamVjdHMvKi9yb2xsb3V0cy8qL3N0YWdlcy8qL3Rhc2tzLyovdGFza1J1bnMvKn06cHJldmlld1JvbGxiYWNrQqkBCg9jb20uYnl0ZWJhc2UudjFCE1JvbGxvdXRTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_plan_service]);/*** Describes the message bytebase.v1.BatchRunTasksRequest.diff --git a/frontend/src/types/proto-es/v1/sheet_service_pb.d.ts b/frontend/src/types/proto-es/v1/sheet_service_pb.d.tsindex 4ced3ddbc2..005cecb52d 100644--- a/frontend/src/types/proto-es/v1/sheet_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/sheet_service_pb.d.ts@@ -5,7 +5,7 @@import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";import type { Message } from "@bufbuild/protobuf";import type { Timestamp } from "@bufbuild/protobuf/wkt";-import type { Engine, Range } from "./common_pb";+import type { Engine } from "./common_pb";/*** Describes the file v1/sheet_service.proto.@@ -155,13 +155,6 @@ export declare type Sheet = Message<"bytebase.v1.Sheet"> & {*/contentSize: bigint;- /**- * Parsed metadata about SQL commands in the sheet.- *- * @generated from field: bytebase.v1.SheetPayload payload = 7;- */- payload?: SheetPayload;-/*** The SQL dialect.*@@ -176,24 +169,6 @@ export declare type Sheet = Message<"bytebase.v1.Sheet"> & {*/export declare const SheetSchema: GenMessage<Sheet>;-/**- * @generated from message bytebase.v1.SheetPayload- */-export declare type SheetPayload = Message<"bytebase.v1.SheetPayload"> & {- /**- * The start and end position of each command in the sheet statement.- *- * @generated from field: repeated bytebase.v1.Range commands = 1;- */- commands: Range[];-};--/**- * Describes the message bytebase.v1.SheetPayload.- * Use `create(SheetPayloadSchema)` to create a new message.- */-export declare const SheetPayloadSchema: GenMessage<SheetPayload>;-/*** SheetService manages SQL scripts and saved queries.*diff --git a/frontend/src/types/proto-es/v1/sheet_service_pb.js b/frontend/src/types/proto-es/v1/sheet_service_pb.jsindex 7b59659bfe..a60bf33d1e 100644--- a/frontend/src/types/proto-es/v1/sheet_service_pb.js+++ b/frontend/src/types/proto-es/v1/sheet_service_pb.js@@ -16,7 +16,7 @@ import { file_v1_common } from "./common_pb";* Describes the file v1/sheet_service.proto.*/export const file_v1_sheet_service = /*@__PURE__*/- fileDesc("ChZ2MS9zaGVldF9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJqChJDcmVhdGVTaGVldFJlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EiYKBXNoZWV0GAIgASgLMhIuYnl0ZWJhc2UudjEuU2hlZXRCA+BBAiKAAQoYQmF0Y2hDcmVhdGVTaGVldHNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBI2CghyZXF1ZXN0cxgCIAMoCzIfLmJ5dGViYXNlLnYxLkNyZWF0ZVNoZWV0UmVxdWVzdEID4EECIj8KGUJhdGNoQ3JlYXRlU2hlZXRzUmVzcG9uc2USIgoGc2hlZXRzGAEgAygLMhIuYnl0ZWJhc2UudjEuU2hlZXQiSAoPR2V0U2hlZXRSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL1NoZWV0EgsKA3JhdxgCIAEoCCLNAgoFU2hlZXQSFAoEbmFtZRgBIAEoCUIG4EEC4EEFEhoKBXRpdGxlGAIgASgJQgvgQQK6SAVyAxjIARIUCgdjcmVhdG9yGAMgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHY29udGVudBgFIAEoDEID4EECEhkKDGNvbnRlbnRfc2l6ZRgGIAEoA0ID4EEDEi8KB3BheWxvYWQYByABKAsyGS5ieXRlYmFzZS52MS5TaGVldFBheWxvYWRCA+BBAxIoCgZlbmdpbmUYCCABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmVCA+BBAjo66kE3ChJieXRlYmFzZS5jb20vU2hlZXQSIXByb2plY3RzL3twcm9qZWN0fS9zaGVldHMve3NoZWV0fSI0CgxTaGVldFBheWxvYWQSJAoIY29tbWFuZHMYASADKAsyEi5ieXRlYmFzZS52MS5SYW5nZTLgAwoMU2hlZXRTZXJ2aWNlEpgBCgtDcmVhdGVTaGVldBIfLmJ5dGViYXNlLnYxLkNyZWF0ZVNoZWV0UmVxdWVzdBoSLmJ5dGViYXNlLnYxLlNoZWV0IlTaQQxwYXJlbnQsc2hlZXSK6jAQYmIuc2hlZXRzLmNyZWF0ZZDqMAGC0+STAic6BXNoZWV0Ih4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9zaGVldHMSsQEKEUJhdGNoQ3JlYXRlU2hlZXRzEiUuYnl0ZWJhc2UudjEuQmF0Y2hDcmVhdGVTaGVldHNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuQmF0Y2hDcmVhdGVTaGVldHNSZXNwb25zZSJNiuowEGJiLnNoZWV0cy5jcmVhdGWQ6jABgtPkkwIvOgEqIiovdjEve3BhcmVudD1wcm9qZWN0cy8qfS9zaGVldHM6YmF0Y2hDcmVhdGUSgAEKCEdldFNoZWV0EhwuYnl0ZWJhc2UudjEuR2V0U2hlZXRSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuU2hlZXQiQtpBBG5hbWWK6jANYmIuc2hlZXRzLmdldJDqMAGC0+STAiASHi92MS97bmFtZT1wcm9qZWN0cy8qL3NoZWV0cy8qfUKnAQoPY29tLmJ5dGViYXNlLnYxQhFTaGVldFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);+ fileDesc("ChZ2MS9zaGVldF9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJqChJDcmVhdGVTaGVldFJlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EiYKBXNoZWV0GAIgASgLMhIuYnl0ZWJhc2UudjEuU2hlZXRCA+BBAiKAAQoYQmF0Y2hDcmVhdGVTaGVldHNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBI2CghyZXF1ZXN0cxgCIAMoCzIfLmJ5dGViYXNlLnYxLkNyZWF0ZVNoZWV0UmVxdWVzdEID4EECIj8KGUJhdGNoQ3JlYXRlU2hlZXRzUmVzcG9uc2USIgoGc2hlZXRzGAEgAygLMhIuYnl0ZWJhc2UudjEuU2hlZXQiSAoPR2V0U2hlZXRSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL1NoZWV0EgsKA3JhdxgCIAEoCCKcAgoFU2hlZXQSFAoEbmFtZRgBIAEoCUIG4EEC4EEFEhoKBXRpdGxlGAIgASgJQgvgQQK6SAVyAxjIARIUCgdjcmVhdG9yGAMgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHY29udGVudBgFIAEoDEID4EECEhkKDGNvbnRlbnRfc2l6ZRgGIAEoA0ID4EEDEigKBmVuZ2luZRgIIAEoDjITLmJ5dGViYXNlLnYxLkVuZ2luZUID4EECOjrqQTcKEmJ5dGViYXNlLmNvbS9TaGVldBIhcHJvamVjdHMve3Byb2plY3R9L3NoZWV0cy97c2hlZXR9MuADCgxTaGVldFNlcnZpY2USmAEKC0NyZWF0ZVNoZWV0Eh8uYnl0ZWJhc2UudjEuQ3JlYXRlU2hlZXRSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuU2hlZXQiVNpBDHBhcmVudCxzaGVldIrqMBBiYi5zaGVldHMuY3JlYXRlkOowAYLT5JMCJzoFc2hlZXQiHi92MS97cGFyZW50PXByb2plY3RzLyp9L3NoZWV0cxKxAQoRQmF0Y2hDcmVhdGVTaGVldHMSJS5ieXRlYmFzZS52MS5CYXRjaENyZWF0ZVNoZWV0c1JlcXVlc3QaJi5ieXRlYmFzZS52MS5CYXRjaENyZWF0ZVNoZWV0c1Jlc3BvbnNlIk2K6jAQYmIuc2hlZXRzLmNyZWF0ZZDqMAGC0+STAi86ASoiKi92MS97cGFyZW50PXByb2plY3RzLyp9L3NoZWV0czpiYXRjaENyZWF0ZRKAAQoIR2V0U2hlZXQSHC5ieXRlYmFzZS52MS5HZXRTaGVldFJlcXVlc3QaEi5ieXRlYmFzZS52MS5TaGVldCJC2kEEbmFtZYrqMA1iYi5zaGVldHMuZ2V0kOowAYLT5JMCIBIeL3YxL3tuYW1lPXByb2plY3RzLyovc2hlZXRzLyp9QqcBCg9jb20uYnl0ZWJhc2UudjFCEVNoZWV0U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);/*** Describes the message bytebase.v1.CreateSheetRequest.@@ -53,13 +53,6 @@ export const GetSheetRequestSchema = /*@__PURE__*/export const SheetSchema = /*@__PURE__*/messageDesc(file_v1_sheet_service, 4);-/**- * Describes the message bytebase.v1.SheetPayload.- * Use `create(SheetPayloadSchema)` to create a new message.- */-export const SheetPayloadSchema = /*@__PURE__*/- messageDesc(file_v1_sheet_service, 5);-/*** SheetService manages SQL scripts and saved queries.*diff --git a/frontend/src/utils/v1/sheet.ts b/frontend/src/utils/v1/sheet.tsindex f8a448f23d..8a78ea6be8 100644--- a/frontend/src/utils/v1/sheet.ts+++ b/frontend/src/utils/v1/sheet.ts@@ -22,12 +22,3 @@ export const setSheetStatement = (export const getSheetStatement = (sheet: Sheet | Worksheet) => {return new TextDecoder().decode(sheet.content);};--export const extractSheetCommandByIndex = (sheet: Sheet, index: number) => {- const commands = sheet.payload?.commands;- if (!commands) return undefined;- const command = commands[index];- if (!command) return undefined;- const subarray = sheet.content.subarray(command.start, command.end);- return new TextDecoder().decode(subarray);-};diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 8bc01fb5e5..8626a05d18 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -14017,11 +14017,6 @@ components:readOnly: truetype: stringdescription: content_size is the full size of the content, may not match the size of the `content` field.- payload:- readOnly: true- allOf:- - $ref: '#/components/schemas/SheetPayload'- description: Parsed metadata about SQL commands in the sheet.engine:enum:- ENGINE_UNSPECIFIED@@ -14053,14 +14048,6 @@ components:type: stringdescription: The SQL dialect.format: enum- SheetPayload:- type: object- properties:- commands:- type: array- items:- $ref: '#/components/schemas/Range'- description: The start and end position of each command in the sheet statement.SpatialIndexConfig:type: objectproperties:@@ -14709,14 +14696,10 @@ components:type: stringdescription: When the command was logged.format: date-time- commandIndexes:- type: array- items:- type: integer- format: int32- description: |-- Either `command_indexes` or `statement` is set.- The indexes of the executed commands.+ range:+ allOf:+ - $ref: '#/components/schemas/Range'+ description: The byte offset range of the executed command in the sheet.statement:type: stringdescription: The executed statement.diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 4458daa250..20bd380675 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -4980,7 +4980,7 @@ Status represents the current execution state of a task run.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| command_indexes | [int32](#int32) | repeated | Either `command_indexes` or `statement` is set. The indexes of the executed commands. |+| range | [Range](#bytebase-store-Range) | | The byte offset range of the executed command in the sheet. || statement | [string](#string) | | The statement to be executed. |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex 010ba358fa..1b201d5d9b 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -13481,11 +13481,10 @@ Format: instances/{instance}/databases/{database}/changelogs/{changelog} </p></t<tbody><tr>- <td>command_indexes</td>- <td><a href="#int32">int32</a></td>- <td>repeated</td>- <td><p>Either `command_indexes` or `statement` is set.-The indexes of the executed commands. </p></td>+ <td>range</td>+ <td><a href="#bytebase.store.Range">Range</a></td>+ <td></td>+ <td><p>The byte offset range of the executed command in the sheet. </p></td></tr><tr>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 7adeef9546..3c8bebd294 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -642,7 +642,6 @@- [CreateSheetRequest](#bytebase-v1-CreateSheetRequest)- [GetSheetRequest](#bytebase-v1-GetSheetRequest)- [Sheet](#bytebase-v1-Sheet)- - [SheetPayload](#bytebase-v1-SheetPayload)- [SheetService](#bytebase-v1-SheetService)@@ -10051,7 +10050,7 @@ Command execution details.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- || log_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | When the command was logged. |-| command_indexes | [int32](#int32) | repeated | Either `command_indexes` or `statement` is set. The indexes of the executed commands. |+| range | [Range](#bytebase-v1-Range) | | The byte offset range of the executed command in the sheet. || statement | [string](#string) | | The executed statement. || response | [TaskRunLogEntry.CommandExecute.CommandResponse](#bytebase-v1-TaskRunLogEntry-CommandExecute-CommandResponse) | | The response from executing the command. |@@ -10479,28 +10478,12 @@ RolloutService manages the execution of deployment plans.| create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The create time of the sheet. || content | [bytes](#bytes) | | The content of the sheet. By default, it will be cut off, if it doesn't match the `content_size`, you can set the `raw` to true in GetSheet request to retrieve the full content. || content_size | [int64](#int64) | | content_size is the full size of the content, may not match the size of the `content` field. |-| payload | [SheetPayload](#bytebase-v1-SheetPayload) | | Parsed metadata about SQL commands in the sheet. || engine | [Engine](#bytebase-v1-Engine) | | The SQL dialect. |--<a name="bytebase-v1-SheetPayload"></a>--### SheetPayload----| Field | Type | Label | Description |-| ----- | ---- | ----- | ----------- |-| commands | [Range](#bytebase-v1-Range) | repeated | The start and end position of each command in the sheet statement. |-----diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 56a1659761..46265c9583 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -2628,10 +2628,6 @@<a href="#bytebase.v1.Sheet"><span class="badge">M</span>Sheet</a></li>- <li>- <a href="#bytebase.v1.SheetPayload"><span class="badge">M</span>SheetPayload</a>- </li>-@@ -28208,11 +28204,10 @@ Format: instances/{instance}/databases/{database} </p></td></tr><tr>- <td>command_indexes</td>- <td><a href="#int32">int32</a></td>- <td>repeated</td>- <td><p>Either `command_indexes` or `statement` is set.-The indexes of the executed commands. </p></td>+ <td>range</td>+ <td><a href="#bytebase.v1.Range">Range</a></td>+ <td></td>+ <td><p>The byte offset range of the executed command in the sheet. </p></td></tr><tr>@@ -29470,13 +29465,6 @@ set the `raw` to true in GetSheet request to retrieve the full content. </p></td<td><p>content_size is the full size of the content, may not match the size of the `content` field. </p></td></tr>- <tr>- <td>payload</td>- <td><a href="#bytebase.v1.SheetPayload">SheetPayload</a></td>- <td></td>- <td><p>Parsed metadata about SQL commands in the sheet. </p></td>- </tr>-<tr><td>engine</td><td><a href="#bytebase.v1.Engine">Engine</a></td>@@ -29491,30 +29479,6 @@ set the `raw` to true in GetSheet request to retrieve the full content. </p></td- <h3 id="bytebase.v1.SheetPayload">SheetPayload</h3>- <p></p>--- <table class="field-table">- <thead>- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>- </thead>- <tbody>-- <tr>- <td>commands</td>- <td><a href="#bytebase.v1.Range">Range</a></td>- <td>repeated</td>- <td><p>The start and end position of each command in the sheet statement. </p></td>- </tr>-- </tbody>- </table>-----diff --git a/proto/store/store/task_run_log.proto b/proto/store/store/task_run_log.protoindex 4d81cc9201..f9e475ddc0 100644--- a/proto/store/store/task_run_log.proto+++ b/proto/store/store/task_run_log.proto@@ -2,6 +2,7 @@ syntax = "proto3";package bytebase.store;+import "store/common.proto";import "store/task_run.proto";option go_package = "generated-go/store";@@ -44,9 +45,9 @@ message TaskRunLog {string error = 1;}message CommandExecute {- // Either `command_indexes` or `statement` is set.- // The indexes of the executed commands.- repeated int32 command_indexes = 1;+ // The byte offset range of the executed command in the sheet.+ Range range = 1;+// The statement to be executed.string statement = 2;}diff --git a/proto/v1/v1/rollout_service.proto b/proto/v1/v1/rollout_service.protoindex 1485290f06..4952b5dd25 100644--- a/proto/v1/v1/rollout_service.proto+++ b/proto/v1/v1/rollout_service.proto@@ -670,14 +670,16 @@ message TaskRunLogEntry {message CommandExecute {// When the command was logged.google.protobuf.Timestamp log_time = 1;- // Either `command_indexes` or `statement` is set.- // The indexes of the executed commands.- repeated int32 command_indexes = 2;++ // The byte offset range of the executed command in the sheet.+ Range range = 2;+// The executed statement.string statement = 4;// The response from executing the command.CommandResponse response = 3;+// Command execution response.message CommandResponse {// When the response was logged.diff --git a/proto/v1/v1/sheet_service.proto b/proto/v1/v1/sheet_service.protoindex db4ce48b05..a2652e68da 100644--- a/proto/v1/v1/sheet_service.proto+++ b/proto/v1/v1/sheet_service.proto@@ -122,14 +122,6 @@ message Sheet {// content_size is the full size of the content, may not match the size of the `content` field.int64 content_size = 6 [(google.api.field_behavior) = OUTPUT_ONLY];- // Parsed metadata about SQL commands in the sheet.- SheetPayload payload = 7 [(google.api.field_behavior) = OUTPUT_ONLY];-// The SQL dialect.Engine engine = 8 [(google.api.field_behavior) = REQUIRED];}--message SheetPayload {- // The start and end position of each command in the sheet statement.- repeated Range commands = 1;-}