Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into
index_support
Conflicts:
tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/15f0fdc0
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/15f0fdc0
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/15f0fdc0
Branch: refs/heads/index_support
Commit: 15f0fdc0ce2d7ef9861047f3732492482fbccee0
Parents: 55e4630 dbf91f5
Author: Jihoon Son <[email protected]>
Authored: Sun Feb 15 15:01:24 2015 +0900
Committer: Jihoon Son <[email protected]>
Committed: Sun Feb 15 15:01:24 2015 +0900
----------------------------------------------------------------------
CHANGES | 2 +
.../org/apache/tajo/cli/tools/TajoAdmin.java | 5 +-
.../org/apache/tajo/cli/tools/TajoDump.java | 5 +-
.../org/apache/tajo/cli/tools/TajoGetConf.java | 5 +-
.../org/apache/tajo/cli/tools/TajoHAAdmin.java | 5 +-
.../java/org/apache/tajo/cli/tsql/TajoCli.java | 11 +-
tajo-client/pom.xml | 40 ---
.../apache/tajo/client/CatalogAdminClient.java | 6 +-
.../tajo/client/CatalogAdminClientImpl.java | 8 +-
.../org/apache/tajo/client/QueryClientImpl.java | 25 +-
.../apache/tajo/client/SessionConnection.java | 28 +-
.../org/apache/tajo/client/TajoClientImpl.java | 58 ++--
.../org/apache/tajo/client/TajoClientUtil.java | 23 +-
.../org/apache/tajo/jdbc/FetchResultSet.java | 5 +-
.../apache/tajo/jdbc/TajoMemoryResultSet.java | 11 +-
.../org/apache/tajo/jdbc/TajoResultSet.java | 212 --------------
.../org/apache/tajo/storage/RowStoreUtil.java | 290 +++++++++++++++++++
tajo-client/src/main/proto/ClientProtos.proto | 4 +-
.../main/java/org/apache/tajo/datum/Datum.java | 9 +-
.../exception/UnknownDataTypeException.java | 32 ++
.../org/apache/tajo/benchmark/BenchmarkSet.java | 6 +-
.../java/org/apache/tajo/benchmark/TPCH.java | 2 +-
.../org/apache/tajo/master/QueryManager.java | 20 ++
.../tajo/master/TajoMasterClientService.java | 40 ++-
.../apache/tajo/master/exec/QueryExecutor.java | 9 +-
.../tajo/webapp/QueryExecutorServlet.java | 19 +-
.../main/java/org/apache/tajo/worker/Task.java | 11 +-
.../main/resources/webapps/admin/querytasks.jsp | 7 +-
.../resources/webapps/worker/querydetail.jsp | 12 +-
.../apache/tajo/LocalTajoTestingUtility.java | 8 +-
.../java/org/apache/tajo/QueryTestCaseBase.java | 20 +-
.../org/apache/tajo/TajoTestingCluster.java | 20 +-
.../org/apache/tajo/client/TestTajoClient.java | 37 +--
.../tajo/engine/query/TestJoinBroadcast.java | 12 +-
.../tajo/engine/query/TestNullValues.java | 30 +-
.../tajo/engine/query/TestSelectQuery.java | 7 +-
.../tajo/engine/query/TestTablePartitions.java | 15 +-
.../apache/tajo/ha/TestHAServiceHDFSImpl.java | 9 +-
.../org/apache/tajo/jdbc/TestResultSet.java | 17 +-
.../master/scheduler/TestFifoScheduler.java | 5 +-
.../apache/tajo/querymaster/TestKillQuery.java | 3 +-
.../tajo/querymaster/TestQueryProgress.java | 12 +-
.../org/apache/tajo/worker/TestHistory.java | 5 +-
tajo-dist/pom.xml | 3 +-
tajo-jdbc/pom.xml | 63 +---
.../org/apache/tajo/jdbc/JdbcConnection.java | 22 +-
.../java/org/apache/tajo/jdbc/TajoDriver.java | 4 -
.../org/apache/tajo/jdbc/TajoStatement.java | 5 +-
.../org/apache/tajo/storage/RowStoreUtil.java | 2 +-
.../exception/UnknownDataTypeException.java | 32 --
50 files changed, 652 insertions(+), 589 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClient.java
----------------------------------------------------------------------
diff --cc
tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClient.java
index 652008c,1512b24..86d1622
--- a/tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClient.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClient.java
@@@ -19,17 -19,15 +19,17 @@@
package org.apache.tajo.client;
import com.google.protobuf.ServiceException;
- import org.apache.hadoop.fs.Path;
import org.apache.tajo.annotation.Nullable;
+import org.apache.tajo.catalog.IndexMeta;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.TableDesc;
import org.apache.tajo.catalog.TableMeta;
import org.apache.tajo.catalog.partition.PartitionMethodDesc;
import org.apache.tajo.catalog.proto.CatalogProtos;
+import org.apache.tajo.catalog.proto.CatalogProtos.IndexDescProto;
import java.io.Closeable;
+ import java.net.URI;
import java.sql.SQLException;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClientImpl.java
----------------------------------------------------------------------
diff --cc
tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClientImpl.java
index 17fdb25,6347ad1..90a51b6
---
a/tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClientImpl.java
+++
b/tajo-client/src/main/java/org/apache/tajo/client/CatalogAdminClientImpl.java
@@@ -19,14 -19,14 +19,13 @@@
package org.apache.tajo.client;
import com.google.protobuf.ServiceException;
- import org.apache.hadoop.fs.Path;
import org.apache.tajo.annotation.Nullable;
-import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
-import org.apache.tajo.catalog.TableDesc;
-import org.apache.tajo.catalog.TableMeta;
+import org.apache.tajo.catalog.*;
import org.apache.tajo.catalog.partition.PartitionMethodDesc;
import org.apache.tajo.catalog.proto.CatalogProtos;
+import org.apache.tajo.catalog.proto.CatalogProtos.IndexDescProto;
import org.apache.tajo.ipc.ClientProtos;
+import org.apache.tajo.ipc.ClientProtos.*;
import org.apache.tajo.ipc.TajoMasterClientProtocol;
import org.apache.tajo.jdbc.SQLStates;
import org.apache.tajo.rpc.NettyClientBase;
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java
----------------------------------------------------------------------
diff --cc tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java
index 6f6059e,e61bea0..7c786a4
--- a/tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java
@@@ -32,17 -29,10 +29,11 @@@ import org.apache.tajo.catalog.TableDes
import org.apache.tajo.catalog.TableMeta;
import org.apache.tajo.catalog.partition.PartitionMethodDesc;
import org.apache.tajo.catalog.proto.CatalogProtos;
+import org.apache.tajo.catalog.proto.CatalogProtos.IndexDescProto;
- import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.ipc.ClientProtos.*;
import org.apache.tajo.jdbc.TajoMemoryResultSet;
- import org.apache.tajo.jdbc.TajoResultSet;
- import org.apache.tajo.rule.EvaluationContext;
- import org.apache.tajo.rule.EvaluationFailedException;
- import org.apache.tajo.rule.SelfDiagnosisRuleEngine;
- import org.apache.tajo.rule.SelfDiagnosisRuleSession;
import org.apache.tajo.service.ServiceTracker;
- import org.apache.tajo.service.ServiceTrackerFactory;
+ import org.apache.tajo.util.KeyValueSet;
import java.io.IOException;
import java.net.InetSocketAddress;
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-client/src/main/proto/ClientProtos.proto
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
----------------------------------------------------------------------
diff --cc tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
index aeb346f,db82fca..c9ff554
--- a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
@@@ -241,10 -230,10 +242,10 @@@ public class QueryExecutor
queryResultScanner.init();
session.addNonForwardQueryResultScanner(queryResultScanner);
- response.setQueryId(queryId.getProto());
+ response.setQueryId(queryInfo.getQueryId().getProto());
response.setMaxRowNum(maxRow);
response.setTableDesc(desc.getProto());
- response.setResultCode(ClientProtos.ResultCode.OK);
+ response.setResult(IPCUtil.buildOkRequestResult());
}
public void execNonFromQuery(QueryContext queryContext, Session session,
String query,
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-core/src/main/java/org/apache/tajo/webapp/QueryExecutorServlet.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-core/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/15f0fdc0/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
----------------------------------------------------------------------
