Respect allow_pushdown_into_connectors in split and page sources

trinodb · Oct 22, 2021 · ad86637 · ad86637
1 parent 2e60184
commit ad86637
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/split/PageSourceManager.java b/core/trino-main/src/main/java/io/trino/split/PageSourceManager.java
@@ -30,6 +30,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static io.trino.SystemSessionProperties.isAllowPushdownIntoConnectors;
 import static java.util.Objects.requireNonNull;
 
 public class PageSourceManager
@@ -61,6 +62,9 @@ public ConnectorPageSource createPageSource(Session session, Split split, TableH
         if (constraint.isNone()) {
             return new EmptyPageSource();
         }
+        if (!isAllowPushdownIntoConnectors(session)) {
+            dynamicFilter = DynamicFilter.EMPTY;
+        }
         return provider.createPageSource(
                 table.getTransaction(),
                 session.toConnectorSession(catalogName),

diff --git a/core/trino-main/src/main/java/io/trino/split/SplitManager.java b/core/trino-main/src/main/java/io/trino/split/SplitManager.java
@@ -34,6 +34,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static io.trino.SystemSessionProperties.isAllowPushdownIntoConnectors;
 import static java.util.Objects.requireNonNull;
 
 public class SplitManager
@@ -69,6 +70,9 @@ public SplitSource getSplits(Session session, TableHandle table, SplitScheduling
     {
         CatalogName catalogName = table.getCatalogName();
         ConnectorSplitManager splitManager = getConnectorSplitManager(catalogName);
+        if (!isAllowPushdownIntoConnectors(session)) {
+            dynamicFilter = DynamicFilter.EMPTY;
+        }
 
         ConnectorSession connectorSession = session.toConnectorSession(catalogName);