You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rya.apache.org by pu...@apache.org on 2016/01/06 20:17:25 UTC
incubator-rya git commit: RYA-28 fixing build after incomplete check
in
Repository: incubator-rya
Updated Branches:
refs/heads/develop db96c4584 -> 4b7bd4f4e
RYA-28 fixing build after incomplete check in
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/4b7bd4f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/4b7bd4f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/4b7bd4f4
Branch: refs/heads/develop
Commit: 4b7bd4f4ecc7a2d2e074ef6394452145138ebbca
Parents: db96c45
Author: pujav65 <pu...@gmail.com>
Authored: Wed Jan 6 14:01:40 2016 -0500
Committer: pujav65 <pu...@gmail.com>
Committed: Wed Jan 6 14:01:40 2016 -0500
----------------------------------------------------------------------
.../rya/accumulo/mr/NullFreeTextIndexer.java | 32 +++++++++++++++
.../mvm/rya/accumulo/mr/NullGeoIndexer.java | 32 +++++++++++++++
.../rya/accumulo/mr/NullTemporalIndexer.java | 32 +++++++++++++++
.../accumulo/entity/EntityCentricIndex.java | 41 +++++++++++++++++++-
.../freetext/AccumuloFreeTextIndexer.java | 41 +++++++++++++++++++-
.../accumulo/geo/GeoMesaGeoIndexer.java | 36 ++++++++++++++++-
.../temporal/AccumuloTemporalIndexer.java | 36 ++++++++++++++++-
7 files changed, 242 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4b7bd4f4/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullFreeTextIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullFreeTextIndexer.java b/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullFreeTextIndexer.java
index 3d005cf..b9eb012 100644
--- a/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullFreeTextIndexer.java
+++ b/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullFreeTextIndexer.java
@@ -27,10 +27,12 @@ import java.io.IOException;
import java.util.Set;
import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.indexing.FreeTextIndexer;
import mvm.rya.indexing.StatementContraints;
+import org.apache.accumulo.core.client.Connector;
import org.apache.hadoop.conf.Configuration;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
@@ -67,4 +69,34 @@ public class NullFreeTextIndexer extends AbstractAccumuloIndexer implements Free
return null;
}
+ @Override
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setConnector(Connector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void purge(RdfCloudTripleStoreConfiguration configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void dropAndDestroy() {
+ // TODO Auto-generated method stub
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4b7bd4f4/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullGeoIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullGeoIndexer.java b/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullGeoIndexer.java
index b351c13..e064c74 100644
--- a/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullGeoIndexer.java
+++ b/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullGeoIndexer.java
@@ -27,10 +27,12 @@ import java.io.IOException;
import java.util.Set;
import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.indexing.GeoIndexer;
import mvm.rya.indexing.StatementContraints;
+import org.apache.accumulo.core.client.Connector;
import org.apache.hadoop.conf.Configuration;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
@@ -118,4 +120,34 @@ public class NullGeoIndexer extends AbstractAccumuloIndexer implements GeoIndexe
return null;
}
+ @Override
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setConnector(Connector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void purge(RdfCloudTripleStoreConfiguration configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void dropAndDestroy() {
+ // TODO Auto-generated method stub
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4b7bd4f4/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullTemporalIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullTemporalIndexer.java b/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullTemporalIndexer.java
index 153a3c3..b332080 100644
--- a/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullTemporalIndexer.java
+++ b/extras/indexing/src/main/java/mvm/rya/accumulo/mr/NullTemporalIndexer.java
@@ -27,6 +27,7 @@ import java.util.Collection;
import java.util.Set;
import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.domain.RyaURI;
import mvm.rya.indexing.StatementContraints;
@@ -34,6 +35,7 @@ import mvm.rya.indexing.TemporalIndexer;
import mvm.rya.indexing.TemporalInstant;
import mvm.rya.indexing.TemporalInterval;
+import org.apache.accumulo.core.client.Connector;
import org.apache.hadoop.conf.Configuration;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
@@ -151,4 +153,34 @@ public class NullTemporalIndexer extends AbstractAccumuloIndexer implements Temp
return null;
}
+
+ @Override
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setConnector(Connector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void purge(RdfCloudTripleStoreConfiguration configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void dropAndDestroy() {
+ // TODO Auto-generated method stub
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4b7bd4f4/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 1e2b18a..2ce4331 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
@@ -33,6 +33,7 @@ import java.util.List;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
@@ -50,6 +51,7 @@ import com.google.common.primitives.Bytes;
import mvm.rya.accumulo.AccumuloRdfConfiguration;
import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.domain.RyaType;
import mvm.rya.api.domain.RyaURI;
@@ -70,7 +72,7 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer {
public static final String CONF_TABLE_SUFFIX = "ac.indexer.eci.tablename";
- private void init() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, IOException,
+ private void initInternal() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, IOException,
TableExistsException {
ConfigUtils.createTableIfNotExists(conf, ConfigUtils.getEntityTableName(conf));
}
@@ -91,7 +93,7 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer {
}
if (!isInit) {
try {
- init();
+ initInternal();
isInit = true;
} catch (AccumuloException e) {
logger.warn("Unable to initialize index. Throwing Runtime Exception. ", e);
@@ -239,4 +241,39 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer {
}
+ @Override
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void setConnector(Connector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void purge(RdfCloudTripleStoreConfiguration configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void dropAndDestroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4b7bd4f4/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
index fdefbea..2429e79 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
@@ -37,6 +37,7 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
@@ -64,6 +65,7 @@ import com.google.common.base.Charsets;
import info.aduna.iteration.CloseableIteration;
import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.RyaToRdfConversions;
import mvm.rya.indexing.FreeTextIndexer;
@@ -208,7 +210,7 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements
private boolean isInit = false;
- private void init() throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
+ private void initInternal() throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
TableExistsException {
String doctable = ConfigUtils.getFreeTextDocTablename(conf);
String termtable = ConfigUtils.getFreeTextTermTablename(conf);
@@ -272,7 +274,7 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements
this.conf = conf;
if (!isInit) {
try {
- init();
+ initInternal();
isInit = true;
} catch (AccumuloException | AccumuloSecurityException | TableNotFoundException | TableExistsException e) {
logger.warn("Unable to initialize index. Throwing Runtime Exception. ", e);
@@ -712,4 +714,39 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements
}
return false;
}
+
+
+ @Override
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void setConnector(Connector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void purge(RdfCloudTripleStoreConfiguration configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void dropAndDestroy() {
+ // TODO Auto-generated method stub
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4b7bd4f4/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
index 9d01751..f7ad6b3 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.commons.lang.StringUtils;
@@ -71,6 +72,7 @@ import com.vividsolutions.jts.io.WKTReader;
import info.aduna.iteration.CloseableIteration;
import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.RyaToRdfConversions;
import mvm.rya.indexing.GeoIndexer;
@@ -144,7 +146,7 @@ public class GeoMesaGeoIndexer extends AbstractAccumuloIndexer implements GeoInd
this.conf = conf;
if (!isInit) {
try {
- init();
+ initInternal();
isInit = true;
} catch (IOException e) {
logger.warn("Unable to initialize index. Throwing Runtime Exception. ", e);
@@ -159,7 +161,7 @@ public class GeoMesaGeoIndexer extends AbstractAccumuloIndexer implements GeoInd
}
- private void init() throws IOException {
+ private void initInternal() throws IOException {
validPredicates = ConfigUtils.getGeoPredicates(conf);
DataStore dataStore = createDataStore(conf);
@@ -474,4 +476,34 @@ public class GeoMesaGeoIndexer extends AbstractAccumuloIndexer implements GeoInd
public void deleteStatement(RyaStatement statement) throws IOException {
deleteStatements(Collections.singleton(statement));
}
+
+ @Override
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setConnector(Connector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void purge(RdfCloudTripleStoreConfiguration configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void dropAndDestroy() {
+ // TODO Auto-generated method stub
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4b7bd4f4/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
index 095f18f..12791a6 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
@@ -38,6 +38,7 @@ import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.Scanner;
@@ -62,6 +63,7 @@ import org.openrdf.query.QueryEvaluationException;
import cern.colt.Arrays;
import info.aduna.iteration.CloseableIteration;
import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import mvm.rya.api.RdfCloudTripleStoreConfiguration;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.RyaToRdfConversions;
import mvm.rya.indexing.KeyParts;
@@ -98,7 +100,7 @@ public class AccumuloTemporalIndexer extends AbstractAccumuloIndexer implements
- private void init() throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
+ private void initInternal() throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
TableExistsException {
temporalIndexTableName = ConfigUtils.getTemporalTableName(conf);
// Create one index table on first run.
@@ -117,7 +119,7 @@ public class AccumuloTemporalIndexer extends AbstractAccumuloIndexer implements
this.conf = conf;
if (!isInit) {
try {
- init();
+ initInternal();
isInit = true;
} catch (AccumuloException e) {
logger.warn("Unable to initialize index. Throwing Runtime Exception. ", e);
@@ -889,4 +891,34 @@ public class AccumuloTemporalIndexer extends AbstractAccumuloIndexer implements
public void deleteStatement(RyaStatement statement) throws IllegalArgumentException, IOException {
deleteStatement(RyaToRdfConversions.convertStatement(statement));
}
+
+ @Override
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setConnector(Connector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void purge(RdfCloudTripleStoreConfiguration configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void dropAndDestroy() {
+ // TODO Auto-generated method stub
+
+ }
}