You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by jodersky <gi...@git.apache.org> on 2015/10/14 07:16:03 UTC
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
GitHub user jodersky opened a pull request:
https://github.com/apache/spark/pull/9111
[SPARK-11094] Strip extra strings from Java version in test runner
Removes any extra strings from the Java version, fixing subsequent integer parsing.
This is required since some OpenJDK versions (specifically in Debian testing), append an extra "-internal" string to the version field.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/jodersky/spark fixtestrunner
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/9111.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #9111
----
commit e7c2cb36be71019112cc4c27dce95ea5a67b6c6c
Author: Jakob Odersky <jo...@gmail.com>
Date: 2015-10-14T04:56:41Z
Strip extra strings from Java version in test runner
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the pull request:
https://github.com/apache/spark/pull/9111#issuecomment-148683195
[Test build #1911 has started](https://amplab.cs.berkeley.edu/jenkins/job/NewSparkPullRequestBuilder/1911/consoleFull) for PR 9111 at commit [`2a80d9f`](https://github.com/apache/spark/commit/2a80d9f0eec1ca0563615b3c46c1c0e2d595fb35).
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/spark/pull/9111
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by jodersky <gi...@git.apache.org>.
Github user jodersky commented on a diff in the pull request:
https://github.com/apache/spark/pull/9111#discussion_r42028440
--- Diff: dev/run-tests.py ---
@@ -176,8 +176,9 @@ 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)
- version_str = raw_version_str.split()[-1].strip('"') # eg '1.8.0_25'
- version, update = version_str.split('_') # eg ['1.8.0', '25']
+ version_str = raw_version_str.split()[-1].strip('"') # eg '1.8.0_25-internal'
--- End diff --
good idea, I'll update the PR
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the pull request:
https://github.com/apache/spark/pull/9111#issuecomment-148715027
[Test build #1911 has finished](https://amplab.cs.berkeley.edu/jenkins/job/NewSparkPullRequestBuilder/1911/console) for PR 9111 at commit [`2a80d9f`](https://github.com/apache/spark/commit/2a80d9f0eec1ca0563615b3c46c1c0e2d595fb35).
* This patch **passes all tests**.
* This patch merges cleanly.
* This patch adds no public classes.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by srowen <gi...@git.apache.org>.
Github user srowen commented on the pull request:
https://github.com/apache/spark/pull/9111#issuecomment-148716145
Merged to master / 1.5
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by jodersky <gi...@git.apache.org>.
Github user jodersky commented on the pull request:
https://github.com/apache/spark/pull/9111#issuecomment-148156305
Ok, I updated it to use a regex
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by srowen <gi...@git.apache.org>.
Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/9111#discussion_r41974520
--- Diff: dev/run-tests.py ---
@@ -176,8 +176,9 @@ 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)
- version_str = raw_version_str.split()[-1].strip('"') # eg '1.8.0_25'
- version, update = version_str.split('_') # eg ['1.8.0', '25']
+ version_str = raw_version_str.split()[-1].strip('"') # eg '1.8.0_25-internal'
--- End diff --
Shall we take this a step further and only parse out something like `\d(\.\d+){2,}(_\d+)?` to be more explicit about exactly what to accept?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by srowen <gi...@git.apache.org>.
Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/9111#discussion_r42230708
--- Diff: dev/run-tests.py ---
@@ -176,17 +176,14 @@ 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)
- version_str = raw_version_str.split()[-1].strip('"') # eg '1.8.0_25'
- version, update = version_str.split('_') # eg ['1.8.0', '25']
+ match = re.search('(\d+)\.(\d+)\.(\d+)_(\d+)', raw_version_str)
- # map over the values and convert them to integers
- version_info = [int(x) for x in version.split('.') + [update]]
-
- return JavaVersion(major=version_info[0],
- minor=version_info[1],
- patch=version_info[2],
- update=version_info[3])
+ major = int(match.group(1))
+ minor = int(match.group(2))
+ patch = int(match.group(3))
+ update = int(match.group(4))
--- End diff --
LGTM. I suppose this assumes there's an "update" component but so did the previous implementation.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-11094] Strip extra strings from Java ve...
Posted by AmplabJenkins <gi...@git.apache.org>.
Github user AmplabJenkins commented on the pull request:
https://github.com/apache/spark/pull/9111#issuecomment-147937294
Can one of the admins verify this patch?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org