You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2016/02/18 00:06:18 UTC
spark git commit: [SPARK-13109][BUILD] Fix SBT publishLocal issue
Repository: spark
Updated Branches:
refs/heads/master a7c74d756 -> 1eac38000
[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 <ss...@hortonworks.com>
Closes #11001 from jerryshao/SPARK-13109.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1eac3800
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1eac3800
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1eac3800
Branch: refs/heads/master
Commit: 1eac3800087a804c4b58a4af8b65eeb0879b6528
Parents: a7c74d7
Author: jerryshao <ss...@hortonworks.com>
Authored: Wed Feb 17 15:05:39 2016 -0800
Committer: Josh Rosen <jo...@databricks.com>
Committed: Wed Feb 17 15:05:40 2016 -0800
----------------------------------------------------------------------
project/SparkBuild.scala | 3 ++-
.../spark/sql/execution/vectorized/OffHeapColumnVector.java | 1 +
.../apache/spark/sql/execution/vectorized/OnHeapColumnVector.java | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1eac3800/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 646efb4..1ba6a07 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))),
http://git-wip-us.apache.org/repos/asf/spark/blob/1eac3800/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java
----------------------------------------------------------------------
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 c15f3d3..e38ed05 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;
http://git-wip-us.apache.org/repos/asf/spark/blob/1eac3800/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java
----------------------------------------------------------------------
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 99548bc..3502d31 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org