Skip to content

Commit 4ae0419

Browse files
Praveen2112Praveen2112
committed
Remove ConnectorTableLayoutHandle
1 parent eb32a25 commit 4ae0419

File tree

7 files changed

+2
-69
lines changed

7 files changed

+2
-69
lines changed

‎core/trino-main/src/main/java/io/trino/metadata/HandleJsonModule.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.trino.spi.connector.ConnectorSplit;
2626
import io.trino.spi.connector.ConnectorTableExecuteHandle;
2727
import io.trino.spi.connector.ConnectorTableHandle;
28-
import io.trino.spi.connector.ConnectorTableLayoutHandle;
2928
import io.trino.spi.connector.ConnectorTransactionHandle;
3029

3130
public class HandleJsonModule
@@ -43,12 +42,6 @@ public static com.fasterxml.jackson.databind.Module tableHandleModule(HandleReso
4342
return new AbstractTypedJacksonModule<>(ConnectorTableHandle.class, resolver::getId, resolver::getTableHandleClass) {};
4443
}
4544

46-
@ProvidesIntoSet
47-
public static com.fasterxml.jackson.databind.Module tableLayoutHandleModule(HandleResolver resolver)
48-
{
49-
return new AbstractTypedJacksonModule<>(ConnectorTableLayoutHandle.class, resolver::getId, resolver::getTableLayoutHandleClass) {};
50-
}
51-
5245
@ProvidesIntoSet
5346
public static com.fasterxml.jackson.databind.Module columnHandleModule(HandleResolver resolver)
5447
{

‎core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.trino.spi.connector.ConnectorSplit;
2525
import io.trino.spi.connector.ConnectorTableExecuteHandle;
2626
import io.trino.spi.connector.ConnectorTableHandle;
27-
import io.trino.spi.connector.ConnectorTableLayoutHandle;
2827
import io.trino.spi.connector.ConnectorTransactionHandle;
2928
import io.trino.split.EmptySplitHandleResolver;
3029

@@ -74,11 +73,6 @@ public String getId(ConnectorTableHandle tableHandle)
7473
return getId(tableHandle, MaterializedHandleResolver::getTableHandleClass);
7574
}
7675

77-
public String getId(ConnectorTableLayoutHandle handle)
78-
{
79-
return getId(handle, MaterializedHandleResolver::getTableLayoutHandleClass);
80-
}
81-
8276
public String getId(ColumnHandle columnHandle)
8377
{
8478
return getId(columnHandle, MaterializedHandleResolver::getColumnHandleClass);
@@ -124,11 +118,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass(String id)
124118
return resolverFor(id).getTableHandleClass().orElseThrow(() -> new IllegalArgumentException("No resolver for " + id));
125119
}
126120

