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 2013/11/30 15:16:19 UTC
[7/7] git commit: Merge branch 'master' of
http://git-wip-us.apache.org/repos/asf/incubator-tajo into DAG-execplan
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-tajo into DAG-execplan
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/0cbd968c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/0cbd968c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/0cbd968c
Branch: refs/heads/DAG-execplan
Commit: 0cbd968ca50c1c91efa1fce9be5ddc927b02b3b7
Parents: 6532324 02fd6cb
Author: Jihoon Son <ji...@apache.org>
Authored: Sat Nov 30 23:15:25 2013 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Sat Nov 30 23:15:25 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 8 ++
.../java/org/apache/tajo/datum/CharDatum.java | 4 +-
.../org/apache/tajo/datum/DatumFactory.java | 2 +-
.../java/org/apache/tajo/datum/Float4Datum.java | 14 +-
.../java/org/apache/tajo/datum/Float8Datum.java | 14 +-
.../java/org/apache/tajo/datum/Int2Datum.java | 20 ++-
.../java/org/apache/tajo/datum/Int4Datum.java | 14 +-
.../java/org/apache/tajo/datum/Int8Datum.java | 14 +-
.../java/org/apache/tajo/datum/NullDatum.java | 2 +-
.../java/org/apache/tajo/datum/TextDatum.java | 4 +-
tajo-common/src/main/proto/DataTypes.proto | 4 +-
.../apache/tajo/engine/eval/FunctionEval.java | 2 +-
.../org/apache/tajo/engine/eval/IsNullEval.java | 4 +-
.../tajo/engine/function/string/BitLength.java | 48 +++++++
.../tajo/engine/function/string/Substr.java | 75 +++++++++++
.../engine/planner/physical/SeqScanExec.java | 2 +-
.../java/org/apache/tajo/master/TajoMaster.java | 12 +-
.../tajo/webapp/QueryExecutorServlet.java | 19 ++-
.../webapps/admin/WEB-INF/jetty-web.xml | 23 ++++
.../src/main/resources/webapps/admin/getCSV.jsp | 31 +++++
.../resources/webapps/admin/query_executor.jsp | 131 +++++++++++++++++--
.../TestStringOperatorsAndFunctions.java | 44 +++++++
.../storage/BinarySerializeDeserialize.java | 2 +-
.../org/apache/tajo/storage/MergeScanner.java | 49 ++++---
.../java/org/apache/tajo/storage/RawFile.java | 4 +-
.../java/org/apache/tajo/storage/RowFile.java | 2 +-
.../tajo/storage/TextSerializeDeserialize.java | 2 +-
.../tajo/storage/trevni/TrevniAppender.java | 4 +-
.../tajo/storage/trevni/TrevniScanner.java | 2 +-
.../org/apache/tajo/storage/TestLazyTuple.java | 2 +-
.../apache/tajo/storage/TestMergeScanner.java | 33 ++++-
.../org/apache/tajo/storage/TestStorages.java | 6 +-
.../apache/tajo/storage/v2/TestStorages.java | 2 +-
33 files changed, 503 insertions(+), 96 deletions(-)
----------------------------------------------------------------------