From 006d49aa4de87c96a5eecfcad9277b1e6fbf776b Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Wed, 12 Jan 2022 10:50:50 +0100 Subject: [PATCH] Remove dead variable writes --- .../java/io/trino/jdbc/AbstractTrinoResultSet.java | 3 +-- .../java/io/trino/operator/TopNRankingOperator.java | 2 +- .../src/main/java/io/trino/spi/type/Int128.java | 2 +- .../elasticsearch/decoders/TimestampDecoder.java | 2 +- .../hive/metastore/cache/CachingHiveMetastore.java | 1 - .../thrift/DefaultThriftMetastoreClientFactory.java | 2 +- .../java/io/trino/plugin/hive/orc/OrcPageSource.java | 2 +- .../trino/plugin/kinesis/KinesisShardCheckpointer.java | 2 +- .../trino/plugin/kinesis/util/MockKinesisClient.java | 10 +++++----- .../tests/product/hive/TestHiveTransactionalTable.java | 4 +--- 10 files changed, 13 insertions(+), 17 deletions(-) diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java index d11a5f0d1d22..ec587074a46f 100644 --- a/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java +++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java @@ -1980,9 +1980,8 @@ private static ParsedTimestamp parseTimestamp(String value) Optional timezone = Optional.ofNullable(matcher.group("timezone")); long picosOfSecond = 0; - int precision = 0; if (fraction != null) { - precision = fraction.length(); + int precision = fraction.length(); verify(precision <= 12, "Unsupported timestamp precision %s: %s", precision, value); long fractionValue = Long.parseLong(fraction); picosOfSecond = rescale(fractionValue, precision, 12); diff --git a/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java b/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java index 33ac3706e54b..31c2b4d37f2a 100644 --- a/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java +++ b/core/trino-main/src/main/java/io/trino/operator/TopNRankingOperator.java @@ -367,7 +367,7 @@ public Page getOutput() outputIterator = groupedTopNBuilder.buildResult(); } - Page output = null; + Page output; if (outputIterator != null && outputIterator.hasNext()) { // rewrite to expected column ordering output = outputIterator.next().getColumns(outputChannels); diff --git a/core/trino-spi/src/main/java/io/trino/spi/type/Int128.java b/core/trino-spi/src/main/java/io/trino/spi/type/Int128.java index b5c6e2de5d01..509c40de635c 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/type/Int128.java +++ b/core/trino-spi/src/main/java/io/trino/spi/type/Int128.java @@ -120,7 +120,7 @@ public static Int128 valueOf(String value) public static Int128 valueOf(BigInteger value) { long low = value.longValue(); - long high = 0; + long high; try { high = value.shiftRight(64).longValueExact(); } diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/TimestampDecoder.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/TimestampDecoder.java index 3e730df56925..9248291826e0 100644 --- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/TimestampDecoder.java +++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/decoders/TimestampDecoder.java @@ -49,7 +49,7 @@ public TimestampDecoder(String path) public void decode(SearchHit hit, Supplier getter, BlockBuilder output) { DocumentField documentField = hit.getFields().get(path); - Object value = null; + Object value; if (documentField != null) { if (documentField.getValues().size() > 1) { diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java index 6774eae6690c..08bc9c59209f 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java @@ -1029,7 +1029,6 @@ public void alterTransactionalTable(HiveIdentity identity, Table table, long tra delegate.alterTransactionalTable(identity, table, transactionId, writeId, principalPrivileges); } finally { - identity = updateIdentity(identity); invalidateTable(table.getDatabaseName(), table.getTableName()); } } diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java index b2816f0d4d13..8e8cd0ab44fc 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java @@ -124,9 +124,9 @@ private static Optional buildSslContext( try { // load KeyStore if configured and get KeyManagers KeyManager[] keyManagers = null; - KeyStore keyStore = null; char[] keyManagerPassword = new char[0]; if (keyStorePath.isPresent()) { + KeyStore keyStore; try { keyStore = PemReader.loadKeyStore(keyStorePath.get(), keyStorePath.get(), keyStorePassword); } diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java index 8b32a9ad32eb..94d2c90a1e44 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OrcPageSource.java @@ -77,7 +77,7 @@ public class OrcPageSource private final FileFormatDataSourceStats stats; // Row ID relative to all the original files of the same bucket ID before this file in lexicographic order - private Optional originalFileRowId = Optional.empty(); + private final Optional originalFileRowId; private long completedPositions; diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisShardCheckpointer.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisShardCheckpointer.java index faf68358e079..f07718b049b9 100644 --- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisShardCheckpointer.java +++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisShardCheckpointer.java @@ -111,8 +111,8 @@ public void checkpoint(String lastReadSequenceNumber) public String getLastReadSeqNumber() { String lastReadSeqNumber = null; - KinesisClientLease oldLease = null; if (currentIterationNumber > 0) { + KinesisClientLease oldLease; try { oldLease = leaseManager.getLease(createCheckpointKey(currentIterationNumber - 1)); } diff --git a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/MockKinesisClient.java b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/MockKinesisClient.java index 5433453dfab0..e53ef407d41c 100644 --- a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/MockKinesisClient.java +++ b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/MockKinesisClient.java @@ -111,8 +111,8 @@ public void clearRecords() public static class InternalStream { - private String streamName = ""; - private String streamAmazonResourceName = ""; + private final String streamName; + private final String streamAmazonResourceName; private String streamStatus = "CREATING"; private List shards = new ArrayList<>(); private int sequenceNo = 100; @@ -202,8 +202,8 @@ record = record.withData(data).withPartitionKey(partitionKey).withSequenceNumber public static class ShardIterator { - public String streamId = ""; - public int shardIndex; + public final String streamId; + public final int shardIndex; public int recordIndex; public ShardIterator(String streamId, int shardIndex, int recordIndex) @@ -398,7 +398,6 @@ public GetRecordsResult getRecords(GetRecordsRequest getRecordsRequest) } // TODO: incorporate maximum batch size (getRecordsRequest.getLimit) - GetRecordsResult result = null; InternalStream stream = this.getStream(iterator.streamId); if (stream == null) { throw new AmazonClientException("Unknown stream or bad shard iterator."); @@ -406,6 +405,7 @@ public GetRecordsResult getRecords(GetRecordsRequest getRecordsRequest) InternalShard shard = stream.getShards().get(iterator.shardIndex); + GetRecordsResult result; if (iterator.recordIndex == 100) { result = new GetRecordsResult(); List recs = shard.getRecords(); diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java index c55c9adb514c..1c42f1b42c45 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveTransactionalTable.java @@ -1746,10 +1746,8 @@ void withTemporaryTable(String rootName, boolean transactional, boolean isPartit if (transactional) { ensureTransactionalHive(); } - String tableName = null; try (TemporaryHiveTable table = TemporaryHiveTable.temporaryHiveTable(tableName(rootName, isPartitioned, bucketingType))) { - tableName = table.getName(); - testRunner.accept(tableName); + testRunner.accept(table.getName()); } }