From aa2ee8eb1addffc593ffbb10d57c10790596e721 Mon Sep 17 00:00:00 2001 From: "Xiaotian (Jackie) Jiang" Date: Tue, 4 Oct 2022 15:52:51 -0700 Subject: [PATCH] Fix timestamp index on column of preserved key --- .../pinot/spi/config/table/TimestampIndexGranularity.java | 4 ++-- .../spi/config/table/TimestampIndexGranularityTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TimestampIndexGranularity.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TimestampIndexGranularity.java index 3b7645b4fd67..723c51904142 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TimestampIndexGranularity.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TimestampIndexGranularity.java @@ -97,13 +97,13 @@ public static FieldSpec getFieldSpecForTimestampColumnWithGranularity(FieldSpec /** * Generate the dateTrunc expression to convert the base time column to the time column with granularity value - * E.g. $ts$DAY -> dateTrunc('DAY', ts) + * E.g. $ts$DAY -> dateTrunc('DAY',"ts") * * @param timeColumn * @param granularity * @return Time conversion expression */ public static String getTransformExpression(String timeColumn, TimestampIndexGranularity granularity) { - return "dateTrunc('" + granularity + "', " + timeColumn + ")"; + return "dateTrunc('" + granularity + "',\"" + timeColumn + "\")"; } } diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/TimestampIndexGranularityTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/TimestampIndexGranularityTest.java index 9db2e6b1d2ef..faa50831d1f7 100644 --- a/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/TimestampIndexGranularityTest.java +++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/TimestampIndexGranularityTest.java @@ -76,10 +76,10 @@ public void testExtractTimestampIndexGranularityColumnNames() { @Test public void testGetTransformExpression() { Assert.assertEquals(TimestampIndexGranularity.getTransformExpression("ts", TimestampIndexGranularity.DAY), - "dateTrunc('DAY', ts)"); + "dateTrunc('DAY',\"ts\")"); Assert.assertEquals(TimestampIndexGranularity.getTransformExpression("ts", TimestampIndexGranularity.WEEK), - "dateTrunc('WEEK', ts)"); + "dateTrunc('WEEK',\"ts\")"); Assert.assertEquals(TimestampIndexGranularity.getTransformExpression("ts", TimestampIndexGranularity.MONTH), - "dateTrunc('MONTH', ts)"); + "dateTrunc('MONTH',\"ts\")"); } }