Skip to content

SKIPME merged Apache branch-1.6 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markhamstra merged 17 commits into from
Dec 29, 2015
Merged

SKIPME merged Apache branch-1.6 #139

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4062cda
Preparing Spark release v1.6.0-rc4
pwendell Dec 22, 2015
5b19e7c
Preparing development version 1.6.0-SNAPSHOT
pwendell Dec 22, 2015
309ef35
[MINOR] Fix typos in JavaStreamingContext
zsxwing Dec 22, 2015
0f905d7
[SPARK-11823][SQL] Fix flaky JDBC cancellation test in HiveThriftBina…
JoshRosen Dec 22, 2015
94fb5e8
[SPARK-12487][STREAMING][DOCUMENT] Add docs for Kafka message handler
zsxwing Dec 22, 2015
942c057
[SPARK-12429][STREAMING][DOC] Add Accumulator and Broadcast example f…
zsxwing Dec 23, 2015
c6c9bf9
[SPARK-12477][SQL] - Tungsten projection fails for null values in arr…
Dec 23, 2015
5987b16
[SPARK-12499][BUILD] don't force MAVEN_OPTS
abridgett Dec 24, 2015
b49856a
[SPARK-12411][CORE] Decrease executor heartbeat timeout to match hear…
nongli Dec 19, 2015
4dd8712
[SPARK-12502][BUILD][PYTHON] Script /dev/run-tests fails when IBM Jav…
kiszk Dec 24, 2015
865dd8b
[SPARK-12010][SQL] Spark JDBC requires support for column-name-free I…
CK50 Dec 24, 2015
b8da77e
[SPARK-12520] [PYSPARK] Correct Descriptions and Add Use Cases in Equ…
gatorsmile Dec 28, 2015
1fbcb6e
[SPARK-12517] add default RDD name for one created via sc.textFile
wyaron Dec 28, 2015
7c7d76f
[SPARK-12424][ML] The implementation of ParamMap#filter is wrong.
sarutak Dec 28, 2015
a9c52d4
[SPARK-12222][CORE] Deserialize RoaringBitmap using Kryo serializer t…
adrian-wang Dec 28, 2015
fd20248
[SPARK-12489][CORE][SQL][MLIB] Fix minor issues found by FindBugs
zsxwing Dec 28, 2015
d545dfe
Merge branch 'branch-1.6' of github.com:apache/spark into csd-1.6
markhamstra Dec 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[SPARK-12502][BUILD][PYTHON] Script /dev/run-tests fails when IBM Jav… 
…a is used

fix an exception with IBM JDK by removing update field from a JavaVersion tuple. This is because IBM JDK does not have information on update '_xx'

Author: Kazuaki Ishizaki <[email protected]>

Closes apache#10463 from kiszk/SPARK-12502.

(cherry picked from commit 9e85bb7)
Signed-off-by: Kousuke Saruta <[email protected]>
  • Loading branch information
@kiszk @sarutak
kiszk authored and sarutak committed Dec 24, 2015
commit 4dd8712c1b64a64da0fa0413e2c9be68ad0ddc17
7 changes: 3 additions & 4 deletions dev/run-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def determine_java_executable():
return java_exe if java_exe else which("java")


JavaVersion = namedtuple('JavaVersion', ['major', 'minor', 'patch', 'update'])
JavaVersion = namedtuple('JavaVersion', ['major', 'minor', 'patch'])


def determine_java_version(java_exe):
Expand All @@ -164,14 +164,13 @@ def determine_java_version(java_exe):
# find raw version string, eg 'java version "1.8.0_25"'
raw_version_str = next(x for x in raw_output_lines if " version " in x)

match = re.search('(\d+)\.(\d+)\.(\d+)_(\d+)', raw_version_str)
match = re.search('(\d+)\.(\d+)\.(\d+)', raw_version_str)

major = int(match.group(1))
minor = int(match.group(2))
patch = int(match.group(3))
update = int(match.group(4))

return JavaVersion(major, minor, patch, update)
return JavaVersion(major, minor, patch)

# -------------------------------------------------------------------------------------------------
# Functions for running the other build and test scripts
Expand Down