chore: change the driver

apecloud · Apr 29, 2024 · 798c7aa · 798c7aa
1 parent 3fca5dc
commit 798c7aa
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 38 deletions.
diff --git a/api/v1alpha1/type.go b/api/v1alpha1/type.go
@@ -50,7 +50,7 @@ type ResourceList struct {
 type Target struct {
 	// the driver represents the database type
 	// +optional
-	// +kubebuilder:validation:Enum={mysql,postgresql,mongodb,redis,oceanbase,oracle}
+	// +kubebuilder:validation:Enum={mysql,postgresql,mongodb,redis,oceanbase-oracle}
 	Driver string `json:"driver,omitempty"`
 
 	// The database server's host name

diff --git a/config/crd/bases/benchmark.apecloud.io_pgbenches.yaml b/config/crd/bases/benchmark.apecloud.io_pgbenches.yaml
@@ -95,8 +95,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/config/crd/bases/benchmark.apecloud.io_redisbenches.yaml b/config/crd/bases/benchmark.apecloud.io_redisbenches.yaml
@@ -99,8 +99,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/config/crd/bases/benchmark.apecloud.io_sysbenches.yaml b/config/crd/bases/benchmark.apecloud.io_sysbenches.yaml
@@ -82,8 +82,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/config/crd/bases/benchmark.apecloud.io_tpccs.yaml b/config/crd/bases/benchmark.apecloud.io_tpccs.yaml
@@ -108,8 +108,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/config/crd/bases/benchmark.apecloud.io_tpcds.yaml b/config/crd/bases/benchmark.apecloud.io_tpcds.yaml
@@ -79,8 +79,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/config/crd/bases/benchmark.apecloud.io_tpches.yaml b/config/crd/bases/benchmark.apecloud.io_tpches.yaml
@@ -79,8 +79,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/config/crd/bases/benchmark.apecloud.io_ycsbs.yaml b/config/crd/bases/benchmark.apecloud.io_ycsbs.yaml
@@ -127,8 +127,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/deploy/helm/crds/benchmark.apecloud.io_pgbenches.yaml b/deploy/helm/crds/benchmark.apecloud.io_pgbenches.yaml
@@ -95,8 +95,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/deploy/helm/crds/benchmark.apecloud.io_redisbenches.yaml b/deploy/helm/crds/benchmark.apecloud.io_redisbenches.yaml
@@ -99,8 +99,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/deploy/helm/crds/benchmark.apecloud.io_sysbenches.yaml b/deploy/helm/crds/benchmark.apecloud.io_sysbenches.yaml
@@ -82,8 +82,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/deploy/helm/crds/benchmark.apecloud.io_tpccs.yaml b/deploy/helm/crds/benchmark.apecloud.io_tpccs.yaml
@@ -108,8 +108,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/deploy/helm/crds/benchmark.apecloud.io_tpcds.yaml b/deploy/helm/crds/benchmark.apecloud.io_tpcds.yaml
@@ -79,8 +79,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/deploy/helm/crds/benchmark.apecloud.io_tpches.yaml b/deploy/helm/crds/benchmark.apecloud.io_tpches.yaml
@@ -79,8 +79,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/deploy/helm/crds/benchmark.apecloud.io_ycsbs.yaml b/deploy/helm/crds/benchmark.apecloud.io_ycsbs.yaml
@@ -127,8 +127,7 @@ spec:
                     - postgresql
                     - mongodb
                     - redis
-                    - oceanbase
-                    - oracle
+                    - oceanbase-oracle
                     type: string
                   host:
                     type: string

diff --git a/internal/controller/tpcc_job.go b/internal/controller/tpcc_job.go
@@ -150,8 +150,8 @@ func NewTpccWorkLoadParams(cr *v1alpha1.Tpcc) string {
 		return NewTpccMysqlParams(cr)
 	case constants.PostgreSqlDriver:
 		return NewTpccPostgresParams(cr)
-	case constants.OceanBaseDriver:
-		return NewOceanBaseParams(cr)
+	case constants.OceanBaseOracleTenantDriver:
+		return NewOceanBaseOracleTenantParams(cr)
 	default:
 		return ""
 	}
@@ -169,7 +169,7 @@ func NewTpccPostgresParams(cr *v1alpha1.Tpcc) string {
 	return result
 }
 
-func NewOceanBaseParams(cr *v1alpha1.Tpcc) string {
+func NewOceanBaseOracleTenantParams(cr *v1alpha1.Tpcc) string {
 	result := fmt.Sprintf("--driver %s", "com.alipay.oceanbase.obproxy.mysql.jdbc.Driver")
 	result = fmt.Sprintf("%s --conn \"jdbc:oceanbase://%s:%d/%s?useUnicode=true&characterEncoding=utf-8\"", result, cr.Spec.Target.Host, cr.Spec.Target.Port, cr.Spec.Target.Database)
 	return result
@@ -195,7 +195,7 @@ func getTpccDriver(driver string) string {
 		return "mysql"
 	case constants.PostgreSqlDriver:
 		return "postgres"
-	case constants.OceanBaseDriver:
+	case constants.OceanBaseOracleTenantDriver:
 		// for oceanbase oracle tenant
 		return "oracle"
 	default:

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -21,11 +21,11 @@ const (
 )
 
 const (
-	MySqlDriver      = "mysql"
-	PostgreSqlDriver = "postgresql"
-	MongoDbDriver    = "mongodb"
-	RedisDriver      = "redis"
-	OceanBaseDriver  = "oceanbase"
+	MySqlDriver                 = "mysql"
+	PostgreSqlDriver            = "postgresql"
+	MongoDbDriver               = "mongodb"
+	RedisDriver                 = "redis"
+	OceanBaseOracleTenantDriver = "oceanbase-oracle"
 )
 
 const (