Merge main into develop #10
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…atching between different constructions. Introduce optimise-able data-structures in the collection factory for ValuePair used in the PathIteration without exposing the type by wrapping making it extend BindingSet.
…s are not used as they are supposed to Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
As well as supplier methods later better done with the collection factory API.
…use a collection This allows to always be sure that we can fall back to disk if required. Also allows optimized datastructures to be injected.
…g from the remote default graph, or a dataset clearer
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
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/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/order/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
…ry load of LinkedHashModel
…tion in FedX This change adds preparational infrastructure for having different implementations of schedulers. Configuration is here prepared by means of defining a "SchedulerFactory" interface with a default implementation aside (which essentially mimics the current behavior). Note that for ease of development some aspects of ControlledWorkerScheduler are made accessible to sub-classes. The idea is that in the end version there is an abstract scheduler class providing shared functionality and different implementation (e.g. the current FIFO one and a fair implementation)
…anges - for minor version compatibility the type of the "_taskQueue" field in the scheduler cannot be changed (to non-final). Hence, for now we use a dedicated protected initialization method. In the future (next major release) the idea is to leave the queue entirely managed by the executor service. - refinements and clarifications to the javadoc
Previously we introduced support for left bind joins in FedX. The case of empty left bind joins (i.e. where the clause inside the OPTIONAL does not provide any statements) was not handled and resulted in an exception This change now adds support for empty optional joins and passes the results from the left-handside through.
…KEY and MAX_DOCUMENTS_KEY to DEFAULT_NUM_DOCS_KEY
…t the distinct values when applied to the union of multiple graphs
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatically generated PR to keep develop in sync with main.
USE MERGE COMMIT TO MERGE THIS PR.
See merge_main_to_develop.yml.