Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving Aggregation to Java #3364

Merged
merged 32 commits into from
Apr 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
944b55c
First pass at Java
jdunkerley Mar 24, 2022
0bfdf3c
Functioning initial Java version
jdunkerley Mar 25, 2022
226d67d
Restructure to make faster
jdunkerley Mar 25, 2022
de0660a
Average and Sum working
jdunkerley Mar 28, 2022
fc2f8a3
More Java based aggregate work
jdunkerley Mar 28, 2022
2b05311
Empty table support and problems
jdunkerley Mar 28, 2022
a22cac2
Concatenate and CountDistinct
jdunkerley Mar 29, 2022
037267c
Work on tables
jdunkerley Mar 29, 2022
c4b1b78
License fixes
jdunkerley Mar 29, 2022
46272c8
Merge into aggregate function
jdunkerley Mar 30, 2022
4b2e185
All aggregates working via Java
jdunkerley Mar 30, 2022
4b98411
Fold problems and attach to table
jdunkerley Mar 30, 2022
1c9d83d
Break aggregation into classes for easier reading.
jdunkerley Mar 31, 2022
11ea968
Make it work again...
jdunkerley Mar 31, 2022
21dfce3
Rebase work
jdunkerley Mar 31, 2022
b59e1fd
Restructuring warning set up
jdunkerley Mar 31, 2022
3e32c50
Additional warnings
jdunkerley Mar 31, 2022
6771309
Update std-bits/table/src/main/java/org/enso/table/data/index/MultiVa…
jdunkerley Mar 31, 2022
de6913a
Some PR comments
jdunkerley Mar 31, 2022
98a8b16
Revert
jdunkerley Mar 31, 2022
7ef268b
Revert
jdunkerley Mar 31, 2022
44c3095
Legal review.
jdunkerley Apr 1, 2022
0891538
Use constructors
jdunkerley Apr 1, 2022
13ea6de
Failing test fixes
jdunkerley Apr 1, 2022
6796b9e
Warnings being passed back correctly
jdunkerley Apr 1, 2022
bc89df5
Tests for warnings
jdunkerley Apr 1, 2022
0c8988b
Truncated warning test
jdunkerley Apr 1, 2022
28113ed
PR comments
jdunkerley Apr 1, 2022
10ffa0f
PR comments
jdunkerley Apr 1, 2022
cdde37e
PR comments
jdunkerley Apr 1, 2022
b007545
Doc comments
jdunkerley Apr 1, 2022
f586f2e
Adjusted warnings so single warning for each failure type in each col…
jdunkerley Apr 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@
- [Implemented `Panic.catch` and helper functions for handling errors. Added a
type parameter to `Panic.recover` to recover specific types of errors.][3344]
- [Added warning handling to `Table.aggregate`][3349]
- [Improved performance of `Table.aggregate` and full warnings implementation]
[3364]

[debug-shortcuts]:
https://github.com/enso-org/enso/blob/develop/app/gui/docs/product/shortcuts.md#debug
Expand Down Expand Up @@ -137,6 +139,7 @@
[3346]: https://github.com/enso-org/enso/pull/3346
[3349]: https://github.com/enso-org/enso/pull/3349
[3361]: https://github.com/enso-org/enso/pull/3361
[3364]: https://github.com/enso-org/enso/pull/3364

#### Enso Compiler

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -1582,8 +1582,8 @@ lazy val `std-table` = project
Compile / packageBin / artifactPath :=
`table-polyglot-root` / "std-table.jar",
libraryDependencies ++= Seq(
"com.ibm.icu" % "icu4j" % icuVersion,
"com.univocity" % "univocity-parsers" % "2.9.0",
"org.graalvm.sdk" % "graal-sdk" % graalVersion % "provided",
"org.apache.poi" % "poi-ooxml" % "5.0.0",
"org.apache.xmlbeans" % "xmlbeans" % "5.0.1"
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ The license file can be found at `licenses/BSD-3-Clause`.
Copyright notices related to this dependency can be found in the directory `com.github.virtuald.curvesapi-1.06`.


'icu4j', licensed under the Unicode/ICU License, is distributed with the Table.
The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `com.ibm.icu.icu4j-67.1`.


'univocity-parsers', licensed under the Apache 2, is distributed with the Table.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.univocity.univocity-parsers-2.9.0`.
Expand Down

Large diffs are not rendered by default.

Loading