Fixing merge

apache · Nov 2, 2014 · f3c72fe · f3c72fe
1 parent e13cd8a
commit f3c72fe
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 217 deletions.
diff --git a/examples/src/main/scala/org/apache/spark/examples/mllib/DatasetExample.scala b/examples/src/main/scala/org/apache/spark/examples/mllib/DatasetExample.scala
diff --git a/mllib/pom.xml b/mllib/pom.xml
@@ -40,11 +40,6 @@
       <artifactId>spark-core_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.spark</groupId>
-      <artifactId>spark-sql_${scala.binary.version}</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-streaming_${scala.binary.version}</artifactId>

diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
@@ -25,11 +25,8 @@ import scala.collection.JavaConverters._
 
 import breeze.linalg.{DenseVector => BDV, SparseVector => BSV, Vector => BV}
 
-import org.apache.spark.SparkException
 import org.apache.spark.mllib.util.NumericParser
-import org.apache.spark.sql.catalyst.annotation.SQLUserDefinedType
-import org.apache.spark.sql.catalyst.expressions.GenericMutableRow
-import org.apache.spark.sql.catalyst.types._
+import org.apache.spark.SparkException
 
 /**
  * Represents a numeric vector, whose index type is Int and value type is Double.

diff --git a/mllib/src/test/scala/org/apache/spark/mllib/rdd/DatasetSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/rdd/DatasetSuite.scala
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/DataType.java b/sql/core/src/main/java/org/apache/spark/sql/api/java/DataType.java
@@ -17,7 +17,6 @@
 
 package org.apache.spark.sql.api.java;
 
-import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -201,5 +200,4 @@ public static StructType createStructType(StructField[] fields) {
 
     return new StructType(fields);
   }
-
 }
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/package.scala b/sql/core/src/main/scala/org/apache/spark/sql/package.scala
@@ -451,5 +451,4 @@ package object sql {
    * Builder for [[Metadata]]. If there is a key collision, the latter will overwrite the former.
    */
   type MetadataBuilder = catalyst.util.MetadataBuilder
-
 }