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 master into develop #1

Open
wants to merge 62 commits into
base: develop
Choose a base branch
from
Open

Merge master into develop #1

wants to merge 62 commits into from

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented May 5, 2020

Automatically generated PR to keep develop in sync with master.

USE MERGE COMMIT TO MERGE THIS PR.

See merge_master_to_develop.yml.

abrokenjester and others added 30 commits February 22, 2020 14:58
The previous implementation did not correctly handle the optimization of
filter expressions in presence of ExclusiveGroups: if it was attempted,
an UnsupportedOperationException was thrown.

Now the appropriate methods are handled in the ExclusiveGroup and
filters as well as bound bindings are properly handled
Signed-off-by: Jeen <jeen.broekstra@gmail.com>
…X federation

* do not throw UnsupportedOperationException for internal namespace
handling methods
* pass information on the original update string to the engine
* UPDATE queries are always handled inside the federation engine to
adhere to the configured write strategy
* cover this by unit tests
…-rdf4j#1949-fedx-insert-fix

eclipse-rdf4jGH-1949: fix INSERT DATA query handling for writable FedX federation
…tIteration

The SilenetIteration failed to close the inner iteration, thus resulting
in resource leaks (e.g. pending connections).

Without this fix the attached unit tests takes 20s before forcefully
closing the connection. Now it correctly terminates immediately after
test execution.

Note that additionally a TRACE logger has been introduced to give users
the chance to observe errors.

Additional changes:

* add braces
* apply fixes to both copies of SilentIteration
* cleaned up different SilentIteration impls
…-rdf4j#1958-silent-iteration-close

eclipse-rdf4jGH-1958: fix resource closing in federated service SilentIteration
The SparqlProtocolSession uses this.getClass() as a name for the logger.

When having an extension of the class, this leads to misleading log
output. Particularly the logging levels are also harder to control
(w.r.t namespacing and packaging).

The general recommendation for logger names should be to use the class
name, at least it should adhere to the rdf4j package structure.
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
…target_lang

eclipse-rdf4j#1968 support language in shacl target node, eg. "string"@en
- original behavior was correct: eclipse-rdf4jGH-1978 is not a bug
- used opportunity to clean up implementation flow
- added additional unit and compliance tests
- check if txn string has content before sending update
- added regression test
- minor refactor: use StringBuilder instead of StringBuffer
…ager environment

Due to a wrong initialization order in an environment where the
federation is initialized through a RepositoryManager, references to the
evaluation strategy instance are not available in the Endpoint.

This in turn caused an NPE in the filter evaluation.

This change fixes the issue by first initializing the manager, and only
after that the federation members.
…-rdf4j#1990-fix-fedx-initialization-order

eclipse-rdf4jGH-1990: fix FedX initialization order for RepositoryManager environment
- modified and extended unit tests
- disabled incorrect W3C conformance test per discussion on eclipse-rdf4jGH-1978
- refactored testsuite setup a bit to make future extension easier
- added two simple test cases in manifest tests
- push release branch to avoid direct commits on master
- use hub command to create PR for release branch to master
- use hub command to create PR for updating develop branch
Also adjusted text for Jenkins deployment
Signed-off-by: Jeen Broekstra <jeen.broekstra@gmail.com>
Signed-off-by: Jeen Broekstra <jeen.broekstra@gmail.com>
- added PR body message reminding to use merge commit
Signed-off-by:Bart Hanssens <bart.hanssens@bosa.fgov.be>
- took the opportunity to slightly update the testsuite code, it was
  still using SeRQL and ignore tests involving SPARQL/JSON results
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
…e tests

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
…idationExecutionLogging is enabled as well as a fix where the wrong identity hash is used when printing plans

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
…e use of TreeSet

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
…s found. Add test case

Signed-off-by: damyan.ognyanov <damyan.ognyanov@ontotext.com>
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
reeshabhranjan and others added 30 commits March 21, 2020 20:36
…inct elements, added related tests

