forked from apache/zeppelin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
https://issues.apache.org/jira/browse/ZEPPELIN-273 "spark-1.5" profile is added Author: Lee moon soo <[email protected]> Closes apache#269 from Leemoonsoo/spark_1.5 and squashes the following commits: 6ba2dce [Lee moon soo] Add missing import after rebase 5279d26 [Lee moon soo] improve 8c19b09 [Lee moon soo] Add SparkVersion enum and test 699b05b [Lee moon soo] Add spark-1.5 profile 67023fa [Lee moon soo] allow spark 1.5
- Loading branch information
1 parent
48f875d
commit 754c55e
Showing
8 changed files
with
197 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.zeppelin.spark; | ||
|
|
||
| /** | ||
| * Provide reading comparing capability of spark version returned from SparkContext.version() | ||
| */ | ||
| public enum SparkVersion { | ||
| SPARK_1_0_0, | ||
| SPARK_1_0_1, | ||
| SPARK_1_1_0, | ||
| SPARK_1_1_1, | ||
| SPARK_1_2_0, | ||
| SPARK_1_2_1, | ||
| SPARK_1_2_2, | ||
| SPARK_1_3_0, | ||
| SPARK_1_3_1, | ||
| SPARK_1_4_0, | ||
| SPARK_1_4_1, | ||
| SPARK_1_5_0; | ||
|
|
||
| private int version; | ||
|
|
||
| SparkVersion() { | ||
| version = Integer.parseInt(name().substring("SPARK_".length()).replaceAll("_", "")); | ||
| } | ||
|
|
||
| public int toNumber() { | ||
| return version; | ||
| } | ||
|
|
||
| public String toString() { | ||
| return name().substring("SPARK_".length()).replaceAll("_", "."); | ||
| } | ||
|
|
||
| public static SparkVersion fromVersionString(String versionString) { | ||
| for (SparkVersion v : values()) { | ||
| if (v.toString().equals(versionString)) { | ||
| return v; | ||
| } | ||
| } | ||
| throw new IllegalArgumentException(); | ||
| } | ||
|
|
||
| public boolean isPysparkSupported() { | ||
| return this.newerThanEquals(SPARK_1_2_0); | ||
| } | ||
|
|
||
| public boolean hasDataFrame() { | ||
| return this.newerThanEquals(SPARK_1_4_0); | ||
| } | ||
|
|
||
| public boolean getProgress1_0() { | ||
| return this.olderThan(SPARK_1_1_0); | ||
| } | ||
|
|
||
| public boolean oldLoadFilesMethodName() { | ||
| return this.olderThan(SPARK_1_3_0); | ||
| } | ||
|
|
||
| public boolean oldSqlContextImplicits() { | ||
| return this.olderThan(SPARK_1_3_0); | ||
| } | ||
|
|
||
| public boolean newerThan(SparkVersion versionToCompare) { | ||
| return version > versionToCompare.version; | ||
| } | ||
|
|
||
| public boolean newerThanEquals(SparkVersion versionToCompare) { | ||
| return version >= versionToCompare.version; | ||
| } | ||
|
|
||
| public boolean olderThan(SparkVersion versionToCompare) { | ||
| return version < versionToCompare.version; | ||
| } | ||
|
|
||
| public boolean olderThanEquals(SparkVersion versionToCompare) { | ||
| return version <= versionToCompare.version; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
spark/src/test/java/org/apache/zeppelin/spark/SparkVersionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.zeppelin.spark; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| public class SparkVersionTest { | ||
|
|
||
| @Test | ||
| public void testSparkVersion() { | ||
| // test equals | ||
| assertTrue(SparkVersion.SPARK_1_2_0 == SparkVersion.fromVersionString("1.2.0")); | ||
|
|
||
| // test newer than | ||
| assertFalse(SparkVersion.SPARK_1_2_0.newerThan(SparkVersion.SPARK_1_2_0)); | ||
| assertFalse(SparkVersion.SPARK_1_2_0.newerThan(SparkVersion.SPARK_1_3_0)); | ||
| assertTrue(SparkVersion.SPARK_1_2_0.newerThan(SparkVersion.SPARK_1_1_0)); | ||
|
|
||
| assertTrue(SparkVersion.SPARK_1_2_0.newerThanEquals(SparkVersion.SPARK_1_2_0)); | ||
| assertFalse(SparkVersion.SPARK_1_2_0.newerThanEquals(SparkVersion.SPARK_1_3_0)); | ||
| assertTrue(SparkVersion.SPARK_1_2_0.newerThanEquals(SparkVersion.SPARK_1_1_0)); | ||
|
|
||
| // test older than | ||
| assertFalse(SparkVersion.SPARK_1_2_0.olderThan(SparkVersion.SPARK_1_2_0)); | ||
| assertFalse(SparkVersion.SPARK_1_2_0.olderThan(SparkVersion.SPARK_1_1_0)); | ||
| assertTrue(SparkVersion.SPARK_1_2_0.olderThan(SparkVersion.SPARK_1_3_0)); | ||
|
|
||
| assertTrue(SparkVersion.SPARK_1_2_0.olderThanEquals(SparkVersion.SPARK_1_2_0)); | ||
| assertFalse(SparkVersion.SPARK_1_2_0.olderThanEquals(SparkVersion.SPARK_1_1_0)); | ||
| assertTrue(SparkVersion.SPARK_1_2_0.olderThanEquals(SparkVersion.SPARK_1_3_0)); | ||
|
|
||
| // conversion | ||
| assertEquals(120, SparkVersion.SPARK_1_2_0.toNumber()); | ||
| assertEquals("1.2.0", SparkVersion.SPARK_1_2_0.toString()); | ||
| } | ||
| } |