Metadata changes

kamu-data · Jun 15, 2020 · 700c946 · 700c946
1 parent 97cbe61
commit 700c946
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,9 @@ 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).
 
-## Unreleased
-### Changed
-- Further engine interface improvements
+## [0.17.0] - 2020-06-14
+### Added
+- Added support for [Apache Flink](https://github.com/kamu-data/kamu-engine-flink) engine!
 
 ## [0.16.0] - 2020-05-25
 ### Changed

diff --git a/core.coordinator/src/main/scala/dev/kamu/cli/ingest/IngestService.scala b/core.coordinator/src/main/scala/dev/kamu/cli/ingest/IngestService.scala
@@ -25,7 +25,6 @@ import dev.kamu.core.manifests.infra.IngestRequest
 import dev.kamu.core.manifests.{
   DatasetID,
   DatasetVocabulary,
-  DatasetVocabularyOverrides,
   MetadataBlock,
   SourceKind
 }
@@ -137,9 +136,7 @@ class IngestService(
           prepResult.checkpoint,
           prepDataPath,
           ingestCheckpointPath,
-          summary.vocabulary
-            .getOrElse(DatasetVocabularyOverrides())
-            .asDatasetVocabulary()
+          summary.vocabulary.getOrElse(DatasetVocabulary())
         )
 
         if (ingestResult.wasUpToDate) {

diff --git a/core.coordinator/src/main/scala/dev/kamu/cli/metadata/MetadataRepository.scala b/core.coordinator/src/main/scala/dev/kamu/cli/metadata/MetadataRepository.scala
@@ -102,9 +102,7 @@ class MetadataRepository(
   }
 
   def getDatasetVocabulary(id: DatasetID): DatasetVocabulary = {
-    getDatasetSummary(id).vocabulary
-      .getOrElse(DatasetVocabularyOverrides())
-      .asDatasetVocabulary()
+    getDatasetSummary(id).vocabulary.getOrElse(DatasetVocabulary())
   }
 
   def getDatasetRef(id: DatasetID): DatasetRef = {

diff --git a/core.coordinator/src/test/scala/dev/kamu/cli/KamuPullDerivativeSpec.scala b/core.coordinator/src/test/scala/dev/kamu/cli/KamuPullDerivativeSpec.scala
@@ -42,7 +42,7 @@ class KamuPullDerivativeSpec extends FlatSpec with Matchers with KamuTestBase {
       val deriv = DatasetFactory.newDerivativeDataset(
         source = root.id,
         sql = Some(
-          s"SELECT system_time, event_time, city, (population + 1) as population FROM `${root.id}`"
+          s"SELECT event_time, city, (population + 1) as population FROM `${root.id}`"
         )
       )
 

diff --git a/core.manifests b/core.manifests
+1 −1		src/main/scala/dev/kamu/core/manifests/DatasetSnapshot.scala
+1 −1		src/main/scala/dev/kamu/core/manifests/DatasetSummary.scala
+6 −16		src/main/scala/dev/kamu/core/manifests/DatasetVocabulary.scala
+0 −9		src/main/scala/dev/kamu/core/manifests/MergeStrategyKind.scala
+8 −8		src/main/scala/dev/kamu/core/manifests/TransformKind.scala
+5 −4		src/test/scala/dev/kamu/core/manifests/UtilsSpec.scala