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

Correct lexicographic ordering of items from the local vocab #1390

Merged
merged 64 commits into from
Jul 27, 2024

Conversation

joka921
Copy link
Member

@joka921 joka921 commented Jul 10, 2024

So far, items from the local vocab were handled as if they were lexicographcally larger than all items from both the internal and external vocabulary. This is now fixed, here is an example query: https://qlever.cs.uni-freiburg.de/wikidata/Fkr5Aa . For efficiency reasons, when an entry from the local vocab is compared with an entry from the original vocab, its lower and upper bound in the original vocab are remembered, in order to make future comparisons cheaper. Together with #1405, which fixes the ordering between words in the internal and external vocabularies, QLever can now correctly handle lexicographic ordering of string literals or IRIs in all cases. This concerns operations like ORDER BY and FILTER wth string comparisons or prefix searches.

joka921 added 11 commits July 5, 2024 10:51
local Vocab and Vocab.
However the sorting between local vocab entries doesn't yet work.
TODO:
* Binary search expressions (at least partially).

* Fix unit tests
* Clean everything up.
Only small things not yet working.
This is still missing comments,
and we neeed to discuss and understand the
ICU Levels etc.
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, first round. Very tricky and impressive and awesome that this finally works!

Copy link

codecov bot commented Jul 12, 2024

Codecov Report

Attention: Patch coverage is 96.89922% with 4 lines in your changes missing coverage. Please review.

Project coverage is 89.51%. Comparing base (0ae5ce1) to head (7dd4906).

Files Patch % Lines
src/global/ValueIdComparators.h 85.18% 0 Missing and 4 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1390      +/-   ##
==========================================
+ Coverage   89.38%   89.51%   +0.13%     
==========================================
  Files         340      342       +2     
  Lines       29727    29816      +89     
  Branches     3309     3310       +1     
==========================================
+ Hits        26570    26690     +120     
+ Misses       1999     1976      -23     
+ Partials     1158     1150       -8     

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

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.

Painless second round of 1-1 with Johannes, minor changes left

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.

Tiny change left

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.

Awesome, now we can order strings!

@hannahbast hannahbast changed the title Correct ORDER BY and relational expressions for the Local Vocab Correct lexicographical ordering of items from the local vocab Jul 26, 2024
@hannahbast hannahbast changed the title Correct lexicographical ordering of items from the local vocab Correct lexicographic ordering of items from the local vocab Jul 26, 2024
Copy link

sonarcloud bot commented Jul 27, 2024

Quality Gate Passed Quality Gate passed

Issues
4 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@hannahbast hannahbast merged commit ccbb271 into ad-freiburg:master Jul 27, 2024
20 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.

None yet

2 participants