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 2017/10/08 08:53:41 UTC
[1/3] kylin git commit: KYLIN-2874 fix double-check sync idiom
Repository: kylin
Updated Branches:
refs/heads/misc [created] 7a2510d44
KYLIN-2874 fix double-check sync idiom
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/26a426bd
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/26a426bd
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/26a426bd
Branch: refs/heads/misc
Commit: 26a426bde36adaceaaa3ff5d883bc1f9c5ef526d
Parents: 83d0ef3
Author: Li Yang <li...@apache.org>
Authored: Sun Oct 8 16:50:20 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Sun Oct 8 16:50:20 2017 +0800
----------------------------------------------------------------------
core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java | 2 +-
core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java | 2 +-
.../apache/kylin/query/adhoc/JdbcPushDownConnectionManager.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/26a426bd/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
index 495f9c0..003d006 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
@@ -122,7 +122,7 @@ public class CubeSegment implements IBuildable, ISegment, Serializable {
private Map<Long, Short> cuboidBaseShards = Maps.newConcurrentMap(); // cuboid id ==> base(starting) shard for this cuboid
// lazy init
- transient ISegmentAdvisor advisor = null;
+ transient volatile ISegmentAdvisor advisor = null;
public CubeDesc getCubeDesc() {
return getCubeInstance().getDescriptor();
http://git-wip-us.apache.org/repos/asf/kylin/blob/26a426bd/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index 827ac81..7f47526 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -192,7 +192,7 @@ public class CubeDesc extends RootPersistentEntity implements IEngineAware {
private Map<TblColRef, DeriveInfo> extendedColumnToHosts = Maps.newHashMap();
- transient private CuboidScheduler cuboidScheduler = null;
+ transient volatile private CuboidScheduler cuboidScheduler = null;
public boolean isEnableSharding() {
//in the future may extend to other storage that is shard-able
http://git-wip-us.apache.org/repos/asf/kylin/blob/26a426bd/query/src/main/java/org/apache/kylin/query/adhoc/JdbcPushDownConnectionManager.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/adhoc/JdbcPushDownConnectionManager.java b/query/src/main/java/org/apache/kylin/query/adhoc/JdbcPushDownConnectionManager.java
index f5cdbb6..26f705a 100644
--- a/query/src/main/java/org/apache/kylin/query/adhoc/JdbcPushDownConnectionManager.java
+++ b/query/src/main/java/org/apache/kylin/query/adhoc/JdbcPushDownConnectionManager.java
@@ -26,7 +26,7 @@ import org.apache.kylin.common.KylinConfig;
public class JdbcPushDownConnectionManager {
- private static JdbcPushDownConnectionManager manager = null;
+ private volatile static JdbcPushDownConnectionManager manager = null;
static JdbcPushDownConnectionManager getConnectionManager() throws ClassNotFoundException {
if (manager == null) {
[2/3] kylin git commit: KYLIN-2645 Upgrade to Kafka 0.11.0.1.
Posted by li...@apache.org.
KYLIN-2645 Upgrade to Kafka 0.11.0.1.
This closes #72
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4b2f4866
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4b2f4866
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4b2f4866
Branch: refs/heads/misc
Commit: 4b2f4866ccf50d930b4684c7ad24cf67a3fe458b
Parents: 26a426b
Author: mingming.ge <mi...@kyligence.io>
Authored: Mon Sep 25 19:10:52 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Sun Oct 8 16:52:38 2017 +0800
----------------------------------------------------------------------
pom.xml | 2 +-
.../apache/kylin/source/kafka/config/KafkaClusterConfig.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b2f4866/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f05806..7c9412f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<hbase-hadoop2.version>1.1.1</hbase-hadoop2.version>
<!-- Kafka versions -->
- <kafka.version>0.10.1.0</kafka.version>
+ <kafka.version>0.11.0.1</kafka.version>
<!-- Spark versions -->
<spark.version>2.1.1</spark.version>
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b2f4866/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaClusterConfig.java
----------------------------------------------------------------------
diff --git a/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaClusterConfig.java b/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaClusterConfig.java
index afe888f..4c4a09b 100644
--- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaClusterConfig.java
+++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaClusterConfig.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.annotation.Nullable;
+import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kylin.common.persistence.JsonSerializer;
import org.apache.kylin.common.persistence.RootPersistentEntity;
@@ -64,7 +65,9 @@ public class KafkaClusterConfig extends RootPersistentEntity {
@Nullable
@Override
public Broker apply(BrokerConfig input) {
- return new Broker(input.getId(), input.getHost(), input.getPort(), SecurityProtocol.PLAINTEXT);
+ return new Broker(input.getId(), input.getHost(), input.getPort(),
+ ListenerName.forSecurityProtocol(SecurityProtocol.PLAINTEXT),
+ SecurityProtocol.PLAINTEXT);
}
});
}
[3/3] kylin git commit: KYLIN-2835 Fix unclosed resources in
JdbcExplorer.In loadTableMetadata()
Posted by li...@apache.org.
KYLIN-2835 Fix unclosed resources in JdbcExplorer.In loadTableMetadata()
This closes #74
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7a2510d4
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7a2510d4
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7a2510d4
Branch: refs/heads/misc
Commit: 7a2510d44d8aeaa4bac653d6acec084260c54488
Parents: 4b2f486
Author: mingming.ge <mi...@kyligence>
Authored: Mon Sep 25 16:50:42 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Sun Oct 8 16:53:11 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/7a2510d4/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java
----------------------------------------------------------------------
diff --git a/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java b/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java
index fb720d4..736cf2e 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java
@@ -287,6 +287,7 @@ public class JdbcExplorer implements ISourceMetadataExplorer, ISampleDataDeploye
columns.add(cdesc);
}
DBUtils.closeQuietly(rs);
+ DBUtils.closeQuietly(con);
tableDesc.setColumns(columns.toArray(new ColumnDesc[columns.size()]));