Skip to content

Commit 185876f

Browse files
elharoamitkdutta
elharo
authored and
amitkdutta
committed
Clear out some dead code in tests
1 parent 8de66c4 commit 185876f

File tree

54 files changed

+5
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+5
-299
lines changed

‎presto-common/src/test/java/com/facebook/presto/common/type/TestUnscaledDecimal128Arithmetic.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import org.testng.annotations.Test;
2020

2121
import java.math.BigInteger;
22-
import java.nio.ByteBuffer;
23-
import java.nio.ByteOrder;
24-
import java.nio.IntBuffer;
2522
import java.util.Collections;
2623

2724
import static com.facebook.presto.common.type.Decimals.MAX_DECIMAL_UNSCALED_VALUE;
@@ -772,17 +769,4 @@ private static int[] toInt8Array(byte[] bytes)
772769
}
773770
return ints;
774771
}
775-
776-
private static BigInteger toBigInteger(int[] data)
777-
{
778-
byte[] array = new byte[data.length * 4];
779-
ByteBuffer byteBuffer = ByteBuffer.wrap(array);
780-
byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
781-
IntBuffer intBuffer = byteBuffer.asIntBuffer();
782-
intBuffer.put(data);
783-
784-
Collections.reverse(Bytes.asList(array));
785-
array[0] &= ~(1 << 7);
786-
return new BigInteger((array[0] & (1 << 7)) > 0 ? -1 : 1, array);
787-
}
788772
}

‎presto-delta/src/test/java/com/facebook/presto/delta/TestDeltaTableHandle.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
import com.facebook.presto.common.block.BlockEncoding;
2222
import com.facebook.presto.common.block.BlockEncodingManager;
2323
import com.facebook.presto.common.block.BlockEncodingSerde;
24-
import com.facebook.presto.common.predicate.Domain;
25-
import com.facebook.presto.common.predicate.Range;
26-
import com.facebook.presto.common.predicate.SortedRangeSet;
27-
import com.facebook.presto.common.predicate.TupleDomain;
2824
import com.facebook.presto.common.type.StandardTypes;
2925
import com.facebook.presto.common.type.Type;
3026
import com.facebook.presto.common.type.TypeManager;
@@ -34,7 +30,6 @@
3430
import com.facebook.presto.sql.analyzer.FeaturesConfig;
3531
import com.facebook.presto.type.TypeDeserializer;
3632
import com.google.common.collect.ImmutableList;
37-
import com.google.common.collect.ImmutableMap;
3833
import com.google.inject.Injector;
3934
import com.google.inject.Key;
4035
import com.google.inject.Module;
@@ -47,7 +42,6 @@
4742
import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
4843
import static com.facebook.airlift.json.JsonBinder.jsonBinder;
4944
import static com.facebook.airlift.json.JsonCodecBinder.jsonCodecBinder;
50-
import static com.facebook.presto.common.type.RealType.REAL;
5145
import static com.facebook.presto.common.type.StandardTypes.DATE;
5246
import static com.facebook.presto.common.type.StandardTypes.DOUBLE;
5347
import static com.facebook.presto.common.type.StandardTypes.INTEGER;
@@ -56,7 +50,6 @@
5650
import static com.facebook.presto.delta.DeltaColumnHandle.ColumnType.REGULAR;
5751
import static com.facebook.presto.metadata.FunctionAndTypeManager.createTestFunctionAndTypeManager;
5852
import static com.google.inject.multibindings.Multibinder.newSetBinder;
59-
import static java.lang.Float.floatToRawIntBits;
6053
import static org.testng.Assert.assertEquals;
6154

