You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2020/10/22 23:28:59 UTC
[kudu] 01/02: [backup] Fix Spark 2 and Scala 2.11 compilation
This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 303f4253ee5d5e18d2dbfa73e55091d2e50cdfb6
Author: Grant Henke <gr...@apache.org>
AuthorDate: Thu Oct 22 11:40:02 2020 -0500
[backup] Fix Spark 2 and Scala 2.11 compilation
When compiling with Spark 2 and Scala 2.11, the build fails
due to the use of `java.util.concurrent.ForkJoinPool` which
was added in 41a7c4e. This patch reverts that part of the change.
Change-Id: I75110921a536b6c78d3231251ff68f6f25dba6dc
Reviewed-on: http://gerrit.cloudera.org:8080/16629
Tested-by: Kudu Jenkins
Reviewed-by: Andrew Wong <aw...@cloudera.com>
---
.../kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala | 3 +--
.../src/main/scala/org/apache/kudu/backup/KuduRestore.scala | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala
index 4d97452..c02f5de 100644
--- a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala
+++ b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala
@@ -17,8 +17,6 @@
package org.apache.kudu.backup
-import java.util.concurrent.ForkJoinPool
-
import org.apache.kudu.spark.kudu.KuduContext
import org.apache.spark.sql.SaveMode
import org.apache.spark.sql.SparkSession
@@ -28,6 +26,7 @@ import org.slf4j.Logger
import org.slf4j.LoggerFactory
import scala.collection.JavaConverters._
import scala.collection.parallel.ForkJoinTaskSupport
+import scala.concurrent.forkjoin.ForkJoinPool
import scala.util.Failure
import scala.util.Success
import scala.util.Try
diff --git a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala
index f7ce9b4..6549cd6 100644
--- a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala
+++ b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala
@@ -17,8 +17,6 @@
package org.apache.kudu.backup
-import java.util.concurrent.ForkJoinPool
-
import org.apache.kudu.backup.Backup.TableMetadataPB
import org.apache.kudu.client.AlterTableOptions
import org.apache.kudu.client.KuduPartitioner
@@ -34,6 +32,7 @@ import org.slf4j.Logger
import org.slf4j.LoggerFactory
import scala.collection.JavaConverters._
import scala.collection.parallel.ForkJoinTaskSupport
+import scala.concurrent.forkjoin.ForkJoinPool
import scala.util.Failure
import scala.util.Success
import scala.util.Try