Skip to content

fix: Pinot query generation with time granularities: WEEKS/MONTHS/QUARTERS/YEARS #12536

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
villebro merged 1 commit into from
Jan 15, 2021
Merged

fix: Pinot query generation with time granularities: WEEKS/MONTHS/QUARTERS/YEARS #12536

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
26 changes: 21 additions & 5 deletions superset/db_engine_specs/pinot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ class PinotEngineSpec(BaseEngineSpec): # pylint: disable=abstract-method
"PT1M": "1:MINUTES",
"PT1H": "1:HOURS",
"P1D": "1:DAYS",
"P1W": "1:WEEKS",
"P1M": "1:MONTHS",
"P0.25Y": "3:MONTHS",
"P1Y": "1:YEARS",
"P1W": "week",
"P1M": "month",
"P0.25Y": "quarter",
"P1Y": "year",
}

_python_to_java_time_patterns: Dict[str, str] = {
Expand All @@ -50,6 +50,17 @@ class PinotEngineSpec(BaseEngineSpec): # pylint: disable=abstract-method
"%S": "ss",
}

_use_date_trunc_function: Dict[str, bool] = {
"PT1S": False,
"PT1M": False,
"PT1H": False,
"P1D": False,
"P1W": True,
"P1M": True,
"P0.25Y": True,
"P1Y": True,
}

@classmethod
def get_timestamp_expr(
cls,
Expand Down Expand Up @@ -86,8 +97,13 @@ def get_timestamp_expr(
raise NotImplementedError("No pinot grain spec for " + str(time_grain))
else:
return TimestampExpression("{{col}}", col)

# In pinot the output is a string since there is no timestamp column like pg
time_expr = f"DATETIMECONVERT({{col}}, '{tf}', '{tf}', '{granularity}')"
if cls._use_date_trunc_function.get(time_grain):
time_expr = f"DATETRUNC('{granularity}', {{col}}, '{seconds_or_ms}')"
else:
time_expr = f"DATETIMECONVERT({{col}}, '{tf}', '{tf}', '{granularity}')"

return TimestampExpression(time_expr, col)

@classmethod
Expand Down
12 changes: 10 additions & 2 deletions tests/db_engine_specs/pinot_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,19 @@
class TestPinotDbEngineSpec(TestDbEngineSpec):
""" Tests pertaining to our Pinot database support """

def test_pinot_time_expression_sec_one_1d_grain(self):
col = column("tstamp")
expr = PinotEngineSpec.get_timestamp_expr(col, "epoch_s", "P1D")
result = str(expr.compile())
self.assertEqual(
result,
"DATETIMECONVERT(tstamp, '1:SECONDS:EPOCH', '1:SECONDS:EPOCH', '1:DAYS')",
) # noqa

def test_pinot_time_expression_sec_one_1m_grain(self):
col = column("tstamp")
expr = PinotEngineSpec.get_timestamp_expr(col, "epoch_s", "P1M")
result = str(expr.compile())
self.assertEqual(
result,
"DATETIMECONVERT(tstamp, '1:SECONDS:EPOCH', '1:SECONDS:EPOCH', '1:MONTHS')",
result, "DATETRUNC('month', tstamp, 'SECONDS')",
) # noqa