feat: add max-prefixes-count session property

Introduce a new session property `max-prefixes-count` to tune prefixes.

Co-authored-by: Prashant Sharma <[email protected]>

Author: sh-shamsan

presto-docs/src/main/sphinx/admin/properties-session.rst

@@ -135,6 +135,17 @@ Maximum object size in bytes that can be considered serializable in a function c
 
 The corresponding configuration property is :ref:`admin/properties:\`\`max-serializable-object-size\`\``.
 
+``max_prefixes_count``
+^^^^^^^^^^^^^^^^^^^^^^
+
+* **Type:** ``integer``
+* **Minimum value:** ``1``
+* **Default value:** ``100``
+
+Maximum number of prefixes that will be used when performing a ``SHOW QUERY``.
+
+The corresponding configuration property is :ref:`admin/properties:\`\`max-prefixes-count\`\``.
+
 Spilling Properties
 -------------------
 

presto-docs/src/main/sphinx/admin/properties.rst

@@ -157,7 +157,18 @@ The corresponding session property is :ref:`admin/properties-session:\`\`offset_
 
 Maximum object size in bytes that can be considered serializable in a function call by the coordinator.
 
-The corresponding session property is :ref:`admin/properties-session:\`\`max_serializable_object_size\`\``. 
+The corresponding session property is :ref:`admin/properties-session:\`\`max_serializable_object_size\`\``.
+
+``max-prefixes-count``
+^^^^^^^^^^^^^^^^^^^^^^
+
+* **Type:** ``integer``
+* **Minimum value:** ``1``
+* **Default value:** ``100``
+
+Maximum number of prefixes that will be used when performing a ``SHOW QUERY``.
+
+The corresponding session property is :ref:`admin/properties-session:\`\`max_prefixes_count\`\``.
 
 Memory Management Properties
 ----------------------------

presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java