127-
public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass(String id)
128-
{
129-
return resolverFor(id).getTableLayoutHandleClass().orElseThrow(() -> new IllegalArgumentException("No resolver for " + id));
130-
}
131-
132121
public Class<? extends ColumnHandle> getColumnHandleClass(String id)
133122
{
134123
return resolverFor(id).getColumnHandleClass().orElseThrow(() -> new IllegalArgumentException("No resolver for " + id));
@@ -193,7 +182,6 @@ private <T> String getId(T handle, Function<MaterializedHandleResolver, Optional
193182
private static class MaterializedHandleResolver
194183
{
195184
private final Optional<Class<? extends ConnectorTableHandle>> tableHandle;
196-
private final Optional<Class<? extends ConnectorTableLayoutHandle>> layoutHandle;
197185
private final Optional<Class<? extends ColumnHandle>> columnHandle;
198186
private final Optional<Class<? extends ConnectorSplit>> split;
199187
private final Optional<Class<? extends ConnectorIndexHandle>> indexHandle;
@@ -206,7 +194,6 @@ private static class MaterializedHandleResolver
206194
public MaterializedHandleResolver(ConnectorHandleResolver resolver)
207195
{
208196
tableHandle = getHandleClass(resolver::getTableHandleClass);
209-
layoutHandle = getHandleClass(resolver::getTableLayoutHandleClass);
210197
columnHandle = getHandleClass(resolver::getColumnHandleClass);
211198
split = getHandleClass(resolver::getSplitClass);
212199
indexHandle = getHandleClass(resolver::getIndexHandleClass);
@@ -232,11 +219,6 @@ public Optional<Class<? extends ConnectorTableHandle>> getTableHandleClass()
232219
return tableHandle;
233220
}
234221

235-
public Optional<Class<? extends ConnectorTableLayoutHandle>> getTableLayoutHandleClass()
236-
{
237-
return layoutHandle;
238-
}
239-
240222
public Optional<Class<? extends ColumnHandle>> getColumnHandleClass()
241223
{
242224
return columnHandle;
@@ -288,7 +270,6 @@ public boolean equals(Object o)
288270
}
289271
MaterializedHandleResolver that = (MaterializedHandleResolver) o;
290272
return Objects.equals(tableHandle, that.tableHandle) &&
291-
Objects.equals(layoutHandle, that.layoutHandle) &&
292273
Objects.equals(columnHandle, that.columnHandle) &&
293274
Objects.equals(split, that.split) &&
294275
Objects.equals(indexHandle, that.indexHandle) &&
@@ -302,7 +283,7 @@ public boolean equals(Object o)
302283
@Override
303284
public int hashCode()
304285
{
305-
return Objects.hash(tableHandle, layoutHandle, columnHandle, split, indexHandle, outputTableHandle, insertTableHandle, tableExecuteHandle, partitioningHandle, transactionHandle);
286+
return Objects.hash(tableHandle, columnHandle, split, indexHandle, outputTableHandle, insertTableHandle, tableExecuteHandle, partitioningHandle, transactionHandle);
306287
}
307288
}
308289
}

‎core/trino-main/src/main/java/io/trino/metadata/RemoteHandleResolver.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.trino.spi.connector.ConnectorPartitioningHandle;
1919
import io.trino.spi.connector.ConnectorSplit;
2020
import io.trino.spi.connector.ConnectorTableHandle;
21-
import io.trino.spi.connector.ConnectorTableLayoutHandle;
2221
import io.trino.spi.connector.ConnectorTransactionHandle;
2322
import io.trino.split.RemoteSplit;
2423
import io.trino.sql.planner.SystemPartitioningHandle;
@@ -32,12 +31,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass()
3231
throw new UnsupportedOperationException();
3332
}
3433

35-
@Override
36-
public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass()
37-
{
38-
throw new UnsupportedOperationException();
39-
}
40-
4134
@Override
4235
public Class<? extends ColumnHandle> getColumnHandleClass()
4336
{

‎core/trino-main/src/main/java/io/trino/split/EmptySplitHandleResolver.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.trino.spi.connector.ConnectorHandleResolver;
1818
import io.trino.spi.connector.ConnectorSplit;
1919
import io.trino.spi.connector.ConnectorTableHandle;
20-
import io.trino.spi.connector.ConnectorTableLayoutHandle;
2120

2221
public class EmptySplitHandleResolver
2322
implements ConnectorHandleResolver
@@ -28,12 +27,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass()
2827
throw new UnsupportedOperationException();
2928
}
3029

31-
@Override
32-
public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass()
33-
{
34-
throw new UnsupportedOperationException();
35-
}
36-
3730
@Override
3831
public Class<? extends ColumnHandle> getColumnHandleClass()
3932
{

‎core/trino-main/src/main/java/io/trino/testing/TestingHandle.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515

1616
import io.trino.spi.connector.ConnectorInsertTableHandle;
1717
import io.trino.spi.connector.ConnectorOutputTableHandle;
18-
import io.trino.spi.connector.ConnectorTableLayoutHandle;
1918

2019
public enum TestingHandle
21-
implements ConnectorOutputTableHandle, ConnectorInsertTableHandle, ConnectorTableLayoutHandle
20+
implements ConnectorOutputTableHandle, ConnectorInsertTableHandle
2221
{
2322
INSTANCE
2423
}

‎core/trino-main/src/main/java/io/trino/testing/TestingHandleResolver.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.trino.spi.connector.ConnectorOutputTableHandle;
2020
import io.trino.spi.connector.ConnectorSplit;
2121
import io.trino.spi.connector.ConnectorTableHandle;
22-
import io.trino.spi.connector.ConnectorTableLayoutHandle;
2322
import io.trino.spi.connector.ConnectorTransactionHandle;
2423
import io.trino.testing.TestingMetadata.TestingColumnHandle;
2524
import io.trino.testing.TestingMetadata.TestingTableHandle;
@@ -33,12 +32,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass()
3332
return TestingTableHandle.class;
3433
}
3534

36-
@Override
37-
public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass()
38-
{
39-
return TestingHandle.class;
40-
}
41-
4235
@Override
4336
public Class<? extends ColumnHandle> getColumnHandleClass()
4437
{

‎core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableLayoutHandle.java‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)