Repository: tajo Updated Branches: refs/heads/master f32804742 -> dd16f119c
TAJO-1899: Calling 'Arrays.asList()' with too few arguments cause memory extravagance. Closes #794 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/dd16f119 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/dd16f119 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/dd16f119 Branch: refs/heads/master Commit: dd16f119c200b23e23e6859d6adf1b3e630bc825 Parents: f328047 Author: Dongkyu Hwangbo <[email protected]> Authored: Mon Oct 5 22:23:29 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Oct 5 22:24:14 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../tajo/engine/planner/physical/CommonJoinExec.java | 5 +++-- .../java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java | 12 ++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/dd16f119/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index a285945..baf216a 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ Release 0.12.0 - unreleased NEW FEATURES IMPROVEMENT + + TAJO-1899: Calling 'Arrays.asList()' with too few arguments cause memory + extravagance. (Contributed by Dongkyu Hwangbo, committed by jihoon) TAJO-1461: Follow Protocol Buffer Style Guide. (Contributed by David Chen, committed by hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/dd16f119/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java index 4f819ad..6653157 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java @@ -36,11 +36,12 @@ import org.apache.tajo.storage.Tuple; import org.apache.tajo.worker.TaskAttemptContext; import java.io.IOException; -import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; + /** * common exec for all join execs */ @@ -186,7 +187,7 @@ public abstract class CommonJoinExec extends BinaryPhysicalExec { * @return created list of a null tuple */ protected List<Tuple> nullTupleList(int width) { - return Arrays.asList(NullTuple.create(width)); + return Collections.singletonList(NullTuple.create(width)); } @Override http://git-wip-us.apache.org/repos/asf/tajo/blob/dd16f119/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java ---------------------------------------------------------------------- diff --git a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java index ad0fd3c..170a053 100644 --- a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java +++ b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java @@ -431,7 +431,7 @@ public class TajoDatabaseMetaData implements DatabaseMetaData { return new TajoMetaDataResultSet( Arrays.asList("TABLE_SCHEM", "TABLE_CATALOG"), Arrays.asList(Type.VARCHAR, Type.VARCHAR), - Arrays.asList(tuple)); + Collections.singletonList(tuple)); } @Override @@ -448,8 +448,8 @@ public class TajoDatabaseMetaData implements DatabaseMetaData { } return new TajoMetaDataResultSet( - Arrays.asList("TABLE_CAT"), - Arrays.asList(Type.VARCHAR) , + Collections.singletonList("TABLE_CAT"), + Collections.singletonList(Type.VARCHAR), tuples); } @@ -461,8 +461,8 @@ public class TajoDatabaseMetaData implements DatabaseMetaData { columns.add(tuple); ResultSet result = new TajoMetaDataResultSet( - Arrays.asList("TABLE_TYPE") - , Arrays.asList(Type.VARCHAR) + Collections.singletonList("TABLE_TYPE") + , Collections.singletonList(Type.VARCHAR) , columns); return result; @@ -768,7 +768,7 @@ public class TajoDatabaseMetaData implements DatabaseMetaData { return new TajoMetaDataResultSet( Arrays.asList("TABLE_SCHEM", "TABLE_CATALOG"), Arrays.asList(Type.VARCHAR, Type.VARCHAR), - Arrays.asList(tuple)); + Collections.singletonList(tuple)); } @Override
