Remove deprecated distributed_join session property

trinodb · Mar 12, 2019 · ceedd77 · ceedd77
1 parent 5dda1b7
commit ceedd77
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/presto-main/src/main/java/io/prestosql/SystemSessionProperties.java b/presto-main/src/main/java/io/prestosql/SystemSessionProperties.java
@@ -41,8 +41,6 @@
 import static io.prestosql.spi.type.BooleanType.BOOLEAN;
 import static io.prestosql.spi.type.IntegerType.INTEGER;
 import static io.prestosql.spi.type.VarcharType.VARCHAR;
-import static io.prestosql.sql.analyzer.FeaturesConfig.JoinDistributionType.BROADCAST;
-import static io.prestosql.sql.analyzer.FeaturesConfig.JoinDistributionType.PARTITIONED;
 import static io.prestosql.sql.analyzer.FeaturesConfig.JoinReorderingStrategy.ELIMINATE_CROSS_JOINS;
 import static io.prestosql.sql.analyzer.FeaturesConfig.JoinReorderingStrategy.NONE;
 import static java.lang.Math.min;
@@ -55,7 +53,6 @@ public final class SystemSessionProperties
     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";
-    public static final String DISTRIBUTED_JOIN = "distributed_join";
     public static final String DISTRIBUTED_INDEX_JOIN = "distributed_index_join";
     public static final String HASH_PARTITION_COUNT = "hash_partition_count";
     public static final String GROUPED_EXECUTION = "grouped_execution";
@@ -143,11 +140,6 @@ public SystemSessionProperties(
                         "Compute hash codes for distribution, joins, and aggregations early in query plan",
                         featuresConfig.isOptimizeHashGeneration(),
                         false),
-                booleanProperty(
-                        DISTRIBUTED_JOIN,
-                        "(DEPRECATED) Use a distributed join instead of a broadcast join. If this is set, join_distribution_type is ignored.",
-                        null,
-                        false),
                 new PropertyMetadata<>(
                         JOIN_DISTRIBUTION_TYPE,
                         format("The join method to use. Options are %s",
@@ -569,15 +561,6 @@ public static boolean isOptimizeHashGenerationEnabled(Session session)
 
     public static JoinDistributionType getJoinDistributionType(Session session)
     {
-        // distributed_join takes precedence until we remove it
-        Boolean distributedJoin = session.getSystemProperty(DISTRIBUTED_JOIN, Boolean.class);
-        if (distributedJoin != null) {
-            if (!distributedJoin) {
-                return BROADCAST;
-            }
-            return PARTITIONED;
-        }
-
         return session.getSystemProperty(JOIN_DISTRIBUTION_TYPE, JoinDistributionType.class);
     }