Repository: spark Updated Branches: refs/heads/branch-2.0 f3570bcea -> be2d23dfd
[MINOR] Resolve a number of miscellaneous build warnings This change resolves a number of build warnings that have accumulated, before 2.x. It does not address a large number of deprecation warnings, especially related to the Accumulator API. That will happen separately. Jenkins Author: Sean Owen <so...@cloudera.com> Closes #13377 from srowen/BuildWarnings. (cherry picked from commit ce1572d16f03d383071bcc1f30ede551e8ded49f) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/be2d23df Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/be2d23df Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/be2d23df Branch: refs/heads/branch-2.0 Commit: be2d23dfd97ae8b04c4960784e1223a54fd736bc Parents: f3570bc Author: Sean Owen <so...@cloudera.com> Authored: Sun May 29 16:48:14 2016 -0500 Committer: Sean Owen <so...@cloudera.com> Committed: Sun May 29 16:49:29 2016 -0500 ---------------------------------------------------------------------- .../unsafe/src/main/java/org/apache/spark/unsafe/Platform.java | 4 ++-- .../java/org/apache/spark/mllib/fpm/JavaPrefixSpanSuite.java | 4 +++- .../test/scala/org/apache/spark/mllib/fpm/PrefixSpanSuite.scala | 2 ++ .../org/apache/spark/sql/catalyst/ScalaReflectionSuite.scala | 2 +- .../spark/sql/catalyst/encoders/ExpressionEncoderSuite.scala | 3 ++- sql/core/src/test/scala/org/apache/spark/sql/JoinSuite.scala | 2 ++ .../spark/sql/execution/datasources/FileCatalogSuite.scala | 2 ++ .../org/apache/spark/network/yarn/YarnShuffleServiceSuite.scala | 1 + 8 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/common/unsafe/src/main/java/org/apache/spark/unsafe/Platform.java ---------------------------------------------------------------------- diff --git a/common/unsafe/src/main/java/org/apache/spark/unsafe/Platform.java b/common/unsafe/src/main/java/org/apache/spark/unsafe/Platform.java index bdf52f3..77c8c39 100644 --- a/common/unsafe/src/main/java/org/apache/spark/unsafe/Platform.java +++ b/common/unsafe/src/main/java/org/apache/spark/unsafe/Platform.java @@ -155,8 +155,8 @@ public final class Platform { @SuppressWarnings("unchecked") public static ByteBuffer allocateDirectBuffer(int size) { try { - Class cls = Class.forName("java.nio.DirectByteBuffer"); - Constructor constructor = cls.getDeclaredConstructor(Long.TYPE, Integer.TYPE); + Class<?> cls = Class.forName("java.nio.DirectByteBuffer"); + Constructor<?> constructor = cls.getDeclaredConstructor(Long.TYPE, Integer.TYPE); constructor.setAccessible(true); Field cleanerField = cls.getDeclaredField("cleaner"); cleanerField.setAccessible(true); http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/mllib/src/test/java/org/apache/spark/mllib/fpm/JavaPrefixSpanSuite.java ---------------------------------------------------------------------- diff --git a/mllib/src/test/java/org/apache/spark/mllib/fpm/JavaPrefixSpanSuite.java b/mllib/src/test/java/org/apache/spark/mllib/fpm/JavaPrefixSpanSuite.java index 75b0ec6..32d3141 100644 --- a/mllib/src/test/java/org/apache/spark/mllib/fpm/JavaPrefixSpanSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/fpm/JavaPrefixSpanSuite.java @@ -72,7 +72,9 @@ public class JavaPrefixSpanSuite extends SharedSparkSession { try { model.save(spark.sparkContext(), outputPath); - PrefixSpanModel newModel = PrefixSpanModel.load(spark.sparkContext(), outputPath); + @SuppressWarnings("unchecked") + PrefixSpanModel<Integer> newModel = + (PrefixSpanModel<Integer>) PrefixSpanModel.load(spark.sparkContext(), outputPath); JavaRDD<FreqSequence<Integer>> freqSeqs = newModel.freqSequences().toJavaRDD(); List<FreqSequence<Integer>> localFreqSeqs = freqSeqs.collect(); Assert.assertEquals(5, localFreqSeqs.size()); http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/mllib/src/test/scala/org/apache/spark/mllib/fpm/PrefixSpanSuite.scala ---------------------------------------------------------------------- diff --git a/mllib/src/test/scala/org/apache/spark/mllib/fpm/PrefixSpanSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/fpm/PrefixSpanSuite.scala index 6d8c7b4..4c23763 100644 --- a/mllib/src/test/scala/org/apache/spark/mllib/fpm/PrefixSpanSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/fpm/PrefixSpanSuite.scala @@ -16,6 +16,8 @@ */ package org.apache.spark.mllib.fpm +import scala.language.existentials + import org.apache.spark.SparkFunSuite import org.apache.spark.mllib.util.MLlibTestSparkContext import org.apache.spark.util.Utils http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/ScalaReflectionSuite.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/ScalaReflectionSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/ScalaReflectionSuite.scala index 1b25f5d..85563dd 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/ScalaReflectionSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/ScalaReflectionSuite.scala @@ -288,7 +288,7 @@ class ScalaReflectionSuite extends SparkFunSuite { assert(serializer.children.head.asInstanceOf[Literal].value === UTF8String.fromString("value")) assert(serializer.children.last.isInstanceOf[NewInstance]) assert(serializer.children.last.asInstanceOf[NewInstance] - .cls.isInstanceOf[Class[org.apache.spark.sql.catalyst.util.GenericArrayData]]) + .cls.isAssignableFrom(classOf[org.apache.spark.sql.catalyst.util.GenericArrayData])) } private val dataTypeForComplexData = dataTypeFor[ComplexData] http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoderSuite.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoderSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoderSuite.scala index 3d97113..232dcc9 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoderSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoderSuite.scala @@ -365,7 +365,8 @@ class ExpressionEncoderSuite extends PlanTest with AnalysisTest { Arrays.deepEquals(b1.asInstanceOf[Array[AnyRef]], b2.asInstanceOf[Array[AnyRef]]) case (b1: Array[_], b2: Array[_]) => Arrays.equals(b1.asInstanceOf[Array[AnyRef]], b2.asInstanceOf[Array[AnyRef]]) - case (left: Comparable[Any], right: Comparable[Any]) => left.compareTo(right) == 0 + case (left: Comparable[_], right: Comparable[_]) => + left.asInstanceOf[Comparable[Any]].compareTo(right) == 0 case _ => input == convertedBack } http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/sql/core/src/test/scala/org/apache/spark/sql/JoinSuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/JoinSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/JoinSuite.scala index cbf4a8a..44889d9 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/JoinSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/JoinSuite.scala @@ -17,6 +17,8 @@ package org.apache.spark.sql +import scala.language.existentials + import org.apache.spark.sql.catalyst.analysis.UnresolvedRelation import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.execution.joins._ http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileCatalogSuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileCatalogSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileCatalogSuite.scala index 85c2e8b..0d9ea51 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileCatalogSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileCatalogSuite.scala @@ -19,6 +19,8 @@ package org.apache.spark.sql.execution.datasources import java.io.File +import scala.language.reflectiveCalls + import org.apache.hadoop.fs.Path import org.apache.spark.sql.catalyst.util._ http://git-wip-us.apache.org/repos/asf/spark/blob/be2d23df/yarn/src/test/scala/org/apache/spark/network/yarn/YarnShuffleServiceSuite.scala ---------------------------------------------------------------------- diff --git a/yarn/src/test/scala/org/apache/spark/network/yarn/YarnShuffleServiceSuite.scala b/yarn/src/test/scala/org/apache/spark/network/yarn/YarnShuffleServiceSuite.scala index 0e433f6..c33a9e6 100644 --- a/yarn/src/test/scala/org/apache/spark/network/yarn/YarnShuffleServiceSuite.scala +++ b/yarn/src/test/scala/org/apache/spark/network/yarn/YarnShuffleServiceSuite.scala @@ -19,6 +19,7 @@ package org.apache.spark.network.yarn import java.io.{DataOutputStream, File, FileOutputStream} import scala.annotation.tailrec +import scala.language.postfixOps import org.apache.commons.io.FileUtils import org.apache.hadoop.yarn.api.records.ApplicationId --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
