You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/06/14 10:36:55 UTC
[kylin] branch KYLIN-3404 updated (05b0904 -> 4e1d4c0)
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a change to branch KYLIN-3404
in repository https://gitbox.apache.org/repos/asf/kylin.git.
discard 05b0904 KYLIN-3404 The last optimized time not showing up on cube planner tab
discard 5b4e1a0 KYLIN-3408 update LICENSE
add ec927e3 KYLIN-3364 make it consistent with hive for BigDecimalSumAggregator dealing with null
add e3388f9 KYLIN-3359 Support sum(expression) if possible
add f0c7e0f KYLIN-3359 add unit test & integration test
add 1c9b679 KYLIN-3360 correct count(column)
add 189f7ae KYLIN-3360 add integration test
add d3adc52 KYLIN-3362 support dynamic dimension push down
add 0d4d1ef KYLIN-3362 add integration test
add ed1882f KYLIN-3358 add a trigger kylin.query.enable-dynamic-column with default value false for coprocessor backward compatibility
add e47f2cf APACHE-KYLIN-3359 minor fix
add a9557a6 APACHE-KYLIN-3359 change tupleExpressionList to tupleExpressionMap & keep dynamicCols and tupleExpressionMap independent in GTScanRequest
add 4c22115 KYLIN-3408 update LICENSE
new 11f8836 KYLIN-3408 update LICENSE
new 4e1d4c0 KYLIN-3404 The last optimized time not showing up on cube planner tab
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (05b0904)
\
N -- N -- N refs/heads/KYLIN-3404 (4e1d4c0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 16 ++
.../apache/calcite/sql2rel/SqlToRelConverter.java | 2 +-
.../org/apache/kylin/common/KylinConfigBase.java | 6 +
.../org/apache/kylin/common/util/DecimalUtil.java | 45 +++
.../apache/kylin/cube/CubeCapabilityChecker.java | 36 ++-
.../kylin/cube/gridtable/CubeCodeSystem.java | 13 +-
.../apache/kylin/cube/gridtable/CubeGridTable.java | 17 +-
.../cube/gridtable/CuboidToGridTableMapping.java | 14 +-
.../gridtable/CuboidToGridTableMappingExt.java | 134 +++++++++
.../kylin/cube/gridtable/ScanRangePlannerBase.java | 5 +
.../apache/kylin/gridtable/GTAggregateScanner.java | 2 +-
.../apache/kylin/gridtable/GTFunctionScanner.java | 117 ++++++++
.../java/org/apache/kylin/gridtable/GTInfo.java | 17 ++
.../java/org/apache/kylin/gridtable/GTRecord.java | 12 +
.../org/apache/kylin/gridtable/GTScanRequest.java | 79 +++++-
.../kylin/gridtable/GTScanRequestBuilder.java | 41 ++-
.../java/org/apache/kylin/gridtable/GTUtil.java | 60 +++-
core-metadata/pom.xml | 6 +
.../measure/basic/BigDecimalSumAggregator.java | 9 +-
.../metadata/datatype/BigDecimalSerializer.java | 10 +
.../apache/kylin/metadata/datatype/DataType.java | 4 +
...g8Serializer.java => DynamicDimSerializer.java} | 46 ++--
.../metadata/expression/BinaryTupleExpression.java | 149 ++++++++++
.../metadata/expression/CaseTupleExpression.java | 180 ++++++++++++
.../ColumnTupleExpression.java} | 102 ++++---
.../expression/ExpressionColCollector.java | 120 ++++++++
.../expression/ExpressionCountDistributor.java | 140 ++++++++++
.../metadata/expression/ExpressionVisitor.java | 16 +-
.../NoneTupleExpression.java} | 34 +--
.../metadata/expression/NumberTupleExpression.java | 95 +++++++
.../RexCallTupleExpression.java} | 34 +--
.../metadata/expression/StringTupleExpression.java | 89 ++++++
.../kylin/metadata/expression/TupleExpression.java | 117 ++++++++
.../expression/TupleExpressionSerializer.java | 239 ++++++++++++++++
.../kylin/metadata/filter/CompareTupleFilter.java | 37 +++
.../kylin/metadata/model/DynamicFunctionDesc.java | 85 ++++++
.../apache/kylin/metadata/model/FunctionDesc.java | 1 +
.../metadata/model/SumDynamicFunctionDesc.java | 77 ++++++
.../kylin/metadata/realization/SQLDigest.java | 21 +-
.../datatype/BigDecimalSerializerTest.java | 10 +
.../expression/ExpressionCountDistributorTest.java | 210 ++++++++++++++
.../expression/TupleExpressionSerializerTest.java | 77 ++++++
.../metadata/expression/TupleExpressionTest.java | 84 ++++++
.../org/apache/kylin/storage/StorageContext.java | 10 +
.../storage/gtrecord/CubeScanRangePlanner.java | 58 +++-
.../kylin/storage/gtrecord/CubeSegmentScanner.java | 22 +-
.../storage/gtrecord/GTCubeStorageQueryBase.java | 57 +++-
.../gtrecord/GTCubeStorageQueryRequest.java | 27 +-
.../storage/gtrecord/SegmentCubeTupleIterator.java | 2 +-
.../gtrecord/SequentialCubeTupleIterator.java | 11 +-
.../kylin/engine/mr/steps/CubeReducerTest.java | 9 +-
.../org/apache/kylin/query/ITKylinQueryTest.java | 6 +
.../apache/kylin/storage/hbase/ITStorageTest.java | 6 +
.../query/{sql_hive => sql_expression}/query01.sql | 6 +-
.../{sql_subquery => sql_expression}/query02.sql | 29 +-
.../query/{sql => sql_expression}/query03.sql | 10 +-
.../query02.sql => sql_expression/query04.sql} | 35 ++-
.../query02.sql => sql_expression/query05.sql} | 35 ++-
.../apache/kylin/query/relnode/ColumnRowType.java | 28 +-
.../kylin/query/relnode/OLAPAggregateRel.java | 150 +++++++++-
.../apache/kylin/query/relnode/OLAPContext.java | 69 ++++-
.../apache/kylin/query/relnode/OLAPFilterRel.java | 277 +------------------
.../apache/kylin/query/relnode/OLAPJoinRel.java | 31 ++-
.../apache/kylin/query/relnode/OLAPProjectRel.java | 242 ++++++----------
.../apache/kylin/query/relnode/OLAPTableScan.java | 23 ++
.../apache/kylin/query/relnode/OLAPUnionRel.java | 17 +-
.../relnode/visitor/TupleExpressionVisitor.java | 204 ++++++++++++++
.../query/relnode/visitor/TupleFilterVisitor.java | 304 +++++++++++++++++++++
.../org/apache/kylin/query/schema/OLAPTable.java | 21 ++
.../java/org/apache/kylin/query/util/RexUtil.java | 57 ++++
70 files changed, 3661 insertions(+), 693 deletions(-)
create mode 100644 core-common/src/main/java/org/apache/kylin/common/util/DecimalUtil.java
create mode 100644 core-cube/src/main/java/org/apache/kylin/cube/gridtable/CuboidToGridTableMappingExt.java
create mode 100644 core-cube/src/main/java/org/apache/kylin/gridtable/GTFunctionScanner.java
copy core-metadata/src/main/java/org/apache/kylin/metadata/datatype/{Long8Serializer.java => DynamicDimSerializer.java} (51%)
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/BinaryTupleExpression.java
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/CaseTupleExpression.java
copy core-metadata/src/main/java/org/apache/kylin/metadata/{filter/ColumnTupleFilter.java => expression/ColumnTupleExpression.java} (77%)
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/ExpressionColCollector.java
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/ExpressionCountDistributor.java
copy core-cube/src/main/java/org/apache/kylin/gridtable/IGTStore.java => core-metadata/src/main/java/org/apache/kylin/metadata/expression/ExpressionVisitor.java (60%)
copy core-metadata/src/main/java/org/apache/kylin/metadata/{filter/UnsupportedTupleFilter.java => expression/NoneTupleExpression.java} (67%)
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/NumberTupleExpression.java
copy core-metadata/src/main/java/org/apache/kylin/metadata/{filter/UnsupportedTupleFilter.java => expression/RexCallTupleExpression.java} (67%)
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/StringTupleExpression.java
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/TupleExpression.java
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/expression/TupleExpressionSerializer.java
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/model/DynamicFunctionDesc.java
create mode 100644 core-metadata/src/main/java/org/apache/kylin/metadata/model/SumDynamicFunctionDesc.java
create mode 100644 core-metadata/src/test/java/org/apache/kylin/metadata/expression/ExpressionCountDistributorTest.java
create mode 100644 core-metadata/src/test/java/org/apache/kylin/metadata/expression/TupleExpressionSerializerTest.java
create mode 100644 core-metadata/src/test/java/org/apache/kylin/metadata/expression/TupleExpressionTest.java
copy kylin-it/src/test/resources/query/{sql_hive => sql_expression}/query01.sql (84%)
copy kylin-it/src/test/resources/query/{sql_subquery => sql_expression}/query02.sql (61%)
copy kylin-it/src/test/resources/query/{sql => sql_expression}/query03.sql (67%)
copy kylin-it/src/test/resources/query/{sql_subquery/query02.sql => sql_expression/query04.sql} (58%)
copy kylin-it/src/test/resources/query/{sql_subquery/query02.sql => sql_expression/query05.sql} (56%)
create mode 100644 query/src/main/java/org/apache/kylin/query/relnode/visitor/TupleExpressionVisitor.java
create mode 100644 query/src/main/java/org/apache/kylin/query/relnode/visitor/TupleFilterVisitor.java
create mode 100644 query/src/main/java/org/apache/kylin/query/util/RexUtil.java
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.
[kylin] 01/02: KYLIN-3408 update LICENSE
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch KYLIN-3404
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 11f88362ba15c50940c16b1d3236397b9b3b94d9
Author: shaofengshi <sh...@apache.org>
AuthorDate: Wed Jun 13 15:10:39 2018 +0800
KYLIN-3408 update LICENSE
---
LICENSE | 3 +++
1 file changed, 3 insertions(+)
diff --git a/LICENSE b/LICENSE
index a237c61..2433ca8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -246,6 +246,7 @@ https://github.com/michal-harish/kafka-hadoop-loader/blob/master/LICENSE
==============================================================================
+<<<<<<< HEAD
For Apache Spark:
==============================================================================
apache/spark is licensed under the Apache License 2.0
@@ -259,6 +260,8 @@ https://github.com/apache/tomcat/blob/trunk/LICENSE
==============================================================================
+=======
+>>>>>>> KYLIN-3408 update LICENSE
For RocksDB:
==============================================================================
RocksDB is dual-licensed under both the GPLv2 and Apache 2.0 License.You may
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.
[kylin] 02/02: KYLIN-3404 The last optimized time not showing up on
cube planner tab
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch KYLIN-3404
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 4e1d4c0b37c2b83c2de714566286a8a48dd1eb4b
Author: ycq <yc...@meitu.com>
AuthorDate: Tue Jun 12 23:31:03 2018 +0800
KYLIN-3404 The last optimized time not showing up on cube planner tab
Signed-off-by: shaofengshi <sh...@apache.org>
---
.../java/org/apache/kylin/job/execution/CheckpointExecutable.java | 7 ++++---
.../java/org/apache/kylin/rest/response/CubeInstanceResponse.java | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java
index c5f1c0a..779809a 100644
--- a/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java
+++ b/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java
@@ -83,9 +83,10 @@ public class CheckpointExecutable extends DefaultChainedExecutable {
// Add last optimization time
CubeManager cubeManager = CubeManager.getInstance(executableContext.getConfig());
CubeInstance cube = cubeManager.getCube(getCubeName());
- try{
- cube.setCuboidLastOptimized(getEndTime());
- CubeUpdate cubeUpdate = new CubeUpdate(cube);
+ CubeInstance copyForWrite = cube.latestCopyForWrite();
+ try {
+ copyForWrite.setCuboidLastOptimized(getEndTime());
+ CubeUpdate cubeUpdate = new CubeUpdate(copyForWrite);
cubeManager.updateCube(cubeUpdate);
} catch (IOException e) {
logger.error("Failed to update last optimized for " + getCubeName(), e);
diff --git a/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java b/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java
index 19a5ef5..f6f88bd 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java
@@ -64,6 +64,7 @@ public class CubeInstanceResponse extends CubeInstance {
setSegments(cube.getSegments());
setCreateTimeUTC(cube.getCreateTimeUTC());
setLastModified(cube.getDescriptor().getLastModified());
+ setCuboidLastOptimized(cube.getCuboidLastOptimized());
this.model = cube.getDescriptor().getModelName();
this.partitionDateStart = cube.getDescriptor().getPartitionDateStart();
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.