Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/6f060704 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/6f060704 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/6f060704 Branch: refs/heads/index_support Commit: 6f060704b93efc794d67d169c0cbc0921fab50b6 Parents: f2f8981 a0625a6 Author: Jihoon Son <[email protected]> Authored: Mon Nov 17 20:49:57 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Nov 17 20:49:57 2014 +0900 ---------------------------------------------------------------------- CHANGES | 12 +++++ .../java/org/apache/tajo/conf/TajoConf.java | 2 +- .../java/org/apache/tajo/datum/BlobDatum.java | 2 - .../java/org/apache/tajo/datum/TextDatum.java | 5 +- .../java/org/apache/tajo/util/KeyValueSet.java | 6 +-- .../java/org/apache/tajo/util/StringUtils.java | 57 ++++++++++++++++++++ .../java/org/apache/tajo/util/UnsafeUtil.java | 4 +- .../org/apache/tajo/datum/TestTextDatum.java | 14 +++++ .../org/apache/tajo/util/TestStringUtil.java | 24 +++++++++ .../org/apache/tajo/TajoTestingCluster.java | 1 + .../org/apache/tajo/client/TestTajoClient.java | 9 ++-- .../apache/tajo/tuple/offheap/HeapTuple.java | 7 ++- .../apache/tajo/tuple/offheap/UnSafeTuple.java | 7 ++- 13 files changed, 129 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
