Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmottestad
hmottestad committed Oct 25, 2023
1 parent 7a6763b commit dd731f6
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ...eclipse/rdf4j/sail/extensiblestore/impl/ExtensibleStoreConnectionOrderedImplForTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import org.eclipse.rdf4j.sail.extensiblestore.ExtensibleStoreConnection;

public class ExtensibleStoreConnectionOrderedImplForTests
class ExtensibleStoreConnectionOrderedImplForTests
extends ExtensibleStoreConnection<ExtensibleStoreOrderedImplForTests> {
protected ExtensibleStoreConnectionOrderedImplForTests(ExtensibleStoreOrderedImplForTests sail) {
super(sail);
Expand Down
2 changes: 2 additions & 0 deletions .../java/org/eclipse/rdf4j/sail/extensiblestore/impl/ExtensibleStoreOrderedImplForTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.extensiblestore.impl;

import org.eclipse.rdf4j.common.annotation.InternalUseOnly;
import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics;
import org.eclipse.rdf4j.sail.NotifyingSailConnection;
import org.eclipse.rdf4j.sail.SailException;
import org.eclipse.rdf4j.sail.extensiblestore.ExtensibleStore;
import org.eclipse.rdf4j.sail.extensiblestore.SimpleMemoryNamespaceStore;

@InternalUseOnly
public class ExtensibleStoreOrderedImplForTests
extends ExtensibleStore<OrderedDataStructure, SimpleMemoryNamespaceStore> {

Expand Down
2 changes: 1 addition & 1 deletion ...parql/src/test/java/org/eclipse/rdf4j/sail/extensiblestore/impl/OrderedDataStructure.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.eclipse.rdf4j.sail.extensiblestore.SortedIteration;
import org.eclipse.rdf4j.sail.extensiblestore.valuefactory.ExtensibleStatement;

public class OrderedDataStructure implements DataStructureInterface {
class OrderedDataStructure implements DataStructureInterface {

private static final EmptyIteration<ExtensibleStatement> EMPTY_ITERATION = new EmptyIteration<>();

Expand Down
1 change: 0 additions & 1 deletion ...aluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/EvaluationStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.query.BindingSet;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.query.algebra.Service;
import org.eclipse.rdf4j.query.algebra.TupleExpr;
import org.eclipse.rdf4j.query.algebra.ValueExpr;
import org.eclipse.rdf4j.query.algebra.evaluation.federation.FederatedService;
Expand Down
3 changes: 0 additions & 3 deletions .../eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/JoinQueryEvaluationStep.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
*******************************************************************************/
package org.eclipse.rdf4j.query.algebra.evaluation.impl.evaluationsteps;

import java.util.Comparator;

import org.eclipse.rdf4j.common.iteration.CloseableIteration;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.query.BindingSet;
import org.eclipse.rdf4j.query.algebra.Join;
import org.eclipse.rdf4j.query.algebra.Service;
Expand Down
1 change: 0 additions & 1 deletion ...eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/UnionQueryEvaluationStep.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

import org.eclipse.rdf4j.common.iteration.CloseableIteration;
import org.eclipse.rdf4j.common.iteration.DualUnionIteration;
import org.eclipse.rdf4j.common.iteration.EmptyIteration;
import org.eclipse.rdf4j.query.BindingSet;
import org.eclipse.rdf4j.query.algebra.evaluation.QueryEvaluationStep;

Expand Down
2 changes: 0 additions & 2 deletions .../src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/iterator/DescribeIteration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.Set;

import org.eclipse.rdf4j.common.iteration.CloseableIteration;
import org.eclipse.rdf4j.common.iteration.EmptyIteration;
import org.eclipse.rdf4j.common.iteration.LookAheadIteration;
import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.Value;
Expand All @@ -28,7 +27,6 @@
import org.eclipse.rdf4j.query.algebra.Var;
import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy;
import org.eclipse.rdf4j.query.algebra.evaluation.QueryEvaluationStep;
import org.eclipse.rdf4j.query.algebra.evaluation.QueryValueEvaluationStep;

/**
* Iteration that implements a simplified version of Symmetric Concise Bounded Description (omitting reified
Expand Down
4 changes: 1 addition & 3 deletions ...main/java/org/eclipse/rdf4j/query/algebra/evaluation/iterator/InnerMergeJoinIterator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ void calculateNext() {
if (compareTo == 0) {
if (rightIterator.isResettable()) {
next = join(currentLeft, rightIterator.next(), true);
return;
} else {
BindingSet leftPeek = leftIterator.peek();
if (leftPeek != null && left.equals(value.apply(leftPeek))) {
Expand All @@ -120,10 +119,9 @@ void calculateNext() {
} else {
next = join(currentLeft, nextRight, false);
}
return;
}
return;
}
break;
} else {
if (compareTo < 0) {
// leftIterator is behind, or in other words, rightIterator is ahead
Expand Down
1 change: 0 additions & 1 deletion .../org/eclipse/rdf4j/query/algebra/evaluation/optimizer/RegexAsStringFunctionOptimizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
package org.eclipse.rdf4j.query.algebra.evaluation.optimizer;

import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import org.eclipse.rdf4j.model.vocabulary.FN;
import org.eclipse.rdf4j.query.BindingSet;
import org.eclipse.rdf4j.query.Dataset;
Expand Down
1 change: 0 additions & 1 deletion ...n/src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/iterator/JoinIteratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.eclipse.rdf4j.query.BindingSet;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.query.algebra.BindingSetAssignment;
import org.eclipse.rdf4j.query.algebra.Join;
import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy;
import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource;
Expand Down
1 change: 0 additions & 1 deletion .../src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/iterator/OrderIteratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Set;

import org.eclipse.rdf4j.common.iteration.AbstractCloseableIteration;
Expand Down
1 change: 0 additions & 1 deletion ...on/src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/util/OrderComparatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.query.algebra.Order;
import org.eclipse.rdf4j.query.algebra.OrderElem;
import org.eclipse.rdf4j.query.algebra.Service;
import org.eclipse.rdf4j.query.algebra.TupleExpr;
import org.eclipse.rdf4j.query.algebra.ValueExpr;
import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy;
Expand Down
2 changes: 0 additions & 2 deletions core/queryalgebra/model/src/main/java/org/eclipse/rdf4j/query/algebra/Join.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
import java.util.LinkedHashSet;
import java.util.Set;

import org.eclipse.rdf4j.query.algebra.helpers.TupleExprs;

/**
* A natural join between two tuple expressions.
*/
Expand Down
1 change: 0 additions & 1 deletion ...gebra/model/src/test/java/org/eclipse/rdf4j/query/algebra/AbstractQueryModelNodeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

import static org.junit.jupiter.api.Assertions.assertEquals;

import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.junit.jupiter.api.Test;

public class AbstractQueryModelNodeTest {
Expand Down

0 comments on commit dd731f6

Please sign in to comment.