Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 5 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,12 @@
<mainClass>org.rumbledb.cli.Main</mainClass>
</manifest>
</archive>
<descriptorRefs>
<!-- <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</descriptorRefs> -->
<descriptors>
<descriptor>src/assembly/custom-jar-with-dependencies-assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
Expand Down
33 changes: 33 additions & 0 deletions src/assembly/custom-jar-with-dependencies-assembly.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>jar-with-dependencies</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
<includes>
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
<include>pom.xml</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main</directory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
</assembly>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions src/test/java/iq/FrontendTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ public class FrontendTests extends AnnotationsTestsBase {
public static final File grammarTestsDirectory = new File(
System.getProperty("user.dir")
+
"/src/main/resources/test_files/parser"
"/src/test/resources/test_files/parser"
);
public static final File astTestsDirectory = new File(
System.getProperty("user.dir")
+
"/src/main/resources/test_files/ast"
"/src/test/resources/test_files/ast"
);
public static final File semanticTestsDirectory = new File(
System.getProperty("user.dir")
+
"/src/main/resources/test_files/semantics"
"/src/test/resources/test_files/semantics"
);
public static final String[] manualSemanticChecksFiles = new String[] { "TypesCheck.jq" };

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/iq/RuntimeTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class RuntimeTests extends AnnotationsTestsBase {
public static final File runtimeTestsDirectory = new File(
System.getProperty("user.dir")
+
"/src/main/resources/test_files/runtime"
"/src/test/resources/test_files/runtime"
);
public static final String javaVersion =
System.getProperty("java.version");
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/iq/SparkRuntimeTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class SparkRuntimeTests extends RuntimeTests {
public static final File sparkRuntimeTestsDirectory = new File(
System.getProperty("user.dir")
+
"/src/main/resources/test_files/runtime-spark"
"/src/test/resources/test_files/runtime-spark"
);

public SparkRuntimeTests(File testFile) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(:JIQS: ShouldRun; Output="(Russian, Russian, Czech, Serbian, Serbian)" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
return $i."target"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(:JIQS: ShouldRun; Output="({ "target" : "Czech", "guess" : "Czech" }, { "target" : "Russian", "guess" : "Russian" }, { "target" : "Russian", "guess" : "Latvian" }, { "target" : "Serbian", "guess" : "Serbian" }, { "target" : "Serbian", "guess" : "Greek" })" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
order by $i."target", $i."guess" descending
return {"target" : $i."target", "guess" : $i."guess"}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(:JIQS: ShouldRun; Output="({ "target" : "Russian", "count" : 1 }, { "target" : "Russian", "count" : 2 }, { "target" : "Czech", "count" : 3 }, { "target" : "Serbian", "count" : 4 }, { "target" : "Serbian", "count" : 5 })" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
count $c
return { "target" : $i."target", "count" : $c }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(:JIQS: ShouldRun; Output="({ "target" : "Russian", "count" : 1 }, { "target" : "Russian", "count" : 2 }, { "target" : "Czech", "count" : 3 }, { "target" : "Serbian", "count" : 4 }, { "target" : "Serbian", "count" : 5 })" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json", 10)
for $i in json-file("./src/test/resources/test_data/conf-ex.json", 10)
count $c
return { "target" : $i."target", "count" : $c }
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="([ 1, { "guess" : "Czech", "target" : "Czech", "country" : "SE", "choices" : [ "Maori", "Czech", "Korean", "Turkish" ], "sample" : "1787b5c79a00b3513ce76847bc1f5b75", "date" : "2013-08-20" } ], [ 2, { "guess" : "Greek", "target" : "Serbian", "country" : "SE", "choices" : [ "German", "Greek", "Kannada", "Serbian" ], "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "date" : "2013-08-20" }, { "guess" : "Serbian", "target" : "Serbian", "country" : "AU", "choices" : [ "Dari", "Serbian", "Sinhalese", "Vietnamese" ], "sample" : "0d5b697ebb326b5043ce7fa60a7b968d", "date" : "2013-08-20" } ], [ 3, { "guess" : "Latvian", "target" : "Russian", "country" : "AU", "choices" : [ "Lao", "Latvian", "Russian", "Swahili" ], "sample" : "b7df3f9d67cef259fbcaa5abcad9d774", "date" : "2013-08-20" }, { "guess" : "Russian", "target" : "Russian", "country" : "AU", "choices" : [ "Croatian", "Nepali", "Russian", "Slovenian" ], "sample" : "8a59d48e99e8a1df7e366c4648095e27", "date" : "2013-08-20" } ])" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json", 10)
for $i in json-file("./src/test/resources/test_data/conf-ex.json", 10)
let $j := $i.target
group by $j
count $k
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="(2, 1, 1, 1)" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
group by $y := $i.country, $t := $i.target
let $c := count($i)
order by $c descending
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="(2, 1, 1, 1)" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
group by $y := $i.country, $t := $i.target
order by count($i) descending
return count($i)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="2" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
group by $y := $i.country, $t := $i.target
where count($i) eq 2
return count($i)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="(1, 1, 1, 1, 2)" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
group by $y := $i.country, $t := $i.target
order by count($i)
for $n in 1 to count($i)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="(1, 2)" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json")
for $i in json-file("./src/test/resources/test_data/conf-ex.json")
group by $y := $i.country, $t := $i.target
group by $j := count($i)
order by $j
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="({ "Author" : "pregnanthollywood", "TotalScore" : -1 }, { "Author" : "uncannylizard", "TotalScore" : 0 }, { "Author" : "Mace55555", "TotalScore" : 1 }, { "Author" : "PeglegGecko", "TotalScore" : 1 }, { "Author" : "vhisic", "TotalScore" : 1 }, { "Author" : "asdjfweaiv", "TotalScore" : 1 }, { "Author" : "TimDisaster", "TotalScore" : 1 }, { "Author" : "kylionsfan", "TotalScore" : 1 }, { "Author" : "deephaven", "TotalScore" : 1 }, { "Author" : "politevelociraptor", "TotalScore" : 1 }, { "Author" : "billj457", "TotalScore" : 1 }, { "Author" : "MadagascarDifficulty", "TotalScore" : 1 }, { "Author" : "slicked9778", "TotalScore" : 1 }, { "Author" : "Crodface", "TotalScore" : 1 }, { "Author" : "MrRangerLP", "TotalScore" : 1 }, { "Author" : "Clomez", "TotalScore" : 1 }, { "Author" : "CarpeAeonem", "TotalScore" : 1 }, { "Author" : "Movepeck", "TotalScore" : 2 }, { "Author" : "Vamking12", "TotalScore" : 2 }, { "Author" : "gingerguitarx92x", "TotalScore" : 2 }, { "Author" : "Mastersimpson", "TotalScore" : 2 }, { "Author" : "marklar7", "TotalScore" : 2 }, { "Author" : "thebasedyeezus", "TotalScore" : 2 }, { "Author" : "highvoltorb", "TotalScore" : 2 }, { "Author" : "noitnemid", "TotalScore" : 2 }, { "Author" : "jaggazz", "TotalScore" : 2 }, { "Author" : "-purple-is-a-fruit-", "TotalScore" : 2 }, { "Author" : "FreeSoul789", "TotalScore" : 3 }, { "Author" : "RedCoatsForever", "TotalScore" : 3 }, { "Author" : "BigGupp1", "TotalScore" : 6 }, { "Author" : "[deleted]", "TotalScore" : 7 }, { "Author" : "submaRED", "TotalScore" : 7 }, { "Author" : "Meltingteeth", "TotalScore" : 10 }, { "Author" : "YoungModern", "TotalScore" : 14 }, { "Author" : "dewprisms", "TotalScore" : 17 })" :)
for $i in json-file("./src/main/resources/queries/Reddit.json", 10)
for $i in json-file("./src/test/resources/test_data/Reddit.json", 10)
let $author := $i.author, $score := $i.score
group by $author
let $totalScore := sum($score)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="({ "Language" : "Albanian", "Correct guesses" : 2 }, { "Language" : "Amharic", "Correct guesses" : 4 }, { "Language" : "Arabic", "Correct guesses" : 5 }, { "Language" : "Armenian", "Correct guesses" : 4 }, { "Language" : "Assyrian", "Correct guesses" : 8 }, { "Language" : "Bangla", "Correct guesses" : 3 }, { "Language" : "Bosnian", "Correct guesses" : 2 }, { "Language" : "Bulgarian", "Correct guesses" : 3 }, { "Language" : "Burmese", "Correct guesses" : 4 }, { "Language" : "Cantonese", "Correct guesses" : 2 }, { "Language" : "Czech", "Correct guesses" : 4 }, { "Language" : "Danish", "Correct guesses" : 3 }, { "Language" : "Dari", "Correct guesses" : 2 }, { "Language" : "Dinka", "Correct guesses" : 2 }, { "Language" : "Dutch", "Correct guesses" : 3 }, { "Language" : "Estonian", "Correct guesses" : 3 }, { "Language" : "Farsi", "Correct guesses" : 4 }, { "Language" : "Fijian", "Correct guesses" : 1 }, { "Language" : "Finnish", "Correct guesses" : 3 }, { "Language" : "French", "Correct guesses" : 7 }, { "Language" : "German", "Correct guesses" : 7 }, { "Language" : "Greek", "Correct guesses" : 1 }, { "Language" : "Gujarati", "Correct guesses" : 8 }, { "Language" : "Hebrew", "Correct guesses" : 10 }, { "Language" : "Hindi", "Correct guesses" : 5 }, { "Language" : "Hungarian", "Correct guesses" : 3 }, { "Language" : "Indonesian", "Correct guesses" : 5 }, { "Language" : "Italian", "Correct guesses" : 5 }, { "Language" : "Japanese", "Correct guesses" : 7 }, { "Language" : "Kannada", "Correct guesses" : 5 }, { "Language" : "Khmer", "Correct guesses" : 8 }, { "Language" : "Korean", "Correct guesses" : 3 }, { "Language" : "Kurdish", "Correct guesses" : 6 }, { "Language" : "Lao", "Correct guesses" : 7 }, { "Language" : "Latvian", "Correct guesses" : 5 }, { "Language" : "Macedonian", "Correct guesses" : 3 }, { "Language" : "Malay", "Correct guesses" : 3 }, { "Language" : "Malayalam", "Correct guesses" : 5 }, { "Language" : "Maltese", "Correct guesses" : 6 }, { "Language" : "Mandarin", "Correct guesses" : 8 }, { "Language" : "Nepali", "Correct guesses" : 7 }, { "Language" : "Norwegian", "Correct guesses" : 3 }, { "Language" : "Polish", "Correct guesses" : 4 }, { "Language" : "Portuguese", "Correct guesses" : 10 }, { "Language" : "Punjabi", "Correct guesses" : 7 }, { "Language" : "Romanian", "Correct guesses" : 7 }, { "Language" : "Russian", "Correct guesses" : 10 }, { "Language" : "Samoan", "Correct guesses" : 2 }, { "Language" : "Serbian", "Correct guesses" : 6 }, { "Language" : "Sinhalese", "Correct guesses" : 4 }, { "Language" : "Slovak", "Correct guesses" : 3 }, { "Language" : "Slovenian", "Correct guesses" : 3 }, { "Language" : "Somali", "Correct guesses" : 3 }, { "Language" : "Spanish", "Correct guesses" : 11 }, { "Language" : "Swahili", "Correct guesses" : 1 }, { "Language" : "Swedish", "Correct guesses" : 6 }, { "Language" : "Tagalog", "Correct guesses" : 4 }, { "Language" : "Tamil", "Correct guesses" : 5 }, { "Language" : "Thai", "Correct guesses" : 1 }, { "Language" : "Tigrinya", "Correct guesses" : 2 }, { "Language" : "Tongan", "Correct guesses" : 5 }, { "Language" : "Turkish", "Correct guesses" : 4 }, { "Language" : "Ukrainian", "Correct guesses" : 3 }, { "Language" : "Urdu", "Correct guesses" : 4 }, { "Language" : "Vietnamese", "Correct guesses" : 5 })" :)
for $i in json-file("./src/main/resources/queries/confusion_sample.json")
for $i in json-file("./src/test/resources/test_data/confusion_sample.json")
let $guess := $i."guess", $target := $i."target"
where $guess eq $target
group by $target
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(:JIQS: ShouldRun; Output="(Czech, Serbian, Russian)" :)
for $i in json-file("./src/main/resources/queries/conf-ex.json", 10)
for $i in json-file("./src/test/resources/test_data/conf-ex.json", 10)
group by $target := $i.target
return $target

Expand Down
Loading