You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2018/05/24 00:10:42 UTC
atlas git commit: ATLAS-2714: model updates - added relationship-def
_AtlasUserProfile_savedsearches,
updated few relationships to align end1/end2 with edge-direction,
fixed cardinality of array attributes from SINGLE to LIST/SET
Repository: atlas
Updated Branches:
refs/heads/master 2bb7f7784 -> 1616b3f9e
ATLAS-2714: model updates - added relationship-def _AtlasUserProfile_savedsearches, updated few relationships to align end1/end2 with edge-direction, fixed cardinality of array attributes from SINGLE to LIST/SET
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/1616b3f9
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/1616b3f9
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/1616b3f9
Branch: refs/heads/master
Commit: 1616b3f9ea5f22968cf195b3327a59be8d26db64
Parents: 2bb7f77
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Wed May 23 12:36:06 2018 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Wed May 23 13:27:17 2018 -0700
----------------------------------------------------------------------
addons/models/0000-Area0/0010-base_model.json | 39 +++++++++++++++-----
addons/models/1000-Hadoop/1030-hive_model.json | 26 ++++++-------
addons/models/1000-Hadoop/1060-hbase_model.json | 18 ++++-----
.../migration/ComplexAttributesTest.java | 2 +-
.../migration/HiveParititionTest.java | 6 +--
.../repository/migration/HiveStocksTest.java | 4 +-
.../atlas/repository/migration/PathTest.java | 2 +-
7 files changed, 58 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/1616b3f9/addons/models/0000-Area0/0010-base_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0000-Area0/0010-base_model.json b/addons/models/0000-Area0/0010-base_model.json
index fe80019..fe1eb65 100644
--- a/addons/models/0000-Area0/0010-base_model.json
+++ b/addons/models/0000-Area0/0010-base_model.json
@@ -84,7 +84,7 @@
{
"name": "inputs",
"typeName": "array<DataSet>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"isIndexable": false,
"isOptional": true,
"isUnique": false
@@ -92,7 +92,7 @@
{
"name": "outputs",
"typeName": "array<DataSet>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"isIndexable": false,
"isOptional": true,
"isUnique": false
@@ -125,7 +125,7 @@
{
"name": "savedSearches",
"typeName": "array<__AtlasUserSavedSearch>",
- "cardinality": "LIST",
+ "cardinality": "SET",
"isIndexable": false,
"isOptional": true,
"isUnique": false,
@@ -201,19 +201,19 @@
"typeVersion": "1.0",
"relationshipCategory": "AGGREGATION",
"endDef1": {
- "type": "DataSet",
- "name": "inputToProcesses",
- "isContainer": false,
- "cardinality": "SET"
- },
- "endDef2": {
"type": "Process",
"name": "inputs",
"isContainer": true,
"cardinality": "SET",
"isLegacyAttribute": true
},
- "propagateTags": "ONE_TO_TWO"
+ "endDef2": {
+ "type": "DataSet",
+ "name": "inputToProcesses",
+ "isContainer": false,
+ "cardinality": "SET"
+ },
+ "propagateTags": "TWO_TO_ONE"
},
{
"name": "process_dataset_outputs",
@@ -233,6 +233,25 @@
"cardinality": "SET"
},
"propagateTags": "ONE_TO_TWO"
+ },
+ {
+ "name": "__AtlasUserProfile_savedsearches",
+ "typeVersion": "1.0",
+ "relationshipCategory": "COMPOSITION",
+ "endDef1": {
+ "type": "__AtlasUserProfile",
+ "name": "savedSearches",
+ "isContainer": true,
+ "cardinality": "SET",
+ "isLegacyAttribute": true
+ },
+ "endDef2": {
+ "type": "__AtlasUserSavedSearch",
+ "name": "userProfile",
+ "isContainer": false,
+ "cardinality": "SINGLE"
+ },
+ "propagateTags": "NONE"
}
]
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/1616b3f9/addons/models/1000-Hadoop/1030-hive_model.json
----------------------------------------------------------------------
diff --git a/addons/models/1000-Hadoop/1030-hive_model.json b/addons/models/1000-Hadoop/1030-hive_model.json
index 552dfe4..346009d 100644
--- a/addons/models/1000-Hadoop/1030-hive_model.json
+++ b/addons/models/1000-Hadoop/1030-hive_model.json
@@ -141,7 +141,7 @@
{
"name": "recentQueries",
"typeName": "array<string>",
- "cardinality": "SINGLE",
+ "cardinality": "LIST",
"isIndexable": false,
"isOptional": true,
"isUnique": false
@@ -228,7 +228,7 @@
{
"name": "partitionKeys",
"typeName": "array<hive_column>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"constraints": [
{
"type": "ownedRef"
@@ -241,7 +241,7 @@
{
"name": "aliases",
"typeName": "array<string>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"isIndexable": false,
"isOptional": true,
"isUnique": false
@@ -249,7 +249,7 @@
{
"name": "columns",
"typeName": "array<hive_column>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"constraints": [
{
"type": "ownedRef"
@@ -375,7 +375,7 @@
{
"name": "bucketCols",
"typeName": "array<string>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"isIndexable": false,
"isOptional": true,
"isUnique": false
@@ -383,7 +383,7 @@
{
"name": "sortCols",
"typeName": "array<hive_order>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"isIndexable": false,
"isOptional": true,
"isUnique": false
@@ -525,22 +525,22 @@
],
"relationshipDefs": [
{
- "name": "hive_db_tables",
+ "name": "hive_table_db",
"typeVersion": "1.0",
"relationshipCategory": "COMPOSITION",
"endDef1": {
- "type": "hive_db",
- "name": "tables",
- "isContainer": true,
- "cardinality": "SET"
- },
- "endDef2": {
"type": "hive_table",
"name": "db",
"isContainer": false,
"cardinality": "SINGLE",
"isLegacyAttribute": true
},
+ "endDef2": {
+ "type": "hive_db",
+ "name": "tables",
+ "isContainer": true,
+ "cardinality": "SET"
+ },
"propagateTags": "NONE"
},
{
http://git-wip-us.apache.org/repos/asf/atlas/blob/1616b3f9/addons/models/1000-Hadoop/1060-hbase_model.json
----------------------------------------------------------------------
diff --git a/addons/models/1000-Hadoop/1060-hbase_model.json b/addons/models/1000-Hadoop/1060-hbase_model.json
index 392412a..0d56739 100644
--- a/addons/models/1000-Hadoop/1060-hbase_model.json
+++ b/addons/models/1000-Hadoop/1060-hbase_model.json
@@ -71,7 +71,7 @@
{
"name": "column_families",
"typeName": "array<hbase_column_family>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"constraints": [
{
"type": "ownedRef"
@@ -108,7 +108,7 @@
{
"name": "columns",
"typeName": "array<hbase_column>",
- "cardinality": "SINGLE",
+ "cardinality": "SET",
"constraints": [
{
"type": "ownedRef"
@@ -149,22 +149,22 @@
],
"relationshipDefs": [
{
- "name": "hbase_namespace_tables",
+ "name": "hbase_table_namespace",
"typeVersion": "1.0",
"relationshipCategory": "COMPOSITION",
"endDef1": {
- "type": "hbase_namespace",
- "name": "tables",
- "isContainer": true,
- "cardinality": "SET"
- },
- "endDef2": {
"type": "hbase_table",
"name": "namespace",
"isContainer": false,
"cardinality": "SINGLE",
"isLegacyAttribute": true
},
+ "endDef2": {
+ "type": "hbase_namespace",
+ "name": "tables",
+ "isContainer": true,
+ "cardinality": "SET"
+ },
"propagateTags": "NONE"
},
{
http://git-wip-us.apache.org/repos/asf/atlas/blob/1616b3f9/repository/src/test/java/org/apache/atlas/repository/migration/ComplexAttributesTest.java
----------------------------------------------------------------------
diff --git a/repository/src/test/java/org/apache/atlas/repository/migration/ComplexAttributesTest.java b/repository/src/test/java/org/apache/atlas/repository/migration/ComplexAttributesTest.java
index 9451fa2..800638d 100644
--- a/repository/src/test/java/org/apache/atlas/repository/migration/ComplexAttributesTest.java
+++ b/repository/src/test/java/org/apache/atlas/repository/migration/ComplexAttributesTest.java
@@ -42,7 +42,7 @@ public class ComplexAttributesTest extends MigrationBaseAsserts {
String ENTITY_TYPE = "entity_type";
String ENTITY_WITH_COMPLEX_COLL_TYPE = "entity_with_complex_collection_attr";
- final int EXPECTED_TOTAL_COUNT = 214;
+ final int EXPECTED_TOTAL_COUNT = 215;
final int EXPECTED_ENTITY_TYPE_COUNT = 16;
final int EXPECTED_STRUCT_TYPE_COUNT = 3;
final int EXPECTED_ENTITY_WITH_COMPLEX_COLL_TYPE_COUNT = 1;
http://git-wip-us.apache.org/repos/asf/atlas/blob/1616b3f9/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
----------------------------------------------------------------------
diff --git a/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java b/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
index 7b23e59..cae7512 100644
--- a/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
+++ b/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
@@ -39,7 +39,7 @@ public class HiveParititionTest extends MigrationBaseAsserts {
@Test
public void fileImporterTest() throws IOException, AtlasBaseException {
- final int EXPECTED_TOTAL_COUNT = 141;
+ final int EXPECTED_TOTAL_COUNT = 142;
final int EXPECTED_DB_COUNT = 1;
final int EXPECTED_TABLE_COUNT = 2;
final int EXPECTED_COLUMN_COUNT = 7;
@@ -51,8 +51,8 @@ public class HiveParititionTest extends MigrationBaseAsserts {
assertTypeCountNameGuid("hive_db", 1, "parts_db", "ae30d78b-51b4-42ab-9436-8d60c8f68b95");
assertTypeCountNameGuid("hive_process", 1, "", "");
assertEdges("hive_db", "parts_db", AtlasEdgeDirection.IN,1, 1, "");
- assertEdges("hive_table", "t1", AtlasEdgeDirection.OUT, 1, 1, "hive_db_tables");
- assertEdges("hive_table", "tv1", AtlasEdgeDirection.OUT, 1, 1, "hive_db_tables");
+ assertEdges("hive_table", "t1", AtlasEdgeDirection.OUT, 1, 1, "hive_table_db");
+ assertEdges("hive_table", "tv1", AtlasEdgeDirection.OUT, 1, 1, "hive_table_db");
assertMigrationStatus(EXPECTED_TOTAL_COUNT);
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/1616b3f9/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
----------------------------------------------------------------------
diff --git a/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java b/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
index 721bb31..9f25518 100644
--- a/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
+++ b/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
@@ -37,7 +37,7 @@ public class HiveStocksTest extends MigrationBaseAsserts {
@Test
public void migrateStocks() throws AtlasBaseException, IOException {
- final int EXPECTED_TOTAL_COUNT = 188;
+ final int EXPECTED_TOTAL_COUNT = 189;
final int EXPECTED_DB_COUNT = 1;
final int EXPECTED_TABLE_COUNT = 1;
final int EXPECTED_COLUMN_COUNT = 7;
@@ -59,7 +59,7 @@ public class HiveStocksTest extends MigrationBaseAsserts {
assertTypeCountNameGuid("Tag1", 1, "", "");
assertEdges(getVertex("hive_db", "stocks").getEdges(AtlasEdgeDirection.IN).iterator(),1, 1, "");
- assertEdges(getVertex("hive_table", "stocks_daily").getEdges(AtlasEdgeDirection.OUT).iterator(), 1, 1, "hive_db_tables");
+ assertEdges(getVertex("hive_table", "stocks_daily").getEdges(AtlasEdgeDirection.OUT).iterator(), 1, 1, "hive_table_db");
assertEdges(getVertex("hive_column", "high").getEdges(AtlasEdgeDirection.OUT).iterator(), 1,1, "hive_table_columns");
assertMigrationStatus(EXPECTED_TOTAL_COUNT);
http://git-wip-us.apache.org/repos/asf/atlas/blob/1616b3f9/repository/src/test/java/org/apache/atlas/repository/migration/PathTest.java
----------------------------------------------------------------------
diff --git a/repository/src/test/java/org/apache/atlas/repository/migration/PathTest.java b/repository/src/test/java/org/apache/atlas/repository/migration/PathTest.java
index 5c8decc..468b526 100644
--- a/repository/src/test/java/org/apache/atlas/repository/migration/PathTest.java
+++ b/repository/src/test/java/org/apache/atlas/repository/migration/PathTest.java
@@ -44,7 +44,7 @@ public class PathTest extends MigrationBaseAsserts {
@Test
public void migrationImport() throws IOException, AtlasBaseException {
- final int EXPECTED_TOTAL_COUNT = 89;
+ final int EXPECTED_TOTAL_COUNT = 90;
runFileImporter("path_db");