diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java index da486eb63d78..935bea14e76d 100644 --- a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java +++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java @@ -21,7 +21,6 @@ import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -725,7 +724,7 @@ public void createTable(ConnectorSession session, ConnectorTableMetadata tableMe private Map getEmptyTableProperties(ConnectorTableMetadata tableMetadata, boolean partitioned, HdfsContext hdfsContext) { - Builder tableProperties = ImmutableMap.builder(); + ImmutableMap.Builder tableProperties = ImmutableMap.builder(); // Hook point for extended versions of the Hive Plugin tableProperties.putAll(tableParameterCodec.encode(tableMetadata.getProperties())); diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/IonSqlQueryBuilder.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/IonSqlQueryBuilder.java index 5afe9ba797ae..5c1f2c174090 100644 --- a/presto-hive/src/main/java/io/prestosql/plugin/hive/IonSqlQueryBuilder.java +++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/IonSqlQueryBuilder.java @@ -14,6 +14,7 @@ package io.prestosql.plugin.hive; import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; import io.prestosql.spi.predicate.Domain; import io.prestosql.spi.predicate.Range; @@ -30,8 +31,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static com.google.common.collect.ImmutableList.Builder; -import static com.google.common.collect.ImmutableList.builder; import static com.google.common.collect.Iterables.getOnlyElement; import static io.prestosql.spi.type.BigintType.BIGINT; import static io.prestosql.spi.type.BooleanType.BOOLEAN; @@ -89,7 +88,7 @@ public String buildSql(List columns, TupleDomain toConjuncts(List columns, TupleDomain tupleDomain) { - Builder builder = builder(); + ImmutableList.Builder builder = ImmutableList.builder(); for (HiveColumnHandle column : columns) { Type type = column.getHiveType().getType(typeManager); if (tupleDomain.getDomains().isPresent() && isSupported(type)) { diff --git a/presto-jmx/src/main/java/io/prestosql/plugin/jmx/JmxMetadata.java b/presto-jmx/src/main/java/io/prestosql/plugin/jmx/JmxMetadata.java index 6adfec36b229..ddc78432bb78 100644 --- a/presto-jmx/src/main/java/io/prestosql/plugin/jmx/JmxMetadata.java +++ b/presto-jmx/src/main/java/io/prestosql/plugin/jmx/JmxMetadata.java @@ -15,7 +15,6 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -199,7 +198,7 @@ else if (HISTORY_SCHEMA_NAME.equals(schema)) { private List listJmxTables() { - Builder tableNames = ImmutableList.builder(); + ImmutableList.Builder tableNames = ImmutableList.builder(); for (ObjectName objectName : mbeanServer.queryNames(WILDCARD, null)) { // todo remove lower case when presto supports mixed case names tableNames.add(new SchemaTableName(JMX_SCHEMA_NAME, objectName.getCanonicalName().toLowerCase(ENGLISH))); diff --git a/presto-main/src/main/java/io/prestosql/sql/planner/LocalExecutionPlanner.java b/presto-main/src/main/java/io/prestosql/sql/planner/LocalExecutionPlanner.java index 5950685a69ee..f969b553b2c8 100644 --- a/presto-main/src/main/java/io/prestosql/sql/planner/LocalExecutionPlanner.java +++ b/presto-main/src/main/java/io/prestosql/sql/planner/LocalExecutionPlanner.java @@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Iterables; @@ -27,7 +26,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.SetMultimap; import com.google.common.primitives.Ints; -import io.airlift.log.Logger; import io.airlift.units.DataSize; import io.prestosql.Session; import io.prestosql.SystemSessionProperties; @@ -285,8 +283,6 @@ public class LocalExecutionPlanner { - private static final Logger log = Logger.get(LocalExecutionPlanner.class); - private final Metadata metadata; private final SqlParser sqlParser; private final Optional explainAnalyzeContext; @@ -1281,7 +1277,7 @@ private RowExpression toRowExpression(Expression expression, Map getInputTypes(Map layout, List types) { - Builder inputTypes = ImmutableMap.builder(); + ImmutableMap.Builder inputTypes = ImmutableMap.builder(); for (Integer input : ImmutableSet.copyOf(layout.values())) { Type type = types.get(input); inputTypes.put(input, type); @@ -1392,7 +1388,7 @@ private ImmutableMap makeLayout(PlanNode node) private ImmutableMap makeLayoutFromOutputSymbols(List outputSymbols) { - Builder outputMappings = ImmutableMap.builder(); + ImmutableMap.Builder outputMappings = ImmutableMap.builder(); int channel = 0; for (Symbol symbol : outputSymbols) { outputMappings.put(symbol, channel); @@ -2121,7 +2117,7 @@ private OptionalInt getJoinOperatorsCountForSpill(LocalExecutionPlanContext cont private Map createJoinSourcesLayout(Map lookupSourceLayout, Map probeSourceLayout) { - Builder joinSourcesLayout = ImmutableMap.builder(); + ImmutableMap.Builder joinSourcesLayout = ImmutableMap.builder(); joinSourcesLayout.putAll(lookupSourceLayout); for (Map.Entry probeLayoutEntry : probeSourceLayout.entrySet()) { joinSourcesLayout.put(probeLayoutEntry.getKey(), probeLayoutEntry.getValue() + lookupSourceLayout.size()); diff --git a/presto-main/src/main/java/io/prestosql/sql/planner/PlanFragment.java b/presto-main/src/main/java/io/prestosql/sql/planner/PlanFragment.java index 1ea61c3a2e68..e80f85424272 100644 --- a/presto-main/src/main/java/io/prestosql/sql/planner/PlanFragment.java +++ b/presto-main/src/main/java/io/prestosql/sql/planner/PlanFragment.java @@ -16,7 +16,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableSet; import io.prestosql.cost.StatsAndCosts; import io.prestosql.operator.StageExecutionDescriptor; @@ -194,7 +193,7 @@ private static void findSources(PlanNode node, Set nodeIds, Immutabl } } - private static void findRemoteSourceNodes(PlanNode node, Builder builder) + private static void findRemoteSourceNodes(PlanNode node, ImmutableList.Builder builder) { for (PlanNode source : node.getSources()) { findRemoteSourceNodes(source, builder); diff --git a/presto-main/src/test/java/io/prestosql/type/TestMapOperators.java b/presto-main/src/test/java/io/prestosql/type/TestMapOperators.java index eece545a30dc..5e7a60fdd615 100644 --- a/presto-main/src/test/java/io/prestosql/type/TestMapOperators.java +++ b/presto-main/src/test/java/io/prestosql/type/TestMapOperators.java @@ -37,7 +37,6 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.ImmutableMap.builder; import static io.airlift.slice.Slices.utf8Slice; import static io.prestosql.SessionTestUtils.TEST_SESSION; import static io.prestosql.spi.function.OperatorType.HASH_CODE; @@ -379,7 +378,7 @@ public void testJsonToMap() assertFunction("CAST(JSON '{\"k1\": 5, \"k2\": 3.14, \"k3\":[1, 2, 3], \"k4\":\"e\", \"k5\":{\"a\": \"b\"}, \"k6\":null, \"k7\":\"null\", \"k8\":[null]}' AS MAP)", mapType(VARCHAR, JSON), - builder() + ImmutableMap.builder() .put("k1", "5") .put("k2", "3.14") .put("k3", "[1,2,3]") diff --git a/presto-orc/src/test/java/io/prestosql/orc/AbstractTestOrcReader.java b/presto-orc/src/test/java/io/prestosql/orc/AbstractTestOrcReader.java index 56b7d5f725c2..34fa66a0f32d 100644 --- a/presto-orc/src/test/java/io/prestosql/orc/AbstractTestOrcReader.java +++ b/presto-orc/src/test/java/io/prestosql/orc/AbstractTestOrcReader.java @@ -18,7 +18,6 @@ import com.google.common.collect.ContiguousSet; import com.google.common.collect.DiscreteDomain; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Range; import io.prestosql.spi.type.CharType; import io.prestosql.spi.type.DecimalType; @@ -457,7 +456,7 @@ private static List doubleSequence(double start, double step, int items) private static List floatSequence(float start, float step, int items) { - Builder values = ImmutableList.builder(); + ImmutableList.Builder values = ImmutableList.builder(); float nextValue = start; for (int i = 0; i < items; i++) { values.add(nextValue); diff --git a/presto-tests/src/test/java/io/prestosql/tests/TestQueryManager.java b/presto-tests/src/test/java/io/prestosql/tests/TestQueryManager.java index cc4244654c94..e83185112167 100644 --- a/presto-tests/src/test/java/io/prestosql/tests/TestQueryManager.java +++ b/presto-tests/src/test/java/io/prestosql/tests/TestQueryManager.java @@ -32,7 +32,6 @@ import static io.prestosql.execution.TestQueryRunnerUtil.waitForQueryState; import static io.prestosql.spi.StandardErrorCode.EXCEEDED_CPU_LIMIT; import static io.prestosql.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR; -import static io.prestosql.tests.tpch.TpchQueryRunnerBuilder.builder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.fail; @@ -93,7 +92,7 @@ public void testFailQuery() public void testQueryCpuLimit() throws Exception { - try (DistributedQueryRunner queryRunner = builder().setSingleExtraProperty("query.max-cpu-time", "1ms").build()) { + try (DistributedQueryRunner queryRunner = TpchQueryRunnerBuilder.builder().setSingleExtraProperty("query.max-cpu-time", "1ms").build()) { QueryId queryId = createQuery(queryRunner, TEST_SESSION, "SELECT COUNT(*) FROM lineitem"); waitForQueryState(queryRunner, queryId, FAILED); QueryManager queryManager = queryRunner.getCoordinator().getQueryManager();