You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by mi...@apache.org on 2016/10/13 19:05:16 UTC
[3/7] incubator-rya git commit: RYA-142 updated for Fluo 1.0.0 release
RYA-142 updated for Fluo 1.0.0 release
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/ca2743a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/ca2743a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/ca2743a0
Branch: refs/heads/master
Commit: ca2743a0e1183ba39067945eb7a845c880728955
Parents: a06850b
Author: Keith Turner <ke...@deenlo.com>
Authored: Thu Oct 6 18:59:07 2016 -0400
Committer: Aaron Mihalik <mi...@alum.mit.edu>
Committed: Thu Oct 13 12:55:42 2016 -0400
----------------------------------------------------------------------
extras/indexing/pom.xml | 2 +-
.../api/client/accumulo/AccumuloCreatePCJ.java | 4 +-
.../api/client/accumulo/AccumuloDeletePCJ.java | 4 +-
.../api/client/accumulo/FluoClientFactory.java | 8 +--
.../indexing/external/fluo/FluoPcjUpdater.java | 2 +-
.../external/fluo/FluoPcjUpdaterSupplier.java | 6 +-
extras/indexingExample/pom.xml | 2 +-
.../src/main/java/RyaClientExample.java | 34 +++++------
extras/rya.console/pom.xml | 2 +-
extras/rya.indexing.pcj/pom.xml | 4 +-
.../indexing/pcj/fluo/api/CountStatements.java | 14 ++---
.../rya/indexing/pcj/fluo/api/CreatePcj.java | 6 +-
.../rya/indexing/pcj/fluo/api/DeletePcj.java | 51 ++++++++--------
.../indexing/pcj/fluo/api/GetPcjMetadata.java | 6 +-
.../indexing/pcj/fluo/api/GetQueryReport.java | 28 ++++-----
.../indexing/pcj/fluo/api/InsertTriples.java | 8 +--
.../rya/indexing/pcj/fluo/api/ListQueryIds.java | 26 +++-----
extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 11 ++--
.../indexing/pcj/fluo/app/BindingSetRow.java | 2 +-
.../pcj/fluo/app/FilterResultUpdater.java | 10 ++--
.../rya/indexing/pcj/fluo/app/IncUpdateDAO.java | 58 ++++++------------
.../pcj/fluo/app/JoinResultUpdater.java | 62 +++++++++-----------
.../rya/indexing/pcj/fluo/app/NodeType.java | 4 +-
.../pcj/fluo/app/QueryResultUpdater.java | 10 ++--
.../indexing/pcj/fluo/app/StringTypeLayer.java | 4 +-
.../app/export/IncrementalResultExporter.java | 2 +-
.../IncrementalResultExporterFactory.java | 2 +-
.../app/export/rya/RyaExportParameters.java | 2 +-
.../fluo/app/export/rya/RyaResultExporter.java | 4 +-
.../export/rya/RyaResultExporterFactory.java | 6 +-
.../fluo/app/observers/BindingSetUpdater.java | 14 ++---
.../pcj/fluo/app/observers/FilterObserver.java | 2 +-
.../pcj/fluo/app/observers/JoinObserver.java | 2 +-
.../fluo/app/observers/QueryResultObserver.java | 14 ++---
.../app/observers/StatementPatternObserver.java | 2 +-
.../pcj/fluo/app/observers/TripleObserver.java | 45 +++++++-------
.../pcj/fluo/app/query/FluoQueryColumns.java | 4 +-
.../fluo/app/query/FluoQueryMetadataDAO.java | 12 ++--
extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 2 +-
.../pcj/fluo/client/PcjAdminClient.java | 6 +-
.../pcj/fluo/client/PcjAdminClientCommand.java | 2 +-
.../CountUnprocessedStatementsCommand.java | 2 +-
.../fluo/client/command/ListQueriesCommand.java | 2 +-
.../fluo/client/command/LoadTriplesCommand.java | 2 +-
.../fluo/client/command/NewQueryCommand.java | 2 +-
.../fluo/client/command/QueryReportCommand.java | 2 +-
.../pcj/fluo/client/util/FluoLoader.java | 2 +-
extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml | 2 +-
.../apache/rya/indexing/pcj/fluo/demo/Demo.java | 4 +-
.../rya/indexing/pcj/fluo/demo/DemoDriver.java | 25 ++++----
.../pcj/fluo/demo/FluoAndHistoricPcjsDemo.java | 6 +-
.../rya.pcj.fluo/pcj.fluo.integration/pom.xml | 4 +-
.../apache/rya/indexing/pcj/fluo/ITBase.java | 29 +++++----
.../pcj/fluo/api/CountStatementsIT.java | 14 ++---
.../indexing/pcj/fluo/api/ListQueryIdsIT.java | 2 +-
.../fluo/app/query/FluoQueryMetadataDAOIT.java | 4 +-
.../pcj/fluo/integration/RyaExportIT.java | 2 +-
.../RyaInputIncrementalUpdateIT.java | 4 +-
pom.xml | 14 +++--
59 files changed, 283 insertions(+), 328 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexing/pom.xml b/extras/indexing/pom.xml
index 32e9ef2..60897b8 100644
--- a/extras/indexing/pom.xml
+++ b/extras/indexing/pom.xml
@@ -96,7 +96,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloCreatePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloCreatePCJ.java b/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloCreatePCJ.java
index 30be548..4cf0935 100644
--- a/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloCreatePCJ.java
+++ b/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloCreatePCJ.java
@@ -35,7 +35,7 @@ import org.openrdf.sail.SailException;
import com.google.common.base.Optional;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.accumulo.AccumuloRdfConfiguration;
import mvm.rya.accumulo.AccumuloRyaDAO;
import mvm.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
@@ -178,4 +178,4 @@ public class AccumuloCreatePCJ extends AccumuloCommand implements CreatePCJ {
ryaRepo.initialize();
return ryaRepo;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloDeletePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloDeletePCJ.java b/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloDeletePCJ.java
index d170fab..233a265 100644
--- a/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloDeletePCJ.java
+++ b/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/AccumuloDeletePCJ.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.api.client.DeletePCJ;
import mvm.rya.api.client.GetInstanceDetails;
import mvm.rya.api.client.InstanceDoesNotExistException;
@@ -127,4 +127,4 @@ public class AccumuloDeletePCJ extends AccumuloCommand implements DeletePCJ {
// Delete the PCJ from the Fluo App.
new DeletePcj(1000).deletePcj(fluoClient, pcjId);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/FluoClientFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/FluoClientFactory.java b/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/FluoClientFactory.java
index b80abfa..0c6c2f1 100644
--- a/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/FluoClientFactory.java
+++ b/extras/indexing/src/main/java/mvm/rya/api/client/accumulo/FluoClientFactory.java
@@ -22,9 +22,9 @@ import static java.util.Objects.requireNonNull;
import javax.annotation.ParametersAreNonnullByDefault;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.config.FluoConfiguration;
/**
* Creates {@link FluoClient}s that are connected to a specific Fluo Application.
@@ -69,4 +69,4 @@ public class FluoClientFactory {
// Connect the client.
return FluoFactory.newClient(fluoConfig);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdater.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdater.java b/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdater.java
index 901bd61..f53727d 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdater.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdater.java
@@ -30,7 +30,7 @@ import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;
import com.google.common.base.Optional;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.api.domain.RyaStatement;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java b/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
index 61de078..c0895ba 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
@@ -26,9 +26,9 @@ import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_USERN
import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_ZOOKEEPERS;
import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.FLUO_APP_NAME;
import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.STATEMENT_VISIBILITY;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.config.FluoConfiguration;
import javax.annotation.ParametersAreNonnullByDefault;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexingExample/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexingExample/pom.xml b/extras/indexingExample/pom.xml
index 212210e..2a00e61 100644
--- a/extras/indexingExample/pom.xml
+++ b/extras/indexingExample/pom.xml
@@ -69,7 +69,7 @@ under the License.
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/indexingExample/src/main/java/RyaClientExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/RyaClientExample.java b/extras/indexingExample/src/main/java/RyaClientExample.java
index 7d1d3dc..bee44e1 100644
--- a/extras/indexingExample/src/main/java/RyaClientExample.java
+++ b/extras/indexingExample/src/main/java/RyaClientExample.java
@@ -53,13 +53,13 @@ import com.beust.jcommander.internal.Lists;
import com.google.common.io.Files;
import info.aduna.iteration.CloseableIteration;
-import io.fluo.api.client.FluoAdmin;
-import io.fluo.api.client.FluoAdmin.AlreadyInitializedException;
-import io.fluo.api.client.FluoAdmin.TableExistsException;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.config.ObserverConfiguration;
-import io.fluo.api.mini.MiniFluo;
+import org.apache.fluo.api.client.FluoAdmin;
+import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException;
+import org.apache.fluo.api.client.FluoAdmin.TableExistsException;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.ObserverSpecification;
+import org.apache.fluo.api.mini.MiniFluo;
import mvm.rya.accumulo.AccumuloRdfConfiguration;
import mvm.rya.api.client.Install.InstallConfiguration;
import mvm.rya.api.client.RyaClient;
@@ -242,17 +242,14 @@ public class RyaClientExample {
private static MiniFluo makeMiniFluo(final String username, final String password, final String instanceName, final String zookeepers, final String fluoAppName) throws AlreadyInitializedException, TableExistsException {
// Setup the observers that will be used by the Fluo PCJ Application.
- final List<ObserverConfiguration> observers = new ArrayList<>();
- observers.add(new ObserverConfiguration(TripleObserver.class.getName()));
- observers.add(new ObserverConfiguration(StatementPatternObserver.class.getName()));
- observers.add(new ObserverConfiguration(JoinObserver.class.getName()));
- observers.add(new ObserverConfiguration(FilterObserver.class.getName()));
+ final List<ObserverSpecification> observers = new ArrayList<>();
+ observers.add(new ObserverSpecification(TripleObserver.class.getName()));
+ observers.add(new ObserverSpecification(StatementPatternObserver.class.getName()));
+ observers.add(new ObserverSpecification(JoinObserver.class.getName()));
+ observers.add(new ObserverSpecification(FilterObserver.class.getName()));
// Provide export parameters child test classes may provide to the
// export observer.
- final ObserverConfiguration exportObserverConfig = new ObserverConfiguration(
- QueryResultObserver.class.getName());
-
final HashMap<String, String> params = new HashMap<>();
final RyaExportParameters ryaParams = new RyaExportParameters(params);
ryaParams.setExportToRya(true);
@@ -262,7 +259,8 @@ public class RyaClientExample {
ryaParams.setExporterPassword(password);
ryaParams.setRyaInstanceName(fluoAppName);
- exportObserverConfig.setParameters(params);
+ final ObserverSpecification exportObserverConfig = new ObserverSpecification(
+ QueryResultObserver.class.getName(), params);
observers.add(exportObserverConfig);
// Configure how the mini fluo will run.
@@ -280,7 +278,7 @@ public class RyaClientExample {
config.addObservers(observers);
FluoFactory.newAdmin(config).initialize(
- new FluoAdmin.InitOpts().setClearTable(true).setClearZookeeper(true) );
+ new FluoAdmin.InitializationOptions().setClearTable(true).setClearZookeeper(true) );
return FluoFactory.newMiniFluo(config);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.console/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.console/pom.xml b/extras/rya.console/pom.xml
index 9513c59..ea5c2bb 100644
--- a/extras/rya.console/pom.xml
+++ b/extras/rya.console/pom.xml
@@ -84,7 +84,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.indexing.pcj/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/pom.xml b/extras/rya.indexing.pcj/pom.xml
index c90ded3..3d9bf96 100644
--- a/extras/rya.indexing.pcj/pom.xml
+++ b/extras/rya.indexing.pcj/pom.xml
@@ -56,7 +56,7 @@ under the License.
<!-- Fluo support dependencies. -->
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
</dependency>
@@ -91,4 +91,4 @@ under the License.
<type>test-jar</type>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CountStatements.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CountStatements.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CountStatements.java
index 326f807..9b7e0c5 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CountStatements.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CountStatements.java
@@ -21,13 +21,13 @@ package org.apache.rya.indexing.pcj.fluo.api;
import static com.google.common.base.Preconditions.checkNotNull;
import java.math.BigInteger;
+import java.util.Iterator;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.Snapshot;
-import io.fluo.api.config.ScannerConfiguration;
-import io.fluo.api.iterator.RowIterator;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.Snapshot;
+import org.apache.fluo.api.client.scanner.ColumnScanner;
/**
* Counts the number of RDF Statements that have been loaded into the Fluo app
@@ -48,10 +48,8 @@ public class CountStatements {
try(Snapshot sx = fluo.newSnapshot()) {
// Limit the scan to the Triples binding set column.
- final ScannerConfiguration scanConfig = new ScannerConfiguration();
- scanConfig.fetchColumn(FluoQueryColumns.TRIPLES.getFamily(), FluoQueryColumns.TRIPLES.getQualifier());
-
- final RowIterator rows = sx.get(scanConfig);
+ final Iterator<ColumnScanner> rows = sx.scanner().fetch(FluoQueryColumns.TRIPLES).byRow().build().iterator();
+
BigInteger count = BigInteger.valueOf(0L);
while(rows.hasNext()) {
rows.next();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
index 29d328d..943a022 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java
@@ -54,8 +54,8 @@ import org.openrdf.sail.SailConnection;
import org.openrdf.sail.SailException;
import info.aduna.iteration.CloseableIteration;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.types.TypedTransaction;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.recipes.core.types.TypedTransaction;
/**
* Sets up a new Pre Computed Join (PCJ) in Fluo from a SPARQL query.
@@ -229,4 +229,4 @@ public class CreatePcj {
tx.commit();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
index df59cb5..e1a9b8e 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/DeletePcj.java
@@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -35,14 +36,14 @@ import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata;
import org.apache.rya.indexing.pcj.fluo.app.query.QueryMetadata;
import org.openrdf.query.BindingSet;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.Transaction;
-import io.fluo.api.config.ScannerConfiguration;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.data.Span;
-import io.fluo.api.iterator.RowIterator;
-import io.fluo.api.types.TypedTransaction;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.Transaction;
+import org.apache.fluo.api.client.scanner.CellScanner;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.RowColumnValue;
+import org.apache.fluo.api.data.Span;
+import org.apache.fluo.recipes.core.types.TypedTransaction;
/**
* Deletes a Pre-computed Join (PCJ) from Fluo.
@@ -239,34 +240,30 @@ public class DeletePcj {
}
}
- private RowIterator getIterator(final Transaction tx, final String nodeId, final Column column) {
+ private CellScanner getIterator(final Transaction tx, final String nodeId, final Column column) {
requireNonNull(tx);
requireNonNull(nodeId);
requireNonNull(column);
- ScannerConfiguration sc1 = new ScannerConfiguration();
- sc1.fetchColumn(column.getFamily(), column.getQualifier());
- sc1.setSpan(Span.prefix(Bytes.of(nodeId)));
- return tx.get(sc1);
+ return tx.scanner().fetch(column).over(Span.prefix(nodeId)).build();
}
- private boolean deleteDataBatch(final Transaction tx, final RowIterator iter, final Column column) {
+ private boolean deleteDataBatch(final Transaction tx, final CellScanner scanner, final Column column) {
requireNonNull(tx);
- requireNonNull(iter);
+ requireNonNull(scanner);
requireNonNull(column);
- try (final TypedTransaction typeTx = new StringTypeLayer().wrap(tx)) {
- int count = 0;
- while (iter.hasNext() && count < batchSize) {
- final Bytes row = iter.next().getKey();
- count++;
- tx.delete(row, column);
- }
-
- final boolean hasNext = iter.hasNext();
- tx.commit();
- return hasNext;
+ int count = 0;
+ Iterator<RowColumnValue> iter = scanner.iterator();
+ while (iter.hasNext() && count < batchSize) {
+ final Bytes row = iter.next().getRow();
+ count++;
+ tx.delete(row, column);
}
+
+ final boolean hasNext = iter.hasNext();
+ tx.commit();
+ return hasNext;
}
private String getQueryIdFromPcjId(final Transaction tx, final String pcjId) {
@@ -284,4 +281,4 @@ public class DeletePcj {
final QueryMetadata metadata = dao.readQueryMetadata(tx, queryId);
return metadata.getSparql();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadata.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadata.java
index 7a0a953..d8c800e 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadata.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadata.java
@@ -30,9 +30,9 @@ import org.apache.rya.indexing.pcj.storage.PcjException;
import org.apache.rya.indexing.pcj.storage.PcjMetadata;
import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.types.TypedSnapshot;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.recipes.core.types.TypedSnapshot;
/**
* Get {@link PcjMetadata} for queries that are managed by the Fluo app.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
index 2db7f3d..e1e8566 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReport.java
@@ -38,13 +38,13 @@ import org.apache.rya.indexing.pcj.fluo.app.query.StatementPatternMetadata;
import com.google.common.collect.ImmutableMap;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.Snapshot;
-import io.fluo.api.client.SnapshotBase;
-import io.fluo.api.config.ScannerConfiguration;
-import io.fluo.api.data.Column;
-import io.fluo.api.data.Span;
-import io.fluo.api.iterator.RowIterator;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.Snapshot;
+import org.apache.fluo.api.client.SnapshotBase;
+import org.apache.fluo.api.client.scanner.ColumnScanner;
+import org.apache.fluo.api.client.scanner.RowScanner;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.Span;
/**
* Get a reports that indicates how many binding sets have been emitted for
@@ -130,17 +130,13 @@ public class GetQueryReport {
checkNotNull(bindingSetColumn);
// Limit the scan to the binding set column and node id.
- final ScannerConfiguration scanConfig = new ScannerConfiguration();
- scanConfig.fetchColumn(bindingSetColumn.getFamily(), bindingSetColumn.getQualifier());
- scanConfig.setSpan( Span.prefix(nodeId) );
+ final RowScanner rows = sx.scanner().over(Span.prefix(nodeId)).fetch(bindingSetColumn).byRow().build();
- final RowIterator rows = sx.get(scanConfig);
BigInteger count = BigInteger.valueOf(0L);
- while(rows.hasNext()) {
- rows.next();
- count = count.add( BigInteger.ONE );
- }
-
+ for (ColumnScanner columns : rows) {
+ count = count.add( BigInteger.ONE );
+ }
+
return count;
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java
index 2a53a0e..1f45388 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java
@@ -30,10 +30,10 @@ import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import com.google.common.base.Optional;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
-import io.fluo.api.types.TypedTransaction;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
+import org.apache.fluo.recipes.core.types.TypedTransaction;
import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.triple.TripleRow;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIds.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIds.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIds.java
index a85bf56..3913e41 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIds.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIds.java
@@ -23,17 +23,14 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map.Entry;
import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.config.ScannerConfiguration;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.iterator.ColumnIterator;
-import io.fluo.api.iterator.RowIterator;
-import io.fluo.api.types.TypedSnapshot;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.scanner.CellScanner;
+import org.apache.fluo.api.data.RowColumnValue;
+import org.apache.fluo.recipes.core.types.TypedSnapshot;
/**
* Finds all queries that are being managed by this instance of Fluo that
@@ -56,17 +53,12 @@ public class ListQueryIds {
try(TypedSnapshot snap = new StringTypeLayer().wrap( fluo.newSnapshot() )) {
// Create an iterator that iterates over the QUERY_ID column.
- final ScannerConfiguration scanConfig = new ScannerConfiguration();
- scanConfig.fetchColumn(FluoQueryColumns.QUERY_ID.getFamily(), FluoQueryColumns.QUERY_ID.getQualifier());
- final RowIterator rows = snap.get(scanConfig);
+ final CellScanner cellScanner = snap.scanner().fetch( FluoQueryColumns.QUERY_ID).build();
- // Fetch the Query IDs that is stored in the Fluo table.
- while(rows.hasNext()) {
- final Entry<Bytes, ColumnIterator> entry = rows.next();
- final Bytes sparql = entry.getKey();
- final String queryId = snap.get(sparql, FluoQueryColumns.QUERY_ID).toString();
- queryIds.add(queryId);
- }
+ for (RowColumnValue rcv : cellScanner) {
+ queryIds.add(rcv.getsValue());
+ //TODO this was doing a snap.get that seemed unnecessary
+ }
}
// Sort them alphabetically.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
index 9c7f672..45ea9ce 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
@@ -52,11 +52,15 @@ under the License.
<!-- 3rd Party Runtime Dependencies. -->
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-core</artifactId>
<exclusions>
<exclusion>
@@ -65,7 +69,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<!-- Testing dependencies. -->
<dependency>
<groupId>junit</groupId>
@@ -97,4 +100,4 @@ under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
index 85f1b1f..fa0ea70 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/BindingSetRow.java
@@ -24,7 +24,7 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NO
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.concurrent.Immutable;
-import io.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Bytes;
/**
* The values of an Accumulo Row ID for a row that stores a Binding set for
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
index 8583eb5..328c653 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FilterResultUpdater.java
@@ -49,11 +49,11 @@ import org.openrdf.query.impl.MapBindingSet;
import com.google.common.base.Optional;
import info.aduna.iteration.CloseableIteration;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
/**
* Updates the results of a Filter node when its child has added a new Binding
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java
index 5bc9d0a..7ccfeff 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java
@@ -23,16 +23,13 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.DE
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.TYPE_DELIM;
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.URI_TYPE;
-import java.util.Map.Entry;
-
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.Snapshot;
-import io.fluo.api.config.ScannerConfiguration;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.iterator.ColumnIterator;
-import io.fluo.api.iterator.RowIterator;
-import io.fluo.api.types.TypedTransaction;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.Snapshot;
+import org.apache.fluo.api.client.scanner.CellScanner;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.RowColumnValue;
+import org.apache.fluo.recipes.core.types.TypedTransaction;
import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.triple.TripleRow;
@@ -106,15 +103,10 @@ public class IncUpdateDAO {
*/
public static void printTriples(final FluoClient fluoClient) throws Exception {
try (Snapshot snapshot = fluoClient.newSnapshot()) {
- final ScannerConfiguration scanConfig = new ScannerConfiguration();
- scanConfig.fetchColumn(Bytes.of("triples"), Bytes.of("SPO"));
-
- final RowIterator rowIter = snapshot.get(scanConfig);
-
- while (rowIter.hasNext()) {
- final Entry<Bytes, ColumnIterator> row = rowIter.next();
- System.out.println("Triple: " + row.getKey().toString());
- }
+ CellScanner cscanner = snapshot.scanner().fetch(new Column("triples", "SPO")).build();
+ for (RowColumnValue rcv : cscanner) {
+ System.out.println("Triple: "+rcv.getsRow());
+ }
}
}
@@ -179,25 +171,13 @@ public class IncUpdateDAO {
"--Column Qual--", "--Value--");
// Use try with resource to ensure snapshot is closed.
try (Snapshot snapshot = fluoClient.newSnapshot()) {
- final ScannerConfiguration scanConfig = new ScannerConfiguration();
- // scanConfig.setSpan(Span.prefix("word:"));
-
- final RowIterator rowIter = snapshot.get(scanConfig);
-
- while (rowIter.hasNext()) {
- final Entry<Bytes, ColumnIterator> row = rowIter.next();
- final ColumnIterator colIter = row.getValue();
- while (colIter.hasNext()) {
- final Entry<Column, Bytes> column = colIter.next();
- // System.out.println(row.getKey() + " " +
- // column.getKey().getFamily()+ " " +
- // column.getKey().getQualifier() );
- System.out.format(FORMAT, to_String(row.getKey()),
- to_String(column.getKey().getFamily()),
- to_String(column.getKey().getQualifier()),
- to_String(column.getValue()));
- }
- }
+ CellScanner cscanner = snapshot.scanner().build();
+ for (RowColumnValue rcv : cscanner) {
+ System.out.format(FORMAT, to_String(rcv.getRow()),
+ to_String(rcv.getColumn().getFamily()),
+ to_String(rcv.getColumn().getQualifier()),
+ to_String(rcv.getValue()));
+ }
}
}
@@ -229,4 +209,4 @@ public class IncUpdateDAO {
}
return sb.toString();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
index dfa5b62..5ac69b0 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/JoinResultUpdater.java
@@ -25,7 +25,6 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NO
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map.Entry;
import java.util.Set;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -47,15 +46,15 @@ import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.config.ScannerConfiguration;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.data.Span;
-import io.fluo.api.iterator.ColumnIterator;
-import io.fluo.api.iterator.RowIterator;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.client.scanner.ColumnScanner;
+import org.apache.fluo.api.client.scanner.RowScanner;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.ColumnValue;
+import org.apache.fluo.api.data.Span;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
/**
* Updates the results of a Join node when one of its children has added a
@@ -175,12 +174,9 @@ public class JoinResultUpdater {
// and inserted into the Join's results. It's possible that none of these
// results will be new Join results if they have already been created in
// earlier iterations of this algorithm.
- final ScannerConfiguration scanConfig = new ScannerConfiguration();
- scanConfig.setSpan(Span.prefix(siblingScanPrefix));
- setScanColumnFamily(scanConfig, siblingId);
- final RowIterator ri = tx.get(scanConfig);
- return new FluoTableIterator(ri, siblingVarOrder);
+ final RowScanner rs = tx.scanner().over(Span.prefix(siblingScanPrefix)).fetch(getScanColumnFamily(siblingId)).byRow().build();
+ return new FluoTableIterator(rs, siblingVarOrder);
}
@@ -247,15 +243,12 @@ public class JoinResultUpdater {
}
/**
- * Update a {@link ScannerConfiguration} to use the sibling node's binding
- * set column for its scan. The column that will be used is determined by the
- * node's {@link NodeType}.
+ * Return the sibling node's binding set column to use for a scan. The column
+ * that will be used is determined by the node's {@link NodeType}.
*
- * @param sc - The scan configuration that will be updated. (not null)
* @param siblingId - The Node ID of the sibling. (not null)
*/
- private static void setScanColumnFamily(final ScannerConfiguration sc, final String siblingId) {
- checkNotNull(sc);
+ private static Column getScanColumnFamily(final String siblingId) {
checkNotNull(siblingId);
// Determine which type of binding set the sibling is.
@@ -279,7 +272,8 @@ public class JoinResultUpdater {
default:
throw new IllegalArgumentException("The child node's sibling is not of type StatementPattern, Join, Left Join, or Filter.");
}
- sc.fetchColumn(column.getFamily(), column.getQualifier());
+
+ return column;
}
/**
@@ -462,7 +456,7 @@ public class JoinResultUpdater {
FluoQueryColumns.JOIN_BINDING_SET,
FluoQueryColumns.FILTER_BINDING_SET);
- private final RowIterator rows;
+ private final Iterator<ColumnScanner> rows;
private final VariableOrder varOrder;
/**
@@ -472,8 +466,8 @@ public class JoinResultUpdater {
* @param varOrder - The Variable Order of binding sets that will be
* read from the Fluo Table. (not null)
*/
- public FluoTableIterator(final RowIterator rows, final VariableOrder varOrder) {
- this.rows = checkNotNull(rows);
+ public FluoTableIterator(final RowScanner rows, final VariableOrder varOrder) {
+ this.rows = checkNotNull(rows).iterator();
this.varOrder = checkNotNull(varOrder);
}
@@ -484,16 +478,14 @@ public class JoinResultUpdater {
@Override
public VisibilityBindingSet next() {
- final ColumnIterator columns = rows.next().getValue();
-
- while(columns.hasNext()) {
- // If this is one of the BindingSet columns, handle it and return the BindingSet.
- final Entry<Column, Bytes> entry = columns.next();
- if(BINDING_SET_COLUMNS.contains(entry.getKey())) {
- final String bindingSetString = entry.getValue().toString();
- return (VisibilityBindingSet) valueConverter.convert(bindingSetString, varOrder);
- }
- }
+ final ColumnScanner columns = rows.next();
+
+ for (ColumnValue cv : columns) {
+ if(BINDING_SET_COLUMNS.contains(cv.getColumn())) {
+ final String bindingSetString = cv.getsValue();
+ return (VisibilityBindingSet) valueConverter.convert(bindingSetString, varOrder);
+ }
+ }
throw new RuntimeException("Row did not containing a Binding Set.");
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/NodeType.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/NodeType.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/NodeType.java
index c6ad31e..0a5ecc1 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/NodeType.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/NodeType.java
@@ -32,7 +32,7 @@ import org.openrdf.query.BindingSet;
import com.google.common.base.Optional;
-import io.fluo.api.data.Column;
+import org.apache.fluo.api.data.Column;
/**
* Represents the different types of nodes that a Query may have.
@@ -99,4 +99,4 @@ public enum NodeType {
return Optional.fromNullable(type);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
index 0c57985..41f9025 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/QueryResultUpdater.java
@@ -32,11 +32,11 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringCo
import org.openrdf.query.Binding;
import org.openrdf.query.impl.MapBindingSet;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
/**
* Updates the results of a Query node when one of its children has added a
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/StringTypeLayer.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/StringTypeLayer.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/StringTypeLayer.java
index 35fcf52..aecb434 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/StringTypeLayer.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/StringTypeLayer.java
@@ -18,8 +18,8 @@
*/
package org.apache.rya.indexing.pcj.fluo.app;
-import io.fluo.api.types.StringEncoder;
-import io.fluo.api.types.TypeLayer;
+import org.apache.fluo.recipes.core.types.StringEncoder;
+import org.apache.fluo.recipes.core.types.TypeLayer;
public class StringTypeLayer extends TypeLayer {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
index d93bae2..a7f016d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporter.java
@@ -22,7 +22,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
-import io.fluo.api.types.TypedTransactionBase;
+import org.apache.fluo.recipes.core.types.TypedTransactionBase;
/**
* Exports a single Binding Set that is a new result for a SPARQL query to some
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
index aae42ef..7052069 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/IncrementalResultExporterFactory.java
@@ -22,7 +22,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import com.google.common.base.Optional;
-import io.fluo.api.observer.Observer.Context;
+import org.apache.fluo.api.observer.Observer.Context;
/**
* Builds instances of {@link IncrementalResultExporter} using the provided
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
index 6f71a48..18af878 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaExportParameters.java
@@ -27,7 +27,7 @@ import org.apache.rya.indexing.pcj.fluo.app.export.ParametersBase;
import com.google.common.base.Optional;
-import io.fluo.api.observer.Observer;
+import org.apache.fluo.api.observer.Observer;
/**
* Provides read/write functions to the parameters map that is passed into an
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporter.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporter.java
index 11245c0..27530f0 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporter.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporter.java
@@ -28,8 +28,8 @@ import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage;
import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageException;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.types.TypedTransactionBase;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.recipes.core.types.TypedTransactionBase;
/**
* Incrementally exports SPARQL query results to Accumulo PCJ tables as they are defined by Rya.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporterFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporterFactory.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporterFactory.java
index dfbb910..c695272 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporterFactory.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/rya/RyaResultExporterFactory.java
@@ -33,7 +33,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage;
import com.google.common.base.Optional;
-import io.fluo.api.observer.Observer.Context;
+import org.apache.fluo.api.observer.Observer.Context;
/**
* Creates instances of {@link RyaResultExporter}.
@@ -45,7 +45,7 @@ public class RyaResultExporterFactory implements IncrementalResultExporterFactor
checkNotNull(context);
// Wrap the context's parameters for parsing.
- final RyaExportParameters params = new RyaExportParameters( context.getParameters() );
+ final RyaExportParameters params = new RyaExportParameters( context.getObserverConfiguration().toMap() );
if(params.isExportToRya()) {
// Setup Zookeeper connection info.
@@ -74,4 +74,4 @@ public class RyaResultExporterFactory implements IncrementalResultExporterFactor
return Optional.absent();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
index 06fca0a..e344b0a 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/BindingSetUpdater.java
@@ -34,13 +34,13 @@ import org.apache.rya.indexing.pcj.fluo.app.query.QueryMetadata;
import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
-import io.fluo.api.types.TypedObserver;
-import io.fluo.api.types.TypedTransactionBase;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
+import org.apache.fluo.recipes.core.types.TypedObserver;
+import org.apache.fluo.recipes.core.types.TypedTransactionBase;
/**
* Notified when the results of a node have been updated to include a new Binding
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java
index ea1f3a0..36af898 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java
@@ -29,7 +29,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringConverter;
import org.openrdf.query.BindingSet;
-import io.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.client.TransactionBase;
/**
* Notified when the results of a Filter have been updated to include a new
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java
index dbde885..6933096 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java
@@ -29,7 +29,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringConverter;
import org.openrdf.query.BindingSet;
-import io.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.client.TransactionBase;
/**
* Notified when the results of a Join have been updated to include a new
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java
index 2f7a1ea..638b1fc 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java
@@ -39,12 +39,12 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringCo
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
-import io.fluo.api.types.TypedObserver;
-import io.fluo.api.types.TypedTransactionBase;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
+import org.apache.fluo.recipes.core.types.TypedObserver;
+import org.apache.fluo.recipes.core.types.TypedTransactionBase;
import mvm.rya.accumulo.utils.VisibilitySimplifier;
/**
@@ -138,4 +138,4 @@ public class QueryResultObserver extends TypedObserver {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java
index 4694371..5956634 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java
@@ -29,7 +29,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringConverter;
import org.openrdf.query.BindingSet;
-import io.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.client.TransactionBase;
/**
* Notified when the results of a Statement Pattern have been updated to include
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java
index 4feb752..31a4c29 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java
@@ -24,7 +24,6 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.SP
import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.VAR_DELIM;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.rya.indexing.pcj.fluo.app.IncUpdateDAO;
import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
@@ -37,16 +36,16 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringCo
import com.google.common.collect.Maps;
-import io.fluo.api.config.ScannerConfiguration;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.data.Span;
-import io.fluo.api.iterator.ColumnIterator;
-import io.fluo.api.iterator.RowIterator;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
-import io.fluo.api.types.TypedObserver;
-import io.fluo.api.types.TypedTransactionBase;
+import org.apache.fluo.api.client.scanner.ColumnScanner;
+import org.apache.fluo.api.client.scanner.RowScanner;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.ColumnValue;
+import org.apache.fluo.api.data.Span;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
+import org.apache.fluo.recipes.core.types.TypedObserver;
+import org.apache.fluo.recipes.core.types.TypedTransactionBase;
/**
* An observer that matches new Triples to the Statement Patterns that are part
@@ -79,23 +78,19 @@ public class TripleObserver extends TypedObserver {
}
//get variable metadata for all SP in table
- final ScannerConfiguration sc1 = new ScannerConfiguration();
- sc1.fetchColumn(FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER.getFamily(), FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER.getQualifier());
- sc1.setSpan(Span.prefix(SP_PREFIX));
+ RowScanner rscanner = tx.scanner().over(Span.prefix(SP_PREFIX)).fetch(FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER).byRow().build();
+
//see if triple matches conditions of any of the SP
- final RowIterator ri = tx.get(sc1);
- while(ri.hasNext()) {
- final Entry<Bytes, ColumnIterator> next = ri.next();
- final ColumnIterator ci = next.getValue();
- final String spID = next.getKey().toString();
+ for (ColumnScanner colScanner : rscanner) {
+ final String spID = colScanner.getsRow();
final StatementPatternMetadata spMetadata = QUERY_DAO.readStatementPatternMetadata(tx, spID);
final String pattern = spMetadata.getStatementPattern();
-
- while(ci.hasNext()) {
- final String varOrders = ci.next().getValue().toString();
+
+ for (ColumnValue cv : colScanner) {
+ final String varOrders = cv.getsValue();
final VariableOrder varOrder = new VariableOrder(varOrders);
final String bindingSetString = getBindingSet(triple, pattern, varOrders);
@@ -107,8 +102,8 @@ public class TripleObserver extends TypedObserver {
final String valueString = CONVERTER.convert(bindingSet, varOrder);
tx.mutate().row(spID + NODEID_BS_DELIM + bindingSetString).col(FluoQueryColumns.STATEMENT_PATTERN_BINDING_SET).set(valueString);
}
- }
- }
+ }
+ }
// Once the triple has been handled, it may be deleted.
tx.delete(row, column);
@@ -158,4 +153,4 @@ public class TripleObserver extends TypedObserver {
return bindingSet;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
index e90496a..13743f4 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryColumns.java
@@ -25,7 +25,7 @@ import java.util.List;
import javax.annotation.ParametersAreNonnullByDefault;
-import io.fluo.api.data.Column;
+import org.apache.fluo.api.data.Column;
/**
* Holds {@link Column} objects that represent where each piece of metadata is stored.
@@ -223,4 +223,4 @@ public class FluoQueryColumns {
return columns;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
index e33ab07..a955a53 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java
@@ -30,12 +30,12 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
import com.google.common.collect.Sets;
-import io.fluo.api.client.SnapshotBase;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.types.Encoder;
-import io.fluo.api.types.StringEncoder;
+import org.apache.fluo.api.client.SnapshotBase;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.recipes.core.types.Encoder;
+import org.apache.fluo.recipes.core.types.StringEncoder;
/**
* Reads and writes {@link FluoQuery} instances and their components to/from
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml
index 8746154..a02aa6c 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml
@@ -52,7 +52,7 @@ under the License.
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-core</artifactId>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
index 59177f6..1e70d6e 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java
@@ -54,9 +54,9 @@ import org.openrdf.repository.RepositoryException;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.config.FluoConfiguration;
import mvm.rya.accumulo.AccumuloRdfConfiguration;
import mvm.rya.accumulo.AccumuloRyaDAO;
import mvm.rya.rdftriplestore.RdfCloudTripleStore;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
index e1185d4..afe6b9f 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java
@@ -22,7 +22,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.accumulo.core.client.Connector;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.rdftriplestore.RyaSailRepository;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java
index 7fefb28..151501d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java
@@ -27,7 +27,7 @@ import org.apache.log4j.Logger;
import org.apache.rya.indexing.pcj.fluo.api.CountStatements;
import org.apache.rya.indexing.pcj.fluo.client.PcjAdminClientCommand;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.rdftriplestore.RyaSailRepository;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
index 3e84499..20ddf17 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java
@@ -41,7 +41,7 @@ import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.rdftriplestore.RyaSailRepository;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
index c24eb66..2562378 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java
@@ -45,7 +45,7 @@ import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.rdftriplestore.RyaSailRepository;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
index ad66757..0f553d6 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java
@@ -45,7 +45,7 @@ import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.rdftriplestore.RyaSailRepository;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java
index 9a8c7f7..5ae29b6 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java
@@ -32,7 +32,7 @@ import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.rdftriplestore.RyaSailRepository;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java
index 7be539a..c5ec7cc 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java
@@ -32,7 +32,7 @@ import org.openrdf.rio.helpers.RDFHandlerBase;
import com.google.common.base.Optional;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.RdfToRyaConversions;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml
index 7396cee..7deea2d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml
@@ -53,7 +53,7 @@ under the License.
<artifactId>sesame-queryrender</artifactId>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java
index f1ec3dd..f02b099 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java
@@ -22,8 +22,8 @@ import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.openrdf.repository.RepositoryConnection;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.mini.MiniFluo;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.mini.MiniFluo;
import mvm.rya.rdftriplestore.RyaSailRepository;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java
index 1d37831..b1a1c91 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java
@@ -52,11 +52,11 @@ import org.openrdf.repository.RepositoryException;
import com.google.common.base.Optional;
import com.google.common.io.Files;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.config.ObserverConfiguration;
-import io.fluo.api.mini.MiniFluo;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.ObserverSpecification;
+import org.apache.fluo.api.mini.MiniFluo;
import mvm.rya.accumulo.AccumuloRdfConfiguration;
import mvm.rya.accumulo.AccumuloRyaDAO;
import mvm.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
@@ -297,11 +297,11 @@ public class DemoDriver {
final File miniDataDir = Files.createTempDir();
// Setup the observers that will be used by the Fluo PCJ Application.
- final List<ObserverConfiguration> observers = new ArrayList<>();
- observers.add(new ObserverConfiguration(TripleObserver.class.getName()));
- observers.add(new ObserverConfiguration(StatementPatternObserver.class.getName()));
- observers.add(new ObserverConfiguration(JoinObserver.class.getName()));
- observers.add(new ObserverConfiguration(FilterObserver.class.getName()));
+ final List<ObserverSpecification> observers = new ArrayList<>();
+ observers.add(new ObserverSpecification(TripleObserver.class.getName()));
+ observers.add(new ObserverSpecification(StatementPatternObserver.class.getName()));
+ observers.add(new ObserverSpecification(JoinObserver.class.getName()));
+ observers.add(new ObserverSpecification(FilterObserver.class.getName()));
// Provide export parameters child test classes may provide to the export observer.
final HashMap<String, String> exportParams = new HashMap<>();
@@ -313,8 +313,7 @@ public class DemoDriver {
ryaParams.setExporterPassword("password");
ryaParams.setRyaInstanceName("demo_");
- final ObserverConfiguration exportObserverConfig = new ObserverConfiguration(QueryResultObserver.class.getName());
- exportObserverConfig.setParameters( exportParams );
+ final ObserverSpecification exportObserverConfig = new ObserverSpecification(QueryResultObserver.class.getName(), exportParams);
observers.add(exportObserverConfig);
// Configure how the mini fluo will run.
@@ -326,4 +325,4 @@ public class DemoDriver {
final MiniFluo miniFluo = FluoFactory.newMiniFluo(config);
return miniFluo;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java
index 8207966..cb4420d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java
@@ -45,8 +45,8 @@ import org.openrdf.sail.SailException;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.mini.MiniFluo;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.mini.MiniFluo;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.domain.RyaType;
import mvm.rya.api.domain.RyaURI;
@@ -322,4 +322,4 @@ public class FluoAndHistoricPcjsDemo implements Demo {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
index 6ca8cd7..ef667a9 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<!-- Testing dependencies. -->
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
<scope>test</scope>
</dependency>
@@ -54,7 +54,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
</dependency>
</dependencies>