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/04/27 09:27:50 UTC
kylin git commit: Merge commit
'043dd5cd551735c5f9d8036a987eab579c4ee7b3' into mergekylin0427
Repository: kylin
Updated Branches:
refs/heads/mergekylin0427 [created] ff3e095ac
Merge commit '043dd5cd551735c5f9d8036a987eab579c4ee7b3' into mergekylin0427
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ff3e095a
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ff3e095a
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ff3e095a
Branch: refs/heads/mergekylin0427
Commit: ff3e095ac7a575c6e192f3baf72df10da4ff1fee
Parents: 29265af 043dd5c
Author: Hongbin Ma <ma...@apache.org>
Authored: Thu Apr 27 17:26:32 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Thu Apr 27 17:26:32 2017 +0800
----------------------------------------------------------------------
assembly/pom.xml | 2 +-
atopcalcite/pom.xml | 2 +-
build/bin/check-env.sh | 5 +
build/bin/kylin_port_replace_util.sh | 18 +
build/bin/sample.sh | 9 +-
core-common/pom.xml | 2 +-
.../apache/kylin/common/KylinConfigBase.java | 10 +
.../org/apache/kylin/common/KylinVersion.java | 2 +-
.../kylin/common/lock/DistributedLock.java | 37 +
.../kylin-backward-compatibility.properties | 16 +
core-cube/pom.xml | 2 +-
.../metadata/measure/TopNMeasureTypeTest.java | 2 +-
core-dictionary/pom.xml | 2 +-
.../apache/kylin/dict/AppendTrieDictionary.java | 1204 +-----------------
.../kylin/dict/AppendTrieDictionaryChecker.java | 101 --
.../org/apache/kylin/dict/CachedTreeMap.java | 481 -------
.../kylin/dict/GlobalDictionaryBuilder.java | 119 +-
.../kylin/dict/Number2BytesConverter.java | 22 +-
.../kylin/dict/TrieDictionaryBuilder.java | 33 +-
.../apache/kylin/dict/TrieDictionaryForest.java | 14 +-
.../kylin/dict/TrieDictionaryForestBuilder.java | 2 +-
.../kylin/dict/global/AppendDictNode.java | 378 ++++++
.../kylin/dict/global/AppendDictSlice.java | 283 ++++
.../kylin/dict/global/AppendDictSliceKey.java | 75 ++
.../global/AppendTrieDictionaryBuilder.java | 283 ++++
.../global/AppendTrieDictionaryChecker.java | 102 ++
.../kylin/dict/global/GlobalDictHDFSStore.java | 413 ++++++
.../kylin/dict/global/GlobalDictMetadata.java | 51 +
.../kylin/dict/global/GlobalDictStore.java | 102 ++
.../kylin/dict/AppendTrieDictionaryTest.java | 367 ------
.../apache/kylin/dict/CachedTreeMapTest.java | 378 ------
.../kylin/dict/TrieDictionaryForestTest.java | 11 +
.../apache/kylin/dict/TrieDictionaryTest.java | 10 +
.../dict/global/AppendTrieDictionaryTest.java | 523 ++++++++
core-job/pom.xml | 2 +-
.../org/apache/kylin/job/JoinedFlatTable.java | 1 +
.../kylin/job/common/PatternedLogger.java | 8 +
.../kylin/job/execution/ExecutableManager.java | 26 +
.../job/impl/threadpool/DefaultScheduler.java | 8 +-
.../impl/threadpool/DistributedScheduler.java | 52 +-
.../kylin/job/lock/DistributedJobLock.java | 16 +-
.../java/org/apache/kylin/job/lock/JobLock.java | 7 +-
.../org/apache/kylin/job/lock/MockJobLock.java | 4 +-
core-metadata/pom.xml | 2 +-
.../kylin/dimension/DictionaryDimEnc.java | 2 +-
.../kylin/measure/topn/TopNMeasureType.java | 28 +-
.../kylin/metadata/model/DataModelDesc.java | 1 +
core-storage/pom.xml | 2 +-
engine-mr/pom.xml | 2 +-
.../mr/steps/FactDistinctColumnsReducer.java | 2 +
.../mr/steps/NumberDictionaryForestTest.java | 86 +-
engine-spark/pom.xml | 2 +-
.../engine/spark/KylinKryoRegistrator.java | 3 -
.../flatten_data_for_without_slr_left_join.csv | 402 ------
.../test_case_data/localmeta/kylin.properties | 2 +-
jdbc/pom.xml | 2 +-
kylin-it/pom.xml | 2 +-
.../ITDoggedCubeBuilderStressTest.java | 4 +-
.../inmemcubing/ITDoggedCubeBuilderTest.java | 4 +-
.../inmemcubing/ITInMemCubeBuilderTest.java | 6 +-
.../dict/ITGlobalDictionaryBuilderTest.java | 121 ++
.../kylin/job/BaseTestDistributedScheduler.java | 9 +-
odbc/Driver/KO_DIAG.CPP | 11 +-
odbc/Driver/KO_FETCH.CPP | 2 +
pom.xml | 3 +-
query/pom.xml | 2 +-
server-base/pom.xml | 2 +-
.../rest/controller/ProjectController.java | 59 +-
.../apache/kylin/rest/service/AdminService.java | 2 +-
.../apache/kylin/rest/service/QueryService.java | 11 +-
.../org/apache/kylin/rest/util/AclUtil.java | 116 ++
server/pom.xml | 2 +-
source-hive/pom.xml | 2 +-
source-kafka/pom.xml | 2 +-
storage-hbase/pom.xml | 2 +-
.../hbase/util/DeployCoprocessorCLI.java | 13 +-
.../hbase/util/ZookeeperDistributedJobLock.java | 167 ++-
.../storage/hbase/util/ZookeeperJobLock.java | 4 +-
tomcat-ext/pom.xml | 2 +-
tool-assembly/pom.xml | 2 +-
tool/pom.xml | 2 +-
webapp/app/js/services/encodings.js | 19 +-
.../app/partials/modelDesigner/data_model.html | 24 +-
83 files changed, 3159 insertions(+), 3157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ff3e095a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
----------------------------------------------------------------------
diff --cc core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
index 14fcfd0,692c817..6eba7c5
--- a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
@@@ -89,10 -69,8 +89,10 @@@ public class KylinVersion implements Co
/**
* Require MANUAL updating kylin version per ANY upgrading.
*/
- private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("2.0.0");
+ private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("2.1.0");
+ private static final KylinVersion VERSION_200 = new KylinVersion("2.0.0");
+
private static final Set<KylinVersion> SIGNATURE_INCOMPATIBLE_REVISIONS = new HashSet<KylinVersion>();
/**
http://git-wip-us.apache.org/repos/asf/kylin/blob/ff3e095a/core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
----------------------------------------------------------------------
diff --cc core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
index a9da822,54c1e61..b8d18f8
--- a/core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
+++ b/core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
@@@ -107,13 -107,7 +107,14 @@@ public class JoinedFlatTable
}
public static String generateInsertDataStatement(IJoinedFlatTableDesc flatDesc) {
- final KylinConfig kylinConfig = ((CubeSegment) flatDesc.getSegment()).getConfig();
+ CubeSegment segment = ((CubeSegment) flatDesc.getSegment());
+ KylinConfig kylinConfig;
+ if (null == segment) {
+ kylinConfig = KylinConfig.getInstanceFromEnv();
+ } else {
+ kylinConfig = ((CubeSegment) flatDesc.getSegment()).getConfig();
+ }
++
if (kylinConfig.isAdvancedFlatTableUsed()) {
try {
Class advancedFlatTable = Class.forName(kylinConfig.getAdvancedFlatTableClass());
http://git-wip-us.apache.org/repos/asf/kylin/blob/ff3e095a/examples/test_case_data/localmeta/kylin.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ff3e095a/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ff3e095a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
----------------------------------------------------------------------
diff --cc server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
index 6fed9a8,b526f96..1ddf4a3
--- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
@@@ -65,8 -65,7 +65,8 @@@ import org.apache.kylin.cube.CubeManage
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.metadata.project.RealizationEntry;
import org.apache.kylin.metadata.realization.RealizationType;
- import org.apache.kylin.query.util.QueryUtil;
import org.apache.kylin.query.relnode.OLAPContext;
++import org.apache.kylin.query.util.QueryUtil;
import org.apache.kylin.rest.constant.Constant;
import org.apache.kylin.rest.exception.InternalErrorException;
import org.apache.kylin.rest.metrics.QueryMetricsFacade;
@@@ -77,6 -76,8 +77,7 @@@ import org.apache.kylin.rest.model.Tabl
import org.apache.kylin.rest.request.PrepareSqlRequest;
import org.apache.kylin.rest.request.SQLRequest;
import org.apache.kylin.rest.response.SQLResponse;
+ import org.apache.kylin.rest.util.AclUtil;
-import org.apache.kylin.rest.util.QueryUtil;
import org.apache.kylin.rest.util.Serializer;
import org.apache.kylin.rest.util.TableauInterceptor;
import org.apache.kylin.storage.hbase.HBaseConnection;