Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions amiadapters/storage/snowflake.py
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,9 @@ def _meter_tuple(self, meter: GeneralMeter, row_active_from: datetime):
return tuple(result)

def _upsert_reads(self, reads: List[GeneralMeterRead], conn, table_name="readings"):
self._verify_no_duplicate_reads(reads)
oldest_flowtime = self._verify_no_duplicate_reads_and_return_oldest_flowtime(
reads
)

temp_table_name = f"temp_{table_name}"
create_temp_table_sql = (
Expand Down Expand Up @@ -582,6 +584,12 @@ def _upsert_reads(self, reads: List[GeneralMeterRead], conn, table_name="reading
source.battery, source.install_date, source.connection, source.estimated)
"""
conn.cursor().execute(merge_sql)
if oldest_flowtime is not None:
self.metrics.gauge(
"snowflake_storage_sink.oldest_flowtime_stored",
int(oldest_flowtime.timestamp()),
tags={"org_id": self.org_id},
)

def _meter_read_tuple(self, read: GeneralMeterRead):
result = [
Expand Down Expand Up @@ -611,15 +619,21 @@ def _verify_no_duplicate_meters(self, meters: List[GeneralMeter]):
)
seen.add(key)

def _verify_no_duplicate_reads(self, reads: List[GeneralMeterRead]):
def _verify_no_duplicate_reads_and_return_oldest_flowtime(
self, reads: List[GeneralMeterRead]
):
seen = set()
oldest_flowtime = None
for read in reads:
key = (read.org_id, read.device_id, read.flowtime)
if key in seen:
raise ValueError(
f"Encountered duplicate read in data for Snowflake: {key}"
)
seen.add(key)
if oldest_flowtime is None or read.flowtime < oldest_flowtime:
oldest_flowtime = read.flowtime
return oldest_flowtime

def calculate_end_of_backfill_range(
self, org_id: str, min_date: datetime, max_date: datetime
Expand Down