Fix snapshot merge strategy

kamu-data · Mar 22, 2020 · 6ef1a6c · 6ef1a6c
1 parent c4f9b8e
commit 6ef1a6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.12.1] - 2020-03-22
+### Fixed
+- Snapshot merge strategy was completely broken
+
 ## [0.12.0] - 2020-03-21
 ### Changed
 - Use dataset caching for faster hash computation

diff --git a/core.ingest.polling b/core.ingest.polling
+1 −1		src/main/scala/dev/kamu/core/ingest/polling/merge/SnapshotMergeStrategy.scala
+15 −27		src/main/scala/dev/kamu/core/ingest/polling/utils/TimeSeriesUtils.scala
+60 −33		src/test/scala/dev/kamu/core/ingest/polling/TimeSeriesUtilsTest.scala