http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java index 90461d1..63929bb 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java index 409c978..e985563 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -31,7 +31,7 @@ import org.openrdf.model.ValueFactory; import org.openrdf.model.impl.ValueFactoryImpl; import org.openrdf.rio.RDFFormat; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; /** * Contains constants and static methods for interacting with a http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java index 208045e..27e38f2 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -46,9 +46,9 @@ import org.openrdf.rio.RDFParseException; import org.openrdf.rio.RDFParser; import org.openrdf.rio.Rio; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.api.resolver.RyaTripleContext; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.resolver.RyaTripleContext; /** * {@link FileInputFormat} that can read multiple RDF files and convert into http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java index b6545b6..baa7033 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,12 +33,12 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; /** * Subclass of {@link AbstractInputFormat} for reading http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java index 331c721..155d694 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -48,22 +48,22 @@ import org.apache.log4j.Logger; import org.openrdf.model.Statement; import org.openrdf.model.vocabulary.XMLSchema; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRdfConstants; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.indexing.FreeTextIndexer; -import mvm.rya.indexing.TemporalIndexer; -import mvm.rya.indexing.accumulo.ConfigUtils; -import mvm.rya.indexing.accumulo.entity.EntityCentricIndex; -import mvm.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; -import mvm.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRdfConstants; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.indexing.FreeTextIndexer; +import org.apache.rya.indexing.TemporalIndexer; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.indexing.accumulo.entity.EntityCentricIndex; +import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; +import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; /** * {@link OutputFormat} that uses Rya, the {@link GeoIndexer}, the http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java index cdc3235..0e8f43d 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,18 +28,18 @@ import org.apache.commons.lang.builder.CompareToBuilder; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.WritableComparable; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; /** * Basic {@link WritableComparable} for using Rya data with Hadoop. * RyaStatementWritable wraps a {@link RyaStatement}, which in turn represents a - * statement as a collection of {@link mvm.rya.api.domain.RyaURI} and - * {@link mvm.rya.api.domain.RyaType} objects. + * statement as a collection of {@link org.apache.rya.api.domain.RyaURI} and + * {@link org.apache.rya.api.domain.RyaType} objects. * <p> * This class is mutable, like all {@link org.apache.hadoop.io.Writable}s. When * used as Mapper or Reducer input, the Hadoop framework will typically reuse http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java index bc3af58..57349cc 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.examples; +package org.apache.rya.accumulo.mr.examples; import java.io.BufferedReader; @@ -48,15 +48,15 @@ import org.openrdf.rio.RDFHandlerException; import org.openrdf.rio.RDFWriter; import org.openrdf.rio.Rio; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.AbstractAccumuloMRTool; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.RyaStatementWritable; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.resolver.RyaToRdfConversions; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.RyaStatementWritable; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.resolver.RyaToRdfConversions; /** * Example of using a MapReduce tool to get triples from a Rya instance and serialize them to a text file as RDF. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java index ee4e00b..a1c84aa 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.tools; +package org.apache.rya.accumulo.mr.tools; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,16 +24,16 @@ package mvm.rya.accumulo.mr.tools; import java.io.IOException; import java.util.Date; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRdfConstants; -import mvm.rya.accumulo.mr.AbstractAccumuloMRTool; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRdfConstants; +import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; import org.apache.accumulo.core.data.Key; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java index 7857e45..55c4365 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.tools; +package org.apache.rya.accumulo.mr.tools; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,13 +27,13 @@ import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; import org.openrdf.rio.RDFFormat; -import mvm.rya.accumulo.mr.AbstractAccumuloMRTool; -import mvm.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; +import org.apache.rya.accumulo.mr.MRUtils; /** * Reads RDF data from one or more file(s) and inserts statements into Rya. * <p> - * Uses {@link mvm.rya.accumulo.mr.RdfFileInputFormat} to read data. + * Uses {@link org.apache.rya.accumulo.mr.RdfFileInputFormat} to read data. * <p> * Takes one argument: the file or directory to read (from HDFS). * <p> @@ -46,7 +46,7 @@ import mvm.rya.accumulo.mr.MRUtils; * (username, password, instance name, zookeepers, and Rya prefix) * <p> * - Indexing configuration parameters as named in - * {@link mvm.rya.indexing.accumulo.ConfigUtils} (enable or disable freetext, + * {@link org.apache.rya.indexing.accumulo.ConfigUtils} (enable or disable freetext, * geo, temporal, and entity indexing, and specify predicates for each * indexer). If not given, no secondary indexing is done. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java index d713d85..4edc949 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.tools; +package org.apache.rya.accumulo.mr.tools; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ package mvm.rya.accumulo.mr.tools; -import mvm.rya.accumulo.mr.AbstractAccumuloMRTool; -import mvm.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; +import org.apache.rya.accumulo.mr.MRUtils; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; @@ -43,7 +43,7 @@ import org.calrissian.mango.types.TypeEncoder; import java.io.IOException; import java.util.Date; -import static mvm.rya.api.RdfCloudTripleStoreConstants.*; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.*; /** */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java index cda66bd..c3bbbba 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; import java.io.File; import java.io.IOException; @@ -25,7 +25,7 @@ import org.openrdf.model.impl.StatementImpl; import org.openrdf.model.impl.URIImpl; import org.openrdf.rio.RDFFormat; -import mvm.rya.api.resolver.RyaToRdfConversions; +import org.apache.rya.api.resolver.RyaToRdfConversions; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java index 2755732..1c75629 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,14 +17,14 @@ package mvm.rya.accumulo.mr; * specific language governing permissions and limitations * under the License. */ -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.RyaTableMutationsFactory; -import mvm.rya.accumulo.mr.RyaInputFormat.RyaStatementRecordReader; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.resolver.RyaTripleContext; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.RyaTableMutationsFactory; +import org.apache.rya.accumulo.mr.RyaInputFormat.RyaStatementRecordReader; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java index 60bcc49..0b44a92 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; import java.io.IOException; import java.util.HashSet; @@ -26,23 +26,23 @@ import org.openrdf.model.impl.ValueFactoryImpl; import org.openrdf.model.vocabulary.XMLSchema; import info.aduna.iteration.CloseableIteration; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.api.resolver.RyaToRdfConversions; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.indexing.StatementConstraints; -import mvm.rya.indexing.TemporalInstant; -import mvm.rya.indexing.TemporalInstantRfc3339; -import mvm.rya.indexing.accumulo.ConfigUtils; -import mvm.rya.indexing.accumulo.entity.EntityCentricIndex; -import mvm.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; -import mvm.rya.indexing.accumulo.freetext.SimpleTokenizer; -import mvm.rya.indexing.accumulo.freetext.Tokenizer; -import mvm.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.indexing.StatementConstraints; +import org.apache.rya.indexing.TemporalInstant; +import org.apache.rya.indexing.TemporalInstantRfc3339; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.indexing.accumulo.entity.EntityCentricIndex; +import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; +import org.apache.rya.indexing.accumulo.freetext.SimpleTokenizer; +import org.apache.rya.indexing.accumulo.freetext.Tokenizer; +import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java index 8bebdf4..29639c2 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,11 +11,11 @@ import org.openrdf.model.vocabulary.XMLSchema; import org.junit.Assert; import org.junit.Rule; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.resolver.RyaTripleContext; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RyaTripleContext; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/TestUtils.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/TestUtils.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/TestUtils.java index 3bb35d9..5e1670b 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/TestUtils.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/TestUtils.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,12 +26,12 @@ import org.apache.accumulo.core.client.Connector; import org.calrissian.mango.collect.CloseableIterable; import org.junit.Assert; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.query.AccumuloRyaQueryEngine; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.persist.query.RyaQuery; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.persist.query.RyaQuery; public class TestUtils { public static void verify(Connector connector, AccumuloRdfConfiguration conf, RyaStatement... ryaStatements) http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java index 837457a..9b7fa22 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.tools; +package org.apache.rya.accumulo.mr.tools; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,13 +21,13 @@ package mvm.rya.accumulo.mr.tools; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.tools.AccumuloRdfCountTool; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.tools.AccumuloRdfCountTool; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java index 13c7d6d..6b41ca2 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.tools; +package org.apache.rya.accumulo.mr.tools; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,13 +29,13 @@ import org.junit.Test; import org.openrdf.rio.RDFFormat; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.mr.TestUtils; -import mvm.rya.accumulo.mr.tools.RdfFileInputTool; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.mr.TestUtils; +import org.apache.rya.accumulo.mr.tools.RdfFileInputTool; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; /** * Created by IntelliJ IDEA. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java index a6b22e9..f740cc0 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.tools; +package org.apache.rya.accumulo.mr.tools; import java.util.Map; @@ -40,15 +40,15 @@ import org.openrdf.model.vocabulary.XMLSchema; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.TestUtils; -import mvm.rya.accumulo.mr.tools.Upgrade322Tool; -import mvm.rya.accumulo.query.AccumuloRyaQueryEngine; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.TestUtils; +import org.apache.rya.accumulo.mr.tools.Upgrade322Tool; +import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; /** * Created by IntelliJ IDEA. @@ -108,7 +108,7 @@ public class Upgrade322ToolTest extends TestCase { ospWriter.addMutation(getMutation("10.0\u0000http://here/2010/tracked-data-provenance/ns#uuid10"; + "\u0000http://here/2010/tracked-data-provenance/ns#floatLit\u0001http"; + "://www.w3.org/2001/XMLSchema#float\u0001\b")); - ospWriter.addMutation(getMutation("3.0.0\u0000urn:mvm.rya/2012/05#rts\u0000urn:mvm" + + ospWriter.addMutation(getMutation("3.0.0\u0000urn:org.apache.rya/2012/05#rts\u0000urn:org.apache" + ".rya/2012/05#version\u0001\u0003")); ospWriter.addMutation(getMutation("9223370726404375807\u0000http://here/2010/tracked-data-provenance/ns"; + "#uuid10\u0000http://here/2010/tracked-data-provenance/ns#dateLit"; + @@ -142,7 +142,7 @@ public class Upgrade322ToolTest extends TestCase { spoWriter.addMutation(getMutation("http://here/2010/tracked-data-provenance/ns#uuid10"; + "\u0000http://here/2010/tracked-data-provenance/ns#floatLit\u0001http"; + "://www.w3.org/2001/XMLSchema#float\u000010.0\u0001\b")); - spoWriter.addMutation(getMutation("urn:mvm.rya/2012/05#rts\u0000urn:mvm" + + spoWriter.addMutation(getMutation("urn:org.apache.rya/2012/05#rts\u0000urn:org.apache" + ".rya/2012/05#version\u00003.0.0\u0001\u0003")); spoWriter.addMutation(getMutation("http://here/2010/tracked-data-provenance/ns"; + "#uuid10\u0000http://here/2010/tracked-data-provenance/ns#dateLit"; + @@ -171,8 +171,8 @@ public class Upgrade322ToolTest extends TestCase { ".org/2001/XMLSchema#short\u0001\b")); poWriter.addMutation(getMutation("http://here/2010/tracked-data-provenance/ns#floatLit\u0000http://here/2010/tracked-data-provenance/ns#uuid10\u0001http"; + "://www.w3.org/2001/XMLSchema#float\u000010.0\u0001\b")); - poWriter.addMutation(getMutation("urn:mvm" + - ".rya/2012/05#version\u00003.0.0\u0000urn:mvm.rya/2012/05#rts\u0001\u0003")); + poWriter.addMutation(getMutation("urn:org.apache" + + ".rya/2012/05#version\u00003.0.0\u0000urn:org.apache.rya/2012/05#rts\u0001\u0003")); poWriter.addMutation(getMutation("http://here/2010/tracked-data-provenance/ns#dateLit"; + "\u00009223370726404375807\u0000http://here/2010/tracked-data-provenance/ns#uuid10\u0001\u0007";)); poWriter.addMutation(getMutation("http://www.w3"; + @@ -256,8 +256,8 @@ public class Upgrade322ToolTest extends TestCase { new RyaURI("http://here/2010/tracked-data-provenance/ns"; + "#objectuuid1")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("urn:mvm.rya/2012/05#rts"), - new RyaURI("urn:mvm.rya/2012/05#version"), + new RyaURI("urn:org.apache.rya/2012/05#rts"), + new RyaURI("urn:org.apache.rya/2012/05#version"), new RyaType("3.0.0")), queryEngine); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java index e5fd293..f7096e3 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr.tools; +package org.apache.rya.accumulo.mr.tools; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,10 @@ package mvm.rya.accumulo.mr.tools; -import mvm.rya.api.resolver.impl.*; +import org.apache.rya.api.resolver.impl.*; import org.junit.Test; -import static mvm.rya.accumulo.mr.tools.Upgrade322Tool.UpgradeObjectSerialization; +import static org.apache.rya.accumulo.mr.tools.Upgrade322Tool.UpgradeObjectSerialization; import static org.junit.Assert.*; public class UpgradeObjectSerializationTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java index 7fada66..0d3ac97 100644 --- a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java @@ -1,4 +1,4 @@ -package mvm.rya.alx.command; +package org.apache.rya.alx.command; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package mvm.rya.alx.command; -import mvm.rya.api.persist.RyaDAO; +import org.apache.rya.api.persist.RyaDAO; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.openrdf.repository.Repository; import org.osgi.util.tracker.ServiceTracker; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java index 658f3fc..408f700 100644 --- a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java @@ -1,4 +1,4 @@ -package mvm.rya.alx.command; +package org.apache.rya.alx.command; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,7 +29,7 @@ import org.openrdf.model.URI; import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryResult; -import static mvm.rya.api.RdfCloudTripleStoreUtils.*; +import static org.apache.rya.api.RdfCloudTripleStoreUtils.*; /** * Date: 5/16/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java index 19b002f..37be971 100644 --- a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java @@ -1,4 +1,4 @@ -package mvm.rya.alx.command; +package org.apache.rya.alx.command; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package mvm.rya.alx.command; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.felix.gogo.commands.Command; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/alx.rya/src/main/java/org/apache/rya/alx/util/ConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/java/org/apache/rya/alx/util/ConfigurationFactory.java b/osgi/alx.rya/src/main/java/org/apache/rya/alx/util/ConfigurationFactory.java index 849cf60..a60ebc4 100644 --- a/osgi/alx.rya/src/main/java/org/apache/rya/alx/util/ConfigurationFactory.java +++ b/osgi/alx.rya/src/main/java/org/apache/rya/alx/util/ConfigurationFactory.java @@ -1,4 +1,4 @@ -package mvm.rya.alx.util; +package org.apache.rya.alx.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ package mvm.rya.alx.util; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.hadoop.conf.Configuration; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java index 0bbc07c..e5d73d2 100644 --- a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java +++ b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java @@ -1,4 +1,4 @@ -package mvm.rya.camel.cbsail; +package org.apache.rya.camel.cbsail; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java index 4a89291..a8909cb 100644 --- a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java +++ b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java @@ -1,4 +1,4 @@ -package mvm.rya.camel.cbsail; +package org.apache.rya.camel.cbsail; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java index ce3ff55..e570ce5 100644 --- a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java +++ b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java @@ -1,4 +1,4 @@ -package mvm.rya.camel.cbsail; +package org.apache.rya.camel.cbsail; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,9 +33,9 @@ import org.openrdf.rio.RDFHandlerException; import java.io.ByteArrayOutputStream; import java.util.*; -import static mvm.rya.api.RdfCloudTripleStoreConfiguration.*; -import static mvm.rya.camel.cbsail.CbSailComponent.SPARQL_QUERY_PROP; -import static mvm.rya.camel.cbsail.CbSailComponent.valueFactory; +import static org.apache.rya.api.RdfCloudTripleStoreConfiguration.*; +import static org.apache.rya.camel.cbsail.CbSailComponent.SPARQL_QUERY_PROP; +import static org.apache.rya.camel.cbsail.CbSailComponent.valueFactory; /** */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailIntegrationTest.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailIntegrationTest.java b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailIntegrationTest.java index d4f53da..4928886 100644 --- a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailIntegrationTest.java +++ b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailIntegrationTest.java @@ -1,4 +1,4 @@ -package mvm.rya.camel.cbsail; +package org.apache.rya.camel.cbsail; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package mvm.rya.camel.cbsail; -import mvm.rya.camel.cbsail.CbSailComponent; +import org.apache.rya.camel.cbsail.CbSailComponent; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -67,7 +67,7 @@ public class CbSailIntegrationTest extends CamelTestSupport { " {" + " <http://www.Department0.University0.edu/UndergraduateStudent60> ?pred ?obj ." + " }"; - String rawEvents = "PREFIX nh: <http://mvm.com/2011/02/nh#>\n" + + String rawEvents = "PREFIX nh: <http://org.apache.com/2011/02/nh#>\n" + " SELECT * WHERE\n" + " {\n" + " ?uuid nh:timestamp ?timestamp.\n" + @@ -75,9 +75,9 @@ public class CbSailIntegrationTest extends CamelTestSupport { " nh:system ?system;\n" + " nh:dataSupplier ?dataSupplier;\n" + " nh:dataType ?dataType;\n" + - " <http://mvm.com/2011/02/nh#count> ?data.\n" + + " <http://org.apache.com/2011/02/nh#count> ?data.\n" + " } LIMIT 100"; - String latestModels = "PREFIX nh: <http://mvm.com/rdf/2011/02/model#>" + + String latestModels = "PREFIX nh: <http://org.apache.com/rdf/2011/02/model#>" + " PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>" + " SELECT * WHERE" + " {" + @@ -86,7 +86,7 @@ public class CbSailIntegrationTest extends CamelTestSupport { " nh:timestamp ?timestamp;" + // " FILTER (xsd:integer(?timestamp) > 1297652964633)." + " nh:dataProperty \"count\";" + - " nh:modelType \"mvm.learning.tpami.SimpleGaussianMMModel\";" + + " nh:modelType \"org.apache.learning.tpami.SimpleGaussianMMModel\";" + " nh:site ?site;" + " nh:dataSupplier ?dataSupplier;" + " nh:system ?system;" + http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailPojoMain.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailPojoMain.java b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailPojoMain.java index ddb056e..d808ea6 100644 --- a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailPojoMain.java +++ b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailPojoMain.java @@ -1,4 +1,4 @@ -package mvm.rya.camel.cbsail; +package org.apache.rya.camel.cbsail; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package mvm.rya.camel.cbsail; -import mvm.rya.camel.cbsail.CbSailComponent; +import org.apache.rya.camel.cbsail.CbSailComponent; import org.apache.camel.EndpointInject; import org.apache.camel.ProducerTemplate; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java index c52d094..b0037fd 100644 --- a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java +++ b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java @@ -1,4 +1,4 @@ -package mvm.rya.camel.cbsail; +package org.apache.rya.camel.cbsail; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,14 +21,14 @@ package mvm.rya.camel.cbsail; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.RyaSailRepository; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.namespace.NamespaceManager; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.namespace.NamespaceManager; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.mock.MockInstance; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/AccumuloStorage.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/AccumuloStorage.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/AccumuloStorage.java index 054146d..eb55e94 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/AccumuloStorage.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/AccumuloStorage.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java index 392c108..c1d426c 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java index ed8134d..782840c 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,16 +23,16 @@ package mvm.rya.accumulo.pig; import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRdfEvalStatsDAO; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.pig.optimizer.SimilarVarJoinOptimizer; -import mvm.rya.rdftriplestore.evaluation.QueryJoinOptimizer; -import mvm.rya.rdftriplestore.evaluation.RdfCloudTripleStoreEvaluationStatistics; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.inference.InverseOfVisitor; -import mvm.rya.rdftriplestore.inference.SymmetricPropertyVisitor; -import mvm.rya.rdftriplestore.inference.TransitivePropertyVisitor; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRdfEvalStatsDAO; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.pig.optimizer.SimilarVarJoinOptimizer; +import org.apache.rya.rdftriplestore.evaluation.QueryJoinOptimizer; +import org.apache.rya.rdftriplestore.evaluation.RdfCloudTripleStoreEvaluationStatistics; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.inference.InverseOfVisitor; +import org.apache.rya.rdftriplestore.inference.SymmetricPropertyVisitor; +import org.apache.rya.rdftriplestore.inference.TransitivePropertyVisitor; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.commons.logging.Log; @@ -192,7 +192,7 @@ public class SparqlQueryPigEngine { public static void main(String[] args) { try { Preconditions.checkArgument(args.length == 7, "Usage: java -cp <jar>:$PIG_LIB <class> sparqlFile hdfsSaveLocation cbinstance cbzk cbuser cbpassword rdfTablePrefix.\n " + - "Sample command: java -cp java -cp cloudbase.pig-2.0.0-SNAPSHOT-shaded.jar:/usr/local/hadoop-etc/hadoop-0.20.2/hadoop-0.20.2-core.jar:/srv_old/hdfs-tmp/pig/pig-0.9.2/pig-0.9.2.jar:$HADOOP_HOME/conf mvm.rya.accumulo.pig.SparqlQueryPigEngine " + + "Sample command: java -cp java -cp cloudbase.pig-2.0.0-SNAPSHOT-shaded.jar:/usr/local/hadoop-etc/hadoop-0.20.2/hadoop-0.20.2-core.jar:/srv_old/hdfs-tmp/pig/pig-0.9.2/pig-0.9.2.jar:$HADOOP_HOME/conf org.apache.rya.accumulo.pig.SparqlQueryPigEngine " + "tstSpqrl.query temp/engineTest stratus stratus13:2181 root password l_"); String sparql = new String(ByteStreams.toByteArray(new FileInputStream(args[0]))); String hdfsSaveLocation = args[1]; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java index 38d8adb..c57aab8 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -94,15 +94,15 @@ public class SparqlToPigTransformVisitor extends QueryModelVisitorBase<RuntimeEx addToExprToNames(node, cntxtName); } - //load 'l_' using mvm.rya.cloudbase.pig.dep.StatementPatternStorage('<http://www.Department0.University0.edu>', '', '', + //load 'l_' using org.apache.rya.cloudbase.pig.dep.StatementPatternStorage('<http://www.Department0.University0.edu>', '', '', // 'stratus', 'stratus13:2181', 'root', 'password') AS (dept:chararray, p:chararray, univ:chararray); -// pigScriptBuilder.append(i).append(" = load '").append(tablePrefix).append("' using mvm.rya.cloudbase.pig.dep.StatementPatternStorage('") +// pigScriptBuilder.append(i).append(" = load '").append(tablePrefix).append("' using org.apache.rya.cloudbase.pig.dep.StatementPatternStorage('") // .append(subjValue).append("','").append(predValue).append("','").append(objValue).append("','").append(instance).append("','") // .append(zk).append("','").append(user).append("','").append(password).append("') AS (").append(subj).append(":chararray, ") // .append(pred).append(":chararray, ").append(obj).append(":chararray);\n"); //load 'cloudbase://tablePrefix?instance=myinstance&user=root&password=secret&zookeepers=127.0.0.1:2181&auths=PRIVATE,PUBLIC&subject=a&predicate=b&object=c' - //using mvm.rya.accumulo.pig.StatementPatternStorage() AS (dept:chararray, p:chararray, univ:chararray); + //using org.apache.rya.accumulo.pig.StatementPatternStorage() AS (dept:chararray, p:chararray, univ:chararray); pigScriptBuilder.append(i).append(" = load 'accumulo://").append(tablePrefix).append("?instance=").append(instance).append("&user=").append(user) .append("&password=").append(password).append("&zookeepers=").append(zk); if (subjValue != null && subjValue.length() > 0) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java index 6e67f29..974888b 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,21 +26,21 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.query.strategy.ByteRange; -import mvm.rya.api.query.strategy.TriplePatternStrategy; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.inference.InferenceEngineException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.query.strategy.ByteRange; +import org.apache.rya.api.query.strategy.TriplePatternStrategy; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.mock.MockInstance; @@ -199,7 +199,7 @@ public class StatementPatternStorage extends AccumuloStorage { return new RdfCloudTripleStoreUtils.CustomEntry<TABLE_LAYOUT, Range>(TABLE_LAYOUT.SPO, new Range()); Map.Entry<TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(subject_rya, predicate_rya, object_rya, null, null); ByteRange byteRange = entry.getValue(); - return new RdfCloudTripleStoreUtils.CustomEntry<mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range>( + return new RdfCloudTripleStoreUtils.CustomEntry<org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range>( entry.getKey(), new Range(new Text(byteRange.getStart()), new Text(byteRange.getEnd())) ); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java index 4b458b6..c046a3d 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig.optimizer; +package org.apache.rya.accumulo.pig.optimizer; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/AccumuloStorageTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/AccumuloStorageTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/AccumuloStorageTest.java index 119ccb1..9bf882d 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/AccumuloStorageTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/AccumuloStorageTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/IndexWritingToolTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/IndexWritingToolTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/IndexWritingToolTest.java index 02a6f84..e0bbdbc 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/IndexWritingToolTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/IndexWritingToolTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngineTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngineTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngineTest.java index e4cf10e..d0d8fde 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngineTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngineTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -69,7 +69,7 @@ public class SparqlQueryPigEngineTest extends TestCase { ""; // engine.runQuery(query, "/temp/testSP"); - assertTrue(engine.generatePigScript(query).contains("A = load 'accumulo://l_?instance=stratus&user=root&password=password&zookeepers=stratus13:2181&subject=<http://www.Department0.University0.edu>' using mvm.rya.accumulo.pig.StatementPatternStorage() AS (A_s:chararray, p:chararray, o:chararray);\n" + + assertTrue(engine.generatePigScript(query).contains("A = load 'accumulo://l_?instance=stratus&user=root&password=password&zookeepers=stratus13:2181&subject=<http://www.Department0.University0.edu>' using org.apache.rya.accumulo.pig.StatementPatternStorage() AS (A_s:chararray, p:chararray, o:chararray);\n" + "PROJ = FOREACH A GENERATE p,o;")); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java index b011a24..5bd5b35 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package mvm.rya.accumulo.pig; import junit.framework.TestCase; -import mvm.rya.accumulo.pig.optimizer.SimilarVarJoinOptimizer; +import org.apache.rya.accumulo.pig.optimizer.SimilarVarJoinOptimizer; import org.openrdf.query.algebra.QueryRoot; import org.openrdf.query.algebra.TupleExpr; import org.openrdf.query.parser.ParsedQuery; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java index 5bc4a34..1446d20 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.pig; +package org.apache.rya.accumulo.pig; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,12 +26,12 @@ import java.util.ArrayList; import java.util.List; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java index 0af9f32..d102bfc 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore; +package org.apache.rya.rdftriplestore; import static com.google.common.base.Preconditions.checkNotNull; @@ -29,14 +29,14 @@ import org.openrdf.sail.helpers.SailBase; -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.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.persist.RdfEvalStatsDAO; +import org.apache.rya.api.persist.RyaDAO; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.namespace.NamespaceManager; +import org.apache.rya.rdftriplestore.provenance.ProvenanceCollector; public class RdfCloudTripleStore extends SailBase { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java index 048046f..e8e370e 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore; +package org.apache.rya.rdftriplestore; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,34 +32,34 @@ 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.PropertyChainVisitor; -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.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RdfEvalStatsDAO; +import org.apache.rya.api.persist.RyaDAO; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; +import org.apache.rya.api.persist.utils.RyaDAOHelper; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.rdftriplestore.evaluation.FilterRangeVisitor; +import org.apache.rya.rdftriplestore.evaluation.ParallelEvaluationStrategyImpl; +import org.apache.rya.rdftriplestore.evaluation.QueryJoinSelectOptimizer; +import org.apache.rya.rdftriplestore.evaluation.RdfCloudTripleStoreEvaluationStatistics; +import org.apache.rya.rdftriplestore.evaluation.RdfCloudTripleStoreSelectivityEvaluationStatistics; +import org.apache.rya.rdftriplestore.evaluation.SeparateFilterJoinsVisitor; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.inference.InverseOfVisitor; +import org.apache.rya.rdftriplestore.inference.PropertyChainVisitor; +import org.apache.rya.rdftriplestore.inference.SameAsVisitor; +import org.apache.rya.rdftriplestore.inference.SubClassOfVisitor; +import org.apache.rya.rdftriplestore.inference.SubPropertyOfVisitor; +import org.apache.rya.rdftriplestore.inference.SymmetricPropertyVisitor; +import org.apache.rya.rdftriplestore.inference.TransitivePropertyVisitor; +import org.apache.rya.rdftriplestore.namespace.NamespaceManager; +import org.apache.rya.rdftriplestore.provenance.ProvenanceCollectionException; +import org.apache.rya.rdftriplestore.provenance.ProvenanceCollector; +import org.apache.rya.rdftriplestore.utils.DefaultStatistics; import org.apache.hadoop.conf.Configurable; import org.openrdf.model.Namespace; @@ -383,7 +383,7 @@ public class RdfCloudTripleStoreConnection extends SailConnectionBase { selectEvalDAO)).optimize(tupleExpr, dataset, bindings); } else { - (new mvm.rya.rdftriplestore.evaluation.QueryJoinOptimizer(stats)).optimize(tupleExpr, dataset, + (new org.apache.rya.rdftriplestore.evaluation.QueryJoinOptimizer(stats)).optimize(tupleExpr, dataset, bindings); // TODO: Make pluggable } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java index 7003398..402e5bb 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore; +package org.apache.rya.rdftriplestore; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java index 6261b8c..5dfe5f3 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore; +package org.apache.rya.rdftriplestore; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import mvm.rya.rdftriplestore.utils.CombineContextsRdfInserter; +import org.apache.rya.rdftriplestore.utils.CombineContextsRdfInserter; import org.openrdf.OpenRDFUtil; import org.openrdf.model.Resource; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java index b84104a..606c1fb 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java index 16ef588..c36ef68 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java index 24e2527..db5ba78 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ package mvm.rya.rdftriplestore.evaluation; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.domain.RangeURI; -import mvm.rya.api.domain.RangeValue; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.domain.RangeURI; +import org.apache.rya.api.domain.RangeValue; import org.openrdf.model.Value; import org.openrdf.model.impl.BooleanLiteralImpl; import org.openrdf.query.QueryEvaluationException; @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static mvm.rya.api.RdfCloudTripleStoreConstants.RANGE; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.RANGE; /** * Class FilterTimeIndexVisitor @@ -61,7 +61,7 @@ public class FilterRangeVisitor extends QueryModelVisitorBase { //range(?var, start, end) List<ValueExpr> valueExprs = fc.getArgs(); if (valueExprs.size() != 3) { - throw new QueryEvaluationException("mvm:range must have 3 parameters: variable, start, end"); + throw new QueryEvaluationException("org.apache:range must have 3 parameters: variable, start, end"); } Var var = (Var) valueExprs.get(0); ValueConstant startVc = (ValueConstant) valueExprs.get(1); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java index 01f3d27..5d4d3c1 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/MultipleBindingSetsIterator.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java index 30dc966..c1eb68c 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelEvaluationStrategyImpl.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -38,14 +38,14 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.utils.NullableStatementImpl; -import mvm.rya.rdftriplestore.RdfCloudTripleStoreConnection; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.inference.InferenceEngineException; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.TransitivePropertySP; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.utils.NullableStatementImpl; +import org.apache.rya.rdftriplestore.RdfCloudTripleStoreConnection; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.inference.InferenceEngineException; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; import org.apache.log4j.Logger; import org.openrdf.model.Resource; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java index 1d5c982..5ee9802 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ParallelJoinIterator.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java index 342f98d..ebf9737 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/PushJoinDownVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java index 940e46e..2cb02ba 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinOptimizer.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java index 643446a..8fc437a 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizer.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,10 +26,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.persist.joinselect.SelectivityEvalDAO; -import mvm.rya.rdftriplestore.inference.DoNotExpandSP; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; +import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; import org.openrdf.query.BindingSet; import org.openrdf.query.Dataset; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java index b0fa46c..ac11cf7 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreEvaluationStatistics.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,11 +32,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.persist.RdfEvalStatsDAO; -import mvm.rya.api.persist.RdfEvalStatsDAO.CARDINALITY_OF; -import mvm.rya.rdftriplestore.inference.DoNotExpandSP; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.persist.RdfEvalStatsDAO; +import org.apache.rya.api.persist.RdfEvalStatsDAO.CARDINALITY_OF; +import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; import org.openrdf.model.Resource; import org.openrdf.model.Statement; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java index 7c88640..7ddb914 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatistics.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,11 +22,11 @@ package mvm.rya.rdftriplestore.evaluation; import static com.google.common.base.Preconditions.checkNotNull; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.persist.RdfEvalStatsDAO; -import mvm.rya.api.persist.joinselect.SelectivityEvalDAO; -import mvm.rya.rdftriplestore.inference.DoNotExpandSP; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.persist.RdfEvalStatsDAO; +import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; +import org.apache.rya.rdftriplestore.inference.DoNotExpandSP; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; import org.openrdf.query.algebra.Join; import org.openrdf.query.algebra.StatementPattern; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java index f825921..9ff09b2 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ReorderJoinVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java index 002b804..fc16c15 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/SeparateFilterJoinsVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one
