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
11 changes: 7 additions & 4 deletions dp3/database/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,13 @@ def insert_datapoints(
with self._master_buffer_locks[etype]:
if eid in self._master_buffers[etype]:
for attr, push_dps in master_changes["pushes"].items():
if attr in self._master_buffers[etype][eid]["pushes"]:
self._master_buffers[etype][eid]["pushes"][attr].extend(push_dps)
else:
self._master_buffers[etype][eid]["pushes"][attr] = push_dps
if "pushes" not in self._master_buffers[etype][eid]:
self._master_buffers[etype][eid]["pushes"] = {}
if attr not in self._master_buffers[etype][eid]["pushes"]:
self._master_buffers[etype][eid]["pushes"][attr] = []
self._master_buffers[etype][eid]["pushes"][attr].extend(push_dps)
if "$set" not in self._master_buffers[etype][eid]:
self._master_buffers[etype][eid]["$set"] = {}
self._master_buffers[etype][eid]["$set"].update(master_changes["$set"])
else:
self._master_buffers[etype][eid] = master_changes
Expand Down