fix partition table with partition column name date (#1892)

pingcap · Jan 29, 2021 · edfea9b · edfea9b
1 parent 7bbabce
commit edfea9b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/core/src/test/scala/org/apache/spark/sql/IssueTestSuite.scala b/core/src/test/scala/org/apache/spark/sql/IssueTestSuite.scala
@@ -21,6 +21,20 @@ import org.apache.spark.sql.functions.{col, sum}
 
 class IssueTestSuite extends BaseTiSparkTest {
 
+  test("partition table with date partition column name") {
+    tidbStmt.execute("drop table if exists t1")
+    tidbStmt.execute("""
+        |CREATE TABLE t1 (
+        |date date NOT NULL,
+        |cost bigint(20) DEFAULT NULL)
+        |PARTITION BY RANGE COLUMNS(date) (
+        |PARTITION p20200404 VALUES LESS THAN ("2020-04-05"),
+        |PARTITION p20200418 VALUES LESS THAN ("2020-04-19")
+        |)
+        |""".stripMargin)
+    spark.sql("select `date`, sum(cost) from t1 where group by `date`").show()
+  }
+
   test("count(a, b) with null values") {
     tidbStmt.execute("drop table if exists t1")
     tidbStmt.execute("create table t1(a int, b int)")

diff --git a/tikv-client/src/main/java/com/pingcap/tikv/expression/PartitionPruner.java b/tikv-client/src/main/java/com/pingcap/tikv/expression/PartitionPruner.java
@@ -80,15 +80,27 @@ static void generateRangeExprs(
       if (current.equals("MAXVALUE")) {
         leftHand = "true";
       } else {
-        leftHand = String.format("%s < %s", partExprStr, current);
+        leftHand = String.format("%s < %s", wrapColumnName(partExprStr), current);
       }
       if (i == 0) {
         partExprs.add(parser.parseExpression(leftHand));
       } else {
         String previous = partInfo.getDefs().get(i - 1).getLessThan().get(lessThanIdx);
-        String and = String.format("%s and %s", partExprStr + ">=" + previous, leftHand);
+        String and =
+            String.format("%s >= %s and %s", wrapColumnName(partExprStr), previous, leftHand);
         partExprs.add(parser.parseExpression(and));
       }
     }
   }
+
+  private static String wrapColumnName(String columnName) {
+    if (columnName.startsWith("`") && columnName.endsWith("`")) {
+      return columnName;
+    } else if (columnName.contains("(") && columnName.contains(")")) {
+      // function not column name, e.g. year(columnName)
+      return columnName;
+    } else {
+      return String.format("`%s`", columnName);
+    }
+  }
 }