Repository: atlas Updated Branches: refs/heads/branch-0.8 ef642b4cb -> 8e1c60658
ATLAS-2507: updated HBase hook to use : as separator between namespace and table names Signed-off-by: Madhan Neethiraj <[email protected]> (cherry picked from commit c26e9bcd7427dfb0e7b14714d394de7b4667ace2) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/8e1c6065 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/8e1c6065 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/8e1c6065 Branch: refs/heads/branch-0.8 Commit: 8e1c60658a19f3b555e7cebbcd8b4538202cbb5a Parents: ef642b4 Author: rmani <[email protected]> Authored: Mon Mar 19 18:16:42 2018 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Mar 26 14:06:43 2018 -0700 ---------------------------------------------------------------------- .../org/apache/atlas/hbase/bridge/HBaseAtlasHook.java | 10 +++++++--- .../atlas/hbase/util/ImportHBaseEntitiesBase.java | 12 +++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/8e1c6065/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java ---------------------------------------------------------------------- diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java index c79a7d3..314ff68 100644 --- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java +++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java @@ -116,6 +116,10 @@ public class HBaseAtlasHook extends AtlasHook { public static final String ATTR_CF_EVICT_BLOCK_ONCLOSE = "evictBlocksOnClose"; public static final String ATTR_CF_PREFETCH_BLOCK_ONOPEN = "prefetchBlocksOnOpen"; + public static final String HBASE_NAMESPACE_QUALIFIED_NAME = "%s@%s"; + public static final String HBASE_TABLE_QUALIFIED_NAME_FORMAT = "%s:%s@%s"; + public static final String HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT = "%s:%s.%s@%s"; + private static final String REFERENCEABLE_ATTRIBUTE_NAME = "qualifiedName"; private String clusterName = null; @@ -377,7 +381,7 @@ public class HBaseAtlasHook extends AtlasHook { if (clusterName == null || nameSpace == null || tableName == null || columnFamily == null) { return null; } else { - return String.format("%s.%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), columnFamily.toLowerCase(), clusterName); + return String.format(HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), columnFamily.toLowerCase(), clusterName); } } @@ -393,7 +397,7 @@ public class HBaseAtlasHook extends AtlasHook { if (clusterName == null || nameSpace == null || tableName == null) { return null; } else { - return String.format("%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), clusterName); + return String.format(HBASE_TABLE_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), clusterName); } } @@ -408,7 +412,7 @@ public class HBaseAtlasHook extends AtlasHook { if (clusterName == null || nameSpace == null) { return null; } else { - return String.format("%s@%s", nameSpace.toLowerCase(), clusterName); + return String.format(HBASE_NAMESPACE_QUALIFIED_NAME, nameSpace.toLowerCase(), clusterName); } } http://git-wip-us.apache.org/repos/asf/atlas/blob/8e1c6065/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java ---------------------------------------------------------------------- diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java index d11a1a0..6c195b7 100644 --- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java +++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java @@ -92,6 +92,10 @@ public class ImportHBaseEntitiesBase { public static final String ATTR_CF_EVICT_BLOCK_ONCLOSE = "evictBlocksOnClose"; public static final String ATTR_CF_PREFETCH_BLOCK_ONOPEN = "prefetchBlocksOnOpen"; + public static final String HBASE_NAMESPACE_QUALIFIED_NAME = "%s@%s"; + public static final String HBASE_TABLE_QUALIFIED_NAME_FORMAT = "%s:%s@%s"; + public static final String HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT = "%s:%s.%s@%s"; + protected final HBaseAdmin hbaseAdmin; protected final boolean failOnError; protected final String namespaceToImport; @@ -380,8 +384,7 @@ public class ImportHBaseEntitiesBase { */ private static String getColumnFamilyQualifiedName(String clusterName, String nameSpace, String tableName, String columnFamily) { tableName = stripNameSpace(tableName.toLowerCase()); - - return String.format("%s.%s.%s@%s", nameSpace.toLowerCase(), tableName, columnFamily.toLowerCase(), clusterName); + return String.format(HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), tableName, columnFamily.toLowerCase(), clusterName); } /** @@ -393,8 +396,7 @@ public class ImportHBaseEntitiesBase { */ private static String getTableQualifiedName(String clusterName, String nameSpace, String tableName) { tableName = stripNameSpace(tableName.toLowerCase()); - - return String.format("%s.%s@%s", nameSpace.toLowerCase(), tableName, clusterName); + return String.format(HBASE_TABLE_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), tableName, clusterName); } /** @@ -404,7 +406,7 @@ public class ImportHBaseEntitiesBase { * @return Unique qualified name to identify the HBase NameSpace instance in Atlas. */ private static String getNameSpaceQualifiedName(String clusterName, String nameSpace) { - return String.format("%s@%s", nameSpace.toLowerCase(), clusterName); + return String.format(HBASE_NAMESPACE_QUALIFIED_NAME, nameSpace.toLowerCase(), clusterName); } private static String stripNameSpace(String tableName){
