Skip to content
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

Jump to bottom

Dev/issue 10 #18

Merged
merged 11 commits into from
Jul 26, 2022
Merged

Dev/issue 10 #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3366a60
Add a dummy transformation rule
taewhi Jun 14, 2022
3c7fbc0
Chore: add cleanup stmts in jdbc tests
taewhi Jun 17, 2022
01d07b5
Refactoring: pass CatalogContext to planner
taewhi Jun 17, 2022
eb098c0
Refactoring: rename method to avoid confusion
taewhi Jun 24, 2022
b847104
Add catalog method to get availabe synopses
taewhi Jun 24, 2022
d6c616d
Refactor: add CatalogReader to TrainDBPlanner
taewhi Jul 20, 2022
5423f44
Refactor: adjust visibility of JdbcTableScan class
taewhi Jul 20, 2022
00d19c1
Feat: find available synopses for aggr table scan
taewhi Jul 20, 2022
948ea11
Feat: replace base table scan to synopsis table scan
ChoonseoPark Jul 25, 2022
7389944
Fix: adjust the span of approximate aggr hints
taewhi Jul 26, 2022
3eccb08
Test: add test cases for SELECT APPROXIMATE query
taewhi Jul 26, 2022
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
Prev Previous commit
Next Next commit
Refactor: add CatalogReader to TrainDBPlanner
  • Loading branch information
@taewhi
taewhi committed Jul 20, 2022
commit d6c616d2905eb5d25f667be44c24905f99b17d9e
14 changes: 12 additions & 2 deletions traindb-core/src/main/java/traindb/planner/TrainDBPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
package traindb.planner;

import java.util.Collection;
import java.util.List;
import org.apache.calcite.plan.Context;
import org.apache.calcite.plan.ConventionTraitDef;
import org.apache.calcite.plan.RelOptCostFactory;
import org.apache.calcite.plan.RelOptTable;
import org.apache.calcite.plan.RelOptUtil;
import org.apache.calcite.plan.volcano.VolcanoPlanner;
import org.apache.calcite.rel.RelCollationTraitDef;
Expand All @@ -27,20 +29,24 @@
import traindb.catalog.CatalogException;
import traindb.catalog.pm.MSynopsis;
import traindb.planner.rules.TrainDBRules;
import traindb.prepare.TrainDBCatalogReader;

public class TrainDBPlanner extends VolcanoPlanner {

private CatalogContext catalogContext;
private TrainDBCatalogReader catalogReader;

public TrainDBPlanner(CatalogContext catalogContext) {
this(catalogContext, null, null);
public TrainDBPlanner(CatalogContext catalogContext, TrainDBCatalogReader catalogReader) {
this(catalogContext, catalogReader, null, null);
}

public TrainDBPlanner(CatalogContext catalogContext,
TrainDBCatalogReader catalogReader,
@Nullable RelOptCostFactory costFactory,
@Nullable Context externalContext) {
super(costFactory, externalContext);
this.catalogContext = catalogContext;
this.catalogReader = catalogReader;
initPlanner();
}

Expand All @@ -64,4 +70,8 @@ public Collection<MSynopsis> getAvailableSynopses(String baseSchema, String base
} catch (CatalogException e) {}
return null;
}

public RelOptTable getTable(List<String> names) {
return catalogReader.getTable(names);
}
}
12 changes: 10 additions & 2 deletions traindb-core/src/main/java/traindb/prepare/TrainDBPrepareImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ private ParseResult convert_(Context context, String sql, boolean analyze,
// Use the Volcano because it can handle the traits.
CatalogContext catalogContext =
((TrainDBConnectionImpl.TrainDBContextImpl) context).getCatalogContext();
final VolcanoPlanner planner = new TrainDBPlanner(catalogContext);
final VolcanoPlanner planner = new TrainDBPlanner(catalogContext, catalogReader);

final SqlToRelConverter.Config config =
SqlToRelConverter.config().withTrimUnusedFields(true)
Expand Down Expand Up @@ -420,7 +420,15 @@ protected RelOptPlanner createPlanner(
}
CatalogContext catalogContext =
((TrainDBConnectionImpl.TrainDBContextImpl) prepareContext).getCatalogContext();
final VolcanoPlanner planner = new TrainDBPlanner(catalogContext, costFactory, externalContext);

TrainDBCatalogReader catalogReader =
new TrainDBCatalogReader(
prepareContext.getRootSchema(),
prepareContext.getDefaultSchemaPath(),
prepareContext.getTypeFactory(),
prepareContext.config());
final VolcanoPlanner planner = new TrainDBPlanner(
catalogContext, catalogReader, costFactory, externalContext);
return planner;
}

Expand Down