Revert "tidb: support tidb_cost_model_version (sqlancer#692)" (sqlancer#694)

hawkingrei · web-flow · commit e7d91ad03249 · 2023-01-16T09:42:56.000+08:00
This reverts commit 1c053ce.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -328,8 +328,8 @@ jobs:
         run: mvn -B package -DskipTests=true
       - name: Set up TiDB
         run: |
-          docker pull pingcap/tidb:nightly
-          docker run --name tidb-server -d -p 4000:4000 pingcap/tidb:nightly
+          docker pull pingcap/tidb:latest
+          docker run --name tidb-server -d -p 4000:4000 pingcap/tidb:latest
           sleep 10
       - name: Create SQLancer user
         run: sudo mysql -h 127.0.0.1 -P 4000 -u root -D test -e "CREATE USER 'sqlancer'@'%' IDENTIFIED WITH mysql_native_password BY 'sqlancer'; GRANT ALL PRIVILEGES ON *.* TO 'sqlancer'@'%' WITH GRANT OPTION; FLUSH PRIVILEGES;"
diff --git a/src/sqlancer/tidb/gen/TiDBSetGenerator.java b/src/sqlancer/tidb/gen/TiDBSetGenerator.java
@@ -13,7 +13,7 @@ private TiDBSetGenerator() {
     }
 
     private enum Action {
-        TIDB_COST_MODEL_VERSION("tidb_cost_model_version", (r) -> Randomly.fromOptions(1, 2)), //
+
         // SQL_MODE("sql_mode", (r) -> Randomly.fromOptions("TRADITIONAL", "ANSI", "POSTGRESQL", "ORACLE")),
         TIDB_OPT_AGG_PUSH_DOWN("tidb_opt_agg_push_down", (r) -> Randomly.fromOptions(0, 1)), //
         TIDB_BUILD_STATS_CONCURRENCY("tidb_build_stats_concurrency", (r) -> Randomly.getNotCachedInteger(0, 500)), //

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ private TiDBSetGenerator() {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`private enum Action {`
`16`		`- TIDB_COST_MODEL_VERSION("tidb_cost_model_version", (r) -> Randomly.fromOptions(1, 2)), //`
	`16`	`+`
`17`	`17`	`// SQL_MODE("sql_mode", (r) -> Randomly.fromOptions("TRADITIONAL", "ANSI", "POSTGRESQL", "ORACLE")),`
`18`	`18`	`TIDB_OPT_AGG_PUSH_DOWN("tidb_opt_agg_push_down", (r) -> Randomly.fromOptions(0, 1)), //`
`19`	`19`	`TIDB_BUILD_STATS_CONCURRENCY("tidb_build_stats_concurrency", (r) -> Randomly.getNotCachedInteger(0, 500)), //`