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

Multi-file import #1537

Merged
merged 31 commits into from
Oct 16, 2024
Merged

Multi-file import #1537

merged 31 commits into from
Oct 16, 2024

Conversation

joka921
Copy link
Member

@joka921 joka921 commented Oct 2, 2024

So far, QLever read its input from a single file or from standard input. This made it hard to associate graph information per file. It also caused problems when parallel parsing was activated and a Turtle file did not have all its prefix declarations at the beginning. With this change, QLever can read its input from multiple input streams (files or pipes), and the streams are parsed concurrently. It can be specified separately for each stream which default graph to use for that stream and whether to use the parallel parser or not. Specifying a value for "parallel-parsing" in the .settings.json file is now deprecated.

There will a corresponding change in https://github.com/ad-freiburg/qlever-control next that enables the convenient control of this new functionality from a Qleverfile.

Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Copy link

codecov bot commented Oct 2, 2024

Codecov Report

Attention: Patch coverage is 97.19626% with 3 lines in your changes missing coverage. Please review.

Project coverage is 88.47%. Comparing base (77ea2c6) to head (d14cd8e).
Report is 9 commits behind head on master.

Files with missing lines Patch % Lines
src/parser/RdfParser.cpp 96.72% 1 Missing and 1 partial ⚠️
src/index/IndexImpl.cpp 96.29% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1537      +/-   ##
==========================================
+ Coverage   88.22%   88.47%   +0.24%     
==========================================
  Files         360      363       +3     
  Lines       27095    27533     +438     
  Branches     3647     3714      +67     
==========================================
+ Hits        23905    24360     +455     
+ Misses       1953     1941      -12     
+ Partials     1237     1232       -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

joka921 and others added 14 commits October 4, 2024 12:20
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
# Conflicts:
#	src/index/CMakeLists.txt
#	src/index/Permutation.h
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
TODO<joka921>
We need dedicated testing with multiple inputs for the Multifile parser.

Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Copy link
Member

@hannahbast hannahbast left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1-1 with Johannes, committed some minor changes, looks very good now and we tested it end-to-end

@hannahbast hannahbast marked this pull request as ready for review October 16, 2024 16:36
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
@hannahbast hannahbast changed the title Import multiple files to separate graphs Multi-file import Oct 16, 2024
@sparql-conformance
Copy link

Copy link

sonarcloud bot commented Oct 16, 2024

@hannahbast hannahbast merged commit 4acbca3 into ad-freiburg:master Oct 16, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants