Fix bins on time-related fields#4612
Closed
ahkcs wants to merge 12 commits intoopensearch-project:mainfrom
Closed
Conversation
ykmr1224
reviewed
Oct 21, 2025
Comment on lines
+33
to
+34
| RexNode maxValue = context.relBuilder.max(fieldExpr).over().toRex(); | ||
| RexNode dataRange = context.relBuilder.call(SqlStdOperatorTable.MINUS, maxValue, minValue); | ||
| RexNode minValue = context.relBuilder.min(fieldExpr).over().toRex(); |
Collaborator
There was a problem hiding this comment.
nitnit: more intuitive to start with minValue
| } | ||
|
|
||
| /** Width bucket calculation using nice number algorithm. */ | ||
| public static String calculateWidthBucket( |
Collaborator
There was a problem hiding this comment.
I think it is cleaner to have separate method for timestamp.
| @@ -0,0 +1 @@ | |||
| {"calcite":{"logical":"LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])\n LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], email=[$8], lastname=[$9], age=[$16])\n LogicalSort(fetch=[5])\n LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], email=[$9], lastname=[$10], _id=[$11], _index=[$12], _score=[$13], _maxscore=[$14], _sort=[$15], _routing=[$16], age=[WIDTH_BUCKET($8, 3, MIN($8) OVER (), MAX($8) OVER ())])\n CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])\n","physical":"EnumerableLimit(fetch=[10000])\n EnumerableCalc(expr#0..12=[{inputs}], expr#13=[3], expr#14=[WIDTH_BUCKET($t8, $t13, $t11, $t12)], proj#0..7=[{exprs}], email=[$t9], lastname=[$t10], age=[$t14])\n EnumerableLimit(fetch=[5])\n EnumerableWindow(window#0=[window(aggs [MIN($8), MAX($8)])])\n CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[PROJECT->[account_number, firstname, address, balance, gender, city, employer, state, age, email, lastname]], OpenSearchRequestBuilder(sourceBuilder={\"from\":0,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"account_number\",\"firstname\",\"address\",\"balance\",\"gender\",\"city\",\"employer\",\"state\",\"age\",\"email\",\"lastname\"],\"excludes\":[]}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])\n"}} No newline at end of file | |||
Collaborator
There was a problem hiding this comment.
It looks like JSON file instead of YAML.
| String timestampStr = (String) timestamp; | ||
| java.time.LocalDateTime localDateTime = | ||
| java.time.LocalDateTime.parse( | ||
| timestampStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); |
Collaborator
There was a problem hiding this comment.
Why this pattern is different from something used in time_bins_test_data.json file?
And I was not quite sure if we can always assume this format.
Collaborator
Author
There was a problem hiding this comment.
The test data uses ISO 8601 format (2025-07-28T10:00:00 with 'T') for ingestion into OpenSearch, but when Calcite retrieves timestamp values and converts them to strings, it uses the SQL literal format (yyyy-MM-dd HH:mm:ss with space).
| private static String formatTimestamp(long timestampMillis) { | ||
| Instant instant = Instant.ofEpochMilli(timestampMillis); | ||
| ZonedDateTime zdt = instant.atZone(ZoneOffset.UTC); | ||
| return zdt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); |
Collaborator
There was a problem hiding this comment.
Should we make DateTimeFormatter instance a constant? (it is used above as well)
Collaborator
Author
There was a problem hiding this comment.
Great suggestion!
I updated the following:
For parsing (input) - uses DATE_TIMESTAMP_FORMATTER
For formatting (output) - uses SQL_LITERAL_DATE_TIME_FORMAT
Signed-off-by: Kai Huang <ahkcs@amazon.com>
Signed-off-by: Kai Huang <ahkcs@amazon.com>
ahkcs
added a commit
to ahkcs/sql
that referenced
this pull request
Oct 31, 2025
…g, AVG rounding, timestamp support
ahkcs
added a commit
to ahkcs/sql
that referenced
this pull request
Oct 31, 2025
…g, AVG rounding, timestamp support Signed-off-by: Kai Huang <ahkcs@amazon.com>
ahkcs
added a commit
to ahkcs/sql
that referenced
this pull request
Nov 3, 2025
…g, AVG rounding, timestamp support Signed-off-by: Kai Huang <ahkcs@amazon.com>
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.
Description
Summary
This PR extends the
bincommand to support time-related fields (timestamp,date,time) in non-aggregation scenarios using theWIDTH_BUCKETUDF.Previously,
binson time fields only worked with aggregations viaauto_date_histogrampushdown.Now, users can apply binning on timestamp fields in projection queries without aggregation.
Related Issues
Resolves ##4578