You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/09/22 12:46:53 UTC
[6/6] incubator-kylin git commit: Merge branch 'origin/2.x-staging'
Merge branch 'origin/2.x-staging'
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/db65a1c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/db65a1c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/db65a1c6
Branch: refs/heads/KYLIN-942-test
Commit: db65a1c672435649501e5b5acbb0cbed6c4704d0
Parents: e44bc25 cc15d63
Author: honma <ho...@ebay.com>
Authored: Tue Sep 22 18:49:26 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Sep 22 18:49:26 2015 +0800
----------------------------------------------------------------------
build/conf/kylin.properties | 4 +
.../org/apache/kylin/common/KylinConfig.java | 6 +
.../org/apache/kylin/job/JoinedFlatTable.java | 2 +-
engine-mr/pom.xml | 5 +
.../org/apache/kylin/engine/mr/HadoopUtil.java | 32 ++++-
query/src/test/resources/query/sql/query81.sql | 28 ++++
.../apache/kylin/source/hive/HiveMRInput.java | 19 ++-
.../kylin/storage/hbase/HBaseConnection.java | 8 ++
.../kylin/storage/hbase/HBaseResourceStore.java | 4 +-
.../coprocessor/observer/ObserverEnabler.java | 8 +-
.../kylin/storage/hbase/steps/BulkLoadJob.java | 3 +-
.../storage/hbase/steps/CreateHTableJob.java | 2 +-
.../storage/hbase/steps/HBaseMROutput.java | 5 +-
.../kylin/storage/hbase/steps/HBaseMRSteps.java | 45 ++++++-
.../steps/HDFSPathGarbageCollectionStep.java | 134 +++++++++++++++++++
.../hbase/util/DeployCoprocessorCLI.java | 2 +-
.../hbase/steps/ITHBaseResourceStoreTest.java | 2 +-
17 files changed, 293 insertions(+), 16 deletions(-)
----------------------------------------------------------------------