You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by bl...@apache.org on 2014/09/11 04:55:11 UTC
[01/12] git commit: TAJO-995: HiveMetaStoreClient wrapper should
retry the connection
Repository: tajo
Updated Branches:
refs/heads/TAJO-1027 [created] a51940a2a
TAJO-995: HiveMetaStoreClient wrapper should retry the connection
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7c98709f
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7c98709f
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7c98709f
Branch: refs/heads/TAJO-1027
Commit: 7c98709f0fcb06dfb675acae3d6489a6126f55b5
Parents: 242d6ad
Author: jinossy <ji...@gmail.com>
Authored: Wed Aug 6 17:43:35 2014 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Wed Aug 6 17:43:35 2014 +0900
----------------------------------------------------------------------
.../tajo/catalog/store/HCatalogStore.java | 11 ++++++-----
.../catalog/store/HCatalogStoreClientPool.java | 20 ++++++++++++++++----
.../apache/tajo/catalog/store/HCatalogUtil.java | 6 ++++++
3 files changed, 28 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/7c98709f/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
index 6f48348..d27f19c 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
@@ -48,6 +48,7 @@ import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.exception.InternalException;
import org.apache.tajo.storage.StorageConstants;
import org.apache.tajo.util.KeyValueSet;
+import org.apache.thrift.TException;
import java.io.IOException;
import java.util.*;
@@ -77,13 +78,13 @@ public class HCatalogStore extends CatalogConstants implements CatalogStore {
@Override
public boolean existTable(final String databaseName, final String tableName) throws CatalogException {
boolean exist = false;
- org.apache.hadoop.hive.ql.metadata.Table table = null;
+ org.apache.hadoop.hive.ql.metadata.Table table;
HCatalogStoreClientPool.HCatalogStoreClient client = null;
// get table
try {
client = clientPool.getClient();
- table = HCatUtil.getTable(client.getHiveClient(), databaseName, tableName);
+ table = HCatalogUtil.getTable(client.getHiveClient(), databaseName, tableName);
if (table != null) {
exist = true;
}
@@ -118,7 +119,7 @@ public class HCatalogStore extends CatalogConstants implements CatalogStore {
// get hive table schema
try {
client = clientPool.getClient();
- table = HCatUtil.getTable(client.getHiveClient(), databaseName, tableName);
+ table = HCatalogUtil.getTable(client.getHiveClient(), databaseName, tableName);
path = table.getPath();
} catch (NoSuchObjectException nsoe) {
throw new CatalogException("Table not found. - tableName:" + tableName, nsoe);
@@ -291,7 +292,7 @@ public class HCatalogStore extends CatalogConstants implements CatalogStore {
try {
client = clientPool.getClient();
return client.getHiveClient().getAllTables(databaseName);
- } catch (MetaException e) {
+ } catch (TException e) {
throw new CatalogException(e);
} finally {
if(client != null) client.release();
@@ -401,7 +402,7 @@ public class HCatalogStore extends CatalogConstants implements CatalogStore {
try {
client = clientPool.getClient();
return client.getHiveClient().getAllDatabases();
- } catch (MetaException e) {
+ } catch (TException e) {
throw new CatalogException(e);
} finally {
if (client != null) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/7c98709f/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStoreClientPool.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStoreClientPool.java b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStoreClientPool.java
index 2fff67c..8ccb100 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStoreClientPool.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStoreClientPool.java
@@ -16,7 +16,9 @@ package org.apache.tajo.catalog.store;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
+import org.apache.hadoop.hive.metastore.*;
+import org.apache.hadoop.hive.metastore.api.MetaException;
+import org.apache.hadoop.hive.metastore.api.Table;
import org.apache.log4j.Logger;
import java.util.Iterator;
@@ -41,12 +43,22 @@ public class HCatalogStoreClientPool {
* connection pool.
*/
public class HCatalogStoreClient {
- private final HiveMetaStoreClient hiveClient;
+ private final IMetaStoreClient hiveClient;
public AtomicBoolean isInUse = new AtomicBoolean(false);
private HCatalogStoreClient(HiveConf hiveConf) {
try {
- this.hiveClient = new HiveMetaStoreClient(hiveConf);
+ HiveMetaHookLoader hookLoader = new HiveMetaHookLoader() {
+ @Override
+ public HiveMetaHook getHook(Table table) throws MetaException {
+ /* metadata hook implementation, or null if this
+ * storage handler does not need any metadata notifications
+ */
+ return null;
+ }
+ };
+
+ this.hiveClient = RetryingMetaStoreClient.getProxy(hiveConf, hookLoader, HiveMetaStoreClient.class.getName());
clientPool.add(this);
LOG.info("MetaStoreClient created (size = " + clientPool.size() + ")");
} catch (Exception e) {
@@ -58,7 +70,7 @@ public class HCatalogStoreClientPool {
/**
* Returns the internal HiveMetaStoreClient object.
*/
- public HiveMetaStoreClient getHiveClient() {
+ public IMetaStoreClient getHiveClient() {
return hiveClient;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/7c98709f/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
index 9e60768..54fdb9d 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogUtil.java
@@ -20,9 +20,11 @@ package org.apache.tajo.catalog.store;
import com.google.common.base.Preconditions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat;
import org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat;
import org.apache.hadoop.hive.ql.io.RCFileOutputFormat;
+import org.apache.hadoop.hive.ql.metadata.Table;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hcatalog.common.HCatException;
import org.apache.hcatalog.data.schema.HCatFieldSchema;
@@ -30,6 +32,7 @@ import org.apache.hcatalog.data.schema.HCatSchema;
import org.apache.tajo.catalog.exception.CatalogException;
import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.common.TajoDataTypes;
+import org.apache.thrift.TException;
import parquet.hadoop.mapred.DeprecatedParquetOutputFormat;
public class HCatalogUtil {
@@ -137,4 +140,7 @@ public class HCatalogUtil {
}
}
+ public static Table getTable(IMetaStoreClient client, String dbName, String tableName) throws TException {
+ return new Table(client.getTable(dbName, tableName));
+ }
}
[08/12] git commit: Added dependency scope for hive-hcatalog-core.
Posted by bl...@apache.org.
Added dependency scope for hive-hcatalog-core.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/fca2e743
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/fca2e743
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/fca2e743
Branch: refs/heads/TAJO-1027
Commit: fca2e743d2c5978b297a804b42de4d04fd4dc578
Parents: 9147f43
Author: Jaehwa Jung <bl...@apache.org>
Authored: Thu Sep 4 15:09:19 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Thu Sep 4 15:09:19 2014 +0900
----------------------------------------------------------------------
tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/fca2e743/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
index 0aed5b5..203d56a 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
@@ -467,6 +467,7 @@
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-core</artifactId>
<version>${hive.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hive</groupId>
@@ -640,6 +641,7 @@
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-core</artifactId>
<version>${hive.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hive</groupId>
[03/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7a7b4fd2
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7a7b4fd2
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7a7b4fd2
Branch: refs/heads/TAJO-1027
Commit: 7a7b4fd26f61df89cacdb4fc41faf9c2abe456b2
Parents: 415d086 fcc5da0
Author: Jaehwa Jung <bl...@apache.org>
Authored: Mon Aug 11 11:28:48 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Mon Aug 11 11:28:48 2014 +0900
----------------------------------------------------------------------
CHANGES | 5 ++
.../function/builtin/CountValueDistinct.java | 4 +-
.../tajo/master/querymaster/Repartitioner.java | 1 +
.../java/org/apache/tajo/worker/FetchImpl.java | 23 +++++++++
.../tajo/engine/query/TestGroupByQuery.java | 46 +++++++++++------
.../apache/tajo/master/TestRepartitioner.java | 52 +++++++++++++++-----
.../testDistinctAggregationCaseByCase3.sql | 8 +++
.../testDistinctAggregationCaseByCase4.sql | 7 +++
.../testDistinctAggregationCaseByCase3.result | 3 ++
.../testDistinctAggregationCaseByCase4.result | 3 ++
10 files changed, 125 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
[04/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/45f5ed3a
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/45f5ed3a
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/45f5ed3a
Branch: refs/heads/TAJO-1027
Commit: 45f5ed3adba931f4706f26dda1d3c03240ee11d3
Parents: 7a7b4fd 87e7ba2
Author: Jaehwa Jung <bl...@apache.org>
Authored: Mon Aug 11 14:40:25 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Mon Aug 11 14:40:25 2014 +0900
----------------------------------------------------------------------
CHANGES | 8 +
.../java/org/apache/tajo/catalog/TableMeta.java | 14 +-
.../apache/tajo/catalog/TestKeyValueSet.java | 83 ++++++-
.../tajo/catalog/store/HCatalogStore.java | 28 +--
.../tajo/catalog/store/TestHCatalogStore.java | 12 +-
.../org/apache/tajo/catalog/TestCatalog.java | 10 +-
.../tajo/cli/DefaultTajoCliOutputFormatter.java | 16 +-
.../java/org/apache/tajo/cli/HelpCommand.java | 100 ++++----
.../java/org/apache/tajo/cli/SetCommand.java | 78 +++++-
.../main/java/org/apache/tajo/cli/TajoCli.java | 149 ++++++++----
.../apache/tajo/cli/TajoCliOutputFormatter.java | 5 +-
.../org/apache/tajo/cli/TajoShellCommand.java | 10 +-
.../main/java/org/apache/tajo/ConfigKey.java | 52 ++++
.../java/org/apache/tajo/OverridableConf.java | 235 +++++++++++++++++++
.../main/java/org/apache/tajo/SessionVars.java | 211 +++++++++++++++++
.../java/org/apache/tajo/conf/TajoConf.java | 199 ++++++++--------
.../main/java/org/apache/tajo/datum/Datum.java | 2 +-
.../java/org/apache/tajo/datum/NullDatum.java | 1 +
.../java/org/apache/tajo/util/KeyValueSet.java | 149 ++++++++++--
.../java/org/apache/tajo/util/StringUtils.java | 96 ++++++++
.../tajo/datum/TestArithmeticOperator.java | 4 +-
.../tajo/engine/planner/LogicalOptimizer.java | 9 +-
.../apache/tajo/engine/planner/LogicalPlan.java | 4 +-
.../engine/planner/LogicalPlanPreprocessor.java | 18 +-
.../engine/planner/LogicalPlanVerifier.java | 12 +-
.../tajo/engine/planner/LogicalPlanner.java | 35 ++-
.../engine/planner/PhysicalPlannerImpl.java | 44 +++-
.../engine/planner/PreLogicalPlanVerifier.java | 21 +-
.../engine/planner/global/GlobalPlanner.java | 18 +-
.../planner/physical/ExternalSortExec.java | 4 +-
.../HashBasedColPartitionStoreExec.java | 3 +-
.../SortBasedColPartitionStoreExec.java | 7 +-
.../engine/planner/physical/StoreTableExec.java | 6 +-
.../apache/tajo/engine/query/QueryContext.java | 144 ++++++------
.../tajo/engine/query/QueryUnitRequestImpl.java | 3 +-
.../org/apache/tajo/engine/utils/TupleUtil.java | 3 +-
.../org/apache/tajo/master/GlobalEngine.java | 94 ++++----
.../tajo/master/TajoMasterClientService.java | 31 ++-
.../apache/tajo/master/querymaster/Query.java | 4 +-
.../tajo/master/querymaster/QueryMaster.java | 11 +-
.../querymaster/QueryMasterManagerService.java | 4 +-
.../master/querymaster/QueryMasterTask.java | 4 +-
.../tajo/master/querymaster/Repartitioner.java | 16 +-
.../tajo/master/querymaster/SubQuery.java | 15 +-
.../org/apache/tajo/master/session/Session.java | 50 ++--
.../session/SessionLivelinessMonitor.java | 2 +-
.../main/java/org/apache/tajo/worker/Task.java | 4 +-
.../apache/tajo/worker/TaskAttemptContext.java | 12 +-
.../resources/webapps/worker/querydetail.jsp | 10 +
.../apache/tajo/LocalTajoTestingUtility.java | 5 +
.../java/org/apache/tajo/QueryTestCaseBase.java | 2 +-
.../test/java/org/apache/tajo/TpchTestBase.java | 2 +-
.../tajo/cli/TestDefaultCliOutputFormatter.java | 47 +++-
.../java/org/apache/tajo/cli/TestTajoCli.java | 172 ++++++++------
.../org/apache/tajo/client/TestTajoClient.java | 8 +-
.../apache/tajo/engine/eval/ExprTestBase.java | 9 +-
.../tajo/engine/eval/TestEvalTreeUtil.java | 16 +-
.../engine/planner/TestLogicalOptimizer.java | 20 +-
.../tajo/engine/planner/TestLogicalPlan.java | 3 +-
.../tajo/engine/planner/TestLogicalPlanner.java | 135 ++++++++---
.../tajo/engine/planner/TestPlannerUtil.java | 5 +-
.../planner/global/TestBroadcastJoinPlan.java | 62 ++---
.../planner/physical/TestBNLJoinExec.java | 9 +-
.../planner/physical/TestBSTIndexExec.java | 4 +-
.../planner/physical/TestExternalSortExec.java | 4 +-
.../physical/TestFullOuterHashJoinExec.java | 24 +-
.../physical/TestFullOuterMergeJoinExec.java | 29 +--
.../planner/physical/TestHashAntiJoinExec.java | 4 +-
.../planner/physical/TestHashJoinExec.java | 19 +-
.../planner/physical/TestHashSemiJoinExec.java | 4 +-
.../physical/TestLeftOuterHashJoinExec.java | 28 +--
.../physical/TestLeftOuterNLJoinExec.java | 25 +-
.../planner/physical/TestMergeJoinExec.java | 4 +-
.../engine/planner/physical/TestNLJoinExec.java | 17 +-
.../planner/physical/TestPhysicalPlanner.java | 100 ++++----
.../physical/TestProgressExternalSortExec.java | 4 +-
.../physical/TestRightOuterHashJoinExec.java | 16 +-
.../physical/TestRightOuterMergeJoinExec.java | 32 +--
.../engine/planner/physical/TestSortExec.java | 4 +-
.../tajo/engine/query/TestGroupByQuery.java | 22 +-
.../tajo/engine/query/TestJoinBroadcast.java | 8 +-
.../apache/tajo/engine/query/TestJoinQuery.java | 90 +++----
.../tajo/engine/query/TestNullValues.java | 14 +-
.../tajo/engine/query/TestSelectQuery.java | 10 +-
.../apache/tajo/engine/query/TestSortQuery.java | 8 +-
.../tajo/engine/query/TestTablePartitions.java | 43 ++++
.../org/apache/tajo/jdbc/TestResultSet.java | 2 +-
.../tajo/master/TestExecutionBlockCursor.java | 6 +-
.../apache/tajo/master/TestGlobalPlanner.java | 4 +-
.../querymaster/TestQueryUnitStatusUpdate.java | 2 +-
.../tajo/worker/TestRangeRetrieverHandler.java | 8 +-
.../TestTablePartitions/lineitemspecial.tbl | 5 +
.../TestTablePartitions/lineitemspecial_ddl.sql | 3 +
.../TestSpecialCharPartitionKeys1.result | 4 +
.../TestSpecialCharPartitionKeys2.result | 3 +
.../TestTajoCli/testHelpSessionVars.result | 36 +++
...estSelectResultWithNullTrueDeprecated.result | 9 +
.../testStopWhenErrorDeprecated.result | 6 +
.../java/org/apache/tajo/storage/Appender.java | 2 +-
.../java/org/apache/tajo/storage/CSVFile.java | 11 +-
.../org/apache/tajo/storage/StorageUtil.java | 18 +-
.../org/apache/tajo/storage/avro/AvroUtil.java | 17 +-
.../org/apache/tajo/storage/rcfile/RCFile.java | 10 +-
.../sequencefile/SequenceFileAppender.java | 30 ++-
.../sequencefile/SequenceFileScanner.java | 21 +-
.../apache/tajo/storage/v2/RCFileScanner.java | 2 +-
.../tajo/storage/TestCompressionStorages.java | 12 +
.../org/apache/tajo/storage/TestStorages.java | 13 +
108 files changed, 2272 insertions(+), 1010 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/45f5ed3a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
----------------------------------------------------------------------
[05/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/aa01e838
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/aa01e838
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/aa01e838
Branch: refs/heads/TAJO-1027
Commit: aa01e83859ef553ac4eb90c1678e3bc6be20c6c9
Parents: 45f5ed3 96b6c2a
Author: Jaehwa Jung <bl...@apache.org>
Authored: Mon Aug 18 18:56:24 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Mon Aug 18 18:56:24 2014 +0900
----------------------------------------------------------------------
CHANGES | 21 +++
LICENSE | 25 +++
NOTICE | 6 +
.../main/java/org/apache/tajo/cli/TajoCli.java | 10 +-
.../java/org/apache/tajo/client/TajoAdmin.java | 2 +-
.../java/org/apache/tajo/client/TajoClient.java | 26 +++-
tajo-common/pom.xml | 15 ++
.../java/org/apache/tajo/datum/TextDatum.java | 8 +-
.../java/org/apache/tajo/unit/StorageUnit.java | 2 +-
.../org/apache/tajo/datum/TestTextDatum.java | 36 ++++-
.../org/apache/tajo/engine/eval/BinaryEval.java | 14 +-
.../apache/tajo/engine/eval/EvalTreeUtil.java | 23 ++-
.../apache/tajo/engine/eval/FunctionEval.java | 6 +-
.../eval/EvalTreeOptimizationRule.java | 27 ++++
.../optimizer/eval/EvalTreeOptimizer.java | 76 +++++++++
.../tajo/engine/optimizer/eval/Prioritized.java | 30 ++++
.../optimizer/eval/rules/ConstantFolding.java | 92 +++++++++++
.../eval/rules/ConstantPropagation.java | 112 ++++++++++++++
.../tajo/engine/planner/ExprAnnotator.java | 12 +-
.../tajo/engine/planner/ExprNormalizer.java | 2 +-
.../apache/tajo/engine/planner/LogicalPlan.java | 56 ++++++-
.../engine/planner/LogicalPlanPreprocessor.java | 120 +++++++--------
.../tajo/engine/planner/LogicalPlanner.java | 154 ++++++++++++-------
.../tajo/engine/planner/NamedExprsManager.java | 15 +-
.../apache/tajo/engine/planner/PlannerUtil.java | 2 +-
.../tajo/engine/planner/TypeDeterminant.java | 41 ++---
.../planner/rewrite/ProjectionPushDownRule.java | 2 +-
.../apache/tajo/master/querymaster/Query.java | 25 ++-
.../tajo/master/querymaster/QueryMaster.java | 14 ++
.../master/querymaster/QueryMasterTask.java | 4 +-
.../tajo/master/querymaster/SubQuery.java | 85 ++++++----
.../tajo/worker/TajoResourceAllocator.java | 2 +-
.../tajo/worker/TajoWorkerClientService.java | 12 +-
.../org/apache/tajo/client/TestTajoClient.java | 2 +-
.../tajo/engine/eval/TestEvalTreeUtil.java | 14 +-
.../tajo/engine/planner/TestLogicalPlan.java | 34 +---
.../tajo/engine/query/TestGroupByQuery.java | 54 +++++++
.../apache/tajo/engine/query/TestJoinQuery.java | 28 ++++
.../tajo/engine/query/TestSelectQuery.java | 11 +-
.../apache/tajo/engine/query/TestSortQuery.java | 17 ++
.../tajo/engine/query/TestWindowQuery.java | 7 +
.../testGroupByWithConstantKeys3.sql | 8 +
.../testGroupByWithConstantKeys4.sql | 12 ++
.../testGroupByWithConstantKeys5.sql | 13 ++
.../testLeftOuterJoinWithConstantExpr4.sql | 6 +
.../testLeftOuterJoinWithConstantExpr5.sql | 9 ++
...SelectSameConstantsWithDifferentAliases3.sql | 10 ++
.../TestSortQuery/testSortWithConstKeys.sql | 10 ++
.../queries/TestWindowQuery/testWindow8.sql | 7 +
.../testGroupByWithConstantKeys3.result | 3 +
.../testGroupByWithConstantKeys4.result | 5 +
.../testGroupByWithConstantKeys5.result | 5 +
.../testLeftOuterJoinWithConstantExpr4.result | 7 +
.../testLeftOuterJoinWithConstantExpr5.result | 6 +
.../TestSelectQuery/testSelectAsterisk5.result | 2 +-
...ectSameConstantsWithDifferentAliases3.result | 7 +
.../TestSortQuery/testSortWithConstKeys.result | 7 +
.../testLocalQueryWithoutFrom.result | 4 +-
.../results/TestWindowQuery/testWindow8.result | 7 +
tajo-project/pom.xml | 37 ++++-
tajo-project/src/site/apt/index.apt | 2 +
61 files changed, 1141 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
[06/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/b33a9450
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/b33a9450
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/b33a9450
Branch: refs/heads/TAJO-1027
Commit: b33a94509c1a007b56785435c8e16640ffde91b7
Parents: aa01e83 7c5ef87
Author: Jaehwa Jung <bl...@apache.org>
Authored: Thu Sep 4 11:14:19 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Thu Sep 4 11:14:19 2014 +0900
----------------------------------------------------------------------
CHANGES | 35 +
LICENSE | 31 +
pom.xml | 52 +-
tajo-algebra/pom.xml | 13 +-
tajo-catalog/pom.xml | 12 +-
tajo-catalog/tajo-catalog-client/pom.xml | 13 +-
.../tajo/catalog/AbstractCatalogClient.java | 75 +-
tajo-catalog/tajo-catalog-common/pom.xml | 13 +-
.../org/apache/tajo/catalog/CatalogUtil.java | 2 +-
.../org/apache/tajo/catalog/FunctionDesc.java | 2 +-
.../apache/tajo/catalog/TestKeyValueSet.java | 1 -
tajo-catalog/tajo-catalog-drivers/pom.xml | 11 +-
.../tajo-catalog-drivers/tajo-hcatalog/pom.xml | 19 +-
tajo-catalog/tajo-catalog-server/pom.xml | 20 +-
.../org/apache/tajo/catalog/CatalogServer.java | 2 +-
tajo-client/pom.xml | 14 +-
.../main/java/org/apache/tajo/cli/TajoCli.java | 24 +-
.../org/apache/tajo/cli/TajoHAAdminCommand.java | 57 +
.../java/org/apache/tajo/client/TajoAdmin.java | 27 +-
.../java/org/apache/tajo/client/TajoClient.java | 78 +-
.../org/apache/tajo/client/TajoGetConf.java | 16 +-
.../org/apache/tajo/client/TajoHAAdmin.java | 210 ++
.../apache/tajo/client/TajoHAClientUtil.java | 87 +
tajo-common/pom.xml | 13 +-
.../java/org/apache/tajo/OverridableConf.java | 12 +
.../main/java/org/apache/tajo/SessionVars.java | 2 +-
.../java/org/apache/tajo/TajoConstants.java | 5 +
.../java/org/apache/tajo/conf/TajoConf.java | 16 +-
.../java/org/apache/tajo/datum/CharDatum.java | 5 +-
.../main/java/org/apache/tajo/datum/Datum.java | 11 +-
.../org/apache/tajo/datum/DatumFactory.java | 32 +-
.../java/org/apache/tajo/datum/Inet4Datum.java | 5 +
.../java/org/apache/tajo/datum/NullDatum.java | 5 +
.../java/org/apache/tajo/datum/TextDatum.java | 8 +
.../java/org/apache/tajo/util/BitArray.java | 2 +-
.../org/apache/tajo/util/CommonTestingUtil.java | 24 +-
.../org/apache/tajo/util/HAServiceUtil.java | 293 ++
.../java/org/apache/tajo/util/KeyValueSet.java | 18 +-
.../main/java/org/apache/tajo/util/Pair.java | 44 +-
.../java/org/apache/tajo/util/StringUtils.java | 34 +
.../apache/tajo/util/datetime/DateTimeUtil.java | 35 +
tajo-core/pom.xml | 35 +-
.../tajo/engine/codegen/CaseWhenEmitter.java | 210 ++
.../engine/codegen/CaseWhenSwitchGenerator.java | 92 +
.../tajo/engine/codegen/CodeGenUtils.java | 41 +
.../tajo/engine/codegen/CompilationError.java | 31 +
.../tajo/engine/codegen/EvalCodeEmitter.java | 27 +
.../tajo/engine/codegen/EvalCodeGenContext.java | 223 ++
.../tajo/engine/codegen/EvalCodeGenerator.java | 840 ++++++
.../engine/codegen/ExecutorPreCompiler.java | 213 ++
.../tajo/engine/codegen/TajoClassLoader.java | 30 +
.../engine/codegen/TajoGeneratorAdapter.java | 953 +++++++
.../engine/codegen/VariablesPreBuilder.java | 83 +
.../apache/tajo/engine/eval/AlgebraicUtil.java | 6 +-
.../tajo/engine/eval/BetweenPredicateEval.java | 26 +
.../org/apache/tajo/engine/eval/BinaryEval.java | 7 +
.../apache/tajo/engine/eval/CaseWhenEval.java | 38 +-
.../org/apache/tajo/engine/eval/ConstEval.java | 12 +-
.../org/apache/tajo/engine/eval/EvalNode.java | 6 +-
.../apache/tajo/engine/eval/EvalTreeUtil.java | 98 +-
.../org/apache/tajo/engine/eval/EvalType.java | 56 +-
.../org/apache/tajo/engine/eval/FieldEval.java | 12 +-
.../apache/tajo/engine/eval/FunctionEval.java | 25 +-
.../tajo/engine/eval/LikePredicateEval.java | 4 +
.../engine/eval/PatternMatchPredicateEval.java | 8 +
.../tajo/engine/eval/RowConstantEval.java | 10 +
.../engine/eval/SimilarToPredicateEval.java | 5 +
.../tajo/engine/eval/SimpleEvalNodeVisitor.java | 27 +-
.../org/apache/tajo/engine/eval/UnaryEval.java | 11 +
.../function/builtin/CoalesceBoolean.java | 4 +-
.../engine/function/builtin/CoalesceDate.java | 3 +-
.../engine/function/builtin/CoalesceDouble.java | 3 +-
.../engine/function/builtin/CoalesceLong.java | 3 +-
.../engine/function/builtin/CoalesceString.java | 3 +-
.../engine/function/builtin/CoalesceTime.java | 3 +-
.../function/builtin/CoalesceTimestamp.java | 3 +-
.../engine/plan/EvalTreeProtoDeserializer.java | 218 ++
.../engine/plan/EvalTreeProtoSerializer.java | 308 ++
.../tajo/engine/planner/ExprAnnotator.java | 17 +-
.../apache/tajo/engine/planner/ExprFinder.java | 2 +-
.../engine/planner/LogicalPlanPreprocessor.java | 22 +-
.../engine/planner/PhysicalPlannerImpl.java | 11 +
.../apache/tajo/engine/planner/Projector.java | 33 +-
.../engine/planner/RangePartitionAlgorithm.java | 61 +-
.../engine/planner/UniformRangePartition.java | 309 +-
.../tajo/engine/planner/logical/HavingNode.java | 15 +-
.../planner/logical/PersistentStoreNode.java | 2 +-
.../tajo/engine/planner/logical/ScanNode.java | 12 +-
.../engine/planner/logical/SelectableNode.java | 48 +
.../engine/planner/logical/SelectionNode.java | 15 +-
.../engine/planner/logical/join/JoinGraph.java | 2 +-
.../engine/planner/physical/BNLJoinExec.java | 9 +-
.../planner/physical/BSTIndexScanExec.java | 2 +-
.../physical/BasicPhysicalExecutorVisitor.java | 2 +
.../planner/physical/BinaryPhysicalExec.java | 2 +
.../planner/physical/ColPartitionStoreExec.java | 55 +-
.../planner/physical/ExternalSortExec.java | 4 +
.../HashBasedColPartitionStoreExec.java | 6 +-
.../planner/physical/HashFullOuterJoinExec.java | 8 +-
.../engine/planner/physical/HashJoinExec.java | 7 +-
.../planner/physical/HashLeftOuterJoinExec.java | 7 +-
.../planner/physical/HashLeftSemiJoinExec.java | 4 +
.../physical/HashShuffleFileWriteExec.java | 125 +-
.../physical/MergeFullOuterJoinExec.java | 7 +-
.../engine/planner/physical/MergeJoinExec.java | 7 +-
.../engine/planner/physical/NLJoinExec.java | 2 +-
.../planner/physical/NLLeftOuterJoinExec.java | 2 +-
.../physical/PartitionMergeScanExec.java | 5 +-
.../engine/planner/physical/PhysicalExec.java | 11 +-
.../physical/PhysicalExecutorVisitor.java | 2 +
.../planner/physical/PhysicalPlanUtil.java | 64 +
.../physical/PhysicalPlanningException.java | 31 -
.../engine/planner/physical/ProjectionExec.java | 2 +-
.../physical/RightOuterMergeJoinExec.java | 7 +-
.../engine/planner/physical/SelectionExec.java | 8 +-
.../engine/planner/physical/SeqScanExec.java | 34 +-
.../SortBasedColPartitionStoreExec.java | 40 +-
.../engine/planner/physical/StoreTableExec.java | 64 +-
.../planner/physical/UnaryPhysicalExec.java | 5 +
.../planner/rewrite/FilterPushDownRule.java | 19 +-
.../tajo/engine/query/QueryUnitRequestImpl.java | 2 +-
.../org/apache/tajo/master/GlobalEngine.java | 16 +-
.../tajo/master/LaunchTaskRunnersEvent.java | 45 +
.../apache/tajo/master/TajoContainerProxy.java | 34 +-
.../java/org/apache/tajo/master/TajoMaster.java | 38 +-
.../org/apache/tajo/master/ha/HAService.java | 56 +
.../tajo/master/ha/HAServiceHDFSImpl.java | 278 ++
.../apache/tajo/master/ha/TajoMasterInfo.java | 89 +
.../apache/tajo/master/querymaster/Query.java | 3 +-
.../tajo/master/querymaster/QueryMaster.java | 115 +-
.../querymaster/QueryMasterManagerService.java | 13 +
.../master/querymaster/QueryMasterTask.java | 50 +-
.../tajo/master/querymaster/QueryUnit.java | 83 +
.../tajo/master/querymaster/Repartitioner.java | 346 ++-
.../tajo/master/querymaster/SubQuery.java | 88 +-
.../org/apache/tajo/master/session/Session.java | 8 +-
.../tajo/webapp/QueryExecutorServlet.java | 5 +
.../worker/ExecutionBlockSharedResource.java | 139 +
.../java/org/apache/tajo/worker/FetchImpl.java | 32 +
.../java/org/apache/tajo/worker/Fetcher.java | 3 +-
.../tajo/worker/TajoResourceAllocator.java | 43 +-
.../java/org/apache/tajo/worker/TajoWorker.java | 158 +-
.../tajo/worker/TajoWorkerManagerService.java | 24 +-
.../main/java/org/apache/tajo/worker/Task.java | 80 +-
.../apache/tajo/worker/TaskAttemptContext.java | 60 +-
.../java/org/apache/tajo/worker/TaskRunner.java | 22 +-
.../apache/tajo/worker/TaskRunnerManager.java | 127 +-
.../tajo/worker/WorkerHeartbeatService.java | 42 +-
tajo-core/src/main/proto/Plan.proto | 209 ++
.../src/main/proto/QueryMasterProtocol.proto | 1 +
.../src/main/proto/TajoWorkerProtocol.proto | 33 +
.../resources/webapps/admin/catalogview.jsp | 13 +-
.../main/resources/webapps/admin/cluster.jsp | 87 +-
.../src/main/resources/webapps/admin/index.jsp | 47 +-
.../src/main/resources/webapps/admin/query.jsp | 13 +-
.../resources/webapps/admin/query_executor.jsp | 13 +-
.../apache/tajo/LocalTajoTestingUtility.java | 6 +-
.../org/apache/tajo/TajoTestingCluster.java | 47 +-
.../engine/codegen/TestEvalCodeGenerator.java | 311 ++
.../engine/codegen/TestGeneratorAdapter.java | 41 +
.../apache/tajo/engine/eval/ExprTestBase.java | 102 +-
.../apache/tajo/engine/eval/TestEvalTree.java | 21 +-
.../tajo/engine/eval/TestEvalTreeUtil.java | 7 +
.../apache/tajo/engine/eval/TestPredicates.java | 17 +
.../tajo/engine/eval/TestSQLExpression.java | 24 +-
.../function/TestConditionalExpressions.java | 123 +-
.../function/TestPatternMatchingPredicates.java | 2 +-
.../planner/TestUniformRangePartition.java | 635 ++++-
.../planner/physical/TestPhysicalPlanner.java | 238 +-
.../tajo/engine/query/TestGroupByQuery.java | 8 +-
.../tajo/engine/query/TestSelectQuery.java | 14 +
.../apache/tajo/engine/query/TestSortQuery.java | 73 +-
.../tajo/engine/query/TestTablePartitions.java | 72 +
.../apache/tajo/master/TestRepartitioner.java | 309 +-
.../tajo/master/ha/TestHAServiceHDFSImpl.java | 133 +
.../querymaster/TestIntermediateEntry.java | 53 +
.../querymaster/TestQueryUnitStatusUpdate.java | 6 +-
.../tajo/scheduler/TestFifoScheduler.java | 47 +-
.../org/apache/tajo/worker/TestFetcher.java | 23 +-
.../testColumnEqualityButNotJoinCondition1.sql | 7 +
.../testColumnEqualityButNotJoinCondition2.sql | 7 +
.../TestSortQuery/testSortOnNullColumn.sql | 13 +
.../TestSortQuery/testSortOnUnicodeTextAsc.sql | 6 +
.../TestSortQuery/testSortOnUnicodeTextDesc.sql | 6 +
...estColumnEqualityButNotJoinCondition1.result | 3 +
...estColumnEqualityButNotJoinCondition2.result | 6 +
.../TestSortQuery/testSortOnNullColumn.result | 6 +
.../testSortOnUnicodeTextAsc.result | 6 +
.../testSortOnUnicodeTextDesc.result | 6 +
.../TestTajoCli/testHelpSessionVars.result | 1 +
tajo-dist/pom.xml | 22 +
tajo-dist/src/main/bin/start-tajo.sh | 18 +-
tajo-dist/src/main/bin/stop-tajo.sh | 19 +-
tajo-dist/src/main/bin/tajo | 18 +-
tajo-dist/src/main/bin/tajo-daemons.sh | 1 +
tajo-dist/src/main/conf/tajo-env.sh | 13 +-
tajo-docs/pom.xml | 18 +
tajo-docs/src/main/sphinx/configuration.rst | 3 +-
.../sphinx/configuration/ha_configuration.rst | 135 +
tajo-jdbc/pom.xml | 13 +-
.../org/apache/tajo/jdbc/MetaDataTuple.java | 11 +
tajo-maven-plugins/pom.xml | 12 +
tajo-project/pom.xml | 23 +-
tajo-rpc/pom.xml | 12 +
tajo-storage/pom.xml | 18 +-
.../tajo/storage/AbstractStorageManager.java | 1 -
.../java/org/apache/tajo/storage/Appender.java | 2 +
.../org/apache/tajo/storage/FileAppender.java | 4 +
.../org/apache/tajo/storage/FrameTuple.java | 11 +
.../tajo/storage/HashShuffleAppender.java | 209 ++
.../storage/HashShuffleAppenderManager.java | 225 ++
.../java/org/apache/tajo/storage/LazyTuple.java | 14 +-
.../java/org/apache/tajo/storage/RawFile.java | 1 +
.../org/apache/tajo/storage/RowStoreUtil.java | 8 +-
.../java/org/apache/tajo/storage/Tuple.java | 5 +
.../org/apache/tajo/storage/TupleRange.java | 29 +-
.../java/org/apache/tajo/storage/VTuple.java | 11 +
.../tajo/storage/parquet/ParquetAppender.java | 15 +-
.../parquet/InternalParquetRecordWriter.java | 4 +
.../thirdparty/parquet/ParquetWriter.java | 4 +
.../tajo/storage/TestCompressionStorages.java | 2 -
.../tajo/storage/parquet/TestReadWrite.java | 7 +-
tajo-thirdparty/asm/pom.xml | 180 ++
.../org/objectweb/asm/AnnotationVisitor.java | 169 ++
.../org/objectweb/asm/AnnotationWriter.java | 318 +++
.../tajo/org/objectweb/asm/Attribute.java | 255 ++
.../tajo/org/objectweb/asm/ByteVector.java | 312 ++
.../tajo/org/objectweb/asm/ClassReader.java | 2202 ++++++++++++++
.../tajo/org/objectweb/asm/ClassVisitor.java | 286 ++
.../tajo/org/objectweb/asm/ClassWriter.java | 1706 +++++++++++
.../apache/tajo/org/objectweb/asm/Context.java | 110 +
.../org/apache/tajo/org/objectweb/asm/Edge.java | 75 +
.../tajo/org/objectweb/asm/FieldVisitor.java | 121 +
.../tajo/org/objectweb/asm/FieldWriter.java | 273 ++
.../apache/tajo/org/objectweb/asm/Frame.java | 1453 ++++++++++
.../apache/tajo/org/objectweb/asm/Handle.java | 170 ++
.../apache/tajo/org/objectweb/asm/Handler.java | 121 +
.../org/apache/tajo/org/objectweb/asm/Item.java | 311 ++
.../apache/tajo/org/objectweb/asm/Label.java | 560 ++++
.../tajo/org/objectweb/asm/MethodVisitor.java | 662 +++++
.../tajo/org/objectweb/asm/MethodWriter.java | 2685 ++++++++++++++++++
.../apache/tajo/org/objectweb/asm/Opcodes.java | 358 +++
.../org/apache/tajo/org/objectweb/asm/Type.java | 895 ++++++
.../tajo/org/objectweb/asm/attrs/package.html | 66 +
.../objectweb/asm/commons/AdviceAdapter.java | 625 ++++
.../objectweb/asm/commons/AnalyzerAdapter.java | 920 ++++++
.../asm/commons/CodeSizeEvaluator.java | 217 ++
.../objectweb/asm/commons/GeneratorAdapter.java | 1641 +++++++++++
.../asm/commons/InstructionAdapter.java | 1090 +++++++
.../asm/commons/JSRInlinerAdapter.java | 746 +++++
.../asm/commons/LocalVariablesSorter.java | 361 +++
.../tajo/org/objectweb/asm/commons/Method.java | 282 ++
.../org/objectweb/asm/commons/Remapper.java | 223 ++
.../asm/commons/RemappingAnnotationAdapter.java | 79 +
.../asm/commons/RemappingClassAdapter.java | 126 +
.../asm/commons/RemappingFieldAdapter.java | 62 +
.../asm/commons/RemappingMethodAdapter.java | 161 ++
.../asm/commons/RemappingSignatureAdapter.java | 155 +
.../asm/commons/SerialVersionUIDAdder.java | 533 ++++
.../objectweb/asm/commons/SimpleRemapper.java | 69 +
.../objectweb/asm/commons/StaticInitMerger.java | 96 +
.../asm/commons/TableSwitchGenerator.java | 57 +
.../asm/commons/TryCatchBlockSorter.java | 92 +
.../tajo/org/objectweb/asm/commons/package.html | 66 +
.../optimizer/AnnotationConstantsCollector.java | 147 +
.../asm/optimizer/ClassConstantsCollector.java | 184 ++
.../objectweb/asm/optimizer/ClassOptimizer.java | 167 ++
.../org/objectweb/asm/optimizer/Constant.java | 323 +++
.../objectweb/asm/optimizer/ConstantPool.java | 249 ++
.../asm/optimizer/FieldConstantsCollector.java | 75 +
.../objectweb/asm/optimizer/JarOptimizer.java | 234 ++
.../asm/optimizer/MethodConstantsCollector.java | 161 ++
.../asm/optimizer/MethodOptimizer.java | 167 ++
.../objectweb/asm/optimizer/NameMapping.java | 114 +
.../org/objectweb/asm/optimizer/Shrinker.java | 283 ++
.../objectweb/asm/optimizer/jdk1.2.2_017.txt.gz | Bin 0 -> 113814 bytes
.../objectweb/asm/optimizer/jdk1.3.1_19.txt.gz | Bin 0 -> 128067 bytes
.../asm/optimizer/shrink-annotations.properties | 71 +
.../asm/optimizer/shrink-frames.properties | 80 +
.../asm/optimizer/shrink-resize.properties | 55 +
.../asm/optimizer/shrink-signatures.properties | 61 +
.../asm/optimizer/shrink-writer.properties | 84 +
.../objectweb/asm/optimizer/shrink.properties | 372 +++
.../apache/tajo/org/objectweb/asm/package.html | 105 +
.../asm/signature/SignatureReader.java | 228 ++
.../asm/signature/SignatureVisitor.java | 235 ++
.../asm/signature/SignatureWriter.java | 227 ++
.../org/objectweb/asm/signature/package.html | 54 +
.../objectweb/asm/tree/AbstractInsnNode.java | 248 ++
.../org/objectweb/asm/tree/AnnotationNode.java | 225 ++
.../tajo/org/objectweb/asm/tree/ClassNode.java | 345 +++
.../org/objectweb/asm/tree/FieldInsnNode.java | 108 +
.../tajo/org/objectweb/asm/tree/FieldNode.java | 243 ++
.../tajo/org/objectweb/asm/tree/FrameNode.java | 210 ++
.../org/objectweb/asm/tree/IincInsnNode.java | 82 +
.../org/objectweb/asm/tree/InnerClassNode.java | 101 +
.../tajo/org/objectweb/asm/tree/InsnList.java | 600 ++++
.../tajo/org/objectweb/asm/tree/InsnNode.java | 87 +
.../org/objectweb/asm/tree/IntInsnNode.java | 87 +
.../asm/tree/InvokeDynamicInsnNode.java | 100 +
.../org/objectweb/asm/tree/JumpInsnNode.java | 95 +
.../tajo/org/objectweb/asm/tree/LabelNode.java | 78 +
.../org/objectweb/asm/tree/LdcInsnNode.java | 78 +
.../org/objectweb/asm/tree/LineNumberNode.java | 84 +
.../objectweb/asm/tree/LocalVariableNode.java | 112 +
.../asm/tree/LookupSwitchInsnNode.java | 117 +
.../org/objectweb/asm/tree/MethodInsnNode.java | 109 +
.../tajo/org/objectweb/asm/tree/MethodNode.java | 597 ++++
.../asm/tree/MultiANewArrayInsnNode.java | 83 +
.../objectweb/asm/tree/TableSwitchInsnNode.java | 113 +
.../objectweb/asm/tree/TryCatchBlockNode.java | 94 +
.../org/objectweb/asm/tree/TypeInsnNode.java | 90 +
.../org/objectweb/asm/tree/VarInsnNode.java | 93 +
.../objectweb/asm/tree/analysis/Analyzer.java | 549 ++++
.../asm/tree/analysis/AnalyzerException.java | 61 +
.../asm/tree/analysis/BasicInterpreter.java | 358 +++
.../objectweb/asm/tree/analysis/BasicValue.java | 111 +
.../asm/tree/analysis/BasicVerifier.java | 433 +++
.../org/objectweb/asm/tree/analysis/Frame.java | 729 +++++
.../asm/tree/analysis/Interpreter.java | 226 ++
.../asm/tree/analysis/SimpleVerifier.java | 320 +++
.../objectweb/asm/tree/analysis/SmallSet.java | 134 +
.../asm/tree/analysis/SourceInterpreter.java | 198 ++
.../asm/tree/analysis/SourceValue.java | 97 +
.../objectweb/asm/tree/analysis/Subroutine.java | 90 +
.../org/objectweb/asm/tree/analysis/Value.java | 45 +
.../objectweb/asm/tree/analysis/package.html | 85 +
.../tajo/org/objectweb/asm/tree/package.html | 210 ++
.../tajo/org/objectweb/asm/util/ASMifiable.java | 56 +
.../tajo/org/objectweb/asm/util/ASMifier.java | 1151 ++++++++
.../asm/util/CheckAnnotationAdapter.java | 136 +
.../objectweb/asm/util/CheckClassAdapter.java | 914 ++++++
.../objectweb/asm/util/CheckFieldAdapter.java | 100 +
.../objectweb/asm/util/CheckMethodAdapter.java | 1397 +++++++++
.../asm/util/CheckSignatureAdapter.java | 330 +++
.../tajo/org/objectweb/asm/util/Printer.java | 500 ++++
.../org/objectweb/asm/util/Textifiable.java | 56 +
.../tajo/org/objectweb/asm/util/Textifier.java | 1200 ++++++++
.../asm/util/TraceAnnotationVisitor.java | 89 +
.../objectweb/asm/util/TraceClassVisitor.java | 209 ++
.../objectweb/asm/util/TraceFieldVisitor.java | 76 +
.../objectweb/asm/util/TraceMethodVisitor.java | 223 ++
.../asm/util/TraceSignatureVisitor.java | 317 +++
.../tajo/org/objectweb/asm/util/package.html | 58 +
.../objectweb/asm/xml/ASMContentHandler.java | 1317 +++++++++
.../tajo/org/objectweb/asm/xml/Processor.java | 1044 +++++++
.../tajo/org/objectweb/asm/xml/SAXAdapter.java | 89 +
.../objectweb/asm/xml/SAXAnnotationAdapter.java | 185 ++
.../org/objectweb/asm/xml/SAXClassAdapter.java | 324 +++
.../org/objectweb/asm/xml/SAXCodeAdapter.java | 362 +++
.../org/objectweb/asm/xml/SAXFieldAdapter.java | 63 +
.../tajo/org/objectweb/asm/xml/asm-xml.dtd | 367 +++
.../tajo/org/objectweb/asm/xml/package.html | 114 +
tajo-yarn-pullserver/pom.xml | 17 +
.../pullserver/listener/FileCloseListener.java | 15 +-
.../pullserver/listener/FileCloseListener.java | 15 +-
.../pullserver/listener/FileCloseListener.java | 15 +-
.../tajo/pullserver/PullServerAuxService.java | 2 +-
.../apache/tajo/pullserver/TajoPullServer.java | 73 +
.../tajo/pullserver/TajoPullServerService.java | 215 +-
.../java/org/apache/tajo/storage/Tuple.java | 27 +-
361 files changed, 54189 insertions(+), 1084 deletions(-)
----------------------------------------------------------------------
[12/12] git commit: Merge branch 'master' of
https://github.com/blrunner/tajo into TAJO-1027
Posted by bl...@apache.org.
Merge branch 'master' of https://github.com/blrunner/tajo into TAJO-1027
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/a51940a2
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/a51940a2
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/a51940a2
Branch: refs/heads/TAJO-1027
Commit: a51940a2ac784b467bb791c03435c7689af10755
Parents: e1a94ba 05c8924
Author: Jaehwa Jung <bl...@apache.org>
Authored: Thu Sep 11 11:36:12 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Thu Sep 11 11:36:12 2014 +0900
----------------------------------------------------------------------
CHANGES | 2 ++
.../main/java/org/apache/tajo/cli/TajoCli.java | 23 +++++++++++++-------
2 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[11/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/05c89244
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/05c89244
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/05c89244
Branch: refs/heads/TAJO-1027
Commit: 05c892448113db40daef54d2e06dad463dbae9c8
Parents: b33a945 604eb32
Author: Jaehwa Jung <bl...@apache.org>
Authored: Thu Sep 11 11:33:54 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Thu Sep 11 11:33:54 2014 +0900
----------------------------------------------------------------------
CHANGES | 13 +++
.../main/java/org/apache/tajo/cli/TajoCli.java | 23 +++--
.../org/apache/tajo/cli/VersionCommand.java | 4 +-
.../org/apache/tajo/jdbc/TajoResultSet.java | 2 +-
.../java/org/apache/tajo/TajoConstants.java | 1 -
.../java/org/apache/tajo/conf/TajoConf.java | 8 +-
.../java/org/apache/tajo/master/TajoMaster.java | 4 +-
.../java/org/apache/tajo/worker/TajoWorker.java | 2 +-
.../org/apache/tajo/TajoTestingCluster.java | 1 -
.../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 95 +++++++++++++++++++-
tajo-dist/src/main/bin/tajo-daemon.sh | 1 +
tajo-dist/src/main/conf/tajo-env.sh | 2 +-
.../org/apache/tajo/jdbc/TajoConnection.java | 8 +-
.../apache/tajo/jdbc/TajoDatabaseMetaData.java | 4 +-
.../apache/tajo/jdbc/TajoPreparedStatement.java | 16 +++-
.../org/apache/tajo/jdbc/TajoStatement.java | 76 +++++++++++++++-
.../apache/tajo/pullserver/TajoPullServer.java | 2 +-
.../tajo/pullserver/TajoPullServerService.java | 51 ++++++-----
18 files changed, 249 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
[09/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1027
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1027
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/05337542
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/05337542
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/05337542
Branch: refs/heads/TAJO-1027
Commit: 05337542264d428618082036d567e97e608920c2
Parents: fca2e74 0f76a8b
Author: Jaehwa Jung <bl...@apache.org>
Authored: Thu Sep 11 10:27:53 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Thu Sep 11 10:27:53 2014 +0900
----------------------------------------------------------------------
CHANGES | 8 ++
.../org/apache/tajo/cli/VersionCommand.java | 4 +-
.../org/apache/tajo/jdbc/TajoResultSet.java | 2 +-
.../java/org/apache/tajo/TajoConstants.java | 1 -
.../java/org/apache/tajo/conf/TajoConf.java | 8 +-
.../java/org/apache/tajo/master/TajoMaster.java | 4 +-
.../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 95 +++++++++++++++++++-
.../org/apache/tajo/jdbc/TajoConnection.java | 8 +-
.../apache/tajo/jdbc/TajoDatabaseMetaData.java | 4 +-
.../apache/tajo/jdbc/TajoPreparedStatement.java | 16 +++-
.../org/apache/tajo/jdbc/TajoStatement.java | 76 +++++++++++++++-
11 files changed, 200 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[07/12] git commit: TAJO-1027: Upgrade Hive to 0.13.0 and 0.13.1
Posted by bl...@apache.org.
TAJO-1027: Upgrade Hive to 0.13.0 and 0.13.1
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/9147f43f
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/9147f43f
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/9147f43f
Branch: refs/heads/TAJO-1027
Commit: 9147f43f12931bdb80fb09e31fbeb266045e2e0a
Parents: b33a945
Author: Jaehwa Jung <bl...@apache.org>
Authored: Thu Sep 4 14:56:40 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Thu Sep 4 14:56:40 2014 +0900
----------------------------------------------------------------------
tajo-catalog/tajo-catalog-drivers/pom.xml | 18 +
.../tajo-catalog-drivers/tajo-hcatalog/pom.xml | 345 +++++++++++++++++++
tajo-dist/src/main/bin/tajo | 2 +-
.../configuration/catalog_configuration.rst | 2 +-
4 files changed, 365 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/9147f43f/tajo-catalog/tajo-catalog-drivers/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/pom.xml b/tajo-catalog/tajo-catalog-drivers/pom.xml
index 2cb05ee..001329d 100644
--- a/tajo-catalog/tajo-catalog-drivers/pom.xml
+++ b/tajo-catalog/tajo-catalog-drivers/pom.xml
@@ -69,6 +69,24 @@
<module>tajo-hcatalog</module>
</modules>
</profile>
+ <profile>
+ <id>hcatalog-0.13.0</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>tajo-hcatalog</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>hcatalog-0.13.1</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>tajo-hcatalog</module>
+ </modules>
+ </profile>
</profiles>
<reporting>
http://git-wip-us.apache.org/repos/asf/tajo/blob/9147f43f/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
index 02ea16b..0aed5b5 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/pom.xml
@@ -286,10 +286,190 @@
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hcatalog-core</artifactId>
<version>${hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-service</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shims</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>parquet-hive-bundle</artifactId>
+ <version>${parquet.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hcatalog-0.13.0</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <hive.version>0.13.0</hive.version>
+ <parquet.version>1.5.0</parquet.version>
+ <parquet.format.version>2.1.0</parquet.format.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-contrib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-hbase-handler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shims</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-testutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${hive.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shimss</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-cli</artifactId>
+ <version>${hive.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-service</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shims</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.hcatalog</groupId>
+ <artifactId>hive-hcatalog-core</artifactId>
+ <version>${hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
<artifactId>hive-cli</artifactId>
</exclusion>
<exclusion>
@@ -305,6 +485,136 @@
<artifactId>hive-metastore</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>parquet-hive-bundle</artifactId>
+ <version>${parquet.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hcatalog-0.13.1</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <hive.version>0.13.1</hive.version>
+ <parquet.version>1.5.0</parquet.version>
+ <parquet.format.version>2.1.0</parquet.format.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-contrib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-hbase-handler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shims</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-testutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${hive.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shimss</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-cli</artifactId>
+ <version>${hive.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.hive</groupId>
<artifactId>hive-serde</artifactId>
</exclusion>
@@ -320,6 +630,41 @@
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.hcatalog</groupId>
+ <artifactId>hive-hcatalog-core</artifactId>
+ <version>${hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tajo/blob/9147f43f/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index 3fc2ae0..4236d9b 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -248,7 +248,7 @@ if [ -d ${HIVE_LIB} ]; then
CLASSPATH=${CLASSPATH}:$f;
done
- for f in $HIVE_HOME/hcatalog/share/hcatalog/hcatalog-core-*.jar; do
+ for f in $HIVE_HOME/hcatalog/share/hcatalog/*hcatalog-core-*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
fi
http://git-wip-us.apache.org/repos/asf/tajo/blob/9147f43f/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst b/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
index 9b2404a..cdf7168 100644
--- a/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
+++ b/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
@@ -107,7 +107,7 @@ First, you must compile source code and get a binary archive as follows:
$ mvn clean install -DskipTests -Pdist -Dtar -Phcatalog-0.1x.0
$ ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
-Currently Tajo supports only hive 0.12.0. If you enables HCatalogStore, you set the maven profile as ``-Phcatalog-0.12.0``.
+Currently Tajo supports hive 0.12.0, hive 0.13.0, hive 0.13.1. If you enables HCatalogStore, you set the maven profile as ``-Phcatalog-0.12.0``.
Second, you must set your hive home directory to HIVE_HOME variable in ``conf/tajo-env.sh`` with it as follows:
[10/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1027
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1027
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/e1a94ba5
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e1a94ba5
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e1a94ba5
Branch: refs/heads/TAJO-1027
Commit: e1a94ba55698ec6098bb02bd001209261aecfe31
Parents: 0533754 016507d
Author: Jaehwa Jung <bl...@apache.org>
Authored: Thu Sep 11 10:51:41 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Thu Sep 11 10:51:41 2014 +0900
----------------------------------------------------------------------
CHANGES | 3 ++
.../java/org/apache/tajo/worker/TajoWorker.java | 2 +-
.../org/apache/tajo/TajoTestingCluster.java | 1 -
tajo-dist/src/main/bin/tajo-daemon.sh | 1 +
tajo-dist/src/main/conf/tajo-env.sh | 2 +-
.../apache/tajo/pullserver/TajoPullServer.java | 2 +-
.../tajo/pullserver/TajoPullServerService.java | 51 ++++++++++----------
7 files changed, 32 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
[02/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo
Posted by bl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/415d0867
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/415d0867
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/415d0867
Branch: refs/heads/TAJO-1027
Commit: 415d0867ae4a4543f47360294bead1fc7f41e292
Parents: 7c98709 912df6f
Author: Jaehwa Jung <bl...@apache.org>
Authored: Sun Aug 10 15:07:24 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Sun Aug 10 15:07:24 2014 +0900
----------------------------------------------------------------------
.../main/java/org/apache/tajo/cli/TajoCli.java | 3 +-
.../org/apache/tajo/cli/TajoGetConfCommand.java | 57 +++++++
.../java/org/apache/tajo/client/TajoAdmin.java | 16 ++
.../org/apache/tajo/client/TajoGetConf.java | 171 +++++++++++++++++++
.../java/org/apache/tajo/cli/TestTajoCli.java | 31 ++++
tajo-dist/src/main/bin/tajo | 5 +
6 files changed, 282 insertions(+), 1 deletion(-)
----------------------------------------------------------------------