Repository: atlas Updated Branches: refs/heads/branch-0.8 373744ced -> 84fddc1e5
ATLAS-2680: import-hbase fails to match namespaces for the given regex Signed-off-by: Madhan Neethiraj <[email protected]> (cherry picked from commit fccfe919d49ca39d111ade8bb2f2688db5e854e7) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/84fddc1e Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/84fddc1e Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/84fddc1e Branch: refs/heads/branch-0.8 Commit: 84fddc1e5caea5a847061666b9655a69f61bb910 Parents: 373744c Author: rmani <[email protected]> Authored: Mon May 14 17:48:57 2018 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Wed May 16 14:58:28 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/84fddc1e/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 a546ff7..6e1a365 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 @@ -55,6 +55,7 @@ import java.util.Arrays; 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 { @@ -323,11 +324,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); } }
