Repository: spark
Updated Branches:
  refs/heads/branch-2.0 f277cdf78 -> df9a19fe8


[SPARK-15935][PYSPARK] Fix a wrong format tag in the error message

## What changes were proposed in this pull request?

A follow up PR for #13655 to fix a wrong format tag.

## How was this patch tested?

Jenkins unit tests.

Author: Shixiong Zhu <[email protected]>

Closes #13665 from zsxwing/fix.

(cherry picked from commit 0ee9fd9e528206a5edfb2cc4a56538250b428aaf)
Signed-off-by: Shixiong Zhu <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df9a19fe
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df9a19fe
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df9a19fe

Branch: refs/heads/branch-2.0
Commit: df9a19fe880404895e6dfb28c9c1a887913bd582
Parents: f277cdf
Author: Shixiong Zhu <[email protected]>
Authored: Tue Jun 14 19:45:11 2016 -0700
Committer: Shixiong Zhu <[email protected]>
Committed: Tue Jun 14 19:45:21 2016 -0700

----------------------------------------------------------------------
 dev/run-tests.py                | 2 +-
 python/pyspark/sql/streaming.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/df9a19fe/dev/run-tests.py
----------------------------------------------------------------------
diff --git a/dev/run-tests.py b/dev/run-tests.py
index 2030c4a..dcf1be9 100755
--- a/dev/run-tests.py
+++ b/dev/run-tests.py
@@ -335,7 +335,7 @@ def build_spark_maven(hadoop_version):
 def build_spark_sbt(hadoop_version):
     # Enable all of the profiles for the build:
     build_profiles = get_hadoop_profiles(hadoop_version) + 
modules.root.build_profile_flags
-    sbt_goals = ["package",
+    sbt_goals = ["test:package",  # Build test jars as some tests depend on 
them
                  "streaming-kafka-0-8-assembly/assembly",
                  "streaming-flume-assembly/assembly",
                  "streaming-kinesis-asl-assembly/assembly"]

http://git-wip-us.apache.org/repos/asf/spark/blob/df9a19fe/python/pyspark/sql/streaming.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql/streaming.py b/python/pyspark/sql/streaming.py
index 0edaa51..1d65094 100644
--- a/python/pyspark/sql/streaming.py
+++ b/python/pyspark/sql/streaming.py
@@ -146,7 +146,7 @@ class ContinuousQueryManager(object):
         >>> cq.stop()
         """
         if not isinstance(id, intlike):
-            raise ValueError("The id for the query must be an integer. Got: 
%d" % id)
+            raise ValueError("The id for the query must be an integer. Got: 
%s" % id)
         return ContinuousQuery(self._jcqm.get(id))
 
     @since(2.0)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to