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.

Sign up for GitHub

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

Jump to bottom

Merge main into develop #4121

Merged
merged 8 commits into from
Aug 19, 2022
Merged

Merge main into develop #4121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a92401a
GH-4112 add test
hmottestad Aug 17, 2022
67efb9f
GH-4112 check parent refs between each optimizer step to make sure th…
hmottestad Aug 17, 2022
e7ff6a7
GH-4112 assert that Var didn't have a previous parent to make sure th…
hmottestad Aug 17, 2022
64992ac
GH-4112 add support for replaceChild(...) to ValueExprTripleRef
hmottestad Aug 17, 2022
96c8981
GH-4112 clone Var where a Var object is shared or reused
hmottestad Aug 17, 2022
9ec3fbd
GH-4112 fix copyright header
hmottestad Aug 18, 2022
15a7760
GH-4091 fix copyright headers (#4118)
hmottestad Aug 18, 2022
d11f0ac
Merge pull request #4117 from eclipse/GH-4112-query-regression
hmottestad Aug 18, 2022
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
4 changes: 3 additions & 1 deletion compliance/elasticsearch/src/test/java/org/elasticsearch/bootstrap/JarHell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.elasticsearch.bootstrap;

import java.net.URL;
Expand Down
4 changes: 3 additions & 1 deletion ...sitory/src/test/java/org/eclipse/rdf4j/repository/http/HTTPRepositoryTransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.repository.http;

import org.eclipse.rdf4j.repository.RepositoryConnection;
Expand Down
14 changes: 10 additions & 4 deletions ...y/src/test/java/org/eclipse/rdf4j/repository/sparql/SPARQLRepositorySparqlUpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/*******************************************************************************
* Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies
* this distribution, and is available at http://www.eclipse.org/org/documents/edl-v10.php.
* Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.repository.sparql;

/**
* @author Jeen Broekstra
Expand Down Expand Up @@ -52,3 +56,5 @@
// System.err.println("temporarily disabled testAutoCommitHandling() for HTTPRepository");
// }
//}

package org.eclipse.rdf4j.repository.sparql;
4 changes: 3 additions & 1 deletion ...eclipse/rdf4j/repository/sparql/federation/RepositoryFederatedServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.repository.sparql.federation;

import java.util.Collection;
Expand Down
2 changes: 2 additions & 0 deletions core/common/io/src/main/java/org/eclipse/rdf4j/common/io/ByteSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.common.io;

Expand Down
2 changes: 2 additions & 0 deletions core/common/io/src/main/java/org/eclipse/rdf4j/common/io/CharSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.common.io;

Expand Down
2 changes: 2 additions & 0 deletions core/common/io/src/main/java/org/eclipse/rdf4j/common/io/Sink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.common.io;

Expand Down
4 changes: 3 additions & 1 deletion core/common/io/src/test/java/org/eclipse/rdf4j/common/io/ByteArrayUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.common.io;

import static org.junit.Assert.assertArrayEquals;
Expand Down
4 changes: 3 additions & 1 deletion ...rator/src/main/java/org/eclipse/rdf4j/common/iteration/CloseableIterationSpliterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.common.iteration;

Expand Down
4 changes: 3 additions & 1 deletion .../common/iterator/src/main/java/org/eclipse/rdf4j/common/iteration/DualUnionIteration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.common.iteration;

Expand Down
4 changes: 3 additions & 1 deletion core/common/iterator/src/main/java/org/eclipse/rdf4j/common/iteration/SilentIteration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.common.iteration;

Expand Down
4 changes: 3 additions & 1 deletion ...n/iterator/src/test/java/org/eclipse/rdf4j/common/iteration/AutoClosingIterationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.common.iteration;

import static org.junit.Assert.assertEquals;
Expand Down
4 changes: 3 additions & 1 deletion ...common/iterator/src/test/java/org/eclipse/rdf4j/common/iteration/SilentIterationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.common.iteration;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down
4 changes: 3 additions & 1 deletion core/common/transaction/src/main/java/org/eclipse/rdf4j/common/transaction/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
/**
* Common classes and interfaces for transaction settings
*/
Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/ModelNamespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/ValueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.model;

import java.math.BigDecimal;
Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/AbstractBNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/AbstractIRI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/AbstractLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/AbstractNamespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/AbstractStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/AbstractTriple.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/AbstractValueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/ComponentTemporalAmount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
14 changes: 8 additions & 6 deletions core/model-api/src/main/java/org/eclipse/rdf4j/model/base/CoreDatatype.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/*******************************************************************************
* Copyright (c) 2022 Eclipse RDF4J contributors.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/

*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.model.base;

import java.util.Optional;
Expand Down
14 changes: 8 additions & 6 deletions core/model-api/src/main/java/org/eclipse/rdf4j/model/base/CoreDatatypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/*******************************************************************************
* Copyright (c) 2022 Eclipse RDF4J contributors.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/

*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.model.base;

import java.util.Collections;
Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/InternedIRI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model.base;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/base/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

/**
* Abstract base classes for RDF Model API interfaces.
Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/main/java/org/eclipse/rdf4j/model/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
/**
* The RDF Model API
* <p>
Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/test/java/org/eclipse/rdf4j/model/BNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/test/java/org/eclipse/rdf4j/model/IRITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/test/java/org/eclipse/rdf4j/model/LiteralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/
package org.eclipse.rdf4j.model;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/test/java/org/eclipse/rdf4j/model/NamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model;

Expand Down
4 changes: 3 additions & 1 deletion core/model-api/src/test/java/org/eclipse/rdf4j/model/StatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* are made available under the terms of the Eclipse Distribution License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
******************************************************************************/
*
* SPDX-License-Identifier: BSD-3-Clause
*******************************************************************************/

package org.eclipse.rdf4j.model;

Expand Down
Loading