You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/07/16 05:00:19 UTC
incubator-kylin git commit: KYLIN-792,
supprot username/passwod config add opencsv module to performance
module
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging 393548aab -> 0bde07028
KYLIN-792,supprot username/passwod config add opencsv module to performance module
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/0bde0702
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/0bde0702
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/0bde0702
Branch: refs/heads/0.7-staging
Commit: 0bde070289f5d8f84051c978688d7e11dc312ae1
Parents: 393548a
Author: jiazhong <ji...@ebay.com>
Authored: Thu Jul 16 10:58:05 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Thu Jul 16 10:59:14 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/monitor/ConfigUtils.java | 12 ++++++++++++
.../java/org/apache/kylin/monitor/HiveJdbcClient.java | 5 ++++-
server/pom.xml | 11 +++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0bde0702/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java b/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
index 9371ecb..2b02877 100644
--- a/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
+++ b/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
@@ -61,6 +61,9 @@ public class ConfigUtils {
public static final String QUERY_LOG_PARSE_RESULT_TABLE = "query.log.parse.result.table";
public static final String DEFAULT_QUERY_LOG_PARSE_RESULT_TABLE = "kylin_query_log";
+ public static final String HIVE_JDBC_CON_USERNAME = "kylin.hive.jdbc.connection.username";
+ public static final String HIVE_JDBC_CON_PASSWD = "kylin.hive.jdbc.connection.password";
+
public static final String DEPLOY_ENV = "deploy.env";
@@ -206,6 +209,15 @@ public class ConfigUtils {
}
+ public String getHiveJdbcConUserName() {
+ return this.monitorConfig.getProperty(HIVE_JDBC_CON_USERNAME);
+ }
+
+ public String getHiveJdbcConPasswd() {
+ return this.monitorConfig.getProperty(HIVE_JDBC_CON_PASSWD);
+ }
+
+
public static void addClasspath(String path) throws Exception {
File file = new File(path);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0bde0702/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
----------------------------------------------------------------------
diff --git a/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java b/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
index a7d3271..ec919c4 100644
--- a/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
+++ b/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
@@ -83,7 +83,10 @@ public class HiveJdbcClient {
String CON_URL = monitorConfig.getHiveJdbcConUrl();
- Connection con = DriverManager.getConnection(CON_URL, "", "");
+ String USER_NAME = monitorConfig.getHiveJdbcConUserName();
+ String PASSWD = monitorConfig.getHiveJdbcConPasswd();
+
+ Connection con = DriverManager.getConnection(CON_URL, USER_NAME, PASSWD);
Statement stmt = con.createStatement();
ResultSet res = null;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0bde0702/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 29f1095..b4b1043 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -354,8 +354,19 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>2.3</version>
+ </dependency>
+
<!-- Tomcat Env -->
<dependency>
<groupId>org.apache.tomcat</groupId>