Merged
Conversation
gianm
approved these changes
Jan 4, 2018
Contributor
gianm
left a comment
gianm
left a comment
There was a problem hiding this comment.
LGTM, with minor suggestion in the tests.
| Druids.newTimeseriesQueryBuilder() | ||
| .dataSource(CalciteTests.DATASOURCE1) | ||
| .intervals(QSS(Intervals.of("2000/P1M"))) | ||
| .intervals(QSS(Intervals.of("-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z"))) |
Contributor
There was a problem hiding this comment.
This would be better as .intervals(QSS(Filtration.eternity()))
Contributor
Author
There was a problem hiding this comment.
thanks, changed to Filtration.eternity()
jon-wei
added a commit
to jon-wei/druid
that referenced
this pull request
Jan 4, 2018
* Upgrade to Calcite 1.15.0 * Use Filtration.eternity()
jon-wei
added a commit
that referenced
this pull request
Jan 4, 2018
Contributor
|
@jon-wei it appears that calcite-core is now bringing memory-0.9.0.jar which is conflicting with memory-0.10.3.jar brought by datasketches module. |
Contributor
Author
|
@himanshug I opened a PR that excludes sketches-core from calcite here: #5223 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR upgrades Calcite to 1.15.0, which fixes #4635 and #4945, with corresponding unit tests.
Calcite 1.15.0 changed the way it handles
EXTRACT(EPOCH ...), so this patch updates Druid accordingly.The PR also changes Druid's EPOCH units from milliseconds to seconds, which is more standard, e.g.:
https://www.postgresql.org/docs/9.1/static/functions-datetime.html
https://www.ibm.com/support/knowledgecenter/en/SSULQD_7.2.1/com.ibm.nz.dbu.doc/r_dbuser_functions_expressions_extract_datetime.html
The PR also re-enables/updates unit tests that were affected by https://issues.apache.org/jira/browse/CALCITE-1601 (fixed in Calcite 1.12.0, but the Druid tests were not enabled)