@@ -89,6 +89,7 @@
 
 public final class SystemSessionProperties
 {
+    public static final String MAX_PREFIXES_COUNT = "max_prefixes_count";
     public static final String OPTIMIZE_HASH_GENERATION = "optimize_hash_generation";
     public static final String JOIN_DISTRIBUTION_TYPE = "join_distribution_type";
     public static final String JOIN_MAX_BROADCAST_TABLE_SIZE = "join_max_broadcast_table_size";
@@ -396,6 +397,11 @@ public SystemSessionProperties(
             HistoryBasedOptimizationConfig historyBasedOptimizationConfig)
     {
         sessionProperties = ImmutableList.of(
+                integerProperty(
+                        MAX_PREFIXES_COUNT,
+                        "Max prefixes count, tune for show queries performance improvement",
+                        featuresConfig.getMaxPrefixesCount(),
+                        false),
                 stringProperty(
                         EXECUTION_POLICY,
                         "Policy used for scheduling query tasks",
@@ -2003,6 +2009,11 @@ public SystemSessionProperties(
                         false));
     }
 
+    public static int getMaxPrefixesCount(Session session)
+    {
+        return session.getSystemProperty(MAX_PREFIXES_COUNT, Integer.class);
+    }
+
     public static boolean isSpoolingOutputBufferEnabled(Session session)
     {
         return session.getSystemProperty(SPOOLING_OUTPUT_BUFFER_ENABLED, Boolean.class);

presto-main-base/src/main/java/com/facebook/presto/connector/informationSchema/InformationSchemaMetadata.java

@@ -49,6 +49,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import static com.facebook.presto.SystemSessionProperties.getMaxPrefixesCount;
 import static com.facebook.presto.common.type.BigintType.BIGINT;
 import static com.facebook.presto.common.type.VarcharType.createUnboundedVarcharType;
 import static com.facebook.presto.metadata.MetadataUtil.SchemaMetadataBuilder.schemaMetadataBuilder;
@@ -141,7 +142,6 @@ public class InformationSchemaMetadata
     private static final InformationSchemaColumnHandle CATALOG_COLUMN_HANDLE = new InformationSchemaColumnHandle("table_catalog");
     private static final InformationSchemaColumnHandle SCHEMA_COLUMN_HANDLE = new InformationSchemaColumnHandle("table_schema");
     private static final InformationSchemaColumnHandle TABLE_NAME_COLUMN_HANDLE = new InformationSchemaColumnHandle("table_name");
-    private static final int MAX_PREFIXES_COUNT = 100;
 
     private final String catalogName;
     private final Metadata metadata;
@@ -234,19 +234,21 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
     }
 
     @Override
-    public ConnectorTableLayoutResult getTableLayoutForConstraint(ConnectorSession session, ConnectorTableHandle table, Constraint<ColumnHandle> constraint, Optional<Set<ColumnHandle>> desiredColumns)
+    public ConnectorTableLayoutResult getTableLayoutForConstraint(ConnectorSession connectorSession, ConnectorTableHandle table, Constraint<ColumnHandle> constraint, Optional<Set<ColumnHandle>> desiredColumns)
     {
         InformationSchemaTableHandle handle = checkTableHandle(table);
+        Session session = ((FullConnectorSession) connectorSession).getSession();
+        int maxPrefixesCount = getMaxPrefixesCount(session);
 
-        Set<QualifiedTablePrefix> prefixes = calculatePrefixesWithSchemaName(session, constraint.getSummary(), constraint.predicate());
+        Set<QualifiedTablePrefix> prefixes = calculatePrefixesWithSchemaName(connectorSession, constraint.getSummary(), constraint.predicate());
         if (isTablesEnumeratingTable(handle.getSchemaTableName())) {
-            Set<QualifiedTablePrefix> tablePrefixes = calculatePrefixesWithTableName(session, prefixes, constraint.getSummary(), constraint.predicate());
+            Set<QualifiedTablePrefix> tablePrefixes = calculatePrefixesWithTableName(connectorSession, prefixes, constraint.getSummary(), constraint.predicate());
             // in case of high number of prefixes it is better to populate all data and then filter
-            if (tablePrefixes.size() <= MAX_PREFIXES_COUNT) {
+            if (tablePrefixes.size() <= maxPrefixesCount) {
                 prefixes = tablePrefixes;
             }
         }
-        if (prefixes.size() > MAX_PREFIXES_COUNT) {
+        if (prefixes.size() > maxPrefixesCount) {
             // in case of high number of prefixes it is better to populate all data and then filter
             prefixes = ImmutableSet.of(new QualifiedTablePrefix(catalogName));
         }

presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java

@@ -102,6 +102,7 @@ public class FeaturesConfig
     private boolean cteFilterAndProjectionPushdownEnabled = true;
     private int cteHeuristicReplicationThreshold = 4;
     private int maxReorderedJoins = 9;
+    private int maxPrefixesCount = 100;
     private boolean useHistoryBasedPlanStatistics;
     private boolean trackHistoryBasedPlanStatistics;
     private boolean trackHistoryStatsFromFailedQuery = true;
@@ -477,6 +478,20 @@ public enum LeftJoinArrayContainsToInnerJoinStrategy
         ALWAYS_ENABLED
     }
 
+    @Min(1)
+    @Config("max-prefixes-count")
+    @ConfigDescription("Max prefixes count, tune for show queries performance improvement")
+    public FeaturesConfig setMaxPrefixesCount(Integer maxPrefixesCount)
+    {
+        this.maxPrefixesCount = maxPrefixesCount;
+        return this;
+    }
+
+    public int getMaxPrefixesCount()
+    {
+        return maxPrefixesCount;
+    }
+
     public double getCpuCostWeight()
     {
         return cpuCostWeight;

presto-main-base/src/test/java/com/facebook/presto/metadata/TestInformationSchemaMetadata.java

@@ -44,6 +44,7 @@
 
 import java.util.Optional;
 
+import static com.facebook.presto.SystemSessionProperties.MAX_PREFIXES_COUNT;
 import static com.facebook.presto.common.type.VarcharType.VARCHAR;
 import static com.facebook.presto.metadata.MetadataManager.createTestMetadataManager;
 import static com.facebook.presto.spi.ConnectorId.createInformationSchemaConnectorId;
@@ -59,6 +60,7 @@ public class TestInformationSchemaMetadata
 
     private final TransactionManager transactionManager;
     private final Metadata metadata;
+    private static final String TEST_CATALOG = "test_catalog";
 
     public TestInformationSchemaMetadata()
     {
@@ -102,9 +104,9 @@ public void testInformationSchemaPredicatePushdown()
         domains.put(new InformationSchemaColumnHandle("table_name"), Domain.singleValue(VARCHAR, Slices.utf8Slice("test_view")));
         Constraint<ColumnHandle> constraint = new Constraint<>(TupleDomain.withColumnDomains(domains.build()));
 
-        InformationSchemaMetadata informationSchemaMetadata = new InformationSchemaMetadata("test_catalog", metadata);
+        InformationSchemaMetadata informationSchemaMetadata = new InformationSchemaMetadata(TEST_CATALOG, metadata);
         ConnectorTableLayoutResult layoutResult = informationSchemaMetadata.getTableLayoutForConstraint(
-                createNewSession(transactionId),
+                createNewSession(transactionId, 101),
                 new InformationSchemaTableHandle("test_catalog", "information_schema", "views"),
                 constraint,
                 Optional.empty());
@@ -128,7 +130,7 @@ public void testInformationSchemaPredicatePushdownWithConstraintPredicate()
                     NullableValue table = bindings.get(new InformationSchemaColumnHandle("table_name"));
                     boolean isValid = true;
                     if (catalog != null) {
-                        isValid = ((Slice) catalog.getValue()).toStringUtf8().equals("test_catalog");
+                        isValid = ((Slice) catalog.getValue()).toStringUtf8().equals(TEST_CATALOG);
                     }
                     if (schema != null) {
                         isValid &= ((Slice) schema.getValue()).toStringUtf8().equals("test_schema");
@@ -139,25 +141,26 @@ public void testInformationSchemaPredicatePushdownWithConstraintPredicate()
                     return isValid;
                 });
 
-        InformationSchemaMetadata informationSchemaMetadata = new InformationSchemaMetadata("test_catalog", metadata);
+        InformationSchemaMetadata informationSchemaMetadata = new InformationSchemaMetadata(TEST_CATALOG, metadata);
         ConnectorTableLayoutResult layoutResult = informationSchemaMetadata.getTableLayoutForConstraint(
-                createNewSession(transactionId),
-                new InformationSchemaTableHandle("test_catalog", "information_schema", "views"),
+                createNewSession(transactionId, 10),
+                new InformationSchemaTableHandle(TEST_CATALOG, "information_schema", "views"),
                 constraint,
                 Optional.empty());
 
         ConnectorTableLayoutHandle handle = layoutResult.getTableLayout().getHandle();
         assertTrue(handle instanceof InformationSchemaTableLayoutHandle);
         InformationSchemaTableLayoutHandle tableHandle = (InformationSchemaTableLayoutHandle) handle;
-        assertEquals(tableHandle.getPrefixes(), ImmutableSet.of(new QualifiedTablePrefix("test_catalog", "test_schema", "test_view")));
+        assertEquals(tableHandle.getPrefixes(), ImmutableSet.of(new QualifiedTablePrefix(TEST_CATALOG, "test_schema", "test_view")));
     }
 
-    private ConnectorSession createNewSession(TransactionId transactionId)
+    private ConnectorSession createNewSession(TransactionId transactionId, int maxPrefixesCount)
     {
         return testSessionBuilder()
-                .setCatalog("test_catalog")
+                .setCatalog(TEST_CATALOG)
                 .setSchema("information_schema")
                 .setTransactionId(transactionId)
+                .setSystemProperty(MAX_PREFIXES_COUNT, String.valueOf(maxPrefixesCount))
                 .build()
                 .toConnectorSession();
     }

presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java

@@ -59,6 +59,7 @@ public class TestFeaturesConfig
     public void testDefaults()
     {
         assertRecordedDefaults(ConfigAssertions.recordDefaults(FeaturesConfig.class)
+                .setMaxPrefixesCount(100)
                 .setCpuCostWeight(75)
                 .setMemoryCostWeight(10)
                 .setNetworkCostWeight(15)
@@ -279,6 +280,7 @@ public void testDefaults()
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = new ImmutableMap.Builder<String, String>()
+                .put("max-prefixes-count", "1")
                 .put("cpu-cost-weight", "0.4")
                 .put("memory-cost-weight", "0.3")
                 .put("network-cost-weight", "0.2")
@@ -495,6 +497,7 @@ public void testExplicitPropertyMappings()
                 .build();
 
         FeaturesConfig expected = new FeaturesConfig()
+                .setMaxPrefixesCount(1)
                 .setCpuCostWeight(0.4)
                 .setMemoryCostWeight(0.3)
                 .setNetworkCostWeight(0.2)