http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJsonWithTimezone.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJsonWithTimezone.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJsonWithTimezone.java index e526f5c..3380b1f 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJsonWithTimezone.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJsonWithTimezone.java @@ -62,7 +62,7 @@ public class TestJsonWithTimezone extends QueryTestCaseBase { // Table - timezone = GMT+9 // Client - GMT+9 through TajoClient API - Map<String,String> sessionVars = new HashMap<String, String>(); + Map<String,String> sessionVars = new HashMap<>(); sessionVars.put(SessionVars.TIMEZONE.name(), "GMT+9"); getClient().updateSessionVariables(sessionVars);
http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java index 130b02d..e55acf1 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java @@ -613,7 +613,7 @@ public class TestSelectQuery extends QueryTestCaseBase { // Table - timezone = GMT+9 // Client - GMT+9 through TajoClient API - Map<String,String> sessionVars = new HashMap<String, String>(); + Map<String,String> sessionVars = new HashMap<>(); sessionVars.put(SessionVars.TIMEZONE.name(), "GMT+9"); getClient().updateSessionVariables(sessionVars); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java index 94e5e71..5b49507 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java @@ -1091,7 +1091,7 @@ public class TestTablePartitions extends QueryTestCaseBase { schema.addColumn("col1", TajoDataTypes.Type.TEXT); schema.addColumn("col2", TajoDataTypes.Type.TEXT); - List<String> data = new ArrayList<String>(); + List<String> data = new ArrayList<>(); int totalBytes = 0; Random rand = new Random(System.currentTimeMillis()); String col2Data = "Column-2Column-2Column-2Column-2Column-2Column-2Column-2Column-2Column-2Column-2Column-2" + http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/engine/util/TestTableCache.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/util/TestTableCache.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/util/TestTableCache.java index f10f2a1..2161074 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/util/TestTableCache.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/util/TestTableCache.java @@ -50,7 +50,7 @@ public class TestTableCache { final int parallelCount = 30; ExecutorService executor = Executors.newFixedThreadPool(parallelCount); - List<Future<CacheHolder<Long>>> tasks = new ArrayList<Future<CacheHolder<Long>>>(); + List<Future<CacheHolder<Long>>> tasks = new ArrayList<>(); for (int i = 0; i < parallelCount; i++) { tasks.add(executor.submit(createTask(key, resource))); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java b/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java index 36942a4..c1461b0 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/master/TestRepartitioner.java @@ -54,7 +54,7 @@ public class TestRepartitioner { ExecutionBlockId sid = new ExecutionBlockId(q1, 2); int numPartition = 10; - Map<Integer, List<IntermediateEntry>> intermediateEntries = new HashMap<Integer, List<IntermediateEntry>>(); + Map<Integer, List<IntermediateEntry>> intermediateEntries = new HashMap<>(); for (int i = 0; i < numPartition; i++) { intermediateEntries.put(i, new ArrayList<IntermediateEntry>()); } @@ -67,7 +67,7 @@ public class TestRepartitioner { } Map<Integer, Map<ExecutionBlockId, List<IntermediateEntry>>> hashEntries = - new HashMap<Integer, Map<ExecutionBlockId, List<IntermediateEntry>>>(); + new HashMap<>(); for (Map.Entry<Integer, List<IntermediateEntry>> eachEntry: intermediateEntries.entrySet()) { FetchImpl fetch = new FetchImpl(new Task.PullHost(hostName, port), ShuffleType.HASH_SHUFFLE, @@ -79,7 +79,7 @@ public class TestRepartitioner { fetch = new FetchImpl(proto); assertEquals(proto, fetch.getProto()); - Map<ExecutionBlockId, List<IntermediateEntry>> ebEntries = new HashMap<ExecutionBlockId, List<IntermediateEntry>>(); + Map<ExecutionBlockId, List<IntermediateEntry>> ebEntries = new HashMap<>(); ebEntries.put(sid, eachEntry.getValue()); hashEntries.put(eachEntry.getKey(), ebEntries); @@ -172,12 +172,12 @@ public class TestRepartitioner { @Test public void testMergeIntermediates() { //Test Merge - List<IntermediateEntry> intermediateEntries = new ArrayList<IntermediateEntry>(); + List<IntermediateEntry> intermediateEntries = new ArrayList<>(); int[] pageLengths = {10 * 1024 * 1024, 10 * 1024 * 1024, 10 * 1024 * 1024, 5 * 1024 * 1024}; //35 MB long expectedTotalLength = 0; for (int i = 0; i < 20; i++) { - List<Pair<Long, Integer>> pages = new ArrayList<Pair<Long, Integer>>(); + List<Pair<Long, Integer>> pages = new ArrayList<>(); long offset = 0; for (int j = 0; j < pageLengths.length; j++) { pages.add(new Pair(offset, pageLengths[j])); @@ -222,7 +222,7 @@ public class TestRepartitioner { @Test public void testSplitIntermediates() { - List<IntermediateEntry> intermediateEntries = new ArrayList<IntermediateEntry>(); + List<IntermediateEntry> intermediateEntries = new ArrayList<>(); int[] pageLengths = new int[20]; //195MB for (int i = 0 ; i < pageLengths.length; i++) { @@ -235,7 +235,7 @@ public class TestRepartitioner { long expectedTotalLength = 0; for (int i = 0; i < 20; i++) { - List<Pair<Long, Integer>> pages = new ArrayList<Pair<Long, Integer>>(); + List<Pair<Long, Integer>> pages = new ArrayList<>(); long offset = 0; for (int j = 0; j < pageLengths.length; j++) { pages.add(new Pair(offset, pageLengths[j])); @@ -256,7 +256,7 @@ public class TestRepartitioner { int index = 0; int numZeroPosFetcher = 0; long totalLength = 0; - Set<String> uniqPullHost = new HashSet<String>(); + Set<String> uniqPullHost = new HashSet<>(); for (List<FetchImpl> eachFetchList: fetches) { long length = 0; @@ -365,9 +365,9 @@ public class TestRepartitioner { {844591486, 5523957} }; - List<IntermediateEntry> entries = new ArrayList<IntermediateEntry>(); + List<IntermediateEntry> entries = new ArrayList<>(); for (int i = 0; i < 2; i++) { - List<Pair<Long, Integer>> pages = new ArrayList<Pair<Long, Integer>>(); + List<Pair<Long, Integer>> pages = new ArrayList<>(); for (int j = 0; j < pageDatas.length; j++) { pages.add(new Pair(pageDatas[j][0], (int) (pageDatas[j][1]))); } @@ -409,7 +409,7 @@ public class TestRepartitioner { @Test public void testSplitIntermediatesWithUniqueHost() { - List<IntermediateEntry> intermediateEntries = new ArrayList<IntermediateEntry>(); + List<IntermediateEntry> intermediateEntries = new ArrayList<>(); int[] pageLengths = new int[20]; //195MB for (int i = 0 ; i < pageLengths.length; i++) { @@ -424,7 +424,7 @@ public class TestRepartitioner { Task.PullHost pullHost = new Task.PullHost("host", 0); for (int i = 0; i < 20; i++) { - List<Pair<Long, Integer>> pages = new ArrayList<Pair<Long, Integer>>(); + List<Pair<Long, Integer>> pages = new ArrayList<>(); long offset = 0; for (int j = 0; j < pageLengths.length; j++) { pages.add(new Pair(offset, pageLengths[j])); @@ -454,7 +454,7 @@ public class TestRepartitioner { int index = 0; int numZeroPosFetcher = 0; long totalLength = 0; - Set<String> uniqPullHost = new HashSet<String>(); + Set<String> uniqPullHost = new HashSet<>(); for (List<FetchImpl> eachFetchList: fetches) { long length = 0; http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java b/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java index 328c281..89fdba0 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java @@ -179,7 +179,7 @@ public class TestSimpleScheduler { assertEquals(totalResource, scheduler.getClusterResource()); QueryId queryId = QueryIdFactory.newQueryId(System.nanoTime(), 0); - CallFuture<NodeResourceResponse> callBack = new CallFuture<NodeResourceResponse>(); + CallFuture<NodeResourceResponse> callBack = new CallFuture<>(); rmContext.getDispatcher().getEventHandler().handle(new ResourceReserveSchedulerEvent( createResourceRequest(queryId, requestNum, new ArrayList<Integer>()), callBack)); @@ -210,7 +210,7 @@ public class TestSimpleScheduler { QueryId queryId = QueryIdFactory.newQueryId(System.nanoTime(), 0); NodeResourceRequest requestProto = createResourceRequest(queryId, requestNum, targetWorkers); - CallFuture<NodeResourceResponse> callBack = new CallFuture<NodeResourceResponse>(); + CallFuture<NodeResourceResponse> callBack = new CallFuture<>(); rmContext.getDispatcher().getEventHandler().handle(new ResourceReserveSchedulerEvent( requestProto, callBack)); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/querymaster/TestIntermediateEntry.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/querymaster/TestIntermediateEntry.java b/tajo-core-tests/src/test/java/org/apache/tajo/querymaster/TestIntermediateEntry.java index 237fb32..9e134cd 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/querymaster/TestIntermediateEntry.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/querymaster/TestIntermediateEntry.java @@ -31,7 +31,7 @@ public class TestIntermediateEntry { public void testPage() { Task.IntermediateEntry interm = new Task.IntermediateEntry(-1, -1, 1, null); - List<Pair<Long, Integer>> pages = new ArrayList<Pair<Long, Integer>>(); + List<Pair<Long, Integer>> pages = new ArrayList<>(); pages.add(new Pair(0L, 1441275)); pages.add(new Pair(1441275L, 1447446)); pages.add(new Pair(2888721L, 1442507)); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/util/TestJSPUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/util/TestJSPUtil.java b/tajo-core-tests/src/test/java/org/apache/tajo/util/TestJSPUtil.java index f3b6936..3711f4f 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/util/TestJSPUtil.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/util/TestJSPUtil.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; public class TestJSPUtil { @Test public void testSortTask() throws Exception { - List<Task> tasks = new ArrayList<Task>(); + List<Task> tasks = new ArrayList<>(); Configuration conf = new TajoConf(); @@ -84,7 +84,7 @@ public class TestJSPUtil { @Test public void testGetPageNavigationList() { - List<String> originList = new ArrayList<String>(); + List<String> originList = new ArrayList<>(); for (int i = 0; i < 35; i++) { originList.add("Data" + (i + 1)); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/util/history/TestHistoryWriterReader.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/util/history/TestHistoryWriterReader.java b/tajo-core-tests/src/test/java/org/apache/tajo/util/history/TestHistoryWriterReader.java index 3d2578c..8b33d02 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/util/history/TestHistoryWriterReader.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/util/history/TestHistoryWriterReader.java @@ -195,14 +195,14 @@ public class TestHistoryWriterReader extends QueryTestCaseBase { QueryId queryId = QueryIdFactory.newQueryId(startTime, 1); queryHistory.setQueryId(queryId.toString()); queryHistory.setLogicalPlan("LogicalPlan"); - List<StageHistory> stages = new ArrayList<StageHistory>(); + List<StageHistory> stages = new ArrayList<>(); for (int i = 0; i < 3; i++) { ExecutionBlockId ebId = QueryIdFactory.newExecutionBlockId(queryId, i); StageHistory stageHistory = new StageHistory(); stageHistory.setExecutionBlockId(ebId.toString()); stageHistory.setStartTime(startTime + i); - List<TaskHistory> taskHistories = new ArrayList<TaskHistory>(); + List<TaskHistory> taskHistories = new ArrayList<>(); for (int j = 0; j < 5; j++) { TaskHistory taskHistory = new TaskHistory(); taskHistory.setId(QueryIdFactory.newTaskAttemptId(QueryIdFactory.newTaskId(ebId), 1).toString()); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestMetricsFilter.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestMetricsFilter.java b/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestMetricsFilter.java index b70512c..9c52bb1 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestMetricsFilter.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestMetricsFilter.java @@ -38,7 +38,7 @@ public class TestMetricsFilter { @Test public void testRegexpMetricsFilter() { - List<String> filterExpressions = new ArrayList<String>(); + List<String> filterExpressions = new ArrayList<>(); filterExpressions.add("JVM"); filterExpressions.add("Query"); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java b/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java index 8751df9..8361368 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java @@ -125,7 +125,7 @@ public class TestSystemMetrics { String line; - List<String> lines = new ArrayList<String>(); + List<String> lines = new ArrayList<>(); while((line = reader.readLine()) != null) { lines.add(line); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/worker/MockNodeResourceManager.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/worker/MockNodeResourceManager.java b/tajo-core-tests/src/test/java/org/apache/tajo/worker/MockNodeResourceManager.java index 8c8427d..786498e 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/worker/MockNodeResourceManager.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/worker/MockNodeResourceManager.java @@ -67,7 +67,7 @@ public class MockNodeResourceManager extends NodeResourceManager { ExecutionBlockId ebId, int memory, int size) { Queue<TaskAllocationProto> - requestProtoList = new LinkedBlockingQueue<TaskAllocationProto>(); + requestProtoList = new LinkedBlockingQueue<>(); for (int i = 0; i < size; i++) { TaskAttemptId taskAttemptId = QueryIdFactory.newTaskAttemptId(QueryIdFactory.newTaskId(ebId, i), 0); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java b/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java index 1193478..3d0554a 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java @@ -141,7 +141,7 @@ public class TestNodeResourceManager { int requestSize = 4; resourceManager.setTaskHandlerEvent(false); //skip task execution - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); BatchAllocationRequest.Builder requestProto = BatchAllocationRequest.newBuilder(); ExecutionBlockId ebId = new ExecutionBlockId(LocalTajoTestingUtility.newQueryId(), 0); requestProto.setExecutionBlockId(ebId.getProto()); @@ -164,7 +164,7 @@ public class TestNodeResourceManager { int overSize = 10; resourceManager.setTaskHandlerEvent(false); //skip task execution - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); BatchAllocationRequest.Builder requestProto = BatchAllocationRequest.newBuilder(); ExecutionBlockId ebId = new ExecutionBlockId(LocalTajoTestingUtility.newQueryId(), 0); requestProto.setExecutionBlockId(ebId.getProto()); @@ -184,7 +184,7 @@ public class TestNodeResourceManager { int requestSize = 4; resourceManager.setTaskHandlerEvent(false); //skip task execution - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); BatchAllocationRequest.Builder requestProto = BatchAllocationRequest.newBuilder(); ExecutionBlockId ebId = new ExecutionBlockId(LocalTajoTestingUtility.newQueryId(), 0); requestProto.setExecutionBlockId(ebId.getProto()); @@ -226,7 +226,7 @@ public class TestNodeResourceManager { BatchAllocationRequest.Builder requestProto = BatchAllocationRequest.newBuilder(); requestProto.addTaskRequest(task); requestProto.setExecutionBlockId(ebId.getProto()); - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); dispatcher.getEventHandler().handle(new NodeResourceAllocateEvent(requestProto.build(), callFuture)); assertTrue(callFuture.get().getCancellationTaskCount() == 0); totalComplete.incrementAndGet(); @@ -251,7 +251,7 @@ public class TestNodeResourceManager { requestProto.addTaskRequest(task); requestProto.setExecutionBlockId(ebId.getProto()); - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); dispatcher.getEventHandler().handle(new NodeResourceAllocateEvent(requestProto.build(), callFuture)); try { BatchAllocationResponse proto = callFuture.get(); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskExecutor.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskExecutor.java b/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskExecutor.java index 7cb7e71..5039c8b 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskExecutor.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskExecutor.java @@ -143,7 +143,7 @@ public class TestTaskExecutor { QueryId qid = LocalTajoTestingUtility.newQueryId(); ExecutionBlockId ebId = QueryIdFactory.newExecutionBlockId(qid, 1); - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); BatchAllocationRequest.Builder requestProto = BatchAllocationRequest.newBuilder(); requestProto.setExecutionBlockId(ebId.getProto()); @@ -171,7 +171,7 @@ public class TestTaskExecutor { QueryId qid = LocalTajoTestingUtility.newQueryId(); ExecutionBlockId ebId = QueryIdFactory.newExecutionBlockId(qid, 1); - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); BatchAllocationRequest.Builder requestProto = BatchAllocationRequest.newBuilder(); requestProto.setExecutionBlockId(ebId.getProto()); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskManager.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskManager.java b/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskManager.java index 1d84afe..c19d8fa 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskManager.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/worker/TestTaskManager.java @@ -147,7 +147,7 @@ public class TestTaskManager { QueryId qid = LocalTajoTestingUtility.newQueryId(); ExecutionBlockId ebId = QueryIdFactory.newExecutionBlockId(qid, 1); - CallFuture<BatchAllocationResponse> callFuture = new CallFuture<BatchAllocationResponse>(); + CallFuture<BatchAllocationResponse> callFuture = new CallFuture<>(); BatchAllocationRequest.Builder requestProto = BatchAllocationRequest.newBuilder(); requestProto.setExecutionBlockId(ebId.getProto()); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestSessionsResource.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestSessionsResource.java b/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestSessionsResource.java index 7b293d8..99a6d62 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestSessionsResource.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/ws/rs/resources/TestSessionsResource.java @@ -195,10 +195,10 @@ public class TestSessionsResource extends QueryTestCaseBase { assertNotNull(response); assertTrue(response.getId() != null && !response.getId().isEmpty()); - Map<String, String> variablesMap = new HashMap<String, String>(); + Map<String, String> variablesMap = new HashMap<>(); variablesMap.put("variableA", "valueA"); variablesMap.put("variableB", "valueB"); - Map<String, Map<String, String>> variables = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> variables = new HashMap<>(); variables.put("variables", variablesMap); Response restResponse = restClient.target(sessionsURI) .path("/{session-id}/variables").resolveTemplate("session-id", response.getId()) @@ -236,7 +236,7 @@ public class TestSessionsResource extends QueryTestCaseBase { assertNotNull(response); assertTrue(response.getId() != null && !response.getId().isEmpty()); - Map<String, String> variablesMap = new HashMap<String, String>(); + Map<String, String> variablesMap = new HashMap<>(); variablesMap.put("variableA", "valueA"); Response restResponse = restClient.target(sessionsURI) .path("/{session-id}/variables").resolveTemplate("session-id", response.getId()) http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/benchmark/BenchmarkSet.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/benchmark/BenchmarkSet.java b/tajo-core/src/main/java/org/apache/tajo/benchmark/BenchmarkSet.java index d2f56d3..f4527f0 100644 --- a/tajo-core/src/main/java/org/apache/tajo/benchmark/BenchmarkSet.java +++ b/tajo-core/src/main/java/org/apache/tajo/benchmark/BenchmarkSet.java @@ -41,9 +41,9 @@ import java.util.Map; public abstract class BenchmarkSet { protected TajoClient tajo; - protected Map<String, Schema> schemas = new HashMap<String, Schema>(); - protected Map<String, Schema> outSchemas = new HashMap<String, Schema>(); - protected Map<String, String> queries = new HashMap<String, String>(); + protected Map<String, Schema> schemas = new HashMap<>(); + protected Map<String, Schema> outSchemas = new HashMap<>(); + protected Map<String, String> queries = new HashMap<>(); protected String dataDir; public void init(TajoConf conf, String dataDir) throws SQLException { http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java index fbd88ad..adf83ba 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java @@ -75,7 +75,7 @@ public class ExecutorPreCompiler extends BasicLogicalPlanVisitor<ExecutorPreComp } private static void compileIfAbsent(CompilationContext context, Schema schema, EvalNode eval) { - Pair<Schema, EvalNode> key = new Pair<Schema, EvalNode>(schema, eval); + Pair<Schema, EvalNode> key = new Pair<>(schema, eval); if (!context.compiledEval.containsKey(key)) { try { EvalNode compiled = context.compiler.compile(schema, eval); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/codegen/TajoGeneratorAdapter.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/TajoGeneratorAdapter.java b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/TajoGeneratorAdapter.java index 6c3bf17..b1a15ae 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/TajoGeneratorAdapter.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/TajoGeneratorAdapter.java @@ -819,7 +819,7 @@ class TajoGeneratorAdapter { private int nextVarId = 3; - private Map<String, Integer> localVariablesMap = new HashMap<String, Integer>(); + private Map<String, Integer> localVariablesMap = new HashMap<>(); public void astore(String name) { if (localVariablesMap.containsKey(name)) { http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/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 b765f5e..5d172da 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 @@ -229,7 +229,7 @@ public class FunctionLoader { * @return A list of FunctionDescs */ public static List<FunctionDesc> findLegacyFunctions() { - List<FunctionDesc> sqlFuncs = new ArrayList<FunctionDesc>(); + List<FunctionDesc> sqlFuncs = new ArrayList<>(); Set<Class> functionClasses = ClassUtil.findClasses(Function.class, "org.apache.tajo.engine.function"); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/Lead.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/Lead.java b/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/Lead.java index 8edf1fb..5f3290c 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/Lead.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/Lead.java @@ -85,7 +85,7 @@ public abstract class Lead extends AggFunction<Datum> { } private static class LeadContext implements FunctionContext { - LinkedList<Datum> leadBuffer = new LinkedList<Datum>(); + LinkedList<Datum> leadBuffer = new LinkedList<>(); int leadNum = -1; Datum defaultDatum = null; } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/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 461e405..74f978b 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 @@ -1095,7 +1095,7 @@ public class PhysicalPlannerImpl implements PhysicalPlanner { SortNode sortNode = LogicalPlan.createNodeWithoutPID(SortNode.class); //2 phase: seq, groupby columns, distinct1 keys, distinct2 keys, //3 phase: groupby columns, seq, distinct1 keys, distinct2 keys, - List<SortSpec> sortSpecs = new ArrayList<SortSpec>(); + List<SortSpec> sortSpecs = new ArrayList<>(); if (phase == 2) { sortSpecs.add(new SortSpec(distinctNode.getTargets()[0].getNamedColumn())); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlock.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlock.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlock.java index c71324d..6e7720f 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlock.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlock.java @@ -32,11 +32,11 @@ public class ExecutionBlock { private ExecutionBlockId executionBlockId; private LogicalNode plan = null; private StoreTableNode store = null; - private List<ScanNode> scanlist = new ArrayList<ScanNode>(); + private List<ScanNode> scanlist = new ArrayList<>(); private Enforcer enforcer = new Enforcer(); // Actual ScanNode's ExecutionBlockId -> Delegated ScanNode's ExecutionBlockId. - private Map<ExecutionBlockId, ExecutionBlockId> unionScanMap = new HashMap<ExecutionBlockId, ExecutionBlockId>(); + private Map<ExecutionBlockId, ExecutionBlockId> unionScanMap = new HashMap<>(); private boolean hasJoinPlan; private boolean hasUnionPlan; @@ -111,7 +111,7 @@ public class ExecutionBlock { } LogicalNode node = plan; - ArrayList<LogicalNode> s = new ArrayList<LogicalNode>(); + ArrayList<LogicalNode> s = new ArrayList<>(); s.add(node); while (!s.isEmpty()) { node = s.remove(s.size()-1); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlockCursor.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlockCursor.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlockCursor.java index c6864b9..10f6e54 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlockCursor.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ExecutionBlockCursor.java @@ -26,11 +26,11 @@ import java.util.concurrent.atomic.AtomicInteger; */ public class ExecutionBlockCursor implements Iterable<ExecutionBlock> { private MasterPlan masterPlan; - private ArrayList<ExecutionBlock> orderedBlocks = new ArrayList<ExecutionBlock>(); + private ArrayList<ExecutionBlock> orderedBlocks = new ArrayList<>(); - private List<BuildOrderItem> executionOrderedBlocks = new ArrayList<BuildOrderItem>(); - private List<BuildOrderItem> notOrderedSiblingBlocks = new ArrayList<BuildOrderItem>(); - private Map<ExecutionBlockId, AtomicInteger> orderRequiredChildCountMap = new HashMap<ExecutionBlockId, AtomicInteger>(); + private List<BuildOrderItem> executionOrderedBlocks = new ArrayList<>(); + private List<BuildOrderItem> notOrderedSiblingBlocks = new ArrayList<>(); + private Map<ExecutionBlockId, AtomicInteger> orderRequiredChildCountMap = new HashMap<>(); public ExecutionBlockCursor(MasterPlan plan) { this(plan, false); @@ -149,7 +149,7 @@ public class ExecutionBlockCursor implements Iterable<ExecutionBlock> { } private void preExecutionOrder(BuildOrderItem current) { - Stack<BuildOrderItem> stack = new Stack<BuildOrderItem>(); + Stack<BuildOrderItem> stack = new Stack<>(); if (!masterPlan.isLeaf(current.eb.getId())) { List<ExecutionBlock> children = masterPlan.getChilds(current.eb); orderRequiredChildCountMap.put(current.eb.getId(), new AtomicInteger(children.size())); @@ -172,7 +172,7 @@ public class ExecutionBlockCursor implements Iterable<ExecutionBlock> { class BuildOrderItem { ExecutionBlock eb; ExecutionBlock parentEB; - List<ExecutionBlockId> siblings = new ArrayList<ExecutionBlockId>(); + List<ExecutionBlockId> siblings = new ArrayList<>(); BuildOrderItem(ExecutionBlock parentEB, ExecutionBlock eb) { this.parentEB = parentEB; http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java index 5049995..33277b0 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java @@ -1277,7 +1277,7 @@ public class GlobalPlanner { ExecutionBlock currentBlock = context.execBlockMap.remove(child.getPID()); if (child.getType() == NodeType.UNION) { - List<TableSubQueryNode> addedTableSubQueries = new ArrayList<TableSubQueryNode>(); + List<TableSubQueryNode> addedTableSubQueries = new ArrayList<>(); TableSubQueryNode leftMostSubQueryNode = null; for (ExecutionBlock childBlock : context.plan.getChilds(currentBlock.getId())) { TableSubQueryNode copy = PlannerUtil.clone(plan, node); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java index 8a7229b..90ccc3a 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java @@ -43,9 +43,9 @@ public class MasterPlan { private AtomicInteger nextId = new AtomicInteger(0); private ExecutionBlock terminalBlock; - private Map<ExecutionBlockId, ExecutionBlock> execBlockMap = new HashMap<ExecutionBlockId, ExecutionBlock>(); + private Map<ExecutionBlockId, ExecutionBlock> execBlockMap = new HashMap<>(); private SimpleDirectedGraph<ExecutionBlockId, DataChannel> execBlockGraph = - new SimpleDirectedGraph<ExecutionBlockId, DataChannel>(); + new SimpleDirectedGraph<>(); public ExecutionBlockId newExecutionBlockId() { return new ExecutionBlockId(queryId, nextId.incrementAndGet()); @@ -196,7 +196,7 @@ public class MasterPlan { } public List<ExecutionBlock> getChilds(ExecutionBlockId id) { - List<ExecutionBlock> childBlocks = new ArrayList<ExecutionBlock>(); + List<ExecutionBlock> childBlocks = new ArrayList<>(); for (ExecutionBlockId cid : execBlockGraph.getChilds(id)) { childBlocks.add(execBlockMap.get(cid)); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ParallelExecutionQueue.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ParallelExecutionQueue.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ParallelExecutionQueue.java index 1e823be..70397ff 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ParallelExecutionQueue.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/ParallelExecutionQueue.java @@ -35,7 +35,7 @@ public class ParallelExecutionQueue implements ExecutionQueue, Iterable<Executio private final int maximum; private final MasterPlan masterPlan; private final List<Deque<ExecutionBlock>> executable; - private final Set<ExecutionBlockId> executed = new HashSet<ExecutionBlockId>(); + private final Set<ExecutionBlockId> executed = new HashSet<>(); public ParallelExecutionQueue(MasterPlan masterPlan, int maximum) { this.masterPlan = masterPlan; @@ -44,7 +44,7 @@ public class ParallelExecutionQueue implements ExecutionQueue, Iterable<Executio } private List<Deque<ExecutionBlock>> toStacks(ExecutionBlock root) { - List<Deque<ExecutionBlock>> stacks = new ArrayList<Deque<ExecutionBlock>>(); + List<Deque<ExecutionBlock>> stacks = new ArrayList<>(); toStacks(root, stacks, new ArrayList<ExecutionBlock>()); return stacks; } @@ -54,7 +54,7 @@ public class ParallelExecutionQueue implements ExecutionQueue, Iterable<Executio List<ExecutionBlock> stack) { stack.add(current); if (masterPlan.isLeaf(current.getId())) { - queues.add(new ArrayDeque<ExecutionBlock>(stack)); + queues.add(new ArrayDeque<>(stack)); } else { List<ExecutionBlock> children = masterPlan.getChilds(current); for (int i = 0; i < children.size(); i++) { @@ -75,7 +75,7 @@ public class ParallelExecutionQueue implements ExecutionQueue, Iterable<Executio @Override public synchronized ExecutionBlock[] first() { int max = Math.min(maximum, executable.size()); - List<ExecutionBlock> result = new ArrayList<ExecutionBlock>(); + List<ExecutionBlock> result = new ArrayList<>(); for (Deque<ExecutionBlock> queue : executable) { if (result.size() < max && isExecutableNow(queue.peekLast())) { result.add(queue.removeLast()); @@ -106,7 +106,7 @@ public class ParallelExecutionQueue implements ExecutionQueue, Iterable<Executio List<ExecutionBlock> dependents = masterPlan.getChilds(current); if (parent != null && masterPlan.getChannel(current.getId(), parent.getId()).needShuffle()) { // add all children of sibling for partitioning - dependents = new ArrayList<ExecutionBlock>(); + dependents = new ArrayList<>(); for (ExecutionBlock sibling : masterPlan.getChilds(parent)) { dependents.addAll(masterPlan.getChilds(sibling)); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java index 6fbecc1..459d9af 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java @@ -197,13 +197,13 @@ public class DistinctGroupbyBuilder { */ List<Column> originalGroupingColumns = Arrays.asList(groupbyNode.getGroupingColumns()); - List<GroupbyNode> childGroupbyNodes = new ArrayList<GroupbyNode>(); + List<GroupbyNode> childGroupbyNodes = new ArrayList<>(); - List<AggregationFunctionCallEval> otherAggregationFunctionCallEvals = new ArrayList<AggregationFunctionCallEval>(); - List<Target> otherAggregationFunctionTargets = new ArrayList<Target>(); + List<AggregationFunctionCallEval> otherAggregationFunctionCallEvals = new ArrayList<>(); + List<Target> otherAggregationFunctionTargets = new ArrayList<>(); //distinct columns -> GroupbyNode - Map<String, DistinctGroupbyNodeBuildInfo> distinctNodeBuildInfos = new HashMap<String, DistinctGroupbyNodeBuildInfo>(); + Map<String, DistinctGroupbyNodeBuildInfo> distinctNodeBuildInfos = new HashMap<>(); AggregationFunctionCallEval[] aggFunctions = groupbyNode.getAggFunctions(); for (int aggIdx = 0; aggIdx < aggFunctions.length; aggIdx++) { AggregationFunctionCallEval aggFunction = aggFunctions[aggIdx]; @@ -223,7 +223,7 @@ public class DistinctGroupbyBuilder { distinctNodeBuildInfos.put(groupbyMapKey, buildInfo); // Grouping columns are GROUP BY clause's column + Distinct column. - List<Column> groupingColumns = new ArrayList<Column>(); + List<Column> groupingColumns = new ArrayList<>(); for (Column eachGroupingColumn: groupbyUniqColumns) { if (!groupingColumns.contains(eachGroupingColumn)) { groupingColumns.add(eachGroupingColumn); @@ -239,7 +239,7 @@ public class DistinctGroupbyBuilder { } } - List<Target> baseGroupByTargets = new ArrayList<Target>(); + List<Target> baseGroupByTargets = new ArrayList<>(); baseGroupByTargets.add(new Target(new FieldEval(new Column("?distinctseq", Type.INT2)))); for (Column column : originalGroupingColumns) { baseGroupByTargets.add(new Target(new FieldEval(column))); @@ -369,13 +369,13 @@ public class DistinctGroupbyBuilder { */ List<Column> originalGroupingColumns = Arrays.asList(groupbyNode.getGroupingColumns()); - List<GroupbyNode> childGroupbyNodes = new ArrayList<GroupbyNode>(); + List<GroupbyNode> childGroupbyNodes = new ArrayList<>(); - List<AggregationFunctionCallEval> otherAggregationFunctionCallEvals = new ArrayList<AggregationFunctionCallEval>(); - List<Target> otherAggregationFunctionTargets = new ArrayList<Target>(); + List<AggregationFunctionCallEval> otherAggregationFunctionCallEvals = new ArrayList<>(); + List<Target> otherAggregationFunctionTargets = new ArrayList<>(); //distinct columns -> GroupbyNode - Map<String, DistinctGroupbyNodeBuildInfo> distinctNodeBuildInfos = new HashMap<String, DistinctGroupbyNodeBuildInfo>(); + Map<String, DistinctGroupbyNodeBuildInfo> distinctNodeBuildInfos = new HashMap<>(); AggregationFunctionCallEval[] aggFunctions = groupbyNode.getAggFunctions(); for (int aggIdx = 0; aggIdx < aggFunctions.length; aggIdx++) { @@ -393,7 +393,7 @@ public class DistinctGroupbyBuilder { distinctNodeBuildInfos.put(groupbyMapKey, buildInfo); // Grouping columns are GROUP BY clause's column + Distinct column. - List<Column> groupingColumns = new ArrayList<Column>(originalGroupingColumns); + List<Column> groupingColumns = new ArrayList<>(originalGroupingColumns); for (Column eachGroupingColumn: groupbyUniqColumns) { if (!groupingColumns.contains(eachGroupingColumn)) { groupingColumns.add(eachGroupingColumn); @@ -525,7 +525,7 @@ public class DistinctGroupbyBuilder { // FirstStage: Remove aggregation, Set target with only grouping columns firstStageGroupbyNode.setAggFunctions(PlannerUtil.EMPTY_AGG_FUNCS); - List<Target> firstGroupbyTargets = new ArrayList<Target>(); + List<Target> firstGroupbyTargets = new ArrayList<>(); for (Column column : firstStageGroupbyNode.getGroupingColumns()) { Target target = new Target(new FieldEval(column)); firstGroupbyTargets.add(target); @@ -538,9 +538,9 @@ public class DistinctGroupbyBuilder { secondStageGroupbyNode.setGroupingColumns(originGroupColumns.toArray(new Column[]{})); Target[] oldTargets = secondStageGroupbyNode.getTargets(); - List<Target> secondGroupbyTargets = new ArrayList<Target>(); + List<Target> secondGroupbyTargets = new ArrayList<>(); LinkedHashSet<Column> distinctColumns = EvalTreeUtil.findUniqueColumns(secondStageGroupbyNode.getAggFunctions()[0]); - List<Column> uniqueDistinctColumn = new ArrayList<Column>(); + List<Column> uniqueDistinctColumn = new ArrayList<>(); // remove origin group by column from distinctColumns for (Column eachColumn: distinctColumns) { if (!originGroupColumns.contains(eachColumn)) { @@ -570,7 +570,7 @@ public class DistinctGroupbyBuilder { secondStageGroupbyNode.setTargets(secondGroupbyTargets.toArray(new Target[]{})); } else { // FirstStage: Change target of aggFunction to function name expr - List<Target> firstGroupbyTargets = new ArrayList<Target>(); + List<Target> firstGroupbyTargets = new ArrayList<>(); for (Column column : firstStageDistinctNode.getGroupingColumns()) { firstGroupbyTargets.add(new Target(new FieldEval(column))); columnIdIndex++; @@ -632,9 +632,9 @@ public class DistinctGroupbyBuilder { } // Set FirstStage DistinctNode's target with grouping column and other aggregation function - List<Integer> firstStageColumnIds = new ArrayList<Integer>(); + List<Integer> firstStageColumnIds = new ArrayList<>(); columnIdIndex = 0; - List<Target> firstTargets = new ArrayList<Target>(); + List<Target> firstTargets = new ArrayList<>(); for (GroupbyNode firstStageGroupbyNode: firstStageDistinctNode.getSubPlans()) { if (firstStageGroupbyNode.isDistinct()) { for (Column column : firstStageGroupbyNode.getGroupingColumns()) { @@ -684,10 +684,10 @@ public class DistinctGroupbyBuilder { firstStageBlock.getEnforcer().enforceDistinctAggregation(firstStageDistinctNode.getPID(), DistinctAggregationAlgorithm.HASH_AGGREGATION, null); - List<SortSpecArray> sortSpecArrays = new ArrayList<SortSpecArray>(); + List<SortSpecArray> sortSpecArrays = new ArrayList<>(); int index = 0; for (GroupbyNode groupbyNode: firstStageDistinctNode.getSubPlans()) { - List<SortSpecProto> sortSpecs = new ArrayList<SortSpecProto>(); + List<SortSpecProto> sortSpecs = new ArrayList<>(); for (Column column: groupbyNode.getGroupingColumns()) { sortSpecs.add(SortSpecProto.newBuilder().setColumn(column.getProto()).build()); } @@ -712,10 +712,10 @@ public class DistinctGroupbyBuilder { true, MultipleAggregationStage.SECOND_STAGE, DistinctAggregationAlgorithm.HASH_AGGREGATION, null); - List<SortSpecArray> sortSpecArrays = new ArrayList<SortSpecArray>(); + List<SortSpecArray> sortSpecArrays = new ArrayList<>(); int index = 0; for (GroupbyNode groupbyNode: firstStageDistinctNode.getSubPlans()) { - List<SortSpecProto> sortSpecs = new ArrayList<SortSpecProto>(); + List<SortSpecProto> sortSpecs = new ArrayList<>(); for (Column column: groupbyNode.getGroupingColumns()) { sortSpecs.add(SortSpecProto.newBuilder().setColumn(column.getProto()).build()); } @@ -771,8 +771,8 @@ public class DistinctGroupbyBuilder { static class DistinctGroupbyNodeBuildInfo { private GroupbyNode groupbyNode; - private List<AggregationFunctionCallEval> aggFunctions = new ArrayList<AggregationFunctionCallEval>(); - private List<Target> aggFunctionTargets = new ArrayList<Target>(); + private List<AggregationFunctionCallEval> aggFunctions = new ArrayList<>(); + private List<Target> aggFunctionTargets = new ArrayList<>(); public DistinctGroupbyNodeBuildInfo(GroupbyNode groupbyNode) { this.groupbyNode = groupbyNode; http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/GlobalPlanRewriteEngine.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/GlobalPlanRewriteEngine.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/GlobalPlanRewriteEngine.java index f71c683..7132e78 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/GlobalPlanRewriteEngine.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/GlobalPlanRewriteEngine.java @@ -33,7 +33,7 @@ public class GlobalPlanRewriteEngine { private static final Log LOG = LogFactory.getLog(GlobalPlanRewriteEngine.class); /** a map for query rewrite rules */ - private final Map<String, GlobalPlanRewriteRule> rewriteRules = new LinkedHashMap<String, GlobalPlanRewriteRule>(); + private final Map<String, GlobalPlanRewriteRule> rewriteRules = new LinkedHashMap<>(); /** * Add a query rewrite rule to this engine. http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java index e171338..19b0c9a 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java @@ -133,7 +133,7 @@ public class BSTIndexScanExec extends ScanExec { // the target can be an empty list. if (plan.hasTargets()) { projected = new Schema(); - Set<Column> columnSet = new HashSet<Column>(); + Set<Column> columnSet = new HashSet<>(); if (plan.hasQual()) { columnSet.addAll(EvalTreeUtil.findUniqueColumns(qual)); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonHashJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonHashJoinExec.java index a248d52..59239a6 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonHashJoinExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonHashJoinExec.java @@ -158,7 +158,7 @@ public abstract class CommonHashJoinExec<T> extends CommonJoinExec { protected TupleMap<TupleList> buildRightToHashTableForNonCrossJoin() throws IOException { Tuple tuple; - TupleMap<TupleList> map = new TupleMap<TupleList>(100000); + TupleMap<TupleList> map = new TupleMap<>(100000); KeyProjector keyProjector = new KeyProjector(rightSchema, rightKeyList); while (!context.isStopped() && (tuple = rightChild.next()) != null) { http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java index 7ac3e0b..92438fb 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java @@ -237,7 +237,7 @@ public class DistinctGroupbyFirstAggregationExec extends UnaryPhysicalExec { private final Tuple outTuple; private NonDistinctHashAggregator(GroupbyNode groupbyNode) throws IOException { - nonDistinctAggrDatas = new TupleMap<FunctionContext[]>(); + nonDistinctAggrDatas = new TupleMap<>(); if (groupbyNode.hasAggFunctions()) { aggFunctions = groupbyNode.getAggFunctions(); @@ -318,7 +318,7 @@ public class DistinctGroupbyFirstAggregationExec extends UnaryPhysicalExec { Set<Column> groupingKeySet = TUtil.newHashSet(plan.getGroupingColumns()); - List<Column> distinctGroupingKeyIndexSet = new ArrayList<Column>(); + List<Column> distinctGroupingKeyIndexSet = new ArrayList<>(); Column[] groupingColumns = groupbyNode.getGroupingColumns(); for (int idx = 0; idx < groupingColumns.length; idx++) { Column col = groupingColumns[idx]; @@ -330,7 +330,7 @@ public class DistinctGroupbyFirstAggregationExec extends UnaryPhysicalExec { distinctKeyColumns = distinctGroupingKeyIndexSet.toArray(distinctKeyColumns); this.dummyTuple = NullTuple.create(distinctGroupingKeyIndexSet.size()); - this.distinctAggrDatas = new TupleMap<TupleSet>(); + this.distinctAggrDatas = new TupleMap<>(); distinctGroupbyKeyProjectors.put(nodeSequence, new KeyProjector(inSchema, distinctKeyColumns)); this.tupleLength = distinctKeyColumns.length; http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/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 2d1fa4b..418d0fc 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 @@ -148,7 +148,7 @@ public class DistinctGroupbyHashAggregationExec extends UnaryPhysicalExec { // Groupby_Key2 | Distinct1_Column_V3 | | | //-------------------------------------------------------------------------------------- - List<TupleList> tupleSlots = new ArrayList<TupleList>(); + List<TupleList> tupleSlots = new ArrayList<>(); // aggregation with single grouping key for (int i = 0; i < hashAggregators.length; i++) { @@ -359,9 +359,9 @@ public class DistinctGroupbyHashAggregationExec extends UnaryPhysicalExec { public HashAggregator(GroupbyNode groupbyNode, Schema schema) throws IOException { - hashTable = new TupleMap<TupleMap<FunctionContext[]>>(10000); + hashTable = new TupleMap<>(10000); - List<Column> groupingKeyColumnList = new ArrayList<Column>(distinctGroupingKeyColumnSet); + List<Column> groupingKeyColumnList = new ArrayList<>(distinctGroupingKeyColumnSet); Column[] keyColumns = groupbyNode.getGroupingColumns(); Column col; @@ -399,7 +399,7 @@ public class DistinctGroupbyHashAggregationExec extends UnaryPhysicalExec { TupleMap<FunctionContext[]> distinctEntry = hashTable.get(outerKeyTuple); if (distinctEntry == null) { - distinctEntry = new TupleMap<FunctionContext[]>(); + distinctEntry = new TupleMap<>(); hashTable.put(outerKeyTuple, distinctEntry); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java index b3edab6..be0b513 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java @@ -86,8 +86,8 @@ public class DistinctGroupbySecondAggregationExec extends UnaryPhysicalExec { // Key tuples may have various lengths. The below two maps are used to cache key tuple instances. // Each map is a mapping of key length to key tuple. - private Map<Integer, Tuple> keyTupleMap = new HashMap<Integer, Tuple>(); - private Map<Integer, Tuple> prevKeyTupleMap = new HashMap<Integer, Tuple>(); + private Map<Integer, Tuple> keyTupleMap = new HashMap<>(); + private Map<Integer, Tuple> prevKeyTupleMap = new HashMap<>(); private Tuple prevKeyTuple = null; private Tuple prevTuple = null; @@ -109,7 +109,7 @@ public class DistinctGroupbySecondAggregationExec extends UnaryPhysicalExec { List<GroupbyNode> groupbyNodes = plan.getSubPlans(); // Finding distinct group by column index. - Set<Integer> groupingKeyIndexSet = new HashSet<Integer>(); + Set<Integer> groupingKeyIndexSet = new HashSet<>(); for (Column col: plan.getGroupingColumns()) { int keyIndex; if (col.hasQualifier()) { @@ -140,7 +140,7 @@ public class DistinctGroupbySecondAggregationExec extends UnaryPhysicalExec { distinctKeyIndexes = new int[numDistinct][]; for (GroupbyNode eachGroupby : groupbyNodes) { if (eachGroupby.isDistinct()) { - List<Integer> distinctGroupingKeyIndex = new ArrayList<Integer>(); + List<Integer> distinctGroupingKeyIndex = new ArrayList<>(); Column[] distinctGroupingColumns = eachGroupby.getGroupingColumns(); for (int idx = 0; idx < distinctGroupingColumns.length; idx++) { Column col = distinctGroupingColumns[idx]; http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java index 9e9e9b4..7b3ca7d 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java @@ -72,7 +72,7 @@ public class DistinctGroupbyThirdAggregationExec extends UnaryPhysicalExec { List<GroupbyNode> groupbyNodes = plan.getSubPlans(); - List<DistinctFinalAggregator> aggregatorList = new ArrayList<DistinctFinalAggregator>(); + List<DistinctFinalAggregator> aggregatorList = new ArrayList<>(); int inTupleIndex = 1 + numGroupingColumns; int outTupleIndex = numGroupingColumns; int distinctSeq = 0; @@ -96,14 +96,14 @@ public class DistinctGroupbyThirdAggregationExec extends UnaryPhysicalExec { // make output schema mapping index resultTupleIndexes = new int[outSchema.size()]; - Map<Column, Integer> groupbyResultTupleIndex = new HashMap<Column, Integer>(); + Map<Column, Integer> groupbyResultTupleIndex = new HashMap<>(); int resultTupleIndex = 0; for (Column eachColumn: plan.getGroupingColumns()) { groupbyResultTupleIndex.put(eachColumn, resultTupleIndex); resultTupleIndex++; } for (GroupbyNode eachGroupby : groupbyNodes) { - Set<Column> groupingColumnSet = new HashSet<Column>(); + Set<Column> groupingColumnSet = new HashSet<>(); for (Column column: eachGroupby.getGroupingColumns()) { groupingColumnSet.add(column); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java index b657622..e3f566a 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java @@ -42,7 +42,7 @@ public class HashAggregateExec extends AggregationExec { public HashAggregateExec(TaskAttemptContext ctx, GroupbyNode plan, PhysicalExec subOp) throws IOException { super(ctx, plan, subOp); hashKeyProjector = new KeyProjector(inSchema, plan.getGroupingColumns()); - hashTable = new TupleMap<FunctionContext []>(10000); + hashTable = new TupleMap<>(10000); this.tuple = new VTuple(plan.getOutSchema().size()); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashBasedColPartitionStoreExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashBasedColPartitionStoreExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashBasedColPartitionStoreExec.java index 1860ec0..c7987de 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashBasedColPartitionStoreExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashBasedColPartitionStoreExec.java @@ -40,7 +40,7 @@ import java.util.Map; public class HashBasedColPartitionStoreExec extends ColPartitionStoreExec { private final ComparableTuple partKey; - private final Map<ComparableTuple, Appender> appenderMap = new HashMap<ComparableTuple, Appender>(); + private final Map<ComparableTuple, Appender> appenderMap = new HashMap<>(); public HashBasedColPartitionStoreExec(TaskAttemptContext context, StoreTableNode plan, PhysicalExec child) throws IOException { @@ -82,7 +82,7 @@ public class HashBasedColPartitionStoreExec extends ColPartitionStoreExec { getAppender(partKey, tuple).addTuple(tuple); } - List<TableStats> statSet = new ArrayList<TableStats>(); + List<TableStats> statSet = new ArrayList<>(); for (Appender app : appenderMap.values()) { app.flush(); app.close(); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java index c463028..7020b9d 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java @@ -127,7 +127,7 @@ public class HashFullOuterJoinExec extends CommonHashJoinExec<Pair<Boolean, Tupl @Override protected TupleMap<Pair<Boolean, TupleList>> convert(TupleMap<TupleList> hashed, boolean fromCache) throws IOException { - TupleMap<Pair<Boolean, TupleList>> tuples = new TupleMap<Pair<Boolean, TupleList>>(hashed.size()); + TupleMap<Pair<Boolean, TupleList>> tuples = new TupleMap<>(hashed.size()); for (Map.Entry<KeyTuple, TupleList> entry : hashed.entrySet()) { // flag: initially false (whether this join key had at least one match on the counter part) tuples.putWihtoutKeyCopy(entry.getKey(), new Pair<>(false, entry.getValue())); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashShuffleFileWriteExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashShuffleFileWriteExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashShuffleFileWriteExec.java index bc4382e..a72a375 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashShuffleFileWriteExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashShuffleFileWriteExec.java @@ -45,7 +45,7 @@ public final class HashShuffleFileWriteExec extends UnaryPhysicalExec { private ShuffleFileWriteNode plan; private final TableMeta meta; private Partitioner partitioner; - private Map<Integer, HashShuffleAppender> appenderMap = new HashMap<Integer, HashShuffleAppender>(); + private Map<Integer, HashShuffleAppender> appenderMap = new HashMap<>(); private final int numShuffleOutputs; private final int [] shuffleKeyIds; private HashShuffleAppenderManager hashShuffleAppenderManager; @@ -89,7 +89,7 @@ public final class HashShuffleFileWriteExec extends UnaryPhysicalExec { return appender; } - Map<Integer, TupleList> partitionTuples = new HashMap<Integer, TupleList>(); + Map<Integer, TupleList> partitionTuples = new HashMap<>(); long writtenBytes = 0L; @Override http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java index e9f4fb9..2fc4fb4 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java @@ -84,13 +84,13 @@ public class PhysicalPlanUtil { partitionDepth = tableDesc.getPartitionMethod().getExpressionSchema().getRootColumns().size(); } - List<FileStatus> nonZeroLengthFiles = new ArrayList<FileStatus>(); + List<FileStatus> nonZeroLengthFiles = new ArrayList<>(); if (fs.exists(path)) { getNonZeroLengthDataFiles(fs, path, nonZeroLengthFiles, fileIndex, numResultFiles, new AtomicInteger(0), tableDesc.hasPartition(), 0, partitionDepth); } - List<FileFragment> fragments = new ArrayList<FileFragment>(); + List<FileFragment> fragments = new ArrayList<>(); String[] previousPartitionPathNames = null; http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java index a41d20a..2572e1d 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java @@ -143,7 +143,7 @@ public class SeqScanExec extends ScanExec { // the target can be an empty list. if (plan.hasTargets()) { projected = new Schema(); - Set<Column> columnSet = new HashSet<Column>(); + Set<Column> columnSet = new HashSet<>(); if (plan.hasQual()) { columnSet.addAll(EvalTreeUtil.findUniqueColumns(qual)); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/query/QueryContext.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/query/QueryContext.java b/tajo-core/src/main/java/org/apache/tajo/engine/query/QueryContext.java index 7279e8e..20f4b40 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/query/QueryContext.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/query/QueryContext.java @@ -44,7 +44,7 @@ public class QueryContext extends OverridableConf { public QueryContext(TajoConf conf, Session session) { super(conf, ConfigKey.ConfigType.QUERY, ConfigKey.ConfigType.SESSION); - Map<String, String> copy = new HashMap<String, String>(session.getAllVariables()); + Map<String, String> copy = new HashMap<>(session.getAllVariables()); // Among session variables, timezone must not be copy.remove("TIMEZONE"); putAll(copy); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/engine/query/TaskRequestImpl.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/query/TaskRequestImpl.java b/tajo-core/src/main/java/org/apache/tajo/engine/query/TaskRequestImpl.java index f97d005..7b52dab 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/query/TaskRequestImpl.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/query/TaskRequestImpl.java @@ -118,7 +118,7 @@ public class TaskRequestImpl implements TaskRequest { return fragments; } if (fragments == null) { - fragments = new ArrayList<FragmentProto>(); + fragments = new ArrayList<>(); } for (int i = 0; i < p.getFragmentsCount(); i++) { fragments.add(p.getFragments(i)); @@ -223,7 +223,7 @@ public class TaskRequestImpl implements TaskRequest { return; } TaskRequestProtoOrBuilder p = viaProto ? proto : builder; - this.fetches = new ArrayList<FetchImpl>(); + this.fetches = new ArrayList<>(); for(FetchProto fetch : p.getFetchesList()) { fetches.add(new FetchImpl(fetch)); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/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 4b97fe6..e7f4748 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 @@ -596,7 +596,7 @@ public class HdfsServiceTracker extends HAServiceTracker { @Override public List<String> getMasters(TajoConf conf) throws ServiceTrackerException { - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); try { FileSystem fs = getFileSystem(conf); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java b/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java index 8e999c3..f76e7f0 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java @@ -103,7 +103,7 @@ public class QueryInProgress { try { getQueryInfo().setQueryState(TajoProtos.QueryState.QUERY_KILLED); if (queryMasterRpcClient != null) { - CallFuture<PrimitiveProtos.NullProto> callFuture = new CallFuture<PrimitiveProtos.NullProto>(); + CallFuture<PrimitiveProtos.NullProto> callFuture = new CallFuture<>(); queryMasterRpcClient.killQuery(callFuture.getController(), queryId.getProto(), callFuture); callFuture.get(RpcConstants.FUTURE_TIMEOUT_SECONDS_DEFAULT, TimeUnit.SECONDS); } @@ -157,7 +157,7 @@ public class QueryInProgress { connectQueryMaster(connectionInfo); } - CallFuture<PrimitiveProtos.BoolProto> callFuture = new CallFuture<PrimitiveProtos.BoolProto>(); + CallFuture<PrimitiveProtos.BoolProto> callFuture = new CallFuture<>(); queryMasterRpcClient.allocateQueryMaster(callFuture.getController(), allocation, callFuture); if(!callFuture.get().getValue()) return false; @@ -220,7 +220,7 @@ public class QueryInProgress { .setLogicalPlanJson(PrimitiveProtos.StringProto.newBuilder().setValue(plan.toJson()).build()) .setAllocation(allocationResource); - CallFuture<PrimitiveProtos.NullProto> callFuture = new CallFuture<PrimitiveProtos.NullProto>(); + CallFuture<PrimitiveProtos.NullProto> callFuture = new CallFuture<>(); queryMasterRpcClient.executeQuery(callFuture.getController(), builder.build(), callFuture); callFuture.get(RpcConstants.FUTURE_TIMEOUT_SECONDS_DEFAULT, TimeUnit.SECONDS); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java b/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java index ba421bd..24ed830 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java @@ -153,7 +153,7 @@ public class QueryManager extends CompositeService { result.addAll(historyCache.values()); } int fromIndex = (page - 1) * size; - return new LinkedList<QueryInfo>(result).subList(fromIndex, fromIndex + size); + return new LinkedList<>(result).subList(fromIndex, fromIndex + size); } else { try { return this.masterContext.getHistoryReader().getQueriesInHistory(page, size); @@ -164,7 +164,7 @@ public class QueryManager extends CompositeService { synchronized (historyCache) { result.addAll(historyCache.values()); } - return new LinkedList<QueryInfo>(result); + return new LinkedList<>(result); } } } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java b/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java index 227af0b..fa36b79 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java @@ -393,7 +393,7 @@ public class TajoMasterClientService extends AbstractService { try { context.getSessionManager().touch(request.getId()); - Collection<QueryInProgress> queries = new ArrayList<QueryInProgress>(context.getQueryJobManager().getSubmittedQueries()); + Collection<QueryInProgress> queries = new ArrayList<>(context.getQueryJobManager().getSubmittedQueries()); queries.addAll(context.getQueryJobManager().getRunningQueries()); BriefQueryInfo.Builder infoBuilder = BriefQueryInfo.newBuilder(); @@ -666,7 +666,7 @@ public class TajoMasterClientService extends AbstractService { try { context.getSessionManager().touch(request.getSessionId().getId()); - List<NodeStatus> nodeStatusList = new ArrayList<NodeStatus>(context.getResourceManager().getRMContext().getNodes().values()); + List<NodeStatus> nodeStatusList = new ArrayList<>(context.getResourceManager().getRMContext().getNodes().values()); Collections.sort(nodeStatusList); WorkerResourceInfo.Builder workerBuilder = WorkerResourceInfo.newBuilder(); @@ -931,7 +931,7 @@ public class TajoMasterClientService extends AbstractService { String functionName = request.getValue(); Collection<FunctionDesc> functions = catalog.getFunctions(); - List<CatalogProtos.FunctionDescProto> functionProtos = new ArrayList<CatalogProtos.FunctionDescProto>(); + List<CatalogProtos.FunctionDescProto> functionProtos = new ArrayList<>(); for (FunctionDesc eachFunction: functions) { if (functionName == null || functionName.isEmpty()) { http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/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 15abf9e..92e1775 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 @@ -331,7 +331,7 @@ public class DDLExecutor { String databaseName; String simpleTableName; - List<TableDesc> tableDescList = new ArrayList<TableDesc>(); + List<TableDesc> tableDescList = new ArrayList<>(); for (String eachTableName : tableNames) { if (CatalogUtil.isFQTableName(eachTableName)) { String[] split = CatalogUtil.splitFQTableName(eachTableName); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/master/exec/ExplainPlanPreprocessorForTest.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/ExplainPlanPreprocessorForTest.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/ExplainPlanPreprocessorForTest.java index 0c83206..b747849 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/ExplainPlanPreprocessorForTest.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/ExplainPlanPreprocessorForTest.java @@ -50,7 +50,7 @@ public class ExplainPlanPreprocessorForTest { private static class PlanShapeFixerContext { - Stack<Integer> childNumbers = new Stack<Integer>(); + Stack<Integer> childNumbers = new Stack<>(); public void reset() { childNumbers.clear(); } http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/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 14077b1..82bc679 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 @@ -157,7 +157,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getTablespaces(Schema outSchema) { List<TablespaceProto> tablespaces = masterContext.getCatalog().getAllTablespaces(); - List<Tuple> tuples = new ArrayList<Tuple>(tablespaces.size()); + List<Tuple> tuples = new ArrayList<>(tablespaces.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; @@ -192,7 +192,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getDatabases(Schema outSchema) { List<DatabaseProto> databases = masterContext.getCatalog().getAllDatabases(); - List<Tuple> tuples = new ArrayList<Tuple>(databases.size()); + List<Tuple> tuples = new ArrayList<>(databases.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; @@ -222,7 +222,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getTables(Schema outSchema) { List<TableDescriptorProto> tables = masterContext.getCatalog().getAllTables(); - List<Tuple> tuples = new ArrayList<Tuple>(tables.size()); + List<Tuple> tuples = new ArrayList<>(tables.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; @@ -258,7 +258,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getColumns(Schema outSchema) { List<ColumnProto> columnsList = masterContext.getCatalog().getAllColumns(); - List<Tuple> tuples = new ArrayList<Tuple>(columnsList.size()); + List<Tuple> tuples = new ArrayList<>(columnsList.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; int columnId = 1, prevtid = -1, tid = 0; @@ -306,7 +306,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getIndexes(Schema outSchema) { List<IndexDescProto> indexList = masterContext.getCatalog().getAllIndexes(); - List<Tuple> tuples = new ArrayList<Tuple>(indexList.size()); + List<Tuple> tuples = new ArrayList<>(indexList.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; @@ -337,7 +337,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getAllTableOptions(Schema outSchema) { List<TableOptionProto> optionList = masterContext.getCatalog().getAllTableOptions(); - List<Tuple> tuples = new ArrayList<Tuple>(optionList.size()); + List<Tuple> tuples = new ArrayList<>(optionList.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; @@ -364,7 +364,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getAllTableStats(Schema outSchema) { List<TableStatsProto> statList = masterContext.getCatalog().getAllTableStats(); - List<Tuple> tuples = new ArrayList<Tuple>(statList.size()); + List<Tuple> tuples = new ArrayList<>(statList.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; @@ -391,7 +391,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getAllPartitions(Schema outSchema) { List<TablePartitionProto> partitionList = masterContext.getCatalog().getAllPartitions(); - List<Tuple> tuples = new ArrayList<Tuple>(partitionList.size()); + List<Tuple> tuples = new ArrayList<>(partitionList.size()); List<Column> columns = outSchema.getRootColumns(); Tuple aTuple; @@ -521,15 +521,15 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult private List<Tuple> getClusterInfo(Schema outSchema) { Map<Integer, NodeStatus> workerMap = masterContext.getResourceManager().getNodes(); List<Tuple> tuples; - List<NodeStatus> queryMasterList = new ArrayList<NodeStatus>(); - List<NodeStatus> nodeStatusList = new ArrayList<NodeStatus>(); + List<NodeStatus> queryMasterList = new ArrayList<>(); + List<NodeStatus> nodeStatusList = new ArrayList<>(); for (NodeStatus aNodeStatus : workerMap.values()) { queryMasterList.add(aNodeStatus); nodeStatusList.add(aNodeStatus); } - tuples = new ArrayList<Tuple>(queryMasterList.size() + nodeStatusList.size()); + tuples = new ArrayList<>(queryMasterList.size() + nodeStatusList.size()); for (NodeStatus queryMaster: queryMasterList) { tuples.add(getQueryMasterTuple(outSchema, queryMaster)); } @@ -591,7 +591,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult @Override public List<ByteString> getNextRows(int fetchRowNum) throws IOException { - List<ByteString> rows = new ArrayList<ByteString>(); + List<ByteString> rows = new ArrayList<>(); int startRow = currentRow; int endRow = startRow + fetchRowNum; http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java index d5341d8..6219e31 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java @@ -510,7 +510,7 @@ public class QueryExecutor { } else { // If INSERT INTO LOCATION // Empty TableDesc - List<CatalogProtos.ColumnProto> columns = new ArrayList<CatalogProtos.ColumnProto>(); + List<CatalogProtos.ColumnProto> columns = new ArrayList<>(); CatalogProtos.TableDescProto tableDescProto = CatalogProtos.TableDescProto.newBuilder() .setTableName(nodeUniqName) .setMeta(CatalogProtos.TableProto.newBuilder().setStoreType(BuiltinStorages.TEXT).build()) http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/master/exec/prehook/DistributedQueryHookManager.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/prehook/DistributedQueryHookManager.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/prehook/DistributedQueryHookManager.java index f403092..87ebd9d 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/prehook/DistributedQueryHookManager.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/prehook/DistributedQueryHookManager.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; public class DistributedQueryHookManager { - private List<DistributedQueryHook> hooks = new ArrayList<DistributedQueryHook>(); + private List<DistributedQueryHook> hooks = new ArrayList<>(); public void addHook(DistributedQueryHook hook) { hooks.add(hook); http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-core/src/main/java/org/apache/tajo/master/rule/MasterRuleProvider.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/rule/MasterRuleProvider.java b/tajo-core/src/main/java/org/apache/tajo/master/rule/MasterRuleProvider.java index 0caedb9..1a609cf 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/rule/MasterRuleProvider.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/rule/MasterRuleProvider.java @@ -37,7 +37,7 @@ public class MasterRuleProvider implements SelfDiagnosisRuleProvider { public List<SelfDiagnosisRule> getDefinedRules() { Set<Class> classSet = ClassUtil.findClasses(SelfDiagnosisRule.class, getClass().getPackage().getName()); - List<SelfDiagnosisRule> ruleList = new ArrayList<SelfDiagnosisRule>(classSet.size()); + List<SelfDiagnosisRule> ruleList = new ArrayList<>(classSet.size()); for (Class<SelfDiagnosisRule> ruleClazz: classSet) { try {
