Skip to content

A
atlas
Commit 4f9cba4b by Suma Shivaprasad
Options

ATLAS-754 InstanceSerialization does not serialize Reference in the values array…

ATLAS-754 InstanceSerialization does not serialize Reference in the values array of Reference. (harishjp via sumasai)
parent 856ee6b5
Showing with 41 additions and 39 deletions
release-log.txt
...@@ -20,6 +20,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ...@@ -20,6 +20,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES: ALL CHANGES:
ATLAS-754 InstanceSerialization does not serialize Reference in the values array of Reference.(harishjp via sumasai)
ATLAS-626 Hive temporary table metadata is captured in atlas (sumasai) ATLAS-626 Hive temporary table metadata is captured in atlas (sumasai)
ATLAS-747 Hive CTAS entity registration fails because userName is null (shwethags) ATLAS-747 Hive CTAS entity registration fails because userName is null (shwethags)
ATLAS-759 HiveHookIT.testAlterTableChangeColumn is consistently failing on master (yhemanth) ATLAS-759 HiveHookIT.testAlterTableChangeColumn is consistently failing on master (yhemanth)
......
typesystem/src/main/scala/org/apache/atlas/typesystem/json/InstanceSerialization.scala
...@@ -104,7 +104,7 @@ object InstanceSerialization { ...@@ -104,7 +104,7 @@ object InstanceSerialization {
refClass <- idClass refClass <- idClass
typNm <- typeName typNm <- typeName
i <- id i <- id
s <- Some (state) s <- Some(state)
v <- version v <- version
} yield _Id(i, v, typNm, s) } yield _Id(i, v, typNm, s)
} }
...@@ -219,7 +219,6 @@ object InstanceSerialization { ...@@ -219,7 +219,6 @@ object InstanceSerialization {
* A Map is an Reference if: * A Map is an Reference if:
* - it has the correct [[format.typeHintFieldName]] * - it has the correct [[format.typeHintFieldName]]
* - it has a 'typeName' * - it has a 'typeName'
* - it has an _Id
* - it has a 'values' attribute * - it has a 'values' attribute
* - it has 'traitNames' attribute * - it has 'traitNames' attribute
* - it has 'traits' attribute * - it has 'traits' attribute
...@@ -229,11 +228,11 @@ object InstanceSerialization { ...@@ -229,11 +228,11 @@ object InstanceSerialization {
for { for {
refClass <- referenceClass refClass <- referenceClass
typNm <- typeName typNm <- typeName
i <- idObject i <- Some(idObject)
values <- valuesMap values <- valuesMap
traitNms <- traitNames traitNms <- traitNames
ts <- traits ts <- traits
} yield _Reference(Some(i), typNm, values, traitNms.toList, ts) } yield _Reference(i, typNm, values, traitNms.toList, ts)
} }
/** /**
......
typesystem/src/test/scala/org/apache/atlas/typesystem/json/InstanceSerializationTest.scala
...@@ -53,31 +53,35 @@ class InstanceSerializationTest { ...@@ -53,31 +53,35 @@ class InstanceSerializationTest {
} }
@Test def testReferenceArrayWithNoState { @Test def testReferenceArrayWithNoState {
val staticJson = s"""{
val staticJson = """{ "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Reference",
"jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$_Reference",
"id": { "id": {
"jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$_Id", "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Id",
"version": 0, "version": 0,
"typeName": "LoadProcess" "typeName": "LoadProcess"
}, },
"typeName": "LoadProcess", "typeName": "LoadProcess",
"values": { "values": {
"inputTables": [{ "inputTables": [{
"jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$_Id", "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Id",
"id": "bacfa996-e88e-4d7e-9630-68c9829b10b4", "id": "bacfa996-e88e-4d7e-9630-68c9829b10b4",
"version": 0, "version": 0,
"typeName": "Table" "typeName": "Table"
}, { }, {
"jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$_Id", "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Id",
"id": "6da06805-3f56-446f-8831-672a65ac2199", "id": "6da06805-3f56-446f-8831-672a65ac2199",
"version": 0, "version": 0,
"typeName": "Table" "typeName": "Table"
}, {
"jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Reference",
"typeName": "$typeName",
"values": {}
"traitNames": []
"traits": {}
} }
], ],
"outputTable": { "outputTable": {
"jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$_Id", "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Id",
"id": "d5c3d6d0-aa10-44c1-b05d-ed9400d2a5ac", "id": "d5c3d6d0-aa10-44c1-b05d-ed9400d2a5ac",
"version": 0, "version": 0,
"typeName": "Table" "typeName": "Table"
...@@ -89,10 +93,9 @@ class InstanceSerializationTest { ...@@ -89,10 +93,9 @@ class InstanceSerializationTest {
], ],
"traits": { "traits": {
"ETL": { "ETL": {
"jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$_Struct", "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Struct",
"typeName": "ETL", "typeName": "ETL",
"values": { "values": {
} }
} }
} }
...@@ -103,29 +106,29 @@ class InstanceSerializationTest { ...@@ -103,29 +106,29 @@ class InstanceSerializationTest {
val outputTable = entity.getValuesMap.get("outputTable") val outputTable = entity.getValuesMap.get("outputTable")
val inputTables : java.util.List[_] = entity.getValuesMap().get("inputTables").asInstanceOf[java.util.List[_]] val inputTables : java.util.List[_] = entity.getValuesMap().get("inputTables").asInstanceOf[java.util.List[_]]
assertTrue(entity.getId.isInstanceOf[Id]);
assertTrue(outputTable.isInstanceOf[Id]); assertTrue(outputTable.isInstanceOf[Id]);
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
for(inputTable <- inputTables) { assertTrue(inputTables(0).isInstanceOf[Id]);
assertTrue(inputTable.isInstanceOf[Id]); assertTrue(inputTables(1).isInstanceOf[Id]);
} assertTrue(inputTables(2).isInstanceOf[Referenceable]);
} }
@Test def testMissingStateInId: Unit = { @Test def testMissingStateInId: Unit = {
val entity: Referenceable = new Referenceable(typeName) val entity: Referenceable = new Referenceable(typeName)
val json: String = InstanceSerialization.toJson(entity, true) val staticJson: String = s"""{
val staticJson: String = "{\n" + "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Reference",
" \"jsonClass\":\"org.apache.atlas.typesystem.json.InstanceSerialization$_Reference\",\n" + "id": {
" \"id\":{\n" + "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Id",
" \"jsonClass\":\"org.apache.atlas.typesystem.json.InstanceSerialization$_Id\",\n" + "id": "${entity.getId.id}",
" \"id\":\"" + entity.getId.id + "\",\n" + "version":0,
" \"version\":0,\n" + "typeName": "${entity.getTypeName}",
" \"typeName\":\"" + entity.getTypeName + "\",\n" + },
" },\n" + "typeName": "${entity.getTypeName}",
" \"typeName\":\"" + entity.getTypeName + "\",\n" + "values": {}
" \"values\":{}\n" + "traitNames": []
" \"traitNames\":[]\n" + "traits": {}
" \"traits\":{}\n" + }"""
"}"
val entity2: Referenceable = InstanceSerialization.fromJsonReferenceable(staticJson, true) val entity2: Referenceable = InstanceSerialization.fromJsonReferenceable(staticJson, true)
assertNotNull(entity2) assertNotNull(entity2)
assertNotNull(entity2.getId) assertNotNull(entity2.getId)
...@@ -140,14 +143,13 @@ class InstanceSerializationTest { ...@@ -140,14 +143,13 @@ class InstanceSerializationTest {
@Test def testMissingId: Unit = { @Test def testMissingId: Unit = {
val entity: Referenceable = new Referenceable(typeName) val entity: Referenceable = new Referenceable(typeName)
val json: String = InstanceSerialization.toJson(entity, true) val staticJson: String = s"""{
val staticJson: String = "{\n" + "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$$_Reference",
" \"jsonClass\":\"org.apache.atlas.typesystem.json.InstanceSerialization$_Reference\",\n" + "typeName": "${entity.getTypeName}",
" \"typeName\":\"" + entity.getTypeName + "\",\n" + "values": {}
" \"values\":{}\n" + "traitNames": []
" \"traitNames\":[],\n" + "traits": {}
" \"traits\":{}\n" + }"""
"}"
val entity2: Referenceable = InstanceSerialization.fromJsonReferenceable(staticJson, true) val entity2: Referenceable = InstanceSerialization.fromJsonReferenceable(staticJson, true)
assertNotNull(entity2) assertNotNull(entity2)
assertNotNull(entity2.getId) assertNotNull(entity2.getId)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment