Remove comments. Rework TLPHaving/TLPWhere via TLPBase. Move TLP orac…

…les to separate module.
sqlancer · Jul 1, 2020 · 87c4219 · 87c4219
1 parent 85ebbd9
commit 87c4219
Show file tree

Hide file tree

Showing 42 changed files with 3,836 additions and 735 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ target/
 .settings
 .project
 .checkstyle
+*.DS_Store
diff --git a/pom.xml b/pom.xml
@@ -126,20 +126,20 @@
 				<artifactId>maven-pmd-plugin</artifactId>
 				<version>3.13.0</version>
 				<executions>
-					<execution>
-						<id>pmd</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<failurePriority>2</failurePriority>
-							<failOnViolation>true</failOnViolation>
-							<rulesets>
-								<ruleset>configs/pmd-rules.xml</ruleset>
-							</rulesets>
-						</configuration>
-					</execution>
+						<execution>
+								<id>pmd</id>
+								<phase>verify</phase>
+								<goals>
+										<goal>check</goal>
+								</goals>
+								<configuration>
+										<failurePriority>2</failurePriority>
+										<failOnViolation>true</failOnViolation>
+										<rulesets>
+												<ruleset>configs/pmd-rules.xml</ruleset>
+										</rulesets>
+								</configuration>
+						</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -200,8 +200,18 @@
 			<version>5.6.2</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId> slf4j-simple</artifactId>
+			<version>1.7.30</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>ru.yandex.clickhouse</groupId>
+			<artifactId>clickhouse-jdbc</artifactId>
+			<version>0.2.4</version>
+		</dependency>
 	</dependencies>
-
 	<reporting>
 		<plugins>
 			<plugin>

diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -26,7 +26,7 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.JCommander.Builder;
 
-import sqlancer.clickhouse.ClickhouseProvider;
+import sqlancer.clickhouse.ClickHouseProvider;
 import sqlancer.cockroachdb.CockroachDBProvider;
 import sqlancer.duckdb.DuckDBProvider;
 import sqlancer.mariadb.MariaDBProvider;
@@ -472,7 +472,7 @@ private void runThread(final String databaseName) {
         providers.add(new MariaDBProvider());
         providers.add(new TiDBProvider());
         providers.add(new PostgresProvider());
-        providers.add(new ClickhouseProvider());
+        providers.add(new ClickHouseProvider());
         providers.add(new DuckDBProvider());
         return providers;
     }

