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/7a38895d
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7a38895d
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7a38895d

Branch: refs/heads/index_support
Commit: 7a38895d4b15e7f7591c3591952394dbe2a5492a
Parents: 3b5c287 4c713fb
Author: Jihoon Son <[email protected]>
Authored: Thu Dec 25 19:28:16 2014 +0900
Committer: Jihoon Son <[email protected]>
Committed: Thu Dec 25 19:28:16 2014 +0900

----------------------------------------------------------------------
 CHANGES                                         |  17 +-
 .../org/apache/tajo/cli/tools/TajoDump.java     |   8 +-
 .../java/org/apache/tajo/cli/tsql/TajoCli.java  |  14 +-
 .../apache/tajo/cli/tsql/TajoFileHistory.java   |   8 +-
 .../org/apache/tajo/client/QueryClient.java     |   4 +-
 .../org/apache/tajo/client/QueryClientImpl.java |   4 +-
 .../apache/tajo/client/SessionConnection.java   |  10 +-
 .../java/org/apache/tajo/auth/UserRoleInfo.java |  80 +++
 .../java/org/apache/tajo/util/PlatformUtil.java |  65 +++
 .../DefaultFragmentScheduleAlgorithm.java       | 251 ---------
 .../tajo/master/FragmentScheduleAlgorithm.java  |  38 --
 .../FragmentScheduleAlgorithmFactory.java       |  68 ---
 .../master/GreedyFragmentScheduleAlgorithm.java | 429 ---------------
 .../apache/tajo/master/LazyTaskScheduler.java   | 529 -------------------
 .../querymaster/QueryMasterManagerService.java  |   6 +-
 tajo-core/src/main/resources/tajo-default.xml   |   7 +-
 .../org/apache/tajo/cli/tools/TestTajoDump.java |   5 +-
 .../apache/tajo/engine/eval/TestPredicates.java |   7 -
 .../engine/planner/TestQueryValidation.java     |   6 +
 .../invalid_store_format.sql                    |   1 +
 .../plan/verifier/PreLogicalPlanVerifier.java   |  18 +-
 .../parquet/ColumnChunkPageWriteStore.java      |   6 +-
 .../parquet/InternalParquetRecordReader.java    |  14 +-
 .../parquet/InternalParquetRecordWriter.java    |   4 +-
 24 files changed, 225 insertions(+), 1374 deletions(-)
----------------------------------------------------------------------


Reply via email to