You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/03 11:28:26 UTC
[12/50] incubator-kylin git commit: correct line endings,
make hive loader compatible with older hadoop
correct line endings, make hive loader compatible with older hadoop
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/64c25849
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/64c25849
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/64c25849
Branch: refs/heads/master
Commit: 64c25849e5101ef283579a910373e72a056b13ce
Parents: 520a1ad
Author: Li, Yang <ya...@ebay.com>
Authored: Fri Feb 13 11:14:21 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Fri Feb 13 11:14:21 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/KylinConfig.java | 2 +-
.../apache/kylin/common/util/HiveClient.java | 31 +++++++++++++++++---
2 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/64c25849/common/src/main/java/org/apache/kylin/common/KylinConfig.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/KylinConfig.java b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
index 5138c0b..006cf34 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -413,7 +413,7 @@ public class KylinConfig {
public String[] getRestServers() {
String nodes = getOptional(KYLIN_REST_SERVERS);
- if (nodes == null)
+ if (StringUtils.isBlank(nodes))
return null;
return nodes.split("\\s*,\\s*");
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/64c25849/common/src/main/java/org/apache/kylin/common/util/HiveClient.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/util/HiveClient.java b/common/src/main/java/org/apache/kylin/common/util/HiveClient.java
index 2588257..cfeea31 100644
--- a/common/src/main/java/org/apache/kylin/common/util/HiveClient.java
+++ b/common/src/main/java/org/apache/kylin/common/util/HiveClient.java
@@ -33,7 +33,6 @@ import org.apache.hadoop.hive.ql.CommandNeedRetryException;
import org.apache.hadoop.hive.ql.Driver;
import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
import org.apache.hadoop.hive.ql.session.SessionState;
-import org.apache.hadoop.hive.ql.stats.StatsUtils;
/**
* Hive meta API client for Kylin
@@ -94,7 +93,7 @@ public class HiveClient {
CommandProcessorResponse response = getDriver().run(hql);
int retCode = response.getResponseCode();
if (retCode != 0) {
- String err = response.getErrorMessage();
+ String err = response.getErrorMessage();
throw new IOException("Failed to execute hql [" + hql + "], error message is: " + err);
}
}
@@ -125,11 +124,35 @@ public class HiveClient {
}
public long getFileSizeForTable(Table table) {
- return StatsUtils.getTotalSize(new org.apache.hadoop.hive.ql.metadata.Table(table));
+ return getBasicStatForTable(new org.apache.hadoop.hive.ql.metadata.Table(table), StatsSetupConst.TOTAL_SIZE);
}
public long getFileNumberForTable(Table table) {
- return StatsUtils.getBasicStatForTable(new org.apache.hadoop.hive.ql.metadata.Table(table), StatsSetupConst.NUM_FILES);
+ return getBasicStatForTable(new org.apache.hadoop.hive.ql.metadata.Table(table), StatsSetupConst.NUM_FILES);
+ }
+
+ /**
+ * COPIED FROM org.apache.hadoop.hive.ql.stats.StatsUtil for backward compatibility
+ *
+ * Get basic stats of table
+ * @param table
+ * - table
+ * @param statType
+ * - type of stats
+ * @return value of stats
+ */
+ public static long getBasicStatForTable(org.apache.hadoop.hive.ql.metadata.Table table, String statType) {
+ Map<String, String> params = table.getParameters();
+ long result = 0;
+
+ if (params != null) {
+ try {
+ result = Long.parseLong(params.get(statType));
+ } catch (NumberFormatException e) {
+ result = 0;
+ }
+ }
+ return result;
}
}