tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [5/5] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Date Mon, 26 Jan 2015 04:17:19 GMT
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/QueryClientImpl.java
	tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java


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

Branch: refs/heads/index_support
Commit: 9d48a40adbb138964160cd5858b5372d35bfe6cf
Parents: a805c4c a15b5fa
Author: Jihoon Son <jihoonson@apache.org>
Authored: Mon Jan 26 13:17:04 2015 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Mon Jan 26 13:17:04 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |  11 +
 .../tajo/cli/tsql/commands/HelpCommand.java     |   6 +-
 .../org/apache/tajo/client/QueryClientImpl.java |   9 +-
 .../java/org/apache/tajo/conf/TajoConf.java     |   2 +
 .../base/CheckHadoopRuntimeVersionRule.java     |   4 +-
 .../main/java/org/apache/tajo/util/Bytes.java   |   6 +-
 .../engine/planner/physical/BNLJoinExec.java    |   3 +-
 .../planner/physical/ExternalSortExec.java      |   2 +-
 .../planner/physical/HashAggregateExec.java     |   2 +-
 .../HashBasedColPartitionStoreExec.java         |   2 +-
 .../planner/physical/HashFullOuterJoinExec.java |   4 +-
 .../engine/planner/physical/HashJoinExec.java   |   4 +-
 .../planner/physical/HashLeftAntiJoinExec.java  |   4 +-
 .../planner/physical/HashLeftOuterJoinExec.java |   4 +-
 .../planner/physical/HashLeftSemiJoinExec.java  |   2 +-
 .../physical/HashShuffleFileWriteExec.java      |   2 +-
 .../engine/planner/physical/HavingExec.java     |   2 +-
 .../engine/planner/physical/MemSortExec.java    |   2 +-
 .../physical/MergeFullOuterJoinExec.java        |   3 +-
 .../engine/planner/physical/MergeJoinExec.java  |   3 +-
 .../engine/planner/physical/NLJoinExec.java     |   3 +-
 .../planner/physical/NLLeftOuterJoinExec.java   |   3 +-
 .../physical/PartitionMergeScanExec.java        |   5 +-
 .../physical/RangeShuffleFileWriteExec.java     |   2 +-
 .../physical/RightOuterMergeJoinExec.java       |   3 +-
 .../engine/planner/physical/SelectionExec.java  |   2 +-
 .../engine/planner/physical/SeqScanExec.java    |   2 +-
 .../SortBasedColPartitionStoreExec.java         |   2 +-
 .../engine/planner/physical/StoreTableExec.java |   2 +-
 .../org/apache/tajo/master/QueryInProgress.java |  17 +-
 .../java/org/apache/tajo/master/QueryInfo.java  |   7 +-
 .../org/apache/tajo/master/QueryManager.java    |  28 +-
 .../apache/tajo/master/TajoContainerProxy.java  |  10 +-
 .../tajo/master/TajoMasterClientService.java    |   4 +-
 .../apache/tajo/querymaster/QueryMaster.java    |   8 +-
 .../apache/tajo/util/history/HistoryReader.java |  33 +-
 .../apache/tajo/util/history/HistoryWriter.java | 361 ++++++++++++++-----
 .../tajo/worker/TajoResourceAllocator.java      |   6 +-
 .../main/java/org/apache/tajo/worker/Task.java  |  22 +-
 .../apache/tajo/worker/TaskAttemptContext.java  |   2 +-
 .../apache/tajo/worker/TaskRunnerManager.java   |   1 +
 .../org/apache/tajo/client/TestTajoClient.java  |  16 +-
 .../util/history/TestHistoryWriterReader.java   |  19 +-
 43 files changed, 420 insertions(+), 215 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/9d48a40a/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
----------------------------------------------------------------------
diff --cc tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
index c643679,813d5d8..3ef0524
--- a/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
@@@ -391,8 -391,9 +391,9 @@@ public class QueryClientImpl implement
                builder.setFetchRowNum(fetchRowNum);
                try {
                  GetQueryResultDataResponse response = tajoMasterService.getQueryResultData(null,
builder.build());
 -                if (response.getResultCode() == ClientProtos.ResultCode.ERROR) {
 +                if (response.getResult().getResultCode() == ClientProtos.ResultCode.ERROR)
{
-                   throw new ServiceException(response.getResult().getErrorTrace());
+                   abort();
 -                  throw new ServiceException(response.getErrorMessage());
++                  throw new ServiceException(response.getResult().getErrorMessage());
                  }
  
                  return response.getResultSet();

http://git-wip-us.apache.org/repos/asf/tajo/blob/9d48a40a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/9d48a40a/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
----------------------------------------------------------------------
diff --cc tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
index b500fe7,16e4fea..72b77a6
--- a/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
@@@ -523,9 -537,11 +524,10 @@@ public class TajoMasterClientService ex
  
        } catch (Throwable t) {
          LOG.error(t.getMessage(), t);
+         builder.setResultSet(resultSetBuilder.build()); // required field
 -        builder.setResultCode(ResultCode.ERROR);
          String errorMessage = t.getMessage() == null ? t.getClass().getName() : t.getMessage();
 -        builder.setErrorMessage(errorMessage);
 -        builder.setErrorTrace(org.apache.hadoop.util.StringUtils.stringifyException(t));
 +        builder.setResult(IPCUtil.buildRequestResult(ResultCode.ERROR,
 +            errorMessage, org.apache.hadoop.util.StringUtils.stringifyException(t)));
        }
        return builder.build();
      }

http://git-wip-us.apache.org/repos/asf/tajo/blob/9d48a40a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/9d48a40a/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java
----------------------------------------------------------------------


Mime
View raw message