You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2016/04/18 16:36:13 UTC

flink git commit: [FLINK-3773] Scanners are left unclosed in SqlExplainTest

Repository: flink
Updated Branches:
  refs/heads/master 6d53bbc4b -> fabc5f96e


[FLINK-3773] Scanners are left unclosed in SqlExplainTest

This closes #1902


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/fabc5f96
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/fabc5f96
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/fabc5f96

Branch: refs/heads/master
Commit: fabc5f96e3ad95ce1a7b8bfbf53c874d53cf07db
Parents: 6d53bbc
Author: samaitra <sa...@gmail.com>
Authored: Sun Apr 17 12:24:50 2016 +0530
Committer: zentol <ch...@apache.org>
Committed: Mon Apr 18 16:35:25 2016 +0200

----------------------------------------------------------------------
 .../api/java/table/test/SqlExplainTest.java     | 54 +++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/fabc5f96/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java
index 74cd802..9389a0c 100644
--- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java
+++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java
@@ -51,10 +51,11 @@ public class SqlExplainTest extends MultipleProgramsTestBase {
 			.filter("a % 2 = 0");
 
 		String result = tableEnv.explain(table);
-		String source = new Scanner(new File(testFilePath +
-				"../../src/test/scala/resources/testFilter0.out"))
-				.useDelimiter("\\A").next();
-		assertEquals(source, result);
+		try (Scanner scanner = new Scanner(new File(testFilePath +
+			"../../src/test/scala/resources/testFilter0.out"))){
+			String source = scanner.useDelimiter("\\A").next();
+			assertEquals(source, result);
+		}
 	}
 
 	@Test
@@ -68,10 +69,11 @@ public class SqlExplainTest extends MultipleProgramsTestBase {
 			.filter("a % 2 = 0");
 
 		String result = tableEnv.explain(table, true);
-		String source = new Scanner(new File(testFilePath +
-				"../../src/test/scala/resources/testFilter1.out"))
-				.useDelimiter("\\A").next();
-		assertEquals(source, result);
+		try (Scanner scanner = new Scanner(new File(testFilePath +
+			"../../src/test/scala/resources/testFilter1.out"))){
+			String source = scanner.useDelimiter("\\A").next();
+			assertEquals(source, result);
+		}
 	}
 
 	@Test
@@ -89,10 +91,11 @@ public class SqlExplainTest extends MultipleProgramsTestBase {
 			.select("a, c");
 
 		String result = tableEnv.explain(table);
-		String source = new Scanner(new File(testFilePath +
-				"../../src/test/scala/resources/testJoin0.out"))
-				.useDelimiter("\\A").next();
-		assertEquals(source, result);
+		try (Scanner scanner = new Scanner(new File(testFilePath +
+			"../../src/test/scala/resources/testJoin0.out"))){
+			String source = scanner.useDelimiter("\\A").next();
+			assertEquals(source, result);
+		}
 	}
 
 	@Test
@@ -110,10 +113,11 @@ public class SqlExplainTest extends MultipleProgramsTestBase {
 			.select("a, c");
 
 		String result = tableEnv.explain(table, true);
-		String source = new Scanner(new File(testFilePath +
-				"../../src/test/scala/resources/testJoin1.out"))
-				.useDelimiter("\\A").next();
-		assertEquals(source, result);
+		try (Scanner scanner = new Scanner(new File(testFilePath +
+			"../../src/test/scala/resources/testJoin1.out"))){
+			String source = scanner.useDelimiter("\\A").next();
+			assertEquals(source, result);
+		}
 	}
 
 	@Test
@@ -128,10 +132,11 @@ public class SqlExplainTest extends MultipleProgramsTestBase {
 		Table table = table1.unionAll(table2);
 
 		String result = tableEnv.explain(table);
-		String source = new Scanner(new File(testFilePath +
-				"../../src/test/scala/resources/testUnion0.out"))
-				.useDelimiter("\\A").next();
-		assertEquals(source, result);
+		try (Scanner scanner = new Scanner(new File(testFilePath +
+			"../../src/test/scala/resources/testUnion0.out"))){
+			String source = scanner.useDelimiter("\\A").next();
+			assertEquals(source, result);
+		}
 	}
 
 	@Test
@@ -146,9 +151,10 @@ public class SqlExplainTest extends MultipleProgramsTestBase {
 		Table table = table1.unionAll(table2);
 
 		String result = tableEnv.explain(table, true);
-		String source = new Scanner(new File(testFilePath +
-				"../../src/test/scala/resources/testUnion1.out"))
-				.useDelimiter("\\A").next();
-		assertEquals(source, result);
+		try (Scanner scanner = new Scanner(new File(testFilePath +
+			"../../src/test/scala/resources/testUnion1.out"))){
+			String source = scanner.useDelimiter("\\A").next();
+			assertEquals(source, result);
+		}
 	}
 }