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

Refactor: Optimize the generated SPARQL queries #124

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
13ad0fc
auto lint changes
syphax-bouazzouni Jul 14, 2022
fac2795
remove duplicated method
syphax-bouazzouni Jul 14, 2022
8e52ba8
add the new function expand_equivalent_predicates_filter
syphax-bouazzouni Jul 14, 2022
f18548a
update get_includes to select :id, :attributeProperty, :attributeObject
syphax-bouazzouni Jul 14, 2022
320a7ed
use the new get_includes
syphax-bouazzouni Jul 14, 2022
1e3c164
update the query builder to add the ?attributeProperty filters
syphax-bouazzouni Jul 14, 2022
8a94793
update solutions_mapper to use the new pattern (?s,?p,?v,?inverse_v))
syphax-bouazzouni Jul 14, 2022
2022222
update expand_equivalent_predicates
syphax-bouazzouni Jul 19, 2022
7745e1f
update get_predicate_map to predicate_map
syphax-bouazzouni Jul 19, 2022
d085508
update get_includes
syphax-bouazzouni Jul 19, 2022
95a3fea
update get_binding_as
syphax-bouazzouni Jul 19, 2022
72c6717
update get_models_by_id_hash
syphax-bouazzouni Jul 19, 2022
076420c
remove unused functions in the loader (an omission)
syphax-bouazzouni Jul 19, 2022
2f8196e
update get_embed_includes
syphax-bouazzouni Jul 19, 2022
e312656
add to the module loader `class << self to specify private functions
syphax-bouazzouni Jul 19, 2022
b222270
add properties_to_include to save the properties to include in the query
syphax-bouazzouni Jul 19, 2022
149a2e8
use the new get_includes, predicate_map and get_bnode_extraction
syphax-bouazzouni Jul 19, 2022
5ea4f09
use the new expand_equivalent_predicates
syphax-bouazzouni Jul 19, 2022
8028017
add in the query builder initialize instance variables
syphax-bouazzouni Jul 19, 2022
cf1d9ea
update the build_select_query
syphax-bouazzouni Jul 19, 2022
a9161b4
add to the solution mapper initialize some instance variable
syphax-bouazzouni Jul 19, 2022
f4dc339
update map_each_solutions
syphax-bouazzouni Jul 19, 2022
6cf7320
update order by query to use unions so that it can be optional
syphax-bouazzouni Nov 23, 2022
dce68a7
use optional statements for order by instead of UNION
syphax-bouazzouni Nov 29, 2022
352f3ca
fix embed ready only models
syphax-bouazzouni Dec 17, 2022
3162ee8
fix requests with multiple filters
syphax-bouazzouni Jan 19, 2023
1b26d2b
use ontoportal-lirmm sparql client version to pass tests
syphax-bouazzouni Jan 19, 2023
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ group :profiling do
gem 'thin'
end

gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
gem 'sparql-client', github: 'ontoportal-lirmm/sparql-client', branch: 'master'
48 changes: 26 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/ncbo/sparql-client.git
revision: fb4a89b420f8eb6dda5190a126b6c62e32c4c0c9
remote: https://github.com/ontoportal-lirmm/sparql-client.git
revision: aed51baf4106fd0f3d0e3f9238f0aad9406aa3f0
branch: master
specs:
sparql-client (1.0.1)
Expand Down Expand Up @@ -34,14 +34,15 @@ GEM
addressable (2.3.5)
builder (3.2.4)
coderay (1.1.3)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
connection_pool (2.3.0)
cube-ruby (0.0.3)
daemons (1.4.1)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
eventmachine (1.2.7)
faraday (1.10.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -57,19 +58,19 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
http-accept (1.7.0)
http-cookie (1.0.4)
http-cookie (1.0.5)
domain_name (~> 0.5)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json_pure (2.6.1)
json_pure (2.6.3)
macaddr (1.7.2)
systemu (~> 2.6.5)
method_source (1.0.0)
Expand All @@ -78,25 +79,28 @@ GEM
mime-types-data (3.2022.0105)
minitest (4.7.5)
multi_json (1.15.0)
multipart-post (2.1.1)
mustermann (1.1.1)
multipart-post (2.2.3)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
net-http-persistent (2.9.4)
netrc (0.11.0)
pry (0.14.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
rack (2.2.3)
rack (2.2.6.2)
rack-accept (0.4.5)
rack (>= 0.4)
rack-post-body-to-params (0.1.8)
activesupport (>= 2.3)
rack-protection (2.2.0)
rack-protection (3.0.5)
rack
rake (13.0.6)
rdf (1.0.8)
addressable (>= 2.2)
redis (4.6.0)
redis (5.0.6)
redis-client (>= 0.9.0)
redis-client (0.12.1)
connection_pool
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
Expand All @@ -106,28 +110,28 @@ GEM
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
ruby2_keywords (0.0.5)
simplecov (0.21.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sinatra (2.2.0)
mustermann (~> 1.0)
rack (~> 2.2)
rack-protection (= 2.2.0)
sinatra (3.0.5)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.0.5)
tilt (~> 2.0)
systemu (2.6.5)
thin (1.8.1)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (0.3.60)
tilt (2.0.11)
tzinfo (0.3.61)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unf_ext (0.0.8.2)
uuid (2.3.9)
macaddr (~> 1.0)

Expand Down
Loading