TAJO-1510: Change a function name from getFileCunks to getFileChunks. Closes #499
Signed-off-by: JaeHwa Jung <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4eb87133 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4eb87133 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4eb87133 Branch: refs/heads/index_support Commit: 4eb8713326d5f049df577e49c1a2e629b3ee8096 Parents: 32b524d Author: swlsw <[email protected]> Authored: Mon Apr 6 12:11:31 2015 +0900 Committer: JaeHwa Jung <[email protected]> Committed: Mon Apr 6 12:11:31 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ tajo-core/src/main/java/org/apache/tajo/worker/Task.java | 3 +-- .../org/apache/tajo/pullserver/TajoPullServerService.java | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4eb87133/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index efadea8..7ea0b5e 100644 --- a/CHANGES +++ b/CHANGES @@ -69,6 +69,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1510: Change a function name from getFileCunks to getFileChunks. + (Contributed by Soonwoong Lee, Committed by jaehwa) + TAJO-1360: VALUES_ field in OPTIONS table of catalog store should be longer. (Contributed by DaeMyung Kang, Committed by jihun) http://git-wip-us.apache.org/repos/asf/tajo/blob/4eb87133/tajo-core/src/main/java/org/apache/tajo/worker/Task.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java index 9ff18dd..b08af2b 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java @@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.netty.channel.EventLoopGroup; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -791,7 +790,7 @@ public class Task { boolean last = params.get("final") != null; try { - chunk = TajoPullServerService.getFileCunks(path, startKey, endKey, last); + chunk = TajoPullServerService.getFileChunks(path, startKey, endKey, last); } catch (Throwable t) { LOG.error("getFileChunks() throws exception"); return null; http://git-wip-us.apache.org/repos/asf/tajo/blob/4eb87133/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java ---------------------------------------------------------------------- diff --git a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java index 6894cc5..29cf719 100644 --- a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java +++ b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java @@ -520,7 +520,7 @@ public class TajoPullServerService extends AbstractService { FileChunk chunk; try { - chunk = getFileCunks(path, startKey, endKey, last); + chunk = getFileChunks(path, startKey, endKey, last); } catch (Throwable t) { LOG.error("ERROR Request: " + request.getUri(), t); sendError(ctx, "Cannot get file chunks to be sent", HttpResponseStatus.BAD_REQUEST); @@ -672,10 +672,10 @@ public class TajoPullServerService extends AbstractService { } } - public static FileChunk getFileCunks(Path outDir, - String startKey, - String endKey, - boolean last) throws IOException { + public static FileChunk getFileChunks(Path outDir, + String startKey, + String endKey, + boolean last) throws IOException { BSTIndex index = new BSTIndex(new TajoConf()); BSTIndex.BSTIndexReader idxReader = index.getIndexReader(new Path(outDir, "index"));
