Skip to content

Commit f16886c

Browse files
committed
[Native] Advance Velox
1 parent 3cd1b54 commit f16886c

File tree

4 files changed

+11
-24
lines changed

4 files changed

+11
-24
lines changed

presto-native-execution/velox

Submodule velox updated 163 files

presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/typemanager/NativeTypeManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import static com.facebook.presto.common.type.StandardTypes.ROW;
6060
import static com.facebook.presto.common.type.StandardTypes.SMALLINT;
6161
import static com.facebook.presto.common.type.StandardTypes.TDIGEST;
62+
import static com.facebook.presto.common.type.StandardTypes.TIME;
6263
import static com.facebook.presto.common.type.StandardTypes.TIMESTAMP;
6364
import static com.facebook.presto.common.type.StandardTypes.TIMESTAMP_WITH_TIME_ZONE;
6465
import static com.facebook.presto.common.type.StandardTypes.TINYINT;
@@ -84,6 +85,7 @@ public class NativeTypeManager
8485
TINYINT,
8586
BOOLEAN,
8687
DATE,
88+
TIME,
8789
INTEGER,
8890
DOUBLE,
8991
SMALLINT,

presto-native-tests/src/test/java/com/facebook/presto/nativetests/AbstractTestAggregationsNative.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void init(String storageFormat, boolean charNToVarcharImplicitCast, boole
3636
if (sidecarEnabled) {
3737
charTypeUnsupportedError = ".*Unknown type: char.*";
3838
timeTypeUnsupportedError = ".*Unknown type: time.*";
39-
approxDistinctUnsupportedSignatureError = ".*Unexpected parameters \\(timestamp with time zone.*\\) for function.*";
39+
approxDistinctUnsupportedSignatureError = ".*Unexpected parameters \\(time.*\\) for function.*";
4040
}
4141
else {
4242
charTypeUnsupportedError = "Failed to parse type.*char";
@@ -75,8 +75,8 @@ public void testApproximateCountDistinct()
7575
approxDistinctUnsupportedSignatureError, true);
7676

7777
// test time
78-
assertQueryFails("SELECT approx_distinct(CAST(from_unixtime(custkey) AS TIME)) FROM orders", timeTypeUnsupportedError, true);
79-
assertQueryFails("SELECT approx_distinct(CAST(from_unixtime(custkey) AS TIME), 0.023) FROM orders", timeTypeUnsupportedError, true);
78+
assertQueryFails("SELECT approx_distinct(CAST(from_unixtime(custkey) AS TIME)) FROM orders", approxDistinctUnsupportedSignatureError, true);
79+
assertQueryFails("SELECT approx_distinct(CAST(from_unixtime(custkey) AS TIME), 0.023) FROM orders", approxDistinctUnsupportedSignatureError, true);
8080

8181
// test time with time zone
8282
assertQueryFails("SELECT approx_distinct(CAST(from_unixtime(custkey) AS TIME WITH TIME ZONE)) FROM orders", timeTypeUnsupportedError, true);

presto-native-tests/src/test/java/com/facebook/presto/nativetests/TestDistributedEngineOnlyQueries.java

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@
1515

1616
import com.facebook.presto.testing.QueryRunner;
1717
import com.facebook.presto.tests.AbstractTestEngineOnlyQueries;
18-
import org.intellij.lang.annotations.Language;
1918
import org.testng.annotations.BeforeClass;
2019
import org.testng.annotations.Test;
2120

22-
import java.time.LocalDate;
2321
import java.time.LocalTime;
24-
import java.time.ZoneId;
25-
import java.time.format.DateTimeFormatter;
2622

27-
import static com.google.common.base.Preconditions.checkState;
2823
import static java.lang.Boolean.parseBoolean;
24+
import static org.testng.Assert.assertEquals;
2925

3026
public class TestDistributedEngineOnlyQueries
3127
extends AbstractTestEngineOnlyQueries
@@ -68,10 +64,10 @@ protected void createTables()
6864
@Test
6965
public void testTimeLiterals()
7066
{
71-
assertQueryFails("SELECT TIME '3:04:05'", timeTypeUnsupportedError);
72-
assertQueryFails("SELECT TIME '3:04:05.123'", timeTypeUnsupportedError);
73-
assertQueryFails("SELECT TIME '3:04:05'", timeTypeUnsupportedError);
74-
assertQueryFails("SELECT TIME '0:04:05'", timeTypeUnsupportedError);
67+
assertEquals(computeScalar("SELECT TIME '3:04:05'"), LocalTime.of(3, 4, 5, 0));
68+
assertEquals(computeScalar("SELECT TIME '3:04:05.123'"), LocalTime.of(3, 4, 5, 123_000_000));
69+
assertQuery("SELECT TIME '3:04:05'");
70+
assertQuery("SELECT TIME '0:04:05'");
7571
// TODO #7122 assertQueryFails(chicago, "SELECT TIME '3:04:05'", timeTypeUnsupportedError);
7672
// TODO #7122 assertQueryFails(kathmandu, "SELECT TIME '3:04:05'", timeTypeUnsupportedError);
7773

@@ -82,17 +78,6 @@ public void testTimeLiterals()
8278
assertQueryFails("SELECT TIME '3:04:05 +03'", timeTypeUnsupportedError);
8379
}
8480

85-
/// TIME datatype is not supported in Prestissimo. See issue: https://github.com/prestodb/presto/issues/18844.
86-
@Override
87-
@Test
88-
public void testLocallyUnrepresentableTimeLiterals()
89-
{
90-
LocalTime localTimeThatDidNotOccurOn20120401 = LocalTime.of(2, 10);
91-
checkState(ZoneId.systemDefault().getRules().getValidOffsets(localTimeThatDidNotOccurOn20120401.atDate(LocalDate.of(2012, 4, 1))).isEmpty(), "This test assumes certain JVM time zone");
92-
@Language("SQL") String sql = DateTimeFormatter.ofPattern("'SELECT TIME '''HH:mm:ss''").format(localTimeThatDidNotOccurOn20120401);
93-
assertQueryFails(sql, timeTypeUnsupportedError);
94-
}
95-
9681
// todo: turn on these test cases when the sql invoked functions are extracted into a plugin module.
9782
@Override
9883
@Test(enabled = false)

0 commit comments

Comments
 (0)