date:20161013

[3/7] incubator-rya git commit: RYA-142 updated for Fluo 1.0.0 release

2016-10-13 Thread mihalik

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 
Authored: Thu Oct 6 18:59:07 2016 -0400
Committer: Aaron Mihalik 
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 @@
test

 
-io.fluo
+org.apache.fluo
 fluo-mini
 test
 

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

[4/7] incubator-rya git commit: RYA-142 Stopped using Fluo TypeLayer

2016-10-13 Thread mihalik

RYA-142 Stopped using Fluo TypeLayer


Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/177c80a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/177c80a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/177c80a1

Branch: refs/heads/master
Commit: 177c80a1ed9845f7914610714cb7084d4877cf76
Parents: ca2743a
Author: Keith Turner 
Authored: Thu Oct 6 18:55:34 2016 -0400
Committer: Aaron Mihalik 
Committed: Thu Oct 13 12:55:44 2016 -0400

--
 .../rya/indexing/pcj/fluo/api/CreatePcj.java|  22 ++--
 .../rya/indexing/pcj/fluo/api/DeletePcj.java|  30 +++---
 .../indexing/pcj/fluo/api/GetPcjMetadata.java   |  12 +--
 .../indexing/pcj/fluo/api/InsertTriples.java|  19 +---
 .../rya/indexing/pcj/fluo/api/ListQueryIds.java |   5 +-
 extras/rya.pcj.fluo/pcj.fluo.app/pom.xml|   4 -
 .../pcj/fluo/app/FilterResultUpdater.java   |   8 +-
 .../rya/indexing/pcj/fluo/app/IncUpdateDAO.java |   9 +-
 .../pcj/fluo/app/JoinResultUpdater.java |  10 +-
 .../pcj/fluo/app/QueryResultUpdater.java|  10 +-
 .../indexing/pcj/fluo/app/StringTypeLayer.java  |  29 --
 .../app/export/IncrementalResultExporter.java   |   4 +-
 .../fluo/app/export/rya/RyaResultExporter.java  |   7 +-
 .../fluo/app/observers/BindingSetUpdater.java   |  12 +--
 .../fluo/app/observers/QueryResultObserver.java |  18 ++--
 .../pcj/fluo/app/observers/TripleObserver.java  |  30 ++
 .../fluo/app/query/FluoQueryMetadataDAO.java| 100 +--
 .../indexing/pcj/fluo/api/ListQueryIdsIT.java   |  13 ++-
 pom.xml |   6 --
 19 files changed, 127 insertions(+), 221 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 943a022..d31e578 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
@@ -29,7 +29,6 @@ import java.util.Set;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter;
-import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
 import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery;
 import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
 import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryMetadataDAO;
@@ -55,7 +54,7 @@ import org.openrdf.sail.SailException;
 
 import info.aduna.iteration.CloseableIteration;
 import org.apache.fluo.api.client.FluoClient;
-import org.apache.fluo.recipes.core.types.TypedTransaction;
+import org.apache.fluo.api.client.Transaction;
 
 /**
  * Sets up a new Pre Computed Join (PCJ) in Fluo from a SPARQL query.
@@ -76,11 +75,6 @@ import org.apache.fluo.recipes.core.types.TypedTransaction;
 public class CreatePcj {
 
 /**
- * Wraps Fluo {@link Transaction}s so that we can write String values to 
them.
- */
-private static final StringTypeLayer STRING_TYPED_LAYER = new 
StringTypeLayer();
-
-/**
  * The default Statement Pattern batch insert size is 1000.
  */
 private static final int DEFAULT_SP_INSERT_BATCH_SIZE = 1000;
