From 268c6cade0bb1b864ddea9a7f13bc2561040acaa Mon Sep 17 00:00:00 2001 From: Dongkyu Hwangbo Date: Wed, 30 Sep 2015 12:52:49 +0900 Subject: [PATCH 1/4] initial commit --- .../tajo/engine/planner/physical/CommonJoinExec.java | 7 ++----- .../org/apache/tajo/jdbc/TajoDatabaseMetaData.java | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) 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 4f819ada26..c6afb744e0 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,10 +36,7 @@ import org.apache.tajo.worker.TaskAttemptContext; import java.io.IOException; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; +import java.util.*; /** * common exec for all join execs @@ -186,7 +183,7 @@ public boolean apply(Tuple input) { * @return created list of a null tuple */ protected List nullTupleList(int width) { - return Arrays.asList(NullTuple.create(width)); + return Collections.singletonList(NullTuple.create(width)); } @Override 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 ad0fd3c1f3..1929e3550c 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 ResultSet getSchemas() throws SQLException { 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 ResultSet getCatalogs() throws SQLException { } 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 ResultSet getTableTypes() throws SQLException { 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 ResultSet getSchemas(String catalog, String schemaPattern) throws SQLExce return new TajoMetaDataResultSet( Arrays.asList("TABLE_SCHEM", "TABLE_CATALOG"), Arrays.asList(Type.VARCHAR, Type.VARCHAR), - Arrays.asList(tuple)); + Collections.singletonList(tuple)); } @Override From 5262eba22751741a617fe55aaa461ab720de80d8 Mon Sep 17 00:00:00 2001 From: Dongkyu Hwangbo Date: Wed, 30 Sep 2015 12:57:47 +0900 Subject: [PATCH 2/4] modify import --- .../apache/tajo/engine/planner/physical/CommonJoinExec.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 c6afb744e0..66531575ed 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,7 +36,11 @@ import org.apache.tajo.worker.TaskAttemptContext; import java.io.IOException; -import java.util.*; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; + /** * common exec for all join execs From 6e27a7bb7e849909ae0a889e5bfaf33cba0896e3 Mon Sep 17 00:00:00 2001 From: Dongkyu Hwangbo Date: Wed, 30 Sep 2015 12:59:49 +0900 Subject: [PATCH 3/4] rollback unnecessarily difference --- .../java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1929e3550c..7745320baf 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 ResultSet getSchemas() throws SQLException { return new TajoMetaDataResultSet( Arrays.asList("TABLE_SCHEM", "TABLE_CATALOG"), Arrays.asList(Type.VARCHAR, Type.VARCHAR), - Collections.singletonList(tuple)); + Collections.singletonList(tuple)); } @Override @@ -448,8 +448,8 @@ public ResultSet getCatalogs() throws SQLException { } return new TajoMetaDataResultSet( - Collections.singletonList("TABLE_CAT"), - Collections.singletonList(Type.VARCHAR), + Collections.singletonList("TABLE_CAT"), + Collections.singletonList(Type.VARCHAR), tuples); } From adf6eb1b06bd214db4f5ce707402e79c77ffa03a Mon Sep 17 00:00:00 2001 From: Dongkyu Hwangbo Date: Wed, 30 Sep 2015 13:01:32 +0900 Subject: [PATCH 4/4] rollback unnecessarily difference --- .../main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7745320baf..170a053b78 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 @@ -461,7 +461,7 @@ public ResultSet getTableTypes() throws SQLException { columns.add(tuple); ResultSet result = new TajoMetaDataResultSet( - Collections.singletonList("TABLE_TYPE") + Collections.singletonList("TABLE_TYPE") , Collections.singletonList(Type.VARCHAR) , columns); @@ -768,7 +768,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLExce return new TajoMetaDataResultSet( Arrays.asList("TABLE_SCHEM", "TABLE_CATALOG"), Arrays.asList(Type.VARCHAR, Type.VARCHAR), - Collections.singletonList(tuple)); + Collections.singletonList(tuple)); } @Override