Skip to content

Commit 0bf597d

Browse files
jackylkchenliang613
authored andcommitted
[CARBONDATA-1597] Remove spark1 integration
As voted by community, spark version 1 integration can be removed. This PR removes following profiles and module for spark version 1 integration:1)spark-1.5 profile, 2) spark-1.6 profile, 3) example/spark module, 4) integration/spark module This closes apache#1421
1 parent 311a5b7 commit 0bf597d

File tree

91 files changed

+5
-13575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+5
-13575
lines changed

bin/carbon-spark-sql

+1-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ fi
3333
export FWDIR=$SPARK_HOME
3434
export CARBON_SOURCE="$(cd "`dirname "$0"`"/..; pwd)"
3535

36-
ASSEMBLY_DIR="$CARBON_SOURCE/assembly/target/scala-2.10"
37-
if [ -d "$CARBON_SOURCE/assembly/target/scala-2.11" ]; then
38-
ASSEMBLY_DIR="$CARBON_SOURCE/assembly/target/scala-2.11"
39-
fi
36+
ASSEMBLY_DIR="$CARBON_SOURCE/assembly/target/scala-2.11"
4037

4138
GREP_OPTIONS=
4239
num_jars="$(ls -1 "$ASSEMBLY_DIR" | grep "^carbondata.*hadoop.*\.jar$" | wc -l)"

examples/spark/CARBON_EXAMPLESLogResource.properties

-18
This file was deleted.

examples/spark/pom.xml

-85
This file was deleted.

examples/spark/src/main/resources/complexdata.csv

-101
This file was deleted.

examples/spark/src/main/resources/data.csv

-11
This file was deleted.

examples/spark/src/main/resources/dimSample.csv

-21
This file was deleted.

examples/spark/src/main/resources/factSample.csv

-51
This file was deleted.

examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala

-67
This file was deleted.

examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala

-65
This file was deleted.

0 commit comments

Comments
 (0)