You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/03/30 11:57:39 UTC
[5/5] tajo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into index_support
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Conflicts:
tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/bba7d18c
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/bba7d18c
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/bba7d18c
Branch: refs/heads/index_support
Commit: bba7d18c6127dfbdb494ea48a9b9fd6277d7ffa2
Parents: 11300ef 652e4db
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Mar 30 18:57:46 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Mar 30 18:57:46 2015 +0900
----------------------------------------------------------------------
CHANGES | 11 ++
.../apache/tajo/client/SessionConnection.java | 2 +-
.../tajo/engine/function/builtin/StdDev.java | 94 ++++++++++++++
.../tajo/engine/function/builtin/StdDevPop.java | 42 ++++++
.../function/builtin/StdDevPopDouble.java | 39 ++++++
.../engine/function/builtin/StdDevPopFloat.java | 39 ++++++
.../engine/function/builtin/StdDevPopInt.java | 39 ++++++
.../engine/function/builtin/StdDevPopLong.java | 39 ++++++
.../engine/function/builtin/StdDevSamp.java | 41 ++++++
.../function/builtin/StdDevSampDouble.java | 39 ++++++
.../function/builtin/StdDevSampFloat.java | 39 ++++++
.../engine/function/builtin/StdDevSampInt.java | 39 ++++++
.../engine/function/builtin/StdDevSampLong.java | 39 ++++++
.../java/org/apache/tajo/querymaster/Query.java | 5 +-
.../tajo/querymaster/QueryMasterTask.java | 12 +-
tajo-core/src/main/proto/InternalTypes.proto | 6 +
.../engine/function/TestBuiltinFunctions.java | 129 +++++++++++++++++++
.../tajo/engine/query/TestWindowQuery.java | 28 +++-
.../apache/tajo/querymaster/TestKillQuery.java | 40 ++++--
.../queries/TestWindowQuery/firstValue1.sql | 18 ---
.../queries/TestWindowQuery/lastValue1.sql | 18 ---
.../queries/TestWindowQuery/rowNumber1.sql | 5 -
.../queries/TestWindowQuery/rowNumber2.sql | 5 -
.../queries/TestWindowQuery/rowNumber3.sql | 7 -
.../queries/TestWindowQuery/testFirstValue1.sql | 18 +++
.../queries/TestWindowQuery/testLastValue1.sql | 18 +++
.../queries/TestWindowQuery/testRowNumber1.sql | 5 +
.../queries/TestWindowQuery/testRowNumber2.sql | 5 +
.../queries/TestWindowQuery/testRowNumber3.sql | 7 +
.../queries/TestWindowQuery/testStdDevPop1.sql | 14 ++
.../queries/TestWindowQuery/testStdDevSamp1.sql | 14 ++
.../results/TestWindowQuery/firstValue1.result | 7 -
.../results/TestWindowQuery/lastValue1.result | 7 -
.../results/TestWindowQuery/rowNumber1.result | 7 -
.../results/TestWindowQuery/rowNumber2.result | 7 -
.../results/TestWindowQuery/rowNumber3.result | 7 -
.../TestWindowQuery/testFirstValue1.result | 7 +
.../TestWindowQuery/testLastValue1.result | 7 +
.../TestWindowQuery/testRowNumber1.result | 7 +
.../TestWindowQuery/testRowNumber2.result | 7 +
.../TestWindowQuery/testRowNumber3.result | 7 +
.../TestWindowQuery/testStdDevPop1.result | 7 +
.../TestWindowQuery/testStdDevSamp1.result | 7 +
.../apache/tajo/jdbc/TajoDatabaseMetaData.java | 3 +-
.../apache/tajo/jdbc/TajoPreparedStatement.java | 4 +-
.../org/apache/tajo/jdbc/TajoStatement.java | 23 ++--
46 files changed, 846 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/bba7d18c/tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/bba7d18c/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/bba7d18c/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/bba7d18c/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
----------------------------------------------------------------------