6255
/**
@@ -86,14 +79,6 @@ public void testJsonRoundTrip()
8679
columns.get(0).isPartition() ? PARTITION : REGULAR,
8780
Optional.empty());
8881

89-
TupleDomain<DeltaColumnHandle> predicate = TupleDomain.withColumnDomains(ImmutableMap.of(
90-
c1ColumnHandle, Domain.create(SortedRangeSet.copyOf(REAL,
91-
ImmutableList.of(
92-
Range.equal(REAL, (long) floatToRawIntBits(100.0f + 0)),
93-
Range.equal(REAL, (long) floatToRawIntBits(100.008f + 0)),
94-
Range.equal(REAL, (long) floatToRawIntBits(100.0f + 14)))),
95-
false)));
96-
9782
DeltaTableHandle expected = new DeltaTableHandle("delta", deltaTable);
9883

9984
String json = getJsonCodec().toJson(expected);

‎presto-druid/src/test/java/com/facebook/presto/druid/TestDruidQueryBase.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import com.facebook.presto.Session;
1717
import com.facebook.presto.SystemSessionProperties;
18-
import com.facebook.presto.common.block.SortOrder;
1918
import com.facebook.presto.common.predicate.TupleDomain;
2019
import com.facebook.presto.common.type.Type;
2120
import com.facebook.presto.metadata.FunctionAndTypeManager;
@@ -31,13 +30,10 @@
3130
import com.facebook.presto.spi.plan.Assignments;
3231
import com.facebook.presto.spi.plan.FilterNode;
3332
import com.facebook.presto.spi.plan.LimitNode;
34-
import com.facebook.presto.spi.plan.Ordering;
35-
import com.facebook.presto.spi.plan.OrderingScheme;
3633
import com.facebook.presto.spi.plan.PlanNode;
3734
import com.facebook.presto.spi.plan.PlanNodeIdAllocator;
3835
import com.facebook.presto.spi.plan.ProjectNode;
3936
import com.facebook.presto.spi.plan.TableScanNode;
40-
import com.facebook.presto.spi.plan.TopNNode;
4137
import com.facebook.presto.spi.relation.RowExpression;
4238
import com.facebook.presto.spi.relation.VariableReferenceExpression;
4339
import com.facebook.presto.sql.ExpressionUtils;
@@ -51,15 +47,12 @@
5147
import com.facebook.presto.sql.tree.NodeRef;
5248
import com.facebook.presto.testing.TestingSession;
5349
import com.facebook.presto.testing.TestingTransactionHandle;
54-
import com.google.common.collect.ImmutableList;
5550
import com.google.common.collect.ImmutableMap;
5651

5752
import java.util.Arrays;
58-
import java.util.LinkedHashMap;
5953
import java.util.List;
6054
import java.util.Map;
6155
import java.util.Optional;
62-
import java.util.stream.IntStream;
6356

6457
import static com.facebook.presto.common.type.BigintType.BIGINT;
6558
import static com.facebook.presto.common.type.DoubleType.DOUBLE;
@@ -173,17 +166,6 @@ protected ProjectNode project(PlanBuilder planBuilder, PlanNode source, List<Str
173166
return planBuilder.project(assignmentsBuilder.build(), source);
174167
}
175168

176-
protected ProjectNode project(PlanBuilder planBuilder, PlanNode source, LinkedHashMap<String, String> toProject, SessionHolder sessionHolder)
177-
{
178-
Assignments.Builder assignmentsBuilder = Assignments.builder();
179-
toProject.forEach((columnName, expression) -> {
180-
RowExpression rowExpression = getRowExpression(expression, sessionHolder);
181-
VariableReferenceExpression variable = new VariableReferenceExpression(Optional.empty(), columnName, rowExpression.getType());
182-
assignmentsBuilder.put(variable, rowExpression);
183-
});
184-
return planBuilder.project(assignmentsBuilder.build(), source);
185-
}
186-
187169
public static Expression expression(String sql)
188170
{
189171
return ExpressionUtils.rewriteIdentifiersToSymbolReferences(new SqlParser().createExpression(sql, new ParsingOptions(ParsingOptions.DecimalLiteralTreatment.AS_DECIMAL)));
@@ -207,12 +189,6 @@ protected LimitNode limit(PlanBuilder pb, long count, PlanNode source)
207189
return new LimitNode(Optional.empty(), pb.getIdAllocator().getNextId(), source, count, FINAL);
208190
}
209191

210-
protected TopNNode topN(PlanBuilder pb, long count, List<String> orderingColumns, List<Boolean> ascending, PlanNode source)
211-
{
212-
ImmutableList<Ordering> ordering = IntStream.range(0, orderingColumns.size()).boxed().map(i -> new Ordering(variable(orderingColumns.get(i)), ascending.get(i) ? SortOrder.ASC_NULLS_FIRST : SortOrder.DESC_NULLS_FIRST)).collect(toImmutableList());
213-
return new TopNNode(Optional.empty(), pb.getIdAllocator().getNextId(), source, count, new OrderingScheme(ordering), TopNNode.Step.SINGLE);
214-
}
215-
216192
protected RowExpression getRowExpression(String sqlExpression, SessionHolder sessionHolder)
217193
{
218194
return toRowExpression(expression(sqlExpression), sessionHolder.getSession());

‎presto-druid/src/test/java/com/facebook/presto/druid/TestDruidQueryGenerator.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@ private void testDQL(
3939
Map<String, String> outputVariables)
4040
{
4141
PlanNode planNode = planBuilderConsumer.apply(createPlanBuilder(sessionHolder));
42-
testDQL(givenDruidConfig, planNode, expectedDQL, sessionHolder, outputVariables);
43-
}
44-
45-
private void testDQL(
46-
DruidConfig givenDruidConfig,
47-
PlanNode planNode,
48-
String expectedDQL,
49-
SessionHolder sessionHolder,
50-
Map<String, String> outputVariables)
51-
{
5242
DruidQueryGenerator.DruidQueryGeneratorResult druidQueryGeneratorResult = new DruidQueryGenerator(functionAndTypeManager, functionAndTypeManager, standardFunctionResolution).generate(planNode, sessionHolder.getConnectorSession()).get();
5343
if (expectedDQL.contains("__expressions__")) {
5444
String expressions = planNode.getOutputVariables().stream().map(v -> outputVariables.get(v.getName())).filter(v -> v != null).collect(Collectors.joining(", "));

‎presto-geospatial-toolkit/src/test/java/com/facebook/presto/geospatial/rtree/TestFlatbush.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,6 @@ public OGCGeometryWrapper(OGCGeometry geometry)
253253
this.extent = GeometryUtils.getExtent(geometry);
254254
}
255255

256-
public OGCGeometry getGeometry()
257-
{
258-
return geometry;
259-
}
260-
261256
@Override
262257
public Rectangle getExtent()
263258
{

‎presto-hive/src/test/java/com/facebook/presto/hive/TestHiveMetadataFileFormatEncryptionSettings.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public class TestHiveMetadataFileFormatEncryptionSettings
9898
ImmutableMap.of(NEW_PARTITION_USER_SUPPLIED_PARAMETER, "{}"));
9999

100100
private HiveMetadataFactory metadataFactory;
101-
private HiveTransactionManager transactionManager;
102101
private ExtendedHiveMetastore metastore;
103102
private ExecutorService executor;
104103
private File baseDirectory;
@@ -109,7 +108,6 @@ public void setup()
109108
baseDirectory = new File(Files.createTempDir(), "metastore");
110109
metastore = new BridgingHiveMetastore(new InMemoryHiveMetastore(baseDirectory), new HivePartitionMutator());
111110
executor = newCachedThreadPool(daemonThreadsNamed("hive-encryption-test-%s"));
112-
transactionManager = new HiveTransactionManager();
113111
metadataFactory = new HiveMetadataFactory(
114112
metastore,
115113
HDFS_ENVIRONMENT,

‎presto-hive/src/test/java/com/facebook/presto/hive/TestHivePageSink.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
public class TestHivePageSink
107107
{
108108
private static final int NUM_ROWS = 1000;
109-
private static final String CLIENT_ID = "client_id";
110109
private static final String SCHEMA_NAME = "test";
111110
private static final String TABLE_NAME = "test";
112111

@@ -350,11 +349,6 @@ private static ConnectorPageSink createPageSink(HiveTransactionHandle transactio
350349
return provider.createPageSink(transaction, getSession(config, new HiveCommonClientConfig()), handle, TEST_HIVE_PAGE_SINK_CONTEXT);
351350
}
352351

353-
private static TestingConnectorSession getSession(HiveClientConfig config)
354-
{
355-
return new TestingConnectorSession(new HiveSessionProperties(config, new OrcFileWriterConfig(), new ParquetFileWriterConfig(), new CacheConfig()).getSessionProperties());
356-
}
357-
358352
private static TestingConnectorSession getSession(HiveClientConfig config, HiveCommonClientConfig hiveCommonClientConfig)
359353
{
360354
return new TestingConnectorSession(getAllSessionProperties(config, hiveCommonClientConfig));

‎presto-hive/src/test/java/com/facebook/presto/hive/metastore/TestInMemoryCachingHiveMetastore.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
*/
1414
package com.facebook.presto.hive.metastore;
1515

