http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalIndexer.java index 0eac949..51160d3 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalIndexer.java @@ -1,8 +1,3 @@ -package org.apache.rya.indexing; - -import org.openrdf.model.Statement; -import org.openrdf.query.QueryEvaluationException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,10 +16,12 @@ import org.openrdf.query.QueryEvaluationException; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing; - -import info.aduna.iteration.CloseableIteration; import org.apache.rya.api.persist.index.RyaSecondaryIndexer; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.QueryEvaluationException; /** * A repository to store, index, and retrieve {@link Statement}s based on time. @@ -90,35 +87,35 @@ public interface TemporalIndexer extends RyaSecondaryIndexer { * and then the inverses, including after. */ - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantEqualsInstant( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantEqualsInstant( TemporalInstant queryInstant, StatementConstraints contraints) - throws QueryEvaluationException;; + throws QueryEvaluationException; - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantBeforeInstant( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantBeforeInstant( TemporalInstant queryInstant, StatementConstraints contraints) - throws QueryEvaluationException;; + throws QueryEvaluationException; - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantAfterInstant( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantAfterInstant( TemporalInstant queryInstant, StatementConstraints contraints) - throws QueryEvaluationException;; + throws QueryEvaluationException; - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantBeforeInterval( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantBeforeInterval( TemporalInterval givenInterval, StatementConstraints contraints) - throws QueryEvaluationException;; + throws QueryEvaluationException; - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantAfterInterval( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantAfterInterval( TemporalInterval givenInterval, StatementConstraints contraints) throws QueryEvaluationException; - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantInsideInterval( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantInsideInterval( TemporalInterval givenInterval, StatementConstraints contraints) throws QueryEvaluationException; - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantHasBeginningInterval( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantHasBeginningInterval( TemporalInterval queryInterval, StatementConstraints contraints) throws QueryEvaluationException; - public abstract CloseableIteration<Statement, QueryEvaluationException> queryInstantHasEndInterval( + public CloseableIteration<Statement, QueryEvaluationException> queryInstantHasEndInterval( TemporalInterval queryInterval, StatementConstraints contraints) throws QueryEvaluationException; @@ -133,7 +130,7 @@ public interface TemporalIndexer extends RyaSecondaryIndexer { * @return * @throws QueryEvaluationException */ - public abstract CloseableIteration<Statement, QueryEvaluationException> queryIntervalEquals( + public CloseableIteration<Statement, QueryEvaluationException> queryIntervalEquals( TemporalInterval query, StatementConstraints contraints) throws QueryEvaluationException; @@ -147,7 +144,7 @@ public interface TemporalIndexer extends RyaSecondaryIndexer { * the {@link StatementConstraints} * @return */ - public abstract CloseableIteration<Statement, QueryEvaluationException> queryIntervalBefore( + public CloseableIteration<Statement, QueryEvaluationException> queryIntervalBefore( TemporalInterval query, StatementConstraints contraints) throws QueryEvaluationException; @@ -160,7 +157,7 @@ public interface TemporalIndexer extends RyaSecondaryIndexer { * the {@link StatementConstraints} * @return */ - public abstract CloseableIteration<Statement, QueryEvaluationException> queryIntervalAfter( + public CloseableIteration<Statement, QueryEvaluationException> queryIntervalAfter( TemporalInterval query, StatementConstraints contraints) throws QueryEvaluationException; }
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalTupleSet.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalTupleSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalTupleSet.java index 3f20191..bb34609 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalTupleSet.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/TemporalTupleSet.java @@ -1,22 +1,3 @@ -package org.apache.rya.indexing; - -import java.util.Map; -import java.util.Set; - -import org.apache.hadoop.conf.Configuration; -import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; -import org.joda.time.DateTime; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.QueryModelVisitor; - -import com.google.common.base.Joiner; -import com.google.common.collect.Maps; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -35,12 +16,35 @@ import com.google.common.collect.Maps; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing; + +import java.util.Map; +import java.util.Set; -import info.aduna.iteration.CloseableIteration; +import org.apache.hadoop.conf.Configuration; +import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.QueryModelVisitor; +import org.joda.time.DateTime; + +import com.google.common.base.Joiner; +import com.google.common.collect.Maps; -//Indexing Node for temporal expressions to be inserted into execution plan -//to delegate temporal portion of query to temporal index +/** + * Indexing Node for temporal expressions to be inserted into execution plan + * to delegate temporal portion of query to temporal index + */ public class TemporalTupleSet extends ExternalTupleSet { + private static final long serialVersionUID = 1L; + + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private final Configuration conf; private final TemporalIndexer temporalIndexer; @@ -111,7 +115,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(final BindingSet bindings) throws QueryEvaluationException { - final URI funcURI = filterInfo.getFunction(); + final IRI funcURI = filterInfo.getFunction(); final SearchFunction searchFunction = new TemporalSearchFunctionFactory(conf, temporalIndexer).getSearchFunction(funcURI); if(filterInfo.getArguments().length > 1) { @@ -125,7 +129,7 @@ public class TemporalTupleSet extends ExternalTupleSet { //returns appropriate search function for a given URI //search functions used by TemporalIndexer to query Temporal Index public static class TemporalSearchFunctionFactory { - private final Map<URI, SearchFunction> SEARCH_FUNCTION_MAP = Maps.newHashMap(); + private final Map<IRI, SearchFunction> SEARCH_FUNCTION_MAP = Maps.newHashMap(); private final TemporalIndexer temporalIndexer; public TemporalSearchFunctionFactory(final Configuration conf, final TemporalIndexer temporalIndexer) { @@ -138,7 +142,7 @@ public class TemporalTupleSet extends ExternalTupleSet { * @param searchFunction * @return */ - public SearchFunction getSearchFunction(final URI searchFunction) { + public SearchFunction getSearchFunction(final IRI searchFunction) { SearchFunction geoFunc = null; try { geoFunc = getSearchFunctionInternal(searchFunction); @@ -149,7 +153,7 @@ public class TemporalTupleSet extends ExternalTupleSet { return geoFunc; } - private SearchFunction getSearchFunctionInternal(final URI searchFunction) throws QueryEvaluationException { + private SearchFunction getSearchFunctionInternal(final IRI searchFunction) throws QueryEvaluationException { final SearchFunction sf = SEARCH_FUNCTION_MAP.get(searchFunction); if (sf != null) { @@ -170,7 +174,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantAfterInstant"; - }; + } }; private final SearchFunction TEMPORAL_InstantBeforeInstant = new SearchFunction() { @Override @@ -183,7 +187,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantBeforeInstant"; - }; + } }; private final SearchFunction TEMPORAL_InstantEqualsInstant = new SearchFunction() { @@ -197,7 +201,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantEqualsInstant"; - }; + } }; private final SearchFunction TEMPORAL_InstantAfterInterval = new SearchFunction() { @@ -211,7 +215,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantAfterInterval"; - }; + } }; private final SearchFunction TEMPORAL_InstantBeforeInterval = new SearchFunction() { @@ -225,7 +229,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantBeforeInterval"; - }; + } }; private final SearchFunction TEMPORAL_InstantInsideInterval = new SearchFunction() { @@ -239,7 +243,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantInsideInterval"; - }; + } }; private final SearchFunction TEMPORAL_InstantHasBeginningInterval = new SearchFunction() { @@ -253,7 +257,7 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantHasBeginningInterval"; - }; + } }; private final SearchFunction TEMPORAL_InstantHasEndInterval = new SearchFunction() { @@ -267,22 +271,22 @@ public class TemporalTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEMPORAL_InstantHasEndInterval"; - }; + } }; { final String TEMPORAL_NS = "tag:rya-rdf.org,2015:temporal#"; - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"after"), TEMPORAL_InstantAfterInstant); - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"before"), TEMPORAL_InstantBeforeInstant); - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"equals"), TEMPORAL_InstantEqualsInstant); + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"after"), TEMPORAL_InstantAfterInstant); + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"before"), TEMPORAL_InstantBeforeInstant); + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"equals"), TEMPORAL_InstantEqualsInstant); - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"beforeInterval"), TEMPORAL_InstantBeforeInterval); - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"afterInterval"), TEMPORAL_InstantAfterInterval); - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"insideInterval"), TEMPORAL_InstantInsideInterval); - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"hasBeginningInterval"), + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"beforeInterval"), TEMPORAL_InstantBeforeInterval); + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"afterInterval"), TEMPORAL_InstantAfterInterval); + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"insideInterval"), TEMPORAL_InstantInsideInterval); + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"hasBeginningInterval"), TEMPORAL_InstantHasBeginningInterval); - SEARCH_FUNCTION_MAP.put(new URIImpl(TEMPORAL_NS+"hasEndInterval"), TEMPORAL_InstantHasEndInterval); + SEARCH_FUNCTION_MAP.put(VF.createIRI(TEMPORAL_NS+"hasEndInterval"), TEMPORAL_InstantHasEndInterval); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java index 8379215..9e6e92b 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java @@ -33,7 +33,7 @@ import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; import org.apache.rya.indexing.external.PrecomputedJoinIndexer; import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataOptimizer; -import org.openrdf.sail.Sail; +import org.eclipse.rdf4j.sail.Sail; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/ConfigUtils.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/ConfigUtils.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/ConfigUtils.java index 561f6c6..d2fe58a 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/ConfigUtils.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/ConfigUtils.java @@ -60,8 +60,8 @@ import org.apache.rya.indexing.mongodb.freetext.MongoFreeTextIndexer; import org.apache.rya.indexing.mongodb.temporal.MongoTemporalIndexer; import org.apache.rya.indexing.pcj.matching.PCJOptimizer; import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataOptimizer; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.google.common.base.Optional; import com.google.common.collect.Lists; @@ -210,11 +210,11 @@ public class ConfigUtils { return conf.getInt(FREE_TEXT_QUERY_TERM_LIMIT, 100); } - public static Set<URI> getFreeTextPredicates(final Configuration conf) { + public static Set<IRI> getFreeTextPredicates(final Configuration conf) { return getPredicates(conf, FREETEXT_PREDICATES_LIST); } - public static Set<URI> getGeoPredicates(final Configuration conf) { + public static Set<IRI> getGeoPredicates(final Configuration conf) { return getPredicates(conf, GEO_PREDICATES_LIST); } @@ -225,15 +225,15 @@ public class ConfigUtils { * @return Set of predicate URI's whose objects should be date time * literals. */ - public static Set<URI> getTemporalPredicates(final Configuration conf) { + public static Set<IRI> getTemporalPredicates(final Configuration conf) { return getPredicates(conf, TEMPORAL_PREDICATES_LIST); } - protected static Set<URI> getPredicates(final Configuration conf, final String confName) { + protected static Set<IRI> getPredicates(final Configuration conf, final String confName) { final String[] validPredicateStrings = conf.getStrings(confName, new String[] {}); - final Set<URI> predicates = new HashSet<>(); + final Set<IRI> predicates = new HashSet<>(); for (final String prediateString : validPredicateStrings) { - predicates.add(new URIImpl(prediateString)); + predicates.add(SimpleValueFactory.getInstance().createIRI(prediateString)); } return predicates; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java index c87b240..1b20514 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java @@ -54,25 +54,22 @@ import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.resolver.RyaTypeResolverException; import org.apache.rya.indexing.DocIdIndexer; import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.Sets; import com.google.common.primitives.Bytes; -import info.aduna.iteration.CloseableIteration; - -import info.aduna.iteration.CloseableIteration; - public class AccumuloDocIdIndexer implements DocIdIndexer { @@ -192,10 +189,8 @@ public class AccumuloDocIdIndexer implements DocIdIndexer { isEmpty = true; return false; - } else if (isEmpty) { - return false; } else { - return true; + return !isEmpty; } } @@ -314,10 +309,8 @@ public class AccumuloDocIdIndexer implements DocIdIndexer { isEmpty = true; return false; - } else if (isEmpty) { - return false; } else { - return true; + return !isEmpty; } } @@ -366,7 +359,7 @@ public class AccumuloDocIdIndexer implements DocIdIndexer { if (tripleComponent.equals("object")) { final byte[] object = Bytes.concat(cqContent, objType); - org.openrdf.model.Value v = null; + org.eclipse.rdf4j.model.Value v = null; try { v = RyaToRdfConversions.convertValue(RyaContext.getInstance().deserialize( object)); @@ -378,7 +371,7 @@ public class AccumuloDocIdIndexer implements DocIdIndexer { } else if (tripleComponent.equals("subject")) { if (!commonVarSet) { final byte[] object = Bytes.concat(row.getBytes(), objType); - org.openrdf.model.Value v = null; + org.eclipse.rdf4j.model.Value v = null; try { v = RyaToRdfConversions.convertValue(RyaContext.getInstance().deserialize( object)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java index ab4bd55..300d8ba 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java @@ -58,7 +58,7 @@ import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -384,7 +384,7 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer { } @Override - public Set<URI> getIndexablePredicates() { + public Set<IRI> getIndexablePredicates() { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizer.java index d06cfd7..59a260e 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizer.java @@ -19,7 +19,6 @@ package org.apache.rya.indexing.accumulo.entity; * under the License. */ - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -31,21 +30,22 @@ import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.joinselect.AccumuloSelectivityEvalDAO; import org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO; 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.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; -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.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -132,7 +132,7 @@ public class EntityOptimizer implements QueryOptimizer, Configurable { tupleExpr.visit(new JoinVisitor()); } - protected class JoinVisitor extends QueryModelVisitorBase<RuntimeException> { + protected class JoinVisitor extends AbstractQueryModelVisitor<RuntimeException> { @Override public void meet(Join node) { @@ -332,7 +332,7 @@ public class EntityOptimizer implements QueryOptimizer, Configurable { // weight starQuery where common Var is constant slightly more -- this factor is subject // to change - if(s.startsWith("-const-")) { + if (VarNameUtils.isConstant(s)) { tempPriority *= 10; } if (tempPriority > priority) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityTupleSet.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityTupleSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityTupleSet.java index c8675cd..3b7c19b 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityTupleSet.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityTupleSet.java @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import com.google.common.base.Joiner; +import com.google.common.collect.Sets; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; @@ -37,21 +39,17 @@ import org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.RdfCloudTripleStoreConnection; import org.apache.rya.rdftriplestore.evaluation.ExternalBatchingIterator; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +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.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.sail.SailException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Sets; -import com.google.common.base.Joiner; - -import info.aduna.iteration.CloseableIteration; - public class EntityTupleSet extends ExternalSet implements ExternalBatchingIterator { private static final Logger LOG = LoggerFactory.getLogger(EntityTupleSet.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java index a37b14ad..fc1b15e 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java @@ -1,7 +1,3 @@ -package org.apache.rya.indexing.accumulo.entity; - -import java.nio.charset.StandardCharsets; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,8 +16,9 @@ import java.nio.charset.StandardCharsets; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing.accumulo.entity; - +import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.List; import java.util.Map; @@ -32,14 +29,15 @@ import org.apache.hadoop.io.Text; import org.apache.rya.accumulo.documentIndex.TextColumn; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; import org.apache.rya.joinselect.AccumuloSelectivityEvalDAO; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -520,7 +518,7 @@ public class StarQuery { for (final String s : bindings) { - if (!s.startsWith("-const-")) { + if (!VarNameUtils.isConstant(s)) { varCount++; } if (varCount > 1) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java index 9078015..0a44d09 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java @@ -75,16 +75,15 @@ import org.apache.rya.indexing.accumulo.freetext.query.QueryParser; import org.apache.rya.indexing.accumulo.freetext.query.QueryParserTreeConstants; import org.apache.rya.indexing.accumulo.freetext.query.SimpleNode; import org.apache.rya.indexing.accumulo.freetext.query.TokenMgrError; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.query.QueryEvaluationException; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.QueryEvaluationException; import com.google.common.base.Charsets; import com.google.common.collect.Lists; -import info.aduna.iteration.CloseableIteration; - /** * The {@link AccumuloFreeTextIndexer} stores and queries "free text" data from statements into tables in Accumulo. Specifically, this class * stores data into two different Accumulo Tables. This is the <b>document table</b> (default name: triplestore_text) and the <b>terms @@ -208,7 +207,7 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements private int docTableNumPartitions; - private Set<URI> validPredicates; + private Set<IRI> validPredicates; private Configuration conf; @@ -393,7 +392,7 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements } @Override - public Set<URI> getIndexablePredicates() { + public Set<IRI> getIndexablePredicates() { return validPredicates; } @@ -530,7 +529,7 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements if (contraints.hasPredicates()) { constrainedQuery.append(" AND ("); final List<String> predicates = new ArrayList<String>(); - for (final URI u : contraints.getPredicates()) { + for (final IRI u : contraints.getPredicates()) { predicates.add(ColumnPrefixes.getPredColFam(u.stringValue()).toString()); } constrainedQuery.append(StringUtils.join(predicates, " OR ")); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java index e8825f4..a232c44 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java @@ -19,16 +19,13 @@ package org.apache.rya.indexing.accumulo.freetext; * under the License. */ - - import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.io.Text; -import org.openrdf.model.Statement; - import org.apache.rya.indexing.StatementSerializer; +import org.eclipse.rdf4j.model.Statement; /** * Row ID: shardId http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java index 0e74f5e..e98cccb 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java @@ -19,26 +19,23 @@ package org.apache.rya.indexing.accumulo.freetext; * under the License. */ - -import info.aduna.iteration.CloseableIteration; - import java.io.IOException; import java.util.Set; +import org.apache.hadoop.conf.Configuration; import org.apache.rya.indexing.FreeTextIndexer; import org.apache.rya.indexing.IndexingExpr; import org.apache.rya.indexing.IteratorFactory; import org.apache.rya.indexing.SearchFunction; import org.apache.rya.indexing.StatementConstraints; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; - -import org.apache.hadoop.conf.Configuration; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.QueryModelVisitor; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.QueryModelVisitor; import com.google.common.base.Joiner; @@ -128,7 +125,7 @@ public class FreeTextTupleSet extends ExternalTupleSet { throws QueryEvaluationException { - URI funcURI = filterInfo.getFunction(); + IRI funcURI = filterInfo.getFunction(); SearchFunction searchFunction = new SearchFunction() { @@ -147,7 +144,7 @@ public class FreeTextTupleSet extends ExternalTupleSet { @Override public String toString() { return "TEXT"; - }; + } }; if (filterInfo.getArguments().length > 1) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java index 3378fc0..3b945fd 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java @@ -19,8 +19,6 @@ package org.apache.rya.indexing.accumulo.freetext; * under the License. */ - - import java.io.IOException; import java.io.StringReader; import java.util.SortedSet; @@ -30,19 +28,17 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.util.Version; /** * A {@link Tokenizer} that delegates to Lucene functions */ public class LuceneTokenizer implements Tokenizer { - private static final Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_36); + private static final Analyzer ANALYZER = new StandardAnalyzer(); @Override public SortedSet<String> tokenize(String string) { SortedSet<String> set = new TreeSet<String>(); - try { - TokenStream stream = analyzer.tokenStream(null, new StringReader(string)); + try (final TokenStream stream = ANALYZER.tokenStream(null, new StringReader(string))) { stream.reset(); while (stream.incrementToken()) { set.add(stream.getAttribute(CharTermAttribute.class).toString()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java index 48434ca..ce660f9 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java @@ -68,14 +68,13 @@ import org.apache.rya.indexing.TemporalInstant; import org.apache.rya.indexing.TemporalInstantRfc3339; import org.apache.rya.indexing.TemporalInterval; import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.QueryEvaluationException; import org.joda.time.DateTime; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.query.QueryEvaluationException; - -import info.aduna.iteration.CloseableIteration; public class AccumuloTemporalIndexer extends AbstractAccumuloIndexer implements TemporalIndexer { @@ -98,7 +97,7 @@ public class AccumuloTemporalIndexer extends AbstractAccumuloIndexer implements private BatchWriter temporalIndexBatchWriter; - private Set<URI> validPredicates; + private Set<IRI> validPredicates; private String temporalIndexTableName; private boolean isInit = false; @@ -873,7 +872,7 @@ public class AccumuloTemporalIndexer extends AbstractAccumuloIndexer implements } @Override - public Set<URI> getIndexablePredicates() { + public Set<IRI> getIndexablePredicates() { return validPredicates; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexOptimizer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexOptimizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexOptimizer.java index cec776b..6d47060 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexOptimizer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexOptimizer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -37,9 +37,9 @@ import org.apache.rya.indexing.external.matching.QueryNodeListRater; import org.apache.rya.indexing.external.matching.QuerySegment; import org.apache.rya.indexing.external.matching.TopOfQueryFilterRelocator; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.TupleExpr; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java index 1052b38..e52b92b 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -36,11 +36,12 @@ import org.apache.rya.indexing.entity.storage.TypeStorage; import org.apache.rya.indexing.entity.storage.TypeStorage.TypeStorageException; import org.apache.rya.indexing.external.matching.ExternalSetProvider; import org.apache.rya.indexing.external.matching.QuerySegment; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -49,6 +50,7 @@ import com.google.common.collect.Multimap; * Provides {@link EntityQueryNodes}s. */ public class EntityIndexSetProvider implements ExternalSetProvider<EntityQueryNode> { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private Multimap<Type, StatementPattern> typeMap; private Map<String, Type> subjectTypeMap; private final TypeStorage typeStorage; @@ -102,7 +104,7 @@ public class EntityIndexSetProvider implements ExternalSetProvider<EntityQueryNo final String subjStr = subj.getName(); final RyaURI predURI = getPredURI(pattern); //check to see if current node is type - if(new URIImpl(predURI.getData()).equals(RDF.TYPE)) { + if(VF.createIRI(predURI.getData()).equals(RDF.TYPE)) { final Var obj = pattern.getObjectVar(); final RyaURI objURI = new RyaURI(obj.getValue().stringValue()); try { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityToSegmentConverter.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityToSegmentConverter.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityToSegmentConverter.java index c76a3ab..eb0e7d6 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityToSegmentConverter.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityToSegmentConverter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -28,9 +28,9 @@ import org.apache.rya.indexing.entity.query.EntityQueryNode; import org.apache.rya.indexing.external.matching.ExternalSetConverter; import org.apache.rya.indexing.external.matching.JoinSegment; import org.apache.rya.indexing.external.matching.QuerySegment; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.ValueExpr; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java index 3804de4..fb64ccf 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -34,7 +34,7 @@ import org.apache.rya.api.domain.RyaURI; import org.apache.rya.indexing.entity.storage.EntityStorage; import org.apache.rya.indexing.smarturi.SmartUriAdapter; import org.apache.rya.indexing.smarturi.SmartUriException; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -89,7 +89,7 @@ public class Entity { private final int version; - private URI smartUri = null; + private IRI smartUri = null; /** * To construct an instance of this class, use {@link Builder}. @@ -101,7 +101,7 @@ public class Entity { * Entity, grouped by Type ID. * @param version The version of this Entity. This value is used by the * {@link EntityStorage} to prevent stale updates. - * @param smartUri the Smart {@link URI} representation of this + * @param smartUri the Smart {@link IRI} representation of this * {@link Entity}. */ private Entity( @@ -109,7 +109,7 @@ public class Entity { final ImmutableList<RyaURI> explicitTypeIds, final ImmutableMap<RyaURI, ImmutableMap<RyaURI, Property>> typeProperties, final int version, - final URI smartUri) { + final IRI smartUri) { this.subject = requireNonNull(subject); this.explicitTypeIds = requireNonNull(explicitTypeIds); properties = requireNonNull(typeProperties); @@ -175,9 +175,9 @@ public class Entity { } /** - * @return the Smart {@link URI} representation of this {@link Entity}. + * @return the Smart {@link IRI} representation of this {@link Entity}. */ - public URI getSmartUri() { + public IRI getSmartUri() { return smartUri; } @@ -292,7 +292,7 @@ public class Entity { private RyaURI subject = null; private final List<RyaURI> explicitTypes = new ArrayList<>(); private final Map<RyaURI, Map<RyaURI, Property>> properties = new HashMap<>(); - private URI smartUri = null; + private IRI smartUri = null; private int version = 0; @@ -392,11 +392,11 @@ public class Entity { } /** - * @param smartUri - the Smart {@link URI} representation of this + * @param smartUri - the Smart {@link IRI} representation of this * {@link Entity}. * @return This {@link Builder} so that method invocations may be chained. */ - public Builder setSmartUri(final URI smartUri) { + public Builder setSmartUri(final IRI smartUri) { this.smartUri = smartUri; return this; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/query/EntityQueryNode.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/query/EntityQueryNode.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/query/EntityQueryNode.java index 793252e..70efc3a 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/query/EntityQueryNode.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/query/EntityQueryNode.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -42,16 +42,17 @@ import org.apache.rya.indexing.entity.storage.EntityStorage.EntityStorageExcepti import org.apache.rya.indexing.entity.storage.mongo.ConvertingCursor; import org.apache.rya.indexing.entity.update.EntityIndexer; import org.apache.rya.rdftriplestore.evaluation.ExternalBatchingIterator; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; -import org.openrdf.query.algebra.evaluation.iterator.CollectionIteration; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.Binding; +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.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.evaluation.iterator.CollectionIteration; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +62,6 @@ import com.google.common.collect.ImmutableMap.Builder; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; -import info.aduna.iteration.CloseableIteration; /** * Indexing Node for {@link Entity} expressions to be inserted into execution plan @@ -133,7 +133,7 @@ public class EntityQueryNode extends ExternalSet implements ExternalBatchingIter } // Any constant that appears in the Object portion of the SP will be used to make sure they match. - final Builder<RyaURI, Var> builder = ImmutableMap.<RyaURI, Var>builder(); + final Builder<RyaURI, Var> builder = ImmutableMap.builder(); for(final StatementPattern sp : patterns) { final Var object = sp.getObjectVar(); final Var pred = sp.getPredicateVar(); @@ -297,7 +297,7 @@ public class EntityQueryNode extends ExternalSet implements ExternalBatchingIter if(prop.isPresent()) { final RyaType type = prop.get(); final String bindingName = objectVariables.get(key).getName(); - resultSet.addBinding(bindingName, ValueFactoryImpl.getInstance().createLiteral(type.getData())); + resultSet.addBinding(bindingName, SimpleValueFactory.getInstance().createLiteral(type.getData())); } } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverter.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverter.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverter.java index f2647ef..7333de1 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverter.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -29,7 +29,7 @@ import org.apache.rya.indexing.entity.model.Entity; import org.apache.rya.indexing.entity.model.Property; import org.apache.rya.indexing.entity.storage.mongo.key.MongoDbSafeKey; import org.bson.Document; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -130,7 +130,7 @@ public class EntityDocumentConverter implements DocumentConverter<Entity> { builder.setVersion( document.getInteger(VERSION) ); - builder.setSmartUri( new URIImpl(document.getString(SMART_URI)) ); + builder.setSmartUri( SimpleValueFactory.getInstance().createIRI(document.getString(SMART_URI)) ); return builder.build(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/RyaTypeDocumentConverter.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/RyaTypeDocumentConverter.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/RyaTypeDocumentConverter.java index c0afd73..80c489e 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/RyaTypeDocumentConverter.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/storage/mongo/RyaTypeDocumentConverter.java @@ -22,8 +22,8 @@ import static java.util.Objects.requireNonNull; import org.apache.rya.api.domain.RyaType; import org.bson.Document; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -34,7 +34,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; @DefaultAnnotation(NonNull.class) public class RyaTypeDocumentConverter implements DocumentConverter<RyaType> { - private static final ValueFactory VF = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); public static final String DATA_TYPE = "dataType"; public static final String VALUE = "value"; @@ -63,7 +63,7 @@ public class RyaTypeDocumentConverter implements DocumentConverter<RyaType> { } return new RyaType( - VF.createURI( document.getString(DATA_TYPE) ), + VF.createIRI( document.getString(DATA_TYPE) ), document.getString(VALUE)); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/entity/update/BaseEntityIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/update/BaseEntityIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/update/BaseEntityIndexer.java index 7392318..52d6f4d 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/update/BaseEntityIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/update/BaseEntityIndexer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -49,8 +49,8 @@ import org.apache.rya.indexing.entity.storage.mongo.ConvertingCursor; import org.apache.rya.indexing.mongodb.IndexingException; import org.apache.rya.mongodb.MongoSecondaryIndex; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.google.common.base.Objects; @@ -260,7 +260,7 @@ public abstract class BaseEntityIndexer implements EntityIndexer, MongoSecondary } @Override - public Set<URI> getIndexablePredicates() { + public Set<IRI> getIndexablePredicates() { // This isn't used anywhere in Rya, so it will not be implemented. return null; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java index 6de8e3b..c2086d2 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java @@ -43,7 +43,7 @@ import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageExce import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater; import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater.PcjUpdateException; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.google.common.base.Optional; import com.google.common.base.Supplier; @@ -274,7 +274,7 @@ public class PrecomputedJoinIndexer extends AbstractAccumuloIndexer { } @Override - public Set<URI> getIndexablePredicates() { + public Set<IRI> getIndexablePredicates() { return new HashSet<>(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java index 6c82ee0..096dc13 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java @@ -21,9 +21,8 @@ package org.apache.rya.indexing.external.accumulo; import static com.google.common.base.Preconditions.checkNotNull; import org.apache.hadoop.conf.Configuration; -import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; - import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; /** * Configuration values required to initialize a {@link AccumuloPcjStorage}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java index ee8c295..528cb15 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java @@ -20,11 +20,10 @@ package org.apache.rya.indexing.external.fluo; import static com.google.common.base.Preconditions.checkNotNull; +import org.apache.hadoop.conf.Configuration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.apache.hadoop.conf.Configuration; - import com.google.common.base.Optional; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcher.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcher.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcher.java index 0f34030..0cf1ebc 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcher.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcher.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,58 +17,20 @@ * under the License. */ package org.apache.rya.indexing.external.matching; -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ import java.util.ArrayList; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.rya.indexing.external.matching.QueryNodesToTupleExpr.TupleExprAndNodes; -import org.openrdf.query.algebra.BinaryTupleOperator; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.UnaryTupleOperator; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.BinaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.UnaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; /** * This class provides implementations of methods common to all implementations http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcherFactory.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcherFactory.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcherFactory.java index ca7ede4..099b08c 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcherFactory.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetMatcherFactory.java @@ -36,9 +36,9 @@ package org.apache.rya.indexing.external.matching; * under the License. */ -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; /** * This class takes in a given {@link Join}, {@Filter}, or {@link LeftJoin} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetOptimizer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetOptimizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetOptimizer.java index 9ba40fd..9c420e7 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetOptimizer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractExternalSetOptimizer.java @@ -24,18 +24,18 @@ import java.util.Set; import org.apache.rya.indexing.external.matching.QueryNodesToTupleExpr.TupleExprAndNodes; import org.apache.rya.indexing.pcj.matching.PCJOptimizerUtilities; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.BinaryTupleOperator; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.UnaryTupleOperator; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; -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.BinaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.UnaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; import com.google.common.base.Optional; @@ -67,7 +67,7 @@ public abstract class AbstractExternalSetOptimizer<T extends ExternalSet> implem * the nodes returned by {@link ExternalSetMatcher#getUnmatchedArgs()}. * */ - protected class QuerySegmentMatchVisitor extends QueryModelVisitorBase<RuntimeException> { + protected class QuerySegmentMatchVisitor extends AbstractQueryModelVisitor<RuntimeException> { private final QuerySegmentFactory<T> factory = new QuerySegmentFactory<T>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractQuerySegment.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractQuerySegment.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractQuerySegment.java index 49f39f4..18a36fa 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractQuerySegment.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/AbstractQuerySegment.java @@ -28,10 +28,10 @@ import java.util.Map; import java.util.Set; import org.apache.rya.indexing.external.matching.QueryNodesToTupleExpr.TupleExprAndNodes; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/BasicRater.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/BasicRater.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/BasicRater.java index 6166d8a..f61fd3f 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/BasicRater.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/BasicRater.java @@ -40,13 +40,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +import org.apache.rya.api.domain.VarNameUtils; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; + /** * This implementation of the QueryNodeListRater assigns a score to a specified * list between and 0 and 1, where the lower the score, the better the list. It @@ -84,7 +85,7 @@ public class BasicRater implements QueryNodeListRater { TupleExpr tup = (TupleExpr) node; Set<String> bindingNames = tup.getAssuredBindingNames(); for (String name : bindingNames) { - if (!name.startsWith("-const-")) { + if (!VarNameUtils.isConstant(name)) { commonVarBin.put(name, i); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetConverter.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetConverter.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetConverter.java index 900e6a8..d3e0ff2 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetConverter.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetConverter.java @@ -36,7 +36,7 @@ package org.apache.rya.indexing.external.matching; * under the License. */ -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; public interface ExternalSetConverter<T extends ExternalSet> { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetMatcher.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetMatcher.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetMatcher.java index 5456bed..c90d95c 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetMatcher.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetMatcher.java @@ -1,4 +1,3 @@ -package org.apache.rya.indexing.external.matching; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -8,7 +7,7 @@ package org.apache.rya.indexing.external.matching; * "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 + * 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 @@ -17,38 +16,19 @@ package org.apache.rya.indexing.external.matching; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing.external.matching; import java.util.Collection; import java.util.Iterator; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - import java.util.List; import java.util.Set; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetProvider.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetProvider.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetProvider.java index e2d6b34..a9f31c6 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetProvider.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/ExternalSetProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,29 +17,11 @@ * under the License. */ package org.apache.rya.indexing.external.matching; -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ import java.util.Iterator; import java.util.List; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; /** * Interface for extracting {@link ExternalSet}s from specified {@link QuerySegment}s. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/FlattenedOptional.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/FlattenedOptional.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/FlattenedOptional.java index a0cbdb8..d975753 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/FlattenedOptional.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/FlattenedOptional.java @@ -24,17 +24,17 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; - -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.QueryModelNodeBase; -import org.openrdf.query.algebra.QueryModelVisitor; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.AbstractQueryModelNode; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.QueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.Var; import com.google.common.collect.Sets; @@ -51,7 +51,7 @@ import com.google.common.collect.Sets; * bound and unbound variables do not change. * */ -public class FlattenedOptional extends QueryModelNodeBase implements TupleExpr { +public class FlattenedOptional extends AbstractQueryModelNode implements TupleExpr { private Set<TupleExpr> rightArgs; private Set<String> boundVars; @@ -124,11 +124,7 @@ public class FlattenedOptional extends QueryModelNodeBase implements TupleExpr { // unbound vars if (te instanceof FlattenedOptional) { FlattenedOptional lj = (FlattenedOptional) te; - if (Sets.intersection(lj.rightArg.getBindingNames(), unboundVars).size() > 0) { - return false; - } else { - return true; - } + return Sets.intersection(lj.rightArg.getBindingNames(), unboundVars).size() <= 0; } return Sets.intersection(te.getBindingNames(), unboundVars).size() == 0; @@ -246,11 +242,7 @@ public class FlattenedOptional extends QueryModelNodeBase implements TupleExpr { // unbound vars if (te instanceof FlattenedOptional) { FlattenedOptional lj = (FlattenedOptional) te; - if (Sets.intersection(lj.getRightArg().getBindingNames(), unboundVars).size() > 0) { - return false; - } else { - return true; - } + return Sets.intersection(lj.getRightArg().getBindingNames(), unboundVars).size() <= 0; } Set<String> vars = te.getBindingNames(); Set<String> intersection = Sets.intersection(vars, boundVars); @@ -267,9 +259,9 @@ public class FlattenedOptional extends QueryModelNodeBase implements TupleExpr { private void incrementVarCounts(Set<String> vars) { for (String s : vars) { - if (!s.startsWith("-const-") && leftArgVarCounts.containsKey(s)) { + if (!VarNameUtils.isConstant(s) && leftArgVarCounts.containsKey(s)) { leftArgVarCounts.put(s, leftArgVarCounts.get(s) + 1); - } else if (!s.startsWith("-const-")) { + } else if (!VarNameUtils.isConstant(s)) { leftArgVarCounts.put(s, 1); } } @@ -295,7 +287,7 @@ public class FlattenedOptional extends QueryModelNodeBase implements TupleExpr { private Set<String> setWithOutConstants(Set<String> vars) { Set<String> copy = new HashSet<>(); for (String s : vars) { - if (!s.startsWith("-const-")) { + if (!VarNameUtils.isConstant(s)) { copy.add(s); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/JoinSegment.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/JoinSegment.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/JoinSegment.java index 9d97b32..5a700a7 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/JoinSegment.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/matching/JoinSegment.java @@ -1,4 +1,3 @@ -package org.apache.rya.indexing.external.matching; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -8,7 +7,7 @@ package org.apache.rya.indexing.external.matching; * "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 + * 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 @@ -17,41 +16,22 @@ package org.apache.rya.indexing.external.matching; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing.external.matching; import java.util.ArrayList; import java.util.HashMap; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - import java.util.List; import java.util.Map; import java.util.Set; import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; import com.google.common.base.Preconditions; import com.google.common.collect.Sets;
