http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 70cfb60..5f2164f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,122 +1,203 @@ <?xml version="1.0" encoding="utf-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<!-- +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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>mvm.rya</groupId> - <artifactId>parent</artifactId> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>17</version> + </parent> + + <groupId>org.apache.rya</groupId> + <artifactId>rya-project</artifactId> <version>3.2.10-SNAPSHOT</version> + <packaging>pom</packaging> - <name>${project.groupId}.${project.artifactId}</name> + + <name>Apache Rya Project</name> + <!-- this is the year of inception at ASF --> + <inceptionYear>2015</inceptionYear> + <organization> + <name>The Apache Software Foundation</name> + <url>http://www.apache.org/</url> + </organization> <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> </licenses> + <mailingLists> + <mailingList> + <name>Dev</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/rya-dev</archive> + </mailingList> + </mailingLists> <prerequisites> - <maven>${maven.min-version}</maven> + <maven>${maven.min-version}</maven> </prerequisites> <modules> <module>common</module> - <module>iterators</module> <module>dao</module> <module>extras</module> <module>osgi</module> <module>pig</module> <module>sail</module> - <module>utils</module> <module>web</module> </modules> <properties> - <accumulo.version>1.6.2</accumulo.version> - <blueprints.version>2.5.0</blueprints.version> - <commons.lang.version>2.5</commons.lang.version> - <gmaven.version>1.3</gmaven.version> - <groovy.version>2.3.4</groovy.version> - <guava.version>13.0</guava.version> - <hadoop.version>2.5.0-cdh5.3.3</hadoop.version> - <hadoop.core.version>2.5.0-mr1-cdh5.3.3</hadoop.core.version> - <junit.version>4.8.1</junit.version> - <karaf.version>2.2.4</karaf.version> - <mango.version>1.2.0</mango.version> - <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> - <maven.min-version>3.0.4</maven.min-version> - <openrdf.sesame.version>2.7.6</openrdf.sesame.version> + <openrdf.sesame.version>2.7.6</openrdf.sesame.version> <!-- Newest: 4.0.0 --> + <!--Cannot upgrade to openrdf.sesame 2.7.6 until RYA-9 is resolved --> + + <accumulo.version>1.6.4</accumulo.version> <!-- Newest: 1.7.0 --> + <hadoop.version>2.5.2</hadoop.version> <!-- Newest: 2.7.1 --> + + <pig.version>0.9.2</pig.version> <!-- Newest: 0.15.0 --> + + <geomesa.version>1.1.0-rc.6</geomesa.version> <!-- Newest: 1.1.0-rc.6 --> + <lucene.version>3.6.2</lucene.version> <!-- Newest: 5.3.1 --> + <joda-time.version>2.1</joda-time.version> <!-- Newest: 2.9.1 --> + + <mongodb.version>2.13.3</mongodb.version> <!-- Newest: 3.1.1 --> + <embed.mongo.version>1.50.0</embed.mongo.version> <!-- Newest: 1.50.0 --> + + <blueprints.version>2.5.0</blueprints.version> <!-- Newest: Apache 3.1.0-incubating --> + + <commons.lang.version>2.6</commons.lang.version> <!-- Newest: 2.6 --> + <commons.codec.version>1.10</commons.codec.version> <!-- Newest: 1.10 --> + <commons.pool.version>1.6</commons.pool.version> <!-- Newest: 1.6 --> + + <gmaven.version>1.3</gmaven.version> <!-- Newest: 1.5 --> + <groovy.version>2.3.11</groovy.version> <!-- Newest: 2.4.5 --> + + <guava.version>18.0</guava.version> <!-- Newest: 18.0 --> + + <karaf.version>2.2.11</karaf.version> <!-- Newest: 4.0.3 --> + <mango.version>1.2.0</mango.version> <!-- Newest: 1.4.0 --> + <antlr-runtime.version>3.4</antlr-runtime.version> <!-- Newest: 3.5.2 --> + <ehcache.version>1.7.2</ehcache.version> <!-- Newest: 2.6.11 --> + <hamcrest.version>1.3</hamcrest.version> <!-- Newest: 1.3 --> + <camel.version>2.7.5</camel.version> <!-- Newest: 2.16.1 --> + + <spring.version>3.2.15.RELEASE</spring.version> <!-- Newest: 4.2.3.RELEASE --> + <spring.hadoop.version>1.0.2.RELEASE</spring.hadoop.version> <!-- Newest: 2.2.1.RELEASE --> + <spring.shell.version>1.1.0.RELEASE</spring.shell.version> <!-- Newest: 1.1.0.RELEASE --> + + <junit.version>4.12</junit.version> <!-- Newest: 4.12 --> + <mockito.version>1.10.19</mockito.version> <!-- Newest: 1.10.19 --> + <mrunit.version>1.1.0</mrunit.version> <!-- Newest: 1.1.0 --> + <slf4j.version>1.6.6</slf4j.version> <!-- Newest: 1.7.13 --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <slf4j.version>1.6.4</slf4j.version> - <zookeeper.version>3.4.5-cdh5.3.3</zookeeper.version> - <joda-time.version>2.1</joda-time.version> - <pig.version>0.9.2</pig.version> - <antlr-runtime.version>3.4-beta4</antlr-runtime.version> - <ehcache.version>1.7.1</ehcache.version> - <geomesa.version>1.1.0-rc.4</geomesa.version> + + <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> + <maven.min-version>3.0.4</maven.min-version> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>rya.api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>mvm.rya</groupId> - <artifactId>rya.sail.impl</artifactId> + <groupId>org.apache.rya</groupId> + <artifactId>rya.sail</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>accumulo.rya</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>mvm.rya</groupId> + <dependency> + <groupId>org.apache.rya</groupId> <artifactId>mongodb.rya</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>accumulo.utils</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>mvm.rya</groupId> - <artifactId>accumulo.iterators</artifactId> + <groupId>org.apache.rya</groupId> + <artifactId>rya.prospector</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>mvm.rya</groupId> - <artifactId>rya.prospector</artifactId> + <groupId>org.apache.rya</groupId> + <artifactId>rya.provenance</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>cloudtrace</artifactId> - <version>${accumulo.version}</version> + <groupId>org.apache.rya</groupId> + <artifactId>rya.indexing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.indexing</artifactId> + <classifier>accumulo-server</classifier> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.indexing</artifactId> + <classifier>map-reduce</classifier> + <version>${project.version}</version> </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> <version>${accumulo.version}</version> </dependency> + <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-start</artifactId> - <version>${accumulo.version}</version> + <groupId>org.apache.rya</groupId> + <artifactId>sesame-runtime-osgi</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>0.9.0</version> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-runtime</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>mvm.rya</groupId> - <artifactId>sesame-runtime-osgi</artifactId> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-model</artifactId> <version>${openrdf.sesame.version}</version> </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime</artifactId> + <artifactId>sesame-query</artifactId> + <version>${openrdf.sesame.version}</version> + </dependency> + <dependency> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-queryalgebra-model</artifactId> <version>${openrdf.sesame.version}</version> </dependency> <dependency> @@ -125,7 +206,7 @@ <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>org.op2.6.4enrdf.sesame</groupId> + <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-queryresultio-sparqlxml</artifactId> <version>${openrdf.sesame.version}</version> </dependency> @@ -150,60 +231,73 @@ </exclusions> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-rio-ntriples</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-rio-nquads</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-rio-trig</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>cloudtrace</groupId> - <artifactId>cloudtrace</artifactId> - <version>0.1.3</version> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-queryalgebra-evaluation</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>thrift</artifactId> - <version>0.3</version> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-queryresultio-sparqljson</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-repository-api</artifactId> + <version>${openrdf.sesame.version}</version> </dependency> + <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <!--<scope>provided</scope>--> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop.core.version}</version> - <!--<scope>provided</scope>--> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>${hamcrest.version}</version> </dependency> - <!-- Test --> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.0-rc2</version> - <scope>test</scope> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + <version>${camel.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <version>${camel.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> </dependency> <dependency> @@ -221,6 +315,22 @@ <artifactId>gremlin-groovy</artifactId> <version>${blueprints.version}</version> </dependency> + <dependency> + <groupId>com.tinkerpop.rexster</groupId> + <artifactId>rexster-server</artifactId> + <version>${blueprints.version}</version> + </dependency> + + <dependency> + <groupId>org.mongodb</groupId> + <artifactId>mongo-java-driver</artifactId> + <version>${mongodb.version}</version> + </dependency> + <dependency> + <groupId>de.flapdoodle.embed</groupId> + <artifactId>de.flapdoodle.embed.mongo</artifactId> + <version>${embed.mongo.version}</version> + </dependency> <!-- Groovy --> <dependency> @@ -240,12 +350,95 @@ </exclusions> </dependency> + <!-- Spring --> + <dependency> + <groupId>org.springframework.shell</groupId> + <artifactId>spring-shell</artifactId> + <version>${spring.shell.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework.data</groupId> + <artifactId>spring-data-hadoop</artifactId> + <version>${spring.hadoop.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.console</artifactId> + <version>${karaf.version}</version> + <scope>provided</scope> + </dependency> + <!-- Commons --> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>${commons.lang.version}</version> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons.codec.version}</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>${commons.pool.version}</version> + </dependency> + + <!-- Free Text Indexing --> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>${lucene.version}</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers</artifactId> + <version>${lucene.version}</version> + </dependency> + + <!-- Geo Indexing --> + <dependency> + <groupId>org.locationtech.geomesa</groupId> + <artifactId>geomesa-accumulo-datastore</artifactId> + <version>${geomesa.version}</version> + </dependency> + <dependency> + <groupId>org.locationtech.geomesa</groupId> + <artifactId>geomesa-distributed-runtime</artifactId> + <version>${geomesa.version}</version> + </dependency> <dependency> <groupId>joda-time</groupId> @@ -276,6 +469,26 @@ <artifactId>mango-core</artifactId> <version>${mango.version}</version> </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.mrunit</groupId> + <artifactId>mrunit</artifactId> + <version>${mrunit.version}</version> + <classifier>hadoop2</classifier> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> @@ -285,7 +498,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> <configuration> <encoding>${project.build.sourceEncoding}</encoding> </configuration> @@ -300,7 +512,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.5</version> <configuration> <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine> </configuration> @@ -308,17 +519,14 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10</version> <configuration> <skip>true</skip> </configuration> @@ -326,12 +534,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> <configuration> <rules> <requireMavenVersion> @@ -343,7 +549,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5</version> <configuration> <allowTimestampedSnapshots>true</allowTimestampedSnapshots> <autoVersionSubmodules>true</autoVersionSubmodules> @@ -389,7 +594,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>1.6</version> <configuration> <shadedArtifactAttached>true</shadedArtifactAttached> </configuration> @@ -403,41 +607,44 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>1.8</version> - <configuration> - <licenseName>apache_v2</licenseName> - <inceptionYear>2014</inceptionYear> - <organizationName>Rya</organizationName> - <roots> - <root>src/main/java</root> - <root>src/test</root> - </roots> - </configuration> - <executions> - <execution> - <id>first</id> - <goals> - <goal>update-file-header</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> + <!-- Apache Release Audit Tool - reports missing license headers and other issues. --> + <!-- mvn apache-rat:rat --> + <!-- mvn apache-rat:check --> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- RDF data Files --> + <exclude>**/*.ntriples</exclude> + <exclude>**/*.trig</exclude> + <exclude>**/*.ttl</exclude> + <exclude>**/*.owl</exclude> + <exclude>**/*.nt</exclude> + + <!-- Services Files --> + <exclude>**/resources/META-INF/services/**</exclude> + </excludes> + </configuration> </plugin> </plugins> </pluginManagement> + <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> </executions> </plugin> <plugin> @@ -472,35 +679,9 @@ </plugin> </plugins> </build> - <dependencies> - </dependencies> + <repositories> <repository> - <id>cloudera</id> - <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url> - </repository> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>aduna-opensource.releases</id> - <name>Aduna Open Source - Maven releases</name> - <url>http://maven.ontotext.com/content/repositories/aduna</url> - </repository> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>fortytwo</id> - <url>http://fortytwo.net/maven2</url> - </repository> - <repository> <id>LocationTech - SNAPSHOT</id> <url>https://repo.locationtech.org/content/repositories/snapshots/</url> </repository> @@ -509,10 +690,11 @@ <url>https://repo.locationtech.org/content/repositories/releases/</url> </repository> </repositories> + <scm> - <connection>scm:git:[email protected]:LAS-NCSU/rya.git</connection> - <developerConnection>scm:git:[email protected]:LAS-NCSU/rya.git</developerConnection> - <url>scm:git:[email protected]:LAS-NCSU/rya.git</url> - <tag>parent-3.2.9</tag> - </scm> + <connection>scm:git:git://git.apache.org/incubator-rya.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rya.git</developerConnection> + <tag>v3.2.10-SNAPSHOT</tag> + <url>https://git-wip-us.apache.org/repos/asf?p=incubator-rya.git</url> + </scm> </project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/pom.xml ---------------------------------------------------------------------- diff --git a/sail/pom.xml b/sail/pom.xml index 6147d07..dfd2811 100644 --- a/sail/pom.xml +++ b/sail/pom.xml @@ -1,16 +1,98 @@ -<?xml version="1.0" encoding="utf-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<?xml version='1.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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>mvm.rya</groupId> - <artifactId>parent</artifactId> + <groupId>org.apache.rya</groupId> + <artifactId>rya-project</artifactId> <version>3.2.10-SNAPSHOT</version> </parent> + <artifactId>rya.sail</artifactId> - <packaging>pom</packaging> - <name>${project.groupId}.${project.artifactId}</name> - <modules> - <module>rya.sail.impl</module> - </modules> + <name>Apache Rya SAIL</name> + + <dependencies> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.provenance</artifactId> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.prospector</artifactId> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + + <dependency> + <groupId>com.tinkerpop.blueprints</groupId> + <artifactId>blueprints-core</artifactId> + </dependency> + + <dependency> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-runtime</artifactId> + </dependency> + + <!-- Test --> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>accumulo.rya</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>**/resources/META-INF/org.openrdf.store.schemas</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/pom.xml ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/pom.xml b/sail/rya.sail.impl/pom.xml deleted file mode 100644 index 5e6b88a..0000000 --- a/sail/rya.sail.impl/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>mvm.rya</groupId> - <artifactId>rya.sail</artifactId> - <version>3.2.10-SNAPSHOT</version> - </parent> - <artifactId>rya.sail.impl</artifactId> - <name>${project.groupId}.${project.artifactId}</name> - <properties> - </properties> - <dependencies> - <dependency> - <groupId>mvm.rya</groupId> - <artifactId>rya.api</artifactId> - </dependency> - <dependency> - <groupId>mvm.rya</groupId> - <artifactId>rya.provenance</artifactId> - <version>${project.version}</version> - </dependency> - <!-- Ehcache --> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <!--<scope>provided</scope> --> - </dependency> - - <!-- Test --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mvm.rya</groupId> - <artifactId>accumulo.rya</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.tinkerpop.blueprints</groupId> - <artifactId>blueprints-core</artifactId> - </dependency> - - <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <exclusions> - <!-- the log4j that comes with zookeeper 3.3.5 has some bad dependencies --> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>mvm.rya</groupId> - <artifactId>rya.prospector</artifactId> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>accumulo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-core</artifactId> - <optional>true</optional> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>cloudbase</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.texeltek</groupId> - <artifactId>accumulo-cloudbase-shim</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Dfile.encoding=UTF-8</argLine> - </configuration> - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStore.java ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStore.java b/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStore.java deleted file mode 100644 index 9cbb763..0000000 --- a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStore.java +++ /dev/null @@ -1,178 +0,0 @@ -package mvm.rya.rdftriplestore; - -/* - * #%L - * mvm.rya.rya.sail.impl - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.persist.RdfEvalStatsDAO; -import mvm.rya.api.persist.RyaDAO; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.persist.joinselect.SelectivityEvalDAO; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.namespace.NamespaceManager; -import mvm.rya.rdftriplestore.provenance.ProvenanceCollector; - -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; -import org.openrdf.sail.helpers.SailBase; - -import static com.google.common.base.Preconditions.checkNotNull; - -public class RdfCloudTripleStore extends SailBase { - - private RdfCloudTripleStoreConfiguration conf; - - protected RyaDAO ryaDAO; - protected InferenceEngine inferenceEngine; - protected RdfEvalStatsDAO rdfEvalStatsDAO; - protected SelectivityEvalDAO selectEvalDAO; - private NamespaceManager namespaceManager; - protected ProvenanceCollector provenanceCollector; - - private ValueFactory vf = new ValueFactoryImpl(); - - @Override - protected SailConnection getConnectionInternal() throws SailException { - return new RdfCloudTripleStoreConnection(this, conf, vf); - } - - @Override - protected void initializeInternal() throws SailException { - checkNotNull(ryaDAO); - - if (this.conf == null) { - this.conf = ryaDAO.getConf(); - } - - checkNotNull(this.conf); - - try { - if (!ryaDAO.isInitialized()) { - ryaDAO.setConf(this.conf); - ryaDAO.init(); - } - } catch (RyaDAOException e) { - throw new SailException(e); - } - - if (rdfEvalStatsDAO != null && !rdfEvalStatsDAO.isInitialized()) { - rdfEvalStatsDAO.setConf(this.conf); - rdfEvalStatsDAO.init(); - } - - //TODO: Support inferencing with ryadao -// if (inferenceEngine != null && !inferenceEngine.isInitialized()) { -// inferenceEngine.setConf(this.conf); -// inferenceEngine.setRyaDAO(ryaDAO); -// inferenceEngine.init(); -// } - - if (namespaceManager == null) { - this.namespaceManager = new NamespaceManager(ryaDAO, this.conf); - } - } - - @Override - protected void shutDownInternal() throws SailException { - try { - if (namespaceManager != null) { - namespaceManager.shutdown(); - } - if (inferenceEngine != null) { - inferenceEngine.destroy(); - } - if (rdfEvalStatsDAO != null) { - rdfEvalStatsDAO.destroy(); - } - ryaDAO.destroy(); - } catch (Exception e) { - throw new SailException(e); - } - } - - @Override - public ValueFactory getValueFactory() { - return vf; - } - - @Override - public boolean isWritable() throws SailException { - return true; - } - - public RdfCloudTripleStoreConfiguration getConf() { - return conf; - } - - public void setConf(RdfCloudTripleStoreConfiguration conf) { - this.conf = conf; - } - - public RdfEvalStatsDAO getRdfEvalStatsDAO() { - return rdfEvalStatsDAO; - } - - public void setRdfEvalStatsDAO(RdfEvalStatsDAO rdfEvalStatsDAO) { - this.rdfEvalStatsDAO = rdfEvalStatsDAO; - } - - public SelectivityEvalDAO getSelectEvalDAO() { - return selectEvalDAO; - } - - public void setSelectEvalDAO(SelectivityEvalDAO selectEvalDAO) { - this.selectEvalDAO = selectEvalDAO; - } - - public RyaDAO getRyaDAO() { - return ryaDAO; - } - - public void setRyaDAO(RyaDAO ryaDAO) { - this.ryaDAO = ryaDAO; - } - - public InferenceEngine getInferenceEngine() { - return inferenceEngine; - } - - public void setInferenceEngine(InferenceEngine inferenceEngine) { - this.inferenceEngine = inferenceEngine; - } - - public NamespaceManager getNamespaceManager() { - return namespaceManager; - } - - public void setNamespaceManager(NamespaceManager namespaceManager) { - this.namespaceManager = namespaceManager; - } - - public ProvenanceCollector getProvenanceCollector() { - return provenanceCollector; - } - - public void setProvenanceCollector(ProvenanceCollector provenanceCollector) { - this.provenanceCollector = provenanceCollector; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreConnection.java ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreConnection.java b/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreConnection.java deleted file mode 100644 index e19cfba..0000000 --- a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreConnection.java +++ /dev/null @@ -1,622 +0,0 @@ -package mvm.rya.rdftriplestore; - -/* - * #%L - * mvm.rya.rya.sail.impl - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import info.aduna.iteration.CloseableIteration; - -import java.lang.reflect.Constructor; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NoSuchElementException; - -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RdfEvalStatsDAO; -import mvm.rya.api.persist.RyaDAO; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.persist.joinselect.SelectivityEvalDAO; -import mvm.rya.api.persist.utils.RyaDAOHelper; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.rdftriplestore.evaluation.FilterRangeVisitor; -import mvm.rya.rdftriplestore.evaluation.ParallelEvaluationStrategyImpl; -import mvm.rya.rdftriplestore.evaluation.QueryJoinSelectOptimizer; -import mvm.rya.rdftriplestore.evaluation.RdfCloudTripleStoreEvaluationStatistics; -import mvm.rya.rdftriplestore.evaluation.RdfCloudTripleStoreSelectivityEvaluationStatistics; -import mvm.rya.rdftriplestore.evaluation.SeparateFilterJoinsVisitor; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.inference.InverseOfVisitor; -import mvm.rya.rdftriplestore.inference.SameAsVisitor; -import mvm.rya.rdftriplestore.inference.SubClassOfVisitor; -import mvm.rya.rdftriplestore.inference.SubPropertyOfVisitor; -import mvm.rya.rdftriplestore.inference.SymmetricPropertyVisitor; -import mvm.rya.rdftriplestore.inference.TransitivePropertyVisitor; -import mvm.rya.rdftriplestore.namespace.NamespaceManager; -import mvm.rya.rdftriplestore.provenance.ProvenanceCollectionException; -import mvm.rya.rdftriplestore.provenance.ProvenanceCollector; -import mvm.rya.rdftriplestore.utils.DefaultStatistics; - -import org.apache.hadoop.conf.Configurable; -import org.openrdf.model.Namespace; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.QueryRoot; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.EvaluationStrategy; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; -import org.openrdf.query.algebra.evaluation.TripleSource; -import org.openrdf.query.algebra.evaluation.impl.BindingAssigner; -import org.openrdf.query.algebra.evaluation.impl.CompareOptimizer; -import org.openrdf.query.algebra.evaluation.impl.ConjunctiveConstraintSplitter; -import org.openrdf.query.algebra.evaluation.impl.ConstantOptimizer; -import org.openrdf.query.algebra.evaluation.impl.DisjunctiveConstraintOptimizer; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStatistics; -import org.openrdf.query.algebra.evaluation.impl.FilterOptimizer; -import org.openrdf.query.algebra.evaluation.impl.IterativeEvaluationOptimizer; -import org.openrdf.query.algebra.evaluation.impl.OrderLimitOptimizer; -import org.openrdf.query.algebra.evaluation.impl.QueryModelNormalizer; -import org.openrdf.query.algebra.evaluation.impl.SameTermFilterOptimizer; -import org.openrdf.query.impl.EmptyBindingSet; -import org.openrdf.sail.SailException; -import org.openrdf.sail.helpers.SailConnectionBase; - -public class RdfCloudTripleStoreConnection extends SailConnectionBase { - - private RdfCloudTripleStore store; - - private RdfEvalStatsDAO rdfEvalStatsDAO; - private SelectivityEvalDAO selectEvalDAO; - private RyaDAO ryaDAO; - private InferenceEngine inferenceEngine; - private NamespaceManager namespaceManager; - private RdfCloudTripleStoreConfiguration conf; - - - private ProvenanceCollector provenanceCollector; - - public RdfCloudTripleStoreConnection(RdfCloudTripleStore sailBase, RdfCloudTripleStoreConfiguration conf, ValueFactory vf) - throws SailException { - super(sailBase); - this.store = sailBase; - this.conf = conf; - initialize(); - } - - protected void initialize() throws SailException { - refreshConnection(); - } - - protected void refreshConnection() throws SailException { - try { - checkNotNull(store.getRyaDAO()); - checkArgument(store.getRyaDAO().isInitialized()); - checkNotNull(store.getNamespaceManager()); - - this.ryaDAO = store.getRyaDAO(); - this.rdfEvalStatsDAO = store.getRdfEvalStatsDAO(); - this.selectEvalDAO = store.getSelectEvalDAO(); - this.inferenceEngine = store.getInferenceEngine(); - this.namespaceManager = store.getNamespaceManager(); - this.provenanceCollector = store.getProvenanceCollector(); - - } catch (Exception e) { - throw new SailException(e); - } - } - - @Override - protected void addStatementInternal(Resource subject, URI predicate, - Value object, Resource... contexts) throws SailException { - try { - String cv_s = conf.getCv(); - byte[] cv = cv_s == null ? null : cv_s.getBytes(); - if (contexts != null && contexts.length > 0) { - for (Resource context : contexts) { - RyaStatement statement = new RyaStatement( - RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), - RdfToRyaConversions.convertValue(object), - RdfToRyaConversions.convertResource(context), - null, cv); - - ryaDAO.add(statement); - } - } else { - RyaStatement statement = new RyaStatement( - RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), - RdfToRyaConversions.convertValue(object), - null, null, cv); - - ryaDAO.add(statement); - } - } catch (RyaDAOException e) { - throw new SailException(e); - } - } - - - - - @Override - protected void clearInternal(Resource... aresource) throws SailException { - try { - RyaURI[] graphs = new RyaURI[aresource.length]; - for (int i = 0 ; i < graphs.length ; i++){ - graphs[i] = RdfToRyaConversions.convertResource(aresource[i]); - } - ryaDAO.dropGraph(conf, graphs); - } catch (RyaDAOException e) { - throw new SailException(e); - } - } - - @Override - protected void clearNamespacesInternal() throws SailException { - logger.error("Clear Namespace Repository method not implemented"); - } - - @Override - protected void closeInternal() throws SailException { - verifyIsOpen(); - } - - @Override - protected void commitInternal() throws SailException { - verifyIsOpen(); - //There is no transactional layer - } - - @Override - protected CloseableIteration<? extends BindingSet, QueryEvaluationException> evaluateInternal( - TupleExpr tupleExpr, Dataset dataset, BindingSet bindings, - boolean flag) throws SailException { - verifyIsOpen(); - logger.trace("Incoming query model:\n{}", tupleExpr.toString()); - if (provenanceCollector != null){ - try { - provenanceCollector.recordQuery(tupleExpr.toString()); - } catch (ProvenanceCollectionException e) { - // TODO silent fail - e.printStackTrace(); - } - } - tupleExpr = tupleExpr.clone(); - - RdfCloudTripleStoreConfiguration queryConf = store.getConf().clone(); - if (bindings != null) { - Binding dispPlan = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_QUERYPLAN_FLAG); - if (dispPlan != null) { - queryConf.setDisplayQueryPlan(Boolean.parseBoolean(dispPlan.getValue().stringValue())); - } - - Binding authBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH); - if (authBinding != null) { - queryConf.setAuths(authBinding.getValue().stringValue().split(",")); - } - - Binding ttlBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_TTL); - if (ttlBinding != null) { - queryConf.setTtl(Long.valueOf(ttlBinding.getValue().stringValue())); - } - - Binding startTimeBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_STARTTIME); - if (startTimeBinding != null) { - queryConf.setStartTime(Long.valueOf(startTimeBinding.getValue().stringValue())); - } - - Binding performantBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_PERFORMANT); - if (performantBinding != null) { - queryConf.setBoolean(RdfCloudTripleStoreConfiguration.CONF_PERFORMANT, Boolean.parseBoolean(performantBinding.getValue().stringValue())); - } - - Binding inferBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_INFER); - if (inferBinding != null) { - queryConf.setInfer(Boolean.parseBoolean(inferBinding.getValue().stringValue())); - } - - Binding useStatsBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_USE_STATS); - if (useStatsBinding != null) { - queryConf.setUseStats(Boolean.parseBoolean(useStatsBinding.getValue().stringValue())); - } - - Binding offsetBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_OFFSET); - if (offsetBinding != null) { - queryConf.setOffset(Long.parseLong(offsetBinding.getValue().stringValue())); - } - - Binding limitBinding = bindings.getBinding(RdfCloudTripleStoreConfiguration.CONF_LIMIT); - if (limitBinding != null) { - queryConf.setLimit(Long.parseLong(limitBinding.getValue().stringValue())); - } - } else { - bindings = new QueryBindingSet(); - } - - if (!(tupleExpr instanceof QueryRoot)) { - tupleExpr = new QueryRoot(tupleExpr); - } - - try { - List<Class<QueryOptimizer>> optimizers = queryConf.getOptimizers(); - Class<QueryOptimizer> pcjOptimizer = queryConf.getPcjOptimizer(); - - if(pcjOptimizer != null) { - QueryOptimizer opt = null; - try { - Constructor<QueryOptimizer> construct = pcjOptimizer.getDeclaredConstructor(new Class[] {}); - opt = construct.newInstance(); - } catch (Exception e) { - } - if (opt == null) { - throw new NoSuchMethodException("Could not find valid constructor for " + pcjOptimizer.getName()); - } - if (opt instanceof Configurable) { - ((Configurable) opt).setConf(conf); - } - opt.optimize(tupleExpr, dataset, bindings); - } - - final ParallelEvaluationStrategyImpl strategy = new ParallelEvaluationStrategyImpl( - new StoreTripleSource(queryConf), inferenceEngine, dataset, queryConf); - - (new BindingAssigner()).optimize(tupleExpr, dataset, bindings); - (new ConstantOptimizer(strategy)).optimize(tupleExpr, dataset, - bindings); - (new CompareOptimizer()).optimize(tupleExpr, dataset, bindings); - (new ConjunctiveConstraintSplitter()).optimize(tupleExpr, dataset, - bindings); - (new DisjunctiveConstraintOptimizer()).optimize(tupleExpr, dataset, - bindings); - (new SameTermFilterOptimizer()).optimize(tupleExpr, dataset, - bindings); - (new QueryModelNormalizer()).optimize(tupleExpr, dataset, bindings); - - (new IterativeEvaluationOptimizer()).optimize(tupleExpr, dataset, - bindings); - - if (!optimizers.isEmpty()) { - for (Class<QueryOptimizer> optclz : optimizers) { - QueryOptimizer result = null; - try { - Constructor<QueryOptimizer> meth = optclz.getDeclaredConstructor(new Class[] {}); - result = meth.newInstance(); - } catch (Exception e) { - } - try { - Constructor<QueryOptimizer> meth = optclz.getDeclaredConstructor(EvaluationStrategy.class); - result = meth.newInstance(strategy); - } catch (Exception e) { - } - if (result == null) { - throw new NoSuchMethodException("Could not find valid constructor for " + optclz.getName()); - } - if (result instanceof Configurable) { - ((Configurable) result).setConf(conf); - } - result.optimize(tupleExpr, dataset, bindings); - } - } - - (new FilterOptimizer()).optimize(tupleExpr, dataset, bindings); - (new OrderLimitOptimizer()).optimize(tupleExpr, dataset, bindings); - - logger.trace("Optimized query model:\n{}", tupleExpr.toString()); - - if (queryConf.isInfer() - && this.inferenceEngine != null - ) { - try { - tupleExpr.visit(new TransitivePropertyVisitor(queryConf, inferenceEngine)); - tupleExpr.visit(new SymmetricPropertyVisitor(queryConf, inferenceEngine)); - tupleExpr.visit(new InverseOfVisitor(queryConf, inferenceEngine)); - tupleExpr.visit(new SubPropertyOfVisitor(queryConf, inferenceEngine)); - tupleExpr.visit(new SubClassOfVisitor(queryConf, inferenceEngine)); - tupleExpr.visit(new SameAsVisitor(queryConf, inferenceEngine)); - } catch (Exception e) { - e.printStackTrace(); - } - } - if (queryConf.isPerformant()) { - tupleExpr.visit(new SeparateFilterJoinsVisitor()); -// tupleExpr.visit(new FilterTimeIndexVisitor(queryConf)); -// tupleExpr.visit(new PartitionFilterTimeIndexVisitor(queryConf)); - } - FilterRangeVisitor rangeVisitor = new FilterRangeVisitor(queryConf); - tupleExpr.visit(rangeVisitor); - tupleExpr.visit(rangeVisitor); //this has to be done twice to get replace the statementpatterns with the right ranges - EvaluationStatistics stats = null; - if (!queryConf.isUseStats() && queryConf.isPerformant() || rdfEvalStatsDAO == null) { - stats = new DefaultStatistics(); - } else if (queryConf.isUseStats()) { - - if (queryConf.isUseSelectivity()) { - stats = new RdfCloudTripleStoreSelectivityEvaluationStatistics(queryConf, rdfEvalStatsDAO, - selectEvalDAO); - } else { - stats = new RdfCloudTripleStoreEvaluationStatistics(queryConf, rdfEvalStatsDAO); - } - } - if (stats != null) { - - if (stats instanceof RdfCloudTripleStoreSelectivityEvaluationStatistics) { - - (new QueryJoinSelectOptimizer((RdfCloudTripleStoreSelectivityEvaluationStatistics) stats, - selectEvalDAO)).optimize(tupleExpr, dataset, bindings); - } else { - - (new mvm.rya.rdftriplestore.evaluation.QueryJoinOptimizer(stats)).optimize(tupleExpr, dataset, - bindings); // TODO: Make pluggable - } - } - - final CloseableIteration<BindingSet, QueryEvaluationException> iter = strategy - .evaluate(tupleExpr, EmptyBindingSet.getInstance()); - CloseableIteration<BindingSet, QueryEvaluationException> iterWrap = new CloseableIteration<BindingSet, QueryEvaluationException>() { - - @Override - public void remove() throws QueryEvaluationException { - iter.remove(); - } - - @Override - public BindingSet next() throws QueryEvaluationException { - return iter.next(); - } - - @Override - public boolean hasNext() throws QueryEvaluationException { - return iter.hasNext(); - } - - @Override - public void close() throws QueryEvaluationException { - iter.close(); - strategy.shutdown(); - } - }; - return iterWrap; - } catch (QueryEvaluationException e) { - throw new SailException(e); - } catch (Exception e) { - throw new SailException(e); - } - } - - @Override - protected CloseableIteration<? extends Resource, SailException> getContextIDsInternal() - throws SailException { - verifyIsOpen(); - - // iterate through all contextids - return null; - } - - @Override - protected String getNamespaceInternal(String s) throws SailException { - return namespaceManager.getNamespace(s); - } - - @Override - protected CloseableIteration<? extends Namespace, SailException> getNamespacesInternal() - throws SailException { - return namespaceManager.iterateNamespace(); - } - - @Override - protected CloseableIteration<? extends Statement, SailException> getStatementsInternal( - Resource subject, URI predicate, Value object, boolean flag, - Resource... contexts) throws SailException { -// try { - //have to do this to get the inferred values - //TODO: Will this method reduce performance? - final Var subjVar = decorateValue(subject, "s"); - final Var predVar = decorateValue(predicate, "p"); - final Var objVar = decorateValue(object, "o"); - StatementPattern sp = null; - final boolean hasContext = contexts != null && contexts.length > 0; - final Resource context = (hasContext) ? contexts[0] : null; - final Var cntxtVar = decorateValue(context, "c"); - //TODO: Only using one context here - sp = new StatementPattern(subjVar, predVar, objVar, cntxtVar); - //return new StoreTripleSource(store.getConf()).getStatements(resource, uri, value, contexts); - final CloseableIteration<? extends BindingSet, QueryEvaluationException> evaluate = evaluate(sp, null, null, false); - return new CloseableIteration<Statement, SailException>() { //TODO: Use a util class to do this - private boolean isClosed = false; - - @Override - public void close() throws SailException { - isClosed = true; - try { - evaluate.close(); - } catch (QueryEvaluationException e) { - throw new SailException(e); - } - } - - @Override - public boolean hasNext() throws SailException { - try { - return evaluate.hasNext(); - } catch (QueryEvaluationException e) { - throw new SailException(e); - } - } - - @Override - public Statement next() throws SailException { - if (!hasNext() || isClosed) { - throw new NoSuchElementException(); - } - - try { - BindingSet next = evaluate.next(); - Resource bs_subj = (Resource) ((subjVar.hasValue()) ? subjVar.getValue() : next.getBinding(subjVar.getName()).getValue()); - URI bs_pred = (URI) ((predVar.hasValue()) ? predVar.getValue() : next.getBinding(predVar.getName()).getValue()); - Value bs_obj = (objVar.hasValue()) ? objVar.getValue() : (Value) next.getBinding(objVar.getName()).getValue(); - Binding b_cntxt = next.getBinding(cntxtVar.getName()); - - //convert BindingSet to Statement - if (b_cntxt != null) { - return new ContextStatementImpl(bs_subj, bs_pred, bs_obj, (Resource) b_cntxt.getValue()); - } else { - return new StatementImpl(bs_subj, bs_pred, bs_obj); - } - } catch (QueryEvaluationException e) { - throw new SailException(e); - } - } - - @Override - public void remove() throws SailException { - try { - evaluate.remove(); - } catch (QueryEvaluationException e) { - throw new SailException(e); - } - } - }; -// } catch (QueryEvaluationException e) { -// throw new SailException(e); -// } - } - - protected Var decorateValue(Value val, String name) { - if (val == null) { - return new Var(name); - } else { - return new Var(name, val); - } - } - - @Override - protected void removeNamespaceInternal(String s) throws SailException { - namespaceManager.removeNamespace(s); - } - - @Override - protected void removeStatementsInternal(Resource subject, URI predicate, - Value object, Resource... contexts) throws SailException { - if (!(subject instanceof URI)) { - throw new SailException("Subject[" + subject + "] must be URI"); - } - - try { - if (contexts != null && contexts.length > 0) { - for (Resource context : contexts) { - if (!(context instanceof URI)) { - throw new SailException("Context[" + context + "] must be URI"); - } - RyaStatement statement = new RyaStatement( - RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), - RdfToRyaConversions.convertValue(object), - RdfToRyaConversions.convertResource(context)); - - ryaDAO.delete(statement, conf); - } - } else { - RyaStatement statement = new RyaStatement( - RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), - RdfToRyaConversions.convertValue(object), - null); - - ryaDAO.delete(statement, conf); - } - } catch (RyaDAOException e) { - throw new SailException(e); - } - } - - @Override - protected void rollbackInternal() throws SailException { - //TODO: No transactional layer as of yet - } - - @Override - protected void setNamespaceInternal(String s, String s1) - throws SailException { - namespaceManager.addNamespace(s, s1); - } - - @Override - protected long sizeInternal(Resource... contexts) throws SailException { - logger.error("Cannot determine size as of yet"); - - return 0; - } - - @Override - protected void startTransactionInternal() throws SailException { - //TODO: ? - } - - public class StoreTripleSource implements TripleSource { - - private RdfCloudTripleStoreConfiguration conf; - - public StoreTripleSource(RdfCloudTripleStoreConfiguration conf) { - this.conf = conf; - } - - public CloseableIteration<Statement, QueryEvaluationException> getStatements( - Resource subject, URI predicate, Value object, - Resource... contexts) throws QueryEvaluationException { - return RyaDAOHelper.query(ryaDAO, subject, predicate, object, conf, contexts); - } - - public CloseableIteration<? extends Entry<Statement, BindingSet>, QueryEvaluationException> getStatements( - Collection<Map.Entry<Statement, BindingSet>> statements, - Resource... contexts) throws QueryEvaluationException { - - return RyaDAOHelper.query(ryaDAO, statements, conf); - } - - public ValueFactory getValueFactory() { - return RdfCloudTripleStoreConstants.VALUE_FACTORY; - } - } - - public InferenceEngine getInferenceEngine() { - return inferenceEngine; - } - public RdfCloudTripleStoreConfiguration getConf() { - return conf; - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreFactory.java ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreFactory.java b/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreFactory.java deleted file mode 100644 index ae13832..0000000 --- a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreFactory.java +++ /dev/null @@ -1,55 +0,0 @@ -package mvm.rya.rdftriplestore; - -/* - * #%L - * mvm.rya.rya.sail.impl - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import org.openrdf.sail.Sail; -import org.openrdf.sail.config.SailConfigException; -import org.openrdf.sail.config.SailFactory; -import org.openrdf.sail.config.SailImplConfig; - -public class RdfCloudTripleStoreFactory implements SailFactory { - - public static final String SAIL_TYPE = "openrdf:RdfCloudTripleStore"; - - @Override - public SailImplConfig getConfig() { - return new RdfCloudTripleStoreSailConfig(); - } - - @Override - public Sail getSail(SailImplConfig config) throws SailConfigException { -// RdfCloudTripleStore cbStore = new RdfCloudTripleStore(); -// RdfCloudTripleStoreSailConfig cbconfig = (RdfCloudTripleStoreSailConfig) config; -// cbStore.setServer(cbconfig.getServer()); -// cbStore.setPort(cbconfig.getPort()); -// cbStore.setInstance(cbconfig.getInstance()); -// cbStore.setPassword(cbconfig.getPassword()); -// cbStore.setUser(cbconfig.getUser()); -// return cbStore; - return null; //TODO: How? - } - - @Override - public String getSailType() { - return SAIL_TYPE; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreSailConfig.java ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreSailConfig.java b/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreSailConfig.java deleted file mode 100644 index d9b6f25..0000000 --- a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RdfCloudTripleStoreSailConfig.java +++ /dev/null @@ -1,132 +0,0 @@ -package mvm.rya.rdftriplestore; - -/* - * #%L - * mvm.rya.rya.sail.impl - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import org.openrdf.model.*; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.util.GraphUtil; -import org.openrdf.model.util.GraphUtilException; -import org.openrdf.sail.config.SailConfigException; -import org.openrdf.sail.config.SailImplConfigBase; - -public class RdfCloudTripleStoreSailConfig extends SailImplConfigBase { - - public static final String NAMESPACE = "http://www.openrdf.org/config/sail/cloudbasestore#";; - - public static final URI SERVER; - public static final URI PORT; - public static final URI INSTANCE; - public static final URI USER; - public static final URI PASSWORD; - - static { - ValueFactory factory = ValueFactoryImpl.getInstance(); - SERVER = factory.createURI(NAMESPACE, "server"); - PORT = factory.createURI(NAMESPACE, "port"); - INSTANCE = factory.createURI(NAMESPACE, "instance"); - USER = factory.createURI(NAMESPACE, "user"); - PASSWORD = factory.createURI(NAMESPACE, "password"); - } - - private String server = "stratus13"; - - private int port = 2181; - - private String user = "root"; - - private String password = "password"; - - private String instance = "stratus"; - - public String getServer() { - return server; - } - - public void setServer(String server) { - this.server = server; - } - - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getInstance() { - return instance; - } - - public void setInstance(String instance) { - this.instance = instance; - } - - @Override - public void parse(Graph graph, Resource implNode) - throws SailConfigException - { - super.parse(graph, implNode); - System.out.println("parsing"); - - try { - Literal serverLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, SERVER); - if (serverLit != null) { - setServer(serverLit.getLabel()); - } - Literal portLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, PORT); - if (portLit != null) { - setPort(Integer.parseInt(portLit.getLabel())); - } - Literal instList = GraphUtil.getOptionalObjectLiteral(graph, implNode, INSTANCE); - if (instList != null) { - setInstance(instList.getLabel()); - } - Literal userLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, USER); - if (userLit != null) { - setUser(userLit.getLabel()); - } - Literal pwdLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, PASSWORD); - if (pwdLit != null) { - setPassword(pwdLit.getLabel()); - } - } - catch (GraphUtilException e) { - throw new SailConfigException(e.getMessage(), e); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepository.java ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepository.java b/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepository.java deleted file mode 100644 index a2df04d..0000000 --- a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepository.java +++ /dev/null @@ -1,52 +0,0 @@ -package mvm.rya.rdftriplestore; - -/* - * #%L - * mvm.rya.rya.sail.impl - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailException; - -/** - * Created by IntelliJ IDEA. - * User: RoshanP - * Date: 3/23/12 - * Time: 10:05 AM - * To change this template use File | Settings | File Templates. - */ -public class RyaSailRepository extends SailRepository{ - public RyaSailRepository(Sail sail) { - super(sail); - } - - @Override - public SailRepositoryConnection getConnection() throws RepositoryException { - try - { - return new RyaSailRepositoryConnection(this, this.getSail().getConnection()); - } - catch(SailException e) - { - throw new RepositoryException(e); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepositoryConnection.java ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepositoryConnection.java b/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepositoryConnection.java deleted file mode 100644 index fd5e4d4..0000000 --- a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/RyaSailRepositoryConnection.java +++ /dev/null @@ -1,108 +0,0 @@ -package mvm.rya.rdftriplestore; - -/* - * #%L - * mvm.rya.rya.sail.impl - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; - -import mvm.rya.rdftriplestore.utils.CombineContextsRdfInserter; - -import org.openrdf.OpenRDFUtil; -import org.openrdf.model.Resource; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.repository.util.RDFLoader; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.sail.SailConnection; - -/** - * The real reason for this is so that we can combine contexts from an input stream/reader and the given contexts in the add function - */ -public class RyaSailRepositoryConnection extends SailRepositoryConnection { - - protected RyaSailRepositoryConnection(SailRepository repository, SailConnection sailConnection) { - super(repository, sailConnection); - } - - @Override - public void add(InputStream in, String baseURI, RDFFormat dataFormat, Resource... contexts) throws IOException, RDFParseException, - RepositoryException { - OpenRDFUtil.verifyContextNotNull(contexts); - - CombineContextsRdfInserter rdfInserter = new CombineContextsRdfInserter(this); - rdfInserter.enforceContext(contexts); - - boolean localTransaction = startLocalTransaction(); - try { - RDFLoader loader = new RDFLoader(getParserConfig(), getValueFactory()); - loader.load(in, baseURI, dataFormat, rdfInserter); - - conditionalCommit(localTransaction); - } catch (RDFHandlerException e) { - conditionalRollback(localTransaction); - - throw ((RepositoryException) e.getCause()); - } catch (RDFParseException e) { - conditionalRollback(localTransaction); - throw e; - } catch (IOException e) { - conditionalRollback(localTransaction); - throw e; - } catch (RuntimeException e) { - conditionalRollback(localTransaction); - throw e; - } - } - - @Override - public void add(Reader reader, String baseURI, RDFFormat dataFormat, Resource... contexts) throws IOException, RDFParseException, - RepositoryException { - OpenRDFUtil.verifyContextNotNull(contexts); - - CombineContextsRdfInserter rdfInserter = new CombineContextsRdfInserter(this); - rdfInserter.enforceContext(contexts); - - boolean localTransaction = startLocalTransaction(); - try { - RDFLoader loader = new RDFLoader(getParserConfig(), getValueFactory()); - loader.load(reader, baseURI, dataFormat, rdfInserter); - - conditionalCommit(localTransaction); - } catch (RDFHandlerException e) { - conditionalRollback(localTransaction); - - throw ((RepositoryException) e.getCause()); - } catch (RDFParseException e) { - conditionalRollback(localTransaction); - throw e; - } catch (IOException e) { - conditionalRollback(localTransaction); - throw e; - } catch (RuntimeException e) { - conditionalRollback(localTransaction); - throw e; - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java ---------------------------------------------------------------------- diff --git a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java b/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java deleted file mode 100644 index f3ea4b8..0000000 --- a/sail/rya.sail.impl/src/main/java/mvm/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java +++ /dev/null @@ -1,32 +0,0 @@ -package mvm.rya.rdftriplestore.evaluation; - -/* - * #%L - * mvm.rya.rya.sail.impl - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import info.aduna.iteration.CloseableIteration; - -import java.util.Collection; - -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; - -public interface ExternalBatchingIterator { - public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(Collection<BindingSet> bindingset) throws QueryEvaluationException; -}
