diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ranger/RangerRestClientImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ranger/RangerRestClientImpl.java index 5b2fe4ee29..459c95f5b1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ranger/RangerRestClientImpl.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ranger/RangerRestClientImpl.java @@ -264,8 +264,9 @@ private RangerExportPolicyList importRangerPoliciesPlain(String jsonRangerExport public String getRangerImportUrl(String rangerUrl, String dbName) throws URISyntaxException { URIBuilder uriBuilder = new URIBuilder(rangerUrl); uriBuilder.setPath(RANGER_REST_URL_IMPORTJSONFILE); - uriBuilder.addParameter("mergeIfExists", "true"); + uriBuilder.addParameter("updateIfExists", "true"); uriBuilder.addParameter("polResource", dbName); + uriBuilder.addParameter("policyMatchingAlgorithm", "matchByName"); return uriBuilder.build().toString(); } @@ -437,6 +438,7 @@ boolean checkConnectionPlain(String url) { RangerPolicyItemAccess>(); resourceNameList.add(sourceDb); + resourceNameList.add("dummy"); rangerPolicyResource.setValues(resourceNameList); RangerPolicy.RangerPolicyResource rangerPolicyResourceColumn =new RangerPolicy.RangerPolicyResource(); rangerPolicyResourceColumn.setValues(new ArrayList(){{add("*"); }}); diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestRangerLoadTask.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestRangerLoadTask.java index c6bc99ed0d..21201a79a0 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestRangerLoadTask.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestRangerLoadTask.java @@ -284,11 +284,11 @@ public void testRangerEndpointCreation() throws Exception { Assert.assertTrue(rangerRestClient.getRangerImportUrl("http://ranger.apache.org:6080/", "dbname").equals("http://ranger.apache.org:6080/service/plugins/policies/importPoliciesFromFile" - + "?mergeIfExists=true&polResource=dbname")); + + "?updateIfExists=true&polResource=dbname&policyMatchingAlgorithm=matchByName")); Assert.assertTrue(rangerRestClient.getRangerImportUrl("http://ranger.apache.org:6080", "dbname").equals("http://ranger.apache.org:6080/service/plugins/policies/importPoliciesFromFile" - + "?mergeIfExists=true&polResource=dbname")); + + "?updateIfExists=true&polResource=dbname&policyMatchingAlgorithm=matchByName")); }