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

new:dev:Upgrade Apache Calcite to 1.13 #95

Merged
merged 13 commits into from
Jul 10, 2017
Merged

new:dev:Upgrade Apache Calcite to 1.13 #95

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e379236
Upgrade calcite and fix compile errors
Jun 5, 2017
4ddf231
Separate avatica version from calcite version
Jun 5, 2017
3ef010d
Quark compiles with calcite
Jun 19, 2017
4aebe4b
Initialize schema after defaultSchema is set
Jun 20, 2017
8fc38b1
Fix a few cube tests in LatticeTests
Jul 5, 2017
d47defa
Fix checkstyle and a few more tests
Jul 5, 2017
01e9428
Fix support for filters on dim columns
Jul 10, 2017
0cb78fb
Fix filters on non dimension columns
Jul 10, 2017
0ca88b3
Compile plugins with new API changes
Jul 10, 2017
c5a89d7
Ignore failed tests. Fix schema and table registration
Jul 10, 2017
53aeddb
Remove DimensionToCubeColumn Map
Jul 10, 2017
ee44314
Update calcite version to q2
Jul 10, 2017
4e3e6e6
Support only jdk8
Jul 10, 2017
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
Initialize schema after defaultSchema is set
  • Loading branch information
Rajat Venkatesh committed Jun 20, 2017
commit 4aebe4bf679e87b529e03cd3d87d8b58d2b0681a
6 changes: 3 additions & 3 deletions optimizer/src/main/java/com/qubole/quark/sql/QueryContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ public QueryContext(Properties info) throws QuarkException {
SchemaPlus schemaPlus = rootSchema.add(schema.getName(), schema);
schema.setSchemaPlus(schemaPlus);
}
for (QuarkSchema schema : schemas) {
schema.initialize(this);
}
if (info.getProperty("defaultSchema") == null) {
throw new QuarkException(new Throwable("Default schema has to be specified"));
}
final ObjectMapper mapper = new ObjectMapper();
defaultSchema =
Arrays.asList(mapper.readValue(info.getProperty("defaultSchema"), String[].class));
for (QuarkSchema schema : schemas) {
schema.initialize(this);
}
}
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException
| IOException e) {
Expand Down