Simplify the schema update logic

mrigger · mrigger · commit d0d0d605f244 · 2020-09-23T22:07:09.000+02:00
diff --git a/src/sqlancer/GlobalState.java b/src/sqlancer/GlobalState.java
@@ -164,6 +164,10 @@ protected void setSchema(S schema) {
         this.schema = schema;
     }
 
-    protected abstract void updateSchema() throws SQLException;
+    public void updateSchema() throws SQLException {
+        setSchema(readSchema());
+    }
+
+    protected abstract S readSchema() throws SQLException;
 
 }
diff --git a/src/sqlancer/citus/CitusGlobalState.java b/src/sqlancer/citus/CitusGlobalState.java
@@ -17,8 +17,8 @@ public boolean getRepartition() {
     }
 
     @Override
-    public void updateSchema() throws SQLException {
-        setSchema(CitusSchema.fromConnection(getConnection(), getDatabaseName()));
+    public CitusSchema readSchema() throws SQLException {
+        return CitusSchema.fromConnection(getConnection(), getDatabaseName());
     }
 
 }
diff --git a/src/sqlancer/clickhouse/ClickHouseProvider.java b/src/sqlancer/clickhouse/ClickHouseProvider.java
@@ -74,8 +74,8 @@ public String getDatabaseName() {
         }
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(ClickHouseSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected ClickHouseSchema readSchema() throws SQLException {
+            return ClickHouseSchema.fromConnection(getConnection(), getDatabaseName());
         }
     }
 
