http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java index 27b799f..6b049b9 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java @@ -1,11 +1,3 @@ -package org.apache.rya.rdftriplestore.evaluation; - -import static org.apache.rya.api.RdfCloudTripleStoreConstants.RANGE; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -24,29 +16,34 @@ import java.util.Map; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.rdftriplestore.evaluation; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.RANGE; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RangeURI; import org.apache.rya.api.domain.RangeValue; -import org.openrdf.model.Value; -import org.openrdf.model.impl.BooleanLiteralImpl; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.FunctionCall; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.ValueConstant; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.BooleanLiteral; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.FunctionCall; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.ValueConstant; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; /** * Class FilterTimeIndexVisitor * Date: Apr 11, 2011 * Time: 10:16:15 PM */ -public class FilterRangeVisitor extends QueryModelVisitorBase<Exception> { +public class FilterRangeVisitor extends AbstractQueryModelVisitor<Exception> { private final RdfCloudTripleStoreConfiguration conf; private final Map<Var, RangeValue> rangeValues = new HashMap<Var, RangeValue>(); @@ -74,7 +71,7 @@ public class FilterRangeVisitor extends QueryModelVisitorBase<Exception> { final Value start = startVc.getValue(); final Value end = endVc.getValue(); rangeValues.put(var, new RangeValue(start, end)); - node.setCondition(new ValueConstant(BooleanLiteralImpl.TRUE)); + node.setCondition(new ValueConstant(BooleanLiteral.TRUE)); } } }
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java index 5d4d3c1..dd84e4d 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java @@ -19,18 +19,16 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.LookAheadIteration; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; - import java.util.ArrayList; import java.util.Collection; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.LookAheadIteration; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; + /** */ public class MultipleBindingSetsIterator extends LookAheadIteration<BindingSet, QueryEvaluationException> { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java index a3b70b6..47e5269 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java @@ -19,16 +19,6 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.ConvertingIteration; -import info.aduna.iteration.EmptyIteration; -import info.aduna.iteration.Iteration; -import info.aduna.iteration.IteratorIteration; -import info.aduna.iteration.LimitIteration; -import info.aduna.iteration.OffsetIteration; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -38,6 +28,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.log4j.Logger; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.utils.NullableStatementImpl; @@ -47,35 +38,37 @@ import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; - -import org.apache.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.QueryRoot; -import org.openrdf.query.algebra.Slice; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStrategyImpl; -import org.openrdf.query.algebra.evaluation.iterator.FilterIterator; -import org.openrdf.query.algebra.evaluation.iterator.JoinIterator; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.ConvertingIteration; +import org.eclipse.rdf4j.common.iteration.EmptyIteration; +import org.eclipse.rdf4j.common.iteration.Iteration; +import org.eclipse.rdf4j.common.iteration.IteratorIteration; +import org.eclipse.rdf4j.common.iteration.LimitIteration; +import org.eclipse.rdf4j.common.iteration.OffsetIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.QueryRoot; +import org.eclipse.rdf4j.query.algebra.Slice; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategy; +import org.eclipse.rdf4j.query.algebra.evaluation.iterator.FilterIterator; +import org.eclipse.rdf4j.query.algebra.evaluation.iterator.JoinIterator; import com.google.common.collect.Lists; /** */ -public class ParallelEvaluationStrategyImpl extends EvaluationStrategyImpl { +public class ParallelEvaluationStrategyImpl extends StrictEvaluationStrategy { private static Logger logger = Logger.getLogger(ParallelEvaluationStrategyImpl.class); private int numOfThreads = 10; @@ -86,7 +79,7 @@ public class ParallelEvaluationStrategyImpl extends EvaluationStrategyImpl { public ParallelEvaluationStrategyImpl(StoreTripleSource tripleSource, InferenceEngine inferenceEngine, Dataset dataset, RdfCloudTripleStoreConfiguration conf) { - super(tripleSource, dataset); + super(tripleSource, dataset, null); Integer nthreads = conf.getNumThreads(); this.numOfThreads = (nthreads != null) ? nthreads : this.numOfThreads; Boolean val = conf.isPerformant(); @@ -185,7 +178,7 @@ public class ParallelEvaluationStrategyImpl extends EvaluationStrategyImpl { Set<Statement> sts = null; try { sts = inferenceEngine.findTransitiveProperty((Resource) getVarValue(subjVar), - (URI) getVarValue(predVar), getVarValue(objVar), (Resource) getVarValue(cntxtVar)); + (IRI) getVarValue(predVar), getVarValue(objVar), (Resource) getVarValue(cntxtVar)); } catch (InferenceEngineException e) { throw new QueryEvaluationException(e); } @@ -203,11 +196,11 @@ public class ParallelEvaluationStrategyImpl extends EvaluationStrategyImpl { Value objValue = getVarValue(objVar, binding); Resource contxtValue = (Resource) getVarValue(cntxtVar, binding); if ((subjValue != null && !(subjValue instanceof Resource)) || - (predValue != null && !(predValue instanceof URI))) { + (predValue != null && !(predValue instanceof IRI))) { continue; } stmts.add(new RdfCloudTripleStoreUtils.CustomEntry<Statement, BindingSet>( - new NullableStatementImpl((Resource) subjValue, (URI) predValue, objValue, contxtValue), binding)); + new NullableStatementImpl((Resource) subjValue, (IRI) predValue, objValue, contxtValue), binding)); } if (stmts.size() == 0) { return new EmptyIteration(); @@ -259,14 +252,14 @@ public class ParallelEvaluationStrategyImpl extends EvaluationStrategyImpl { return super.evaluate(expr, bindings); } - public CloseableIteration evaluate(Slice slice, BindingSet bindings) + public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(Slice slice, BindingSet bindings) throws QueryEvaluationException { - CloseableIteration result = evaluate(slice.getArg(), bindings); + CloseableIteration<BindingSet, QueryEvaluationException> result = evaluate(slice.getArg(), bindings); if (slice.hasOffset()) { - result = new OffsetIteration(result, slice.getOffset()); + result = new OffsetIteration<BindingSet, QueryEvaluationException>(result, slice.getOffset()); } if (slice.hasLimit()) { - result = new LimitIteration(result, slice.getLimit()); + result = new LimitIteration<BindingSet, QueryEvaluationException>(result, slice.getLimit()); } return result; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java index 5ee9802..1ffeb4a 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java @@ -19,22 +19,19 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.LookAheadIteration; - import java.util.NoSuchElementException; import java.util.Queue; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.EvaluationStrategy; -import org.openrdf.query.impl.EmptyBindingSet; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.LookAheadIteration; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy; +import org.eclipse.rdf4j.query.impl.EmptyBindingSet; /** */ @@ -85,7 +82,7 @@ public class ParallelJoinIterator extends LookAheadIteration<BindingSet, QueryEv try { for (int i = 0; i < batch; i++) { if (leftIter.hasNext()) { - ParallelIteratorWork work = new ParallelIteratorWork((BindingSet) leftIter.next(), join.getRightArg()); + ParallelIteratorWork work = new ParallelIteratorWork(leftIter.next(), join.getRightArg()); workQueue.add(work); executorService.execute(work); } else http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java index ecf4c7b..2cff052 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java @@ -19,18 +19,16 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; /** * Class ReorderJoinVisitor * Date: Apr 11, 2011 * Time: 10:16:15 PM */ -public class PushJoinDownVisitor extends QueryModelVisitorBase<Exception> { +public class PushJoinDownVisitor extends AbstractQueryModelVisitor<Exception> { @Override public void meet(final Join node) throws Exception { super.meet(node); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java index b5d5c43..ab7c8ad 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java @@ -1,14 +1,3 @@ -package org.apache.rya.rdftriplestore.evaluation; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.rya.rdftriplestore.utils.DefaultStatistics; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,9 +6,9 @@ import org.apache.rya.rdftriplestore.utils.DefaultStatistics; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,20 +16,27 @@ import org.apache.rya.rdftriplestore.utils.DefaultStatistics; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.rdftriplestore.evaluation; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; - -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStatistics; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; +import org.apache.rya.rdftriplestore.utils.DefaultStatistics; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; /** * A query optimizer that re-orders nested Joins. @@ -72,7 +68,7 @@ public class QueryJoinOptimizer implements QueryOptimizer { } } - protected class JoinVisitor extends QueryModelVisitorBase<RuntimeException> { + protected class JoinVisitor extends AbstractQueryModelVisitor<RuntimeException> { Set<String> boundVars = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java index 8fc437a..3553c8e 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java @@ -19,8 +19,6 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -30,14 +28,13 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; - -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStatistics; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; public class QueryJoinSelectOptimizer implements QueryOptimizer { @@ -61,7 +58,7 @@ public class QueryJoinSelectOptimizer implements QueryOptimizer { tupleExpr.visit(new JoinVisitor()); } - protected class JoinVisitor extends QueryModelVisitorBase<RuntimeException> { + protected class JoinVisitor extends AbstractQueryModelVisitor<RuntimeException> { @Override public void meet(Join node) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java index b7698cf..f4abd7e 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java @@ -19,10 +19,7 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - import static com.google.common.base.Preconditions.checkNotNull; -//import static RdfCloudTripleStoreUtils.getTtlValueConverter; import java.util.ArrayList; import java.util.Collection; @@ -35,21 +32,21 @@ import org.apache.rya.api.persist.RdfEvalStatsDAO; import org.apache.rya.api.persist.RdfEvalStatsDAO.CARDINALITY_OF; import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.BinaryTupleOperator; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.Slice; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.UnaryTupleOperator; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStatistics; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.BinaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.Slice; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.UnaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics; /** * Class RdfCloudTripleStoreEvaluationStatistics @@ -113,7 +110,7 @@ public class RdfCloudTripleStoreEvaluationStatistics<C extends RdfCloudTripleSto final Var subjectVar = sp.getSubjectVar(); final Resource subj = (Resource) getConstantValue(subjectVar); final Var predicateVar = sp.getPredicateVar(); - final URI pred = (URI) getConstantValue(predicateVar); + final IRI pred = (IRI) getConstantValue(predicateVar); final Var objectVar = sp.getObjectVar(); final Value obj = getConstantValue(objectVar); final Resource context = (Resource) getConstantValue(sp.getContextVar()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java index 09435e7..27882f5 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java @@ -19,8 +19,6 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - import static com.google.common.base.Preconditions.checkNotNull; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; @@ -28,8 +26,8 @@ import org.apache.rya.api.persist.RdfEvalStatsDAO; import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.StatementPattern; public class RdfCloudTripleStoreSelectivityEvaluationStatistics<C extends RdfCloudTripleStoreConfiguration> extends RdfCloudTripleStoreEvaluationStatistics { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java index 2ae159f..03ef28f 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java @@ -19,19 +19,17 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; /** * Class ReorderJoinVisitor * Date: Apr 11, 2011 * Time: 10:16:15 PM */ -public class ReorderJoinVisitor extends QueryModelVisitorBase<Exception> { +public class ReorderJoinVisitor extends AbstractQueryModelVisitor<Exception> { @Override public void meet(final Join node) throws Exception { super.meet(node); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java index 8f24220..d1f758b 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java @@ -18,12 +18,13 @@ package org.apache.rya.rdftriplestore.evaluation; * specific language governing permissions and limitations * under the License. */ -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; + +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; /** * TODO: This might be a very bad thing. It may force all AND and not allow ORs?. Depends on how they do the bindings. @@ -31,7 +32,7 @@ import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; * Date: Apr 11, 2011 * Time: 10:16:15 PM */ -public class SeparateFilterJoinsVisitor extends QueryModelVisitorBase<Exception> { +public class SeparateFilterJoinsVisitor extends AbstractQueryModelVisitor<Exception> { @Override public void meet(final Filter node) throws Exception { super.meet(node); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java index b1c7eb5..90cdf6e 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java @@ -22,11 +22,11 @@ package org.apache.rya.rdftriplestore.inference; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Union; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Union; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; import static com.google.common.base.Preconditions.checkNotNull; @@ -35,7 +35,7 @@ import static com.google.common.base.Preconditions.checkNotNull; * Date: Mar 14, 2012 * Time: 5:33:01 PM */ -public class AbstractInferVisitor extends QueryModelVisitorBase<Exception> { +public class AbstractInferVisitor extends AbstractQueryModelVisitor<Exception> { static Var EXPANDED = new Var("infer-expanded"); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AllValuesFromVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AllValuesFromVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AllValuesFromVisitor.java index 26ae289..d609ac6 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AllValuesFromVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AllValuesFromVisitor.java @@ -25,12 +25,12 @@ import java.util.UUID; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.utils.NullableStatementImpl; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; /** * Expands the query tree to account for any universal class expressions (property restrictions @@ -80,7 +80,7 @@ public class AllValuesFromVisitor extends AbstractInferVisitor { // Only applies to type queries where the type is defined if (predVar != null && RDF.TYPE.equals(predVar.getValue()) && objVar != null && objVar.getValue() instanceof Resource) { final Resource typeToInfer = (Resource) objVar.getValue(); - Map<Resource, Set<URI>> relevantAvfRestrictions = inferenceEngine.getAllValuesFromByValueType(typeToInfer); + Map<Resource, Set<IRI>> relevantAvfRestrictions = inferenceEngine.getAllValuesFromByValueType(typeToInfer); if (!relevantAvfRestrictions.isEmpty()) { // We can infer the queried type if, for an allValuesFrom restriction type // associated with the queried type, some anonymous neighboring node belongs to the @@ -99,7 +99,7 @@ public class AllValuesFromVisitor extends AbstractInferVisitor { final FixedStatementPattern avfPropertyTypes = new FixedStatementPattern(avfTypeVar, new Var(OWL.ONPROPERTY.stringValue(), OWL.ONPROPERTY), avfPredVar); for (Resource avfRestrictionType : relevantAvfRestrictions.keySet()) { - for (URI avfProperty : relevantAvfRestrictions.get(avfRestrictionType)) { + for (IRI avfProperty : relevantAvfRestrictions.get(avfRestrictionType)) { avfPropertyTypes.statements.add(new NullableStatementImpl(avfRestrictionType, OWL.ONPROPERTY, avfProperty)); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java index 717e48a..22e7313 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java @@ -19,10 +19,8 @@ package org.apache.rya.rdftriplestore.inference; * under the License. */ - - -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; /** * Class DoNotExpandSP http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DomainRangeVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DomainRangeVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DomainRangeVisitor.java index 6445286..b13398e 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DomainRangeVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DomainRangeVisitor.java @@ -24,12 +24,12 @@ import java.util.UUID; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.utils.NullableStatementImpl; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Var; /** * Expands the query tree to account for any relevant domain and range information known to the @@ -72,12 +72,12 @@ public class DomainRangeVisitor extends AbstractInferVisitor { final Var contextVar = node.getContextVar(); // Only applies to statement patterns that query for members of a defined type. if (predVar != null && RDF.TYPE.equals(predVar.getValue()) - && objVar != null && objVar.getValue() instanceof URI) { - final URI inferredType = (URI) objVar.getValue(); + && objVar != null && objVar.getValue() instanceof IRI) { + final IRI inferredType = (IRI) objVar.getValue(); // Preserve the original node so explicit type assertions are still matched: TupleExpr currentNode = node.clone(); // If there are any properties with this type as domain, check for appropriate triples: - final Set<URI> domainProperties = inferenceEngine.getPropertiesWithDomain(inferredType); + final Set<IRI> domainProperties = inferenceEngine.getPropertiesWithDomain(inferredType); if (!domainProperties.isEmpty()) { Var domainPredVar = new Var("p-" + UUID.randomUUID()); Var domainObjVar = new Var("o-" + UUID.randomUUID()); @@ -86,14 +86,14 @@ public class DomainRangeVisitor extends AbstractInferVisitor { StatementPattern domainSP = new DoNotExpandSP(subjVar, domainPredVar, domainObjVar, contextVar); // Enumerate predicates having this type as domain FixedStatementPattern domainFSP = new FixedStatementPattern(domainPredVar, domainVar, objVar); - for (URI property : domainProperties) { + for (IRI property : domainProperties) { domainFSP.statements.add(new NullableStatementImpl(property, RDFS.DOMAIN, inferredType)); } // For each such predicate, any triple <subjVar predicate _:any> implies the type currentNode = new InferUnion(currentNode, new InferJoin(domainFSP, domainSP)); } // If there are any properties with this type as range, check for appropriate triples: - final Set<URI> rangeProperties = inferenceEngine.getPropertiesWithRange(inferredType); + final Set<IRI> rangeProperties = inferenceEngine.getPropertiesWithRange(inferredType); if (!rangeProperties.isEmpty()) { Var rangePredVar = new Var("p-" + UUID.randomUUID()); Var rangeSubjVar = new Var("s-" + UUID.randomUUID()); @@ -102,7 +102,7 @@ public class DomainRangeVisitor extends AbstractInferVisitor { StatementPattern rangeSP = new DoNotExpandSP(rangeSubjVar, rangePredVar, subjVar, contextVar); // Enumerate predicates having this type as range FixedStatementPattern rangeFSP = new FixedStatementPattern(rangePredVar, rangeVar, objVar); - for (URI property : rangeProperties) { + for (IRI property : rangeProperties) { rangeFSP.statements.add(new NullableStatementImpl(property, RDFS.RANGE, inferredType)); } // For each such predicate, any triple <_:any predicate subjVar> implies the type http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasSelfVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasSelfVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasSelfVisitor.java index 3077eb4..43eae4a 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasSelfVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasSelfVisitor.java @@ -19,13 +19,13 @@ package org.apache.rya.rdftriplestore.inference; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.Extension; -import org.openrdf.query.algebra.ExtensionElem; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.Extension; +import org.eclipse.rdf4j.query.algebra.ExtensionElem; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; /** * Expands the query tree to account for any relevant has-self class expressions @@ -61,15 +61,15 @@ public class HasSelfVisitor extends AbstractInferVisitor { @Override protected void meetSP(final StatementPattern node) throws Exception { - final URI pred = (URI) node.getPredicateVar().getValue(); + final IRI pred = (IRI) node.getPredicateVar().getValue(); final Var obj = node.getObjectVar(); //if originalSP like (?s rdf:type :C1): require that C1 is defined, i.e. not a variable // node <- originalSP final StatementPattern clone = node.clone(); if (RDF.TYPE.equals(pred) && obj.isConstant()) { //for property in getHasSelfImplyingType(C1): - if (obj.getValue() instanceof URI) { - for (final URI property : inferenceEngine.getHasSelfImplyingType((URI) obj.getValue())) { + if (obj.getValue() instanceof IRI) { + for (final IRI property : inferenceEngine.getHasSelfImplyingType((IRI) obj.getValue())) { //node <- InferUnion(node, StatementPattern(?s, property, ?s)). final InferUnion union = new InferUnion(clone, new StatementPattern(clone.getSubjectVar(), http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java index 43ca579..0bcbc6b 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java @@ -25,14 +25,14 @@ import java.util.UUID; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.utils.NullableStatementImpl; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Var; /** * Expands the query tree to account for any relevant has-value class @@ -94,17 +94,17 @@ public class HasValueVisitor extends AbstractInferVisitor { // { ?var rdf:type :Restriction } and { ?var :property ?value } // Both require defined predicate if (predVar != null && predVar.getValue() != null) { - final URI predURI = (URI) predVar.getValue(); + final IRI predURI = (IRI) predVar.getValue(); if (RDF.TYPE.equals(predURI) && objVar != null && objVar.getValue() != null && objVar.getValue() instanceof Resource) { // If the predicate is rdf:type and the type is specified, check whether it can be // inferred using any hasValue restriction(s) final Resource objType = (Resource) objVar.getValue(); - final Map<URI, Set<Value>> sufficientValues = inferenceEngine.getHasValueByType(objType); + final Map<IRI, Set<Value>> sufficientValues = inferenceEngine.getHasValueByType(objType); if (sufficientValues.size() > 0) { final Var valueVar = new Var("v-" + UUID.randomUUID()); TupleExpr currentNode = node.clone(); - for (URI property : sufficientValues.keySet()) { + for (IRI property : sufficientValues.keySet()) { final Var propVar = new Var(property.toString(), property); final TupleExpr valueSP = new DoNotExpandSP(subjVar, propVar, valueVar); final FixedStatementPattern relevantValues = new FixedStatementPattern(objVar, propVar, valueVar); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java index de18e14..4e1ea77 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java @@ -19,14 +19,12 @@ package org.apache.rya.rdftriplestore.inference; * under the License. */ - - -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.TupleExpr; - import java.util.HashMap; import java.util.Map; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.TupleExpr; + /** * Class InferJoin * Date: Apr 16, 2011 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java index f783881..10390df 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java @@ -19,14 +19,12 @@ package org.apache.rya.rdftriplestore.inference; * under the License. */ - - -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Union; - import java.util.HashMap; import java.util.Map; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Union; + /** * Class InferUnion * Date: Mar 14, 2012
