From b57227702e009b05254f685e8fbd57e0707f403e Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Tue, 14 Jun 2022 14:21:10 +0200 Subject: [PATCH 1/3] Update main screen. --- src/main/resources/assets/defaultscreen.txt | 29 +++++---------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/main/resources/assets/defaultscreen.txt b/src/main/resources/assets/defaultscreen.txt index 68306781ac..e47238739b 100644 --- a/src/main/resources/assets/defaultscreen.txt +++ b/src/main/resources/assets/defaultscreen.txt @@ -9,7 +9,7 @@ If you do not want to install Spark, then you need to use the standalone jar instead from www.rumbledb.org. Usage: -spark-submit +docker run -i rumbledb/rumble The first optional argument specifies the mode: **** run **** @@ -17,11 +17,11 @@ for directly running a query from an input file or (with -q) provided directly o It is the default mode. -spark-submit rumbledb-1.19.0.jar run my-query.jq -spark-submit rumbledb-1.19.0.jar run -q '1+1' +docker run -i rumbledb/rumble run my-query.jq +docker run -i rumbledb/rumble run -q '1+1' You can specify an output path with -o like so: -spark-submit rumbledb-1.19.0.jar run -q '1+1' -o my-output.txt +docker run -i rumbledb/rumble run -q '1+1' -o my-output.txt **** serve **** for running as an HTTP server listening on the specified port (-p) and host (-h). @@ -39,24 +39,7 @@ spark-submit rumbledb-1.19.0.jar repl **** resource use configuration **** -For a local use, you can control the number of cores, as well as allocated -memory, with: -spark-submit --master local[*] rumbledb-1.19.0.jar repl -spark-submit --master local[*] rumbledb-1.19.0.jar repl -spark-submit --master local[2] rumbledb-1.19.0.jar repl -spark-submit --master local[*] --driver-memory 10G rumbledb-1.19.0.jar repl - -You can use RumbleDB remotely with: -spark-submit --master yarn rumbledb-1.19.0.jar repl - -(Although for clusters provided as a service, --master yarn is often implicit -and unnecessary). - -For remote use (e.g., logged in on the Spark cluster with ssh), you can set the -number of executors, cores and memory, you can use: -spark-submit --executor-cores 3 --executor-memory 5G rumbledb-1.19.0.jar repl - -For remote use, you can also use other file system paths such as S3, HDFS, etc: -spark-submit rumbledb-1.19.0.jar run hdfs://server:port/my-query.jq -o hdfs://server:port/my-output.json +The docker edition of RumbleDB cannot change the number of cores or the memory allocation. +If you wish to do so, you could consider using the standalone RumbleDB jar. More documentation on available CLI parameters is available on https://www.rumbledb.org/ From 52a5a1e146b66797bd73349546f64296ddff67f0 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Tue, 14 Jun 2022 14:25:17 +0200 Subject: [PATCH 2/3] Update info for brew. --- src/main/resources/assets/defaultscreen.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/defaultscreen.txt b/src/main/resources/assets/defaultscreen.txt index e47238739b..03069aefe9 100644 --- a/src/main/resources/assets/defaultscreen.txt +++ b/src/main/resources/assets/defaultscreen.txt @@ -9,7 +9,7 @@ If you do not want to install Spark, then you need to use the standalone jar instead from www.rumbledb.org. Usage: -docker run -i rumbledb/rumble +rumbledb The first optional argument specifies the mode: **** run **** @@ -17,16 +17,16 @@ for directly running a query from an input file or (with -q) provided directly o It is the default mode. -docker run -i rumbledb/rumble run my-query.jq -docker run -i rumbledb/rumble run -q '1+1' +rumbledb run my-query.jq +rumbledb run -q '1+1' You can specify an output path with -o like so: -docker run -i rumbledb/rumble run -q '1+1' -o my-output.txt +rumbledb run -q '1+1' -o my-output.txt **** serve **** for running as an HTTP server listening on the specified port (-p) and host (-h). -spark-submit rumbledb-1.19.0.jar serve -p 9090 +rumbledb serve -p 9090 RumbleDB also supports Apache Livy for use in Jupyter notebooks, which may be even more convenient if you are using a cluster. @@ -34,7 +34,7 @@ even more convenient if you are using a cluster. **** repl **** for shell mode. -spark-submit rumbledb-1.19.0.jar repl +rumbledb repl **** resource use configuration **** From 4dc86cd5ba74c18a60d900544cb024c55e5422c5 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Wed, 17 May 2023 14:15:48 +0200 Subject: [PATCH 3/3] Remove java version check because of Java 20 dependency on Brew. --- src/main/java/org/rumbledb/cli/Main.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/org/rumbledb/cli/Main.java b/src/main/java/org/rumbledb/cli/Main.java index 436a14dc69..db73e690b2 100644 --- a/src/main/java/org/rumbledb/cli/Main.java +++ b/src/main/java/org/rumbledb/cli/Main.java @@ -36,16 +36,6 @@ public class Main { public static RumbleJLineShell terminal = null; public static void main(String[] args) throws IOException { - String javaVersion = System.getProperty("java.version"); - if (!javaVersion.startsWith("1.8") && !javaVersion.startsWith("11.")) { - System.err.println("[Error] RumbleDB requires Java 8 or Java 11."); - System.err.println("Your Java version: " + System.getProperty("java.version")); - System.err.println("You can download Java 8 or 11 from https://adoptium.net/"); - System.err.println( - "If you do have Java 8 or 11, but the wrong version appears above, then it means you need to set your JAVA_HOME environment variable properly to point to Java 8 or 11." - ); - System.exit(43); - } RumbleRuntimeConfiguration sparksoniqConf = null; // Parse arguments try {