You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2016/02/15 07:09:49 UTC
tajo git commit: TAJO-2017: Replace manual array copy with Collection.
Repository: tajo
Updated Branches:
refs/heads/master ef43dfaa5 -> 4743c6ea3
TAJO-2017: Replace manual array copy with Collection.
Closes #907
Signed-off-by: Jinho Kim <jh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4743c6ea
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4743c6ea
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4743c6ea
Branch: refs/heads/master
Commit: 4743c6ea3e2dfef8f27ee172bdcff9004bc7640b
Parents: ef43dfa
Author: Dongkyu Hwangbo <hw...@gmail.com>
Authored: Mon Feb 15 15:08:44 2016 +0900
Committer: Jinho Kim <jh...@apache.org>
Committed: Mon Feb 15 15:08:44 2016 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
.../src/main/java/org/apache/tajo/catalog/CatalogUtil.java | 4 +---
.../test/java/org/apache/tajo/master/TestRepartitioner.java | 4 +---
.../test/java/org/apache/tajo/storage/TestFileFragment.java | 5 ++---
.../physical/DistinctGroupbyThirdAggregationExec.java | 4 +---
.../java/org/apache/tajo/storage/hbase/HFileAppender.java | 5 ++---
.../main/java/org/apache/tajo/storage/FileTablespace.java | 4 +---
.../tajo/org/objectweb/asm/util/CheckMethodAdapter.java | 9 +++------
8 files changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2f31255..0c2ba89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -192,6 +192,9 @@ Release 0.12.0 - unreleased
TASKS
+ TAJO-2017: Replace manual array copy with Collection.
+ (Dongkyu Hwangbo via jinho)
+
TAJO-2070: Remove unnecessarily version property in maven pom. (jinho)
TAJO-2065: Increase default heap size. (jinho)
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
index ca7ee98..94e8157 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
@@ -765,9 +765,7 @@ public class CatalogUtil {
};
static {
- for (String keyword : RESERVED_KEYWORDS) {
- RESERVED_KEYWORDS_SET.add(keyword);
- }
+ Collections.addAll(RESERVED_KEYWORDS_SET, RESERVED_KEYWORDS);
}
public static AlterTableDesc renameColumn(String tableName, String oldColumName, String newColumName,
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java b/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java
index 85a0c10..a13a750 100644
--- a/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java
+++ b/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java
@@ -500,9 +500,7 @@ public class TestRepartitioner {
private static void assertFetchProto(FetchProto [] expected, Map<String, List<FetchProto>>[] result) {
Set<FetchProto> expectedURLs = Sets.newHashSet();
- for (FetchProto f : expected) {
- expectedURLs.add(f);
- }
+ Collections.addAll(expectedURLs, expected);
Set<FetchProto> resultURLs = Sets.newHashSet();
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/tajo-core-tests/src/test/java/org/apache/tajo/storage/TestFileFragment.java
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/storage/TestFileFragment.java b/tajo-core-tests/src/test/java/org/apache/tajo/storage/TestFileFragment.java
index d0ab1c0..86f7d1a 100644
--- a/tajo-core-tests/src/test/java/org/apache/tajo/storage/TestFileFragment.java
+++ b/tajo-core-tests/src/test/java/org/apache/tajo/storage/TestFileFragment.java
@@ -27,6 +27,7 @@ import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
+import java.util.Collections;
import java.util.SortedSet;
import static org.junit.Assert.assertEquals;
@@ -85,9 +86,7 @@ public class TestFileFragment {
}
SortedSet sortedSet = Sets.newTreeSet();
- for (FileFragment frag : tablets) {
- sortedSet.add(frag);
- }
+ Collections.addAll(sortedSet, tablets);
assertEquals(num, sortedSet.size());
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
index a0da674..f238ef0 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
@@ -104,9 +104,7 @@ public class DistinctGroupbyThirdAggregationExec extends UnaryPhysicalExec {
}
for (GroupbyNode eachGroupby : groupbyNodes) {
Set<Column> groupingColumnSet = new HashSet<>();
- for (Column column: eachGroupby.getGroupingColumns()) {
- groupingColumnSet.add(column);
- }
+ Collections.addAll(groupingColumnSet, eachGroupby.getGroupingColumns());
for (Target eachTarget: eachGroupby.getTargets()) {
if (!groupingColumnSet.contains(eachTarget.getNamedColumn())) {
//aggr function
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HFileAppender.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HFileAppender.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HFileAppender.java
index 228d5a4..5486897 100644
--- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HFileAppender.java
+++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HFileAppender.java
@@ -43,6 +43,7 @@ import org.apache.tajo.storage.Tuple;
import org.apache.tajo.util.Bytes;
import java.io.IOException;
+import java.util.Collections;
import java.util.TreeSet;
public class HFileAppender extends AbstractHBaseAppender {
@@ -118,9 +119,7 @@ public class HFileAppender extends AbstractHBaseAppender {
readKeyValues(tuple, rowkey);
if (keyValues != null) {
- for (KeyValue eachKeyVal: keyValues) {
- kvSet.add(eachKeyVal);
- }
+ Collections.addAll(kvSet, keyValues);
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java
index 35504af..3d12a40 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java
@@ -330,9 +330,7 @@ public class FileTablespace extends Tablespace {
} else {
for (FileStatus globStat : matches) {
if (globStat.isDirectory()) {
- for (FileStatus stat : fs.listStatus(globStat.getPath(), inputFilter)) {
- result.add(stat);
- }
+ Collections.addAll(result, fs.listStatus(globStat.getPath(), inputFilter));
} else {
result.add(globStat);
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/4743c6ea/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
index d72dfdd..07571a0 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -33,6 +33,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -744,9 +745,7 @@ public class CheckMethodAdapter extends MethodVisitor {
checkNonDebugLabel(labels[i]);
}
super.visitTableSwitchInsn(min, max, dflt, labels);
- for (Label label : labels) {
- usedLabels.add(label);
- }
+ Collections.addAll(usedLabels, labels);
++insnCount;
}
@@ -767,9 +766,7 @@ public class CheckMethodAdapter extends MethodVisitor {
}
super.visitLookupSwitchInsn(dflt, keys, labels);
usedLabels.add(dflt);
- for (Label label : labels) {
- usedLabels.add(label);
- }
+ Collections.addAll(usedLabels, labels);
++insnCount;
}