Skip to content

fix: Register CLP plan optimizer (fixes #35). #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anlowee merged 1 commit into from
Jul 11, 2025
Merged

fix: Register CLP plan optimizer (fixes #35). #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion presto-clp/src/main/java/com/facebook/presto/plugin/clp/ClpConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
import com.facebook.airlift.log.Logger;
import com.facebook.presto.spi.connector.Connector;
import com.facebook.presto.spi.connector.ConnectorMetadata;
import com.facebook.presto.spi.connector.ConnectorPlanOptimizerProvider;
import com.facebook.presto.spi.connector.ConnectorRecordSetProvider;
import com.facebook.presto.spi.connector.ConnectorSplitManager;
import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
import com.facebook.presto.spi.function.FunctionMetadataManager;
import com.facebook.presto.spi.function.StandardFunctionResolution;
import com.facebook.presto.spi.transaction.IsolationLevel;

import javax.inject.Inject;
Expand All @@ -35,14 +38,33 @@ public class ClpConnector
private final ClpMetadata metadata;
private final ClpRecordSetProvider recordSetProvider;
private final ClpSplitManager splitManager;
private final FunctionMetadataManager functionManager;
private final StandardFunctionResolution functionResolution;
private final ClpMetadataFilterProvider metadataFilterProvider;

@Inject
public ClpConnector(LifeCycleManager lifeCycleManager, ClpMetadata metadata, ClpRecordSetProvider recordSetProvider, ClpSplitManager splitManager)
public ClpConnector(
LifeCycleManager lifeCycleManager,
ClpMetadata metadata,
ClpRecordSetProvider recordSetProvider,
ClpSplitManager splitManager,
FunctionMetadataManager functionManager,
StandardFunctionResolution functionResolution,
ClpMetadataFilterProvider metadataFilterProvider)
{
this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
this.metadata = requireNonNull(metadata, "metadata is null");
this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null");
this.splitManager = requireNonNull(splitManager, "splitManager is null");
this.functionManager = requireNonNull(functionManager, "functionManager is null");
this.functionResolution = requireNonNull(functionResolution, "functionResolution is null");
this.metadataFilterProvider = requireNonNull(metadataFilterProvider, "metadataFilterProvider is null");
}

@Override
public ConnectorPlanOptimizerProvider getConnectorPlanOptimizerProvider()
{
return new ClpPlanOptimizerProvider(functionManager, functionResolution, metadataFilterProvider);
}

@Override
Expand Down
2 changes: 0 additions & 2 deletions presto-clp/src/main/java/com/facebook/presto/plugin/clp/ClpConnectorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.facebook.presto.spi.connector.ConnectorFactory;
import com.facebook.presto.spi.function.FunctionMetadataManager;
import com.facebook.presto.spi.function.StandardFunctionResolution;
import com.facebook.presto.spi.relation.RowExpressionService;
import com.google.inject.Injector;

import java.util.Map;
Expand Down Expand Up @@ -56,7 +55,6 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
Bootstrap app = new Bootstrap(new JsonModule(), new ClpModule(), binder -> {
binder.bind(FunctionMetadataManager.class).toInstance(context.getFunctionMetadataManager());
binder.bind(NodeManager.class).toInstance(context.getNodeManager());
binder.bind(RowExpressionService.class).toInstance(context.getRowExpressionService());
binder.bind(StandardFunctionResolution.class).toInstance(context.getStandardFunctionResolution());
binder.bind(TypeManager.class).toInstance(context.getTypeManager());
});
Expand Down