Skip to content

Commit 73f4367

Browse files
committed
[Address Comment] Rename IProcedureRegistry to ProcedureRegistry
Accordingly rename previous ProcedureRegistry to BuiltInProcedureRegistry
1 parent eaa82da commit 73f4367

File tree

25 files changed

+70
-70
lines changed

25 files changed

+70
-70
lines changed

presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryPreparer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.facebook.presto.spi.WarningCollector;
2424
import com.facebook.presto.spi.analyzer.AnalyzerOptions;
2525
import com.facebook.presto.spi.analyzer.QueryPreparer;
26-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
26+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
2727
import com.facebook.presto.sql.analyzer.utils.StatementUtils;
2828
import com.facebook.presto.sql.parser.SqlParser;
2929
import com.facebook.presto.sql.tree.Call;
@@ -64,12 +64,12 @@ public class BuiltInQueryPreparer
6464
implements QueryPreparer
6565
{
6666
private final SqlParser sqlParser;
67-
private final IProcedureRegistry procedureRegistry;
67+
private final ProcedureRegistry procedureRegistry;
6868

6969
@Inject
7070
public BuiltInQueryPreparer(
7171
SqlParser sqlParser,
72-
IProcedureRegistry procedureRegistry)
72+
ProcedureRegistry procedureRegistry)
7373
{
7474
this.sqlParser = requireNonNull(sqlParser, "sqlParser is null");
7575
this.procedureRegistry = requireNonNull(procedureRegistry, "procedureRegistry is null");

presto-analyzer/src/test/java/com/facebook/presto/sql/analyzer/TestBuiltInQueryPreparer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import com.facebook.presto.spi.PrestoException;
1919
import com.facebook.presto.spi.WarningCollector;
2020
import com.facebook.presto.spi.analyzer.AnalyzerOptions;
21-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
2221
import com.facebook.presto.spi.procedure.Procedure;
22+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
2323
import com.facebook.presto.spi.procedure.TableDataRewriteDistributedProcedure;
2424
import com.facebook.presto.spi.procedure.TestProcedureRegistry;
2525
import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer.BuiltInPreparedQuery;
@@ -55,7 +55,7 @@ public class TestBuiltInQueryPreparer
5555
private static final SqlParser SQL_PARSER = new SqlParser();
5656
private static final Map<String, String> emptyPreparedStatements = ImmutableMap.of();
5757
private static final AnalyzerOptions testAnalyzerOptions = AnalyzerOptions.builder().build();
58-
private static IProcedureRegistry procedureRegistry;
58+
private static ProcedureRegistry procedureRegistry;
5959
private static BuiltInQueryPreparer queryPreparer;
6060

6161
@BeforeClass

presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergAbstractMetadata.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
import com.facebook.presto.spi.function.StandardFunctionResolution;
6565
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
6666
import com.facebook.presto.spi.procedure.DistributedProcedure;
67-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
6867
import com.facebook.presto.spi.procedure.Procedure;
68+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
6969
import com.facebook.presto.spi.relation.RowExpression;
7070
import com.facebook.presto.spi.relation.RowExpressionService;
7171
import com.facebook.presto.spi.statistics.ColumnStatisticMetadata;
@@ -225,7 +225,7 @@ public abstract class IcebergAbstractMetadata
225225
protected static final String INFORMATION_SCHEMA = "information_schema";
226226

227227
protected final TypeManager typeManager;
228-
protected final IProcedureRegistry procedureRegistry;
228+
protected final ProcedureRegistry procedureRegistry;
229229
protected final JsonCodec<CommitTaskData> commitTaskCodec;
230230
protected final NodeVersion nodeVersion;
231231
protected final RowExpressionService rowExpressionService;
@@ -240,7 +240,7 @@ public abstract class IcebergAbstractMetadata
240240

241241
public IcebergAbstractMetadata(
242242
TypeManager typeManager,
243-
IProcedureRegistry procedureRegistry,
243+
ProcedureRegistry procedureRegistry,
244244
StandardFunctionResolution functionResolution,
245245
RowExpressionService rowExpressionService,
246246
JsonCodec<CommitTaskData> commitTaskCodec,

presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import com.facebook.presto.spi.ViewNotFoundException;
5555
import com.facebook.presto.spi.function.StandardFunctionResolution;
5656
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
57-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
57+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
5858
import com.facebook.presto.spi.relation.RowExpressionService;
5959
import com.facebook.presto.spi.security.PrestoPrincipal;
6060
import com.facebook.presto.spi.statistics.ColumnStatisticMetadata;
@@ -176,7 +176,7 @@ public IcebergHiveMetadata(
176176
ExtendedHiveMetastore metastore,
177177
HdfsEnvironment hdfsEnvironment,
178178
TypeManager typeManager,
179-
IProcedureRegistry procedureRegistry,
179+
ProcedureRegistry procedureRegistry,
180180
StandardFunctionResolution functionResolution,
181181
RowExpressionService rowExpressionService,
182182
JsonCodec<CommitTaskData> commitTaskCodec,

presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadataFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.facebook.presto.spi.connector.ConnectorMetadata;
2424
import com.facebook.presto.spi.function.StandardFunctionResolution;
2525
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
26-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
26+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
2727
import com.facebook.presto.spi.relation.RowExpressionService;
2828
import jakarta.inject.Inject;
2929

@@ -36,7 +36,7 @@ public class IcebergHiveMetadataFactory
3636
final ExtendedHiveMetastore metastore;
3737
final HdfsEnvironment hdfsEnvironment;
3838
final TypeManager typeManager;
39-
final IProcedureRegistry procedureRegistry;
39+
final ProcedureRegistry procedureRegistry;
4040
final JsonCodec<CommitTaskData> commitTaskCodec;
4141
final StandardFunctionResolution functionResolution;
4242
final RowExpressionService rowExpressionService;
@@ -54,7 +54,7 @@ public IcebergHiveMetadataFactory(
5454
ExtendedHiveMetastore metastore,
5555
HdfsEnvironment hdfsEnvironment,
5656
TypeManager typeManager,
57-
IProcedureRegistry procedureRegistry,
57+
ProcedureRegistry procedureRegistry,
5858
StandardFunctionResolution functionResolution,
5959
RowExpressionService rowExpressionService,
6060
JsonCodec<CommitTaskData> commitTaskCodec,

presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import com.facebook.presto.spi.SchemaTablePrefix;
3131
import com.facebook.presto.spi.function.StandardFunctionResolution;
3232
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
33-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
33+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
3434
import com.facebook.presto.spi.relation.RowExpressionService;
3535
import com.google.common.collect.ImmutableList;
3636
import com.google.common.collect.ImmutableMap;
@@ -105,7 +105,7 @@ public class IcebergNativeMetadata
105105
public IcebergNativeMetadata(
106106
IcebergNativeCatalogFactory catalogFactory,
107107
TypeManager typeManager,
108-
IProcedureRegistry procedureRegistry,
108+
ProcedureRegistry procedureRegistry,
109109
StandardFunctionResolution functionResolution,
110110
RowExpressionService rowExpressionService,
111111
JsonCodec<CommitTaskData> commitTaskCodec,

presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeMetadataFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.facebook.presto.spi.connector.ConnectorMetadata;
2121
import com.facebook.presto.spi.function.StandardFunctionResolution;
2222
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
23-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
23+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
2424
import com.facebook.presto.spi.relation.RowExpressionService;
2525
import jakarta.inject.Inject;
2626

@@ -30,7 +30,7 @@ public class IcebergNativeMetadataFactory
3030
implements IcebergMetadataFactory
3131
{
3232
final TypeManager typeManager;
33-
final IProcedureRegistry procedureRegistry;
33+
final ProcedureRegistry procedureRegistry;
3434
final JsonCodec<CommitTaskData> commitTaskCodec;
3535
final IcebergNativeCatalogFactory catalogFactory;
3636
final CatalogType catalogType;
@@ -46,7 +46,7 @@ public IcebergNativeMetadataFactory(
4646
IcebergConfig config,
4747
IcebergNativeCatalogFactory catalogFactory,
4848
TypeManager typeManager,
49-
IProcedureRegistry procedureRegistry,
49+
ProcedureRegistry procedureRegistry,
5050
StandardFunctionResolution functionResolution,
5151
RowExpressionService rowExpressionService,
5252
JsonCodec<CommitTaskData> commitTaskCodec,

presto-iceberg/src/main/java/com/facebook/presto/iceberg/InternalIcebergConnectorFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
import com.facebook.presto.spi.function.FunctionMetadataManager;
4949
import com.facebook.presto.spi.function.StandardFunctionResolution;
5050
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
51-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
5251
import com.facebook.presto.spi.procedure.Procedure;
52+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
5353
import com.facebook.presto.spi.relation.RowExpressionService;
5454
import com.facebook.presto.spi.session.PropertyMetadata;
5555
import com.google.common.collect.ImmutableSet;
@@ -95,7 +95,7 @@ public static Connector createConnector(
9595
binder.bind(NodeVersion.class).toInstance(new NodeVersion(context.getNodeManager().getCurrentNode().getVersion()));
9696
binder.bind(NodeManager.class).toInstance(context.getNodeManager());
9797
binder.bind(TypeManager.class).toInstance(context.getTypeManager());
98-
binder.bind(IProcedureRegistry.class).toInstance(context.getProcedureRegistry());
98+
binder.bind(ProcedureRegistry.class).toInstance(context.getProcedureRegistry());
9999
binder.bind(PageIndexerFactory.class).toInstance(context.getPageIndexerFactory());
100100
binder.bind(PageSorter.class).toInstance(context.getPageSorter());
101101
binder.bind(StandardFunctionResolution.class).toInstance(context.getStandardFunctionResolution());

presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestRenameTableOnFragileFileSystem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
import com.facebook.presto.iceberg.IcebergTableType;
4949
import com.facebook.presto.iceberg.ManifestFileCache;
5050
import com.facebook.presto.iceberg.statistics.StatisticsFileCache;
51+
import com.facebook.presto.metadata.BuiltInProcedureRegistry;
5152
import com.facebook.presto.metadata.FunctionAndTypeManager;
5253
import com.facebook.presto.metadata.MetadataManager;
53-
import com.facebook.presto.metadata.ProcedureRegistry;
5454
import com.facebook.presto.spi.ConnectorSession;
5555
import com.facebook.presto.spi.PrestoException;
5656
import com.facebook.presto.spi.SchemaTableName;
@@ -411,7 +411,7 @@ private ConnectorMetadata getIcebergHiveMetadata(ExtendedHiveMetastore metastore
411411
metastore,
412412
hdfsEnvironment,
413413
FUNCTION_AND_TYPE_MANAGER,
414-
new ProcedureRegistry(METADATA.getFunctionAndTypeManager()),
414+
new BuiltInProcedureRegistry(METADATA.getFunctionAndTypeManager()),
415415
FUNCTION_RESOLUTION,
416416
ROW_EXPRESSION_SERVICE,
417417
jsonCodec(CommitTaskData.class),

presto-main-base/src/main/java/com/facebook/presto/connector/ConnectorContextInstance.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.facebook.presto.spi.function.FunctionMetadataManager;
2424
import com.facebook.presto.spi.function.StandardFunctionResolution;
2525
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
26-
import com.facebook.presto.spi.procedure.IProcedureRegistry;
26+
import com.facebook.presto.spi.procedure.ProcedureRegistry;
2727
import com.facebook.presto.spi.relation.RowExpressionService;
2828

2929
import static java.util.Objects.requireNonNull;
@@ -33,7 +33,7 @@ public class ConnectorContextInstance
3333
{
3434
private final NodeManager nodeManager;
3535
private final TypeManager typeManager;
36-
private final IProcedureRegistry procedureRegistry;
36+
private final ProcedureRegistry procedureRegistry;
3737
private final FunctionMetadataManager functionMetadataManager;
3838
private final StandardFunctionResolution functionResolution;
3939
private final PageSorter pageSorter;
@@ -46,7 +46,7 @@ public class ConnectorContextInstance
4646
public ConnectorContextInstance(
4747
NodeManager nodeManager,
4848
TypeManager typeManager,
49-
IProcedureRegistry procedureRegistry,
49+
ProcedureRegistry procedureRegistry,
5050
FunctionMetadataManager functionMetadataManager,
5151
StandardFunctionResolution functionResolution,
5252
PageSorter pageSorter,
@@ -82,7 +82,7 @@ public TypeManager getTypeManager()
8282
}
8383

8484
@Override
85-
public IProcedureRegistry getProcedureRegistry()
85+
public ProcedureRegistry getProcedureRegistry()
8686
{
8787
return procedureRegistry;
8888
}

0 commit comments

Comments
 (0)