From 74aaa3425879a3ad01096521ebb26e3eff3f0b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20D=C3=B6hmen?= Date: Fri, 1 Jul 2022 20:05:30 +0200 Subject: [PATCH] [HOPSWORKS-3233] Timestamp incompatibility Spark/Hive/Hudi (#30) --- assembly/pom.xml | 2 +- common/kvstore/pom.xml | 2 +- common/network-common/pom.xml | 2 +- common/network-shuffle/pom.xml | 2 +- common/network-yarn/pom.xml | 2 +- common/sketch/pom.xml | 2 +- common/tags/pom.xml | 2 +- common/unsafe/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- external/avro/pom.xml | 2 +- external/docker-integration-tests/pom.xml | 2 +- external/kafka-0-10-assembly/pom.xml | 2 +- external/kafka-0-10-sql/pom.xml | 2 +- external/kafka-0-10-token-provider/pom.xml | 2 +- external/kafka-0-10/pom.xml | 2 +- external/kinesis-asl-assembly/pom.xml | 2 +- external/kinesis-asl/pom.xml | 2 +- external/spark-ganglia-lgpl/pom.xml | 2 +- graphx/pom.xml | 2 +- hadoop-cloud/pom.xml | 2 +- launcher/pom.xml | 2 +- mllib-local/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 6 +++--- repl/pom.xml | 2 +- resource-managers/kubernetes/core/pom.xml | 2 +- .../kubernetes/integration-tests/pom.xml | 2 +- resource-managers/mesos/pom.xml | 2 +- resource-managers/yarn/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive-thriftserver/pom.xml | 2 +- sql/hive/pom.xml | 2 +- .../apache/spark/sql/hive/HiveInspectors.scala | 15 +++++++++------ .../org/apache/spark/sql/hive/TableReader.scala | 6 ++++-- .../apache/spark/sql/hive/client/HiveClient.scala | 8 ++++---- .../spark/sql/hive/client/HiveClientImpl.scala | 14 +++++++------- .../spark/sql/hive/client/VersionsSuite.scala | 9 +++++---- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- 41 files changed, 67 insertions(+), 61 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 0f908b7cbf5b4..eff71baf2bf71 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index 1e28a39b749b8..f69d9d2542119 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 3b96bec933bc8..60cd65b5ce626 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 40be42738164c..79c71c54758bb 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 72c1efa28529a..8f24f0fef1933 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index c373cb9a1bd12..df62103c5c620 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index db8e74f58edb5..864de33d85924 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 1ee7ff893cbe0..df988839878df 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index b75a77c5aa215..777a6029f6f91 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index f82def3a30555..aa895704f57c9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/external/avro/pom.xml b/external/avro/pom.xml index 8088810c7ba1b..24b29af105729 100644 --- a/external/avro/pom.xml +++ b/external/avro/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index ebdbe4935e582..62b35f59e5216 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 5b55ec2a14d1c..bbe97fd0fd535 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index bf4bcae626ce2..b4223b97d5273 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/kafka-0-10-token-provider/pom.xml b/external/kafka-0-10-token-provider/pom.xml index bf0d66276d2f5..65259af9771ff 100644 --- a/external/kafka-0-10-token-provider/pom.xml +++ b/external/kafka-0-10-token-provider/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index 1426f01665b8f..067eed45c7d35 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 7664420c0cd46..cbb66367b0712 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 236b31873c20e..070fc509ad16c 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 04949a417c10f..e23bc8f71c203 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 4d88cb6f7d108..8d6f86a0ddf41 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 4106eb5454721..569965b753d90 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 5ea4f35b67ec4..978ea94c0323f 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index c83d0d1ebe8c6..0982319e9a887 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 223c533c0e95c..7da19d7e7d00b 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/pom.xml b/pom.xml index 77f88bb1a819b..7d2e34790ddde 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 pom Spark Project Parent POM http://spark.apache.org/ @@ -129,8 +129,8 @@ io.hops.hive core - 3.0.0.8-SNAPSHOT - 3.0.0.8-SNAPSHOT + 3.0.0.11 + 3.0.0.11 3.0 diff --git a/repl/pom.xml b/repl/pom.xml index 3a8cb1ef25197..03781c87894ca 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 04ffaaaa04cb5..6aefd861b251f 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index bd71983d3779c..2f194fcb2db85 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 112e4107cb5e1..b4f46d044a229 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 43dec4cdea03e..80a6a4e12279b 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 6f5c8513c78bf..262700e8e0ed1 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 79468e47a3259..9623d8de52e06 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 55ccc29fae02c..1e470c08aa65c 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 643a7062e7bff..896a727bba5af 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../../pom.xml diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala index 9213173bbc9ba..8f4e3eab96d22 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala @@ -466,7 +466,7 @@ private[hive] trait HiveInspectors { _ => constant case poi: WritableConstantTimestampObjectInspector => val t = poi.getWritableConstantValue - val constant = DateTimeUtils.fromJavaTimestamp(t.getTimestamp) + val constant = DateTimeUtils.fromJavaTimestamp(t.getTimestamp.toSqlTimestamp) _ => constant case poi: WritableConstantIntObjectInspector => val constant = poi.getWritableConstantValue.get() @@ -495,7 +495,8 @@ private[hive] trait HiveInspectors { System.arraycopy(writable.getBytes, 0, constant, 0, constant.length) _ => constant case poi: WritableConstantDateObjectInspector => - val constant = DateTimeUtils.fromJavaDate(poi.getWritableConstantValue.get()) + val constant = DateTimeUtils.fromJavaDate(new java.sql.Date(poi.getWritableConstantValue + .get().toEpochMilli)) _ => constant case mi: StandardConstantMapObjectInspector => val keyUnwrapper = unwrapperFor(mi.getMapKeyObjectInspector) @@ -618,7 +619,7 @@ private[hive] trait HiveInspectors { case x: DateObjectInspector if x.preferWritable() => data: Any => { if (data != null) { - new DaysWritable(x.getPrimitiveWritableObject(data)).gregorianDays + new DaysWritable(x.getPrimitiveWritableObject(data).getDays).gregorianDays } else { null } @@ -626,7 +627,8 @@ private[hive] trait HiveInspectors { case x: DateObjectInspector => data: Any => { if (data != null) { - DateTimeUtils.fromJavaDate(x.getPrimitiveJavaObject(data)) + DateTimeUtils.fromJavaDate(new java.sql.Date(x.getPrimitiveJavaObject(data) + .toEpochMilli)) } else { null } @@ -634,7 +636,8 @@ private[hive] trait HiveInspectors { case x: TimestampObjectInspector if x.preferWritable() => data: Any => { if (data != null) { - DateTimeUtils.fromJavaTimestamp(x.getPrimitiveWritableObject(data).getTimestamp) + DateTimeUtils.fromJavaTimestamp(x.getPrimitiveWritableObject(data).getTimestamp + .toSqlTimestamp) } else { null } @@ -642,7 +645,7 @@ private[hive] trait HiveInspectors { case ti: TimestampObjectInspector => data: Any => { if (data != null) { - DateTimeUtils.fromJavaTimestamp(ti.getPrimitiveJavaObject(data)) + DateTimeUtils.fromJavaTimestamp(ti.getPrimitiveJavaObject(data).toSqlTimestamp) } else { null } diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/TableReader.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/TableReader.scala index eb9ce877fc8d2..1f21b5776200f 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/TableReader.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/TableReader.scala @@ -465,10 +465,12 @@ private[hive] object HadoopTableReader extends HiveInspectors with Logging { row.update(ordinal, HiveShim.toCatalystDecimal(oi, value)) case oi: TimestampObjectInspector => (value: Any, row: InternalRow, ordinal: Int) => - row.setLong(ordinal, DateTimeUtils.fromJavaTimestamp(oi.getPrimitiveJavaObject(value))) + row.setLong(ordinal, DateTimeUtils.fromJavaTimestamp(oi.getPrimitiveJavaObject(value) + .toSqlTimestamp)) case oi: DateObjectInspector => (value: Any, row: InternalRow, ordinal: Int) => - row.setInt(ordinal, DateTimeUtils.fromJavaDate(oi.getPrimitiveJavaObject(value))) + row.setInt(ordinal, DateTimeUtils.fromJavaDate(new java.sql.Date(oi + .getPrimitiveJavaObject(value).toEpochMilli))) case oi: BinaryObjectInspector => (value: Any, row: InternalRow, ordinal: Int) => row.update(ordinal, oi.getPrimitiveJavaObject(value)) diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClient.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClient.scala index 48f3837740933..b71b7bd96e29e 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClient.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClient.scala @@ -17,7 +17,7 @@ package org.apache.spark.sql.hive.client -import java.io.PrintStream +import org.apache.hadoop.hive.common.io.SessionStream import org.apache.spark.sql.catalyst.analysis._ import org.apache.spark.sql.catalyst.catalog._ @@ -51,9 +51,9 @@ private[hive] trait HiveClient { */ def runSqlHive(sql: String): Seq[String] - def setOut(stream: PrintStream): Unit - def setInfo(stream: PrintStream): Unit - def setError(stream: PrintStream): Unit + def setOut(stream: SessionStream): Unit + def setInfo(stream: SessionStream): Unit + def setError(stream: SessionStream): Unit /** Returns the names of all tables in the given database. */ def listTables(dbName: String): Seq[String] diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala index ef76f4559be02..8d1188d796113 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala @@ -17,7 +17,7 @@ package org.apache.spark.sql.hive.client -import java.io.{File, PrintStream} +import java.io.{File} import java.lang.{Iterable => JIterable} import java.lang.reflect.InvocationTargetException import java.nio.charset.StandardCharsets.UTF_8 @@ -30,6 +30,7 @@ import scala.collection.mutable.ArrayBuffer import org.apache.hadoop.fs.Path import org.apache.hadoop.hive.common.StatsSetupConst +import org.apache.hadoop.hive.common.io.SessionStream import org.apache.hadoop.hive.conf.HiveConf import org.apache.hadoop.hive.conf.HiveConf.ConfVars import org.apache.hadoop.hive.metastore.{IMetaStoreClient, TableType => HiveTableType} @@ -62,7 +63,6 @@ import org.apache.spark.sql.hive.HiveExternalCatalog.{DATASOURCE_SCHEMA, DATASOU import org.apache.spark.sql.internal.SQLConf import org.apache.spark.sql.types._ import org.apache.spark.util.{CircularBuffer, Utils} - /** * A class that wraps the HiveClient and converts its responses to externally visible classes. * Note that this class is typically loaded with an internal classloader for each instantiation, @@ -172,8 +172,8 @@ private[hive] class HiveClientImpl( // got changed. We reset it to clientLoader.ClassLoader here. state.getConf.setClassLoader(clientLoader.classLoader) SessionState.start(state) - state.out = new PrintStream(outputBuffer, true, UTF_8.name()) - state.err = new PrintStream(outputBuffer, true, UTF_8.name()) + state.out = new SessionStream(outputBuffer, true, UTF_8.name()) + state.err = new SessionStream(outputBuffer, true, UTF_8.name()) state } @@ -301,15 +301,15 @@ private[hive] class HiveClientImpl( ret } - def setOut(stream: PrintStream): Unit = withHiveState { + def setOut(stream: SessionStream): Unit = withHiveState { state.out = stream } - def setInfo(stream: PrintStream): Unit = withHiveState { + def setInfo(stream: SessionStream): Unit = withHiveState { state.info = stream } - def setError(stream: PrintStream): Unit = withHiveState { + def setError(stream: SessionStream): Unit = withHiveState { state.err = stream } diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/VersionsSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/VersionsSuite.scala index b5500eaf47158..364905bbd0647 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/VersionsSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/VersionsSuite.scala @@ -17,10 +17,11 @@ package org.apache.spark.sql.hive.client -import java.io.{ByteArrayOutputStream, File, PrintStream, PrintWriter} +import java.io.{ByteArrayOutputStream, File, PrintWriter} import java.net.URI import org.apache.commons.lang3.{JavaVersion, SystemUtils} +import org.apache.hadoop.hive.common.io.SessionStream import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.hadoop.hive.common.StatsSetupConst @@ -759,15 +760,15 @@ class VersionsSuite extends SparkFunSuite with Logging { } test(s"$version: setOut") { - client.setOut(new PrintStream(new ByteArrayOutputStream())) + client.setOut(new SessionStream(new ByteArrayOutputStream())) } test(s"$version: setInfo") { - client.setInfo(new PrintStream(new ByteArrayOutputStream())) + client.setInfo(new SessionStream(new ByteArrayOutputStream())) } test(s"$version: setError") { - client.setError(new PrintStream(new ByteArrayOutputStream())) + client.setError(new SessionStream(new ByteArrayOutputStream())) } test(s"$version: newSession") { diff --git a/streaming/pom.xml b/streaming/pom.xml index e361b7057e8ed..224d8c1f6c384 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 0721d6296ef1e..a0aa9ebe5c8a9 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.1 + 3.1.1.2 ../pom.xml