You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by pu...@apache.org on 2016/06/21 17:00:25 UTC
[10/10] incubator-rya git commit: Fix merge conflicts
Fix merge conflicts
Responded to review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/8ac8b394
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/8ac8b394
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/8ac8b394
Branch: refs/heads/develop
Commit: 8ac8b394aefd51be7b9e854a1e14db48d9152e2e
Parents: 917e7a5
Author: isper3at <sm...@gmail.com>
Authored: Fri Jun 17 14:40:39 2016 -0400
Committer: isper3at <sm...@gmail.com>
Committed: Fri Jun 17 14:40:39 2016 -0400
----------------------------------------------------------------------
.../mvm/rya/mongodb/MongoDBQueryEngine.java | 135 +++++++++----------
.../dao/SimpleMongoDBStorageStrategy.java | 2 +-
.../mvm/rya/indexing/accumulo/ConfigUtils.java | 32 ++---
.../accumulo/entity/EntityCentricIndex.java | 2 +
.../indexing/external/PCJOptionalTestIT.java | 6 +-
.../external/PrecompJoinOptimizerTest.java | 22 +--
.../external/tupleSet/AccumuloIndexSetTest.java | 41 +++---
.../src/main/java/RyaDirectExample.java | 3 -
8 files changed, 120 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/MongoDBQueryEngine.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/MongoDBQueryEngine.java b/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/MongoDBQueryEngine.java
index fc4310f..dfaed00 100644
--- a/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/MongoDBQueryEngine.java
+++ b/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/MongoDBQueryEngine.java
@@ -1,24 +1,4 @@
package mvm.rya.mongodb;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.calrissian.mango.collect.CloseableIterable;
-import org.openrdf.query.BindingSet;
-
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-import com.mongodb.MongoClient;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -38,6 +18,24 @@ import com.mongodb.MongoClient;
* under the License.
*/
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.calrissian.mango.collect.CloseableIterable;
+import org.openrdf.query.BindingSet;
+
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.MongoClient;
import info.aduna.iteration.CloseableIteration;
import mvm.rya.api.domain.RyaStatement;
@@ -59,32 +57,32 @@ import mvm.rya.mongodb.iter.RyaStatementCursorIterator;
public class MongoDBQueryEngine implements RyaQueryEngine<MongoDBRdfConfiguration>, Closeable {
private MongoDBRdfConfiguration configuration;
- private final MongoClient mongoClient;
- private final DBCollection coll;
- private final MongoDBStorageStrategy strategy;
+ private final MongoClient mongoClient;
+ private final DBCollection coll;
+ private final MongoDBStorageStrategy strategy;
public MongoDBQueryEngine(final MongoDBRdfConfiguration conf, final MongoClient mongoClient) {
- this.mongoClient = checkNotNull(mongoClient);
- final DB db = mongoClient.getDB( conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
- coll = db.getCollection(conf.getTriplesCollectionName());
- strategy = new SimpleMongoDBStorageStrategy();
+ this.mongoClient = checkNotNull(mongoClient);
+ final DB db = mongoClient.getDB( conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME));
+ coll = db.getCollection(conf.getTriplesCollectionName());
+ strategy = new SimpleMongoDBStorageStrategy();
}
- @Override
- public void setConf(final MongoDBRdfConfiguration conf) {
- configuration = conf;
- }
+ @Override
+ public void setConf(final MongoDBRdfConfiguration conf) {
+ configuration = conf;
+ }
- @Override
- public MongoDBRdfConfiguration getConf() {
- return configuration;
- }
+ @Override
+ public MongoDBRdfConfiguration getConf() {
+ return configuration;
+ }
- @Override
- public CloseableIteration<RyaStatement, RyaDAOException> query(
- final RyaStatement stmt, MongoDBRdfConfiguration conf)
- throws RyaDAOException {
+ @Override
+ public CloseableIteration<RyaStatement, RyaDAOException> query(
+ final RyaStatement stmt, MongoDBRdfConfiguration conf)
+ throws RyaDAOException {
if (conf == null) {
conf = configuration;
}
@@ -98,11 +96,11 @@ public class MongoDBQueryEngine implements RyaQueryEngine<MongoDBRdfConfiguratio
iterator.setMaxResults(maxResults);
}
return iterator;
- }
- @Override
- public CloseableIteration<? extends Entry<RyaStatement, BindingSet>, RyaDAOException> queryWithBindingSet(
- final Collection<Entry<RyaStatement, BindingSet>> stmts,
- MongoDBRdfConfiguration conf) throws RyaDAOException {
+ }
+ @Override
+ public CloseableIteration<? extends Entry<RyaStatement, BindingSet>, RyaDAOException> queryWithBindingSet(
+ final Collection<Entry<RyaStatement, BindingSet>> stmts,
+ MongoDBRdfConfiguration conf) throws RyaDAOException {
if (conf == null) {
conf = configuration;
}
@@ -129,11 +127,11 @@ public class MongoDBQueryEngine implements RyaQueryEngine<MongoDBRdfConfiguratio
throw new RyaDAOException(e);
}
- }
- @Override
- public CloseableIteration<RyaStatement, RyaDAOException> batchQuery(
- final Collection<RyaStatement> stmts, MongoDBRdfConfiguration conf)
- throws RyaDAOException {
+ }
+ @Override
+ public CloseableIteration<RyaStatement, RyaDAOException> batchQuery(
+ final Collection<RyaStatement> stmts, MongoDBRdfConfiguration conf)
+ throws RyaDAOException {
if (conf == null) {
conf = configuration;
}
@@ -156,27 +154,27 @@ public class MongoDBQueryEngine implements RyaQueryEngine<MongoDBRdfConfiguratio
throw new RyaDAOException(e);
}
- }
- @Override
- public CloseableIterable<RyaStatement> query(final RyaQuery ryaQuery)
- throws RyaDAOException {
- final Set<DBObject> queries = new HashSet<DBObject>();
+ }
+ @Override
+ public CloseableIterable<RyaStatement> query(final RyaQuery ryaQuery)
+ throws RyaDAOException {
+ final Set<DBObject> queries = new HashSet<DBObject>();
- try {
+ try {
queries.add( strategy.getQuery(ryaQuery));
- // TODO not sure what to do about regex ranges?
+ // TODO not sure what to do about regex ranges?
// TODO this is gross
final RyaStatementCursorIterable iterator = new RyaStatementCursorIterable(new NonCloseableRyaStatementCursorIterator(new RyaStatementCursorIterator(coll, queries, strategy)));
- return iterator;
- } catch (final Exception e) {
- throw new RyaDAOException(e);
- }
- }
- @Override
- public CloseableIterable<RyaStatement> query(final BatchRyaQuery batchRyaQuery)
- throws RyaDAOException {
+ return iterator;
+ } catch (final Exception e) {
+ throw new RyaDAOException(e);
+ }
+ }
+ @Override
+ public CloseableIterable<RyaStatement> query(final BatchRyaQuery batchRyaQuery)
+ throws RyaDAOException {
try {
final Set<DBObject> queries = new HashSet<DBObject>();
for (final RyaStatement statement : batchRyaQuery.getQueries()){
@@ -192,15 +190,10 @@ public class MongoDBQueryEngine implements RyaQueryEngine<MongoDBRdfConfiguratio
} catch (final Exception e) {
throw new RyaDAOException(e);
}
- }
+ }
@Override
public void close() throws IOException {
if (mongoClient != null){ mongoClient.close(); }
}
-
-
-
-
-
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java b/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
index df4d6af..d09316a 100644
--- a/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
+++ b/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
@@ -42,7 +42,7 @@ import mvm.rya.api.persist.query.RyaQuery;
/**
* Defines how {@link RyaStatement}s are stored in MongoDB.
*/
-public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy {
+public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy<RyaStatement> {
private static final Logger LOG = Logger.getLogger(SimpleMongoDBStorageStrategy.class);
protected static final String ID = "_id";
protected static final String OBJECT_TYPE = "objectType";
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
index 3dce3a2..28afce7 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
@@ -25,20 +25,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.indexing.FilterFunctionOptimizer;
-import mvm.rya.indexing.accumulo.entity.EntityCentricIndex;
-import mvm.rya.indexing.accumulo.entity.EntityOptimizer;
-import mvm.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer;
-import mvm.rya.indexing.accumulo.freetext.LuceneTokenizer;
-import mvm.rya.indexing.accumulo.freetext.Tokenizer;
-import mvm.rya.indexing.accumulo.geo.GeoMesaGeoIndexer;
-import mvm.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer;
-import mvm.rya.indexing.external.PrecompJoinOptimizer;
-import mvm.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
-import mvm.rya.indexing.mongodb.geo.MongoGeoIndexer;
-
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchScanner;
@@ -63,6 +49,20 @@ import org.openrdf.model.impl.URIImpl;
import com.google.common.collect.Lists;
+import mvm.rya.accumulo.AccumuloRdfConfiguration;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
+import mvm.rya.indexing.FilterFunctionOptimizer;
+import mvm.rya.indexing.accumulo.entity.EntityCentricIndex;
+import mvm.rya.indexing.accumulo.entity.EntityOptimizer;
+import mvm.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer;
+import mvm.rya.indexing.accumulo.freetext.LuceneTokenizer;
+import mvm.rya.indexing.accumulo.freetext.Tokenizer;
+import mvm.rya.indexing.accumulo.geo.GeoMesaGeoIndexer;
+import mvm.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer;
+import mvm.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
+import mvm.rya.indexing.mongodb.geo.MongoGeoIndexer;
+import mvm.rya.indexing.pcj.matching.PCJOptimizer;
+
/**
* A set of configuration utils to read a Hadoop {@link Configuration} object and create Cloudbase/Accumulo objects.
*/
@@ -390,7 +390,7 @@ public class ConfigUtils {
} else {
if (getUsePCJ(conf) || getUseOptimalPCJ(conf)) {
- conf.setPcjOptimizer(PrecompJoinOptimizer.class);
+ conf.setPcjOptimizer(PCJOptimizer.class);
}
if (getUseGeo(conf)) {
@@ -421,7 +421,7 @@ public class ConfigUtils {
}
conf.setStrings(AccumuloRdfConfiguration.CONF_ADDITIONAL_INDEXERS, indexList.toArray(new String[]{}));
- conf.setStrings(AccumuloRdfConfiguration.CONF_OPTIMIZERS, optimizers.toArray(new String[]{}));
+ conf.setStrings(RdfCloudTripleStoreConfiguration.CONF_OPTIMIZERS, optimizers.toArray(new String[]{}));
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/entity/EntityCentricIndex.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/entity/EntityCentricIndex.java b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/entity/EntityCentricIndex.java
index c96e2db..cd2d516 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/entity/EntityCentricIndex.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/entity/EntityCentricIndex.java
@@ -27,6 +27,7 @@ import static mvm.rya.api.RdfCloudTripleStoreConstants.EMPTY_BYTES;
import static mvm.rya.api.RdfCloudTripleStoreConstants.EMPTY_TEXT;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -39,6 +40,7 @@ import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.ColumnVisibility;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/extras/indexing/src/test/java/mvm/rya/indexing/external/PCJOptionalTestIT.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/mvm/rya/indexing/external/PCJOptionalTestIT.java b/extras/indexing/src/test/java/mvm/rya/indexing/external/PCJOptionalTestIT.java
index 38861b0..7798c51 100644
--- a/extras/indexing/src/test/java/mvm/rya/indexing/external/PCJOptionalTestIT.java
+++ b/extras/indexing/src/test/java/mvm/rya/indexing/external/PCJOptionalTestIT.java
@@ -63,6 +63,7 @@ import mvm.rya.indexing.external.PrecompJoinOptimizerIntegrationTest.CountingRes
import mvm.rya.indexing.external.PrecompJoinOptimizerTest.NodeCollector;
import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
import mvm.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
+import mvm.rya.indexing.pcj.matching.PCJOptimizer;
import mvm.rya.rdftriplestore.inference.InferenceEngineException;
public class PCJOptionalTestIT {
@@ -153,7 +154,6 @@ public class PCJOptionalTestIT {
+ " ?e <http://www.w3.org/2000/01/rdf-schema#label> ?l . "//
+ " OPTIONAL {?e <uri:talksTo> ?o } . "//
+ "}";//
-
final CountingResultHandler crh = new CountingResultHandler();
PcjIntegrationTestingUtil.deleteCoreRyaTables(accCon, tablePrefix);
PcjIntegrationTestingUtil.closeAndShutdown(conn, repo);
@@ -240,7 +240,7 @@ public class PCJOptionalTestIT {
final List<QueryModelNode> optTupNodes = Lists.newArrayList();
optTupNodes.add(extTup1);
- final PrecompJoinOptimizer pcj = new PrecompJoinOptimizer(list, true);
+ final PCJOptimizer pcj = new PCJOptimizer(list, true);
final TupleExpr te = pq1.getTupleExpr();
pcj.optimize(te, null, null);
@@ -306,7 +306,7 @@ public class PCJOptionalTestIT {
final List<QueryModelNode> optTupNodes = Lists.newArrayList();
optTupNodes.add(extTup2);
- final PrecompJoinOptimizer opt = new PrecompJoinOptimizer(list, true);
+ final PCJOptimizer opt = new PCJOptimizer(list, true);
final TupleExpr te = pq1.getTupleExpr();
opt.optimize(te, null, null);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/extras/indexing/src/test/java/mvm/rya/indexing/external/PrecompJoinOptimizerTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/mvm/rya/indexing/external/PrecompJoinOptimizerTest.java b/extras/indexing/src/test/java/mvm/rya/indexing/external/PrecompJoinOptimizerTest.java
index ce9ef2f..eaf0c53 100644
--- a/extras/indexing/src/test/java/mvm/rya/indexing/external/PrecompJoinOptimizerTest.java
+++ b/extras/indexing/src/test/java/mvm/rya/indexing/external/PrecompJoinOptimizerTest.java
@@ -24,10 +24,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
-import mvm.rya.indexing.pcj.matching.PCJOptimizer;
-
import org.junit.Assert;
import org.junit.Test;
import org.openrdf.query.algebra.Projection;
@@ -42,12 +38,16 @@ import org.openrdf.query.parser.sparql.SPARQLParser;
import com.beust.jcommander.internal.Lists;
import com.google.common.collect.Sets;
+import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import mvm.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
+import mvm.rya.indexing.pcj.matching.PCJOptimizer;
+
public class PrecompJoinOptimizerTest {
@Test
public void testThreeIndex() throws Exception {
- String q7 = ""//
+ final String q7 = ""//
+ "SELECT ?s ?t ?u " //
+ "{" //
+ " ?s a ?t ."//
@@ -55,7 +55,7 @@ public class PrecompJoinOptimizerTest {
+ " ?u <uri:talksTo> ?s . "//
+ "}";//
- String q8 = ""//
+ final String q8 = ""//
+ "SELECT ?e ?l ?c " //
+ "{" //
+ " ?e a ?l ."//
@@ -63,7 +63,7 @@ public class PrecompJoinOptimizerTest {
+ " ?c <uri:talksTo> ?e . "//
+ "}";//
- String q9 = ""//
+ final String q9 = ""//
+ "SELECT ?f ?m ?d " //
+ "{" //
+ " ?f a ?m ."//
@@ -71,7 +71,7 @@ public class PrecompJoinOptimizerTest {
+ " ?d <uri:talksTo> ?f . "//
+ "}";//
- String q15 = ""//
+ final String q15 = ""//
+ "SELECT ?f ?m ?d ?e ?l ?c " //
+ "{" //
+ " ?f a ?m ."//
@@ -411,7 +411,7 @@ public class PrecompJoinOptimizerTest {
Set<QueryModelNode> qNodes = new HashSet<>();
@Override
- public void meetNode(QueryModelNode node) {
+ public void meetNode(final QueryModelNode node) {
if (node instanceof StatementPattern
|| node instanceof ExternalTupleSet) {
qNodes.add(node);
@@ -420,6 +420,10 @@ public class PrecompJoinOptimizerTest {
}
+ public List<QueryModelNode> getNodes() {
+ return Lists.newArrayList(qNodes);
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/extras/indexing/src/test/java/mvm/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/mvm/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java b/extras/indexing/src/test/java/mvm/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java
index f18e61f..483f9e0 100644
--- a/extras/indexing/src/test/java/mvm/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java
+++ b/extras/indexing/src/test/java/mvm/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.hadoop.conf.Configuration;
@@ -66,7 +65,7 @@ import mvm.rya.api.persist.RyaDAOException;
import mvm.rya.api.resolver.RyaTypeResolverException;
import mvm.rya.indexing.accumulo.ConfigUtils;
import mvm.rya.indexing.external.PcjIntegrationTestingUtil;
-import mvm.rya.indexing.external.QueryVariableNormalizer;
+import mvm.rya.indexing.pcj.matching.QueryVariableNormalizer;
import mvm.rya.rdftriplestore.RyaSailRepository;
import mvm.rya.rdftriplestore.inference.InferenceEngineException;
import mvm.rya.sail.config.RyaSailFactory;
@@ -95,14 +94,15 @@ public class AccumuloIndexSetTest {
/**
* TODO doc
- * @throws MutationsRejectedException
* @throws QueryEvaluationException
* @throws SailException
* @throws MalformedQueryException
+ * @throws AccumuloSecurityException
+ * @throws AccumuloException
*/
@Test
public void accumuloIndexSetTestWithEmptyBindingSet() throws RepositoryException, PcjException, TableNotFoundException,
- RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, MutationsRejectedException {
+ RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException {
// Load some Triples into Rya.
final Set<Statement> triples = new HashSet<>();
triples.add( new StatementImpl(new URIImpl("http://Alice"), new URIImpl("http://hasAge"), new NumericLiteralImpl(14, XMLSchema.INTEGER)) );
@@ -131,7 +131,7 @@ public class AccumuloIndexSetTest {
// Create and populate the PCJ table.
PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent());
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(new QueryBindingSet());
final Set<BindingSet> fetchedResults = new HashSet<BindingSet>();
@@ -157,14 +157,15 @@ public class AccumuloIndexSetTest {
/**
* TODO doc
- * @throws MutationsRejectedException
* @throws QueryEvaluationException
* @throws SailException
* @throws MalformedQueryException
+ * @throws AccumuloSecurityException
+ * @throws AccumuloException
*/
@Test
public void accumuloIndexSetTestWithBindingSet() throws RepositoryException, PcjException, TableNotFoundException,
- RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, MutationsRejectedException {
+ RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException {
// Load some Triples into Rya.
final Set<Statement> triples = new HashSet<>();
triples.add( new StatementImpl(new URIImpl("http://Alice"), new URIImpl("http://hasAge"), new NumericLiteralImpl(14, XMLSchema.INTEGER)) );
@@ -194,7 +195,7 @@ public class AccumuloIndexSetTest {
// Create and populate the PCJ table.
PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent());
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
final QueryBindingSet bs = new QueryBindingSet();
bs.addBinding("name",new URIImpl("http://Alice"));
@@ -208,7 +209,7 @@ public class AccumuloIndexSetTest {
@Test
public void accumuloIndexSetTestWithTwoBindingSets() throws RepositoryException, PcjException, TableNotFoundException,
- RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, MutationsRejectedException {
+ RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException {
// Load some Triples into Rya.
final Set<Statement> triples = new HashSet<>();
triples.add( new StatementImpl(new URIImpl("http://Alice"), new URIImpl("http://hasAge"), new NumericLiteralImpl(14, XMLSchema.INTEGER)) );
@@ -238,7 +239,7 @@ public class AccumuloIndexSetTest {
// Create and populate the PCJ table.
PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent());
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
final QueryBindingSet bs = new QueryBindingSet();
bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date")));
@@ -274,7 +275,7 @@ public class AccumuloIndexSetTest {
@Test
public void accumuloIndexSetTestWithNoBindingSet() throws RepositoryException, PcjException, TableNotFoundException,
- RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, MutationsRejectedException {
+ RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException {
// Load some Triples into Rya.
final Set<Statement> triples = new HashSet<>();
triples.add( new StatementImpl(new URIImpl("http://Alice"), new URIImpl("http://hasAge"), new NumericLiteralImpl(14, XMLSchema.INTEGER)) );
@@ -304,7 +305,7 @@ public class AccumuloIndexSetTest {
// Create and populate the PCJ table.
PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent());
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(new HashSet<BindingSet>());
@@ -314,7 +315,7 @@ public class AccumuloIndexSetTest {
@Test
public void accumuloIndexSetTestWithDirectProductBindingSet() throws RepositoryException, PcjException, TableNotFoundException,
- RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, MutationsRejectedException {
+ RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException {
// Load some Triples into Rya.
final Set<Statement> triples = new HashSet<>();
triples.add( new StatementImpl(new URIImpl("http://Alice"), new URIImpl("http://hasAge"), new NumericLiteralImpl(14, XMLSchema.INTEGER)) );
@@ -344,7 +345,7 @@ public class AccumuloIndexSetTest {
// Create and populate the PCJ table.
PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent());
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
final QueryBindingSet bs = new QueryBindingSet();
bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date")));
@@ -377,7 +378,7 @@ public class AccumuloIndexSetTest {
@Test
public void accumuloIndexSetTestWithTwoDirectProductBindingSet() throws RepositoryException, PcjException, TableNotFoundException,
- RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, MutationsRejectedException {
+ RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException {
// Load some Triples into Rya.
final Set<Statement> triples = new HashSet<>();
triples.add( new StatementImpl(new URIImpl("http://Alice"), new URIImpl("http://hasAge"), new NumericLiteralImpl(14, XMLSchema.INTEGER)) );
@@ -407,7 +408,7 @@ public class AccumuloIndexSetTest {
// Create and populate the PCJ table.
PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent());
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
final QueryBindingSet bs = new QueryBindingSet();
bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date")));
@@ -463,7 +464,7 @@ public class AccumuloIndexSetTest {
@Test
public void accumuloIndexSetTestWithTwoDirectProductBindingSetsWithMapping() throws RepositoryException, PcjException, TableNotFoundException,
- RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, MutationsRejectedException {
+ RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException {
// Load some Triples into Rya.
final Set<Statement> triples = new HashSet<>();
triples.add( new StatementImpl(new URIImpl("http://Alice"), new URIImpl("http://hasAge"), new NumericLiteralImpl(14, XMLSchema.INTEGER)) );
@@ -507,7 +508,7 @@ public class AccumuloIndexSetTest {
final Map<String,String> map = new HashMap<>();
map.put("x", "name");
map.put("y", "age");
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
ais.setProjectionExpr((Projection) pq.getTupleExpr());
ais.setTableVarMap(map);
ais.setSupportedVariableOrderMap(Lists.<String>newArrayList("x;y","y;x"));
@@ -586,7 +587,7 @@ public class AccumuloIndexSetTest {
final ParsedQuery pq1 = p.parseQuery(sparql, null);
final ParsedQuery pq2 = p.parseQuery(sparql2, null);
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn, pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName);
ais.setProjectionExpr((Projection) QueryVariableNormalizer.getNormalizedIndex(pq2.getTupleExpr(), pq1.getTupleExpr()).get(0));
final QueryBindingSet bs = new QueryBindingSet();
@@ -635,7 +636,7 @@ public class AccumuloIndexSetTest {
// Create and populate the PCJ table.
PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent());
- final AccumuloIndexSet ais = new AccumuloIndexSet(accumuloConn,pcjTableName);
+ final AccumuloIndexSet ais = new AccumuloIndexSet(conf,pcjTableName);
final QueryBindingSet bs1 = new QueryBindingSet();
bs1.addBinding("age",new LiteralImpl("16"));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ac8b394/extras/indexingExample/src/main/java/RyaDirectExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/RyaDirectExample.java b/extras/indexingExample/src/main/java/RyaDirectExample.java
index f0bc517..21651ef 100644
--- a/extras/indexingExample/src/main/java/RyaDirectExample.java
+++ b/extras/indexingExample/src/main/java/RyaDirectExample.java
@@ -37,7 +37,6 @@ import org.openrdf.model.URI;
import org.openrdf.model.ValueFactory;
import org.openrdf.model.impl.LiteralImpl;
import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
import org.openrdf.model.vocabulary.RDF;
import org.openrdf.model.vocabulary.RDFS;
import org.openrdf.query.BindingSet;
@@ -101,8 +100,6 @@ public class RyaDirectExample {
final long start = System.currentTimeMillis();
log.info("Running SPARQL Example: Add and Delete");
testAddAndDelete(conn);
- log.info("Running SPARQL Example: Add with Visibilities and Query with Authorizations");
- testAddAndQueryWithAuths(conf);
log.info("Running SAIL/SPARQL Example: PCJ Search");
testPCJSearch(conn);
log.info("Running SAIL/SPARQL Example: Add and Temporal Search");