Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding Array of metadataSeq in RichMap #72

Merged
merged 2 commits into from Aug 20, 2018
Merged

Adding Array of metadataSeq in RichMap #72

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcae051
Adding Array of metadataSeq in RichMap
gokulsfdc Aug 20, 2018
7c3797f
Incorporating code review comments
gokulsfdc Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions utils/src/main/scala/com/salesforce/op/utils/spark/RichMetadata.scala
View file
Open in desktop
Expand Up @@ -186,6 +186,7 @@ object RichMetadata {
private val intSeq = TypeCase[Seq[Int]]
private val doubleSeq = TypeCase[Seq[Double]]
private val stringSeq = TypeCase[Seq[String]]
private val metadataSeq = TypeCase[Seq[Metadata]]

/**
* Enrichment functions for Maps
Expand All @@ -203,6 +204,7 @@ object RichMetadata {
case longSeq(v) => builder.putLongArray(key, v.toArray)
case doubleSeq(v) => builder.putDoubleArray(key, v.toArray)
case stringSeq(v) => builder.putStringArray(key, v.toArray)
case metadataSeq(v) => builder.putMetadataArray(key, v.toArray)
case _ => unsupported(key, seq)
}
theMap.foldLeft(builder) {
Expand Down
16 changes: 16 additions & 0 deletions utils/src/test/scala/com/salesforce/op/utils/spark/RichMetadataTest.scala
View file
Open in desktop
Expand Up @@ -85,6 +85,11 @@ class RichMetadataTest extends FlatSpec with TestCommon {
val mergedMetadata = meta1.deepMerge(map2.toMetadata)
mergedMetadata.json shouldBe Serialization.write(mergedMap)

val m1 = Map("1" -> Array(Map("val" -> "a").toMetadata)).toMetadata
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets add it as a separate test case

val m2 = Map("1" -> Array(Map("val" -> "b").toMetadata)).toMetadata
val mergedValue = Map("1" -> Array(Map("val" -> "a").toMetadata, Map("val" -> "b").toMetadata)).toMetadata

m1.deepMerge(m2) shouldBe mergedValue
}

it should "throw an error on incompatible value types in deep merge" in {
Expand All @@ -100,6 +105,17 @@ class RichMetadataTest extends FlatSpec with TestCommon {
summaryMeta.containsSummaryMetadata shouldBe true
}

it should "create summary for a given metadata" in {
val richMetaData = RichMetadata(meta1)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to explicitely wrap metadata into RichMetadata. It should world implicitly.

richMetaData.containsSummaryMetadata() shouldBe false

// create a summary for the metadata.
val expectedSummaryMetadata = Map("s" -> "summaryTest").toMetadata
val richMetaDataWithSummary = richMetaData.withSummaryMetadata(expectedSummaryMetadata)

richMetaDataWithSummary.getSummaryMetadata() shouldBe expectedSummaryMetadata
richMetaDataWithSummary.containsSummaryMetadata() shouldBe true
}
}

case class TestClass(name: String)