Signed-off-by: Reeshabh Kumar Ranjan <reeshabhkumarranjan@gmail.com>
Signed-off-by: Reeshabh Kumar Ranjan <reeshabhkumarranjan@gmail.com>
…countConstantVars()` method, as suggested by @jeenbroekstra; added the actual year in the header comment in CardinalityTest.java

Signed-off-by: Reeshabh Kumar Ranjan <reeshabhkumarranjan@gmail.com>
…ardinality_calculation

eclipse-rdf4jGH-1873 fixing incorrect cardinality calculation
Signed-off-by: Mirr99 <mihir17166@iiitd.ac.in>
Signed-off-by: Mirr99 <mihir17166@iiitd.ac.in>
…handling-langString-without-language-tag

eclipse-rdf4jGH-2004: handling of RDF:langString without language tag
new optional imports are:
* org.locationtech
* org.elasticsearch
* ch.qos.logback

Signed-off-by: Ken Wenzel <kenwenzel@gmx.net>
…untime_osgi_optional_imports

eclipse-rdf4jGH-2043 make more imports optional of runtime-osgi
… code was initially written

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
…-remove-commented-code

eclipse-rdf4jGH-2048 remove code that has been commented out
eclipse-rdf4j#2053)

* eclipse-rdf4jGH-2011 explain merge strategy in PR template

- added checklist to help authors
- added links to more detailed explanation of merge strategy on website

* eclipse-rdf4jGH-2011 PR checklist and merge strategy added to template

* eclipse-rdf4jGH-2011 PR description no longer auto-closes issue
  This will not work with squash and merge strategy because PR description does not end up in the commit message (which is what triggers auto-close).
…ranch sync (eclipse-rdf4j#2060)

- also added some markdown to make PR message prettier
…eSourceQuery (eclipse-rdf4j#2067)

This change correctly set externally passed binding to single source
queries, i.e. where the query is relevant at a single owner (and thus
the original query string is passed as-is)

Signed-off-by: Andreas Schwarte <aschwarte10@gmail.com>
Signed-off-by: Jeen Broekstra <jeen.broekstra@gmail.com>
Signed-off-by: Jeen Broekstra <jeen.broekstra@gmail.com>
next development iteration: 3.1.4-SNAPSHOT
…f4j#2080)

* eclipse-rdf4jGH-2078 create specific tests for two bugs and fix one bug

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>

* eclipse-rdf4jGH-2078 fix handling of inverted negated property set

- added test cases to ComplexSPARQLQueryTest

* eclipse-rdf4jGH-2078 corner case where inverted path element is part of longer
sequence

* eclipse-rdf4jGH-2078 added more test cases

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>

Co-authored-by: Jeen Broekstra <jeen.broekstra@gmail.com>
…w failing more than before due to not loading tests data and shacl shapes at the same time (eclipse-rdf4j#2094)

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
* eclipse-rdf4jGH-2093 check import sort order in compilation (process-sources) phase

* eclipse-rdf4jGH-2093 mvn impsort:sort ran for entire project

* eclipse-rdf4jGH-2093 added import sorting to code conventions instructions

* eclipse-rdf4jGH-2093 remove wildcard import

* eclipse-rdf4jGH-2093 fix header and import ordering in SPARQLTextBooleanTest

* eclipse-rdf4jGH-2093 check import order before complete build 

Allows quick failure

* eclipse-rdf4jGH-2093 make CI fail fast on formatting

- CI runs formatting checks early, explicitly
- added 'formatting-check' profile (default active for local builds) to
  allow disabling on CI build/test run (since it's already been checked
  before).
- editorial cleanup using quick profile consistently for skipping all
  tests

* eclipse-rdf4jGH-2093 fix formatting by default, instead of just checking

* eclipse-rdf4jGH-2093 clarified use of fix vs check in docs
Signed-off-by: Jeen Broekstra <jeen.broekstra@gmail.com>
Signed-off-by: Jeen Broekstra <jeen.broekstra@gmail.com>
next development iteration: 3.1.5-SNAPSHOT
…eclipse-rdf4j#2141)

* eclipse-rdf4jGH-2140 use HashJoinIteration instead of doing loop join

- more efficient
- less clutter as the decision on join strategy is now in the
  EvaluationStrategy, instead of in the joiniterator itself

* eclipse-rdf4jGH-2140 use isGraphPatternGroup consistently to determine variable scoping

- fixed issue in cloning that dropped attribute
- fixed issue in querymodelnormalizer that dropped attribute
- handled corner cases (filters, left-joins)

* eclipse-rdf4jGH-2140 explicitly set isGraphPatternGroup to false for path alternatives

- not strictly necessary as it's the default, but perhaps clearer

* eclipse-rdf4jGH-2140 disable failing test in deprecated federation sail
…clipse-rdf4j#2172)

* eclipse-rdf4jGH-2171 AST nodes now determine if node is scope change

- TupleExprBuilder uses this to build algebra tree with correct settings
- GraphPatternGroupable renamed to VariableScopeChange
- easier to distinguish corner cases at correct abstraction level
- added regression test for handling of values clause and named graphs

* bump CI

* eclipse-rdf4jGH-2171 use new interface / method for tracking scope changes in algebra
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.

8 participants