Compare commits

...

1 Commits

Author SHA1 Message Date
cbadillo1603
ac27d7763f fix(TBD-12184):Password field missing for tImpalaRow (#4520) (#4928)
* Revert "Revert "fix(TBD-12184):Password field missing for tImpalaRow (#4472)" (#4507)"

This reverts commit f7fb174301.

* fix(TBD-12184):Password field missing for tImpalaRow

* fix(TBD-12184):Password field missing for tImpalaRow

* fix(TBD-12184):Password field missing for tImpalaRow

* fix(TBD-12184):Password field missing for tImpalaRow
2022-01-04 15:17:24 +01:00
2 changed files with 37 additions and 4 deletions

View File

@@ -70,9 +70,25 @@ public class ImpalaConnectionManager extends DataBaseConnectionManager {
@Override
public Connection call() throws Exception {
Connection conn = null;
if( !("".equals( metadataConn.getPassword() ) || "\"\"".equals( metadataConn.getPassword() )) ) {
String url = metadataConn.getUrl().replace(";auth=noSasl", "");
if (url.startsWith("jdbc:hive2") && !url.contains(";user=")) {
url = url + ";user=" + metadataConn.getUsername() + ";password=" + metadataConn.getPassword();
} else if (!url.contains(";AuthMech=3;UID=")) {
url = url + ";AuthMech=3;UID=" + metadataConn.getUsername() + ";PWD=" + metadataConn.getPassword();
}
metadataConn.setUrl(url);
}
String connURL = metadataConn.getUrl();
String username = metadataConn.getUsername();
String password = metadataConn.getPassword();
String password = metadataConn.getPassword();
// 1. Get class loader.
ClassLoader currClassLoader = Thread.currentThread().getContextClassLoader();
ClassLoader impalaClassLoader = getClassLoader(metadataConn);
@@ -147,8 +163,11 @@ public class ImpalaConnectionManager extends DataBaseConnectionManager {
Properties info = new Properties();
username = username != null ? username : ""; //$NON-NLS-1$
password = password != null ? password : "";//$NON-NLS-1$
info.setProperty("user", username);//$NON-NLS-1$
info.setProperty("password", password);//$NON-NLS-1$
// info.setProperty("user", username);//$NON-NLS-1$
// info.setProperty("password", password);//$NON-NLS-1$
conn = hiveDriver.connect(connURL, info);
} finally {
Thread.currentThread().setContextClassLoader(currClassLoader);

View File

@@ -4495,6 +4495,20 @@ public class DatabaseForm extends AbstractForm {
};
} else if (isImpalaDBConnSelected()) {
final IMetadataConnection metadataConn = ConvertionHelper.convert(connectionItem.getConnection(), true);
if( !("".equals(metadataConn.getPassword()) || "\"\"".equals(metadataConn.getPassword())) ) {
String url = metadataConn.getUrl().replace(";auth=noSasl", "");
if (url.startsWith("jdbc:hive2")) {
url = url + ";user=" + metadataConn.getUsername() + ";password=" + metadataConn.getPassword();
} else {
url = url + ";AuthMech=3;UID=" + metadataConn.getUsername() + ";PWD=" + metadataConn.getPassword();
}
metadataConn.setUrl(url);
}
checkingDialog = new AProgressMonitorDialogWithCancel<Boolean>(getShell()) {
@Override
@@ -8695,7 +8709,7 @@ public class DatabaseForm extends AbstractForm {
hiveVersion == null ? null : hiveVersion.getVersion(), false);
if (impalaDriverDisplay != null && impalaDriverDisplay.length == 0) {
// hive2 by default
impalaDriverCombo.getCombo().setItems(EImpalaDriver.HIVE2.getDisplayName());
impalaDriverCombo.getCombo().setItems(EImpalaDriver.HIVE2.getDisplayName().split("\n"));
} else {
impalaDriverCombo.getCombo().setItems(impalaDriverDisplay);
}