aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjerryshao <sshao@hortonworks.com>2016-02-17 15:05:39 -0800
committerJosh Rosen <joshrosen@databricks.com>2016-02-17 15:05:40 -0800
commit1eac3800087a804c4b58a4af8b65eeb0879b6528 (patch)
tree1325d54f6ac3b5d61638447e4360ab921020b14f
parenta7c74d7563926573c01baf613708a0f105a03e57 (diff)
downloadspark-1eac3800087a804c4b58a4af8b65eeb0879b6528.tar.gz
spark-1eac3800087a804c4b58a4af8b65eeb0879b6528.tar.bz2
spark-1eac3800087a804c4b58a4af8b65eeb0879b6528.zip
[SPARK-13109][BUILD] Fix SBT publishLocal issue
Add local ivy repo to the SBT build file to fix this. Scaladoc compile error is fixed. Author: jerryshao <sshao@hortonworks.com> Closes #11001 from jerryshao/SPARK-13109.
-rw-r--r--project/SparkBuild.scala3
-rw-r--r--sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java1
-rw-r--r--sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java1
3 files changed, 4 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 646efb4d09..1ba6a07513 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -155,7 +155,8 @@ object SparkBuild extends PomBuild {
// Override SBT's default resolvers:
resolvers := Seq(
DefaultMavenRepository,
- Resolver.mavenLocal
+ Resolver.mavenLocal,
+ Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
),
externalResolvers := resolvers.value,
otherResolvers <<= SbtPomKeys.mvnLocalRepository(dotM2 => Seq(Resolver.file("dotM2", dotM2))),
diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java
index c15f3d34a4..e38ed05121 100644
--- a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java
+++ b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java
@@ -19,6 +19,7 @@ package org.apache.spark.sql.execution.vectorized;
import java.nio.ByteOrder;
import org.apache.spark.memory.MemoryMode;
+import org.apache.spark.sql.execution.vectorized.ColumnVector.Array;
import org.apache.spark.sql.types.BooleanType;
import org.apache.spark.sql.types.ByteType;
import org.apache.spark.sql.types.DataType;
diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java
index 99548bc83b..3502d31bd1 100644
--- a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java
+++ b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java
@@ -17,6 +17,7 @@
package org.apache.spark.sql.execution.vectorized;
import org.apache.spark.memory.MemoryMode;
+import org.apache.spark.sql.execution.vectorized.ColumnVector.Array;
import org.apache.spark.sql.types.*;
import org.apache.spark.unsafe.Platform;