Skip to content

Commit fd0601f

Browse files
committed
Remove deprecated interpolate query example and related test files; update summary query precision
Signed-off-by: Amber-Rigg <amber.l.rigg25@gmail.com>
1 parent 59f7b52 commit fd0601f

5 files changed

Lines changed: 9 additions & 307 deletions

File tree

build_interpolate_query_example.py

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/sdk/python/rtdip_sdk/queries/time_series/_time_series_query_builder.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -589,12 +589,12 @@ def _build_summary_query(
589589
[
590590
summary_query_sql,
591591
f"count(`{value_column}`) as Count,",
592-
f"CAST(Avg(`{value_column}`) as decimal(10, 2)) as Avg,",
593-
f"CAST(Min(`{value_column}`) as decimal(10, 2)) as Min,",
594-
f"CAST(Max(`{value_column}`) as decimal(10, 2)) as Max,",
595-
f"CAST(stddev(`{value_column}`) as decimal(10, 2)) as StDev,",
596-
f"CAST(sum(`{value_column}`) as decimal(10, 2)) as Sum,",
597-
f"CAST(variance(`{value_column}`) as decimal(10, 2)) as Var FROM",
592+
f"CAST(Avg(`{value_column}`) as decimal(18, 2)) as Avg,",
593+
f"CAST(Min(`{value_column}`) as decimal(18, 2)) as Min,",
594+
f"CAST(Max(`{value_column}`) as decimal(18, 2)) as Max,",
595+
f"CAST(stddev(`{value_column}`) as decimal(18, 2)) as StDev,",
596+
f"CAST(sum(`{value_column}`) as decimal(18, 2)) as Sum,",
597+
f"CAST(variance(`{value_column}`) as decimal(18, 2)) as Var FROM",
598598
]
599599
)
600600

test_interpolate_formatted.py

Lines changed: 0 additions & 103 deletions
This file was deleted.

test_interpolate_query_mock.py

Lines changed: 0 additions & 134 deletions
This file was deleted.

tests/sdk/python/rtdip_sdk/queries/_test_utils/sdk_test_objects.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@
9292
LATEST_MOCKED_QUERY_UOM = "WITH latest AS (SELECT * FROM `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_events_latest` WHERE `TagName` IN ('mocked-TAGNAME') ORDER BY `TagName` ) SELECT l.*, m.`UoM` FROM latest l LEFT OUTER JOIN `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_metadata` m ON l.`TagName` = m.`TagName` "
9393

