Update examples

apache · Dec 19, 2023 · c9b3d49 · c9b3d49
1 parent eb3c499
commit c9b3d49
Show file tree

Hide file tree

Showing 52 changed files with 884 additions and 828 deletions.
diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml
@@ -15,9 +15,23 @@ jobs:
  build:
 
  runs-on: ubuntu-22.04
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - spark: 3.4.2
+ spark-compat: 3.4
+ sedona: 1.5.0
+ - spark: 3.5.0
+ spark-compat: 3.4
+ sedona: 1.5.0
+ - spark: 3.3.4
+ spark-compat: 3.0
+ sedona: 1.5.0
+
 
  steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v2
  - uses: actions/setup-java@v1
  with:
  java-version: '8'
@@ -30,19 +44,21 @@ jobs:
  - run: sudo apt-get update
  - run: sudo apt-get install sbt
  - name: Cache SBT
- uses: actions/cache@v3
+ uses: actions/cache@v2
  with:
- path: |
+ path: | 
  ~/.ivy2/cache
  ~/.sbt
  key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
  - name: Cache Maven packages
- uses: actions/cache@v3
+ uses: actions/cache@v2
  with:
  path: ~/.m2
  key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
  restore-keys: ${{ runner.os }}-m2
- - run: (cd examples/spark-rdd-colocation-mining;sbt clean assembly;java -jar target/scala-2.12/*.jar)
- - run: (cd examples/spark-sql;sbt clean assembly;java -jar target/scala-2.12/*.jar)
- - run: (cd examples/spark-viz;sbt clean assembly;java -jar target/scala-2.12/*.jar)
- - run: (cd examples/flink-sql;mvn clean install;java -jar target/sedona-flink-example-1.0.0.jar)
+ - env:
+ SPARK_VERSION: ${{ matrix.spark }}
+ SPARK_COMPAT_VERSION: ${{ matrix.spark-compat }}
+ SEDONA_VERSION: ${{ matrix.sedona }}
+ - run: (cd examples/spark-sql;mvn clean install -Dspark.version=${SPARK_VERSION} -Dspark.compat.version=${SPARK_COMPAT_VERSION} -Dsedona.version=${SEDONA_VERSION};java -jar target/sedona-spark-example-1.0.0.jar)
+ - run: (cd examples/flink-sql;mvn clean install -D;java -jar target/sedona-flink-example-1.0.0.jar)
diff --git a/examples/README.md b/examples/README.md
@@ -1,27 +1,27 @@
 # Sedona Template Project
 
-This repository contains template projects for RDD, SQL and Viz. The template projects have been configured properly.
+This repository contains template projects for Sedona on Spark and Flink. The template projects have been configured properly.
 
 Note that, although the template projects are written in Scala, the same APIs can be used in Java as well.
 
 ## Folder structure
 The folder structure of this repository is as follows.
 
-* rdd-colocation-mining: a scala template shows how to use Sedona RDD API in Spatial Data Mining
-* sql: a scala template shows how to use Sedona DataFrame and SQL API
-* viz: a scala template shows how to use Sedona Viz RDD and SQL API
+* spark-sql: a Scala template shows how to use Sedona RDD, DataFrame and SQL API
+* flink-sql: a Java template show how to use Sedona SQL via Flink Table APIs
+
 
 ## Compile and package
 
 ### Prerequisites
 Please make sure you have the following software installed on your local machine:
 
-* For Scala: Scala 2.12, SBT
+* For Scala: Scala 2.12
 * For Java: JDK 1.8, Apache Maven 3
 
 ### Compile
 
-Run a terminal command `sbt assembly` within the folder of each template
+Run a terminal command `mvn clean package` within the folder of each template
 
 
 ### Submit your fat jar to Spark

diff --git a/examples/spark-rdd-colocation-mining/.gitignore b/examples/spark-rdd-colocation-mining/.gitignore
diff --git a/examples/spark-rdd-colocation-mining/README.md b/examples/spark-rdd-colocation-mining/README.md
diff --git a/examples/spark-rdd-colocation-mining/build.sbt b/examples/spark-rdd-colocation-mining/build.sbt
diff --git a/examples/spark-rdd-colocation-mining/colocationMap.png b/examples/spark-rdd-colocation-mining/colocationMap.png
diff --git a/examples/spark-rdd-colocation-mining/project/.gitignore b/examples/spark-rdd-colocation-mining/project/.gitignore
diff --git a/examples/spark-rdd-colocation-mining/project/build.properties b/examples/spark-rdd-colocation-mining/project/build.properties
diff --git a/examples/spark-rdd-colocation-mining/project/plugins.sbt b/examples/spark-rdd-colocation-mining/project/plugins.sbt
diff --git a/examples/spark-rdd-colocation-mining/src/test/resources/arealandmark.png b/examples/spark-rdd-colocation-mining/src/test/resources/arealandmark.png
diff --git a/examples/spark-rdd-colocation-mining/src/test/resources/colocation.png b/examples/spark-rdd-colocation-mining/src/test/resources/colocation.png
diff --git a/examples/spark-rdd-colocation-mining/src/test/resources/colocationMap.png b/examples/spark-rdd-colocation-mining/src/test/resources/colocationMap.png
diff --git a/examples/spark-rdd-colocation-mining/src/test/resources/colocationResult.png b/examples/spark-rdd-colocation-mining/src/test/resources/colocationResult.png
diff --git a/...k-rdd-colocation-mining/src/test/resources/nyc-area-landmark-shapefile/nyu_2451_34514.cst b/...k-rdd-colocation-mining/src/test/resources/nyc-area-landmark-shapefile/nyu_2451_34514.cst
diff --git a/examples/spark-rdd-colocation-mining/src/test/resources/nyccolocation.png b/examples/spark-rdd-colocation-mining/src/test/resources/nyccolocation.png
diff --git a/examples/spark-sql/.gitignore b/examples/spark-sql/.gitignore
@@ -1,3 +1,2 @@
-/target/
 /.idea/
-/spark-warehouse/
+/target/
diff --git a/examples/spark-sql/build.sbt b/examples/spark-sql/build.sbt
diff --git a/examples/spark-sql/colocationMap.png b/examples/spark-sql/colocationMap.png