This is an automated email from the ASF dual-hosted git repository.
sarath pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new f75d7f4 ATLAS-3202: Hive hook: getStorageDescEntity() throws NPE if
bucketCols is null
f75d7f4 is described below
commit f75d7f409f3323e799bb33e6ae1da89526fc475c
Author: Sarath Subramanian <[email protected]>
AuthorDate: Sat May 11 16:21:38 2019 -0700
ATLAS-3202: Hive hook: getStorageDescEntity() throws NPE if bucketCols is
null
---
.../atlas/hive/hook/events/BaseHiveEvent.java | 54 +++++++++++-----------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java
index 593c413..7b4b893 100644
---
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java
+++
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java
@@ -475,7 +475,7 @@ public abstract class BaseHiveEvent {
ret.setAttribute(ATTRIBUTE_NUM_BUCKETS, sd.getNumBuckets());
ret.setAttribute(ATTRIBUTE_STORED_AS_SUB_DIRECTORIES,
sd.isStoredAsSubDirectories());
- if (sd.getBucketCols().size() > 0) {
+ if (sd.getBucketCols() != null && sd.getBucketCols().size() > 0) {
ret.setAttribute(ATTRIBUTE_BUCKET_COLS, sd.getBucketCols());
}
@@ -512,36 +512,38 @@ public abstract class BaseHiveEvent {
}
protected List<AtlasEntity> getColumnEntities(AtlasObjectId tableId, Table
table, List<FieldSchema> fieldSchemas) {
- List<AtlasEntity> ret = new ArrayList<>();
- boolean isKnownTable = tableId.getGuid() == null;
-
- int columnPosition = 0;
- for (FieldSchema fieldSchema : fieldSchemas) {
- String colQualifiedName = getQualifiedName(table,
fieldSchema);
- AtlasEntity column = context.getEntity(colQualifiedName);
+ List<AtlasEntity> ret = new ArrayList<>();
+ boolean isKnownTable = tableId.getGuid() == null;
+ int columnPosition = 0;
+
+ if (CollectionUtils.isNotEmpty(fieldSchemas)) {
+ for (FieldSchema fieldSchema : fieldSchemas) {
+ String colQualifiedName = getQualifiedName(table,
fieldSchema);
+ AtlasEntity column =
context.getEntity(colQualifiedName);
+
+ if (column == null) {
+ column = new AtlasEntity(HIVE_TYPE_COLUMN);
+
+ // if column's table was sent in an earlier notification,
set 'guid' to null - which will:
+ // - result in this entity to be not included in
'referredEntities'
+ // - cause Atlas server to resolve the entity by its
qualifiedName
+ if (isKnownTable) {
+ column.setGuid(null);
+ }
- if (column == null) {
- column = new AtlasEntity(HIVE_TYPE_COLUMN);
+ column.setAttribute(ATTRIBUTE_TABLE, tableId);
+ column.setAttribute(ATTRIBUTE_QUALIFIED_NAME,
colQualifiedName);
+ column.setAttribute(ATTRIBUTE_NAME, fieldSchema.getName());
+ column.setAttribute(ATTRIBUTE_OWNER, table.getOwner());
+ column.setAttribute(ATTRIBUTE_COL_TYPE,
fieldSchema.getType());
+ column.setAttribute(ATTRIBUTE_COL_POSITION,
columnPosition++);
+ column.setAttribute(ATTRIBUTE_COMMENT,
fieldSchema.getComment());
- // if column's table was sent in an earlier notification, set
'guid' to null - which will:
- // - result in this entity to be not included in
'referredEntities'
- // - cause Atlas server to resolve the entity by its
qualifiedName
- if (isKnownTable) {
- column.setGuid(null);
+ context.putEntity(colQualifiedName, column);
}
- column.setAttribute(ATTRIBUTE_TABLE, tableId);
- column.setAttribute(ATTRIBUTE_QUALIFIED_NAME,
colQualifiedName);
- column.setAttribute(ATTRIBUTE_NAME, fieldSchema.getName());
- column.setAttribute(ATTRIBUTE_OWNER, table.getOwner());
- column.setAttribute(ATTRIBUTE_COL_TYPE, fieldSchema.getType());
- column.setAttribute(ATTRIBUTE_COL_POSITION, columnPosition++);
- column.setAttribute(ATTRIBUTE_COMMENT,
fieldSchema.getComment());
-
- context.putEntity(colQualifiedName, column);
+ ret.add(column);
}
-
- ret.add(column);
}
return ret;