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/03/18 09:23:54 UTC
[kylin] 01/01: Merge pull request #119 from apache/sync
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 4bcd8a14d3fcce385057275fcae10520abe2ead2
Merge: cf6d76d b81d7a2
Author: Shaofeng Shi <sh...@gmail.com>
AuthorDate: Sun Mar 18 17:23:50 2018 +0800
Merge pull request #119 from apache/sync
Sync batch update
.../apache/calcite/prepare/CalcitePrepareImpl.java | 10 +-
.../java/org/apache/calcite/tools/RelUtils.java | 71 +++++++++++
.../org/apache/kylin/common/KylinConfigBase.java | 9 +-
.../java/org/apache/kylin/common/QueryContext.java | 9 ++
.../org/apache/kylin/common/util/EncryptUtil.java | 55 +++++++++
.../apache/kylin/common/util/EncryptUtilTest.java | 7 +-
.../org/apache/kylin/jdbc/ITJDBCDriverTest.java | 27 +++++
.../org/apache/kylin/query/ITKylinQueryTest.java | 17 +++
.../java/org/apache/kylin/query/KylinTestBase.java | 70 +++++++++++
.../src/test/resources/query/sql_plan/query01.sql | 8 ++
.../resources/query/sql_plan/query01.sql.expected | 3 +
.../test/resources/query/sql_subquery/query36.sql | 24 ++++
.../test/resources/query/sql_values/query01.sql | 51 ++++++++
.../test/resources/query/sql_values/query02.sql | 27 +++++
.../test/resources/query/sql_values/query03.sql | 17 +++
.../test/resources/query/sql_values/query04.sql | 50 ++++++++
.../test/resources/query/sql_values/query05.sql | 3 +
.../kylin/query/optrule/OLAPAggregateRule.java | 2 +-
.../apache/kylin/query/optrule/OLAPFilterRule.java | 19 +--
.../apache/kylin/query/optrule/OLAPJoinRule.java | 4 +-
.../kylin/query/optrule/OLAPProjectRule.java | 43 +++++--
.../{OLAPWindowRule.java => OLAPValuesRule.java} | 30 ++---
.../apache/kylin/query/optrule/OLAPWindowRule.java | 4 +-
.../apache/kylin/query/relnode/OLAPProjectRel.java | 11 +-
.../apache/kylin/query/relnode/OLAPTableScan.java | 27 +++--
.../query/relnode/OLAPToEnumerableConverter.java | 12 +-
.../apache/kylin/query/relnode/OLAPUnionRel.java | 2 +-
.../apache/kylin/query/relnode/OLAPValuesRel.java | 131 +++++++++++++++++++++
.../kylin/rest/request/PrepareSqlRequest.java | 18 ++-
.../org/apache/kylin/rest/request/SQLRequest.java | 2 +-
.../security/PasswordPlaceholderConfigurer.java | 41 +------
31 files changed, 703 insertions(+), 101 deletions(-)
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.