9494
# Summary
95-
SUMMARY_MOCKED_QUERY = "WITH summary AS (SELECT `TagName`, count(`Value`) as Count, CAST(Avg(`Value`) as decimal(10, 2)) as Avg, CAST(Min(`Value`) as decimal(10, 2)) as Min, CAST(Max(`Value`) as decimal(10, 2)) as Max, CAST(stddev(`Value`) as decimal(10, 2)) as StDev, CAST(sum(`Value`) as decimal(10, 2)) as Sum, CAST(variance(`Value`) as decimal(10, 2)) as Var FROM `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_events_mocked-data-type` WHERE `EventTime` BETWEEN to_timestamp('2011-01-01T00:00:00+00:00') AND to_timestamp('2011-01-02T23:59:59+00:00') AND `TagName` IN ('mocked-TAGNAME') GROUP BY `TagName`) SELECT * FROM summary"
96-
SUMMARY_MOCKED_QUERY_CHECK_TAGS = "WITH summary AS (SELECT `TagName`, count(`Value`) as Count, CAST(Avg(`Value`) as decimal(10, 2)) as Avg, CAST(Min(`Value`) as decimal(10, 2)) as Min, CAST(Max(`Value`) as decimal(10, 2)) as Max, CAST(stddev(`Value`) as decimal(10, 2)) as StDev, CAST(sum(`Value`) as decimal(10, 2)) as Sum, CAST(variance(`Value`) as decimal(10, 2)) as Var FROM `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_events_mocked-data-type` WHERE `EventTime` BETWEEN to_timestamp('2011-01-01T00:00:00+00:00') AND to_timestamp('2011-01-02T23:59:59+00:00') AND UPPER(`TagName`) IN ('MOCKED-TAGNAME') GROUP BY `TagName`) SELECT * FROM summary"
97-
SUMMARY_MOCKED_QUERY_UOM = "WITH summary AS (SELECT `TagName`, count(`Value`) as Count, CAST(Avg(`Value`) as decimal(10, 2)) as Avg, CAST(Min(`Value`) as decimal(10, 2)) as Min, CAST(Max(`Value`) as decimal(10, 2)) as Max, CAST(stddev(`Value`) as decimal(10, 2)) as StDev, CAST(sum(`Value`) as decimal(10, 2)) as Sum, CAST(variance(`Value`) as decimal(10, 2)) as Var FROM `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_events_mocked-data-type` WHERE `EventTime` BETWEEN to_timestamp('2011-01-01T00:00:00+00:00') AND to_timestamp('2011-01-02T23:59:59+00:00') AND `TagName` IN ('mocked-TAGNAME') GROUP BY `TagName`), uom AS (SELECT summary.*, metadata.`UoM` FROM summary LEFT OUTER JOIN `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_metadata` AS metadata ON summary.`TagName` = metadata.`TagName`) SELECT * FROM uom"
95+
SUMMARY_MOCKED_QUERY = "WITH summary AS (SELECT `TagName`, count(`Value`) as Count, CAST(Avg(`Value`) as decimal(18, 2)) as Avg, CAST(Min(`Value`) as decimal(18, 2)) as Min, CAST(Max(`Value`) as decimal(18, 2)) as Max, CAST(stddev(`Value`) as decimal(18, 2)) as StDev, CAST(sum(`Value`) as decimal(18, 2)) as Sum, CAST(variance(`Value`) as decimal(18, 2)) as Var FROM `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_events_mocked-data-type` WHERE `EventTime` BETWEEN to_timestamp('2011-01-01T00:00:00+00:00') AND to_timestamp('2011-01-02T23:59:59+00:00') AND `TagName` IN ('mocked-TAGNAME') GROUP BY `TagName`) SELECT * FROM summary"
96+
SUMMARY_MOCKED_QUERY_CHECK_TAGS = "WITH summary AS (SELECT `TagName`, count(`Value`) as Count, CAST(Avg(`Value`) as decimal(18, 2)) as Avg, CAST(Min(`Value`) as decimal(18, 2)) as Min, CAST(Max(`Value`) as decimal(18, 2)) as Max, CAST(stddev(`Value`) as decimal(18, 2)) as StDev, CAST(sum(`Value`) as decimal(18, 2)) as Sum, CAST(variance(`Value`) as decimal(18, 2)) as Var FROM `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_events_mocked-data-type` WHERE `EventTime` BETWEEN to_timestamp('2011-01-01T00:00:00+00:00') AND to_timestamp('2011-01-02T23:59:59+00:00') AND UPPER(`TagName`) IN ('MOCKED-TAGNAME') GROUP BY `TagName`) SELECT * FROM summary"
97+
SUMMARY_MOCKED_QUERY_UOM = "WITH summary AS (SELECT `TagName`, count(`Value`) as Count, CAST(Avg(`Value`) as decimal(18, 2)) as Avg, CAST(Min(`Value`) as decimal(18, 2)) as Min, CAST(Max(`Value`) as decimal(18, 2)) as Max, CAST(stddev(`Value`) as decimal(18, 2)) as StDev, CAST(sum(`Value`) as decimal(18, 2)) as Sum, CAST(variance(`Value`) as decimal(18, 2)) as Var FROM `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_events_mocked-data-type` WHERE `EventTime` BETWEEN to_timestamp('2011-01-01T00:00:00+00:00') AND to_timestamp('2011-01-02T23:59:59+00:00') AND `TagName` IN ('mocked-TAGNAME') GROUP BY `TagName`), uom AS (SELECT summary.*, metadata.`UoM` FROM summary LEFT OUTER JOIN `mocked-buiness-unit`.`sensors`.`mocked-asset_mocked-data-security-level_metadata` AS metadata ON summary.`TagName` = metadata.`TagName`) SELECT * FROM uom"

0 commit comments

Comments
 (0)