You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ni...@apache.org on 2021/06/04 09:34:07 UTC
[atlas] branch branch-2.0 updated (0f20630 -> a873395)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 0f20630 ATLAS-4318 : Remove useless pass statement in python client (#133)
new 3fcbf0e ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName
new a873395 ATLAS-3812: Apache Flink model for Atlas.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
addons/models/1000-Hadoop/1110-flink_model.json | 106 ++++++++++++++++
.../java/org/apache/atlas/AtlasConfiguration.java | 1 +
.../repository/patches/AtlasPatchManager.java | 1 +
.../atlas/repository/patches/ProcessNamePatch.java | 136 +++++++++++++++++++++
4 files changed, 244 insertions(+)
create mode 100644 addons/models/1000-Hadoop/1110-flink_model.json
create mode 100644 repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
[atlas] 02/02: ATLAS-3812: Apache Flink model for Atlas.
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit a873395618e0c561c4ba9d4369b4f1ad8d05f2e9
Author: Josh Yeh <jj...@cloudera.com>
AuthorDate: Thu Jun 3 21:41:34 2021 -0700
ATLAS-3812: Apache Flink model for Atlas.
Signed-off-by: nixonrodrigues <ni...@apache.org>
(cherry picked from commit 005d8674e09338504278440658af3159c8e5a967)
---
addons/models/1000-Hadoop/1110-flink_model.json | 106 ++++++++++++++++++++++++
1 file changed, 106 insertions(+)
diff --git a/addons/models/1000-Hadoop/1110-flink_model.json b/addons/models/1000-Hadoop/1110-flink_model.json
new file mode 100644
index 0000000..029600f
--- /dev/null
+++ b/addons/models/1000-Hadoop/1110-flink_model.json
@@ -0,0 +1,106 @@
+{
+ "entityDefs": [
+ {
+ "name": "flink_application",
+ "superTypes": [
+ "Process"
+ ],
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "attributeDefs": [
+ {
+ "name": "id",
+ "typeName": "string",
+ "cardinality": "SINGLE",
+ "isIndexable": true,
+ "isOptional": false,
+ "isUnique": true
+ },
+ {
+ "name": "startTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+ },
+ {
+ "name": "endTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+ },
+ {
+ "name": "conf",
+ "typeName": "map<string,string>",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+ }
+ ]
+ },
+ {
+ "name": "flink_process",
+ "superTypes": [
+ "Process"
+ ],
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "attributeDefs": [
+ {
+ "name": "id",
+ "typeName": "string",
+ "cardinality": "SINGLE",
+ "isIndexable": true,
+ "isOptional": false,
+ "isUnique": true
+ },
+ {
+ "name": "startTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+ },
+ {
+ "name": "endTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+ },
+ {
+ "name": "conf",
+ "typeName": "map<string,string>",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+ }
+ ]
+ },
+ {
+ "name": "flink_application_processes",
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "relationshipCategory": "AGGREGATION",
+ "endDef1": {
+ "type": "flink_application",
+ "name": "processes",
+ "cardinality": "SET",
+ "isContainer": true
+ },
+ "endDef2": {
+ "type": "flink_process",
+ "name": "application",
+ "cardinality": "SINGLE"
+ },
+ "propagateTags": "NONE"
+ }
+ ]
+}'
\ No newline at end of file
[atlas] 01/02: ATLAS-4302: Migrated Data: Process Entity Name not
set to QualifiedName
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 3fcbf0e8531ce9b01071c2e0582a4c290c7dd81c
Author: Ashutosh Mestry <am...@cloudera.com>
AuthorDate: Thu Jun 3 21:44:14 2021 -0700
ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName
Signed-off-by: nixonrodrigues <ni...@apache.org>
(cherry picked from commit ef43a55fccf60bafd1ce1a5c0f2565d6da0e0620)
---
.../java/org/apache/atlas/AtlasConfiguration.java | 1 +
.../repository/patches/AtlasPatchManager.java | 1 +
.../atlas/repository/patches/ProcessNamePatch.java | 136 +++++++++++++++++++++
3 files changed, 138 insertions(+)
diff --git a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
index e31afa8..9ef8487 100644
--- a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
+++ b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
@@ -75,6 +75,7 @@ public enum AtlasConfiguration {
HTTP_HEADER_SERVER_VALUE("atlas.http.header.server.value","Apache Atlas"),
STORAGE_CONSISTENCY_LOCK_ENABLED("atlas.graph.storage.consistency-lock.enabled", true),
REBUILD_INDEX("atlas.rebuild.index", false),
+ PROCESS_NAME_UPDATE_PATCH("atlas.process.name.update.patch", false),
STORE_DIFFERENTIAL_AUDITS("atlas.entity.audit.differential", false),
DSL_EXECUTOR_TRAVERSAL("atlas.dsl.executor.traversal", true),
DEBUG_METRICS_ENABLED("atlas.debug.metrics.enabled", false),
diff --git a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
index fae28c4..e2a38ab 100644
--- a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
+++ b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
@@ -59,6 +59,7 @@ public class AtlasPatchManager {
handlers.add(new SuggestionsRequestHandlerPatch(context));
handlers.add(new IndexConsistencyPatch(context));
handlers.add(new ReIndexPatch(context));
+ handlers.add(new ProcessNamePatch(context));
LOG.info("<== AtlasPatchManager.init()");
}
diff --git a/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java b/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
new file mode 100644
index 0000000..2efb747
--- /dev/null
+++ b/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.atlas.repository.patches;
+
+import org.apache.atlas.AtlasConfiguration;
+import org.apache.atlas.exception.AtlasBaseException;
+import org.apache.atlas.model.instance.AtlasEntity;
+import org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef;
+import org.apache.atlas.pc.WorkItemManager;
+import org.apache.atlas.repository.Constants;
+import org.apache.atlas.repository.IndexException;
+import org.apache.atlas.repository.graph.GraphBackedSearchIndexer.UniqueKind;
+import org.apache.atlas.repository.graphdb.AtlasCardinality;
+import org.apache.atlas.repository.graphdb.AtlasGraph;
+import org.apache.atlas.repository.graphdb.AtlasGraphManagement;
+import org.apache.atlas.repository.graphdb.AtlasSchemaViolationException;
+import org.apache.atlas.repository.graphdb.AtlasVertex;
+import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
+import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
+import org.apache.atlas.type.AtlasEntityType;
+import org.apache.atlas.type.AtlasStructType.AtlasAttribute;
+import org.apache.atlas.type.AtlasTypeRegistry;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import static org.apache.atlas.model.patches.AtlasPatch.PatchStatus.APPLIED;
+import static org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2.getIdFromVertex;
+
+public class ProcessNamePatch extends AtlasPatchHandler {
+ private static final Logger LOG = LoggerFactory.getLogger(ProcessNamePatch.class);
+
+ private static final String PATCH_ID = "JAVA_PATCH_0000_007";
+ private static final String PATCH_DESCRIPTION = "Set name to qualifiedName.";
+
+ private final PatchContext context;
+
+ public ProcessNamePatch(PatchContext context) {
+ super(context.getPatchRegistry(), PATCH_ID, PATCH_DESCRIPTION);
+
+ this.context = context;
+ }
+
+ @Override
+ public void apply() throws AtlasBaseException {
+ if (AtlasConfiguration.PROCESS_NAME_UPDATE_PATCH.getBoolean() == false) {
+ LOG.info("ProcessNamePatch: Skipped, since not enabled!");
+ return;
+ }
+
+ ConcurrentPatchProcessor patchProcessor = new ProcessNamePatchProcessor(context);
+
+ patchProcessor.apply();
+
+ setStatus(APPLIED);
+
+ LOG.info("ProcessNamePatch.apply(): patchId={}, status={}", getPatchId(), getStatus());
+ }
+
+ public static class ProcessNamePatchProcessor extends ConcurrentPatchProcessor {
+ private static final String TYPE_NAME_HIVE_PROCESS = "hive_process";
+ private static final String TYPE_NAME_HIVE_COLUMN_LINEAGE = "hive_column_lineage";
+
+ private static final String ATTR_NAME_QUALIFIED_NAME = "qualifiedName";
+ private static final String ATTR_NAME_NAME = "name";
+
+ private static final String[] processTypes = {TYPE_NAME_HIVE_PROCESS, TYPE_NAME_HIVE_COLUMN_LINEAGE};
+
+
+ public ProcessNamePatchProcessor(PatchContext context) {
+ super(context);
+ }
+
+ @Override
+ protected void prepareForExecution() {
+ }
+
+ @Override
+ public void submitVerticesToUpdate(WorkItemManager manager) {
+ AtlasGraph graph = getGraph();
+
+ for (String typeName : processTypes) {
+ LOG.info("finding entities of type {}", typeName);
+
+ Iterable<Object> iterable = graph.query().has(Constants.ENTITY_TYPE_PROPERTY_KEY, typeName).vertexIds();
+ int count = 0;
+
+ for (Iterator<Object> iter = iterable.iterator(); iter.hasNext(); ) {
+ Object vertexId = iter.next();
+
+ manager.checkProduce(vertexId);
+
+ count++;
+ }
+
+ LOG.info("found {} entities of type {}", count, typeName);
+ }
+ }
+
+ @Override
+ protected void processVertexItem(Long vertexId, AtlasVertex vertex, String typeName, AtlasEntityType entityType) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("processItem(typeName={}, vertexId={})", typeName, vertexId);
+ }
+
+ try {
+ String qualifiedName = AtlasGraphUtilsV2.getProperty(vertex, entityType.getVertexPropertyName(ATTR_NAME_QUALIFIED_NAME), String.class);
+ AtlasGraphUtilsV2.setEncodedProperty(vertex, entityType.getVertexPropertyName(ATTR_NAME_NAME), qualifiedName);
+ } catch (AtlasBaseException e) {
+ LOG.error("Error updating: {}", vertexId);
+ }
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("processItem(typeName={}, vertexId={}): Done!", typeName, vertexId);
+ }
+ }
+ }
+}