TAJO-1999: TUtil.newList/newLinkedHashMap should be replaced by Java's diamond operator.
Closes #891 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/410a53c9 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/410a53c9 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/410a53c9 Branch: refs/heads/master Commit: 410a53c980605a5ecda1b3e4619ae1489849b5db Parents: f9825e7 Author: Dongkyu Hwangbo <[email protected]> Authored: Wed Jan 6 16:34:54 2016 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Jan 6 16:35:28 2016 +0900 ---------------------------------------------------------------------- CHANGES | 3 ++ .../tajo/catalog/AbstractCatalogClient.java | 3 +- .../org/apache/tajo/catalog/CatalogUtil.java | 2 +- .../java/org/apache/tajo/catalog/Schema.java | 11 ++--- .../org/apache/tajo/catalog/SchemaUtil.java | 4 +- .../tajo/catalog/statistics/TableStats.java | 4 +- .../apache/tajo/function/FunctionSignature.java | 4 +- .../tajo/catalog/store/HiveCatalogStore.java | 5 +-- .../catalog/store/TestHiveCatalogStore.java | 5 +-- .../InfoSchemaMetadataDictionary.java | 3 +- .../tajo/catalog/store/AbstractDBStore.java | 15 ++++--- .../catalog/store/XMLCatalogSchemaManager.java | 3 +- .../org/apache/tajo/cli/tools/TajoDump.java | 3 +- .../tajo/rule/SelfDiagnosisRuleSession.java | 3 +- .../apache/tajo/service/BaseServiceTracker.java | 7 ++-- .../main/java/org/apache/tajo/util/TUtil.java | 42 ++++---------------- .../tajo/util/graph/SimpleDirectedGraph.java | 4 +- .../tajo/validation/PathListValidator.java | 5 +-- .../org/apache/tajo/rule/TestRuleEngine.java | 6 ++- .../org/apache/tajo/rule/TestRuleSession.java | 8 ++-- .../apache/tajo/validation/TestValidators.java | 1 - .../planner/physical/TestPhysicalPlanner.java | 7 ++-- .../tajo/engine/query/TestGroupByQuery.java | 3 +- .../tajo/engine/query/TestHBaseTable.java | 3 +- .../engine/query/TestSelectNestedRecord.java | 20 +++++----- .../rs/resources/TestQueryResultResource.java | 6 +-- .../tajo/engine/function/FunctionLoader.java | 3 +- .../engine/planner/PhysicalPlannerImpl.java | 5 ++- .../tajo/engine/planner/enforce/Enforcer.java | 3 +- .../BaseGlobalPlanRewriteRuleProvider.java | 4 +- .../rewriter/rules/BroadcastJoinRule.java | 9 ++--- .../DistinctGroupbyHashAggregationExec.java | 3 +- .../planner/physical/ExternalSortExec.java | 16 ++++---- .../org/apache/tajo/ha/HdfsServiceTracker.java | 8 ++-- .../apache/tajo/master/exec/DDLExecutor.java | 5 +-- .../NonForwardQueryResultSystemScanner.java | 3 +- .../java/org/apache/tajo/querymaster/Query.java | 5 +-- .../apache/tajo/querymaster/Repartitioner.java | 12 +++--- .../apache/tajo/worker/TaskAttemptContext.java | 5 +-- .../main/resources/webapps/admin/cluster.jsp | 2 +- .../src/main/resources/webapps/admin/index.jsp | 3 +- .../org/apache/tajo/plan/ExprAnnotator.java | 3 +- .../org/apache/tajo/plan/LogicalOptimizer.java | 3 +- .../java/org/apache/tajo/plan/LogicalPlan.java | 4 +- .../org/apache/tajo/plan/LogicalPlanner.java | 19 +++++---- .../org/apache/tajo/plan/NamedExprsManager.java | 2 +- .../apache/tajo/plan/expr/AlgebraicUtil.java | 5 +-- .../org/apache/tajo/plan/expr/EvalTreeUtil.java | 5 +-- .../function/python/PythonScriptEngine.java | 4 +- .../plan/function/stream/StreamingUtil.java | 4 +- .../tajo/plan/nameresolver/NameResolver.java | 7 ++-- .../plan/nameresolver/ResolverByLegacy.java | 4 +- .../BaseLogicalPlanPreprocessPhaseProvider.java | 10 ++--- .../BaseLogicalPlanRewriteRuleProvider.java | 13 +++--- .../tajo/plan/rewrite/BaseSchemaBuildPhase.java | 5 +-- .../plan/rewrite/rules/FilterPushDownRule.java | 28 ++++++------- .../rewrite/rules/InSubqueryRewriteRule.java | 8 ++-- .../rewrite/rules/ProjectionPushDownRule.java | 18 ++++----- .../plan/serder/LogicalNodeDeserializer.java | 2 +- .../tajo/plan/serder/LogicalNodeSerializer.java | 4 +- .../org/apache/tajo/plan/util/ExprFinder.java | 4 +- .../util/PartitionFilterAlgebraVisitor.java | 4 +- .../org/apache/tajo/plan/util/PlannerUtil.java | 5 +-- .../plan/verifier/PostLogicalPlanVerifier.java | 4 +- .../tajo/storage/hbase/HBaseTablespace.java | 4 +- .../tajo/storage/fragment/FileFragment.java | 2 +- .../apache/tajo/storage/TestMergeScanner.java | 3 +- .../apache/tajo/storage/jdbc/JdbcFragment.java | 5 ++- 68 files changed, 198 insertions(+), 247 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index c8dd652..82465c9 100644 --- a/CHANGES +++ b/CHANGES @@ -138,6 +138,9 @@ Release 0.12.0 - unreleased TASKS + TAJO-1999: TUtil.newList/newLinkedHashMap should be replaced by Java's diamond + operator. (Dongkyu Hwangbo via jihoon) + TAJO-2020: Remove unused import statements in S3TableSpace. (Contributed by Byunghwa Yun, committed by jaehwa) http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java index 45538e8..b0acbb1 100644 --- a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java +++ b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java @@ -33,7 +33,6 @@ import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos.NullProto; import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos.ReturnState; import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos.StringListResponse; import org.apache.tajo.util.ProtoUtil; -import org.apache.tajo.util.TUtil; import java.io.Closeable; import java.util.ArrayList; @@ -782,7 +781,7 @@ public abstract class AbstractCatalogClient implements CatalogService, Closeable final IndexListResponse response = stub.getAllIndexesByTable(null, proto); ensureOk(response.getState()); - List<IndexDesc> indexDescs = TUtil.newList(); + List<IndexDesc> indexDescs = new ArrayList<>(); for (IndexDescProto descProto : response.getIndexDescList()) { indexDescs.add(new IndexDesc(descProto)); } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/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 6dd12e6..ca7ee98 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 @@ -873,7 +873,7 @@ public class CatalogUtil { */ public static Pair<List<PartitionKeyProto>, String> getPartitionKeyNamePair(String[] columns, String[] values) { Pair<List<PartitionKeyProto>, String> pair = null; - List<PartitionKeyProto> partitionKeyList = TUtil.newList(); + List<PartitionKeyProto> partitionKeyList = new ArrayList<>(); StringBuilder sb = new StringBuilder(); for (int i = 0; i < columns.length; i++) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Schema.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Schema.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Schema.java index ae7d274..9574f12 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Schema.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Schema.java @@ -32,7 +32,6 @@ import org.apache.tajo.exception.DuplicateColumnException; import org.apache.tajo.exception.TajoRuntimeException; import org.apache.tajo.json.GsonObject; import org.apache.tajo.util.StringUtils; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -56,7 +55,7 @@ public class Schema implements ProtoObject<SchemaProto>, Cloneable, GsonObject { public Schema(SchemaProto proto) { init(); - List<Column> toBeAdded = TUtil.newList(); + List<Column> toBeAdded = new ArrayList<>(); for (int i = 0; i < proto.getFieldsCount(); i++) { deserializeColumn(toBeAdded, proto.getFieldsList(), i); } @@ -83,7 +82,7 @@ public class Schema implements ProtoObject<SchemaProto>, Cloneable, GsonObject { // where is start index of nested fields? int childStartIndex = tobeAdded.size() - childNum; // Extract nested fields - List<Column> nestedColumns = TUtil.newList(tobeAdded.subList(childStartIndex, childStartIndex + childNum)); + List<Column> nestedColumns = new ArrayList<>(tobeAdded.subList(childStartIndex, childStartIndex + childNum)); // Remove nested fields from the the current level for (int i = 0; i < childNum; i++) { @@ -309,7 +308,7 @@ public class Schema implements ProtoObject<SchemaProto>, Cloneable, GsonObject { * @return A list of all columns */ public List<Column> getAllColumns() { - final List<Column> columnList = TUtil.newList(); + final List<Column> columnList = new ArrayList<>(); SchemaUtil.visitSchema(this, new ColumnVisitor() { @Override @@ -423,7 +422,9 @@ public class Schema implements ProtoObject<SchemaProto>, Cloneable, GsonObject { Column newCol = new Column(normalized, typeDesc); fields.add(newCol); fieldsByQualifiedName.put(newCol.getQualifiedName(), fields.size() - 1); - fieldsByName.put(newCol.getSimpleName(), TUtil.newList(fields.size() - 1)); + List<Integer> inputList = new ArrayList<>(); + inputList.add(fields.size() - 1); + fieldsByName.put(newCol.getSimpleName(), inputList); return this; } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/SchemaUtil.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/SchemaUtil.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/SchemaUtil.java index 6af9e06..0ffe584 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/SchemaUtil.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/SchemaUtil.java @@ -22,8 +22,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import org.apache.tajo.exception.TajoRuntimeException; import org.apache.tajo.exception.UnsupportedDataTypeException; -import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -183,7 +183,7 @@ public class SchemaUtil { if (column.getDataType().getType() == Type.RECORD) { for (Column nestedColumn : column.typeDesc.nestedRecordSchema.getRootColumns()) { - List<String> newPath = TUtil.newList(path); + List<String> newPath = new ArrayList<>(path); newPath.add(column.getQualifiedName()); visitInDepthFirstOrder(depth + 1, newPath, function, nestedColumn); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/statistics/TableStats.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/statistics/TableStats.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/statistics/TableStats.java index 9ff1fba..c66500d 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/statistics/TableStats.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/statistics/TableStats.java @@ -55,7 +55,7 @@ public class TableStats implements ProtoObject<TableStatsProto>, Cloneable, Gson numShuffleOutputs = 0; avgRows = 0l; readBytes = 0l; - columnStatses = TUtil.newList(); + columnStatses = new ArrayList<>(); } public TableStats(CatalogProtos.TableStatsProto proto) { @@ -83,7 +83,7 @@ public class TableStats implements ProtoObject<TableStatsProto>, Cloneable, Gson this.readBytes = 0l; } - this.columnStatses = TUtil.newList(); + this.columnStatses = new ArrayList<>(); for (CatalogProtos.ColumnStatsProto colProto : proto.getColStatList()) { if (colProto.getColumn().getDataType().getType() == TajoDataTypes.Type.PROTOBUF) { continue; http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionSignature.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionSignature.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionSignature.java index ea4090f..bf37647 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionSignature.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionSignature.java @@ -24,6 +24,8 @@ import org.apache.tajo.annotation.NotNull; import org.apache.tajo.common.ProtoObject; import org.apache.tajo.util.TUtil; +import java.util.Arrays; + import static org.apache.tajo.catalog.proto.CatalogProtos.FunctionSignatureProto; import static org.apache.tajo.catalog.proto.CatalogProtos.FunctionType; import static org.apache.tajo.common.TajoDataTypes.DataType; @@ -109,7 +111,7 @@ public class FunctionSignature implements Comparable<FunctionSignature>, ProtoOb FunctionSignatureProto.Builder builder = FunctionSignatureProto.newBuilder(); builder.setType(functionType); builder.setName(name); - builder.addAllParameterTypes(TUtil.newList(paramTypes)); + builder.addAllParameterTypes(Arrays.asList(paramTypes)); builder.setReturnType(returnType); return builder.build(); } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java index ae77a1f..b8cd57a 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java @@ -55,7 +55,6 @@ import org.apache.tajo.plan.expr.AlgebraicUtil; import org.apache.tajo.plan.util.PartitionFilterAlgebraVisitor; import org.apache.tajo.storage.StorageConstants; import org.apache.tajo.util.KeyValueSet; -import org.apache.tajo.util.TUtil; import org.apache.thrift.TException; import parquet.hadoop.ParquetOutputFormat; @@ -1020,7 +1019,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { List<ColumnProto> parititonColumns = null; try { - partitions = TUtil.newList(); + partitions = new ArrayList<>(); client = clientPool.getClient(); List<Partition> hivePartitions = client.getHiveClient().listPartitionsByFilter(databaseName, tableName @@ -1243,7 +1242,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { public void addPartitions(String databaseName, String tableName, List<CatalogProtos.PartitionDescProto> partitions , boolean ifNotExists) { HiveCatalogStoreClientPool.HiveCatalogStoreClient client = null; - List<Partition> addPartitions = TUtil.newList(); + List<Partition> addPartitions = new ArrayList<>(); CatalogProtos.PartitionDescProto existingPartition = null; try { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java index b4bc53f..ffe9578 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java @@ -39,7 +39,6 @@ import org.apache.tajo.conf.TajoConf; import org.apache.tajo.storage.StorageConstants; import org.apache.tajo.util.CommonTestingUtil; import org.apache.tajo.util.KeyValueSet; -import org.apache.tajo.util.TUtil; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -297,7 +296,7 @@ public class TestHiveCatalogStore { testAddPartition(table1.getUri(), NATION, "n_nationkey=30/n_date=20150101"); testAddPartition(table1.getUri(), NATION, "n_nationkey=30/n_date=20150102"); - List<String> partitionNames = TUtil.newList(); + List<String> partitionNames = new ArrayList<>(); partitionNames.add("n_nationkey=40/n_date=20150801"); partitionNames.add("n_nationkey=40/n_date=20150802"); partitionNames.add("n_nationkey=50/n_date=20150801"); @@ -445,7 +444,7 @@ public class TestHiveCatalogStore { } private void testAddPartitions(URI uri, String tableName, List<String> partitionNames) throws Exception { - List<CatalogProtos.PartitionDescProto> partitions = TUtil.newList(); + List<CatalogProtos.PartitionDescProto> partitions = new ArrayList<>(); for (String partitionName : partitionNames) { CatalogProtos.PartitionDescProto.Builder builder = CatalogProtos.PartitionDescProto.newBuilder(); builder.setPartitionName(partitionName); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java index be2913f..fb7129e 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.tajo.exception.UndefinedTableException; import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.catalog.proto.CatalogProtos.DataFormat; -import org.apache.tajo.util.TUtil; public class InfoSchemaMetadataDictionary { private static final String DATABASE_NAME = "information_schema"; @@ -79,7 +78,7 @@ public class InfoSchemaMetadataDictionary { } public List<String> getAllSystemTables() { - List<String> systemTableNames = TUtil.newList(); + List<String> systemTableNames = new ArrayList<>(); for (TableDescriptor descriptor: schemaInfoTableDescriptors) { systemTableNames.add(descriptor.getTableNameString()); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java index 88d4d60..c2b9529 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java @@ -39,7 +39,6 @@ import org.apache.tajo.util.JavaResourceUtil; import org.apache.tajo.plan.expr.*; import org.apache.tajo.plan.util.PartitionFilterAlgebraVisitor; import org.apache.tajo.util.Pair; -import org.apache.tajo.util.TUtil; import java.io.IOException; import java.net.URI; @@ -431,7 +430,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo @Override public List<TablespaceProto> getTablespaces() { - List<TablespaceProto> tablespaces = TUtil.newList(); + List<TablespaceProto> tablespaces = new ArrayList<>(); String sql = "SELECT SPACE_ID, SPACE_NAME, SPACE_HANDLER, SPACE_URI FROM " + TB_SPACES ; @@ -2138,7 +2137,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo String selectStatement = null; Pair<String, List<PartitionFilterSet>> pair = null; - List<PartitionDescProto> partitions = TUtil.newList(); + List<PartitionDescProto> partitions = new ArrayList<>(); List<PartitionFilterSet> filterSets = null; int databaseId = getDatabaseId(request.getDatabaseName()); @@ -2250,7 +2249,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo Expr[] exprs = null; try { - List<PartitionFilterSet> filterSets = TUtil.newList(); + List<PartitionFilterSet> filterSets = new ArrayList<>(); if (json != null && !json.isEmpty()) { Expr algebra = JsonHelper.fromJson(json, Expr.class); @@ -2297,7 +2296,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo PartitionFilterSet filterSet = new PartitionFilterSet(); filterSet.setColumnName(target.getSimpleName()); - List<Pair<Type, Object>> list = TUtil.newList(); + List<Pair<Type, Object>> list = new ArrayList<>(); list.addAll(visitor.getParameters()); filterSet.addParameters(list); @@ -2321,7 +2320,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo PartitionFilterSet filterSet = new PartitionFilterSet(); filterSet.setColumnName(target.getSimpleName()); - List<Pair<Type, Object>> list = TUtil.newList(); + List<Pair<Type, Object>> list = new ArrayList<>(); list.addAll(visitor.getParameters()); filterSet.addParameters(list); @@ -2872,7 +2871,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo @Override public List<IndexDescProto> getAllIndexes() throws UndefinedDatabaseException { - List<IndexDescProto> indexDescProtos = TUtil.newList(); + List<IndexDescProto> indexDescProtos = new ArrayList<>(); for (String databaseName : getAllDatabaseNames()) { for (String tableName : getAllTableNames(databaseName)) { try { @@ -3029,7 +3028,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo private List<Pair<Type, Object>> parameters; public PartitionFilterSet() { - parameters = TUtil.newList(); + parameters = new ArrayList<>(); } public String getColumnName() { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java index c8b7386..ea15c07 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java @@ -24,7 +24,6 @@ import org.apache.tajo.catalog.CatalogConstants; import org.apache.tajo.catalog.CatalogUtil; import org.apache.tajo.catalog.store.object.*; import org.apache.tajo.exception.TajoInternalError; -import org.apache.tajo.util.TUtil; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; @@ -336,7 +335,7 @@ public class XMLCatalogSchemaManager { public boolean catalogAlreadyExists(Connection conn) { boolean result = false; try { - List<String> constants = TUtil.newList(); + List<String> constants = new ArrayList<>(); constants.add(CatalogConstants.TB_META); constants.add(CatalogConstants.TB_SPACES); constants.add(CatalogConstants.TB_DATABASES); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java index 7fa1705..4df418f 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java @@ -28,7 +28,6 @@ import org.apache.tajo.client.TajoClientImpl; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.service.ServiceTrackerFactory; import org.apache.tajo.util.Pair; -import org.apache.tajo.util.TUtil; import java.io.IOException; import java.io.PrintWriter; @@ -169,7 +168,7 @@ public class TajoDump { writer.write("\n\n"); // returned list is immutable. - List<String> tableNames = TUtil.newList(client.getTableList(databaseName)); + List<String> tableNames = new ArrayList<>(client.getTableList(databaseName)); Collections.sort(tableNames); for (String tableName : tableNames) { try { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-common/src/main/java/org/apache/tajo/rule/SelfDiagnosisRuleSession.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/rule/SelfDiagnosisRuleSession.java b/tajo-common/src/main/java/org/apache/tajo/rule/SelfDiagnosisRuleSession.java index e47269f..9bb319e 100644 --- a/tajo-common/src/main/java/org/apache/tajo/rule/SelfDiagnosisRuleSession.java +++ b/tajo-common/src/main/java/org/apache/tajo/rule/SelfDiagnosisRuleSession.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import org.apache.tajo.rule.EvaluationResult.EvaluationResultCode; import org.apache.tajo.rule.SelfDiagnosisRuleEngine.RuleWrapper; -import org.apache.tajo.util.TUtil; public class SelfDiagnosisRuleSession { @@ -67,7 +66,7 @@ public class SelfDiagnosisRuleSession { protected List<RuleWrapper> getCandidateRules() { Map<String, Map<String, RuleWrapper>> wrapperMap = null; - List<RuleWrapper> candidateRules = TUtil.newList(); + List<RuleWrapper> candidateRules = new ArrayList<>(); wrapperMap = ruleEngine.getRules(); Class<?> callerClazz = getCallerClassName(); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-common/src/main/java/org/apache/tajo/service/BaseServiceTracker.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/service/BaseServiceTracker.java b/tajo-common/src/main/java/org/apache/tajo/service/BaseServiceTracker.java index e598f2a..43f8c32 100644 --- a/tajo-common/src/main/java/org/apache/tajo/service/BaseServiceTracker.java +++ b/tajo-common/src/main/java/org/apache/tajo/service/BaseServiceTracker.java @@ -19,10 +19,11 @@ package org.apache.tajo.service; import org.apache.tajo.conf.TajoConf; -import org.apache.tajo.util.TUtil; import java.io.IOException; import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class BaseServiceTracker implements ServiceTracker { @@ -43,7 +44,7 @@ public class BaseServiceTracker implements ServiceTracker { tajoMasterInfo.setCatalogAddress(conf.getSocketAddrVar(TajoConf.ConfVars.CATALOG_ADDRESS)); tajoMasterInfo.setWebServerAddress(conf.getSocketAddrVar(TajoConf.ConfVars.TAJO_MASTER_INFO_ADDRESS)); - tajoMasterInfos = TUtil.newList(tajoMasterInfo); + tajoMasterInfos = Arrays.asList(tajoMasterInfo); } @Override @@ -94,7 +95,7 @@ public class BaseServiceTracker implements ServiceTracker { @Override public List<String> getMasters(TajoConf conf) throws ServiceTrackerException { - List<String> list = TUtil.newList(); + List<String> list = new ArrayList<>(); list.add(getMasterAddress()); return list; } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-common/src/main/java/org/apache/tajo/util/TUtil.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/util/TUtil.java b/tajo-common/src/main/java/org/apache/tajo/util/TUtil.java index b54ae6a..99ceff0 100644 --- a/tajo-common/src/main/java/org/apache/tajo/util/TUtil.java +++ b/tajo-common/src/main/java/org/apache/tajo/util/TUtil.java @@ -122,42 +122,10 @@ public class TUtil { return result; } - public static <K,V> Map<K,V> newLinkedHashMap() { - return new LinkedHashMap<>(); - } - - public static <K, V> Map<K,V> newLinkedHashMap(K k, V v) { - HashMap<K, V> newMap = new LinkedHashMap<>(); - newMap.put(k, v); - return newMap; - } - public static <K,V> Map<K,V> newConcurrentHashMap() { return new ConcurrentHashMap<>(); } - public static <T> List<T> newList() { - return new ArrayList<>(); - } - - public static <T> List<T> newList(T...items) { - List<T> list = new ArrayList<>(); - for (T t : items) { - list.add(t); - } - - return list; - } - - public static <T> List<T> newList(Collection<T> items) { - List<T> list = new ArrayList<>(); - for (T t : items) { - list.add(t); - } - - return list; - } - /** * It check if T is null or not. * @@ -176,7 +144,9 @@ public class TUtil { if (map.containsKey(k1)) { map.get(k1).add(value); } else { - map.put(k1, TUtil.newList(value)); + List inputList = new ArrayList<>(); + inputList.add(value); + map.put(k1, inputList); } } @@ -185,7 +155,7 @@ public class TUtil { if (map.containsKey(k1)) { map.get(k1).addAll(list); } else { - map.put(k1, TUtil.newList(list)); + map.put(k1, new ArrayList<>(list)); } } @@ -194,7 +164,9 @@ public class TUtil { if (map.containsKey(k1)) { map.get(k1).put(k2, value); } else { - map.put(k1, TUtil.newLinkedHashMap(k2, value)); + HashMap<KEY2, VALUE> newMap = new LinkedHashMap<>(); + newMap.put(k2, value); + map.put(k1, newMap); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-common/src/main/java/org/apache/tajo/util/graph/SimpleDirectedGraph.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/util/graph/SimpleDirectedGraph.java b/tajo-common/src/main/java/org/apache/tajo/util/graph/SimpleDirectedGraph.java index c40338e..b5e36e7 100644 --- a/tajo-common/src/main/java/org/apache/tajo/util/graph/SimpleDirectedGraph.java +++ b/tajo-common/src/main/java/org/apache/tajo/util/graph/SimpleDirectedGraph.java @@ -33,9 +33,9 @@ import java.util.*; */ public class SimpleDirectedGraph<V, E> implements DirectedGraph<V,E> { /** map: child -> parent */ - protected Map<V, Map<V, E>> directedEdges = TUtil.newLinkedHashMap(); + protected Map<V, Map<V, E>> directedEdges = new LinkedHashMap<>(); /** map: parent -> child */ - protected Map<V, Map<V, E>> reversedEdges = TUtil.newLinkedHashMap(); + protected Map<V, Map<V, E>> reversedEdges = new LinkedHashMap<>(); public void clear() { for (Map<V, E> eachEdge : directedEdges.values()) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-common/src/main/java/org/apache/tajo/validation/PathListValidator.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/validation/PathListValidator.java b/tajo-common/src/main/java/org/apache/tajo/validation/PathListValidator.java index a580cb5..5f23608 100644 --- a/tajo-common/src/main/java/org/apache/tajo/validation/PathListValidator.java +++ b/tajo-common/src/main/java/org/apache/tajo/validation/PathListValidator.java @@ -18,8 +18,7 @@ package org.apache.tajo.validation; -import org.apache.tajo.util.TUtil; - +import java.util.ArrayList; import java.util.Collection; public class PathListValidator extends AbstractValidator { @@ -57,7 +56,7 @@ public class PathListValidator extends AbstractValidator { @Override protected Collection<Validator> getDependantValidators() { - return TUtil.newList(); + return new ArrayList<>(); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleEngine.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleEngine.java b/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleEngine.java index a490698..ff568bc 100644 --- a/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleEngine.java +++ b/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleEngine.java @@ -26,6 +26,7 @@ import java.io.FileOutputStream; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.jar.Attributes; @@ -37,7 +38,6 @@ import org.apache.hadoop.fs.Path; import org.apache.tajo.rule.EvaluationResult.EvaluationResultCode; import org.apache.tajo.rule.SelfDiagnosisRuleEngine.RuleWrapper; import org.apache.tajo.util.CommonTestingUtil; -import org.apache.tajo.util.TUtil; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -68,7 +68,9 @@ public class TestRuleEngine { @Override public List<SelfDiagnosisRule> getDefinedRules() { - List<SelfDiagnosisRule> ruleList = TUtil.newList(new TestRule1(), new TestRule2()); + List<SelfDiagnosisRule> ruleList = new ArrayList<>(); + ruleList.add(new TestRule1()); + ruleList.add(new TestRule2()); return ruleList; } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleSession.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleSession.java b/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleSession.java index 5691911..6da5dfa 100644 --- a/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleSession.java +++ b/tajo-common/src/test/java/org/apache/tajo/rule/TestRuleSession.java @@ -26,6 +26,7 @@ import java.io.FileOutputStream; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; import java.util.List; import java.util.jar.Attributes; import java.util.jar.JarEntry; @@ -36,7 +37,6 @@ import org.apache.hadoop.fs.Path; import org.apache.tajo.rule.EvaluationResult.EvaluationResultCode; import org.apache.tajo.rule.SelfDiagnosisRuleEngine.RuleWrapper; import org.apache.tajo.util.CommonTestingUtil; -import org.apache.tajo.util.TUtil; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -69,7 +69,7 @@ public class TestRuleSession { @Override public List<SelfDiagnosisRule> getDefinedRules() { - List<SelfDiagnosisRule> ruleList = TUtil.newList(); + List<SelfDiagnosisRule> ruleList = new ArrayList<>(); ruleList.add(new TestRule1()); ruleList.add(new TestRule2()); ruleList.add(new TestRule3()); @@ -214,7 +214,7 @@ public class TestRuleSession { @Override public List<SelfDiagnosisRule> getDefinedRules() { - List<SelfDiagnosisRule> ruleList = TUtil.newList(); + List<SelfDiagnosisRule> ruleList = new ArrayList<>(); ruleList.add(new TestPriorityRule1()); ruleList.add(new TestPriorityRule2()); ruleList.add(new TestPriorityRule3()); @@ -320,7 +320,7 @@ public class TestRuleSession { @Override public List<SelfDiagnosisRule> getDefinedRules() { - List<SelfDiagnosisRule> ruleList = TUtil.newList(); + List<SelfDiagnosisRule> ruleList = new ArrayList<>(); ruleList.add(new TestExecRule1()); ruleList.add(new TestExecRule2()); ruleList.add(new TestExecRule3()); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/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 8db6e3a..68446ac 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 @@ -27,7 +27,6 @@ import java.math.BigInteger; import java.math.MathContext; import java.util.*; -import org.apache.tajo.util.TUtil; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeDiagnosingMatcher; http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java index 53fbf0a..2528399 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java @@ -56,7 +56,6 @@ import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.unit.StorageUnit; import org.apache.tajo.util.CommonTestingUtil; import org.apache.tajo.util.KeyValueSet; -import org.apache.tajo.util.TUtil; import org.apache.tajo.worker.TaskAttemptContext; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -674,7 +673,7 @@ public class TestPhysicalPlanner { } assertEquals(numPartitions, fragments.size()); - Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, TUtil.newList(fragments)); + Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, new ArrayList<>(fragments)); scanner.init(); Tuple tuple; @@ -745,7 +744,7 @@ public class TestPhysicalPlanner { assertEquals(expectedFileNum, fileStatuses.length); } TableMeta outputMeta = CatalogUtil.newTableMeta("TEXT"); - Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, TUtil.newList(fragments)); + Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, new ArrayList<>(fragments)); scanner.init(); long rowNum = 0; @@ -809,7 +808,7 @@ public class TestPhysicalPlanner { assertEquals(numPartitions, fragments.size()); - Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, TUtil.newList(fragments)); + Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, new ArrayList<>(fragments)); scanner.init(); Tuple tuple; int i = 0; http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java index cc9028b..ea4a7c8 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java @@ -24,7 +24,6 @@ import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.conf.TajoConf.ConfVars; import org.apache.tajo.storage.StorageConstants; import org.apache.tajo.util.KeyValueSet; -import org.apache.tajo.util.TUtil; import org.apache.tajo.util.history.QueryHistory; import org.apache.tajo.util.history.StageHistory; import org.junit.AfterClass; @@ -58,7 +57,7 @@ public class TestGroupByQuery extends QueryTestCaseBase { @AfterClass public static void tearDown() throws Exception { - client.unsetSessionVariables(TUtil.newList(SessionVars.GROUPBY_MULTI_LEVEL_ENABLED.keyname())); + client.unsetSessionVariables(Arrays.asList(SessionVars.GROUPBY_MULTI_LEVEL_ENABLED.keyname())); } @Parameters http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java index edd6c70..13b7711 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java @@ -50,7 +50,6 @@ import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.storage.hbase.*; import org.apache.tajo.util.Bytes; import org.apache.tajo.util.KeyValueSet; -import org.apache.tajo.util.TUtil; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -1312,7 +1311,7 @@ public class TestHBaseTable extends QueryTestCaseBase { } finally { executeString("DROP TABLE hbase_mapped_table PURGE").close(); - client.unsetSessionVariables(TUtil.newList(HBaseStorageConstants.INSERT_PUT_MODE)); + client.unsetSessionVariables(Arrays.asList(HBaseStorageConstants.INSERT_PUT_MODE)); if (scanner != null) { scanner.close(); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectNestedRecord.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectNestedRecord.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectNestedRecord.java index da18b0a..b51c7ee 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectNestedRecord.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectNestedRecord.java @@ -19,10 +19,10 @@ package org.apache.tajo.engine.query; import org.apache.tajo.QueryTestCaseBase; -import org.apache.tajo.util.TUtil; import org.junit.Test; import java.sql.ResultSet; +import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { @Test public final void testSelect0() throws Exception { List<String> tables = executeDDL("sample1_ddl.sql", "sample1", "sample1"); - assertEquals(TUtil.newList("sample1"), tables); + assertEquals(Arrays.asList("sample1"), tables); ResultSet res = executeQuery(); assertResultSet(res); @@ -42,7 +42,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { @Test public final void testSelect1() throws Exception { List<String> tables = executeDDL("sample1_ddl.sql", "sample1", "sample2"); - assertEquals(TUtil.newList("sample2"), tables); + assertEquals(Arrays.asList("sample2"), tables); ResultSet res = executeQuery(); assertResultSet(res); @@ -52,7 +52,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { @Test public final void testSelect2() throws Exception { List<String> tables = executeDDL("tweets_ddl.sql", "tweets", "tweets"); - assertEquals(TUtil.newList("tweets"), tables); + assertEquals(Arrays.asList("tweets"), tables); ResultSet res = executeQuery(); assertResultSet(res); @@ -62,7 +62,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { @Test public final void testSelect3() throws Exception { List<String> tables = executeDDL("sample2_ddl.sql", "sample2", "sample5"); - assertEquals(TUtil.newList("sample5"), tables); + assertEquals(Arrays.asList("sample5"), tables); ResultSet res = executeQuery(); assertResultSet(res); @@ -73,7 +73,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { public final void testTAJO_1610() throws Exception { executeString("CREATE DATABASE tweets").close(); List<String> tables = executeDDL("tweets_ddl.sql", "tweets", "tweets.tweets"); - assertEquals(TUtil.newList("tweets.tweets"), tables); + assertEquals(Arrays.asList("tweets.tweets"), tables); ResultSet res = executeQuery(); assertResultSet(res); @@ -83,7 +83,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { @Test public final void testNestedFieldAsGroupbyKey1() throws Exception { List<String> tables = executeDDL("tweets_ddl.sql", "tweets", "tweets"); - assertEquals(TUtil.newList("tweets"), tables); + assertEquals(Arrays.asList("tweets"), tables); ResultSet res = executeQuery(); assertResultSet(res); @@ -93,7 +93,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { @Test public final void testNestedFieldAsJoinKey1() throws Exception { List<String> tables = executeDDL("tweets_ddl.sql", "tweets", "tweets"); - assertEquals(TUtil.newList("tweets"), tables); + assertEquals(Arrays.asList("tweets"), tables); ResultSet res = executeQuery(); assertResultSet(res); @@ -104,7 +104,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { public final void testInsertType1() throws Exception { // all columns List<String> tables = executeDDL("sample1_ddl.sql", "sample1", "sample3"); - assertEquals(TUtil.newList("sample3"), tables); + assertEquals(Arrays.asList("sample3"), tables); executeString("CREATE TABLE clone (title TEXT, name RECORD (first_name TEXT, last_name TEXT)) USING JSON;").close(); @@ -118,7 +118,7 @@ public class TestSelectNestedRecord extends QueryTestCaseBase { public final void testInsertType2() throws Exception { // some columns List<String> tables = executeDDL("sample1_ddl.sql", "sample1", "sample4"); - assertEquals(TUtil.newList("sample4"), tables); + assertEquals(Arrays.asList("sample4"), tables); executeString("CREATE TABLE clone2 (title TEXT, name RECORD (first_name TEXT, last_name TEXT)) USING JSON;").close(); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResultResource.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResultResource.java b/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResultResource.java index 26fa011..9e0d83a 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResultResource.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResultResource.java @@ -25,7 +25,6 @@ import org.apache.tajo.error.Errors.ResultCode; import org.apache.tajo.exception.ErrorUtil; import org.apache.tajo.storage.RowStoreUtil; import org.apache.tajo.storage.Tuple; -import org.apache.tajo.util.TUtil; import org.apache.tajo.ws.rs.netty.gson.GsonFeature; import org.apache.tajo.ws.rs.requests.NewSessionRequest; import org.apache.tajo.ws.rs.requests.SubmitQueryRequest; @@ -52,6 +51,7 @@ import java.io.DataInputStream; import java.io.EOFException; import java.io.InputStream; import java.net.URI; +import java.util.ArrayList; import java.util.List; import static org.apache.tajo.exception.ErrorUtil.isOk; @@ -208,7 +208,7 @@ public class TestQueryResultResource extends QueryTestCaseBase { assertNotNull(queryResultSetInputStream); boolean isFinished = false; - List<Tuple> tupleList = TUtil.newList(); + List<Tuple> tupleList = new ArrayList<>(); RowStoreUtil.RowStoreDecoder decoder = RowStoreUtil.createDecoder(response.getSchema()); while (!isFinished) { try { @@ -274,7 +274,7 @@ public class TestQueryResultResource extends QueryTestCaseBase { assertNotNull(queryResultSetInputStream); boolean isFinished = false; - List<Tuple> tupleList = TUtil.newList(); + List<Tuple> tupleList = new ArrayList<>(); int receviedSize = 0; RowStoreUtil.RowStoreDecoder decoder = RowStoreUtil.createDecoder(response.getSchema()); while (!isFinished) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/engine/function/FunctionLoader.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/function/FunctionLoader.java b/tajo-core/src/main/java/org/apache/tajo/engine/function/FunctionLoader.java index 1fb5acf..d7fbf88 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/function/FunctionLoader.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/function/FunctionLoader.java @@ -40,7 +40,6 @@ import org.apache.tajo.exception.AmbiguousFunctionException; import org.apache.tajo.function.*; import org.apache.tajo.plan.function.python.PythonScriptEngine; import org.apache.tajo.util.ClassUtil; -import org.apache.tajo.util.TUtil; import java.io.IOException; import java.lang.reflect.Method; @@ -108,7 +107,7 @@ public class FunctionLoader { continue; } - List<Path> filePaths = TUtil.newList(); + List<Path> filePaths = new ArrayList<>(); if (localFS.isDirectory(codePath)) { for (FileStatus file : localFS.listStatus(codePath, (Path path) -> path.getName().endsWith(PythonScriptEngine.FILE_EXTENSION))) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java index c489bbb..8bc935b 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java @@ -61,6 +61,7 @@ import org.apache.tajo.worker.TaskAttemptContext; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Stack; @@ -928,11 +929,11 @@ public class PhysicalPlannerImpl implements PhysicalPlanner { if (broadcastFlag) { PartitionedTableScanNode partitionedTableScanNode = (PartitionedTableScanNode) scanNode; - List<Fragment> fileFragments = TUtil.newList(); + List<Fragment> fileFragments = new ArrayList<>(); FileTablespace space = (FileTablespace) TablespaceManager.get(scanNode.getTableDesc().getUri()); for (Path path : partitionedTableScanNode.getInputPaths()) { - fileFragments.addAll(TUtil.newList(space.split(scanNode.getCanonicalName(), path))); + fileFragments.addAll(Arrays.asList(space.split(scanNode.getCanonicalName(), path))); } FragmentProto[] fragments = http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java index 7126b51..66a1791 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java @@ -24,6 +24,7 @@ import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.common.ProtoObject; import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -212,7 +213,7 @@ public class Enforcer implements ProtoObject<EnforcerProto> { if (proto != null) { return proto.getPropertiesList(); } else { - List<EnforceProperty> list = TUtil.newList(); + List<EnforceProperty> list = new ArrayList<>(); for (List<EnforceProperty> propertyList : properties.values()) { list.addAll(propertyList); } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/BaseGlobalPlanRewriteRuleProvider.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/BaseGlobalPlanRewriteRuleProvider.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/BaseGlobalPlanRewriteRuleProvider.java index 1ae4056..6be4d14 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/BaseGlobalPlanRewriteRuleProvider.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/BaseGlobalPlanRewriteRuleProvider.java @@ -21,14 +21,14 @@ package org.apache.tajo.engine.planner.global.rewriter; import com.google.common.collect.Lists; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.engine.planner.global.rewriter.rules.BroadcastJoinRule; -import org.apache.tajo.util.TUtil; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @SuppressWarnings("unused") public class BaseGlobalPlanRewriteRuleProvider extends GlobalPlanRewriteRuleProvider { - private static final List<Class<? extends GlobalPlanRewriteRule>> EMPTY_RULES = TUtil.newList(); + private static final List<Class<? extends GlobalPlanRewriteRule>> EMPTY_RULES = new ArrayList<>(); public BaseGlobalPlanRewriteRuleProvider(TajoConf conf) { super(conf); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/BroadcastJoinRule.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/BroadcastJoinRule.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/BroadcastJoinRule.java index 7bb2c30..a19704b 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/BroadcastJoinRule.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/BroadcastJoinRule.java @@ -33,7 +33,6 @@ import org.apache.tajo.plan.joinorder.GreedyHeuristicJoinOrderAlgorithm; import org.apache.tajo.plan.logical.*; import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.unit.StorageUnit; -import org.apache.tajo.util.TUtil; import org.apache.tajo.util.graph.DirectedGraphVisitor; import java.util.*; @@ -143,7 +142,7 @@ public class BroadcastJoinRule implements GlobalPlanRewriteRule { // When every child is a broadcast candidate, enforce non-broadcast for the largest relation for the join to be // computed at the node who stores such largest relation. if (isFullyBroadcastable(current)) { - List<ScanNode> broadcastCandidates = TUtil.newList(current.getBroadcastRelations()); + List<ScanNode> broadcastCandidates = new ArrayList<>(current.getBroadcastRelations()); Collections.sort(broadcastCandidates, relSizeComparator); current.removeBroadcastRelation(broadcastCandidates.remove(broadcastCandidates.size()-1)); @@ -244,7 +243,7 @@ public class BroadcastJoinRule implements GlobalPlanRewriteRule { context.estimatedEbOutputSize.put(current.getId(), outputVolume); } } else { - List<ScanNode> relations = TUtil.newList(current.getBroadcastRelations()); + List<ScanNode> relations = new ArrayList<>(current.getBroadcastRelations()); for (ScanNode eachRelation : relations) { current.removeBroadcastRelation(eachRelation); } @@ -387,7 +386,7 @@ public class BroadcastJoinRule implements GlobalPlanRewriteRule { * @param block */ private void checkTotalSizeOfBroadcastableRelations(Context context, ExecutionBlock block) { - List<ScanNode> broadcastCandidates = TUtil.newList(block.getBroadcastRelations()); + List<ScanNode> broadcastCandidates = new ArrayList<>(block.getBroadcastRelations()); Collections.sort(broadcastCandidates, relSizeComparator); // Enforce broadcast for candidates in ascending order of relation size @@ -449,7 +448,7 @@ public class BroadcastJoinRule implements GlobalPlanRewriteRule { private void addUnionNodeIfNecessary(Map<ExecutionBlockId, ExecutionBlockId> unionScanMap, MasterPlan plan, ExecutionBlock child, ExecutionBlock current) { if (unionScanMap != null) { - List<ExecutionBlockId> unionScans = TUtil.newList(); + List<ExecutionBlockId> unionScans = new ArrayList<>(); ExecutionBlockId representativeId = null; if (unionScanMap.containsKey(child.getId())) { representativeId = unionScanMap.get(child.getId()); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java index 777dcf5..8c860dc 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java @@ -32,7 +32,6 @@ import org.apache.tajo.plan.logical.GroupbyNode; import org.apache.tajo.storage.NullTuple; import org.apache.tajo.storage.Tuple; import org.apache.tajo.storage.VTuple; -import org.apache.tajo.util.TUtil; import org.apache.tajo.worker.TaskAttemptContext; import java.io.IOException; @@ -72,7 +71,7 @@ public class DistinctGroupbyHashAggregationExec extends UnaryPhysicalExec { public void init() throws IOException { super.init(); - distinctGroupingKeyColumnSet = TUtil.newList(); + distinctGroupingKeyColumnSet = new ArrayList<>(); for (Column col : plan.getGroupingColumns()) { if (!distinctGroupingKeyColumnSet.contains(col)) { distinctGroupingKeyColumnSet.add(col); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java index 69631b5..0e89928 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java @@ -49,11 +49,11 @@ import org.apache.tajo.tuple.memory.UnSafeTuple; import org.apache.tajo.tuple.memory.UnSafeTupleList; import org.apache.tajo.unit.StorageUnit; import org.apache.tajo.util.FileUtil; -import org.apache.tajo.util.TUtil; import org.apache.tajo.worker.TaskAttemptContext; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -139,7 +139,7 @@ public class ExternalSortExec extends SortExec { final CatalogProtos.FragmentProto[] fragments) throws PhysicalPlanningException { this(context, plan); - mergedInputFragments = TUtil.newList(); + mergedInputFragments = new ArrayList<>(); for (CatalogProtos.FragmentProto proto : fragments) { FileFragment fragment = FragmentConvertor.convert(FileFragment.class, proto); mergedInputFragments.add(new Chunk(inSchema, fragment, scanNode.getTableDesc().getMeta())); @@ -212,7 +212,7 @@ public class ExternalSortExec extends SortExec { */ private List<Chunk> sortAndStoreAllChunks() throws IOException { Tuple tuple; - List<Chunk> chunkPaths = TUtil.newList(); + List<Chunk> chunkPaths = new ArrayList<>(); int chunkId = 0; long runStartTime = System.currentTimeMillis(); @@ -333,8 +333,8 @@ public class ExternalSortExec extends SortExec { private Scanner externalMergeAndSort(List<Chunk> chunks) throws Exception { int level = 0; - final List<Chunk> inputFiles = TUtil.newList(chunks); - final List<Chunk> outputFiles = TUtil.newList(); + final List<Chunk> inputFiles = new ArrayList<>(chunks); + final List<Chunk> outputFiles = new ArrayList<>(); int remainRun = inputFiles.size(); int chunksSize = chunks.size(); @@ -347,9 +347,9 @@ public class ExternalSortExec extends SortExec { int remainInputRuns = inputFiles.size(); int outChunkId = 0; int outputFileNum = 0; - List<Future<Chunk>> futures = TUtil.newList(); + List<Future<Chunk>> futures = new ArrayList<>(); // the number of files being merged in threads. - List<Integer> numberOfMergingFiles = TUtil.newList(); + List<Integer> numberOfMergingFiles = new ArrayList<>(); for (int startIdx = 0; startIdx < inputFiles.size();) { @@ -376,7 +376,7 @@ public class ExternalSortExec extends SortExec { info(LOG, "Unbalanced merge possibility detected: number of remain input (" + remainInputRuns + ") and output files (" + outputFileNum + ") <= " + defaultFanout); - List<Chunk> switched = TUtil.newList(); + List<Chunk> switched = new ArrayList<>(); // switch the remain inputs to the next outputs for (int j = startIdx; j < inputFiles.size(); j++) { switched.add(inputFiles.get(j)); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/ha/HdfsServiceTracker.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/ha/HdfsServiceTracker.java b/tajo-core/src/main/java/org/apache/tajo/ha/HdfsServiceTracker.java index 4c7732f..120d61c 100644 --- a/tajo-core/src/main/java/org/apache/tajo/ha/HdfsServiceTracker.java +++ b/tajo-core/src/main/java/org/apache/tajo/ha/HdfsServiceTracker.java @@ -33,11 +33,11 @@ import org.apache.tajo.service.HAServiceTracker; import org.apache.tajo.service.ServiceTrackerException; import org.apache.tajo.service.TajoMasterInfo; import org.apache.tajo.util.FileUtil; -import org.apache.tajo.util.TUtil; import java.io.IOException; import java.net.InetSocketAddress; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -302,7 +302,7 @@ public class HdfsServiceTracker extends HAServiceTracker { @Override public List<TajoMasterInfo> getMasters() throws IOException { - List<TajoMasterInfo> list = TUtil.newList(); + List<TajoMasterInfo> list = new ArrayList<>(); FileStatus[] files = fs.listStatus(activePath); for(FileStatus status : files) { @@ -496,12 +496,12 @@ public class HdfsServiceTracker extends HAServiceTracker { throw new ServiceTrackerException("Active master entry must be a file, but it is a directory."); } - List<String> addressElements = TUtil.newList(); + List<String> addressElements = new ArrayList<>(); FSDataInputStream stream = fs.open(activeMasterEntry); String data = stream.readUTF(); stream.close(); - addressElements.addAll(TUtil.newList(data.split("_"))); // Add remains entries to elements + addressElements.addAll(Arrays.asList(data.split("_"))); // Add remains entries to elements // ensure the number of entries Preconditions.checkState(addressElements.size() == 5, "Fewer service addresses than necessary."); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java index da19625..7a52acc 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java @@ -48,7 +48,6 @@ import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.TablespaceManager; import org.apache.tajo.util.Pair; import org.apache.tajo.util.StringUtils; -import org.apache.tajo.util.TUtil; import java.io.File; import java.io.IOException; @@ -612,7 +611,7 @@ public class DDLExecutor { // Find missing partitions from filesystem List<PartitionDescProto> existingPartitions = catalog.getPartitionsOfTable(databaseName, simpleTableName); - List<String> existingPartitionNames = TUtil.newList(); + List<String> existingPartitionNames = new ArrayList<>(); Path existingPartitionPath = null; for(PartitionDescProto existingPartition : existingPartitions) { @@ -624,7 +623,7 @@ public class DDLExecutor { } // Find missing partitions from CatalogStore - List<PartitionDescProto> targetPartitions = TUtil.newList(); + List<PartitionDescProto> targetPartitions = new ArrayList<>(); for(Path filteredPath : filteredPaths) { int startIdx = filteredPath.toString().indexOf(PartitionedTableRewriter.getColumnPartitionPathPrefix http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java index 7f505a6..d627064 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java @@ -60,7 +60,6 @@ import org.apache.tajo.storage.VTuple; import org.apache.tajo.tuple.memory.MemoryBlock; import org.apache.tajo.tuple.memory.MemoryRowBlock; import org.apache.tajo.util.KeyValueSet; -import org.apache.tajo.util.TUtil; import org.apache.tajo.worker.TaskAttemptContext; import java.io.IOException; @@ -767,7 +766,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult this.qual.bind(null, inSchema); } - cachedData = TUtil.newList(); + cachedData = new ArrayList<>(); currentRow = 0; isClosed = false; http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java index 0699fc7..599931d 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java @@ -50,7 +50,6 @@ import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.storage.StorageConstants; import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.TablespaceManager; -import org.apache.tajo.util.TUtil; import org.apache.tajo.util.history.QueryHistory; import org.apache.tajo.util.history.StageHistory; @@ -540,7 +539,7 @@ public class Query implements EventHandler<QueryEvent> { private List<PartitionDescProto> getPartitionsWithContentsSummary(TajoConf conf, Path outputDir, List<PartitionDescProto> partitions) throws IOException { - List<PartitionDescProto> finalPartitions = TUtil.newList(); + List<PartitionDescProto> finalPartitions = new ArrayList<>(); FileSystem fileSystem = outputDir.getFileSystem(conf); for (PartitionDescProto partition : partitions) { @@ -560,7 +559,7 @@ public class Query implements EventHandler<QueryEvent> { } private static class QueryHookExecutor { - private List<QueryHook> hookList = TUtil.newList(); + private List<QueryHook> hookList = new ArrayList<>(); private QueryMaster.QueryMasterContext context; public QueryHookExecutor(QueryMaster.QueryMasterContext context) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java index bd8311f..acf6c16 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java @@ -321,12 +321,12 @@ public class Repartitioner { if (tbNameToInterm.containsKey(scanEbId)) { tbNameToInterm.get(scanEbId).add(intermediateEntry); } else { - tbNameToInterm.put(scanEbId, TUtil.newList(intermediateEntry)); + tbNameToInterm.put(scanEbId, new ArrayList<>(Arrays.asList(intermediateEntry))); } } else { Map<ExecutionBlockId, List<IntermediateEntry>> tbNameToInterm = new HashMap<>(); - tbNameToInterm.put(scanEbId, TUtil.newList(intermediateEntry)); + tbNameToInterm.put(scanEbId, new ArrayList<>(Arrays.asList(intermediateEntry))); hashEntries.put(intermediateEntry.getPartId(), tbNameToInterm); } } @@ -999,7 +999,7 @@ public class Repartitioner { int partId = eachInterm.getPartId(); List<IntermediateEntry> partitionInterms = partitionIntermMap.get(partId); if (partitionInterms == null) { - partitionInterms = TUtil.newList(eachInterm); + partitionInterms = Arrays.asList(eachInterm); partitionIntermMap.put(partId, partitionInterms); } else { partitionInterms.add(eachInterm); @@ -1078,7 +1078,7 @@ public class Repartitioner { fetchListVolume = 0; } FetchImpl fetch = new FetchImpl(fetchName, currentInterm.getPullHost(), SCATTERED_HASH_SHUFFLE, - ebId, currentInterm.getPartId(), TUtil.newList(currentInterm)); + ebId, currentInterm.getPartId(), Arrays.asList(currentInterm)); fetch.setOffset(eachSplit.getFirst()); fetch.setLength(eachSplit.getSecond()); fetchListForSingleTask.add(fetch.getProto()); @@ -1219,7 +1219,7 @@ public class Repartitioner { if (hashed.containsKey(entry.getPartId())) { hashed.get(entry.getPartId()).add(entry); } else { - hashed.put(entry.getPartId(), TUtil.newList(entry)); + hashed.put(entry.getPartId(), Arrays.asList(entry)); } } @@ -1235,7 +1235,7 @@ public class Repartitioner { if (hashed.containsKey(host)) { hashed.get(host).add(entry); } else { - hashed.put(host, TUtil.newList(entry)); + hashed.put(host, Arrays.asList(entry)); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java b/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java index 485fa03..d56b6b4 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java @@ -39,7 +39,6 @@ import org.apache.tajo.storage.HashShuffleAppenderManager; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.storage.fragment.FragmentConvertor; -import org.apache.tajo.util.TUtil; import org.apache.tajo.worker.TajoWorker.WorkerContext; import java.io.File; @@ -120,7 +119,7 @@ public class TaskAttemptContext { this.partitionOutputVolume = Maps.newHashMap(); - this.partitions = TUtil.newList(); + this.partitions = new ArrayList<>(); } @VisibleForTesting @@ -292,7 +291,7 @@ public class TaskAttemptContext { } private List<Path> fragmentToPath(List<FragmentProto> tableFragments) { - List<Path> list = TUtil.newList(); + List<Path> list = new ArrayList<>(); for (FragmentProto proto : tableFragments) { FileFragment fragment = FragmentConvertor.convert(FileFragment.class, proto); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/resources/webapps/admin/cluster.jsp ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/resources/webapps/admin/cluster.jsp b/tajo-core/src/main/resources/webapps/admin/cluster.jsp index fd942bd..bc81ff9 100644 --- a/tajo-core/src/main/resources/webapps/admin/cluster.jsp +++ b/tajo-core/src/main/resources/webapps/admin/cluster.jsp @@ -72,7 +72,7 @@ String deadQueryMastersHtml = deadQueryMasters.isEmpty() ? "0": "<font color='red'>" + deadQueryMasters.size() + "</font>"; ServiceTracker haService = master.getContext().getHAService(); - List<TajoMasterInfo> masters = TUtil.newList(); + List<TajoMasterInfo> masters = new ArrayList<>(); String activeLabel = ""; if (haService != null) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-core/src/main/resources/webapps/admin/index.jsp ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/resources/webapps/admin/index.jsp b/tajo-core/src/main/resources/webapps/admin/index.jsp index 96facc5..b0f59f7 100644 --- a/tajo-core/src/main/resources/webapps/admin/index.jsp +++ b/tajo-core/src/main/resources/webapps/admin/index.jsp @@ -35,6 +35,7 @@ <%@ page import="java.net.InetSocketAddress" %> <%@ page import="java.util.Date" %> <%@ page import="java.util.Map" %> +<%@ page import="java.util.ArrayList" %> <% TajoMaster master = (TajoMaster) StaticHttpServer.getInstance().getAttribute("tajo.info.server.object"); @@ -80,7 +81,7 @@ String numDeadQueryMastersHtml = numDeadQueryMasters == 0 ? "0" : "<font color='red'>" + numDeadQueryMasters + "</font>"; ServiceTracker haService = master.getContext().getHAService(); - List<TajoMasterInfo> masters = TUtil.newList(); + List<TajoMasterInfo> masters = new ArrayList<>(); String activeLabel = ""; if (haService != null) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/ExprAnnotator.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/ExprAnnotator.java b/tajo-plan/src/main/java/org/apache/tajo/plan/ExprAnnotator.java index 560f6ac..8107c72 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/ExprAnnotator.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/ExprAnnotator.java @@ -45,6 +45,7 @@ import org.apache.tajo.util.TUtil; import org.apache.tajo.util.datetime.DateTimeUtil; import org.apache.tajo.util.datetime.TimeMeta; +import java.util.Arrays; import java.util.Set; import java.util.Stack; import java.util.TimeZone; @@ -596,7 +597,7 @@ public class ExprAnnotator extends BaseAlgebraVisitor<ExprAnnotator.Context, Eva FunctionDesc funcDesc = catalog.getFunction(expr.getSignature(), paramTypes); // trying the implicit type conversion between actual parameter types and the definition types. - if (CatalogUtil.checkIfVariableLengthParamDefinition(TUtil.newList(funcDesc.getParamTypes()))) { + if (CatalogUtil.checkIfVariableLengthParamDefinition(Arrays.asList(funcDesc.getParamTypes()))) { DataType lastDataType = funcDesc.getParamTypes()[0]; for (int i = 0; i < givenArgs.length; i++) { if (i < (funcDesc.getParamTypes().length - 1)) { // variable length http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalOptimizer.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalOptimizer.java b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalOptimizer.java index e9e6ab2..23f8584 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalOptimizer.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalOptimizer.java @@ -41,7 +41,6 @@ import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.plan.visitor.BasicLogicalPlanVisitor; import org.apache.tajo.storage.StorageService; import org.apache.tajo.util.ReflectionUtil; -import org.apache.tajo.util.TUtil; import org.apache.tajo.util.graph.DirectedGraphCursor; import java.util.*; @@ -260,7 +259,7 @@ public class LogicalOptimizer { SelectionNode node, Stack<LogicalNode> stack) throws TajoException { // all join predicate candidates must be collected before building the join tree except non-equality conditions // TODO: non-equality conditions should also be considered as join conditions after TAJO-1554 - List<EvalNode> candidateJoinQuals = TUtil.newList(); + List<EvalNode> candidateJoinQuals = new ArrayList<>(); for (EvalNode eachEval : AlgebraicUtil.toConjunctiveNormalFormArray(node.getQual())) { if (EvalTreeUtil.isJoinQual(eachEval, false)) { candidateJoinQuals.add(eachEval); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlan.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlan.java b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlan.java index 8610194..f321c76 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlan.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlan.java @@ -288,7 +288,7 @@ public class LogicalPlan { } public List<QueryBlock> getChildBlocks(QueryBlock block) { - List<QueryBlock> childBlocks = TUtil.newList(); + List<QueryBlock> childBlocks = new ArrayList<>(); for (String blockName : queryBlockGraph.getChilds(block.getName())) { childBlocks.add(queryBlocks.get(blockName)); } @@ -431,7 +431,7 @@ public class LogicalPlan { private final Map<String, List<String>> relationAliasMap = new HashMap<>(); private final Map<String, String> columnAliasMap = new HashMap<>(); private final Map<OpType, List<Expr>> operatorToExprMap = new HashMap<>(); - private final List<RelationNode> relationList = TUtil.newList(); + private final List<RelationNode> relationList = new ArrayList<>(); private final Map<Integer, List<AccessPathInfo>> relNodePidAccessPathMap = new HashMap<>(); private boolean hasWindowFunction = false; private final Map<String, ConstEval> constantPoolByRef = Maps.newHashMap(); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java index 6c38c02..50ab2e0 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java @@ -52,7 +52,6 @@ import org.apache.tajo.storage.StorageService; import org.apache.tajo.util.KeyValueSet; import org.apache.tajo.util.Pair; import org.apache.tajo.util.StringUtils; -import org.apache.tajo.util.TUtil; import java.net.URI; import java.util.*; @@ -91,7 +90,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex QueryBlock queryBlock; EvalTreeOptimizer evalOptimizer; TimeZone timeZone; - List<Expr> unplannedExprs = TUtil.newList(); + List<Expr> unplannedExprs = new ArrayList<>(); boolean debugOrUnitTests; Integer noNameSubqueryId = 0; @@ -370,7 +369,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex String [] referenceNames = new String[finalTargetNum]; ExprNormalizedResult[] normalizedExprList = new ExprNormalizedResult[finalTargetNum]; - List<ExprNormalizer.WindowSpecReferences> windowSpecReferencesList = TUtil.newList(); + List<ExprNormalizer.WindowSpecReferences> windowSpecReferencesList = new ArrayList<>(); List<Integer> targetsIds = normalize(context, projection, normalizedExprList, new Matcher() { @Override @@ -1030,8 +1029,8 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex //////////////////////////////////////////////////////// // create EvalNodes and check if each EvalNode can be evaluated here. - List<String> aggEvalNames = TUtil.newList(); - List<AggregationFunctionCallEval> aggEvalNodes = TUtil.newList(); + List<String> aggEvalNames = new ArrayList<>(); + List<AggregationFunctionCallEval> aggEvalNodes = new ArrayList<>(); boolean includeDistinctFunction = false; for (Iterator<NamedExpr> iterator = block.namedExprsMgr.getIteratorForUnevaluatedExprs(); iterator.hasNext();) { NamedExpr namedExpr = iterator.next(); @@ -1191,7 +1190,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex // In this case, this join is the top most one within a query block. boolean isTopMostJoin = stack.isEmpty() ? true : stack.peek().getType() != OpType.Join; List<String> newlyEvaluatedExprs = getNewlyEvaluatedExprsForJoin(context, joinNode, isTopMostJoin); - List<Target> targets = TUtil.newList(PlannerUtil.schemaToTargets(merged)); + List<Target> targets = new ArrayList<>(PlannerUtil.schemaToTargets(merged)); for (String newAddedExpr : newlyEvaluatedExprs) { targets.add(block.namedExprsMgr.getTarget(newAddedExpr, true)); @@ -1215,7 +1214,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex QueryBlock block = context.queryBlock; EvalNode evalNode; - List<String> newlyEvaluatedExprs = TUtil.newList(); + List<String> newlyEvaluatedExprs = new ArrayList<>(); for (Iterator<NamedExpr> it = block.namedExprsMgr.getIteratorForUnevaluatedExprs(); it.hasNext();) { NamedExpr namedExpr = it.next(); try { @@ -1286,7 +1285,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex block.addJoinType(join.getJoinType()); EvalNode evalNode; - List<String> newlyEvaluatedExprs = TUtil.newList(); + List<String> newlyEvaluatedExprs = new ArrayList<>(); for (Iterator<NamedExpr> it = block.namedExprsMgr.getIteratorForUnevaluatedExprs(); it.hasNext();) { NamedExpr namedExpr = it.next(); try { @@ -1299,7 +1298,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex } catch (UndefinedColumnException ve) {} } - List<Target> targets = TUtil.newList(PlannerUtil.schemaToTargets(merged)); + List<Target> targets = new ArrayList<>(PlannerUtil.schemaToTargets(merged)); for (String newAddedExpr : newlyEvaluatedExprs) { targets.add(block.namedExprsMgr.getTarget(newAddedExpr, true)); } @@ -1730,7 +1729,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex // Modifying projected columns by adding NULL constants // It is because that table appender does not support target columns to be written. - List<Target> targets = TUtil.newList(); + List<Target> targets = new ArrayList<>(); for (Column column : tableSchema.getAllColumns()) { int idxInProjectionNode = targetColumns.getIndex(column); http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/NamedExprsManager.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/NamedExprsManager.java b/tajo-plan/src/main/java/org/apache/tajo/plan/NamedExprsManager.java index 3ca2fe5..6ad9d70 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/NamedExprsManager.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/NamedExprsManager.java @@ -349,7 +349,7 @@ public class NamedExprsManager { private final Iterator<NamedExpr> iterator; public UnevaluatedIterator() { - List<NamedExpr> unEvaluatedList = TUtil.newList(); + List<NamedExpr> unEvaluatedList = new ArrayList<>(); for (Integer refId: idToNamesMap.keySet()) { String name = idToNamesMap.get(refId).get(0); if (!isEvaluated(name)) { http://git-wip-us.apache.org/repos/asf/tajo/blob/410a53c9/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java index 55e439e..3fe78c2 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java @@ -25,7 +25,6 @@ import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.exception.TajoException; import org.apache.tajo.plan.util.ExprFinder; import org.apache.tajo.plan.visitor.SimpleAlgebraVisitor; -import org.apache.tajo.util.TUtil; import java.util.*; @@ -543,7 +542,7 @@ public class AlgebraicUtil { * @return An array of CNF-formed algebra expressions */ public static Expr[] toConjunctiveNormalFormArray(Expr expr) { - List<Expr> list = TUtil.newList(); + List<Expr> list = new ArrayList<>(); toConjunctiveNormalFormArrayRecursive(expr, list); return list.toArray(new Expr[list.size()]); } @@ -584,7 +583,7 @@ public class AlgebraicUtil { Column target; for (int i = 0; i < partitionColumns.size(); i++) { - List<Expr> accumulatedFilters = TUtil.newList(); + List<Expr> accumulatedFilters = new ArrayList<>(); target = new Column(partitionColumns.get(i)); ColumnReferenceExpr columnReference = new ColumnReferenceExpr(tableName, target.getSimpleName());
