Repository: atlas Updated Branches: refs/heads/branch-0.8 a1b6ba39c -> c3b01a6f1
http://git-wip-us.apache.org/repos/asf/atlas/blob/c3b01a6f/repository/src/test/resources/json/stocksDB-Entities/typesdef.json ---------------------------------------------------------------------- diff --git a/repository/src/test/resources/json/stocksDB-Entities/typesdef.json b/repository/src/test/resources/json/stocksDB-Entities/typesdef.json new file mode 100644 index 0000000..fcea39c --- /dev/null +++ b/repository/src/test/resources/json/stocksDB-Entities/typesdef.json @@ -0,0 +1,685 @@ +{ + "classificationDefs": [], + "entityDefs": [ + { + "attributeDefs": [ + { + "cardinality": "SINGLE", + "constraints": [ + { + "params": { + "attribute": "sd" + }, + "type": "inverseRef" + } + ], + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "table", + "typeName": "hive_table", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "location", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "inputFormat", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "outputFormat", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false, + "name": "compressed", + "typeName": "boolean", + "valuesMaxCount": 1, + "valuesMinCount": 1 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "numBuckets", + "typeName": "int", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "serdeInfo", + "typeName": "hive_serde", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "bucketCols", + "typeName": "array<string>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "sortCols", + "typeName": "array<hive_order>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "parameters", + "typeName": "map<string,string>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "storedAsSubDirectories", + "typeName": "boolean", + "valuesMaxCount": 1, + "valuesMinCount": 0 + } + ], + "category": "ENTITY", + "createTime": 1528222416164, + "createdBy": "atlas", + "description": "hive_storagedesc", + "guid": "25d90af0-6d83-482b-9e0e-f6d87b6ade18", + "name": "hive_storagedesc", + "subTypes": [], + "superTypes": [ + "Referenceable" + ], + "typeVersion": "1.0", + "updateTime": 1528222416164, + "updatedBy": "atlas", + "version": 1 + }, + { + "attributeDefs": [ + { + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": false, + "isUnique": false, + "name": "name", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 1 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "description", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false, + "name": "owner", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + } + ], + "category": "ENTITY", + "createTime": 1528222408418, + "createdBy": "atlas", + "description": "Asset", + "guid": "bdc1e6ea-91f8-4ba3-bd7e-f9a7deea957e", + "name": "Asset", + "subTypes": [ + "DataSet", + "Infrastructure", + "Process", + "hive_db" + ], + "superTypes": [], + "typeVersion": "1.0", + "updateTime": 1528222408418, + "updatedBy": "atlas", + "version": 1 + }, + { + "attributeDefs": [ + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false, + "name": "db", + "typeName": "hive_db", + "valuesMaxCount": 1, + "valuesMinCount": 1 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "createTime", + "typeName": "date", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "lastAccessTime", + "typeName": "date", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "comment", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "retention", + "typeName": "int", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "constraints": [ + { + "type": "ownedRef" + } + ], + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "sd", + "typeName": "hive_storagedesc", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "constraints": [ + { + "type": "ownedRef" + } + ], + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "partitionKeys", + "typeName": "array<hive_column>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "aliases", + "typeName": "array<string>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "constraints": [ + { + "type": "ownedRef" + } + ], + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "columns", + "typeName": "array<hive_column>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "parameters", + "typeName": "map<string,string>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "viewOriginalText", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "viewExpandedText", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "tableType", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false, + "name": "temporary", + "typeName": "boolean", + "valuesMaxCount": 1, + "valuesMinCount": 0 + } + ], + "category": "ENTITY", + "createTime": 1528222416110, + "createdBy": "atlas", + "description": "hive_table", + "guid": "bc8441a9-1127-4f8f-b09e-d7b295c4895e", + "name": "hive_table", + "options": { + "schemaElementsAttribute": "columns" + }, + "subTypes": [], + "superTypes": [ + "DataSet" + ], + "typeVersion": "1.1", + "updateTime": 1528222420642, + "updatedBy": "atlas", + "version": 2 + }, + { + "attributeDefs": [ + { + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": false, + "isUnique": false, + "name": "type", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 1 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "comment", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "position", + "typeName": "int", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "table", + "typeName": "hive_table", + "valuesMaxCount": 1, + "valuesMinCount": 0 + } + ], + "category": "ENTITY", + "createTime": 1528222416225, + "createdBy": "atlas", + "description": "hive_column", + "guid": "45e871ae-6ef9-4e1c-9b5d-2a66a0ce9fa6", + "name": "hive_column", + "options": { + "schemaAttributes": "[\"name\", \"description\", \"owner\", \"type\", \"comment\", \"position\"]" + }, + "subTypes": [], + "superTypes": [ + "DataSet" + ], + "typeVersion": "1.3", + "updateTime": 1528222420879, + "updatedBy": "atlas", + "version": 4 + }, + { + "attributeDefs": [ + { + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": false, + "isUnique": false, + "name": "clusterName", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 1 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "location", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "parameters", + "typeName": "map<string,string>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "ownerType", + "typeName": "hive_principal_type", + "valuesMaxCount": 1, + "valuesMinCount": 0 + } + ], + "category": "ENTITY", + "createTime": 1528222416207, + "createdBy": "atlas", + "description": "hive_db", + "guid": "0d3278e5-3e42-46b4-bf85-8c3f40cb3225", + "name": "hive_db", + "subTypes": [], + "superTypes": [ + "Referenceable", + "Asset" + ], + "typeVersion": "1.0", + "updateTime": 1528222416207, + "updatedBy": "atlas", + "version": 1 + }, + { + "name": "hive_process", + "superTypes": [ + "Process" + ], + "typeVersion": "1.0", + "attributeDefs": [ + { + "name": "startTime", + "typeName": "date", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false + }, + { + "name": "endTime", + "typeName": "date", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false + }, + { + "name": "userName", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": false, + "isUnique": false + }, + { + "name": "operationType", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": false, + "isUnique": false + }, + { + "name": "queryText", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false + }, + { + "name": "queryPlan", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false + }, + { + "name": "queryId", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false + }, + { + "name": "recentQueries", + "typeName": "array<string>", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false + }, + { + "name": "clusterName", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false + }, + { + "name": "queryGraph", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false + } + ] + } + ], + "enumDefs": [ + { + "category": "ENUM", + "createTime": 1528222414371, + "createdBy": "atlas", + "description": "hive_principal_type", + "elementDefs": [ + { + "ordinal": 1, + "value": "USER" + }, + { + "ordinal": 2, + "value": "ROLE" + }, + { + "ordinal": 3, + "value": "GROUP" + } + ], + "guid": "6ad79f3a-c5b6-448b-95a6-86ddd28f32a3", + "name": "hive_principal_type", + "typeVersion": "1.0", + "updateTime": 1528222414371, + "updatedBy": "atlas", + "version": 1 + } + ], + "structDefs": [ + { + "attributeDefs": [ + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "name", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "serializationLib", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 0 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false, + "name": "parameters", + "typeName": "map<string,string>", + "valuesMaxCount": 1, + "valuesMinCount": 0 + } + ], + "category": "STRUCT", + "createTime": 1528222415093, + "createdBy": "atlas", + "description": "hive_serde", + "guid": "c8db213b-e08d-4e1e-a373-3567f229ea89", + "name": "hive_serde", + "typeVersion": "1.0", + "updateTime": 1528222415093, + "updatedBy": "atlas", + "version": 1 + }, + { + "attributeDefs": [ + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false, + "name": "order", + "typeName": "int", + "valuesMaxCount": 1, + "valuesMinCount": 1 + }, + { + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": false, + "isUnique": false, + "name": "col", + "typeName": "string", + "valuesMaxCount": 1, + "valuesMinCount": 1 + } + ], + "category": "STRUCT", + "createTime": 1528222415076, + "createdBy": "atlas", + "description": "hive_order", + "guid": "d65c1a58-1170-4e5c-a8ce-aee0ec920690", + "name": "hive_order", + "typeVersion": "1.0", + "updateTime": 1528222415076, + "updatedBy": "atlas", + "version": 1 + } + ] +} http://git-wip-us.apache.org/repos/asf/atlas/blob/c3b01a6f/server-api/src/main/java/org/apache/atlas/RequestContextV1.java ---------------------------------------------------------------------- diff --git a/server-api/src/main/java/org/apache/atlas/RequestContextV1.java b/server-api/src/main/java/org/apache/atlas/RequestContextV1.java index 2123166..8506d18 100644 --- a/server-api/src/main/java/org/apache/atlas/RequestContextV1.java +++ b/server-api/src/main/java/org/apache/atlas/RequestContextV1.java @@ -38,10 +38,10 @@ public class RequestContextV1 { private final Map<String, AtlasEntity> entityCacheV2 = new HashMap<>(); private final Metrics metrics = new Metrics(); private final long requestTime = System.currentTimeMillis(); + private boolean shouldUpdateModificationTimestamp = true; private String user; - private RequestContextV1() { } http://git-wip-us.apache.org/repos/asf/atlas/blob/c3b01a6f/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java index e9477ff..d4e7262 100755 --- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java +++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java @@ -35,7 +35,7 @@ import org.apache.atlas.model.impexp.AtlasExportResult; import org.apache.atlas.model.impexp.AtlasImportRequest; import org.apache.atlas.model.impexp.AtlasImportResult; import org.apache.atlas.model.metrics.AtlasMetrics; -import org.apache.atlas.repository.clusterinfo.ClusterService; +import org.apache.atlas.repository.impexp.ClusterService; import org.apache.atlas.repository.impexp.ExportImportAuditService; import org.apache.atlas.repository.impexp.ExportService; import org.apache.atlas.repository.impexp.ImportService;
