You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by an...@apache.org on 2018/08/23 12:39:19 UTC
oozie git commit: OOZIE-3331 [spark-action] Inconsistency while
parsing quoted Spark options (asalamon74 via andras.piros)
Repository: oozie
Updated Branches:
refs/heads/master 1c1225f8b -> 64459d01f
OOZIE-3331 [spark-action] Inconsistency while parsing quoted Spark options (asalamon74 via andras.piros)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/64459d01
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/64459d01
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/64459d01
Branch: refs/heads/master
Commit: 64459d01fa8874274c5103114298e3211377d548
Parents: 1c1225f
Author: Andras Piros <an...@cloudera.com>
Authored: Thu Aug 23 14:38:52 2018 +0200
Committer: Andras Piros <an...@cloudera.com>
Committed: Thu Aug 23 14:38:52 2018 +0200
----------------------------------------------------------------------
release-log.txt | 1 +
.../org/apache/oozie/action/hadoop/SparkOptionsSplitter.java | 3 +--
.../apache/oozie/action/hadoop/TestSparkOptionsSplitter.java | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/64459d01/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 237ab06..d651ac9 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.1.0 release (trunk - unreleased)
+OOZIE-3331 [spark-action] Inconsistency while parsing quoted Spark options (asalamon74 via andras.piros)
OOZIE-3330 [spark-action] Remove double quotes inside plain option values (asalamon74 via andras.piros)
OOZIE-3329 [build] test-patch-30-distro improvement (asalamon74 via andras.piros)
OOZIE-3324 Cannot compile with findbugs check (asalamon74 via pbacsko)
http://git-wip-us.apache.org/repos/asf/oozie/blob/64459d01/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkOptionsSplitter.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkOptionsSplitter.java b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkOptionsSplitter.java
index ac6ee81..5ccd37f 100644
--- a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkOptionsSplitter.java
+++ b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkOptionsSplitter.java
@@ -65,8 +65,7 @@ class SparkOptionsSplitter {
* -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp}</li>
* </ul>
*/
- private static final String VALUE_HAS_QUOTES_IN_BETWEEN_REGEX =
- "([a-zA-Z0-9.]+=)?.*(\\w\\s+\"\\w+[\\s+\\w]*\"|\"\\w+[\\s+\\w]*\"\\s+\\w)+.*";
+ private static final String VALUE_HAS_QUOTES_IN_BETWEEN_REGEX = "([a-zA-Z0-9.]+=)?\".*\".*\"";
/**
* Converts the options to be Spark-compatible.
http://git-wip-us.apache.org/repos/asf/oozie/blob/64459d01/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkOptionsSplitter.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkOptionsSplitter.java b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkOptionsSplitter.java
index 61ded5e..e533be9 100644
--- a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkOptionsSplitter.java
+++ b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkOptionsSplitter.java
@@ -52,6 +52,14 @@ public class TestSparkOptionsSplitter {
Arrays.asList("--conf", "special=value1 value2")},
{" --conf special=\"value1 value2\" ",
Arrays.asList("--conf", "special=value1 value2")},
+ {"--conf key=value1 value2",
+ Arrays.asList("--conf", "key=value1 value2")},
+ {"--conf key=value1 \"value2\"",
+ Arrays.asList("--conf", "key=value1 \"value2\"")},
+ {"--conf key=\"value1 value2\" \"value3 value4\"",
+ Arrays.asList("--conf", "key=\"value1 value2\" \"value3 value4\"")},
+ {"--conf key=\"value1 value2 value3 value4\"",
+ Arrays.asList("--conf", "key=value1 value2 value3 value4")},
{"--conf special=value1 \"value2\"",
Arrays.asList("--conf", "special=value1 \"value2\"")},
{"--conf special=value1 value2 --conf value3",