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

Add result aggregation for query templates #283

Merged
merged 37 commits into from
Jan 24, 2025
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1150b1a
Add QueryData class
nck-mlcnv Sep 23, 2024
5bdf321
Add test
nck-mlcnv Sep 23, 2024
bdef045
Check for update queries
nck-mlcnv Sep 23, 2024
984cd18
Move responsibility of QueryData to QueryHandler
nck-mlcnv Sep 24, 2024
d63e4fb
Remove unused methods
nck-mlcnv Sep 24, 2024
a382d3e
Add tests
nck-mlcnv Sep 24, 2024
21cc304
Fix authentication
nck-mlcnv Sep 24, 2024
870d9d9
Cleanup
nck-mlcnv Sep 24, 2024
3aa46ed
Fix StringListQueryList
nck-mlcnv Sep 26, 2024
df06fda
Modify QueryHandler and QueryData
nck-mlcnv Sep 26, 2024
5c50c69
Add executable query count and representative query count to QueryHan…
nck-mlcnv Sep 26, 2024
5458233
Update the saving template instances
nck-mlcnv Sep 26, 2024
bfa61c4
Fix individual template instances results
nck-mlcnv Sep 26, 2024
9ee14ed
Add some comments
nck-mlcnv Sep 26, 2024
d0c99c0
Update schema
nck-mlcnv Sep 26, 2024
2c78c06
Change default behavior of query templates
nck-mlcnv Sep 26, 2024
f868736
Update tests
nck-mlcnv Sep 27, 2024
bbcae53
Fix configuration
nck-mlcnv Sep 27, 2024
779bd34
Update documentation
nck-mlcnv Sep 27, 2024
b3d980f
Add some comments (to trigger GitHub actions)
nck-mlcnv Sep 27, 2024
1c9ec73
Fix minor bug that caused an infinite loop
nck-mlcnv Sep 27, 2024
55645f9
Merge branch 'develop' into feature/query-templates-aggregation
nck-mlcnv Oct 26, 2024
0beef61
Change sparql endpoint for testing
nck-mlcnv Nov 6, 2024
eab42df
Add javadocs
nck-mlcnv Nov 6, 2024
f595d22
Refactor attribute name
nck-mlcnv Nov 6, 2024
c93768d
Refactor method name
nck-mlcnv Nov 6, 2024
0884195
Add more javadocs
nck-mlcnv Nov 6, 2024
8489f6e
Update src/main/java/org/aksw/iguana/cc/query/QueryData.java
nck-mlcnv Nov 6, 2024
156d3ab
Revert "Update src/main/java/org/aksw/iguana/cc/query/QueryData.java"
nck-mlcnv Nov 6, 2024
0480bae
Delegate handling of query templates to an extra class
nck-mlcnv Nov 8, 2024
45a4c7c
Trying to clarify comments
nck-mlcnv Nov 9, 2024
959d88a
Add more comments
nck-mlcnv Nov 9, 2024
bae3448
Change behavior of noOfQueries property in results
nck-mlcnv Nov 9, 2024
e967ff2
Remove unused import
nck-mlcnv Nov 9, 2024
7a09506
Fix broken tests
nck-mlcnv Nov 13, 2024
d70c344
Rename TemplateHandler to QueryTemplateHandler
nck-mlcnv Jan 24, 2025
652d9d6
Add javadoc string
nck-mlcnv Jan 24, 2025
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
Prev Previous commit
Next Next commit
Add javadocs
nck-mlcnv committed Nov 6, 2024

Verified

This commit was signed with the committer’s verified signature.
jenniferarnesen Jen Jones Arnesen
commit eab42dfccb2bde143550f68fcca3df29e5227e0b
24 changes: 24 additions & 0 deletions src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java
Original file line number Diff line number Diff line change
@@ -154,7 +154,31 @@ public Template(URI endpoint, Long limit, Boolean save, Boolean individualResult
}
}

/**
* Wrapper for the next query that will be executed.
* The wrapper contains the query as a string.
* The result id is only set if the query is a template instance.
* They are used to aggregate the results of multiple queries by using the same id.
*
* @param index the index of the query
* @param query the query string
* @param update whether the query is an update query
* @param resultId the query id that should be used inside the result
*/
public record QueryStringWrapper(int index, String query, boolean update, Integer resultId) {}

/**
* Wrapper for the next query that will be executed.
* The wrapper contains the query as an input stream supplier, that generates an input stream with the query.
* The result id is only set if the query is a template instance.
* They are used to aggregate the results of multiple queries by using the same id.
*
* @param index the index of the query
* @param cached whether the query is cached in memory
* @param queryInputStreamSupplier the supplier that generates the input stream with the query
* @param update whether the query is an update query
* @param resultId the query id that should be used inside the result
*/
public record QueryStreamWrapper(int index, boolean cached, Supplier<InputStream> queryInputStreamSupplier, boolean update, Integer resultId) {}