From f4c3097ed6df3dbbdde11ebd8a207224cf304df7 Mon Sep 17 00:00:00 2001 From: Herman van Hovell Date: Sat, 25 Mar 2017 00:48:46 +0100 Subject: [PATCH] Fix 2.10 build --- .../org/apache/spark/internal/config/ConfigBuilder.scala | 2 +- .../org/apache/spark/internal/config/ConfigEntrySuite.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala b/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala index d87619afd3b2f..b9921138cc6c7 100644 --- a/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala +++ b/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala @@ -225,6 +225,6 @@ private[spark] case class ConfigBuilder(key: String) { } def regexConf: TypedConfigBuilder[Regex] = { - new TypedConfigBuilder(this, regexFromString(_, this.key), _.regex) + new TypedConfigBuilder(this, regexFromString(_, this.key), _.toString) } } diff --git a/core/src/test/scala/org/apache/spark/internal/config/ConfigEntrySuite.scala b/core/src/test/scala/org/apache/spark/internal/config/ConfigEntrySuite.scala index f3756b21080b2..3ff7e84d73bd4 100644 --- a/core/src/test/scala/org/apache/spark/internal/config/ConfigEntrySuite.scala +++ b/core/src/test/scala/org/apache/spark/internal/config/ConfigEntrySuite.scala @@ -100,10 +100,10 @@ class ConfigEntrySuite extends SparkFunSuite { val rConf = ConfigBuilder(testKey("regex")).regexConf.createWithDefault(".*".r) conf.set(rConf, "[0-9a-f]{8}".r) - assert(conf.get(rConf).regex === "[0-9a-f]{8}") + assert(conf.get(rConf).toString === "[0-9a-f]{8}") conf.set(rConf.key, "[0-9a-f]{4}") - assert(conf.get(rConf).regex === "[0-9a-f]{4}") + assert(conf.get(rConf).toString === "[0-9a-f]{4}") conf.set(rConf.key, "[.") val e = intercept[IllegalArgumentException](conf.get(rConf))