Skip to content

Commit

Permalink
Merge branch 'master' into Jar
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghislainfourny
ghislainfourny authored Feb 27, 2024
2 parents 9b3756e + 1efe9c7 commit 630214d
Show file tree
Hide file tree
Showing 19 changed files with 3,322 additions and 30 deletions.
3,212 changes: 3,212 additions & 0 deletions FLWOR.ipynb
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ The documentation also contains an introduction specific to RumbleDB and how you

[The documentation of the current master (for the adventurous and curious) is available here.](http://sparksoniq.readthedocs.io/en/latest/)

RumbleDB is an effort involving many researchers and ETH Zurich students: code and support by Stefan Irimescu, Ghislain Fourny, Gustavo Alonso, Renato Marroquin, Rodrigo Bruno, Falko Noé, Ioana Stefan, Andrea Rinaldi, Stevan Mihajlovic, Mario Arduini, Can Berker Çıkış, Elwin Stephan, David Dao, Zirun Wang, Ingo Müller, Dan-Ovidiu Graur, Thomas Zhou, Olivier Goerens, Alexandru Meterez, Remo Röthlisberger, Dominik Bruggisser, David Loughlin.
12 changes: 6 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,17 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.12</artifactId>
<version>3.3.2</version>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.12</artifactId>
<version>3.3.2</version>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_2.12</artifactId>
<version>3.3.2</version>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand All @@ -220,7 +220,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-avro_2.12</artifactId>
<version>3.3.2</version>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand All @@ -246,12 +246,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.6</version>
<version>1.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/rumbledb/items/Base64BinaryItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.Base64;
import org.rumbledb.api.Item;
import org.rumbledb.exceptions.ExceptionMetadata;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/rumbledb/items/DoubleItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.rumbledb.api.Item;
import org.rumbledb.exceptions.ExceptionMetadata;
import org.rumbledb.exceptions.IteratorFlowException;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/rumbledb/items/FloatItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.rumbledb.api.Item;
import org.rumbledb.exceptions.ExceptionMetadata;
import org.rumbledb.exceptions.IteratorFlowException;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/rumbledb/runtime/functions/strings/NormalizeSpaceFunctionIterator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package org.rumbledb.runtime.functions.strings;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.rumbledb.api.Item;
import org.rumbledb.context.DynamicContext;
import org.rumbledb.context.Name;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/rumbledb/runtime/typing/CastIterator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.rumbledb.api.Item;
import org.rumbledb.context.DynamicContext;
import org.rumbledb.context.RuntimeStaticContext;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/sparksoniq/spark/ml/ApplyEstimatorRuntimeIterator.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sparksoniq.spark.ml;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.spark.ml.Estimator;
import org.apache.spark.ml.Transformer;
import org.apache.spark.ml.linalg.VectorUDT;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/sparksoniq/spark/ml/ApplyTransformerRuntimeIterator.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sparksoniq.spark.ml;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.spark.ml.Transformer;
import org.apache.spark.ml.linalg.VectorUDT;
import org.apache.spark.ml.param.ParamMap;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/iq/base/AnnotationsTestsBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package iq.base;

import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.junit.Assert;
import org.rumbledb.api.Item;
import org.rumbledb.api.Rumble;
Expand Down
6 changes: 4 additions & 2 deletions src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-LDA.jq
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
(:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "topicDistribution" : [ 0.9915007293228202, 0.0084992706771797 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "topicDistribution" : [ 0.9922903440390959, 0.007709655960904113 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "topicDistribution" : [ 0.9929414141611251, 0.007058585838874805 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "topicDistribution" : [ 0.9934942226012154, 0.006505777398784658 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "topicDistribution" : [ 0.9938860832566909, 0.006113916743309047 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "topicDistribution" : [ 0.9943034888595204, 0.005696511140479687 ] })" :)
(:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "topicDistribution" : [ 0.99150074, 0.00849927 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "topicDistribution" : [ 0.9922903, 0.007709656 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "topicDistribution" : [ 0.99294144, 0.007058586 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "topicDistribution" : [ 0.9934942, 0.0065057776 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "topicDistribution" : [ 0.99388605, 0.0061139166 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "topicDistribution" : [ 0.99430346, 0.0056965114 ] })" :)


let $data := annotate(
json-file("../../../../queries/rumbleML/sample-ml-data-flat.json"),
{ "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"], "doubleArrayCol": ["double"], "doubleArrayArrayCol": [["double"]] }
Expand All @@ -20,5 +22,5 @@ return {
"name": $result.name,
"age": $result.age,
"weight": $result.weight,
"topicDistribution": $result.topicDistribution
"topicDistribution": [ for $v in $result.topicDistribution[] return float($v) ]
}
Loading

0 comments on commit 630214d

Please sign in to comment.