Repository: atlas Updated Branches: refs/heads/master 3b75d56d9 -> fccfe919d
ATLAS-2680: import-hbase fails to match namespaces for the given regex Signed-off-by: Madhan Neethiraj <mad...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/fccfe919 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/fccfe919 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/fccfe919 Branch: refs/heads/master Commit: fccfe919d49ca39d111ade8bb2f2688db5e854e7 Parents: 3b75d56 Author: rmani <rm...@hortonworks.com> Authored: Mon May 14 17:48:57 2018 -0700 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Mon May 14 18:02:18 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/fccfe919/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java ---------------------------------------------------------------------- diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java index af67e78..8372f02 100644 --- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java +++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java @@ -56,6 +56,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; import java.util.regex.Pattern; public class HBaseBridge { @@ -324,11 +325,13 @@ public class HBaseBridge { private List<NamespaceDescriptor> getMatchingNameSpaces(String nameSpace) throws Exception { List<NamespaceDescriptor> ret = new ArrayList<>(); NamespaceDescriptor[] namespaceDescriptors = hbaseAdmin.listNamespaceDescriptors(); + Pattern pattern = Pattern.compile(nameSpace); for (NamespaceDescriptor namespaceDescriptor:namespaceDescriptors){ - String nmSpace = namespaceDescriptor.getName(); + String nmSpace = namespaceDescriptor.getName(); + Matcher matcher = pattern.matcher(nmSpace); - if (nmSpace.matches(nameSpace)){ + if (matcher.find()){ ret.add(namespaceDescriptor); } }