@@ -150,15 +144,15 @@ public class CreatePcj {
 final ParsedQuery parsedQuery = new SPARQLParser().parseQuery(sparql, 
null);
 final FluoQuery fluoQuery = new 
SparqlFluoQueryBuilder().make(parsedQuery, nodeIds);
 
-try(TypedTransaction tx = STRING_TYPED_LAYER.wrap( 
fluo.newTransaction() )) {
+try(Transaction tx = fluo.newTransaction()) {
 // Write the query's structure to Fluo.
 new FluoQueryMetadataDAO().write(tx, fluoQuery);
 
 // The results of the query are eventually exported to an instance 
of Rya, so store the Rya ID for the PCJ.
 final String queryId = fluoQuery.getQueryMetadata().getNodeId();
-
tx.mutate().row(queryId).col(FluoQueryColumns.RYA_PCJ_ID).set(pcjId);
-
tx.mutate().row(pcjId).col(FluoQueryColumns.PCJ_ID_QUERY_ID).set(queryId);
-
+tx.set(queryId, FluoQueryColumns.RYA_PCJ_ID, pcjId);
+tx.set(pcjId, FluoQueryColumns.PCJ_ID_QUERY_ID, queryId);
+
 // Flush the changes to Fluo.
 tx.commit();
 }
@@ -206,7 +200,7 @@ public class CreatePcj {

[7/7] incubator-rya git commit: RYA-142 Removing Fluo from Geoindexing Project

2016-10-13 Thread mihalik

RYA-142 Removing Fluo from Geoindexing Project


Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a08059a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a08059a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a08059a0

Branch: refs/heads/master
Commit: a08059a0bc9a08754a17c32a6934fd6015ae61fd
Parents: 878b53a
Author: Aaron Mihalik 
Authored: Thu Oct 13 15:03:59 2016 -0400
Committer: Aaron Mihalik 
Committed: Thu Oct 13 15:03:59 2016 -0400

--
 extras/rya.geoindexing/pom.xml | 14 --
 1 file changed, 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a08059a0/extras/rya.geoindexing/pom.xml
--
diff --git a/extras/rya.geoindexing/pom.xml b/extras/rya.geoindexing/pom.xml
index d41cdc5..1c2040a 100644
--- a/extras/rya.geoindexing/pom.xml
+++ b/extras/rya.geoindexing/pom.xml
@@ -92,15 +92,6 @@
geomesa-accumulo-datastore

 
-   
-   
-   org.apache.rya
-   rya.indexing.pcj
-   
-   
-   org.apache.rya
-   rya.pcj.fluo.api
-   
 

junit
@@ -113,11 +104,6 @@
test

 
-io.fluo
-fluo-mini
-test
-
-
 org.apache.rya
 accumulo.rya
 ${project.version}

[6/7] incubator-rya git commit: RYA-187 Added 'Incubating' to artifact names

2016-10-13 Thread mihalik

RYA-187 Added 'Incubating' to artifact names

closes #102


Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/878b53a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/878b53a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/878b53a7

Branch: refs/heads/master
Commit: 878b53a77aef9e87b56a237cc60ada15d2467969
Parents: 2139edb
Author: Aaron Mihalik 
Authored: Wed Oct 12 22:12:43 2016 -0400
Committer: Aaron Mihalik 
Committed: Thu Oct 13 13:22:00 2016 -0400

--
 common/pom.xml   | 2 +-
 common/rya.api/pom.xml   | 2 +-
 common/rya.provenance/pom.xml| 2 +-
 dao/accumulo.rya/pom.xml | 2 +-
 dao/mongodb.rya/pom.xml  | 2 +-
 dao/pom.xml  | 2 +-
 extras/indexing/pom.xml  | 2 +-
 extras/indexingExample/pom.xml   | 2 +-
 extras/pom.xml   | 2 +-
 extras/rya.benchmark/pom.xml | 2 +-
 extras/rya.console/pom.xml   | 2 +-
 extras/rya.geoindexing/pom.xml   | 2 +-
 extras/rya.indexing.pcj/pom.xml  | 2 +-
 extras/rya.manual/pom.xml| 2 +-
 extras/rya.merger/pom.xml| 2 +-
 extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 2 +-
 extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 2 +-
 extras/rya.pcj.fluo/pcj.fluo.client/pom.xml  | 2 +-
 extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 2 +-
 extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 2 +-
 extras/rya.pcj.fluo/pom.xml  | 2 +-
 extras/rya.prospector/pom.xml| 2 +-
 extras/rya.reasoning/pom.xml | 2 +-
 extras/tinkerpop.rya/pom.xml | 2 +-
 extras/vagrantExample/pom.xml| 2 +-
 mapreduce/pom.xml| 2 +-
 osgi/alx.rya.console/pom.xml | 2 +-
 osgi/alx.rya/pom.xml | 2 +-
 osgi/camel.rya/pom.xml   | 2 +-
 osgi/pom.xml | 2 +-
 osgi/sesame-runtime-osgi/pom.xml | 2 +-
 pig/accumulo.pig/pom.xml | 2 +-
 pig/pom.xml  | 2 +-
 pom.xml  | 2 +-
 sail/pom.xml | 2 +-
 web/pom.xml  | 2 +-
 web/web.rya/pom.xml  | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index c14d712..0908a25 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
 
 org.apache.rya
 rya-project
-3.2.10-SNAPSHOT
+3.2.10-incubating-SNAPSHOT
 
 
 rya.common

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/common/rya.api/pom.xml
--
diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml
index 302d335..a6f434d 100644
--- a/common/rya.api/pom.xml
+++ b/common/rya.api/pom.xml
@@ -24,7 +24,7 @@ under the License.
 
 org.apache.rya
 rya.common
-3.2.10-SNAPSHOT
+3.2.10-incubating-SNAPSHOT
 
 
 rya.api

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/common/rya.provenance/pom.xml
--
diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml
index b9f749c..c233ed8 100644
--- a/common/rya.provenance/pom.xml
+++ b/common/rya.provenance/pom.xml
@@ -23,7 +23,7 @@ under the License.
 
 org.apache.rya
 rya.common
-3.2.10-SNAPSHOT
+3.2.10-incubating-SNAPSHOT
 
 
 rya.provenance

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/dao/accumulo.rya/pom.xml
--
diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml
index b837fa3..2548dc2 100644
--- a/dao/accumulo.rya/pom.xml
+++ b/dao/accumulo.rya/pom.xml
@@ -24,7 +24,7 @@ under the License.
 
 org.apache.rya
 rya.dao
-3.2.10-SNAPSHOT
+3.2.10-incubating-SNAPSHOT
 
 
 accumulo.rya

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/dao/mongodb.rya/pom.xml

[3/7] incubator-rya git commit: RYA-142 updated for Fluo 1.0.0 release

[4/7] incubator-rya git commit: RYA-142 Stopped using Fluo TypeLayer

[7/7] incubator-rya git commit: RYA-142 Removing Fluo from Geoindexing Project

[6/7] incubator-rya git commit: RYA-187 Added 'Incubating' to artifact names

4 matches

Site Navigation

Mail list logo

Footer information