Rya-405 Refactor RyaURI to RyaIRI to match RDF4J. Closes #291
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/9c2bad66 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/9c2bad66 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/9c2bad66 Branch: refs/heads/master Commit: 9c2bad66b0b29468e842f993052e557c68e1a110 Parents: 855d715 Author: eric.white <eric.wh...@parsons.com> Authored: Fri Apr 20 16:47:35 2018 -0400 Committer: Valiyil <puja.vali...@parsons.com> Committed: Mon Apr 23 09:20:05 2018 -0400 ---------------------------------------------------------------------- .../function/temporal/AfterTemporalInstant.java | 2 +- .../temporal/BeforeTemporalInstant.java | 2 +- .../temporal/EqualsTemporalInstant.java | 2 +- .../rya/api/function/temporal/TemporalIRIs.java | 42 ++++ .../rya/api/function/temporal/TemporalURIs.java | 42 ---- .../temporal/WithinTemporalInterval.java | 2 +- .../api/RdfCloudTripleStoreConfiguration.java | 12 +- .../rya/api/RdfCloudTripleStoreConstants.java | 6 +- .../org/apache/rya/api/domain/RangeIRI.java | 51 +++++ .../org/apache/rya/api/domain/RangeURI.java | 51 ----- .../java/org/apache/rya/api/domain/RyaIRI.java | 61 ++++++ .../org/apache/rya/api/domain/RyaIRIPrefix.java | 47 ++++ .../org/apache/rya/api/domain/RyaIRIRange.java | 95 +++++++++ .../org/apache/rya/api/domain/RyaStatement.java | 44 ++-- .../org/apache/rya/api/domain/RyaTypeUtils.java | 6 +- .../java/org/apache/rya/api/domain/RyaURI.java | 61 ------ .../org/apache/rya/api/domain/RyaURIPrefix.java | 47 ---- .../org/apache/rya/api/domain/RyaURIRange.java | 95 --------- .../rya/api/domain/StatementMetadata.java | 12 +- .../kryo/RyaStatementSerializer.java | 8 +- .../java/org/apache/rya/api/persist/RyaDAO.java | 4 +- .../api/persist/index/RyaSecondaryIndexer.java | 4 +- .../rya/api/persist/query/join/HashJoin.java | 32 +-- .../api/persist/query/join/IterativeJoin.java | 26 +-- .../apache/rya/api/persist/query/join/Join.java | 6 +- .../rya/api/persist/query/join/MergeJoin.java | 32 +-- .../query/strategy/TriplePatternStrategy.java | 6 +- .../HashedPoWholeRowTriplePatternStrategy.java | 8 +- .../HashedSpoWholeRowTriplePatternStrategy.java | 12 +- .../wholerow/NullRowTriplePatternStrategy.java | 8 +- .../OspWholeRowTriplePatternStrategy.java | 8 +- .../PoWholeRowTriplePatternStrategy.java | 8 +- .../SpoWholeRowTriplePatternStrategy.java | 12 +- .../rya/api/resolver/RdfToRyaConversions.java | 26 +-- .../org/apache/rya/api/resolver/RyaContext.java | 4 +- .../rya/api/resolver/RyaToRdfConversions.java | 18 +- .../rya/api/resolver/RyaTripleContext.java | 4 +- .../rya/api/resolver/impl/RyaIRIResolver.java | 42 ++++ .../rya/api/resolver/impl/RyaURIResolver.java | 42 ---- .../api/resolver/triple/TripleRowResolver.java | 2 +- .../impl/WholeRowHashedTripleResolver.java | 22 +- .../triple/impl/WholeRowTripleResolver.java | 22 +- .../apache/rya/api/domain/RyaIRIPrefixTest.java | 37 ++++ .../org/apache/rya/api/domain/RyaTypeTest.java | 26 +-- .../apache/rya/api/domain/RyaURIPrefixTest.java | 37 ---- .../rya/api/domain/StatementMetadataTest.java | 2 +- .../rya/api/persist/query/RyaQueryTest.java | 8 +- .../AbstractTriplePatternStrategyTest.java | 12 +- ...shedPoWholeRowTriplePatternStrategyTest.java | 42 ++-- ...hedSpoWholeRowTriplePatternStrategyTest.java | 34 +-- .../NullRowTriplePatternStrategyTest.java | 16 +- .../OspWholeRowTriplePatternStrategyTest.java | 30 +-- .../PoWholeRowTriplePatternStrategyTest.java | 32 +-- .../SpoWholeRowTriplePatternStrategyTest.java | 34 +-- .../apache/rya/api/resolver/RyaContextTest.java | 18 +- .../api/resolver/impl/RyaIRIResolverTest.java | 40 ++++ .../api/resolver/impl/RyaURIResolverTest.java | 40 ---- .../impl/HashedWholeRowTripleResolverTest.java | 34 +-- .../triple/impl/WholeRowTripleResolverTest.java | 34 +-- .../org/apache/rya/accumulo/AccumuloRyaDAO.java | 6 +- .../experimental/AbstractAccumuloIndexer.java | 4 +- .../accumulo/query/AccumuloRyaQueryEngine.java | 18 +- .../apache/rya/accumulo/AccumuloRyaDAOTest.java | 144 ++++++------- .../org/apache/rya/mongodb/MongoDBRyaDAO.java | 4 +- .../AggregationPipelineQueryNode.java | 12 +- .../dao/SimpleMongoDBStorageStrategy.java | 16 +- .../rya/mongodb/MongoDBQueryEngineIT.java | 8 +- .../rya/mongodb/MongoDBRyaBatchWriterIT.java | 12 +- .../apache/rya/mongodb/MongoDBRyaDAO2IT.java | 42 ++-- .../org/apache/rya/mongodb/MongoDBRyaDAOIT.java | 50 ++--- .../SimpleMongoDBStorageStrategyTest.java | 10 +- .../mongodb/aggregation/PipelineQueryIT.java | 2 +- extras/indexing/README.md | 8 +- .../accumulo/AccumuloIndexingConfiguration.java | 12 +- .../accumulo/entity/AccumuloDocIdIndexer.java | 10 +- .../accumulo/entity/EntityCentricIndex.java | 24 +-- .../rya/indexing/accumulo/entity/StarQuery.java | 8 +- .../accumulo/freetext/FreeTextTupleSet.java | 2 +- .../indexing/entity/EntityIndexSetProvider.java | 16 +- .../rya/indexing/entity/model/Entity.java | 82 +++---- .../rya/indexing/entity/model/Property.java | 8 +- .../apache/rya/indexing/entity/model/Type.java | 12 +- .../rya/indexing/entity/model/TypedEntity.java | 30 +-- .../indexing/entity/query/EntityQueryNode.java | 32 +-- .../indexing/entity/storage/EntityStorage.java | 6 +- .../indexing/entity/storage/TypeStorage.java | 8 +- .../storage/mongo/EntityDocumentConverter.java | 10 +- .../storage/mongo/MongoEntityStorage.java | 26 +-- .../entity/storage/mongo/MongoTypeStorage.java | 10 +- .../storage/mongo/TypeDocumentConverter.java | 8 +- .../entity/update/BaseEntityIndexer.java | 30 +-- .../indexing/entity/update/EntityUpdater.java | 6 +- .../external/PrecomputedJoinIndexer.java | 4 +- .../indexing/mongodb/AbstractMongoIndexer.java | 4 +- .../rya/indexing/mongodb/MongoDbSmartUri.java | 6 +- .../mongodb/update/RyaObjectStorage.java | 8 +- .../rya/indexing/smarturi/SmartUriAdapter.java | 114 +++++----- .../rya/indexing/smarturi/SmartUriStorage.java | 10 +- .../duplication/DuplicateDataDetector.java | 14 +- .../StatementMetadataExternalSetProvider.java | 12 +- .../matching/StatementMetadataNode.java | 48 ++--- .../DocumentIndexIntersectingIteratorTest.java | 16 +- .../AccumuloIndexingConfigurationTest.java | 4 +- .../accumulo/entity/AccumuloDocIndexerTest.java | 128 +++++------ .../accumulo/entity/EntityCentricIndexTest.java | 8 +- .../freetext/AccumuloFreeTextIndexerTest.java | 16 +- .../entity/query/EntityQueryNodeIT.java | 52 ++--- .../mongo/EntityDocumentConverterTest.java | 14 +- .../storage/mongo/MongoEntityStorageIT.java | 212 +++++++++---------- .../storage/mongo/MongoTypeStorageIT.java | 72 +++---- .../mongo/TypeDocumentConverterTest.java | 22 +- .../update/mongo/MongoEntityIndexerIT.java | 138 ++++++------ .../rya/indexing/mongo/MongoDbSmartUriIT.java | 92 ++++---- .../rya/indexing/mongo/MongoEntityIndex2IT.java | 22 +- .../rya/indexing/mongo/MongoEntityIndexIT.java | 44 ++-- .../indexing/mongo/MongoFreeTextIndexerIT.java | 16 +- .../duplication/DuplicateDataDetectorIT.java | 112 +++++----- .../AccumuloStatementMetadataNodeTest.java | 106 +++++----- .../AccumuloStatementMetadataOptimizerIT.java | 60 +++--- .../metadata/MongoStatementMetadataIT.java | 58 ++--- .../metadata/MongoStatementMetadataNodeIT.java | 64 +++--- ...tatementMetadataExternalSetProviderTest.java | 16 +- .../StatementMetadataOptimizerTest.java | 6 +- .../metadata/StatementMetadataTestUtils.java | 16 +- .../src/main/java/StatementMetadataExample.java | 96 ++++----- .../export/accumulo/util/AccumuloRyaUtils.java | 38 ++-- .../accumulo/AccumuloRyaStatementStoreTest.java | 24 +-- .../apache/rya/export/accumulo/TestUtils.java | 29 ++- .../org/apache/rya/indexing/export/ITBase.java | 10 +- .../rya/forwardchain/ForwardChainConstants.java | 6 +- .../rya/indexing/geotemporal/model/Event.java | 16 +- .../geotemporal/model/EventQueryNode.java | 4 +- .../geotemporal/storage/EventStorage.java | 4 +- .../mongo/EventDocumentConverter.java | 4 +- .../geotemporal/mongo/EventUpdater.java | 6 +- .../geotemporal/mongo/MongoEventStorage.java | 10 +- .../mongo/MongoGeoTemporalIndexer.java | 6 +- .../geotemporal/MongoGeoTemporalIndexIT.java | 4 +- .../geotemporal/model/EventQueryNode2IT.java | 26 +-- .../mongo/EventDocumentConverterTest.java | 4 +- .../GeoTemporalMongoDBStorageStrategyTest.java | 8 +- .../geotemporal/mongo/MongoEventStorageIT.java | 26 +-- .../rya/giraph/format/TestVertexFormat.java | 26 +-- .../accumulo/BindingSetStringConverter.java | 4 +- .../mr/merge/util/AccumuloRyaUtils.java | 36 ++-- .../rya/accumulo/mr/merge/MergeToolTest.java | 2 +- .../rya/accumulo/mr/merge/RulesetCopyIT.java | 8 +- .../accumulo/mr/merge/demo/MergeToolDemo.java | 4 +- .../merge/driver/MiniAccumuloClusterDriver.java | 2 +- .../rya/accumulo/mr/merge/util/TestUtils.java | 20 +- .../indexing/pcj/fluo/api/CreateFluoPcj.java | 14 +- .../pcj/fluo/app/ConstructProjection.java | 6 +- .../pcj/fluo/app/ConstructGraphTest.java | 14 +- .../pcj/fluo/app/ConstructGraphTestUtils.java | 4 +- .../pcj/fluo/app/ConstructProjectionTest.java | 8 +- .../pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java | 10 +- .../pcj/fluo/demo/FluoAndHistoricPcjsDemo.java | 54 ++--- .../pcj/fluo/ConstructGraphTestUtils.java | 4 +- .../pcj/fluo/api/CountStatementsIT.java | 12 +- .../indexing/pcj/fluo/api/GetQueryReportIT.java | 34 +-- .../indexing/pcj/fluo/integration/BatchIT.java | 50 ++--- .../indexing/pcj/fluo/integration/InputIT.java | 26 +-- .../integration/KafkaRyaSubGraphExportIT.java | 72 +++---- .../pcj/fluo/integration/RyaExportIT.java | 32 +-- .../pcj/fluo/visibility/PcjVisibilityIT.java | 32 +-- .../rya/prospector/plans/impl/CountPlan.java | 6 +- .../rya/joinselect/mr/JoinSelectMapperTest.java | 4 +- .../joinselect/mr/JoinSelectStatisticsTest.java | 42 ++-- .../rya/prospector/mr/ProspectorTest.java | 12 +- .../ProspectorServiceEvalStatsDAOTest.java | 22 +- .../org/apache/rya/reasoning/LocalReasoner.java | 28 +-- .../java/org/apache/rya/reasoning/OwlClass.java | 22 +- .../org/apache/rya/reasoning/OwlProperty.java | 24 +-- .../rya/reasoning/mr/ConformanceTest.java | 6 +- .../org/apache/rya/reasoning/TestUtils.java | 6 +- .../processors/filter/TemporalFilterIT.java | 10 +- .../rya/accumulo/mr/GraphXEdgeInputFormat.java | 6 +- .../apache/rya/accumulo/mr/RyaOutputFormat.java | 12 +- .../rya/accumulo/mr/RyaStatementWritable.java | 2 +- .../accumulo/mr/examples/TextOutputExample.java | 14 +- .../accumulo/mr/tools/AccumuloRdfCountTool.java | 4 +- .../accumulo/mr/GraphXEdgeInputFormatTest.java | 8 +- .../rya/accumulo/mr/GraphXInputFormatTest.java | 8 +- .../rya/accumulo/mr/RyaInputFormatTest.java | 8 +- .../rya/accumulo/mr/RyaOutputFormatTest.java | 54 ++--- .../accumulo/mr/RyaStatementWritableTest.java | 14 +- .../mr/tools/AccumuloRdfCountToolTest.java | 16 +- .../accumulo/mr/tools/RdfFileInputToolTest.java | 14 +- .../accumulo/mr/tools/Upgrade322ToolTest.java | 40 ++-- .../accumulo/pig/StatementPatternStorage.java | 6 +- .../pig/StatementPatternStorageTest.java | 12 +- .../RdfCloudTripleStoreConnection.java | 12 +- .../evaluation/FilterRangeVisitor.java | 6 +- .../inference/HasValueVisitor.java | 6 +- .../inference/InferenceEngine.java | 22 +- .../rdftriplestore/inference/InverseIRI.java | 64 ++++++ .../inference/InverseOfVisitor.java | 8 +- .../rdftriplestore/inference/InverseURI.java | 64 ------ .../inference/PropertyChainVisitor.java | 6 +- .../inference/SubClassOfVisitor.java | 18 +- .../inference/SubPropertyOfVisitor.java | 16 +- .../inference/SymmetricPropertyVisitor.java | 4 +- .../inference/TransitivePropertyVisitor.java | 4 +- .../test/java/org/apache/rya/HashJoinTest.java | 128 +++++------ .../java/org/apache/rya/IterativeJoinTest.java | 124 +++++------ .../test/java/org/apache/rya/MergeJoinTest.java | 118 +++++------ .../evaluation/StatementPatternEvalTest.java | 62 +++--- .../inference/PropertyChainTest.java | 2 +- 208 files changed, 2780 insertions(+), 2781 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/AfterTemporalInstant.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/AfterTemporalInstant.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/AfterTemporalInstant.java index fe58e37..1ec0128 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/AfterTemporalInstant.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/AfterTemporalInstant.java @@ -32,7 +32,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; public class AfterTemporalInstant extends TemporalInstantRelationFunction { @Override public String getURI() { - return TemporalURIs.AFTER; + return TemporalIRIs.AFTER; } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/BeforeTemporalInstant.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/BeforeTemporalInstant.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/BeforeTemporalInstant.java index 4cb12e0..1399723 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/BeforeTemporalInstant.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/BeforeTemporalInstant.java @@ -32,7 +32,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; public class BeforeTemporalInstant extends TemporalInstantRelationFunction { @Override public String getURI() { - return TemporalURIs.BEFORE; + return TemporalIRIs.BEFORE; } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/EqualsTemporalInstant.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/EqualsTemporalInstant.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/EqualsTemporalInstant.java index 10fe40b..ce52436 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/EqualsTemporalInstant.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/EqualsTemporalInstant.java @@ -32,7 +32,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; public class EqualsTemporalInstant extends TemporalInstantRelationFunction { @Override public String getURI() { - return TemporalURIs.EQUALS; + return TemporalIRIs.EQUALS; } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIRIs.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIRIs.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIRIs.java new file mode 100644 index 0000000..89f9c93 --- /dev/null +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIRIs.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.rya.api.function.temporal; + +/** + * Constants for the Temporal Functions used in rya. + */ +public class TemporalIRIs { + /** + * All temporal functions have the namespace (<tt>http://rya.apache.org/ns/temporal#</tt>). + */ + public static final String NAMESPACE = "http://rya.apache.org/ns/temporal#";; + + /** <tt>http://rya.apache.org/ns/temporal#equals</tt> */ + public final static String EQUALS = NAMESPACE + "equals"; + + /** <tt>http://rya.apache.org/ns/temporal#before</tt> */ + public final static String BEFORE = NAMESPACE + "before"; + + /** <tt>http://rya.apache.org/ns/temporal#after</tt> */ + public final static String AFTER = NAMESPACE + "after"; + + /** <tt>http://rya.apache.org/ns/temporal#within</tt> */ + public final static String WITHIN = NAMESPACE + "within"; +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalURIs.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalURIs.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalURIs.java deleted file mode 100644 index 3fd016a..0000000 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalURIs.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.rya.api.function.temporal; - -/** - * Constants for the Temporal Functions used in rya. - */ -public class TemporalURIs { - /** - * All temporal functions have the namespace (<tt>http://rya.apache.org/ns/temporal#</tt>). - */ - public static final String NAMESPACE = "http://rya.apache.org/ns/temporal#";; - - /** <tt>http://rya.apache.org/ns/temporal#equals</tt> */ - public final static String EQUALS = NAMESPACE + "equals"; - - /** <tt>http://rya.apache.org/ns/temporal#before</tt> */ - public final static String BEFORE = NAMESPACE + "before"; - - /** <tt>http://rya.apache.org/ns/temporal#after</tt> */ - public final static String AFTER = NAMESPACE + "after"; - - /** <tt>http://rya.apache.org/ns/temporal#within</tt> */ - public final static String WITHIN = NAMESPACE + "within"; -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/WithinTemporalInterval.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/WithinTemporalInterval.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/WithinTemporalInterval.java index 5fc3e03..dcb8c94 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/WithinTemporalInterval.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/WithinTemporalInterval.java @@ -33,7 +33,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; public class WithinTemporalInterval extends TemporalIntervalRelationFunction { @Override public String getURI() { - return TemporalURIs.WITHIN; + return TemporalIRIs.WITHIN; } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java index c5d3e5f..4a10506 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Set; import org.apache.hadoop.conf.Configuration; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.layout.TableLayoutStrategy; import org.apache.rya.api.layout.TablePrefixLayoutStrategy; import org.apache.rya.api.persist.RdfEvalStatsDAO; @@ -657,11 +657,11 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { return getBoolean(CONF_USE_STATEMENT_METADATA, false); } - public void setStatementMetadataProperties(final Set<RyaURI> metadataProperties) { + public void setStatementMetadataProperties(final Set<RyaIRI> metadataProperties) { final String[] propArray = new String[metadataProperties.size()]; int i = 0; - for(final RyaURI uri: metadataProperties) { + for(final RyaIRI uri: metadataProperties) { propArray[i] = uri.getData(); i++; } @@ -669,12 +669,12 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { } - public Set<RyaURI> getStatementMetadataProperties() { - final Set<RyaURI> uriSet = new HashSet<>(); + public Set<RyaIRI> getStatementMetadataProperties() { + final Set<RyaIRI> uriSet = new HashSet<>(); final String[] uriStrings = getStrings(CONF_STATEMENT_METADATA_PROPERTIES); if (uriStrings != null) { for (final String s : uriStrings) { - uriSet.add(new RyaURI(s)); + uriSet.add(new RyaIRI(s)); } } return uriSet; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java index a0ac20d..a61137d 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java @@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets; import org.apache.hadoop.io.Text; import org.apache.rya.api.domain.RyaSchema; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Value; @@ -141,9 +141,9 @@ public class RdfCloudTripleStoreConstants { //TODO: This should be in a version file somewhere public static IRI RTS_SUBJECT = VALUE_FACTORY.createIRI(NAMESPACE, "rts"); - public static RyaURI RTS_SUBJECT_RYA = new RyaURI(RTS_SUBJECT.stringValue()); + public static RyaIRI RTS_SUBJECT_RYA = new RyaIRI(RTS_SUBJECT.stringValue()); public static IRI RTS_VERSION_PREDICATE = VALUE_FACTORY.createIRI(NAMESPACE, "version"); - public static RyaURI RTS_VERSION_PREDICATE_RYA = new RyaURI(RTS_VERSION_PREDICATE.stringValue()); + public static RyaIRI RTS_VERSION_PREDICATE_RYA = new RyaIRI(RTS_VERSION_PREDICATE.stringValue()); public static final Value VERSION = VALUE_FACTORY.createLiteral("3.0.0"); public static RyaType VERSION_RYA = new RyaType(VERSION.stringValue()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeIRI.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeIRI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeIRI.java new file mode 100644 index 0000000..84b38d1 --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeIRI.java @@ -0,0 +1,51 @@ +package org.apache.rya.api.domain; + +/* + * 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. + */ + + + +import org.eclipse.rdf4j.model.IRI; + +/** + * Created by IntelliJ IDEA. + * Date: 4/11/12 + * Time: 1:03 PM + * To change this template use File | Settings | File Templates. + */ +public class RangeIRI extends RangeValue<IRI> implements IRI { + + public RangeIRI(IRI start, IRI end) { + super(start, end); + } + + public RangeIRI(RangeValue rangeValue) { + super((IRI) rangeValue.getStart(), (IRI) rangeValue.getEnd()); + } + + @Override + public String getNamespace() { + throw new UnsupportedOperationException("Ranges do not have a namespace"); + } + + @Override + public String getLocalName() { + throw new UnsupportedOperationException("Ranges do not have a localname"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java deleted file mode 100644 index d47ab5a..0000000 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.apache.rya.api.domain; - -/* - * 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. - */ - - - -import org.eclipse.rdf4j.model.IRI; - -/** - * Created by IntelliJ IDEA. - * Date: 4/11/12 - * Time: 1:03 PM - * To change this template use File | Settings | File Templates. - */ -public class RangeURI extends RangeValue<IRI> implements IRI { - - public RangeURI(IRI start, IRI end) { - super(start, end); - } - - public RangeURI(RangeValue rangeValue) { - super((IRI) rangeValue.getStart(), (IRI) rangeValue.getEnd()); - } - - @Override - public String getNamespace() { - throw new UnsupportedOperationException("Ranges do not have a namespace"); - } - - @Override - public String getLocalName() { - throw new UnsupportedOperationException("Ranges do not have a localname"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRI.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRI.java new file mode 100644 index 0000000..8909b05 --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRI.java @@ -0,0 +1,61 @@ +package org.apache.rya.api.domain; + +/* + * 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. + */ + +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.util.URIUtil; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; + + +/** + * Date: 7/16/12 + * Time: 11:56 AM + */ +public class RyaIRI extends RyaType { + + public RyaIRI() { + setDataType(XMLSchema.ANYURI); + } + + public RyaIRI(String data) { + super(XMLSchema.ANYURI, data); + } + + public RyaIRI(String namespace, String data) { + super(XMLSchema.ANYURI, namespace + data); + } + + protected RyaIRI(IRI datatype, String data) { + super(datatype, data); + } + + @Override + public void setData(String data) { + super.setData(data); + validate(data); + } + + protected void validate(String data) { + if (data == null) + throw new IllegalArgumentException("Null not IRI"); + URIUtil.getLocalNameIndex(data); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIPrefix.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIPrefix.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIPrefix.java new file mode 100644 index 0000000..3251237 --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIPrefix.java @@ -0,0 +1,47 @@ +package org.apache.rya.api.domain; + +/* + * 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. + */ + + + +import org.apache.rya.api.RdfCloudTripleStoreConstants; + +/** + * Date: 7/24/12 + * Time: 3:26 PM + */ +public class RyaIRIPrefix extends RyaIRIRange { + public static final String LAST = "\u00FF"; + + public RyaIRIPrefix(String prefix) { + super(); + setPrefix(prefix); + } + + public void setPrefix(String prefix) { + setStart(new RyaIRI(prefix + RdfCloudTripleStoreConstants.DELIM)); + setStop(new RyaIRI(prefix + LAST)); + } + + public String getPrefix() { + String data = getStart().getData(); + return data.substring(0, data.length() - 1); + } +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIRange.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIRange.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIRange.java new file mode 100644 index 0000000..177048e --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaIRIRange.java @@ -0,0 +1,95 @@ +package org.apache.rya.api.domain; + +/* + * 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. + */ + + + +/** + * Date: 7/17/12 + * Time: 9:59 AM + */ +public class RyaIRIRange extends RyaIRI implements RyaRange { + public static final RyaIRI LAST_IRI = new RyaIRI(((char) 255) + ":#" + ((char) 255)); + + private RyaIRI start; + private RyaIRI stop; + + public RyaIRIRange() { + super(); + } + + public RyaIRIRange(RyaIRI start, RyaIRI stop) { + this.start = start; + this.stop = stop; + } + + public RyaIRI getStart() { + return start; + } + + public void setStart(RyaIRI start) { + this.start = start; + } + + public RyaIRI getStop() { + return stop; + } + + public void setStop(RyaIRI stop) { + this.stop = stop; + } + + @Override + public String getData() { + throw new UnsupportedOperationException(); + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append("RyaIRIRange"); + sb.append("{start=").append(start); + sb.append(", stop=").append(stop); + sb.append('}'); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + + RyaIRIRange that = (RyaIRIRange) o; + + if (start != null ? !start.equals(that.start) : that.start != null) return false; + if (stop != null ? !stop.equals(that.stop) : that.stop != null) return false; + + return true; + } + + @Override + public int hashCode() { + int result = super.hashCode(); + result = 31 * result + (start != null ? start.hashCode() : 0); + result = 31 * result + (stop != null ? stop.hashCode() : 0); + return result; + } +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java index eac6740..4d870a8 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java @@ -26,10 +26,10 @@ import java.util.Arrays; * Time: 7:20 AM */ public class RyaStatement { - private RyaURI subject; - private RyaURI predicate; + private RyaIRI subject; + private RyaIRI predicate; private RyaType object; - private RyaURI context; + private RyaIRI context; private String qualifer; private byte[] columnVisibility; private byte[] value; @@ -38,34 +38,34 @@ public class RyaStatement { public RyaStatement() { } - public RyaStatement(final RyaURI subject, final RyaURI predicate, final RyaType object) { + public RyaStatement(final RyaIRI subject, final RyaIRI predicate, final RyaType object) { this(subject, predicate, object, null); } - public RyaStatement(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context) { + public RyaStatement(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context) { this(subject, predicate, object, context, null); } - public RyaStatement(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context, final String qualifier) { + public RyaStatement(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context, final String qualifier) { this(subject, predicate, object, context, qualifier, new StatementMetadata()); } - public RyaStatement(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context, final String qualifier, final StatementMetadata metadata) { + public RyaStatement(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context, final String qualifier, final StatementMetadata metadata) { this(subject, predicate, object, context, qualifier, metadata, null); } - public RyaStatement(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context, final String qualifier, final StatementMetadata metadata, final byte[] columnVisibility) { + public RyaStatement(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context, final String qualifier, final StatementMetadata metadata, final byte[] columnVisibility) { this(subject, predicate, object, context, qualifier, columnVisibility, metadata.toBytes()); } @Deprecated - public RyaStatement(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context, final String qualifier, final byte[] columnVisibility, final byte[] value) { + public RyaStatement(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context, final String qualifier, final byte[] columnVisibility, final byte[] value) { this(subject, predicate, object, context, qualifier, columnVisibility, value, null); } @Deprecated - public RyaStatement(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context, final String qualifier, final byte[] columnVisibility, final byte[] value, final Long timestamp) { + public RyaStatement(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context, final String qualifier, final byte[] columnVisibility, final byte[] value, final Long timestamp) { this.subject = subject; this.predicate = predicate; this.object = object; @@ -76,19 +76,19 @@ public class RyaStatement { this.timestamp = timestamp != null ? timestamp : System.currentTimeMillis(); } - public RyaURI getSubject() { + public RyaIRI getSubject() { return subject; } - public void setSubject(final RyaURI subject) { + public void setSubject(final RyaIRI subject) { this.subject = subject; } - public RyaURI getPredicate() { + public RyaIRI getPredicate() { return predicate; } - public void setPredicate(final RyaURI predicate) { + public void setPredicate(final RyaIRI predicate) { this.predicate = predicate; } @@ -100,11 +100,11 @@ public class RyaStatement { this.object = object; } - public RyaURI getContext() { + public RyaIRI getContext() { return context; } - public void setContext(final RyaURI context) { + public void setContext(final RyaIRI context) { this.context = context; } @@ -273,18 +273,18 @@ public class RyaStatement { return this; } - public RyaStatementBuilder setContext(final RyaURI ryaURI) { - ryaStatement.setContext(ryaURI); + public RyaStatementBuilder setContext(final RyaIRI ryaIRI) { + ryaStatement.setContext(ryaIRI); return this; } - public RyaStatementBuilder setSubject(final RyaURI ryaURI) { - ryaStatement.setSubject(ryaURI); + public RyaStatementBuilder setSubject(final RyaIRI ryaIRI) { + ryaStatement.setSubject(ryaIRI); return this; } - public RyaStatementBuilder setPredicate(final RyaURI ryaURI) { - ryaStatement.setPredicate(ryaURI); + public RyaStatementBuilder setPredicate(final RyaIRI ryaIRI) { + ryaStatement.setPredicate(ryaIRI); return this; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java index 3136af3..505c8ba 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java @@ -45,8 +45,8 @@ public final class RyaTypeUtils { .put(Long.class, (v) -> longRyaType((Long) v)) .put(Short.class, (v) -> shortRyaType((Short) v)) .put(String.class, (v) -> stringRyaType((String) v)) - .put(IRI.class, (v) -> uriRyaType((IRI) v)) - .put(SimpleIRI.class, (v) -> uriRyaType((SimpleIRI) v)) + .put(IRI.class, (v) -> iriRyaType((IRI) v)) + .put(SimpleIRI.class, (v) -> iriRyaType((SimpleIRI) v)) .build(); /** @@ -186,7 +186,7 @@ public final class RyaTypeUtils { * @return the {@link RyaType} with the data type set to * {@link XMLSchema#ANYURI} and the data set to the specified {@code value}. */ - public static RyaType uriRyaType(final IRI value) { + public static RyaType iriRyaType(final IRI value) { return new RyaType(XMLSchema.ANYURI, value.stringValue()); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java deleted file mode 100644 index 1e948ae..0000000 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.apache.rya.api.domain; - -/* - * 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. - */ - -import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.util.URIUtil; -import org.eclipse.rdf4j.model.vocabulary.XMLSchema; - - -/** - * Date: 7/16/12 - * Time: 11:56 AM - */ -public class RyaURI extends RyaType { - - public RyaURI() { - setDataType(XMLSchema.ANYURI); - } - - public RyaURI(String data) { - super(XMLSchema.ANYURI, data); - } - - public RyaURI(String namespace, String data) { - super(XMLSchema.ANYURI, namespace + data); - } - - protected RyaURI(IRI datatype, String data) { - super(datatype, data); - } - - @Override - public void setData(String data) { - super.setData(data); - validate(data); - } - - protected void validate(String data) { - if (data == null) - throw new IllegalArgumentException("Null not URI"); - URIUtil.getLocalNameIndex(data); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java deleted file mode 100644 index 094eb65..0000000 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.apache.rya.api.domain; - -/* - * 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. - */ - - - -import org.apache.rya.api.RdfCloudTripleStoreConstants; - -/** - * Date: 7/24/12 - * Time: 3:26 PM - */ -public class RyaURIPrefix extends RyaURIRange { - public static final String LAST = "\u00FF"; - - public RyaURIPrefix(String prefix) { - super(); - setPrefix(prefix); - } - - public void setPrefix(String prefix) { - setStart(new RyaURI(prefix + RdfCloudTripleStoreConstants.DELIM)); - setStop(new RyaURI(prefix + LAST)); - } - - public String getPrefix() { - String data = getStart().getData(); - return data.substring(0, data.length() - 1); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java deleted file mode 100644 index 7fa9289..0000000 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.apache.rya.api.domain; - -/* - * 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. - */ - - - -/** - * Date: 7/17/12 - * Time: 9:59 AM - */ -public class RyaURIRange extends RyaURI implements RyaRange { - public static final RyaURI LAST_URI = new RyaURI(((char) 255) + ":#" + ((char) 255)); - - private RyaURI start; - private RyaURI stop; - - public RyaURIRange() { - super(); - } - - public RyaURIRange(RyaURI start, RyaURI stop) { - this.start = start; - this.stop = stop; - } - - public RyaURI getStart() { - return start; - } - - public void setStart(RyaURI start) { - this.start = start; - } - - public RyaURI getStop() { - return stop; - } - - public void setStop(RyaURI stop) { - this.stop = stop; - } - - @Override - public String getData() { - throw new UnsupportedOperationException(); - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("RyaURIRange"); - sb.append("{start=").append(start); - sb.append(", stop=").append(stop); - sb.append('}'); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; - - RyaURIRange that = (RyaURIRange) o; - - if (start != null ? !start.equals(that.start) : that.start != null) return false; - if (stop != null ? !stop.equals(that.stop) : that.stop != null) return false; - - return true; - } - - @Override - public int hashCode() { - int result = super.hashCode(); - result = 31 * result + (start != null ? start.hashCode() : 0); - result = 31 * result + (stop != null ? stop.hashCode() : 0); - return result; - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java index 23fe2d3..13e656a 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java @@ -45,9 +45,9 @@ public class StatementMetadata { .registerTypeHierarchyAdapter(RyaType.class, new RyaTypeAdapter()).create(); public static StatementMetadata EMPTY_METADATA = new StatementMetadata(); - private Map<RyaURI, RyaType> metadataMap = new HashMap<>(); + private Map<RyaIRI, RyaType> metadataMap = new HashMap<>(); @SuppressWarnings("serial") - private Type type = new TypeToken<Map<RyaURI, RyaType>>(){}.getType(); + private Type type = new TypeToken<Map<RyaIRI, RyaType>>(){}.getType(); public StatementMetadata() {} @@ -77,11 +77,11 @@ public class StatementMetadata { } } - public void addMetadata(RyaURI key, RyaType value) { + public void addMetadata(RyaIRI key, RyaType value) { metadataMap.put(key, value); } - public Map<RyaURI, RyaType> getMetadata() { + public Map<RyaIRI, RyaType> getMetadata() { return metadataMap; } @@ -124,8 +124,8 @@ public class StatementMetadata { String[] array = element.getAsJsonPrimitive().getAsString().split("\u0000"); Preconditions.checkArgument(array.length == 2); - if(type.equals(RyaURI.class.getName())){ - return new RyaURI(array[0]); + if(type.equals(RyaIRI.class.getName())){ + return new RyaIRI(array[0]); } else if(type.equals(RyaType.class.getName())){ RyaType ryaType = new RyaType(SimpleValueFactory.getInstance().createIRI(array[1]), array[0]); return ryaType; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java index 69a09bb..71de966 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java @@ -20,7 +20,7 @@ package org.apache.rya.api.domain.serialization.kryo; 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.domain.RyaIRI; import org.eclipse.rdf4j.model.ValueFactory; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.eclipse.rdf4j.model.vocabulary.XMLSchema; @@ -115,16 +115,16 @@ public class RyaStatementSerializer extends Serializer<RyaStatement> { String objectValue = input.readString(); RyaType value; if (objectType.equals(XMLSchema.ANYURI.toString())){ - value = new RyaURI(objectValue); + value = new RyaIRI(objectValue); } else { value = new RyaType(VF.createIRI(objectType), objectValue); } - RyaStatement statement = new RyaStatement(new RyaURI(subject), new RyaURI(predicate), value); + RyaStatement statement = new RyaStatement(new RyaIRI(subject), new RyaIRI(predicate), value); int length = 0; boolean hasNextValue = input.readBoolean(); if (hasNextValue){ - statement.setContext(new RyaURI(input.readString())); + statement.setContext(new RyaIRI(input.readString())); } hasNextValue = input.readBoolean(); if (hasNextValue){ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java index d83a5e9..2820beb 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java @@ -25,7 +25,7 @@ import java.util.Iterator; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.query.RyaQueryEngine; /** @@ -89,7 +89,7 @@ public interface RyaDAO<C extends RdfCloudTripleStoreConfiguration> extends RyaC * @param conf * @throws RyaDAOException */ - public void dropGraph(C conf, RyaURI... graphs) throws RyaDAOException; + public void dropGraph(C conf, RyaIRI... graphs) throws RyaDAOException; /** * Delete a collection of RyaStatements. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java index 2696e5b..0ac31e6 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java @@ -27,7 +27,7 @@ import java.util.Set; import org.apache.hadoop.conf.Configurable; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.eclipse.rdf4j.model.IRI; public interface RyaSecondaryIndexer extends Closeable, Flushable, Configurable { @@ -50,7 +50,7 @@ public interface RyaSecondaryIndexer extends Closeable, Flushable, Configurable public void deleteStatement(RyaStatement stmt) throws IOException; - public void dropGraph(RyaURI... graphs); + public void dropGraph(RyaIRI... graphs); /** * @return the set of predicates indexed by the indexer. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java index 65c01a7..209e9d8 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java @@ -27,7 +27,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; 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.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQueryEngine; import org.apache.rya.api.resolver.RyaContext; @@ -54,20 +54,20 @@ public class HashJoin<C extends RdfCloudTripleStoreConfiguration> implements Joi } @Override - public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaURI... preds) throws RyaDAOException { - ConcurrentHashMap<Map.Entry<RyaURI, RyaType>, Integer> ht = new ConcurrentHashMap<Map.Entry<RyaURI, RyaType>, Integer>(); + public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaIRI... preds) throws RyaDAOException { + ConcurrentHashMap<Map.Entry<RyaIRI, RyaType>, Integer> ht = new ConcurrentHashMap<Map.Entry<RyaIRI, RyaType>, Integer>(); int count = 0; boolean first = true; - for (RyaURI pred : preds) { + for (RyaIRI pred : preds) { count++; //query CloseableIteration<RyaStatement, RyaDAOException> results = ryaQueryEngine.query(new RyaStatement(null, pred, null), null); //add to hashtable while (results.hasNext()) { RyaStatement next = results.next(); - RyaURI subject = next.getSubject(); + RyaIRI subject = next.getSubject(); RyaType object = next.getObject(); - Map.Entry<RyaURI, RyaType> entry = new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, RyaType>(subject, object); + Map.Entry<RyaIRI, RyaType> entry = new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, RyaType>(subject, object); if (!first) { if (!ht.containsKey(entry)) { continue; //not in join @@ -79,14 +79,14 @@ public class HashJoin<C extends RdfCloudTripleStoreConfiguration> implements Joi if (first) { first = false; } else { - for (Map.Entry<Map.Entry<RyaURI, RyaType>, Integer> entry : ht.entrySet()) { + for (Map.Entry<Map.Entry<RyaIRI, RyaType>, Integer> entry : ht.entrySet()) { if (entry.getValue() < count) { ht.remove(entry.getKey()); } } } } - final Enumeration<Map.Entry<RyaURI, RyaType>> keys = ht.keys(); + final Enumeration<Map.Entry<RyaIRI, RyaType>> keys = ht.keys(); return new CloseableIteration<RyaStatement, RyaDAOException>() { @Override public void close() throws RyaDAOException { @@ -100,7 +100,7 @@ public class HashJoin<C extends RdfCloudTripleStoreConfiguration> implements Joi @Override public RyaStatement next() throws RyaDAOException { - Map.Entry<RyaURI, RyaType> subjObj = keys.nextElement(); + Map.Entry<RyaIRI, RyaType> subjObj = keys.nextElement(); return new RyaStatement(subjObj.getKey(), null, subjObj.getValue()); } @@ -112,19 +112,19 @@ public class HashJoin<C extends RdfCloudTripleStoreConfiguration> implements Joi } @Override - public CloseableIteration<RyaURI, RyaDAOException> join(C conf, Map.Entry<RyaURI, RyaType>... predObjs) throws RyaDAOException { - ConcurrentHashMap<RyaURI, Integer> ht = new ConcurrentHashMap<RyaURI, Integer>(); + public CloseableIteration<RyaIRI, RyaDAOException> join(C conf, Map.Entry<RyaIRI, RyaType>... predObjs) throws RyaDAOException { + ConcurrentHashMap<RyaIRI, Integer> ht = new ConcurrentHashMap<RyaIRI, Integer>(); int count = 0; boolean first = true; - for (Map.Entry<RyaURI, RyaType> predObj : predObjs) { + for (Map.Entry<RyaIRI, RyaType> predObj : predObjs) { count++; - RyaURI pred = predObj.getKey(); + RyaIRI pred = predObj.getKey(); RyaType obj = predObj.getValue(); //query CloseableIteration<RyaStatement, RyaDAOException> results = ryaQueryEngine.query(new RyaStatement(null, pred, obj), null); //add to hashtable while (results.hasNext()) { - RyaURI subject = results.next().getSubject(); + RyaIRI subject = results.next().getSubject(); if (!first) { if (!ht.containsKey(subject)) { continue; //not in join @@ -136,14 +136,14 @@ public class HashJoin<C extends RdfCloudTripleStoreConfiguration> implements Joi if (first) { first = false; } else { - for (Map.Entry<RyaURI, Integer> entry : ht.entrySet()) { + for (Map.Entry<RyaIRI, Integer> entry : ht.entrySet()) { if (entry.getValue() < count) { ht.remove(entry.getKey()); } } } } - return new EnumerationWrapper<RyaURI, RyaDAOException>(ht.keys()); + return new EnumerationWrapper<RyaIRI, RyaDAOException>(ht.keys()); } public RyaQueryEngine getRyaQueryEngine() { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java index 9bf216c..3c1d659 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java @@ -27,7 +27,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; 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.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQueryEngine; import org.apache.rya.api.resolver.RyaContext; @@ -60,14 +60,14 @@ public class IterativeJoin<C extends RdfCloudTripleStoreConfiguration> implement * @return */ @Override - public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaURI... preds) + public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaIRI... preds) throws RyaDAOException { Preconditions.checkNotNull(preds); Preconditions.checkArgument(preds.length > 1, "Must join 2 or more"); //TODO: Reorder predObjs based on statistics CloseableIteration<RyaStatement, RyaDAOException> iter = null; - for (RyaURI pred : preds) { + for (RyaIRI pred : preds) { if (iter == null) { iter = ryaQueryEngine.query(new RyaStatement(null, pred, null), null); } else { @@ -88,22 +88,22 @@ public class IterativeJoin<C extends RdfCloudTripleStoreConfiguration> implement * */ @Override - public CloseableIteration<RyaURI, RyaDAOException> join(C conf, Map.Entry<RyaURI, RyaType>... predObjs) + public CloseableIteration<RyaIRI, RyaDAOException> join(C conf, Map.Entry<RyaIRI, RyaType>... predObjs) throws RyaDAOException { Preconditions.checkNotNull(predObjs); Preconditions.checkArgument(predObjs.length > 1, "Must join 2 or more"); //TODO: Reorder predObjs based on statistics CloseableIteration<RyaStatement, RyaDAOException> first = null; - CloseableIteration<RyaURI, RyaDAOException> iter = null; - for (Map.Entry<RyaURI, RyaType> entry : predObjs) { + CloseableIteration<RyaIRI, RyaDAOException> iter = null; + for (Map.Entry<RyaIRI, RyaType> entry : predObjs) { if (first == null) { first = ryaQueryEngine.query(new RyaStatement(null, entry.getKey(), entry.getValue()), null); } else if (iter == null) { - iter = join(new ConvertingIteration<RyaStatement, RyaURI, RyaDAOException>(first) { + iter = join(new ConvertingIteration<RyaStatement, RyaIRI, RyaDAOException>(first) { @Override - protected RyaURI convert(RyaStatement statement) throws RyaDAOException { + protected RyaIRI convert(RyaStatement statement) throws RyaDAOException { return statement.getSubject(); } }, entry); @@ -115,12 +115,12 @@ public class IterativeJoin<C extends RdfCloudTripleStoreConfiguration> implement return iter; } - protected CloseableIteration<RyaURI, RyaDAOException> join(final CloseableIteration<RyaURI, RyaDAOException> iteration, - final Map.Entry<RyaURI, RyaType> predObj) { + protected CloseableIteration<RyaIRI, RyaDAOException> join(final CloseableIteration<RyaIRI, RyaDAOException> iteration, + final Map.Entry<RyaIRI, RyaType> predObj) { //TODO: configure batch //TODO: batch = 1, does not work final int batch = 100; - return new CloseableIteration<RyaURI, RyaDAOException>() { + return new CloseableIteration<RyaIRI, RyaDAOException>() { private CloseableIteration<Map.Entry<RyaStatement, BindingSet>, RyaDAOException> query; @@ -138,7 +138,7 @@ public class IterativeJoin<C extends RdfCloudTripleStoreConfiguration> implement } @Override - public RyaURI next() throws RyaDAOException { + public RyaIRI next() throws RyaDAOException { if (query == null || !query.hasNext()) { if (!batchNext()) return null; } @@ -170,7 +170,7 @@ public class IterativeJoin<C extends RdfCloudTripleStoreConfiguration> implement } protected CloseableIteration<RyaStatement, RyaDAOException> join( - final CloseableIteration<RyaStatement, RyaDAOException> iteration, final RyaURI pred) { + final CloseableIteration<RyaStatement, RyaDAOException> iteration, final RyaIRI pred) { //TODO: configure batch //TODO: batch = 1, does not work final int batch = 100; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java index 3334cd8..21ce1a2 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; 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.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.eclipse.rdf4j.common.iteration.CloseableIteration; @@ -34,9 +34,9 @@ import org.eclipse.rdf4j.common.iteration.CloseableIteration; */ public interface Join<C extends RdfCloudTripleStoreConfiguration> { - public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaURI... preds) + public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaIRI... preds) throws RyaDAOException; - public CloseableIteration<RyaURI, RyaDAOException> join(C conf, Map.Entry<RyaURI, RyaType>... predObjs) + public CloseableIteration<RyaIRI, RyaDAOException> join(C conf, Map.Entry<RyaIRI, RyaType>... predObjs) throws RyaDAOException; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java index c858327..327ff39 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java @@ -27,8 +27,8 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaRange; 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.domain.RyaURIRange; +import org.apache.rya.api.domain.RyaIRI; +import org.apache.rya.api.domain.RyaIRIRange; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQueryEngine; import org.apache.rya.api.resolver.RyaContext; @@ -61,13 +61,13 @@ public class MergeJoin<C extends RdfCloudTripleStoreConfiguration> implements Jo * @return */ @Override - public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaURI... preds) + public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaIRI... preds) throws RyaDAOException { Preconditions.checkNotNull(preds); Preconditions.checkArgument(preds.length > 1, "Must join 2 or more"); //TODO: Reorder predObjs based on statistics final List<CloseableIteration<RyaStatement, RyaDAOException>> iters = new ArrayList<CloseableIteration<RyaStatement, RyaDAOException>>(); - for (RyaURI predicate : preds) { + for (RyaIRI predicate : preds) { Preconditions.checkArgument(predicate != null && !(predicate instanceof RyaRange)); CloseableIteration<RyaStatement, RyaDAOException> iter = ryaQueryEngine.query(new RyaStatement(null, predicate, null), conf); @@ -146,16 +146,16 @@ public class MergeJoin<C extends RdfCloudTripleStoreConfiguration> implements Jo * @throws RyaDAOException */ @Override - public CloseableIteration<RyaURI, RyaDAOException> join(C conf, Map.Entry<RyaURI, RyaType>... predObjs) + public CloseableIteration<RyaIRI, RyaDAOException> join(C conf, Map.Entry<RyaIRI, RyaType>... predObjs) throws RyaDAOException { Preconditions.checkNotNull(predObjs); Preconditions.checkArgument(predObjs.length > 1, "Must join 2 or more"); //TODO: Reorder predObjs based on statistics final List<CloseableIteration<RyaStatement, RyaDAOException>> iters = new ArrayList<CloseableIteration<RyaStatement, RyaDAOException>>(); - RyaURI earliest_subject = null; - for (Map.Entry<RyaURI, RyaType> predObj : predObjs) { - RyaURI predicate = predObj.getKey(); + RyaIRI earliest_subject = null; + for (Map.Entry<RyaIRI, RyaType> predObj : predObjs) { + RyaIRI predicate = predObj.getKey(); RyaType object = predObj.getValue(); Preconditions.checkArgument(predicate != null && !(predicate instanceof RyaRange)); Preconditions.checkArgument(object != null && !(object instanceof RyaRange)); @@ -166,10 +166,10 @@ public class MergeJoin<C extends RdfCloudTripleStoreConfiguration> implements Jo ryaQueryEngine.query(new RyaStatement(null, predicate, object), conf)); } else { iter = new PeekingCloseableIteration<RyaStatement, RyaDAOException>( - ryaQueryEngine.query(new RyaStatement(new RyaURIRange(earliest_subject, RyaURIRange.LAST_URI), predicate, object), conf)); + ryaQueryEngine.query(new RyaStatement(new RyaIRIRange(earliest_subject, RyaIRIRange.LAST_IRI), predicate, object), conf)); } if (!iter.hasNext()) { - return new EmptyIteration<RyaURI, RyaDAOException>(); + return new EmptyIteration<RyaIRI, RyaDAOException>(); } //setting up range to make performant query earliest_subject = iter.peek().getSubject(); @@ -181,9 +181,9 @@ public class MergeJoin<C extends RdfCloudTripleStoreConfiguration> implements Jo //perform merge operation - return new CloseableIteration<RyaURI, RyaDAOException>() { + return new CloseableIteration<RyaIRI, RyaDAOException>() { - private RyaURI first_subj; + private RyaIRI first_subj; @Override public void close() throws RyaDAOException { @@ -198,14 +198,14 @@ public class MergeJoin<C extends RdfCloudTripleStoreConfiguration> implements Jo } @Override - public RyaURI next() throws RyaDAOException { + public RyaIRI next() throws RyaDAOException { if (first_subj != null) { - RyaURI temp = first_subj; + RyaIRI temp = first_subj; first_subj = null; return temp; } if (check()) { - RyaURI temp = first_subj; + RyaIRI temp = first_subj; first_subj = null; return temp; } @@ -222,7 +222,7 @@ public class MergeJoin<C extends RdfCloudTripleStoreConfiguration> implements Jo first_subj = first.next().getSubject(); for (CloseableIteration<RyaStatement, RyaDAOException> iter : iters) { if (!iter.hasNext()) return false; //no more left to join - RyaURI iter_subj = iter.next().getSubject(); + RyaIRI iter_subj = iter.next().getSubject(); while (first_subj.compareTo(iter_subj) < 0) { if (!first.hasNext()) return false; first_subj = first.next().getSubject(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java index 15a3a88..d8c8226 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.triple.TripleRowRegex; /** @@ -34,12 +34,12 @@ import org.apache.rya.api.resolver.triple.TripleRowRegex; */ public interface TriplePatternStrategy { - public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(RyaURI subject, RyaURI predicate, RyaType object, RyaURI context, + public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(RyaIRI subject, RyaIRI predicate, RyaType object, RyaIRI context, RdfCloudTripleStoreConfiguration conf) throws IOException; public TABLE_LAYOUT getLayout(); - public boolean handles(RyaURI subject, RyaURI predicate, RyaType object, RyaURI context); + public boolean handles(RyaIRI subject, RyaIRI predicate, RyaType object, RyaIRI context); public TripleRowRegex buildRegex(String subject, String predicate, String object, String context, byte[] objectTypeInfo); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java index 6e8bb31..1b69721 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java @@ -34,7 +34,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaRange; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; @@ -54,8 +54,8 @@ public class HashedPoWholeRowTriplePatternStrategy extends AbstractHashedTripleP @Override public Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, - ByteRange> defineRange(final RyaURI subject, final RyaURI predicate, final RyaType object, - final RyaURI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { + ByteRange> defineRange(final RyaIRI subject, final RyaIRI predicate, final RyaType object, + final RyaIRI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { try { //po(ng) //po_r(s)(ng) @@ -122,7 +122,7 @@ public class HashedPoWholeRowTriplePatternStrategy extends AbstractHashedTripleP } @Override - public boolean handles(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context) { + public boolean handles(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context) { //po(ng) //p_r(o)(ng) //po_r(s)(ng) http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java index c87d268..42fd9d2 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java @@ -34,8 +34,8 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaRange; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; -import org.apache.rya.api.domain.RyaURIRange; +import org.apache.rya.api.domain.RyaIRI; +import org.apache.rya.api.domain.RyaIRIRange; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; @@ -55,8 +55,8 @@ public class HashedSpoWholeRowTriplePatternStrategy extends AbstractHashedTriple } @Override - public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(final RyaURI subject, final RyaURI predicate, final RyaType object, - final RyaURI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { + public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(final RyaIRI subject, final RyaIRI predicate, final RyaType object, + final RyaIRI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { try { //spo(ng) //sp(ng) @@ -134,8 +134,8 @@ public class HashedSpoWholeRowTriplePatternStrategy extends AbstractHashedTriple } @Override - public boolean handles(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context) { + public boolean handles(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context) { //if subject is not null and not a range (if predicate is null then object must be null) - return (subject != null && !(subject instanceof RyaURIRange)) && !((predicate == null || predicate instanceof RyaURIRange) && (object != null)); + return (subject != null && !(subject instanceof RyaIRIRange)) && !((predicate == null || predicate instanceof RyaIRIRange) && (object != null)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java index 5398fc0..afc3af2 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java @@ -28,7 +28,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.query.strategy.AbstractTriplePatternStrategy; import org.apache.rya.api.query.strategy.ByteRange; @@ -40,15 +40,15 @@ public class NullRowTriplePatternStrategy extends AbstractTriplePatternStrategy } @Override - public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(RyaURI subject, RyaURI predicate, RyaType object, - RyaURI context, RdfCloudTripleStoreConfiguration conf) throws IOException { + public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(RyaIRI subject, RyaIRI predicate, RyaType object, + RyaIRI context, RdfCloudTripleStoreConfiguration conf) throws IOException { byte[] start = new byte[]{ /* empty array */ }; // Scan from the beginning of the Accumulo Table byte[] stop = LAST_BYTES; // Scan to the end, up through things beginning with 0xff. return new RdfCloudTripleStoreUtils.CustomEntry<>(TABLE_LAYOUT.SPO, new ByteRange(start, stop)); } @Override - public boolean handles(RyaURI subject, RyaURI predicate, RyaType object, RyaURI context) { + public boolean handles(RyaIRI subject, RyaIRI predicate, RyaType object, RyaIRI context) { return subject == null && predicate == null && object == null; } }
