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:14 UTC
[1/7] incubator-rya git commit: RYA-201 Renaming Geospatial Indexing
project
Repository: incubator-rya
Updated Branches:
refs/heads/master dd22a7d0f -> a08059a0b
RYA-201 Renaming Geospatial Indexing project
Closes #103
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a06850b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a06850b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a06850b5
Branch: refs/heads/master
Commit: a06850b56f22b6a747211b17250078623fcf86d0
Parents: dd22a7d
Author: Aaron Mihalik <mi...@alum.mit.edu>
Authored: Thu Oct 13 09:18:13 2016 -0400
Committer: Aaron Mihalik <mi...@alum.mit.edu>
Committed: Thu Oct 13 12:48:29 2016 -0400
----------------------------------------------------------------------
extras/rya.geoindexing/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a06850b5/extras/rya.geoindexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/pom.xml b/extras/rya.geoindexing/pom.xml
index a1721c8..58ab333 100644
--- a/extras/rya.geoindexing/pom.xml
+++ b/extras/rya.geoindexing/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>rya.geoindexing</artifactId>
- <name>Apache Rya Secondary Indexing</name>
+ <name>Apache Rya Geospatial Secondary Indexing (Optional)</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
[6/7] incubator-rya git commit: RYA-187 Added 'Incubating' to
artifact names
Posted by mi...@apache.org.
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 <mi...@alum.mit.edu>
Authored: Wed Oct 12 22:12:43 2016 -0400
Committer: Aaron Mihalik <mi...@alum.mit.edu>
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.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.common</artifactId>
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.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.common</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.api</artifactId>
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.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.common</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.provenance</artifactId>
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.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.dao</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>accumulo.rya</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/dao/mongodb.rya/pom.xml
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/pom.xml b/dao/mongodb.rya/pom.xml
index 2a1851b..d57fffe 100644
--- a/dao/mongodb.rya/pom.xml
+++ b/dao/mongodb.rya/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.dao</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>mongodb.rya</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/dao/pom.xml
----------------------------------------------------------------------
diff --git a/dao/pom.xml b/dao/pom.xml
index 604b30c..902b251 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.dao</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexing/pom.xml b/extras/indexing/pom.xml
index 60897b8..32cdb10 100644
--- a/extras/indexing/pom.xml
+++ b/extras/indexing/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.indexing</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/indexingExample/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexingExample/pom.xml b/extras/indexingExample/pom.xml
index 2a00e61..a392d86 100644
--- a/extras/indexingExample/pom.xml
+++ b/extras/indexingExample/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.indexing.example</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 8131627..822062c 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.extras</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/pom.xml b/extras/rya.benchmark/pom.xml
index f63be52..5f39cc8 100644
--- a/extras/rya.benchmark/pom.xml
+++ b/extras/rya.benchmark/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>rya.extras</artifactId>
<groupId>org.apache.rya</groupId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.console/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.console/pom.xml b/extras/rya.console/pom.xml
index ea5c2bb..13d1cc0 100644
--- a/extras/rya.console/pom.xml
+++ b/extras/rya.console/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.console</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.geoindexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/pom.xml b/extras/rya.geoindexing/pom.xml
index 58ab333..d41cdc5 100644
--- a/extras/rya.geoindexing/pom.xml
+++ b/extras/rya.geoindexing/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.geoindexing</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.indexing.pcj/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/pom.xml b/extras/rya.indexing.pcj/pom.xml
index 3d9bf96..c29b761 100644
--- a/extras/rya.indexing.pcj/pom.xml
+++ b/extras/rya.indexing.pcj/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.manual/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.manual/pom.xml b/extras/rya.manual/pom.xml
index 75c106a..cbb021f 100644
--- a/extras/rya.manual/pom.xml
+++ b/extras/rya.manual/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.manual</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.merger/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml
index 40f2f01..4ce8e77 100644
--- a/extras/rya.merger/pom.xml
+++ b/extras/rya.merger/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.merger</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.pcj.fluo/pcj.fluo.api/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.api/pom.xml
index 7b88b5a..beeb798 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.api/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.parent</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/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 f756cdb..49cb713 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.parent</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/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 a02aa6c..19ca203 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.parent</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/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 7deea2d..fea59b9 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.parent</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/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 ef667a9..2cc371d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.parent</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.pcj.fluo/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pom.xml b/extras/rya.pcj.fluo/pom.xml
index e50dcc3..c909cb7 100644
--- a/extras/rya.pcj.fluo/pom.xml
+++ b/extras/rya.pcj.fluo/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.prospector/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.prospector/pom.xml b/extras/rya.prospector/pom.xml
index 2ce45b9..c40d61c 100644
--- a/extras/rya.prospector/pom.xml
+++ b/extras/rya.prospector/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.prospector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/rya.reasoning/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.reasoning/pom.xml b/extras/rya.reasoning/pom.xml
index d6e3f1f..b08c15e 100644
--- a/extras/rya.reasoning/pom.xml
+++ b/extras/rya.reasoning/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.reasoning</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/tinkerpop.rya/pom.xml
----------------------------------------------------------------------
diff --git a/extras/tinkerpop.rya/pom.xml b/extras/tinkerpop.rya/pom.xml
index b92eb96..720db67 100644
--- a/extras/tinkerpop.rya/pom.xml
+++ b/extras/tinkerpop.rya/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>tinkerpop.rya</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/extras/vagrantExample/pom.xml
----------------------------------------------------------------------
diff --git a/extras/vagrantExample/pom.xml b/extras/vagrantExample/pom.xml
index 937952e..82743f0 100644
--- a/extras/vagrantExample/pom.xml
+++ b/extras/vagrantExample/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.extras</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.vagrant.example</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/mapreduce/pom.xml b/mapreduce/pom.xml
index 40dd1df..9274c94 100644
--- a/mapreduce/pom.xml
+++ b/mapreduce/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.mapreduce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/osgi/alx.rya.console/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/alx.rya.console/pom.xml b/osgi/alx.rya.console/pom.xml
index 9f5020c..4cbede1 100644
--- a/osgi/alx.rya.console/pom.xml
+++ b/osgi/alx.rya.console/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.osgi</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>alx.rya.console</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/osgi/alx.rya/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/alx.rya/pom.xml b/osgi/alx.rya/pom.xml
index e2ca105..7433e7f 100644
--- a/osgi/alx.rya/pom.xml
+++ b/osgi/alx.rya/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.osgi</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>alx.rya</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/osgi/camel.rya/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/camel.rya/pom.xml b/osgi/camel.rya/pom.xml
index ade8e03..c642245 100644
--- a/osgi/camel.rya/pom.xml
+++ b/osgi/camel.rya/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.osgi</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>camel.rya</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 7775ddb..393e0e3 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/osgi/sesame-runtime-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/sesame-runtime-osgi/pom.xml b/osgi/sesame-runtime-osgi/pom.xml
index c454a66..ce55927 100644
--- a/osgi/sesame-runtime-osgi/pom.xml
+++ b/osgi/sesame-runtime-osgi/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.osgi</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>sesame-runtime-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/pig/accumulo.pig/pom.xml
----------------------------------------------------------------------
diff --git a/pig/accumulo.pig/pom.xml b/pig/accumulo.pig/pom.xml
index f1326b9..ca04848 100644
--- a/pig/accumulo.pig/pom.xml
+++ b/pig/accumulo.pig/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pig</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>accumulo.pig</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/pig/pom.xml
----------------------------------------------------------------------
diff --git a/pig/pom.xml b/pig/pom.xml
index 2df2d1c..1a7e579 100644
--- a/pig/pom.xml
+++ b/pig/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.pig</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ca4505..e42076e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ under the License.
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/sail/pom.xml
----------------------------------------------------------------------
diff --git a/sail/pom.xml b/sail/pom.xml
index 9b2de30..54bfa41 100644
--- a/sail/pom.xml
+++ b/sail/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.sail</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/web/pom.xml
----------------------------------------------------------------------
diff --git a/web/pom.xml b/web/pom.xml
index bcc7f7a..97a31df 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya-project</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>rya.web</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/878b53a7/web/web.rya/pom.xml
----------------------------------------------------------------------
diff --git a/web/web.rya/pom.xml b/web/web.rya/pom.xml
index 26283b5..01ba3fb 100644
--- a/web/web.rya/pom.xml
+++ b/web/web.rya/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.rya</groupId>
<artifactId>rya.web</artifactId>
- <version>3.2.10-SNAPSHOT</version>
+ <version>3.2.10-incubating-SNAPSHOT</version>
</parent>
<artifactId>web.rya</artifactId>
[4/7] incubator-rya git commit: RYA-142 Stopped using Fluo TypeLayer
Posted by mi...@apache.org.
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 <ke...@deenlo.com>
Authored: Thu Oct 6 18:55:34 2016 -0400
Committer: Aaron Mihalik <mi...@alum.mit.edu>
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 {
final BindingSetStringConverter converter = new BindingSetStringConverter();
- try(TypedTransaction tx = STRING_TYPED_LAYER.wrap(fluo.newTransaction())) {
+ try(Transaction tx = fluo.newTransaction()) {
// Get the node's variable order.
final String spNodeId = spMetadata.getNodeId();
final VariableOrder varOrder = spMetadata.getVariableOrder();
@@ -221,9 +215,7 @@ public class CreatePcj {
final String bindingSetStr = converter.convert(spBindingSet, varOrder);
// Write the binding set entry to Fluo for the statement pattern.
- tx.mutate().row(spNodeId + NODEID_BS_DELIM + bindingSetStr)
- .col(FluoQueryColumns.STATEMENT_PATTERN_BINDING_SET)
- .set(bindingSetStr);
+ tx.set(spNodeId + NODEID_BS_DELIM + bindingSetStr, FluoQueryColumns.STATEMENT_PATTERN_BINDING_SET, bindingSetStr);
}
tx.commit();
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/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 e1a9b8e..79ca0ea 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
@@ -28,7 +28,6 @@ import java.util.List;
import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.rya.indexing.pcj.fluo.app.NodeType;
-import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryMetadataDAO;
@@ -43,7 +42,6 @@ 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.
@@ -174,7 +172,7 @@ public class DeletePcj {
requireNonNull(nodeIds);
requireNonNull(pcjId);
- try (final TypedTransaction typeTx = new StringTypeLayer().wrap(tx)) {
+ try (final Transaction typeTx = tx) {
deletePcjIdAndSparqlMetadata(typeTx, pcjId);
for (final String nodeId : nodeIds) {
@@ -192,7 +190,7 @@ public class DeletePcj {
* @param nodeId - The Node ID of the query node to delete. (not null)
* @param columns - The columns that will be deleted. (not null)
*/
- private void deleteMetadataColumns(final TypedTransaction tx, final String nodeId, final List<Column> columns) {
+ private void deleteMetadataColumns(final Transaction tx, final String nodeId, final List<Column> columns) {
requireNonNull(tx);
requireNonNull(columns);
requireNonNull(nodeId);
@@ -211,15 +209,15 @@ public class DeletePcj {
* @param tx - Transaction the deletes will be performed with. (not null)
* @param pcjId - The PCJ whose metadata will be deleted. (not null)
*/
- private void deletePcjIdAndSparqlMetadata(final TypedTransaction tx, final String pcjId) {
+ private void deletePcjIdAndSparqlMetadata(final Transaction tx, final String pcjId) {
requireNonNull(tx);
requireNonNull(pcjId);
final String queryId = getQueryIdFromPcjId(tx, pcjId);
final String sparql = getSparqlFromQueryId(tx, queryId);
- tx.delete(Bytes.of(queryId), FluoQueryColumns.RYA_PCJ_ID);
- tx.delete(Bytes.of(sparql), FluoQueryColumns.QUERY_ID);
- tx.delete(Bytes.of(pcjId), FluoQueryColumns.PCJ_ID_QUERY_ID);
+ tx.delete(queryId, FluoQueryColumns.RYA_PCJ_ID);
+ tx.delete(sparql, FluoQueryColumns.QUERY_ID);
+ tx.delete(pcjId, FluoQueryColumns.PCJ_ID_QUERY_ID);
}
@@ -253,17 +251,19 @@ public class DeletePcj {
requireNonNull(scanner);
requireNonNull(column);
- int count = 0;
- Iterator<RowColumnValue> iter = scanner.iterator();
- while (iter.hasNext() && count < batchSize) {
+ try(Transaction ntx = tx) {
+ 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;
+ final boolean hasNext = iter.hasNext();
+ tx.commit();
+ return hasNext;
+ }
}
private String getQueryIdFromPcjId(final Transaction tx, final String pcjId) {
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/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 d8c800e..061a1d5 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
@@ -24,15 +24,14 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
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 org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.Snapshot;
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.
@@ -87,13 +86,12 @@ public class GetPcjMetadata {
// Lookup the Rya PCJ ID associated with the query.
String pcjId = null;
- try(TypedSnapshot snap = new StringTypeLayer().wrap( fluo.newSnapshot() ) ) {
- final Bytes pcjIdBytes = snap.get(Bytes.of(queryId), FluoQueryColumns.RYA_PCJ_ID);
- if(pcjIdBytes == null) {
+ try(Snapshot snap = fluo.newSnapshot() ) {
+ pcjId = snap.gets(queryId, FluoQueryColumns.RYA_PCJ_ID);
+ if(pcjId == null) {
throw new NotInFluoException("Could not get the PcjMetadata for queryId '" + queryId +
"' because a Rya PCJ ID not stored in the Fluo table.");
}
- pcjId = pcjIdBytes.toString();
}
// Fetch the metadata from the storage.
@@ -128,4 +126,4 @@ public class GetPcjMetadata {
super(message, cause);
}
}
-}
\ No newline at end of file
+}
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/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 1f45388..b184ff3 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
@@ -25,15 +25,13 @@ import java.util.Collections;
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import com.google.common.base.Optional;
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 org.apache.fluo.api.client.Transaction;
+import org.apache.fluo.api.data.Bytes;
import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.triple.TripleRow;
@@ -48,17 +46,10 @@ public class InsertTriples {
private static final Logger log = Logger.getLogger(InsertTriples.class);
/**
- * Wraps Fluo {@link Transaction}s so that we can write String values to them.
- */
- private static final StringTypeLayer STRING_TYPED_LAYER = new StringTypeLayer();
-
- /**
* Converts triples into the byte[] used as the row ID in Accumulo.
*/
private static final WholeRowTripleResolver TRIPLE_RESOLVER = new WholeRowTripleResolver();
- private static final Encoder ENCODER = new StringEncoder();
-
// TODO visiblity is part of RyaStatement. Put it there instead.
/**
@@ -85,10 +76,10 @@ public class InsertTriples {
checkNotNull(triples);
checkNotNull(visibility);
- try(TypedTransaction tx = STRING_TYPED_LAYER.wrap(fluo.newTransaction())) {
+ try(Transaction tx = fluo.newTransaction()) {
for(final RyaStatement triple : triples) {
try {
- tx.mutate().row(spoFormat(triple)).col(FluoQueryColumns.TRIPLES).set(ENCODER.encode(visibility.or("")));
+ tx.set(Bytes.of(spoFormat(triple)), FluoQueryColumns.TRIPLES, Bytes.of(visibility.or("")));
} catch (final TripleRowResolverException e) {
log.error("Could not convert a Triple into the SPO format: " + triple);
}
@@ -111,4 +102,4 @@ public class InsertTriples {
final TripleRow spoRow = serialized.get(TABLE_LAYOUT.SPO);
return spoRow.getRow();
}
-}
\ No newline at end of file
+}
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/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 3913e41..df1648b 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
@@ -24,13 +24,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
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.RowColumnValue;
-import org.apache.fluo.recipes.core.types.TypedSnapshot;
/**
* Finds all queries that are being managed by this instance of Fluo that
@@ -51,7 +50,7 @@ public class ListQueryIds {
final List<String> queryIds = new ArrayList<>();
- try(TypedSnapshot snap = new StringTypeLayer().wrap( fluo.newSnapshot() )) {
+ try(Snapshot snap = fluo.newSnapshot() ) {
// Create an iterator that iterates over the QUERY_ID column.
final CellScanner cellScanner = snap.scanner().fetch( FluoQueryColumns.QUERY_ID).build();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 45ea9ce..f756cdb 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
@@ -56,10 +56,6 @@ under the License.
<artifactId>fluo-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.fluo</groupId>
- <artifactId>fluo-recipes-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-core</artifactId>
<exclusions>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 328c653..b1af4fc 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
@@ -52,8 +52,6 @@ import info.aduna.iteration.CloseableIteration;
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
@@ -62,8 +60,6 @@ import org.apache.fluo.recipes.core.types.StringEncoder;
@ParametersAreNonnullByDefault
public class FilterResultUpdater {
- private static final Encoder ENCODER = new StringEncoder();
-
private static final BindingSetStringConverter ID_CONVERTER = new BindingSetStringConverter();
private static final VisibilityBindingSetStringConverter VALUE_CONVERTER = new VisibilityBindingSetStringConverter();
@@ -134,9 +130,9 @@ public class FilterResultUpdater {
String filterBindingSetValueString = "";
filterBindingSetValueString = VALUE_CONVERTER.convert(childBindingSet, filterVarOrder);
- final Bytes row = ENCODER.encode( filterMetadata.getNodeId() + NODEID_BS_DELIM + filterBindingSetIdString );
+ final String row = filterMetadata.getNodeId() + NODEID_BS_DELIM + filterBindingSetIdString;
final Column col = FluoQueryColumns.FILTER_BINDING_SET;
- final Bytes value = ENCODER.encode(filterBindingSetValueString);
+ final String value = filterBindingSetValueString;
tx.set(row, col, value);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 7ccfeff..513ab40 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
@@ -25,11 +25,11 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.UR
import org.apache.fluo.api.client.FluoClient;
import org.apache.fluo.api.client.Snapshot;
+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.recipes.core.types.TypedTransaction;
import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.resolver.triple.TripleRow;
@@ -38,7 +38,6 @@ import mvm.rya.api.resolver.triple.impl.WholeRowTripleResolver;
public class IncUpdateDAO {
- private static final StringTypeLayer stl = new StringTypeLayer();
private static final WholeRowTripleResolver tr = new WholeRowTripleResolver();
public static RyaStatement deserializeTriple(final Bytes row) {
@@ -77,7 +76,7 @@ public class IncUpdateDAO {
*/
public static void addRow(final FluoClient fluoClient, final String row, final Column col, final String val) {
checkNotNull(fluoClient);
- try (TypedTransaction tx = stl.wrap(fluoClient.newTransaction())) {
+ try (Transaction tx = fluoClient.newTransaction()) {
addRow(tx, row, col, val);
tx.commit();
}
@@ -91,9 +90,9 @@ public class IncUpdateDAO {
* @param col - The Column.
* @param val - The value.
*/
- public static void addRow(final TypedTransaction tx, final String row, final Column col, final String val) {
+ public static void addRow(final Transaction tx, final String row, final Column col, final String val) {
checkNotNull(tx);
- tx.mutate().row(row).col(col).set(val);
+ tx.set(row, col, val);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 5ac69b0..73a03ca 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
@@ -49,12 +49,9 @@ import com.google.common.collect.Sets;
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
@@ -67,8 +64,7 @@ public class JoinResultUpdater {
private static final VisibilityBindingSetStringConverter valueConverter = new VisibilityBindingSetStringConverter();
private final FluoQueryMetadataDAO queryDao = new FluoQueryMetadataDAO();
- private final Encoder encoder = new StringEncoder();
-
+
/**
* Updates the results of a Join node when one of its children has added a
* new Binding Set to its results.
@@ -132,9 +128,9 @@ public class JoinResultUpdater {
final String joinBindingSetStringId = idConverter.convert(newJoinResult, joinVarOrder);
final String joinBindingSetStringValue = valueConverter.convert(newJoinResult, joinVarOrder);
- final Bytes row = encoder.encode(joinMetadata.getNodeId() + NODEID_BS_DELIM + joinBindingSetStringId);
+ final String row = joinMetadata.getNodeId() + NODEID_BS_DELIM + joinBindingSetStringId;
final Column col = FluoQueryColumns.JOIN_BINDING_SET;
- final Bytes value = encoder.encode(joinBindingSetStringValue);
+ final String value = joinBindingSetStringValue;
tx.set(row, col, value);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 41f9025..b4800fc 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
@@ -33,10 +33,7 @@ import org.openrdf.query.Binding;
import org.openrdf.query.impl.MapBindingSet;
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
@@ -44,8 +41,7 @@ import org.apache.fluo.recipes.core.types.StringEncoder;
*/
@ParametersAreNonnullByDefault
public class QueryResultUpdater {
- private final Encoder encoder = new StringEncoder();
-
+
private final BindingSetStringConverter converter = new BindingSetStringConverter();
private final VisibilityBindingSetStringConverter valueConverter = new VisibilityBindingSetStringConverter();
@@ -79,9 +75,9 @@ public class QueryResultUpdater {
final String queryBindingSetValueString = valueConverter.convert(new VisibilityBindingSet(queryBindingSet, childBindingSet.getVisibility()), queryVarOrder);
// Commit it to the Fluo table for the SPARQL query. This isn't guaranteed to be a new entry.
- final Bytes row = encoder.encode(queryMetadata.getNodeId() + NODEID_BS_DELIM + queryBindingSetString);
+ final String row = queryMetadata.getNodeId() + NODEID_BS_DELIM + queryBindingSetString;
final Column col = FluoQueryColumns.QUERY_BINDING_SET;
- final Bytes value = encoder.encode(queryBindingSetValueString);
+ final String value = queryBindingSetValueString;
tx.set(row, col, value);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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
deleted file mode 100644
index aecb434..0000000
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/StringTypeLayer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rya.indexing.pcj.fluo.app;
-
-import org.apache.fluo.recipes.core.types.StringEncoder;
-import org.apache.fluo.recipes.core.types.TypeLayer;
-
-public class StringTypeLayer extends TypeLayer {
-
- public StringTypeLayer() {
- super(new StringEncoder());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 a7f016d..ecc39bd 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
@@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.fluo.app.export;
import javax.annotation.ParametersAreNonnullByDefault;
+import org.apache.fluo.api.client.TransactionBase;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
-import org.apache.fluo.recipes.core.types.TypedTransactionBase;
/**
* Exports a single Binding Set that is a new result for a SPARQL query to some
@@ -40,7 +40,7 @@ public interface IncrementalResultExporter {
* Fluo application. (not null)
* @throws ResultExportException The result could not be exported.
*/
- public void export(TypedTransactionBase tx, String queryId, VisibilityBindingSet result) throws ResultExportException;
+ public void export(TransactionBase tx, String queryId, VisibilityBindingSet result) throws ResultExportException;
/**
* A result could not be exported.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 27530f0..a4b589f 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
@@ -27,9 +27,8 @@ import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
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 org.apache.fluo.api.client.TransactionBase;
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.
@@ -49,14 +48,14 @@ public class RyaResultExporter implements IncrementalResultExporter {
@Override
public void export(
- final TypedTransactionBase fluoTx,
+ final TransactionBase fluoTx,
final String queryId,
final VisibilityBindingSet result) throws ResultExportException {
checkNotNull(fluoTx);
checkNotNull(queryId);
checkNotNull(result);
- final String pcjId = fluoTx.get(Bytes.of(queryId), FluoQueryColumns.RYA_PCJ_ID).toString();
+ final String pcjId = fluoTx.gets(queryId, FluoQueryColumns.RYA_PCJ_ID);
try {
pcjStorage.addResults(pcjId, Collections.singleton(result));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 e344b0a..a2953cf 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
@@ -37,10 +37,7 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
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;
+import org.apache.fluo.api.observer.AbstractObserver;
/**
* Notified when the results of a node have been updated to include a new Binding
@@ -48,9 +45,8 @@ import org.apache.fluo.recipes.core.types.TypedTransactionBase;
* results.
*/
@ParametersAreNonnullByDefault
-public abstract class BindingSetUpdater extends TypedObserver {
+public abstract class BindingSetUpdater extends AbstractObserver {
- private final Encoder encoder = new StringEncoder();
// DAO
private final FluoQueryMetadataDAO queryDao = new FluoQueryMetadataDAO();
@@ -72,12 +68,12 @@ public abstract class BindingSetUpdater extends TypedObserver {
public abstract Observation parseObservation(TransactionBase tx, final BindingSetRow parsedRow);
@Override
- public final void process(final TypedTransactionBase tx, final Bytes row, final Column col) {
+ public final void process(final TransactionBase tx, final Bytes row, final Column col) {
checkNotNull(tx);
checkNotNull(row);
checkNotNull(col);
- final String bindingSetString = encoder.decodeString(tx.get(row, col));
+ final String bindingSetString = tx.get(row, col).toString();
final Observation observation = parseObservation( tx, new BindingSetRow(BindingSetRow.make(row).getNodeId(), bindingSetString) );
final String observedNodeId = observation.getObservedNodeId();
final VisibilityBindingSet observedBindingSet = observation.getObservedBindingSet();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 638b1fc..0944f9b 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
@@ -38,23 +38,19 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringCo
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
-
+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;
+import org.apache.fluo.api.observer.AbstractObserver;
import mvm.rya.accumulo.utils.VisibilitySimplifier;
/**
* Performs incremental result exporting to the configured destinations.
*/
-public class QueryResultObserver extends TypedObserver {
+public class QueryResultObserver extends AbstractObserver {
private static final Logger log = Logger.getLogger(QueryResultObserver.class);
private static final FluoQueryMetadataDAO QUERY_DAO = new FluoQueryMetadataDAO();
- private static final Encoder ENCODER = new StringEncoder();
private static final VisibilityBindingSetStringConverter CONVERTER = new VisibilityBindingSetStringConverter();
/**
@@ -107,11 +103,13 @@ public class QueryResultObserver extends TypedObserver {
}
@Override
- public void process(final TypedTransactionBase tx, final Bytes row, final Column col) {
+ public void process(final TransactionBase tx, final Bytes brow, final Column col) {
+ final String row = brow.toString();
+
// Read the SPARQL query and it Binding Set from the row id.
- final String[] queryAndBindingSet = ENCODER.decodeString(row).split(NODEID_BS_DELIM);
+ final String[] queryAndBindingSet = row.split(NODEID_BS_DELIM);
final String queryId = queryAndBindingSet[0];
- final String bindingSetString = ENCODER.decodeString(tx.get(row, col));
+ final String bindingSetString = tx.gets(row, col);
// Fetch the query's Variable Order from the Fluo table.
final QueryMetadata queryMetadata = QUERY_DAO.readQueryMetadata(tx, queryId);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 31a4c29..70f1cbd 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
@@ -26,7 +26,6 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.VA
import java.util.Map;
import org.apache.rya.indexing.pcj.fluo.app.IncUpdateDAO;
-import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns;
import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryMetadataDAO;
import org.apache.rya.indexing.pcj.fluo.app.query.StatementPatternMetadata;
@@ -35,32 +34,26 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet;
import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetStringConverter;
import com.google.common.collect.Maps;
-
+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;
-import org.apache.fluo.recipes.core.types.TypedObserver;
-import org.apache.fluo.recipes.core.types.TypedTransactionBase;
+import org.apache.fluo.api.observer.AbstractObserver;
/**
* An observer that matches new Triples to the Statement Patterns that are part
* of any PCJ that is being maintained. If the triple matches a pattern, then
* the new result is stored as a binding set for the pattern.
*/
-public class TripleObserver extends TypedObserver {
+public class TripleObserver extends AbstractObserver {
- private static final Encoder ENCODER = new StringEncoder();
private static final FluoQueryMetadataDAO QUERY_DAO = new FluoQueryMetadataDAO();
private static final VisibilityBindingSetStringConverter CONVERTER = new VisibilityBindingSetStringConverter();
- public TripleObserver() {
- super(new StringTypeLayer());
- }
+ public TripleObserver() {}
@Override
public ObservedColumn getObservedColumn() {
@@ -68,15 +61,12 @@ public class TripleObserver extends TypedObserver {
}
@Override
- public void process(final TypedTransactionBase tx, final Bytes row, final Column column) {
+ public void process(final TransactionBase tx, final Bytes brow, final Column column) {
//get string representation of triple
- final String triple = IncUpdateDAO.getTripleString(row);
- final Bytes visiBytes = tx.get(row, FluoQueryColumns.TRIPLES);
- String visibility = "";
- if(visiBytes != null) {
- visibility = ENCODER.decodeString(visiBytes);
- }
-
+ String row = brow.toString();
+ final String triple = IncUpdateDAO.getTripleString(brow);
+ String visibility = tx.gets(row, FluoQueryColumns.TRIPLES, "");
+
//get variable metadata for all SP in table
RowScanner rscanner = tx.scanner().over(Span.prefix(SP_PREFIX)).fetch(FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER).byRow().build();
@@ -100,7 +90,7 @@ public class TripleObserver extends TypedObserver {
CONVERTER.convert(bindingSetString, varOrder),
visibility);
final String valueString = CONVERTER.convert(bindingSet, varOrder);
- tx.mutate().row(spID + NODEID_BS_DELIM + bindingSetString).col(FluoQueryColumns.STATEMENT_PATTERN_BINDING_SET).set(valueString);
+ tx.set(spID + NODEID_BS_DELIM + bindingSetString, FluoQueryColumns.STATEMENT_PATTERN_BINDING_SET, valueString);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/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 a955a53..8d41c61 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
@@ -34,8 +34,6 @@ 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
@@ -44,8 +42,6 @@ import org.apache.fluo.recipes.core.types.StringEncoder;
@ParametersAreNonnullByDefault
public class FluoQueryMetadataDAO {
- private static final Encoder encoder = new StringEncoder();
-
/**
* Write an instance of {@link QueryMetadata} to the Fluo table.
*
@@ -56,11 +52,11 @@ public class FluoQueryMetadataDAO {
checkNotNull(tx);
checkNotNull(metadata);
- final Bytes rowId = encoder.encode(metadata.getNodeId());
+ final String rowId = metadata.getNodeId();
tx.set(rowId, FluoQueryColumns.QUERY_NODE_ID, rowId);
- tx.set(rowId, FluoQueryColumns.QUERY_VARIABLE_ORDER, encoder.encode( metadata.getVariableOrder().toString() ));
- tx.set(rowId, FluoQueryColumns.QUERY_SPARQL, encoder.encode( metadata.getSparql() ));
- tx.set(rowId, FluoQueryColumns.QUERY_CHILD_NODE_ID, encoder.encode( metadata.getChildNodeId() ));
+ tx.set(rowId, FluoQueryColumns.QUERY_VARIABLE_ORDER, metadata.getVariableOrder().toString());
+ tx.set(rowId, FluoQueryColumns.QUERY_SPARQL, metadata.getSparql() );
+ tx.set(rowId, FluoQueryColumns.QUERY_CHILD_NODE_ID, metadata.getChildNodeId() );
}
/**
@@ -79,18 +75,18 @@ public class FluoQueryMetadataDAO {
checkNotNull(nodeId);
// Fetch the values from the Fluo table.
- final Bytes rowId = encoder.encode(nodeId);
- final Map<Column, Bytes> values = sx.get(rowId, Sets.newHashSet(
+ final String rowId = nodeId;
+ final Map<Column, String> values = sx.gets(rowId,
FluoQueryColumns.QUERY_VARIABLE_ORDER,
FluoQueryColumns.QUERY_SPARQL,
- FluoQueryColumns.QUERY_CHILD_NODE_ID));
+ FluoQueryColumns.QUERY_CHILD_NODE_ID);
// Return an object holding them.
- final String varOrderString = encoder.decodeString( values.get(FluoQueryColumns.QUERY_VARIABLE_ORDER));
+ final String varOrderString = values.get(FluoQueryColumns.QUERY_VARIABLE_ORDER);
final VariableOrder varOrder = new VariableOrder(varOrderString);
- final String sparql = encoder.decodeString( values.get(FluoQueryColumns.QUERY_SPARQL) );
- final String childNodeId = encoder.decodeString( values.get(FluoQueryColumns.QUERY_CHILD_NODE_ID) );
+ final String sparql = values.get(FluoQueryColumns.QUERY_SPARQL);
+ final String childNodeId = values.get(FluoQueryColumns.QUERY_CHILD_NODE_ID);
return QueryMetadata.builder(nodeId)
.setVariableOrder( varOrder )
@@ -108,13 +104,13 @@ public class FluoQueryMetadataDAO {
checkNotNull(tx);
checkNotNull(metadata);
- final Bytes rowId = encoder.encode(metadata.getNodeId());
+ final String rowId = metadata.getNodeId();
tx.set(rowId, FluoQueryColumns.FILTER_NODE_ID, rowId);
- tx.set(rowId, FluoQueryColumns.FILTER_VARIABLE_ORDER, encoder.encode( metadata.getVariableOrder().toString() ));
- tx.set(rowId, FluoQueryColumns.FILTER_ORIGINAL_SPARQL, encoder.encode( metadata.getOriginalSparql() ));
- tx.set(rowId, FluoQueryColumns.FILTER_INDEX_WITHIN_SPARQL, encoder.encode( metadata.getFilterIndexWithinSparql() ));
- tx.set(rowId, FluoQueryColumns.FILTER_PARENT_NODE_ID, encoder.encode( metadata.getParentNodeId() ));
- tx.set(rowId, FluoQueryColumns.FILTER_CHILD_NODE_ID, encoder.encode( metadata.getChildNodeId() ));
+ tx.set(rowId, FluoQueryColumns.FILTER_VARIABLE_ORDER, metadata.getVariableOrder().toString());
+ tx.set(rowId, FluoQueryColumns.FILTER_ORIGINAL_SPARQL, metadata.getOriginalSparql() );
+ tx.set(rowId, FluoQueryColumns.FILTER_INDEX_WITHIN_SPARQL, metadata.getFilterIndexWithinSparql()+"" );
+ tx.set(rowId, FluoQueryColumns.FILTER_PARENT_NODE_ID, metadata.getParentNodeId() );
+ tx.set(rowId, FluoQueryColumns.FILTER_CHILD_NODE_ID, metadata.getChildNodeId() );
}
/**
@@ -133,22 +129,22 @@ public class FluoQueryMetadataDAO {
checkNotNull(nodeId);
// Fetch the values from the Fluo table.
- final Bytes rowId = encoder.encode(nodeId);
- final Map<Column, Bytes> values = sx.get(rowId, Sets.newHashSet(
+ final String rowId = nodeId;
+ final Map<Column, String> values = sx.gets(rowId,
FluoQueryColumns.FILTER_VARIABLE_ORDER,
FluoQueryColumns.FILTER_ORIGINAL_SPARQL,
FluoQueryColumns.FILTER_INDEX_WITHIN_SPARQL,
FluoQueryColumns.FILTER_PARENT_NODE_ID,
- FluoQueryColumns.FILTER_CHILD_NODE_ID));
+ FluoQueryColumns.FILTER_CHILD_NODE_ID);
// Return an object holding them.
- final String varOrderString = encoder.decodeString( values.get(FluoQueryColumns.FILTER_VARIABLE_ORDER));
+ final String varOrderString = values.get(FluoQueryColumns.FILTER_VARIABLE_ORDER);
final VariableOrder varOrder = new VariableOrder(varOrderString);
- final String originalSparql = encoder.decodeString( values.get(FluoQueryColumns.FILTER_ORIGINAL_SPARQL) );
- final int filterIndexWithinSparql = encoder.decodeInteger( values.get(FluoQueryColumns.FILTER_INDEX_WITHIN_SPARQL) );
- final String parentNodeId = encoder.decodeString( values.get(FluoQueryColumns.FILTER_PARENT_NODE_ID) );
- final String childNodeId = encoder.decodeString( values.get(FluoQueryColumns.FILTER_CHILD_NODE_ID) );
+ final String originalSparql = values.get(FluoQueryColumns.FILTER_ORIGINAL_SPARQL);
+ final int filterIndexWithinSparql = Integer.parseInt(values.get(FluoQueryColumns.FILTER_INDEX_WITHIN_SPARQL));
+ final String parentNodeId = values.get(FluoQueryColumns.FILTER_PARENT_NODE_ID);
+ final String childNodeId = values.get(FluoQueryColumns.FILTER_CHILD_NODE_ID);
return FilterMetadata.builder(nodeId)
.setVarOrder(varOrder)
@@ -168,13 +164,13 @@ public class FluoQueryMetadataDAO {
checkNotNull(tx);
checkNotNull(metadata);
- final Bytes rowId = encoder.encode(metadata.getNodeId());
+ final String rowId = metadata.getNodeId();
tx.set(rowId, FluoQueryColumns.JOIN_NODE_ID, rowId);
- tx.set(rowId, FluoQueryColumns.JOIN_VARIABLE_ORDER, encoder.encode( metadata.getVariableOrder().toString() ));
- tx.set(rowId, FluoQueryColumns.JOIN_TYPE, encoder.encode(metadata.getJoinType().toString()) );
- tx.set(rowId, FluoQueryColumns.JOIN_PARENT_NODE_ID, encoder.encode( metadata.getParentNodeId() ));
- tx.set(rowId, FluoQueryColumns.JOIN_LEFT_CHILD_NODE_ID, encoder.encode( metadata.getLeftChildNodeId() ));
- tx.set(rowId, FluoQueryColumns.JOIN_RIGHT_CHILD_NODE_ID, encoder.encode( metadata.getRightChildNodeId() ));
+ tx.set(rowId, FluoQueryColumns.JOIN_VARIABLE_ORDER, metadata.getVariableOrder().toString());
+ tx.set(rowId, FluoQueryColumns.JOIN_TYPE, metadata.getJoinType().toString() );
+ tx.set(rowId, FluoQueryColumns.JOIN_PARENT_NODE_ID, metadata.getParentNodeId() );
+ tx.set(rowId, FluoQueryColumns.JOIN_LEFT_CHILD_NODE_ID, metadata.getLeftChildNodeId() );
+ tx.set(rowId, FluoQueryColumns.JOIN_RIGHT_CHILD_NODE_ID, metadata.getRightChildNodeId() );
}
/**
@@ -193,24 +189,24 @@ public class FluoQueryMetadataDAO {
checkNotNull(nodeId);
// Fetch the values from the Fluo table.
- final Bytes rowId = encoder.encode(nodeId);
- final Map<Column, Bytes> values = sx.get(rowId, Sets.newHashSet(
+ final String rowId = nodeId;
+ final Map<Column, String> values = sx.gets(rowId,
FluoQueryColumns.JOIN_VARIABLE_ORDER,
FluoQueryColumns.JOIN_TYPE,
FluoQueryColumns.JOIN_PARENT_NODE_ID,
FluoQueryColumns.JOIN_LEFT_CHILD_NODE_ID,
- FluoQueryColumns.JOIN_RIGHT_CHILD_NODE_ID));
+ FluoQueryColumns.JOIN_RIGHT_CHILD_NODE_ID);
// Return an object holding them.
- final String varOrderString = encoder.decodeString( values.get(FluoQueryColumns.JOIN_VARIABLE_ORDER));
+ final String varOrderString = values.get(FluoQueryColumns.JOIN_VARIABLE_ORDER);
final VariableOrder varOrder = new VariableOrder(varOrderString);
- final String joinTypeString = encoder.decodeString( values.get(FluoQueryColumns.JOIN_TYPE) );
+ final String joinTypeString = values.get(FluoQueryColumns.JOIN_TYPE);
final JoinType joinType = JoinType.valueOf(joinTypeString);
- final String parentNodeId = encoder.decodeString( values.get(FluoQueryColumns.JOIN_PARENT_NODE_ID) );
- final String leftChildNodeId = encoder.decodeString( values.get(FluoQueryColumns.JOIN_LEFT_CHILD_NODE_ID) );
- final String rightChildNodeId = encoder.decodeString( values.get(FluoQueryColumns.JOIN_RIGHT_CHILD_NODE_ID) );
+ final String parentNodeId = values.get(FluoQueryColumns.JOIN_PARENT_NODE_ID);
+ final String leftChildNodeId = values.get(FluoQueryColumns.JOIN_LEFT_CHILD_NODE_ID);
+ final String rightChildNodeId = values.get(FluoQueryColumns.JOIN_RIGHT_CHILD_NODE_ID);
return JoinMetadata.builder(nodeId)
.setVariableOrder(varOrder)
@@ -230,11 +226,11 @@ public class FluoQueryMetadataDAO {
checkNotNull(tx);
checkNotNull(metadata);
- final Bytes rowId = encoder.encode(metadata.getNodeId());
+ final String rowId = metadata.getNodeId();
tx.set(rowId, FluoQueryColumns.STATEMENT_PATTERN_NODE_ID, rowId);
- tx.set(rowId, FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER, encoder.encode( metadata.getVariableOrder().toString() ));
- tx.set(rowId, FluoQueryColumns.STATEMENT_PATTERN_PATTERN, encoder.encode( metadata.getStatementPattern() ));
- tx.set(rowId, FluoQueryColumns.STATEMENT_PATTERN_PARENT_NODE_ID, encoder.encode( metadata.getParentNodeId() ));
+ tx.set(rowId, FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER, metadata.getVariableOrder().toString());
+ tx.set(rowId, FluoQueryColumns.STATEMENT_PATTERN_PATTERN, metadata.getStatementPattern() );
+ tx.set(rowId, FluoQueryColumns.STATEMENT_PATTERN_PARENT_NODE_ID, metadata.getParentNodeId());
}
/**
@@ -253,18 +249,18 @@ public class FluoQueryMetadataDAO {
checkNotNull(nodeId);
// Fetch the values from the Fluo table.
- final Bytes rowId = encoder.encode(nodeId);
- final Map<Column, Bytes> values = sx.get(rowId, Sets.newHashSet(
+ final String rowId = nodeId;
+ final Map<Column, String> values = sx.gets(rowId,
FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER,
FluoQueryColumns.STATEMENT_PATTERN_PATTERN,
- FluoQueryColumns.STATEMENT_PATTERN_PARENT_NODE_ID));
+ FluoQueryColumns.STATEMENT_PATTERN_PARENT_NODE_ID);
// Return an object holding them.
- final String varOrderString = encoder.decodeString( values.get(FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER));
+ final String varOrderString = values.get(FluoQueryColumns.STATEMENT_PATTERN_VARIABLE_ORDER);
final VariableOrder varOrder = new VariableOrder(varOrderString);
- final String pattern = encoder.decodeString( values.get(FluoQueryColumns.STATEMENT_PATTERN_PATTERN) );
- final String parentNodeId = encoder.decodeString( values.get(FluoQueryColumns.STATEMENT_PATTERN_PARENT_NODE_ID) );
+ final String pattern = values.get(FluoQueryColumns.STATEMENT_PATTERN_PATTERN);
+ final String parentNodeId = values.get(FluoQueryColumns.STATEMENT_PATTERN_PARENT_NODE_ID);
return StatementPatternMetadata.builder(nodeId)
.setVarOrder(varOrder)
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
index 99e2191..19bc272 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
@@ -27,12 +27,11 @@ import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.rya.indexing.pcj.fluo.ITBase;
-import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer;
import org.junit.Test;
import com.beust.jcommander.internal.Lists;
-import org.apache.fluo.recipes.core.types.TypedTransaction;
+import org.apache.fluo.api.client.Transaction;
/**
* Integration tests the methods of {@link ListQueryIds}.
@@ -47,11 +46,11 @@ public class ListQueryIdsIT extends ITBase {
@Test
public void getQueryIds() throws AccumuloException, AccumuloSecurityException, TableExistsException {
// Store a few SPARQL/Query ID pairs in the Fluo table.
- try(TypedTransaction tx = new StringTypeLayer().wrap( fluoClient.newTransaction() )) {
- tx.mutate().row("SPARQL_3").col(QUERY_ID).set("ID_3");
- tx.mutate().row("SPARQL_1").col(QUERY_ID).set("ID_1");
- tx.mutate().row("SPARQL_4").col(QUERY_ID).set("ID_4");
- tx.mutate().row("SPARQL_2").col(QUERY_ID).set("ID_2");
+ try(Transaction tx = fluoClient.newTransaction()) {
+ tx.set("SPARQL_3", QUERY_ID, "ID_3");
+ tx.set("SPARQL_1", QUERY_ID, "ID_1");
+ tx.set("SPARQL_4", QUERY_ID, "ID_4");
+ tx.set("SPARQL_2", QUERY_ID, "ID_2");
tx.commit();
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/177c80a1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6e280c8..6ca4505 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,6 @@ under the License.
<maven.min-version>3.0.4</maven.min-version>
<fluo.version>1.0.0-incubating</fluo.version>
- <fluo-recipes.version>1.0.0-incubating-SNAPSHOT</fluo-recipes.version>
<jmh.version>1.13</jmh.version>
<jsr305.version>3.0.1</jsr305.version>
@@ -524,11 +523,6 @@ under the License.
<artifactId>fluo-mini</artifactId>
<version>${fluo.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.fluo</groupId>
- <artifactId>fluo-recipes-core</artifactId>
- <version>${fluo-recipes.version}</version>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
[7/7] incubator-rya git commit: RYA-142 Removing Fluo from
Geoindexing Project
Posted by mi...@apache.org.
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 <mi...@alum.mit.edu>
Authored: Thu Oct 13 15:03:59 2016 -0400
Committer: Aaron Mihalik <mi...@alum.mit.edu>
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 @@
<artifactId>geomesa-accumulo-datastore</artifactId>
</dependency>
- <!-- PCJ Indexing -->
- <dependency>
- <groupId>org.apache.rya</groupId>
- <artifactId>rya.indexing.pcj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.rya</groupId>
- <artifactId>rya.pcj.fluo.api</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
@@ -113,11 +104,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-mini</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.rya</groupId>
<artifactId>accumulo.rya</artifactId>
<version>${project.version}</version>
[2/7] incubator-rya git commit: RYA-142 updated for Fluo 1.0.0 release
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
index 0b24abc..9e2b9c6 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
@@ -63,20 +63,19 @@ import org.openrdf.repository.RepositoryConnection;
import org.openrdf.sail.Sail;
import com.google.common.io.Files;
-
-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.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.client.Snapshot;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.config.ObserverConfiguration;
-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.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.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.client.Snapshot;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.ObserverConfiguration;
+import org.apache.fluo.api.config.ScannerConfiguration;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.iterator.ColumnIterator;
+import org.apache.fluo.api.iterator.RowIterator;
+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;
@@ -418,4 +417,4 @@ public abstract class ITBase {
new FluoAdmin.InitOpts().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.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
index b8e068c..630b86d 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
@@ -29,13 +29,13 @@ import org.junit.Test;
import com.google.common.base.Optional;
-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.ObserverConfiguration;
+import org.apache.fluo.api.mini.MiniFluo;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.domain.RyaURI;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
index 8434a8d..99e2191 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import com.beust.jcommander.internal.Lists;
-import io.fluo.api.types.TypedTransaction;
+import org.apache.fluo.recipes.core.types.TypedTransaction;
/**
* Integration tests the methods of {@link ListQueryIds}.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java
index 5cb68d3..d5ed447 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java
@@ -30,8 +30,8 @@ import org.openrdf.query.parser.ParsedQuery;
import org.openrdf.query.parser.sparql.SPARQLParser;
import org.openrdf.repository.RepositoryException;
-import io.fluo.api.client.Snapshot;
-import io.fluo.api.client.Transaction;
+import org.apache.fluo.api.client.Snapshot;
+import org.apache.fluo.api.client.Transaction;
/**
* Integration tests the methods of {@link FluoQueryMetadataDAO}.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java
index d173e82..dd634fb 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java
@@ -113,4 +113,4 @@ public class RyaExportIT extends ITBase {
// Verify the end results of the query match the expected results.
assertEquals(expected, results);
}
-}
\ 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/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
index 8cc7404..bc83eed 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
@@ -37,7 +37,7 @@ import org.openrdf.repository.RepositoryConnection;
import com.google.common.collect.Sets;
-import io.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoClient;
import mvm.rya.accumulo.AccumuloRyaDAO;
import mvm.rya.indexing.external.PrecomputedJoinIndexer;
@@ -209,4 +209,4 @@ public class RyaInputIncrementalUpdateIT extends ITBase {
Set<BindingSet> results = getQueryBindingSetValues(fluoClient, sparql);
assertEquals(expected, results);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8afa589..6e280c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,8 @@ under the License.
<!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
<maven.min-version>3.0.4</maven.min-version>
- <fluo.version>1.0.0-beta-2</fluo.version>
+ <fluo.version>1.0.0-incubating</fluo.version>
+ <fluo-recipes.version>1.0.0-incubating-SNAPSHOT</fluo-recipes.version>
<jmh.version>1.13</jmh.version>
<jsr305.version>3.0.1</jsr305.version>
@@ -509,20 +510,25 @@ under the License.
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
<version>${fluo.version}</version>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-core</artifactId>
<version>${fluo.version}</version>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
<version>${fluo.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-core</artifactId>
+ <version>${fluo-recipes.version}</version>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
[3/7] incubator-rya git commit: RYA-142 updated for Fluo 1.0.0 release
Posted by mi...@apache.org.
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>
[5/7] incubator-rya git commit: RYA-142 Fixed Integration Tests for
Fluo Update
Posted by mi...@apache.org.
RYA-142 Fixed Integration Tests for Fluo Update
Closes #104, closes #100
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/2139edb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/2139edb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/2139edb5
Branch: refs/heads/master
Commit: 2139edb5244c42f11c9440eced2fd0773846f856
Parents: 177c80a
Author: Caleb Meier <ca...@parsons.com>
Authored: Wed Oct 12 12:55:27 2016 -0700
Committer: Aaron Mihalik <mi...@alum.mit.edu>
Committed: Thu Oct 13 12:57:09 2016 -0400
----------------------------------------------------------------------
.../mvm/rya/api/client/accumulo/FluoITBase.java | 33 +++++-----
.../apache/rya/indexing/pcj/fluo/ITBase.java | 64 +++++++++-----------
.../pcj/fluo/api/CountStatementsIT.java | 6 +-
.../pcj/fluo/integration/CreateDeleteIT.java | 26 +++-----
.../RyaInputIncrementalUpdateIT.java | 3 +-
5 files changed, 61 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2139edb5/extras/indexing/src/test/java/mvm/rya/api/client/accumulo/FluoITBase.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/mvm/rya/api/client/accumulo/FluoITBase.java b/extras/indexing/src/test/java/mvm/rya/api/client/accumulo/FluoITBase.java
index 0dcc04c..cc50b90 100644
--- a/extras/indexing/src/test/java/mvm/rya/api/client/accumulo/FluoITBase.java
+++ b/extras/indexing/src/test/java/mvm/rya/api/client/accumulo/FluoITBase.java
@@ -55,14 +55,14 @@ import org.openrdf.sail.SailException;
import com.google.common.io.Files;
-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.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.FluoAdmin;
+import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException;
+import org.apache.fluo.api.client.FluoAdmin.TableExistsException;
+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.api.client.RyaClientException;
import mvm.rya.api.client.Install;
@@ -224,17 +224,16 @@ public abstract class FluoITBase {
*/
protected MiniFluo startMiniFluo() 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());
- exportObserverConfig.setParameters(makeExportParams());
+ final ObserverSpecification exportObserverConfig = new ObserverSpecification(
+ QueryResultObserver.class.getName(), makeExportParams());
observers.add(exportObserverConfig);
// Configure how the mini fluo will run.
@@ -252,7 +251,7 @@ public abstract class FluoITBase {
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);
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2139edb5/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
index 9e2b9c6..a5288ec 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
@@ -25,8 +25,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.accumulo.core.client.AccumuloException;
@@ -37,6 +37,20 @@ import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
+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.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.client.Snapshot;
+import org.apache.fluo.api.client.scanner.CellScanner;
+import org.apache.fluo.api.client.scanner.ColumnScanner;
+import org.apache.fluo.api.client.scanner.RowScanner;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.ObserverSpecification;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.RowColumnValue;
+import org.apache.fluo.api.mini.MiniFluo;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.rya.indexing.pcj.fluo.app.export.rya.RyaExportParameters;
@@ -63,19 +77,7 @@ import org.openrdf.repository.RepositoryConnection;
import org.openrdf.sail.Sail;
import com.google.common.io.Files;
-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.FluoClient;
-import org.apache.fluo.api.client.FluoFactory;
-import org.apache.fluo.api.client.Snapshot;
-import org.apache.fluo.api.config.FluoConfiguration;
-import org.apache.fluo.api.config.ObserverConfiguration;
-import org.apache.fluo.api.config.ScannerConfiguration;
-import org.apache.fluo.api.data.Bytes;
-import org.apache.fluo.api.iterator.ColumnIterator;
-import org.apache.fluo.api.iterator.RowIterator;
-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;
@@ -283,17 +285,13 @@ public abstract class ITBase {
final QueryMetadata queryMetadata = new FluoQueryMetadataDAO().readQueryMetadata(snapshot, queryId);
final VariableOrder varOrder = queryMetadata.getVariableOrder();
- // Fetch the Binding Sets for the query.
- final ScannerConfiguration scanConfig = new ScannerConfiguration();
- scanConfig.fetchColumn(FluoQueryColumns.QUERY_BINDING_SET.getFamily(),
- FluoQueryColumns.QUERY_BINDING_SET.getQualifier());
-
+ CellScanner cellScanner = snapshot.scanner().fetch(FluoQueryColumns.QUERY_BINDING_SET).build();
final BindingSetStringConverter converter = new BindingSetStringConverter();
- final RowIterator rowIter = snapshot.get(scanConfig);
- while (rowIter.hasNext()) {
- final Entry<Bytes, ColumnIterator> row = rowIter.next();
- final String bindingSetString = row.getValue().next().getValue().toString();
+ Iterator<RowColumnValue> iter = cellScanner.iterator();
+
+ while (iter.hasNext()) {
+ final String bindingSetString = iter.next().getsValue();
final BindingSet bindingSet = converter.convert(bindingSetString, varOrder);
bindingSets.add(bindingSet);
}
@@ -378,14 +376,11 @@ public abstract class ITBase {
*/
protected MiniFluo startMiniFluo() 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()));
-
- // Configure the export observer to export new PCJ results to the mini accumulo cluster.
- final ObserverConfiguration exportObserverConfig = new ObserverConfiguration(QueryResultObserver.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()));
final HashMap<String, String> exportParams = new HashMap<>();
final RyaExportParameters ryaParams = new RyaExportParameters(exportParams);
@@ -395,8 +390,9 @@ public abstract class ITBase {
ryaParams.setZookeeperServers(zookeepers);
ryaParams.setExporterUsername(ITBase.ACCUMULO_USER);
ryaParams.setExporterPassword(ITBase.ACCUMULO_PASSWORD);
-
- exportObserverConfig.setParameters(exportParams);
+
+ // Configure the export observer to export new PCJ results to the mini accumulo cluster.
+ final ObserverSpecification exportObserverConfig = new ObserverSpecification(QueryResultObserver.class.getName(), exportParams);
observers.add(exportObserverConfig);
// Configure how the mini fluo will run.
@@ -414,7 +410,7 @@ public abstract class ITBase {
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);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2139edb5/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
index 630b86d..f7d4ee1 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java
@@ -34,7 +34,7 @@ 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.ObserverConfiguration;
+import org.apache.fluo.api.config.ObserverSpecification;
import org.apache.fluo.api.mini.MiniFluo;
import mvm.rya.api.domain.RyaStatement;
import mvm.rya.api.domain.RyaURI;
@@ -53,7 +53,7 @@ public class CountStatementsIT extends ITBase {
@Override
protected MiniFluo startMiniFluo() throws AlreadyInitializedException, TableExistsException {
// Setup the observers that will be used by the Fluo PCJ Application.
- final List<ObserverConfiguration> observers = new ArrayList<>();
+ final List<ObserverSpecification> observers = new ArrayList<>();
// Configure how the mini fluo will run.
final FluoConfiguration config = new FluoConfiguration();
@@ -70,7 +70,7 @@ public class CountStatementsIT extends ITBase {
config.addObservers(observers);
FluoFactory.newAdmin(config).initialize(
- new FluoAdmin.InitOpts().setClearTable(true).setClearZookeeper(true) );
+ new FluoAdmin.InitializationOptions().setClearTable(true).setClearZookeeper(true) );
final MiniFluo miniFluo = FluoFactory.newMiniFluo(config);
return miniFluo;
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2139edb5/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java
index 0a1852b..d2ff98c 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java
@@ -23,9 +23,14 @@ import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Map.Entry;
import java.util.Set;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.Snapshot;
+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.Span;
import org.apache.rya.indexing.pcj.fluo.ITBase;
import org.apache.rya.indexing.pcj.fluo.api.CreatePcj;
import org.apache.rya.indexing.pcj.fluo.api.DeletePcj;
@@ -39,14 +44,6 @@ import org.openrdf.query.impl.BindingImpl;
import com.google.common.collect.Sets;
-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.Span;
-import io.fluo.api.iterator.ColumnIterator;
-import io.fluo.api.iterator.RowIterator;
-
public class CreateDeleteIT extends ITBase {
/**
@@ -109,15 +106,12 @@ public class CreateDeleteIT extends ITBase {
private List<Bytes> getFluoTableEntries(FluoClient fluoClient) {
try (Snapshot snapshot = fluoClient.newSnapshot()) {
List<Bytes> rows = new ArrayList<>();
+ RowScanner rscanner = snapshot.scanner().over(Span.prefix("")).byRow().build();
- ScannerConfiguration sc1 = new ScannerConfiguration();
- sc1.setSpan(Span.prefix(""));
- RowIterator iterator = snapshot.get(sc1);
-
- while (iterator.hasNext()) {
- Entry<Bytes, ColumnIterator> row = iterator.next();
- rows.add(row.getKey());
+ for(ColumnScanner cscanner: rscanner) {
+ rows.add(cscanner.getRow());
}
+
return rows;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2139edb5/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
index bc83eed..82f568e 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java
@@ -25,6 +25,7 @@ import java.util.Set;
import org.apache.rya.indexing.pcj.fluo.ITBase;
import org.apache.rya.indexing.pcj.fluo.api.CreatePcj;
+import org.apache.rya.indexing.pcj.fluo.app.IncUpdateDAO;
import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage;
import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage;
import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;
@@ -101,7 +102,7 @@ public class RyaInputIncrementalUpdateIT extends ITBase {
}
fluo.waitForObservers();
-
+
final Set<BindingSet> results = getQueryBindingSetValues(fluoClient, sparql);
assertEquals(expected, results);
}