Merge branch 'master' of http://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/1c9ab99e Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/1c9ab99e Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/1c9ab99e Branch: refs/heads/index_support Commit: 1c9ab99efc988235504d0047597153af6440db14 Parents: 93b8d02 491395a Author: Jihoon Son <[email protected]> Authored: Tue Nov 18 10:57:29 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Nov 18 10:57:29 2014 +0900 ---------------------------------------------------------------------- CHANGES | 8 + .../org/apache/tajo/catalog/CatalogUtil.java | 2 - .../src/main/proto/CatalogProtos.proto | 1 - .../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/client/TestTajoClient.java | 9 +- tajo-project/pom.xml | 2 +- tajo-storage/pom.xml | 11 +- .../tajo/storage/trevni/TrevniAppender.java | 202 ------------------- .../tajo/storage/trevni/TrevniScanner.java | 193 ------------------ .../apache/tajo/tuple/offheap/HeapTuple.java | 7 +- .../apache/tajo/tuple/offheap/UnSafeTuple.java | 7 +- .../src/main/resources/storage-default.xml | 18 +- .../apache/tajo/storage/TestMergeScanner.java | 4 +- .../org/apache/tajo/storage/TestStorages.java | 1 - .../src/test/resources/storage-default.xml | 18 +- 20 files changed, 132 insertions(+), 461 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/1c9ab99e/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto ----------------------------------------------------------------------
