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/31698f53 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/31698f53 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/31698f53 Branch: refs/heads/index_support Commit: 31698f537f8c19ee0fc16968add6e29229ddc2d0 Parents: 255046b 58bbb1b Author: Jihoon Son <[email protected]> Authored: Mon Feb 2 21:28:56 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Feb 2 21:28:56 2015 +0900 ---------------------------------------------------------------------- CHANGES | 9 ++ .../apache/tajo/catalog/CatalogConstants.java | 2 + .../org/apache/tajo/cli/tools/TajoDump.java | 16 +++- .../cli/tsql/DefaultTajoCliOutputFormatter.java | 3 +- .../org/apache/tajo/master/QueryInProgress.java | 2 +- .../org/apache/tajo/master/QueryManager.java | 4 - .../tajo/master/TajoMasterClientService.java | 8 +- .../apache/tajo/querymaster/QueryMaster.java | 1 - .../java/org/apache/tajo/querymaster/Stage.java | 23 ++++- .../main/proto/QueryCoordinatorProtocol.proto | 1 - .../org/apache/tajo/TajoTestingCluster.java | 96 ++++++++------------ .../org/apache/tajo/cli/tsql/TestTajoCli.java | 42 +++------ .../tajo/engine/query/TestInsertQuery.java | 3 +- .../apache/tajo/querymaster/TestKillQuery.java | 20 +++- .../TestTajoCli/testNonForwardQueryPause.result | 3 +- .../org/apache/tajo/storage/StorageManager.java | 40 ++++---- .../tajo/storage/TestFileStorageManager.java | 60 +++++++++--- 17 files changed, 192 insertions(+), 141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/31698f53/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogConstants.java ---------------------------------------------------------------------- diff --cc tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogConstants.java index c7df801,a8c5c9b..f19f77f --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogConstants.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogConstants.java @@@ -52,6 -52,7 +52,8 @@@ public class CatalogConstants public static final String COL_TABLESPACE_PK = "SPACE_ID"; public static final String COL_DATABASES_PK = "DB_ID"; public static final String COL_TABLES_PK = "TID"; + public static final String COL_INDEXES_PK = "INDEX_ID"; public static final String COL_TABLES_NAME = "TABLE_NAME"; + + public static final String INFORMATION_SCHEMA_DB_NAME = "information_schema"; } http://git-wip-us.apache.org/repos/asf/tajo/blob/31698f53/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/31698f53/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java ----------------------------------------------------------------------