diff --git a/src/sqlancer/cockroachdb/CockroachDBProvider.java b/src/sqlancer/cockroachdb/CockroachDBProvider.java
@@ -113,8 +113,8 @@ public Query getQuery(CockroachDBGlobalState state) throws SQLException {
     public static class CockroachDBGlobalState extends GlobalState<CockroachDBOptions, CockroachDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(CockroachDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected CockroachDBSchema readSchema() throws SQLException {
+            return CockroachDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }
diff --git a/src/sqlancer/duckdb/DuckDBProvider.java b/src/sqlancer/duckdb/DuckDBProvider.java
@@ -88,8 +88,8 @@ private static int mapActions(DuckDBGlobalState globalState, Action a) {
     public static class DuckDBGlobalState extends GlobalState<DuckDBOptions, DuckDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(DuckDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected DuckDBSchema readSchema() throws SQLException {
+            return DuckDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }
diff --git a/src/sqlancer/mariadb/MariaDBProvider.java b/src/sqlancer/mariadb/MariaDBProvider.java
@@ -155,8 +155,8 @@ public void generateDatabase(MariaDBGlobalState globalState) throws SQLException
     public static class MariaDBGlobalState extends GlobalState<MariaDBOptions, MariaDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(MariaDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected MariaDBSchema readSchema() throws SQLException {
+            return MariaDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }
diff --git a/src/sqlancer/mysql/MySQLGlobalState.java b/src/sqlancer/mysql/MySQLGlobalState.java
@@ -9,8 +9,8 @@
 public class MySQLGlobalState extends GlobalState<MySQLOptions, MySQLSchema> {
 
     @Override
-    protected void updateSchema() throws SQLException {
-        setSchema(MySQLSchema.fromConnection(getConnection(), getDatabaseName()));
+    protected MySQLSchema readSchema() throws SQLException {
+        return MySQLSchema.fromConnection(getConnection(), getDatabaseName());
     }
 
     public boolean usesPQS() {
diff --git a/src/sqlancer/postgres/PostgresGlobalState.java b/src/sqlancer/postgres/PostgresGlobalState.java
@@ -101,8 +101,8 @@ public String getRandomOpclass() {
     }
 
     @Override
-    public void updateSchema() throws SQLException {
-        setSchema(PostgresSchema.fromConnection(getConnection(), getDatabaseName()));
+    public PostgresSchema readSchema() throws SQLException {
+        return PostgresSchema.fromConnection(getConnection(), getDatabaseName());
     }
 
     public void addFunctionAndType(String functionName, Character functionType) {
diff --git a/src/sqlancer/sqlite3/SQLite3Provider.java b/src/sqlancer/sqlite3/SQLite3Provider.java
@@ -115,8 +115,8 @@ public Query getQuery(SQLite3GlobalState state) throws SQLException {
     public static class SQLite3GlobalState extends GlobalState<SQLite3Options, SQLite3Schema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(SQLite3Schema.fromConnection(this));
+        protected SQLite3Schema readSchema() throws SQLException {
+            return SQLite3Schema.fromConnection(this);
         }
 
     }
diff --git a/src/sqlancer/tidb/TiDBProvider.java b/src/sqlancer/tidb/TiDBProvider.java
@@ -69,8 +69,8 @@ public Query getQuery(TiDBGlobalState state) throws SQLException {
     public static class TiDBGlobalState extends GlobalState<TiDBOptions, TiDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(TiDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected TiDBSchema readSchema() throws SQLException {
+            return TiDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,10 @@ protected void setSchema(S schema) {`
`164`	`164`	`this.schema = schema;`
`165`	`165`	`}`
`166`	`166`
`167`		`- protected abstract void updateSchema() throws SQLException;`
	`167`	`+ public void updateSchema() throws SQLException {`
	`168`	`+ setSchema(readSchema());`
	`169`	`+ }`
	`170`	`+`
	`171`	`+ protected abstract S readSchema() throws SQLException;`
`168`	`172`
`169`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public boolean getRepartition() {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`
`20`		`- public void updateSchema() throws SQLException {`
`21`		`- setSchema(CitusSchema.fromConnection(getConnection(), getDatabaseName()));`
	`20`	`+ public CitusSchema readSchema() throws SQLException {`
	`21`	`+ return CitusSchema.fromConnection(getConnection(), getDatabaseName());`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ public String getDatabaseName() {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`		`- protected void updateSchema() throws SQLException {`
`78`		`- setSchema(ClickHouseSchema.fromConnection(getConnection(), getDatabaseName()));`
	`77`	`+ protected ClickHouseSchema readSchema() throws SQLException {`
	`78`	`+ return ClickHouseSchema.fromConnection(getConnection(), getDatabaseName());`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,8 @@ public Query getQuery(CockroachDBGlobalState state) throws SQLException {`
`113`	`113`	`public static class CockroachDBGlobalState extends GlobalState<CockroachDBOptions, CockroachDBSchema> {`
`114`	`114`
`115`	`115`	`@Override`
`116`		`- protected void updateSchema() throws SQLException {`
`117`		`- setSchema(CockroachDBSchema.fromConnection(getConnection(), getDatabaseName()));`
	`116`	`+ protected CockroachDBSchema readSchema() throws SQLException {`
	`117`	`+ return CockroachDBSchema.fromConnection(getConnection(), getDatabaseName());`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ private static int mapActions(DuckDBGlobalState globalState, Action a) {`
`88`	`88`	`public static class DuckDBGlobalState extends GlobalState<DuckDBOptions, DuckDBSchema> {`
`89`	`89`
`90`	`90`	`@Override`
`91`		`- protected void updateSchema() throws SQLException {`
`92`		`- setSchema(DuckDBSchema.fromConnection(getConnection(), getDatabaseName()));`
	`91`	`+ protected DuckDBSchema readSchema() throws SQLException {`
	`92`	`+ return DuckDBSchema.fromConnection(getConnection(), getDatabaseName());`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ public void generateDatabase(MariaDBGlobalState globalState) throws SQLException`
`155`	`155`	`public static class MariaDBGlobalState extends GlobalState<MariaDBOptions, MariaDBSchema> {`
`156`	`156`
`157`	`157`	`@Override`
`158`		`- protected void updateSchema() throws SQLException {`
`159`		`- setSchema(MariaDBSchema.fromConnection(getConnection(), getDatabaseName()));`
	`158`	`+ protected MariaDBSchema readSchema() throws SQLException {`
	`159`	`+ return MariaDBSchema.fromConnection(getConnection(), getDatabaseName());`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`	`public class MySQLGlobalState extends GlobalState<MySQLOptions, MySQLSchema> {`
`10`	`10`
`11`	`11`	`@Override`
`12`		`- protected void updateSchema() throws SQLException {`
`13`		`- setSchema(MySQLSchema.fromConnection(getConnection(), getDatabaseName()));`
	`12`	`+ protected MySQLSchema readSchema() throws SQLException {`
	`13`	`+ return MySQLSchema.fromConnection(getConnection(), getDatabaseName());`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public boolean usesPQS() {`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ public String getRandomOpclass() {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`
`104`		`- public void updateSchema() throws SQLException {`
`105`		`- setSchema(PostgresSchema.fromConnection(getConnection(), getDatabaseName()));`
	`104`	`+ public PostgresSchema readSchema() throws SQLException {`
	`105`	`+ return PostgresSchema.fromConnection(getConnection(), getDatabaseName());`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public void addFunctionAndType(String functionName, Character functionType) {`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ public Query getQuery(SQLite3GlobalState state) throws SQLException {`
`115`	`115`	`public static class SQLite3GlobalState extends GlobalState<SQLite3Options, SQLite3Schema> {`
`116`	`116`
`117`	`117`	`@Override`
`118`		`- protected void updateSchema() throws SQLException {`
`119`		`- setSchema(SQLite3Schema.fromConnection(this));`
	`118`	`+ protected SQLite3Schema readSchema() throws SQLException {`
	`119`	`+ return SQLite3Schema.fromConnection(this);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ public Query getQuery(TiDBGlobalState state) throws SQLException {`
`69`	`69`	`public static class TiDBGlobalState extends GlobalState<TiDBOptions, TiDBSchema> {`
`70`	`70`
`71`	`71`	`@Override`
`72`		`- protected void updateSchema() throws SQLException {`
`73`		`- setSchema(TiDBSchema.fromConnection(getConnection(), getDatabaseName()));`
	`72`	`+ protected TiDBSchema readSchema() throws SQLException {`
	`73`	`+ return TiDBSchema.fromConnection(getConnection(), getDatabaseName());`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`}`