Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
window_function

Conflicts:
        CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/90f84967
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/90f84967
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/90f84967

Branch: refs/heads/master
Commit: 90f849673be633ef8b968686c0fa98dc73a061ac
Parents: bf540a1 508ebed
Author: Hyunsik Choi <[email protected]>
Authored: Fri Apr 18 15:38:21 2014 +0900
Committer: Hyunsik Choi <[email protected]>
Committed: Fri Apr 18 15:38:21 2014 +0900

----------------------------------------------------------------------
 CHANGES.txt                                     | 11 +++-
 .../org/apache/tajo/catalog/DDLBuilder.java     |  4 +-
 .../tajo/catalog/store/HCatalogStore.java       |  7 +-
 .../java/org/apache/tajo/client/TajoDump.java   | 32 ++++++----
 .../apache/tajo/engine/planner/LogicalPlan.java | 28 +++++++-
 .../planner/logical/CreateDatabaseNode.java     |  4 +-
 .../engine/planner/logical/RelationNode.java    |  2 +
 .../tajo/engine/planner/logical/ScanNode.java   |  5 ++
 .../planner/logical/TableSubQueryNode.java      |  5 ++
 .../java/org/apache/tajo/QueryTestCaseBase.java | 35 ++++++++--
 .../apache/tajo/engine/query/TestDropTable.java |  5 +-
 .../tajo/engine/query/TestSelectQuery.java      | 22 +++++++
 .../org/apache/tajo/client/TestTajoDump.java    | 44 +++++++++++++
 .../queries/TestDropTable/drop_table_ddl.sql    |  2 +-
 .../resources/queries/TestNetTypes/testJoin.sql |  2 +-
 .../TestSelectQuery/testDatabaseRef1.sql        |  1 +
 .../TestSelectQuery/testDatabaseRef2.sql        |  1 +
 .../TestSelectQuery/testDatabaseRef3.sql        |  1 +
 .../results/TestNetTypes/testJoin.result        |  8 +--
 .../TestSelectQuery/testDatabaseRef.result      |  7 ++
 .../results/TestTajoDump/testDump1.result       | 17 +++++
 .../testBuildDDLQuotedTableName1.result         |  2 +-
 .../testBuildDDLQuotedTableName2.result         |  2 +-
 tajo-dist/src/main/bin/tajo                     | 10 ++-
 tajo-dist/src/main/bin/tajo-daemon.sh           |  2 +-
 tajo-dist/src/main/conf/log4j.properties        | 67 ++++++++++++++++++--
 26 files changed, 278 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/90f84967/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3027f71,c39875a..66905dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,10 +1,16 @@@
  Tajo Change Log
  
- 
  Release 0.9.0 - unreleased
  
 +  NEW FEATURES:
++  
+   IMPROVEMENT
  
- 
+     TAJO-769: A minor improvements for HCatalogStore (Fengdong Yu via hyunsik)
++    
 +  SUB TASKS:
 +
 +    TAJO-757: Add parser rule and algebraic expression for window function. 
(hyunsik)
  
  Release 0.8.0 - unreleased
  

Reply via email to