16-
import com.facebook.presto.hive.ColumnConverter;
1716
import com.facebook.presto.hive.MetastoreClientConfig;
1817
import com.facebook.presto.hive.MockHiveMetastore;
1918
import com.facebook.presto.hive.PartitionMutator;
@@ -279,7 +278,6 @@ private void assertInvalidateCache(MockPartitionMutator partitionMutator, Functi
279278
MockHiveCluster mockHiveCluster = new MockHiveCluster(mockClient);
280279
ListeningExecutorService executor = listeningDecorator(newCachedThreadPool(daemonThreadsNamed("partition-versioning-test-%s")));
281280
MockHiveMetastore mockHiveMetastore = new MockHiveMetastore(mockHiveCluster);
282-
ColumnConverter hiveColumnConverter = new HiveColumnConverter();
283281
InMemoryCachingHiveMetastore partitionCachingEnabledmetastore = new InMemoryCachingHiveMetastore(
284282
new BridgingHiveMetastore(mockHiveMetastore, partitionMutator),
285283
executor,
@@ -318,7 +316,6 @@ public void testPartitionCacheValidation()
318316
ListeningExecutorService executor = listeningDecorator(newCachedThreadPool(daemonThreadsNamed("partition-versioning-test-%s")));
319317
MockHiveMetastore mockHiveMetastore = new MockHiveMetastore(mockHiveCluster);
320318
PartitionMutator mockPartitionMutator = new MockPartitionMutator(identity());
321-
ColumnConverter hiveColumnConverter = new HiveColumnConverter();
322319
InMemoryCachingHiveMetastore partitionCacheVerificationEnabledMetastore = new InMemoryCachingHiveMetastore(
323320
new BridgingHiveMetastore(mockHiveMetastore, mockPartitionMutator),
324321
executor,

‎presto-hive/src/test/java/com/facebook/presto/hive/metastore/glue/TestHiveClientGlueMetastore.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -964,11 +964,6 @@ private static PartitionValues make(String... values)
964964
return new PartitionValues(Arrays.asList(values));
965965
}
966966

967-
private static PartitionValues make(List<String> values)
968-
{
969-
return new PartitionValues(values);
970-
}
971-
972967
private PartitionValues(List<String> values)
973968
{
974969
this.values = values;

‎presto-hive/src/test/java/com/facebook/presto/hive/security/ranger/TestRangerBasedAccessControl.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,17 @@
3030
import com.facebook.presto.spi.security.PrestoPrincipal;
3131
import com.facebook.presto.spi.security.PrincipalType;
3232
import com.facebook.presto.spi.security.Privilege;
33-
import com.fasterxml.jackson.databind.DeserializationFeature;
34-
import com.fasterxml.jackson.databind.ObjectMapper;
3533
import com.google.common.collect.ImmutableListMultimap;
3634
import com.google.common.collect.ImmutableSet;
3735
import com.google.common.io.ByteStreams;
3836
import org.testng.Assert.ThrowingRunnable;
3937
import org.testng.annotations.Test;
4038

41-
import java.io.BufferedReader;
42-
import java.io.File;
43-
import java.io.FileReader;
44-
import java.io.IOException;
4539
import java.util.Optional;
4640

4741
import static com.facebook.presto.hive.security.ranger.RangerBasedAccessControlConfig.RANGER_REST_POLICY_MGR_DOWNLOAD_URL;
4842
import static com.facebook.presto.hive.security.ranger.RangerBasedAccessControlConfig.RANGER_REST_USER_GROUP_URL;
4943
import static com.facebook.presto.hive.security.ranger.RangerBasedAccessControlConfig.RANGER_REST_USER_ROLES_URL;
50-
import static java.lang.String.format;
5144
import static java.nio.charset.StandardCharsets.UTF_8;
5245
import static org.testng.Assert.assertThrows;
5346

@@ -229,19 +222,6 @@ private TestingResponse makeHttpResponse(byte[] answerJson)
229222
return new TestingResponse(HttpStatus.OK, headers.build(), answerJson);
230223
}
231224

232-
private static <T> T jsonParse(File file, Class<T> clazz)
233-
{
234-
try {
235-
BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
236-
ObjectMapper mapper = new ObjectMapper();
237-
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
238-
return mapper.readValue(bufferedReader, clazz);
239-
}
240-
catch (IOException e) {
241-
throw new IllegalArgumentException(format("Invalid JSON file '%s'", file.getPath()), e);
242-
}
243-
}
244-
245225
private static void assertDenied(ThrowingRunnable runnable)
246226
{
247227
assertThrows(AccessDeniedException.class, runnable);

0 commit comments

Comments
 (0)