From 2a1679bfc040e150fd9f4622278bc64523d39328 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Mon, 21 Mar 2016 03:27:23 +0000 Subject: [PATCH 1/3] [SPARK-13401][SQL][TESTS] Fix SQL test warnings. This fix tries to fix several SQL test warnings under the sql/core/src/test directory. The fixed warnings includes "[unchecked]", "[rawtypes]", and "[varargs]". --- .../datasources/parquet/test/avro/AvroArrayOfArray.java | 1 + .../datasources/parquet/test/avro/AvroMapOfArray.java | 1 + .../datasources/parquet/test/avro/AvroNonNullableArrays.java | 1 + .../sql/execution/datasources/parquet/test/avro/Nested.java | 1 + .../datasources/parquet/test/avro/ParquetAvroCompat.java | 1 + .../java/test/org/apache/spark/sql/JavaDataFrameSuite.java | 4 ++-- .../test/java/test/org/apache/spark/sql/JavaDatasetSuite.java | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroArrayOfArray.java b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroArrayOfArray.java index ee327827903e5..8de0b06b162c6 100644 --- a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroArrayOfArray.java +++ b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroArrayOfArray.java @@ -129,6 +129,7 @@ public org.apache.spark.sql.execution.datasources.parquet.test.avro.AvroArrayOfA } @Override + @SuppressWarnings(value="unchecked") public AvroArrayOfArray build() { try { AvroArrayOfArray record = new AvroArrayOfArray(); diff --git a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroMapOfArray.java b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroMapOfArray.java index 727f6a7bf733e..29f3109f83a15 100644 --- a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroMapOfArray.java +++ b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroMapOfArray.java @@ -129,6 +129,7 @@ public org.apache.spark.sql.execution.datasources.parquet.test.avro.AvroMapOfArr } @Override + @SuppressWarnings(value="unchecked") public AvroMapOfArray build() { try { AvroMapOfArray record = new AvroMapOfArray(); diff --git a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroNonNullableArrays.java b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroNonNullableArrays.java index 934793f42f9c9..c5522ed1e53e5 100644 --- a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroNonNullableArrays.java +++ b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/AvroNonNullableArrays.java @@ -182,6 +182,7 @@ public org.apache.spark.sql.execution.datasources.parquet.test.avro.AvroNonNulla } @Override + @SuppressWarnings(value="unchecked") public AvroNonNullableArrays build() { try { AvroNonNullableArrays record = new AvroNonNullableArrays(); diff --git a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/Nested.java b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/Nested.java index a7bf4841919c5..f84e3f2d61efb 100644 --- a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/Nested.java +++ b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/Nested.java @@ -182,6 +182,7 @@ public org.apache.spark.sql.execution.datasources.parquet.test.avro.Nested.Build } @Override + @SuppressWarnings(value="unchecked") public Nested build() { try { Nested record = new Nested(); diff --git a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/ParquetAvroCompat.java b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/ParquetAvroCompat.java index ef12d193f916c..46fc608398ccf 100644 --- a/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/ParquetAvroCompat.java +++ b/sql/core/src/test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/ParquetAvroCompat.java @@ -235,6 +235,7 @@ public org.apache.spark.sql.execution.datasources.parquet.test.avro.ParquetAvroC } @Override + @SuppressWarnings(value="unchecked") public ParquetAvroCompat build() { try { ParquetAvroCompat record = new ParquetAvroCompat(); diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java index f3c5a86e20320..03d0fa5fbe91c 100644 --- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java +++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java @@ -328,7 +328,7 @@ public void testTextLoad() { @Test public void testCountMinSketch() { - Dataset df = context.range(1000); + Dataset df = context.range(1000); CountMinSketch sketch1 = df.stat().countMinSketch("id", 10, 20, 42); Assert.assertEquals(sketch1.totalCount(), 1000); @@ -353,7 +353,7 @@ public void testCountMinSketch() { @Test public void testBloomFilter() { - Dataset df = context.range(1000); + Dataset df = context.range(1000); BloomFilter filter1 = df.stat().bloomFilter("id", 1000, 0.03); Assert.assertTrue(filter1.expectedFpp() - 0.03 < 1e-3); diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java index 4b8b0d9d4f8aa..3bff129ae2294 100644 --- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java +++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java @@ -309,6 +309,7 @@ private static Set toSet(List records) { } @SafeVarargs + @SuppressWarnings("varargs") private static Set asSet(T... records) { return toSet(Arrays.asList(records)); } From 70b537b149398f1b2ff58472e4755f5af743d107 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Tue, 22 Mar 2016 01:33:36 +0000 Subject: [PATCH 2/3] [SPARK-13401][SQL][TESTS] Fix SQL test warnings (continued). This fix tries to replace `Dataset` to Dataset`. --- .../java/test/org/apache/spark/sql/JavaDataFrameSuite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java index 03d0fa5fbe91c..4914c17e0929f 100644 --- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java +++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java @@ -328,7 +328,7 @@ public void testTextLoad() { @Test public void testCountMinSketch() { - Dataset df = context.range(1000); + Dataset df = context.range(1000); CountMinSketch sketch1 = df.stat().countMinSketch("id", 10, 20, 42); Assert.assertEquals(sketch1.totalCount(), 1000); @@ -353,7 +353,7 @@ public void testCountMinSketch() { @Test public void testBloomFilter() { - Dataset df = context.range(1000); + Dataset df = context.range(1000); BloomFilter filter1 = df.stat().bloomFilter("id", 1000, 0.03); Assert.assertTrue(filter1.expectedFpp() - 0.03 < 1e-3); From 69ba48aae0e7e23a91824f417b3fbea8727e5e96 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Tue, 22 Mar 2016 05:11:39 +0000 Subject: [PATCH 3/3] [SPARK-13401][SQL][TESTS] Fix SQL test warnings (continued 2). Revert `Dataset` to Dataset. --- .../java/test/org/apache/spark/sql/JavaDataFrameSuite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java index 4914c17e0929f..f3c5a86e20320 100644 --- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java +++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java @@ -328,7 +328,7 @@ public void testTextLoad() { @Test public void testCountMinSketch() { - Dataset df = context.range(1000); + Dataset df = context.range(1000); CountMinSketch sketch1 = df.stat().countMinSketch("id", 10, 20, 42); Assert.assertEquals(sketch1.totalCount(), 1000); @@ -353,7 +353,7 @@ public void testCountMinSketch() { @Test public void testBloomFilter() { - Dataset df = context.range(1000); + Dataset df = context.range(1000); BloomFilter filter1 = df.stat().bloomFilter("id", 1000, 0.03); Assert.assertTrue(filter1.expectedFpp() - 0.03 < 1e-3);