Repository: tajo Updated Branches: refs/heads/branch-0.11.1 2a1d9a04a -> 79b2e873e
TAJO-1973: Replace 'while' loop with 'foreach'. Signed-off-by: Jihoon Son <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/79b2e873 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/79b2e873 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/79b2e873 Branch: refs/heads/branch-0.11.1 Commit: 79b2e873e86e492d8a0354aa6f58ab5815308bcb Parents: 2a1d9a0 Author: Dongkyu Hwangbo <[email protected]> Authored: Wed Dec 9 16:10:44 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Dec 9 16:10:44 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../test/java/org/apache/tajo/catalog/TestCatalog.java | 4 +--- .../tajo/catalog/store/TestXMLCatalogSchemaManager.java | 10 ++++------ .../java/org/apache/tajo/validation/TestValidators.java | 10 ++++------ .../src/main/java/org/apache/tajo/querymaster/Stage.java | 4 +--- .../org/apache/tajo/plan/serder/EvalNodeDeserializer.java | 7 ++----- .../apache/tajo/plan/serder/LogicalNodeDeserializer.java | 5 +---- .../tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java | 4 +--- .../apache/tajo/org/objectweb/asm/optimizer/Shrinker.java | 8 ++------ 9 files changed, 19 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index f29cb2c..eef287c 100644 --- a/CHANGES +++ b/CHANGES @@ -65,6 +65,9 @@ Release 0.11.1 - unreleased TASKS + TAJO-1973: Replace 'while' loop with 'foreach'. (Contributed by Dongkyu Hwangbo, + committed by jihoon) + TAJO-1854: Add in-subquery document. (jihoon) TAJO-2003: Fix typo in worker configuration. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java index 1671f57..9ae2d91 100644 --- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java +++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java @@ -274,10 +274,8 @@ public class TestCatalog { Map<String, List<String>> createdTablesMap = createBaseDatabaseAndTables(); // Each time we drop one database, check all databases and their tables. - Iterator<String> it = new ArrayList<String>(createdTablesMap.keySet()).iterator(); - while(it.hasNext()) { + for (String databaseName : new ArrayList<String>(createdTablesMap.keySet())) { // drop one database - String databaseName = it.next(); assertTrue(catalog.existDatabase(databaseName)); catalog.dropDatabase(databaseName); createdTablesMap.remove(databaseName); http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java index f53beff..4c79975 100644 --- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java +++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java @@ -131,18 +131,16 @@ public class TestXMLCatalogSchemaManager { @Override protected boolean matchesSafely(Iterable<? extends T> item, org.hamcrest.Description mismatchDescription) { boolean isFirst = true; - Iterator<? extends T> iterator = item.iterator(); - - while (iterator.hasNext()) { - T obj = iterator.next(); + + for (T obj : item) { if (this.matcher.matches(obj)) { return true; } - + if (!isFirst) { mismatchDescription.appendText(", "); } - + this.matcher.describeMismatch(obj, mismatchDescription); isFirst = false; } http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java b/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java index 92e016a..b5a036e 100644 --- a/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java +++ b/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java @@ -80,18 +80,16 @@ public class TestValidators { @Override protected boolean matchesSafely(Iterable<? extends T> item, Description mismatchDescription) { boolean isFirst = true; - Iterator<? extends T> iterator = item.iterator(); - - while (iterator.hasNext()) { - T obj = iterator.next(); + + for (T obj : item) { if (this.matcher.matches(obj)) { return true; } - + if (!isFirst) { mismatchDescription.appendText(", "); } - + this.matcher.describeMismatch(obj, mismatchDescription); isFirst = false; } http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java index 4e7ee83..f7b7904 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java @@ -656,9 +656,7 @@ public class Stage implements EventHandler<StageEvent> { List<ColumnStats> columnStatses = Lists.newArrayList(); MasterPlan masterPlan = stage.getMasterPlan(); - Iterator<ExecutionBlock> it = masterPlan.getChilds(stage.getBlock()).iterator(); - while (it.hasNext()) { - ExecutionBlock block = it.next(); + for (ExecutionBlock block : masterPlan.getChilds(stage.getBlock())) { Stage childStage = stage.context.getStage(block.getId()); TableStats[] childStatArray = new TableStats[]{ childStage.getInputStats(), childStage.getResultStats() http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-plan/src/main/java/org/apache/tajo/plan/serder/EvalNodeDeserializer.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/EvalNodeDeserializer.java b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/EvalNodeDeserializer.java index fa952ab..3b369a1 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/EvalNodeDeserializer.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/EvalNodeDeserializer.java @@ -72,10 +72,7 @@ public class EvalNodeDeserializer { // So, it sequentially transforms each serialized node into a EvalNode instance in a postfix order of // the original eval tree. - Iterator<PlanProto.EvalNode> it = nodeList.iterator(); - while (it.hasNext()) { - PlanProto.EvalNode protoNode = it.next(); - + for (PlanProto.EvalNode protoNode : nodeList) { EvalType type = EvalType.valueOf(protoNode.getType().name()); if (EvalType.isUnaryOperator(type)) { @@ -214,7 +211,7 @@ public class EvalNodeDeserializer { if (evalContext != null && funcDesc.getInvocation().hasPythonAggregation()) { evalContext.addScriptEngine(current, new PythonScriptEngine(funcDesc, - aggFunc.isFirstPhase() , aggFunc.isLastPhase())); + aggFunc.isFirstPhase(), aggFunc.isLastPhase())); } } else { http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java index 2051dfb..205e76b 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java @@ -74,10 +74,7 @@ public class LogicalNodeDeserializer { // So, it sequentially transforms each serialized node into a LogicalNode instance in a postfix order of // the original logical node tree. - Iterator<PlanProto.LogicalNode> it = nodeList.iterator(); - while (it.hasNext()) { - PlanProto.LogicalNode protoNode = it.next(); - + for (PlanProto.LogicalNode protoNode : nodeList) { switch (protoNode.getType()) { case ROOT: current = convertRoot(nodeMap, protoNode); http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java ---------------------------------------------------------------------- diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java index b64f371..fd0f5cb 100644 --- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java +++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java @@ -167,9 +167,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes { markSubroutines(); if (LOGGING) { log(mainSubroutine.toString()); - Iterator<BitSet> it = subroutineHeads.values().iterator(); - while (it.hasNext()) { - BitSet sub = it.next(); + for (BitSet sub : subroutineHeads.values()) { log(sub.toString()); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/79b2e873/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java ---------------------------------------------------------------------- diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java index 40909ac..913ae9c 100644 --- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java +++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java @@ -87,9 +87,7 @@ public class Shrinker { } }); - Iterator<String> i = unused.iterator(); - while (i.hasNext()) { - String s = i.next(); + for (String s : unused) { if (!s.endsWith("/remove")) { System.out.println("INFO: unused mapping " + s); } @@ -117,9 +115,7 @@ public class Shrinker { cr = new ClassReader(cw.toByteArray()); cw = new ClassWriter(0); - Iterator<Constant> i = constants.iterator(); - while (i.hasNext()) { - Constant c = i.next(); + for (Constant c : constants) { c.write(cw); } cr.accept(cw, ClassReader.SKIP_DEBUG);
