Update default Presto Pinot Connector Configs

jagill · Sep 21, 2020 · 00fbb9b · 00fbb9b
1 parent 14ba79c
commit 00fbb9b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 21 deletions.
diff --git a/presto-main/etc/catalog/pinot.properties b/presto-main/etc/catalog/pinot.properties
@@ -0,0 +1,4 @@
+connector.name=pinot
+
+# Pinot controller endpoint
+pinot.controller-urls=localhost:9000
diff --git a/presto-main/etc/config.properties b/presto-main/etc/config.properties
@@ -40,6 +40,7 @@ plugin.bundles=\
   ../presto-sqlserver/pom.xml, \
   ../presto-postgresql/pom.xml, \
   ../presto-tpcds/pom.xml, \
+  ../presto-pinot/pom.xml, \
   ../presto-i18n-functions/pom.xml,\
   ../presto-function-namespace-managers/pom.xml,\
   ../presto-druid/pom.xml

diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java
@@ -73,13 +73,20 @@ public class PinotConfig
     private Map<String, String> extraHttpHeaders = ImmutableMap.of();
     private Duration metadataCacheExpiry = new Duration(2, TimeUnit.MINUTES);
 
-    private boolean allowMultipleAggregations;
+    private boolean allowMultipleAggregations = true;
     private boolean forbidBrokerQueries;
     private boolean forbidSegmentQueries;
-    private boolean inferDateTypeInSchema;
-    private boolean inferTimestampTypeInSchema;
-    private boolean markDataFetchExceptionsAsRetriable;
-    private boolean usePinotSqlForBrokerQueries;
+
+    // Infer Pinot time fields to Presto Date/Timestamp type
+    private boolean inferDateTypeInSchema = true;
+    private boolean inferTimestampTypeInSchema = true;
+
+    // Retry on data fetch exceptions, e.g. timeout from the server side.
+    private boolean markDataFetchExceptionsAsRetriable = true;
+
+    // Requires Pinot version >= 0.4.0.
+    private boolean usePinotSqlForBrokerQueries = true;
+
     private int numSegmentsPerSplit = 1;
     private boolean ignoreEmptyResponses;
     private int fetchRetryCount = 2;

diff --git a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotColumnMetadata.java b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotColumnMetadata.java
@@ -214,6 +214,8 @@ public void testTimeFieldInPinotSchemaToPinotColumns()
     public void testConversionWithoutConfigSwitchOn()
     {
         PinotConfig pinotConfig = new PinotConfig();
+        pinotConfig.setInferDateTypeInSchema(false);
+        pinotConfig.setInferTimestampTypeInSchema(false);
 
         // Test Date
         Schema testSchema = new Schema.SchemaBuilder()

diff --git a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java
@@ -44,16 +44,16 @@ public void testDefaults()
                         .setCallerHeaderValue("presto")
                         .setCallerHeaderParam("RPC-Caller")
                         .setMetadataCacheExpiry(new Duration(2, TimeUnit.MINUTES))
-                        .setAllowMultipleAggregations(false)
-                        .setInferDateTypeInSchema(false)
-                        .setInferTimestampTypeInSchema(false)
+                        .setAllowMultipleAggregations(true)
+                        .setInferDateTypeInSchema(true)
+                        .setInferTimestampTypeInSchema(true)
                         .setForbidBrokerQueries(false)
-                        .setUsePinotSqlForBrokerQueries(false)
+                        .setUsePinotSqlForBrokerQueries(true)
                         .setRestProxyServiceForQuery(null)
                         .setRestProxyUrl(null)
                         .setNumSegmentsPerSplit(1)
                         .setFetchRetryCount(2)
-                        .setMarkDataFetchExceptionsAsRetriable(false)
+                        .setMarkDataFetchExceptionsAsRetriable(true)
                         .setIgnoreEmptyResponses(false)
                         .setUseDateTrunc(false)
                         .setForbidSegmentQueries(false)
@@ -80,17 +80,17 @@ public void testExplicitPropertyMappings()
                 .put("pinot.caller-header-value", "myCaller")
                 .put("pinot.caller-header-param", "myParam")
                 .put("pinot.service-header-param", "myServiceHeader")
-                .put("pinot.allow-multiple-aggregations", "true")
-                .put("pinot.infer-date-type-in-schema", "true")
-                .put("pinot.infer-timestamp-type-in-schema", "true")
+                .put("pinot.allow-multiple-aggregations", "false")
+                .put("pinot.infer-date-type-in-schema", "false")
+                .put("pinot.infer-timestamp-type-in-schema", "false")
                 .put("pinot.forbid-broker-queries", "true")
-                .put("pinot.use-pinot-sql-for-broker-queries", "true")
+                .put("pinot.use-pinot-sql-for-broker-queries", "false")
                 .put("pinot.rest-proxy-url", "localhost:1111")
                 .put("pinot.rest-proxy-service-for-query", "pinot-rest-proxy-service")
                 .put("pinot.num-segments-per-split", "2")
                 .put("pinot.ignore-empty-responses", "true")
                 .put("pinot.fetch-retry-count", "3")
-                .put("pinot.mark-data-fetch-exceptions-as-retriable", "true")
+                .put("pinot.mark-data-fetch-exceptions-as-retriable", "false")
                 .put("pinot.non-aggregate-limit-for-broker-queries", "10")
                 .put("pinot.use-date-trunc", "true")
                 .put("pinot.limit-large-for-segment", "100")
@@ -115,16 +115,16 @@ public void testExplicitPropertyMappings()
                 .setCallerHeaderValue("myCaller")
                 .setCallerHeaderParam("myParam")
                 .setMetadataCacheExpiry(new Duration(1, TimeUnit.MINUTES))
-                .setAllowMultipleAggregations(true)
-                .setInferDateTypeInSchema(true)
-                .setInferTimestampTypeInSchema(true)
+                .setAllowMultipleAggregations(false)
+                .setInferDateTypeInSchema(false)
+                .setInferTimestampTypeInSchema(false)
                 .setForbidBrokerQueries(true)
-                .setUsePinotSqlForBrokerQueries(true)
+                .setUsePinotSqlForBrokerQueries(false)
                 .setRestProxyServiceForQuery("pinot-rest-proxy-service")
                 .setNumSegmentsPerSplit(2)
                 .setIgnoreEmptyResponses(true)
                 .setFetchRetryCount(3)
-                .setMarkDataFetchExceptionsAsRetriable(true)
+                .setMarkDataFetchExceptionsAsRetriable(false)
                 .setNonAggregateLimitForBrokerQueries(10)
                 .setLimitLargeForSegment(100)
                 .setForbidSegmentQueries(true)

diff --git a/...-pinot-toolkit/src/test/java/com/facebook/presto/pinot/query/TestPinotQueryGenerator.java b/...-pinot-toolkit/src/test/java/com/facebook/presto/pinot/query/TestPinotQueryGenerator.java
@@ -313,7 +313,7 @@ public void testMultipleAggregatesWhenAllowed()
     @Test(expectedExceptions = NoSuchElementException.class)
     public void testMultipleAggregatesNotAllowed()
     {
-        helperTestMultipleAggregatesWithGroupBy(pinotConfig);
+        helperTestMultipleAggregatesWithGroupBy(new PinotConfig().setAllowMultipleAggregations(false));
     }
 
     protected void helperTestMultipleAggregatesWithGroupBy(PinotConfig givenPinotConfig)