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

Merge main into develop #7

Closed
wants to merge 2,492 commits into from
Closed

Merge main into develop #7

wants to merge 2,492 commits into from

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Jun 8, 2024

Automatically generated PR to keep develop in sync with main.

USE MERGE COMMIT TO MERGE THIS PR.

See merge_main_to_develop.yml.

hmottestad and others added 30 commits November 7, 2023 13:41
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
# Conflicts:
#	assembly-descriptors/pom.xml
#	assembly/pom.xml
#	bom/pom.xml
#	compliance/elasticsearch/pom.xml
#	compliance/geosparql/pom.xml
#	compliance/lucene/pom.xml
#	compliance/model/pom.xml
#	compliance/pom.xml
#	compliance/repository/pom.xml
#	compliance/rio/pom.xml
#	compliance/shacl/pom.xml
#	compliance/solr/pom.xml
#	compliance/sparql/pom.xml
#	core/client/pom.xml
#	core/collection-factory/api/pom.xml
#	core/collection-factory/mapdb/pom.xml
#	core/collection-factory/mapdb3/pom.xml
#	core/collection-factory/pom.xml
#	core/common/annotation/pom.xml
#	core/common/exception/pom.xml
#	core/common/io/pom.xml
#	core/common/iterator/pom.xml
#	core/common/pom.xml
#	core/common/text/pom.xml
#	core/common/transaction/pom.xml
#	core/common/xml/pom.xml
#	core/http/client/pom.xml
#	core/http/pom.xml
#	core/http/protocol/pom.xml
#	core/model-api/pom.xml
#	core/model-vocabulary/pom.xml
#	core/model/pom.xml
#	core/pom.xml
#	core/query/pom.xml
#	core/queryalgebra/evaluation/pom.xml
#	core/queryalgebra/geosparql/pom.xml
#	core/queryalgebra/model/pom.xml
#	core/queryalgebra/pom.xml
#	core/queryparser/api/pom.xml
#	core/queryparser/pom.xml
#	core/queryparser/sparql/pom.xml
#	core/queryrender/pom.xml
#	core/queryresultio/api/pom.xml
#	core/queryresultio/binary/pom.xml
#	core/queryresultio/pom.xml
#	core/queryresultio/sparqljson/pom.xml
#	core/queryresultio/sparqlxml/pom.xml
#	core/queryresultio/text/pom.xml
#	core/repository/api/pom.xml
#	core/repository/contextaware/pom.xml
#	core/repository/dataset/pom.xml
#	core/repository/event/pom.xml
#	core/repository/http/pom.xml
#	core/repository/manager/pom.xml
#	core/repository/pom.xml
#	core/repository/sail/pom.xml
#	core/repository/sparql/pom.xml
#	core/rio/api/pom.xml
#	core/rio/binary/pom.xml
#	core/rio/datatypes/pom.xml
#	core/rio/hdt/pom.xml
#	core/rio/jsonld/pom.xml
#	core/rio/languages/pom.xml
#	core/rio/n3/pom.xml
#	core/rio/nquads/pom.xml
#	core/rio/ntriples/pom.xml
#	core/rio/pom.xml
#	core/rio/rdfjson/pom.xml
#	core/rio/rdfxml/pom.xml
#	core/rio/trig/pom.xml
#	core/rio/trix/pom.xml
#	core/rio/turtle/pom.xml
#	core/sail/api/pom.xml
#	core/sail/base/pom.xml
#	core/sail/elasticsearch-store/pom.xml
#	core/sail/elasticsearch/pom.xml
#	core/sail/extensible-store/pom.xml
#	core/sail/inferencer/pom.xml
#	core/sail/lmdb/pom.xml
#	core/sail/lucene-api/pom.xml
#	core/sail/lucene/pom.xml
#	core/sail/memory/pom.xml
#	core/sail/model/pom.xml
#	core/sail/nativerdf/pom.xml
#	core/sail/pom.xml
#	core/sail/shacl/pom.xml
#	core/sail/solr/pom.xml
#	core/sparqlbuilder/pom.xml
#	core/spin/pom.xml
#	core/storage/pom.xml
#	examples/pom.xml
#	pom.xml
#	spring-components/pom.xml
#	spring-components/rdf4j-spring-demo/pom.xml
#	spring-components/rdf4j-spring/pom.xml
#	spring-components/spring-boot-sparql-web/pom.xml
#	testsuites/benchmark/pom.xml
#	testsuites/geosparql/pom.xml
#	testsuites/lucene/pom.xml
#	testsuites/model/pom.xml
#	testsuites/pom.xml
#	testsuites/queryresultio/pom.xml
#	testsuites/repository/pom.xml
#	testsuites/rio/pom.xml
#	testsuites/sail/pom.xml
#	testsuites/shacl/pom.xml
#	testsuites/sparql/pom.xml
#	tools/config/pom.xml
#	tools/console/pom.xml
#	tools/federation/pom.xml
#	tools/pom.xml
#	tools/runtime-osgi/pom.xml
#	tools/runtime/pom.xml
#	tools/server-spring/pom.xml
#	tools/server/pom.xml
#	tools/workbench/pom.xml
…t changed.

If the variable name that is being optimized is in a different scope the
optimization does not hold.
…ope for a filter

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
…ope for a filter

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
… should not fail, but return as if

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
…(UNDEF)

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
…sNext, also avoid LinkedHashSet althoughether

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
…t keep on advancing on hasNext, only skipping non set values

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
Also replaces a static so more tests should be runnable in parallel in
the future.

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
Also delete some deprecated tests classes that are no longer compatible
with the junit5 way of doing things.

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
…oncurrently.

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
…velop branch.

Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
Allow for non DAWG approved tests to run.
Adds a manifest-all.ttl file for geosparql like sparql 1.1. compliance.

Also remove some unused imports.
Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
The current implementation of the algorithm for the hierachical JSON-LD
output changes references of the triples stored in `List`s and keeps
adding these references to the output. This can leed to infinite loops
when traversing the result. Making copies of the contained lists avoids
this.
This flag is not ready for deprecation as it is used by 3rd party plugins. It would be good to set up an alternative mechanism for providing this support before this is deprecated. See eclipse-rdf4j#4779 for details.
hmottestad and others added 29 commits June 12, 2024 15:47
…lauses

FedX supports interpret the Dataset being defined on the query: if it is
of type FedXDataset, the federation is reduced to the members defined by
FedXDataset#getEndpoints().

This is a nice means to evaluate a query on a subset of the federation
and is generally working fine.

When the query contains a FROM clause, however, the externally passed
Dataset is wrapped into a FallbackDataset (which internally keeps the
FedXDataset as primary one.

This change now inspects the FallbackDataset and unwraps it to reduce
the members. Note that for execution still the "FallbackDataset" is
used.
…rby to 1.1.1 since this one has good enough license info for ClearlyDefined
…rby to 1.1.1 since this one has good enough license info for ClearlyDefined (eclipse-rdf4j#5036)
… FedX

This change makes sure to push limits for simple ASK queries with a
single statement patterns into the query.

The optimization is the same as applied for simple SELECT queries with a
LIMIT.

Rational: if the limit is not pushed, the federation engine will first fetch all data for the statement pattern and only then locally check if there is at least one, i.e it will cause performance issues and memory pressure when there are many triples matching the statement pattern (for instance millions of persons).
… impelementations that supports overriding with system property
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
* javadocs for 5.0.0

* fix milestone and release script
@linnaung linnaung closed this Jul 24, 2024
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.