Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: preliminary adaptation of gaussdb #12061

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
+2,098 −339
Open

feat: preliminary adaptation of gaussdb #12061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d6831ea
gaussdb init 20240429
shanzhuer Apr 29, 2024
7ba87b1
gaussdb init
shanzhuer May 11, 2024
a4049dd
gaussdb 0514
shanzhuer May 14, 2024
cd57b5c
gaussdb sync ok 20240520
shanzhuer May 20, 2024
a17d902
gauss dml ok 20240520
shanzhuer May 20, 2024
2eba927
gaussdb ddl tested
shanzhuer May 21, 2024
75ddcab
Merge branch 'main' of github.com:bytebase/bytebase into chore/conflict
ecmadao May 21, 2024
09af09e
chore: update
ecmadao May 21, 2024
d5eae73
Merge pull request #1 from ecmadao/chore/conflict
shanzhuer May 21, 2024
47b6bae
Update gauss.go
shanzhuer May 21, 2024
85d80d8
fix i18n sql-review
shanzhuer May 21, 2024
cbba572
fix vi-VN.json
shanzhuer May 21, 2024
127796b
mod gauss sync test
shanzhuer May 21, 2024
c1b86c9
Delete scripts/.airnotmin.toml
shanzhuer May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of github.com:bytebase/bytebase into chore/conflict 
# Conflicts:
#	backend/api/v1/database_service.go
#	backend/plugin/parser/pg/completion.go
#	backend/runner/taskrun/executor.go
#	frontend/pnpm-lock.yaml
#	frontend/src/types/proto/google/protobuf/descriptor.ts
#	frontend/src/types/proto/store/common.ts
#	frontend/src/types/proto/v1/common.ts
#	frontend/src/types/sql-review-schema.yaml
#	go.sum
#	proto/generated-go/store/activity.pb.go
#	proto/generated-go/store/approval.pb.go
#	proto/generated-go/store/audit_log.pb.go
#	proto/generated-go/store/branch.pb.go
#	proto/generated-go/store/changelist.pb.go
#	proto/generated-go/store/common.pb.go
#	proto/generated-go/store/data_source.pb.go
#	proto/generated-go/store/database.pb.go
#	proto/generated-go/store/export_archive.pb.go
#	proto/generated-go/store/idp.pb.go
#	proto/generated-go/store/instance.pb.go
#	proto/generated-go/store/instance_change_history.pb.go
#	proto/generated-go/store/issue.pb.go
#	proto/generated-go/store/issue_comment.pb.go
#	proto/generated-go/store/plan.pb.go
#	proto/generated-go/store/plan_check_run.pb.go
#	proto/generated-go/store/policy.pb.go
#	proto/generated-go/store/project.pb.go
#	proto/generated-go/store/query_history.pb.go
#	proto/generated-go/store/role.pb.go
#	proto/generated-go/store/setting.pb.go
#	proto/generated-go/store/sheet.pb.go
#	proto/generated-go/store/slow_query.pb.go
#	proto/generated-go/store/task_run.pb.go
#	proto/generated-go/store/user.pb.go
#	proto/generated-go/store/vcs.pb.go
#	proto/generated-go/v1/actuator_service.pb.go
#	proto/generated-go/v1/anomaly_service.pb.go
#	proto/generated-go/v1/audit_log_service.pb.go
#	proto/generated-go/v1/auth_service.pb.go
#	proto/generated-go/v1/branch_service.pb.go
#	proto/generated-go/v1/cel_service.pb.go
#	proto/generated-go/v1/changelist_service.pb.go
#	proto/generated-go/v1/common.pb.go
#	proto/generated-go/v1/database_service.pb.go
#	proto/generated-go/v1/environment_service.pb.go
#	proto/generated-go/v1/iam_policy.pb.go
#	proto/generated-go/v1/idp_service.pb.go
#	proto/generated-go/v1/instance_role_service.pb.go
#	proto/generated-go/v1/instance_service.pb.go
#	proto/generated-go/v1/issue_service.pb.go
#	proto/generated-go/v1/logging_service.pb.go
#	proto/generated-go/v1/org_policy_service.pb.go
#	proto/generated-go/v1/project_service.pb.go
#	proto/generated-go/v1/risk_service.pb.go
#	proto/generated-go/v1/role_service.pb.go
#	proto/generated-go/v1/rollout_service.pb.go
#	proto/generated-go/v1/setting_service.pb.go
#	proto/generated-go/v1/sheet_service.pb.go
#	proto/generated-go/v1/sql_service.pb.go
#	proto/generated-go/v1/subscription_service.pb.go
#	proto/generated-go/v1/vcs_connector_service.pb.go
#	proto/generated-go/v1/vcs_provider_service.pb.go
#	proto/generated-go/v1/worksheet_service.pb.go
  • Loading branch information
@ecmadao
ecmadao committed May 21, 2024
commit 75ddcabd9a20c8d9144a9e7629f74c78fa5cf683
2 changes: 2 additions & 0 deletions backend/api/v1/database_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,8 @@ func (s *DatabaseService) getParserEngine(ctx context.Context, request *v1pb.Dif
engine = storepb.Engine_ORACLE
case storepb.Engine_GAUSSDB:
engine = storepb.Engine_GAUSSDB
case storepb.Engine_MSSQL:
engine = storepb.Engine_MSSQL
default:
return engine, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid engine type %v", instance.Engine))
}
Expand Down
2 changes: 1 addition & 1 deletion backend/runner/taskrun/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func executeMigration(
switch task.Type {
case api.TaskDatabaseSchemaUpdate, api.TaskDatabaseDataUpdate:
switch instance.Engine {
case storepb.Engine_MYSQL, storepb.Engine_TIDB, storepb.Engine_OCEANBASE, storepb.Engine_STARROCKS, storepb.Engine_DORIS, storepb.Engine_POSTGRES, storepb.Engine_REDSHIFT, storepb.Engine_RISINGWAVE, storepb.Engine_ORACLE, storepb.Engine_DM, storepb.Engine_OCEANBASE_ORACLE, storepb.Engine_GAUSSDB:
case storepb.Engine_MYSQL, storepb.Engine_TIDB, storepb.Engine_OCEANBASE, storepb.Engine_STARROCKS, storepb.Engine_DORIS, storepb.Engine_POSTGRES, storepb.Engine_REDSHIFT, storepb.Engine_RISINGWAVE, storepb.Engine_ORACLE, storepb.Engine_DM, storepb.Engine_OCEANBASE_ORACLE, storepb.Engine_GAUSSDB, storepb.Engine_MSSQL:
opts.ChunkedSubmission = true
opts.UpdateExecutionStatus = func(detail *v1pb.TaskRun_ExecutionDetail) {
stateCfg.TaskRunExecutionStatuses.Store(taskRunUID,
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.