zabetak commented on a change in pull request #2734:
URL: https://github.com/apache/hive/pull/2734#discussion_r739184522



##########
File path: ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
##########
@@ -3011,9 +3011,14 @@ private RelNode genTableLogicalPlan(String tableAlias, 
QB qb) throws SemanticExc
             final String user = 
tabMetaData.getProperty(Constants.JDBC_USERNAME);
             String pswd = tabMetaData.getProperty(Constants.JDBC_PASSWORD);
             if (pswd == null) {
-              String keystore = 
tabMetaData.getProperty(Constants.JDBC_KEYSTORE);
-              String key = tabMetaData.getProperty(Constants.JDBC_KEY);
-              pswd = Utilities.getPasswdFromKeystore(keystore, key);
+              if(!(tabMetaData.getProperty(Constants.JDBC_PASSWORD_URI) == 
null)) {
+                  pswd = 
Utilities.getPasswdFromUri(tabMetaData.getProperty(Constants.JDBC_PASSWORD_URI));
+              }
+              else {
+                String keystore = 
tabMetaData.getProperty(Constants.JDBC_KEYSTORE);
+                String key = tabMetaData.getProperty(Constants.JDBC_KEY);
+                pswd = Utilities.getPasswdFromKeystore(keystore, key);
+              }

Review comment:
       Sure we can defer the test for later. Please create another JIRA and 
link with HIVE-25626 so that we don't forget.
   
   Please have a look on my comments in 
https://github.com/apache/hive/pull/2734/commits/e64d9af1d7649f4c2c480edf48f2b519d1ce2e20
 and if you are OK with this I can merge this PR.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to