diff --git a/src/sqlancer/MainOptions.java b/src/sqlancer/MainOptions.java
@@ -80,7 +80,7 @@ public int getNrStatementRetryCount() {
     }
 
     public enum DBMS {
-        MariaDB, SQLite3, MySQL, PostgreSQL, TDEngine, CockroachDB, TiDB
+        MariaDB, SQLite3, MySQL, PostgreSQL, TDEngine, CockroachDB, TiDB, ClickHouse
     }
 
     public String getUserName() {

diff --git a/src/sqlancer/StateToReproduce.java b/src/sqlancer/StateToReproduce.java
@@ -4,6 +4,9 @@
 import java.util.List;
 import java.util.Map;
 
+import sqlancer.clickhouse.ClickHouseSchema;
+import sqlancer.clickhouse.ast.ClickHouseConstant;
+import sqlancer.clickhouse.ast.ClickHouseExpression;
 import sqlancer.mysql.MySQLSchema.MySQLColumn;
 import sqlancer.mysql.ast.MySQLConstant;
 import sqlancer.mysql.ast.MySQLExpression;
@@ -35,7 +38,6 @@ public class StateToReproduce {
 
     public StateToReproduce(String databaseName) {
         this.databaseName = databaseName;
-
     }
 
     public String getException() {
@@ -125,4 +127,26 @@ public PostgresExpression getWhereClause() {
 
     }
 
+    public static class ClickHouseStateToReproduce extends StateToReproduce {
+
+        public Map<ClickHouseSchema.ClickHouseColumn, ClickHouseConstant> randomRowValues;
+
+        public ClickHouseExpression whereClause;
+
+        public String queryThatSelectsRow;
+
+        public ClickHouseStateToReproduce(String databaseName) {
+            super(databaseName);
+        }
+
+        public Map<ClickHouseSchema.ClickHouseColumn, ClickHouseConstant> getRandomRowValues() {
+            return randomRowValues;
+        }
+
+        public ClickHouseExpression getWhereClause() {
+            return whereClause;
+        }
+
+    }
+
 }
diff --git a/src/sqlancer/ast/ClickhouseSelect.java b/src/sqlancer/ast/ClickhouseSelect.java
diff --git a/...sqlancer/clickhouse/ClickhouseErrors.java → ...sqlancer/clickhouse/ClickHouseErrors.java b/...sqlancer/clickhouse/ClickhouseErrors.java → ...sqlancer/clickhouse/ClickHouseErrors.java
@@ -2,12 +2,12 @@
 
 import java.util.Set;
 
-public final class ClickhouseErrors {
+public final class ClickHouseErrors {
 
-    private ClickhouseErrors() {
+    private ClickHouseErrors() {
     }
 
-    public static void addExpressionErrors(Set<String> errors) {
+    public static void addExpectedExpressionErrors(Set<String> errors) {
         // errors.add("Illegal type (String) of argument of function not");
         // errors.add("Illegal type String of column for constant filter. Must be UInt8 or Nullable(UInt8)");
         // errors.add("Illegal type Int32 of column for constant filter. Must be UInt8 or Nullable(UInt8)");
@@ -24,6 +24,24 @@ public static void addExpressionErrors(Set<String> errors) {
         // regex
         errors.add("invalid escape sequence");
         errors.add("invalid character class range");
+        errors.add("Memory limit");
+        errors.add("There is no supertype for types");
+        errors.add("Bad get: has Int64, requested UInt64");
+        errors.add("Cannot convert string");
+        errors.add("Attempt to read after eof: while converting");
+        errors.add("doesn't exist"); // TODO: consecutive test runs can lead to dropped database
+        errors.add("is not under aggregate function");
     }
 
+    public static void addExpressionHavingErrors(Set<String> errors) {
+        errors.add("Memory limit");
+    }
+
+    public static void addQueryErrors(Set<String> errors) {
+        errors.add("Memory limit");
+    }
+
+    public static void addGroupingErrors(Set<String> errors) {
+        errors.add("Memory limit");
+    }
 }
diff --git a/src/sqlancer/clickhouse/ClickHouseOptions.java b/src/sqlancer/clickhouse/ClickHouseOptions.java
@@ -0,0 +1,39 @@
+package sqlancer.clickhouse;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.Parameters;
+import sqlancer.MainOptions;
+import sqlancer.TestOracle;
+import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPWhereOracle;
+import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPHavingOracle;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+@Parameters(separators = "=", commandDescription = "ClickHouse")
+public class ClickHouseOptions extends MainOptions {
+
+    @Parameter(names = "--oracle", converter = MainOptions.DBMSConverter.class)
+    public List<ClickHouseOracle> oracle = Arrays.asList(ClickHouseOracle.TLPWhere);
+
+    @Parameter(names = { "--test-joins" }, description = "Allow the generation of JOIN clauses", arity = 1)
+    public boolean testJoins = true;
+
+    public enum ClickHouseOracle {
+        TLPWhere {
+            @Override
+            public TestOracle create(ClickHouseProvider.ClickHouseGlobalState globalState) throws SQLException {
+                return new ClickHouseTLPWhereOracle(globalState);
+            }
+        },
+        HAVING {
+            @Override
+            public TestOracle create(ClickHouseProvider.ClickHouseGlobalState globalState) throws SQLException {
+                return new ClickHouseTLPHavingOracle(globalState);
+            }
+        };
+
+        public abstract TestOracle create(ClickHouseProvider.ClickHouseGlobalState globalState) throws SQLException;
+    }
+}