diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java b/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java
index c7f939e9db1a0..53d6aebe3a7d8 100644
--- a/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java
+++ b/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java
@@ -29,6 +29,7 @@
 import com.facebook.presto.common.predicate.Range;
 import com.facebook.presto.common.predicate.TupleDomain;
 import com.facebook.presto.common.predicate.ValueSet;
+import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.common.type.ArrayType;
 import com.facebook.presto.common.type.MapType;
 import com.facebook.presto.common.type.NamedTypeSignature;
@@ -1250,6 +1251,12 @@ public RuntimeStats getRuntimeStats()
                 return session.getRuntimeStats();
             }
 
+            @Override
+            public Optional<QueryType> getQueryType()
+            {
+                return session.getQueryType();
+            }
+
             @Override
             public ConnectorSession forConnectorId(ConnectorId connectorId)
             {
diff --git a/presto-main-base/src/main/java/com/facebook/presto/FullConnectorSession.java b/presto-main-base/src/main/java/com/facebook/presto/FullConnectorSession.java
index 663dcd82976f7..44ba295923010 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/FullConnectorSession.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/FullConnectorSession.java
@@ -15,6 +15,7 @@
 
 import com.facebook.presto.common.RuntimeStats;
 import com.facebook.presto.common.function.SqlFunctionProperties;
+import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.common.type.TimeZoneKey;
 import com.facebook.presto.metadata.SessionPropertyManager;
 import com.facebook.presto.spi.ConnectorId;
@@ -309,6 +310,12 @@ public RuntimeStats getRuntimeStats()
         return runtimeStats;
     }
 
+    @Override
+    public Optional<QueryType> getQueryType()
+    {
+        return session.getQueryType();
+    }
+
     @Override
     public ConnectorSession forConnectorId(ConnectorId connectorId)
     {
diff --git a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingConnectorSession.java b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingConnectorSession.java
index 93967c06134c6..9cffb7efc7ae8 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/testing/TestingConnectorSession.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/testing/TestingConnectorSession.java
@@ -16,6 +16,7 @@
 import com.facebook.presto.FullConnectorSession;
 import com.facebook.presto.common.RuntimeStats;
 import com.facebook.presto.common.function.SqlFunctionProperties;
+import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.common.type.TimeZoneKey;
 import com.facebook.presto.execution.QueryIdGenerator;
 import com.facebook.presto.spi.ConnectorId;
@@ -228,6 +229,12 @@ public RuntimeStats getRuntimeStats()
         return new RuntimeStats();
     }
 
+    @Override
+    public Optional<QueryType> getQueryType()
+    {
+        return Optional.of(QueryType.SELECT);
+    }
+
     @Override
     public ConnectorSession forConnectorId(ConnectorId connectorId)
     {
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/ConnectorSession.java b/presto-spi/src/main/java/com/facebook/presto/spi/ConnectorSession.java
index bfde64f141376..59e6a4bf08e08 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/ConnectorSession.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/ConnectorSession.java
@@ -15,6 +15,7 @@
 
 import com.facebook.presto.common.RuntimeStats;
 import com.facebook.presto.common.function.SqlFunctionProperties;
+import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.common.type.TimeZoneKey;
 import com.facebook.presto.spi.function.SqlFunctionId;
 import com.facebook.presto.spi.function.SqlInvokedFunction;
@@ -67,6 +68,8 @@ default boolean isReadConstraints()
 
     RuntimeStats getRuntimeStats();
 
+    Optional<QueryType> getQueryType();
+
     /**
      * returns a ConnectorSession for a specific ConnectorId
      * @return
diff --git a/presto-spi/src/test/java/com/facebook/presto/spi/TestingSession.java b/presto-spi/src/test/java/com/facebook/presto/spi/TestingSession.java
index 4074c3ef33876..b66c61cb58b2e 100644
--- a/presto-spi/src/test/java/com/facebook/presto/spi/TestingSession.java
+++ b/presto-spi/src/test/java/com/facebook/presto/spi/TestingSession.java
@@ -15,6 +15,7 @@
 
 import com.facebook.presto.common.RuntimeStats;
 import com.facebook.presto.common.function.SqlFunctionProperties;
+import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.common.type.TimeZoneKey;
 import com.facebook.presto.spi.function.SqlFunctionId;
 import com.facebook.presto.spi.function.SqlInvokedFunction;
@@ -131,6 +132,12 @@ public RuntimeStats getRuntimeStats()
             return new RuntimeStats();
         }
 
+        @Override
+        public Optional<QueryType> getQueryType()
+        {
+            return Optional.of(QueryType.SELECT);
+        }
+
         @Override
         public ConnectorSession forConnectorId(ConnectorId connectorId)
         {