RYA-405 Migration of OpenRDF Sesame libraries to RDF4J Co-authored-by: eric.white <[email protected]> Co-authored-by: Jorge Machado <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/81b99327 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/81b99327 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/81b99327 Branch: refs/heads/master Commit: 81b99327d97f60de3273c21c25ec564034c974da Parents: ca055ae Author: Jorge Machado <[email protected]> Authored: Wed Oct 18 11:32:39 2017 +0200 Committer: Valiyil <[email protected]> Committed: Mon Apr 23 09:19:10 2018 -0400 ---------------------------------------------------------------------- README.md | 90 +- common/rya.api.function/pom.xml | 8 +- .../function/aggregation/AggregationState.java | 2 +- .../function/aggregation/AggregationType.java | 12 +- .../aggregation/AggregationsEvaluator.java | 14 +- .../function/aggregation/AverageFunction.java | 25 +- .../api/function/aggregation/CountFunction.java | 13 +- .../api/function/aggregation/MaxFunction.java | 6 +- .../api/function/aggregation/MinFunction.java | 6 +- .../api/function/aggregation/SumFunction.java | 20 +- .../api/function/filter/FilterEvaluator.java | 35 +- .../api/function/join/LazyJoiningIterator.java | 6 +- .../rya/api/function/join/LeftOuterJoin.java | 2 +- .../projection/MultiProjectionEvaluator.java | 22 +- .../projection/ProjectionEvaluator.java | 32 +- .../function/sp/StatementPatternMatcher.java | 12 +- .../TemporalInstantRelationFunction.java | 8 +- .../TemporalIntervalRelationFunction.java | 8 +- ...j.query.algebra.evaluation.function.Function | 22 + ...f.query.algebra.evaluation.function.Function | 22 - .../api/function/join/IterativeJoinTest.java | 15 +- .../api/function/join/LeftOuterJoinTest.java | 73 +- .../rya/api/function/join/NaturalJoinTest.java | 73 +- .../temporal/AfterTemporalFunctionsTest.java | 8 +- .../temporal/BeforeTemporalFunctionsTest.java | 8 +- .../temporal/EqualsTemporalFunctionsTest.java | 8 +- .../temporal/WithinTemporalFunctionsTest.java | 10 +- .../function/filter/FilterEvaluatorTest.java | 25 +- .../MultiProjectionEvaluatorTest.java | 50 +- .../projection/ProjectionEvaluatorTest.java | 72 +- .../sp/StatementPatternMatcherTest.java | 86 +- common/rya.api.model/pom.xml | 8 +- .../rya/api/model/BindingSetDecorator.java | 6 +- .../rya/api/model/StatementDecorator.java | 10 +- .../rya/api/model/VisibilityBindingSet.java | 2 +- .../rya/api/model/VisibilityStatement.java | 2 +- .../rya/api/model/VisibilityBindingSetTest.java | 8 +- common/rya.api/pom.xml | 33 +- .../api/RdfCloudTripleStoreConfiguration.java | 24 +- ...RdfCloudTripleStoreConfigurationBuilder.java | 4 +- .../rya/api/RdfCloudTripleStoreConstants.java | 22 +- .../rya/api/RdfCloudTripleStoreStatement.java | 28 +- .../rya/api/RdfCloudTripleStoreUtils.java | 52 +- .../rya/api/client/ExecuteSparqlQuery.java | 4 +- .../apache/rya/api/client/LoadStatements.java | 4 +- .../rya/api/client/LoadStatementsFile.java | 4 +- .../rya/api/date/DateTimeTtlValueConverter.java | 8 +- .../api/date/TimestampTtlStrValueConverter.java | 4 +- .../api/date/TimestampTtlValueConverter.java | 4 +- .../apache/rya/api/date/TtlValueConverter.java | 10 +- .../java/org/apache/rya/api/domain/Node.java | 4 +- .../org/apache/rya/api/domain/RangeURI.java | 9 +- .../org/apache/rya/api/domain/RangeValue.java | 4 +- .../org/apache/rya/api/domain/RyaSchema.java | 8 +- .../java/org/apache/rya/api/domain/RyaType.java | 28 +- .../apache/rya/api/domain/RyaTypePrefix.java | 6 +- .../org/apache/rya/api/domain/RyaTypeRange.java | 8 +- .../org/apache/rya/api/domain/RyaTypeUtils.java | 14 +- .../java/org/apache/rya/api/domain/RyaURI.java | 10 +- .../rya/api/domain/StatementMetadata.java | 6 +- .../org/apache/rya/api/domain/VarNameUtils.java | 202 ++ .../kryo/RyaStatementSerializer.java | 19 +- .../rya/api/functions/DateTimeWithinPeriod.java | 36 +- .../org/apache/rya/api/functions/OWLTime.java | 28 +- .../java/org/apache/rya/api/path/PathUtils.java | 2 +- .../apache/rya/api/persist/RdfEvalStatsDAO.java | 8 +- .../rya/api/persist/RyaNamespaceManager.java | 6 +- .../api/persist/index/RyaSecondaryIndexer.java | 14 +- .../persist/joinselect/SelectivityEvalDAO.java | 6 +- .../rya/api/persist/query/BatchRyaQuery.java | 5 +- .../rya/api/persist/query/RyaQueryEngine.java | 8 +- .../rya/api/persist/query/RyaQueryOptions.java | 8 +- .../rya/api/persist/query/join/HashJoin.java | 10 +- .../api/persist/query/join/IterativeJoin.java | 19 +- .../apache/rya/api/persist/query/join/Join.java | 10 +- .../rya/api/persist/query/join/MergeJoin.java | 19 +- .../rya/api/persist/utils/RyaDAOHelper.java | 26 +- .../api/persist/utils/RyaDaoQueryWrapper.java | 27 +- .../query/strategy/TriplePatternStrategy.java | 9 +- .../wholerow/NullRowTriplePatternStrategy.java | 4 +- .../resolver/CustomRyaTypeResolverMapping.java | 10 +- .../rya/api/resolver/RdfToRyaConversions.java | 28 +- .../org/apache/rya/api/resolver/RyaContext.java | 12 +- .../rya/api/resolver/RyaToRdfConversions.java | 35 +- .../rya/api/resolver/RyaTripleContext.java | 3 - .../rya/api/resolver/RyaTypeResolver.java | 7 +- .../api/resolver/RyaTypeResolverMapping.java | 4 +- .../resolver/impl/BooleanRyaTypeResolver.java | 4 +- .../api/resolver/impl/ByteRyaTypeResolver.java | 4 +- .../resolver/impl/CustomDatatypeResolver.java | 4 +- .../resolver/impl/DateTimeRyaTypeResolver.java | 6 +- .../resolver/impl/DoubleRyaTypeResolver.java | 6 +- .../api/resolver/impl/FloatRyaTypeResolver.java | 4 +- .../resolver/impl/IntegerRyaTypeResolver.java | 4 +- .../api/resolver/impl/LongRyaTypeResolver.java | 4 +- .../api/resolver/impl/RyaTypeResolverImpl.java | 12 +- .../rya/api/resolver/impl/RyaURIResolver.java | 4 +- .../api/resolver/impl/ShortRyaTypeResolver.java | 4 +- .../api/utils/CloseableIterableIteration.java | 5 +- .../rya/api/utils/EnumerationWrapper.java | 6 +- .../apache/rya/api/utils/IteratorWrapper.java | 6 +- .../rya/api/utils/NullableStatementImpl.java | 16 +- .../api/utils/PeekingCloseableIteration.java | 3 +- .../apache/rya/api/utils/QueryInvestigator.java | 4 +- .../RyaStatementAddBindingSetFunction.java | 9 +- ...ementRemoveBindingSetCloseableIteration.java | 8 +- ...j.query.algebra.evaluation.function.Function | 17 + ...f.query.algebra.evaluation.function.Function | 17 - .../org/apache/rya/api/domain/RyaTypeTest.java | 2 +- .../rya/api/domain/StatementMetadataTest.java | 1 - .../api/functions/DateTimeWithinPeriodTest.java | 84 +- .../AbstractTriplePatternStrategyTest.java | 6 +- ...shedPoWholeRowTriplePatternStrategyTest.java | 37 +- ...hedSpoWholeRowTriplePatternStrategyTest.java | 22 +- .../wholerow/MockRdfCloudConfiguration.java | 32 - .../strategy/wholerow/MockRdfConfiguration.java | 32 + .../NullRowTriplePatternStrategyTest.java | 8 +- .../OspWholeRowTriplePatternStrategyTest.java | 2 +- .../PoWholeRowTriplePatternStrategyTest.java | 2 +- .../SpoWholeRowTriplePatternStrategyTest.java | 2 +- .../apache/rya/api/resolver/RyaContextTest.java | 17 +- .../impl/CustomDatatypeResolverTest.java | 7 +- .../impl/DateTimeRyaTypeResolverTest.java | 23 +- .../impl/DoubleRyaTypeResolverTest.java | 6 +- .../impl/IntegerRyaTypeResolverTest.java | 7 +- .../resolver/impl/LongRyaTypeResolverTest.java | 8 +- .../rya/api/utils/QueryInvestigatorTest.java | 2 +- .../org/apache/rya/api/utils/RdfIOTest.java | 4 +- common/rya.provenance/pom.xml | 4 +- .../ProvenanceCollectionException.java | 3 +- .../TriplestoreProvenanceCollector.java | 8 +- .../provenance/rdf/BaseProvenanceModel.java | 39 +- .../provenance/rdf/RDFProvenanceModel.java | 5 +- .../TriplestoreProvenanceCollectorTest.java | 19 +- .../provenance/rdf/BaseProvenanceModelTest.java | 3 +- dao/accumulo.rya/pom.xml | 21 +- .../AccumuloNamespaceTableIterator.java | 10 +- .../rya/accumulo/AccumuloRdfEvalStatsDAO.java | 4 +- .../rya/accumulo/AccumuloRdfQueryIterator.java | 12 +- .../org/apache/rya/accumulo/AccumuloRyaDAO.java | 5 +- .../accumulo/DefineTripleQueryRangeFactory.java | 6 +- .../apache/rya/accumulo/RyaTableKeyValues.java | 11 +- .../rya/accumulo/RyaTableMutationsFactory.java | 12 +- .../accumulo/experimental/AccumuloIndexer.java | 2 - .../accumulo/query/AccumuloRyaQueryEngine.java | 5 +- .../query/KeyValueToRyaStatementFunction.java | 11 +- .../accumulo/query/RangeBindingSetEntries.java | 17 +- .../RyaStatementBindingSetKeyValueIterator.java | 23 +- .../query/RyaStatementKeyValueIterator.java | 11 +- .../apache/rya/accumulo/AccumuloRyaDAOTest.java | 65 +- .../DefineTripleQueryRangeFactoryTest.java | 50 +- .../apache/rya/mongodb/MongoDBQueryEngine.java | 9 +- .../rya/mongodb/MongoDBRdfConfiguration.java | 2 +- .../AggregationPipelineQueryNode.java | 43 +- .../AggregationPipelineQueryOptimizer.java | 8 +- .../aggregation/PipelineResultIteration.java | 25 +- .../SparqlToPipelineTransformVisitor.java | 23 +- .../dao/SimpleMongoDBNamespaceManager.java | 5 +- .../dao/SimpleMongoDBStorageStrategy.java | 10 +- .../RyaStatementBindingSetCursorIterator.java | 5 +- .../iter/RyaStatementCursorIterator.java | 8 +- .../rya/mongodb/MongoDBQueryEngineIT.java | 39 +- .../SimpleMongoDBStorageStrategyTest.java | 2 +- .../AggregationPipelineQueryNodeTest.java | 36 +- .../mongodb/aggregation/PipelineQueryIT.java | 131 +- .../PipelineResultIterationTest.java | 16 +- .../SparqlToPipelineTransformVisitorTest.java | 50 +- extras/indexing/pom.xml | 8 +- .../iterators/BindingSetHashJoinIterator.java | 25 +- .../pcj/iterators/IteratorCombiner.java | 11 +- .../PCJKeyToCrossProductBindingSetIterator.java | 23 +- .../PCJKeyToJoinBindingSetIterator.java | 23 +- .../client/accumulo/AccumuloBatchUpdatePCJ.java | 19 +- .../api/client/accumulo/AccumuloCreatePCJ.java | 12 +- .../accumulo/AccumuloCreatePeriodicPCJ.java | 12 +- .../accumulo/AccumuloDeletePeriodicPCJ.java | 4 +- .../accumulo/AccumuloExecuteSparqlQuery.java | 22 +- .../api/client/accumulo/AccumuloInstall.java | 12 +- .../client/accumulo/AccumuloLoadStatements.java | 14 +- .../accumulo/AccumuloLoadStatementsFile.java | 18 +- .../api/client/mongo/MongoBatchUpdatePCJ.java | 28 +- .../client/mongo/MongoExecuteSparqlQuery.java | 20 +- .../rya/api/client/mongo/MongoInstall.java | 4 +- .../api/client/mongo/MongoLoadStatements.java | 12 +- .../client/mongo/MongoLoadStatementsFile.java | 14 +- .../org/apache/rya/indexing/DocIdIndexer.java | 15 +- .../rya/indexing/FilterFunctionOptimizer.java | 69 +- .../apache/rya/indexing/FreeTextIndexer.java | 16 +- .../org/apache/rya/indexing/GeoConstants.java | 33 +- .../ExternalIndexMatcher.java | 3 +- .../GeneralizedExternalProcessor.java | 49 +- .../IndexPlanValidator/IndexPlanValidator.java | 33 +- .../IndexPlanValidator/IndexTupleGenerator.java | 3 +- .../IndexedExecutionPlanGenerator.java | 9 +- .../IndexedQueryPlanSelector.java | 5 +- .../ThreshholdPlanSelector.java | 29 +- .../TupleExecutionPlanGenerator.java | 23 +- .../IndexPlanValidator/TupleReArranger.java | 29 +- .../IndexPlanValidator/TupleValidator.java | 3 +- .../ValidIndexCombinationGenerator.java | 28 +- .../VarConstantIndexListPruner.java | 16 +- .../org/apache/rya/indexing/IndexingExpr.java | 14 +- .../rya/indexing/IndexingFunctionRegistry.java | 46 +- .../apache/rya/indexing/IteratorFactory.java | 32 +- .../java/org/apache/rya/indexing/KeyParts.java | 29 +- .../org/apache/rya/indexing/SearchFunction.java | 9 +- .../rya/indexing/SearchFunctionFactory.java | 11 +- .../rya/indexing/StatementConstraints.java | 12 +- .../rya/indexing/StatementSerializer.java | 44 +- .../apache/rya/indexing/TemporalIndexer.java | 41 +- .../apache/rya/indexing/TemporalTupleSet.java | 88 +- .../accumulo/AccumuloIndexingConfiguration.java | 2 +- .../rya/indexing/accumulo/ConfigUtils.java | 16 +- .../accumulo/entity/AccumuloDocIdIndexer.java | 35 +- .../accumulo/entity/EntityCentricIndex.java | 4 +- .../accumulo/entity/EntityOptimizer.java | 24 +- .../accumulo/entity/EntityTupleSet.java | 22 +- .../rya/indexing/accumulo/entity/StarQuery.java | 18 +- .../freetext/AccumuloFreeTextIndexer.java | 17 +- .../accumulo/freetext/ColumnPrefixes.java | 5 +- .../accumulo/freetext/FreeTextTupleSet.java | 23 +- .../accumulo/freetext/LuceneTokenizer.java | 8 +- .../temporal/AccumuloTemporalIndexer.java | 17 +- .../indexing/entity/EntityIndexOptimizer.java | 8 +- .../indexing/entity/EntityIndexSetProvider.java | 16 +- .../entity/EntityToSegmentConverter.java | 8 +- .../rya/indexing/entity/model/Entity.java | 20 +- .../indexing/entity/query/EntityQueryNode.java | 28 +- .../storage/mongo/EntityDocumentConverter.java | 6 +- .../storage/mongo/RyaTypeDocumentConverter.java | 8 +- .../entity/update/BaseEntityIndexer.java | 8 +- .../external/PrecomputedJoinIndexer.java | 4 +- .../accumulo/AccumuloPcjStorageConfig.java | 3 +- .../external/fluo/FluoPcjUpdaterConfig.java | 3 +- .../matching/AbstractExternalSetMatcher.java | 52 +- .../AbstractExternalSetMatcherFactory.java | 6 +- .../matching/AbstractExternalSetOptimizer.java | 26 +- .../external/matching/AbstractQuerySegment.java | 8 +- .../indexing/external/matching/BasicRater.java | 9 +- .../external/matching/ExternalSetConverter.java | 2 +- .../external/matching/ExternalSetMatcher.java | 36 +- .../external/matching/ExternalSetProvider.java | 22 +- .../external/matching/FlattenedOptional.java | 38 +- .../indexing/external/matching/JoinSegment.java | 36 +- .../external/matching/JoinSegmentMatcher.java | 5 +- .../external/matching/MatcherUtilities.java | 30 +- .../external/matching/OptionalJoinSegment.java | 14 +- .../matching/OptionalJoinSegmentMatcher.java | 5 +- .../matching/QueryNodeConsolidator.java | 6 +- .../external/matching/QueryNodeListRater.java | 22 +- .../matching/QueryNodesToTupleExpr.java | 10 +- .../external/matching/QuerySegment.java | 6 +- .../external/matching/QuerySegmentFactory.java | 30 +- .../matching/TopOfQueryFilterRelocator.java | 12 +- .../external/tupleSet/AccumuloIndexSet.java | 34 +- .../external/tupleSet/ExternalTupleSet.java | 52 +- .../external/tupleSet/ParsedQueryUtil.java | 14 +- .../tupleSet/SimpleExternalTupleSet.java | 12 +- .../indexing/mongodb/AbstractMongoIndexer.java | 15 +- .../mongodb/IndexingMongoDBStorageStrategy.java | 8 +- .../rya/indexing/mongodb/MongoDbSmartUri.java | 10 +- .../mongodb/MongoIndexingConfiguration.java | 4 +- .../mongodb/freetext/MongoFreeTextIndexer.java | 7 +- .../mongodb/pcj/MongoPcjIndexSetProvider.java | 2 +- .../indexing/mongodb/pcj/MongoPcjQueryNode.java | 16 +- .../mongodb/temporal/MongoTemporalIndexer.java | 7 +- .../rya/indexing/pcj/matching/PCJOptimizer.java | 13 +- .../pcj/matching/PCJOptimizerUtilities.java | 38 +- .../pcj/matching/PCJToSegmentConverter.java | 38 +- .../pcj/matching/QueryVariableNormalizer.java | 74 +- .../provider/AbstractPcjIndexSetProvider.java | 2 +- .../provider/AccumuloIndexSetProvider.java | 6 +- .../rya/indexing/smarturi/SmartUriAdapter.java | 140 +- .../rya/indexing/smarturi/SmartUriStorage.java | 12 +- .../duplication/ApproxEqualsDetector.java | 6 +- .../duplication/DuplicateDataDetector.java | 52 +- .../MetadataNodeToSegmentConverter.java | 12 +- .../statement/metadata/matching/OWLReify.java | 27 +- .../StatementMetadataExternalSetProvider.java | 15 +- .../matching/StatementMetadataNode.java | 42 +- .../matching/StatementMetadataOptimizer.java | 7 +- .../rya/sail/config/RyaAccumuloSailConfig.java | 78 +- .../rya/sail/config/RyaAccumuloSailFactory.java | 26 +- .../apache/rya/sail/config/RyaSailFactory.java | 4 +- .../org.eclipse.rdf4j.sail.config.SailFactory | 1 + .../org.openrdf.sail.config.SailFactory | 1 - .../rdf4j/repository/config/RyaAccumuloSail.ttl | 20 + .../repository/config/RyaAccumuloSail.ttl | 20 - .../DocumentIndexIntersectingIteratorTest.java | 2923 +++++++++--------- .../api/client/accumulo/AccumuloAddUserIT.java | 10 +- .../accumulo/AccumuloBatchUpdatePCJIT.java | 56 +- .../client/accumulo/AccumuloCreatePCJIT.java | 31 +- .../client/accumulo/AccumuloDeletePCJIT.java | 48 +- .../accumulo/AccumuloLoadStatementsFileIT.java | 22 +- .../client/accumulo/AccumuloRemoveUserIT.java | 8 +- .../rya/api/client/accumulo/FluoITBase.java | 8 +- .../api/client/mongo/MongoBatchUpdatePCJIT.java | 58 +- .../client/mongo/MongoExecuteSparqlQueryIT.java | 48 +- .../client/mongo/MongoLoadStatementsFileIT.java | 22 +- .../api/client/mongo/MongoLoadStatementsIT.java | 32 +- .../GeneralizedExternalProcessorTest.java | 9 +- .../IndexPlanValidatorTest.java | 8 +- .../IndexedExecutionPlanGeneratorTest.java | 9 +- .../ThreshholdPlanSelectorTest.java | 18 +- .../TupleExecutionPlanGeneratorTest.java | 38 +- .../IndexPlanValidator/TupleReArrangerTest.java | 11 +- .../ValidIndexCombinationGeneratorTest.java | 9 +- .../VarConstantIndexListPrunerTest.java | 15 +- .../accumulo/StatementSerializerTest.java | 47 +- .../accumulo/entity/AccumuloDocIndexerTest.java | 97 +- .../accumulo/entity/EntityCentricIndexTest.java | 19 +- .../accumulo/entity/EntityOptimizerTest.java | 60 +- .../indexing/accumulo/entity/StarQueryTest.java | 32 +- .../freetext/AccumuloFreeTextIndexerTest.java | 94 +- .../temporal/AccumuloTemporalIndexerTest.java | 120 +- .../entity/query/EntityQueryNodeIT.java | 43 +- .../mongo/EntityDocumentConverterTest.java | 4 +- .../storage/mongo/MongoEntityStorageIT.java | 4 +- .../mongo/RyaTypeDocumentConverterTest.java | 10 +- .../update/mongo/MongoEntityIndexerIT.java | 6 +- .../external/AccumuloConstantPcjIT.java | 137 +- .../rya/indexing/external/AccumuloPcjIT.java | 406 ++- .../indexing/external/PCJOptionalTestIT.java | 71 +- .../external/PcjIntegrationTestingUtil.java | 36 +- .../external/PrecompJoinOptimizerIT.java | 113 +- .../external/PrecompJoinOptimizerTest.java | 19 +- .../external/PrecompJoinOptimizerTest2.java | 14 +- .../PrecompJoinOptimizerVarToConstTest.java | 15 +- .../AccumuloIndexSetColumnVisibilityTest.java | 48 +- .../external/tupleSet/AccumuloIndexSetTest.java | 345 +-- .../external/tupleSet/ParsedQueryUtilTest.java | 8 +- .../tupleSet/QueryVariableNormalizerTest.java | 15 +- .../tupleSet/SimpleExternalTupleSetTest.java | 8 +- .../VarConstQueryVariableNormalizerTest.java | 20 +- .../rya/indexing/mongo/MongoDbSmartUriIT.java | 41 +- .../rya/indexing/mongo/MongoEntityIndex2IT.java | 21 +- .../rya/indexing/mongo/MongoEntityIndexIT.java | 148 +- .../indexing/mongo/MongoFreeTextIndexerIT.java | 48 +- .../rya/indexing/mongo/MongoPCJIndexIT.java | 90 +- .../indexing/mongo/MongoPcjIntegrationTest.java | 82 +- .../indexing/mongo/MongoTemporalIndexerIT.java | 80 +- .../pcj/matching/FlattenedOptionalTest.java | 17 +- .../pcj/matching/JoinSegmentPCJMatcherTest.java | 26 +- .../indexing/pcj/matching/JoinSegmentTest.java | 18 +- .../OptionalJoinSegmentPCJMatcherTest.java | 28 +- .../pcj/matching/OptionalJoinSegmentTest.java | 20 +- .../pcj/matching/PCJNodeConsolidatorTest.java | 18 +- .../indexing/pcj/matching/PCJOptimizerTest.java | 17 +- .../pcj/matching/PCJOptimizerUtilitesTest.java | 12 +- .../duplication/DuplicateDataDetectorIT.java | 151 +- .../AccumuloStatementMetadataNodeTest.java | 174 +- .../AccumuloStatementMetadataOptimizerIT.java | 44 +- .../metadata/MongoStatementMetadataIT.java | 43 +- .../metadata/MongoStatementMetadataNodeIT.java | 81 +- ...tatementMetadataExternalSetProviderTest.java | 20 +- .../StatementMetadataOptimizerTest.java | 19 +- .../metadata/StatementMetadataTestUtils.java | 25 +- .../sail/config/RyaAccumuloSailFactoryTest.java | 100 +- .../sail/config/RyaMongoDbSailFactoryTest.java | 16 +- .../src/test/resources/log4j.properties | 25 + extras/indexingExample/pom.xml | 6 +- .../src/main/java/EntityDirectExample.java | 35 +- .../src/main/java/InferenceExamples.java | 32 +- .../src/main/java/MongoRyaDirectExample.java | 152 +- .../src/main/java/ProspectorExample.java | 30 +- .../src/main/java/RyaClientExample.java | 37 +- .../src/main/java/RyaDirectExample.java | 102 +- .../src/main/java/StatementMetadataExample.java | 34 +- extras/periodic.notification/api/pom.xml | 4 +- .../periodic/notification/api/BinPruner.java | 4 +- .../notification/api/BindingSetExporter.java | 2 +- .../notification/api/BindingSetRecord.java | 2 +- .../serialization/BindingSetSerDe.java | 7 +- extras/periodic.notification/service/pom.xml | 4 +- .../PeriodicNotificationApplication.java | 2 +- .../PeriodicNotificationApplicationFactory.java | 7 +- .../exporter/KafkaExporterExecutor.java | 2 +- .../KafkaPeriodicBindingSetExporter.java | 4 +- .../TimestampedNotificationProcessor.java | 4 +- .../notification/pruner/FluoBinPruner.java | 13 +- .../PeriodicNotificationApplicationIT.java | 85 +- .../PeriodicNotificationProviderIT.java | 2 +- .../PeriodicNotificationExporterIT.java | 18 +- .../PeriodicNotificationProcessorIT.java | 26 +- .../pruner/PeriodicNotificationBinPrunerIT.java | 45 +- .../periodic/BenchmarkStatementGenerator.java | 17 +- .../periodic/KafkaLatencyBenchmark.java | 4 +- .../benchmark/query/PCJOptimizerBenchmark.java | 10 +- .../rya/benchmark/query/QueryBenchmark.java | 31 +- .../benchmark/query/QueryBenchmarkRunIT.java | 42 +- extras/rya.export/export.accumulo/pom.xml | 6 + .../accumulo/AccumuloRyaStatementStore.java | 15 +- .../accumulo/conf/AccumuloExportConstants.java | 1 + .../export/accumulo/util/AccumuloRyaUtils.java | 4 +- extras/rya.export/export.client/pom.xml | 17 +- .../rya/export/client/MergeDriverClient.java | 10 +- .../rya/export/client/conf/TimeUtils.java | 2 +- .../org/apache/rya/indexing/export/ITBase.java | 20 +- extras/rya.forwardchain/pom.xml | 4 +- .../rya/forwardchain/ForwardChainConstants.java | 8 +- .../rule/AbstractConstructRule.java | 4 +- .../rule/AbstractInconsistencyRule.java | 2 +- .../forwardchain/rule/AntecedentVisitor.java | 6 +- .../rule/ConstructConsequentVisitor.java | 26 +- .../org/apache/rya/forwardchain/rule/Rule.java | 2 +- .../apache/rya/forwardchain/rule/Ruleset.java | 2 +- .../forwardchain/rule/SpinConstructRule.java | 71 +- .../strategy/MongoPipelineStrategy.java | 4 +- .../strategy/RoundRobinStrategy.java | 2 +- .../strategy/SailExecutionStrategy.java | 22 +- .../rya/forwardchain/batch/MongoSpinIT.java | 66 +- .../rule/AntecedentVisitorTest.java | 35 +- .../rule/ConstructConsequentVisitorTest.java | 30 +- .../rya/forwardchain/rule/RulesetTest.java | 13 +- .../rule/SpinConstructRuleTest.java | 43 +- .../GeoEnabledFilterFunctionOptimizer.java | 61 +- .../org/apache/rya/indexing/GeoIndexer.java | 16 +- .../rya/indexing/GeoIndexingTestUtils.java | 2 +- .../apache/rya/indexing/GeoRyaSailFactory.java | 4 +- .../indexing/accumulo/geo/GeoParseUtils.java | 16 +- .../rya/indexing/accumulo/geo/GeoTupleSet.java | 61 +- .../accumulo/geo/OptionalConfigUtils.java | 6 +- .../GeoTemporalIndexSetProvider.java | 26 +- .../geotemporal/GeoTemporalIndexer.java | 46 +- .../GeoTemporalToSegmentConverter.java | 6 +- .../geotemporal/model/EventQueryNode.java | 32 +- .../accumulo/geo/GeoMesaGeoIndexer.java | 17 +- .../geoExamples/RyaGeoDirectExample.java | 28 +- .../indexing/accumulo/geo/GeoIndexerSfTest.java | 61 +- .../indexing/accumulo/geo/GeoIndexerTest.java | 130 +- .../accumulo/geo/GeoWaveGeoIndexer.java | 16 +- .../geoExamples/GeowaveDirectExample.java | 28 +- .../accumulo/geo/GeoWaveIndexerSfTest.java | 60 +- .../accumulo/geo/GeoWaveIndexerTest.java | 130 +- .../geoExamples/RyaMongoGeoDirectExample.java | 24 +- .../GeoTemporalMongoDBStorageStrategy.java | 10 +- .../mongo/MongoGeoTemporalIndexer.java | 8 +- .../mongodb/geo/GeoMongoDBStorageStrategy.java | 4 +- .../indexing/mongodb/geo/MongoGeoIndexer.java | 9 +- .../indexing/mongodb/geo/MongoGeoTupleSet.java | 43 +- .../geotemporal/GeoTemporalProviderTest.java | 40 +- .../geotemporal/GeoTemporalTestUtils.java | 16 +- .../geotemporal/MongoGeoTemporalIndexIT.java | 31 +- .../geotemporal/model/EventQueryNode2IT.java | 53 +- .../GeoTemporalMongoDBStorageStrategyTest.java | 87 +- .../mongo/MongoGeoTemporalIndexerIT.java | 27 +- .../indexing/mongo/MongoGeoIndexerFilterIT.java | 37 +- .../rya/indexing/mongo/MongoGeoIndexerIT.java | 130 +- .../rya/indexing/mongo/MongoGeoIndexerSfIT.java | 24 +- .../indexing/mongo/MongoIndexerDeleteIT.java | 48 +- .../pcj/storage/PeriodicQueryResultStorage.java | 12 +- .../pcj/storage/PrecomputedJoinStorage.java | 2 +- .../storage/accumulo/AccumuloPcjSerializer.java | 18 +- .../storage/accumulo/AccumuloPcjStorage.java | 4 +- .../AccumuloPeriodicQueryResultStorage.java | 28 +- .../AccumuloValueBindingSetIterator.java | 2 +- .../storage/accumulo/BindingSetConverter.java | 4 +- .../accumulo/BindingSetStringConverter.java | 25 +- .../pcj/storage/accumulo/PcjTables.java | 16 +- .../storage/accumulo/PcjVarOrderFactory.java | 4 +- .../accumulo/ScannerBindingSetIterator.java | 4 +- .../storage/accumulo/ShiftVarOrderFactory.java | 10 +- .../pcj/storage/accumulo/VariableOrder.java | 3 +- .../accumulo/VisibilityBindingSetSerDe.java | 35 +- .../VisibilityBindingSetStringConverter.java | 6 +- .../storage/mongo/MongoBindingSetConverter.java | 2 +- .../pcj/storage/mongo/MongoPcjDocuments.java | 28 +- .../pcj/storage/mongo/MongoPcjStorage.java | 2 +- .../accumulo/AccumuloPcjSerializerTest.java | 75 +- .../accumulo/BindingSetStringConverterTest.java | 47 +- .../pcj/storage/accumulo/PcjTablesIT.java | 129 +- .../storage/accumulo/PcjTablesWithMockTest.java | 94 +- .../accumulo/ShiftVarOrderFactoryTest.java | 4 +- .../accumulo/VisibilityBindingSetSerDeTest.java | 8 +- ...VisibilityBindingSetStringConverterTest.java | 32 +- .../integration/AccumuloPcjStorageIT.java | 38 +- .../AccumuloPeriodicQueryResultStorageIT.java | 83 +- .../storage/mongo/MongoPcjDocumentsTest.java | 19 +- .../pcj/storage/mongo/MongoPcjStorageIT.java | 32 +- .../mongo/PcjDocumentsIntegrationTest.java | 112 +- .../storage/mongo/PcjDocumentsWithMockTest.java | 30 +- extras/rya.manual/src/site/markdown/alx.md | 6 +- extras/rya.manual/src/site/markdown/loaddata.md | 6 +- .../rya.manual/src/site/markdown/mapreduce.md | 2 +- extras/rya.manual/src/site/markdown/overview.md | 2 +- .../rya.manual/src/site/markdown/sm-addauth.md | 6 +- extras/rya.manual/src/site/markdown/sm-infer.md | 78 +- .../src/site/markdown/sm-namedgraph.md | 14 +- .../src/site/markdown/sm-simpleaqr.md | 6 +- .../src/site/markdown/sm-sparqlquery.md | 10 +- .../src/site/markdown/sm-updatedata.md | 2 +- .../mr/merge/mappers/BaseRuleMapper.java | 9 +- .../mr/merge/mappers/MergeToolMapper.java | 9 +- .../mr/merge/util/AccumuloQueryRuleset.java | 13 +- .../mr/merge/util/AccumuloRyaUtils.java | 9 +- .../rya/accumulo/mr/merge/util/CopyRule.java | 46 +- .../accumulo/mr/merge/util/QueryRuleset.java | 59 +- .../rya/accumulo/mr/merge/CopyToolTest.java | 3 +- .../rya/accumulo/mr/merge/MergeToolTest.java | 13 +- .../rya/accumulo/mr/merge/RulesetCopyIT.java | 47 +- .../rya/accumulo/mr/merge/util/TestUtils.java | 6 +- .../indexing/pcj/fluo/api/CreateFluoPcj.java | 14 +- .../pcj/fluo/api/CreatePeriodicQuery.java | 4 +- .../indexing/pcj/fluo/api/DeleteFluoPcj.java | 2 +- .../indexing/pcj/fluo/api/ListFluoQueries.java | 6 +- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 4 +- .../pcj/fluo/app/AggregationResultUpdater.java | 33 +- .../indexing/pcj/fluo/app/ConstructGraph.java | 13 +- .../pcj/fluo/app/ConstructProjection.java | 72 +- .../pcj/fluo/app/FilterResultUpdater.java | 42 +- .../pcj/fluo/app/FluoStringConverter.java | 70 +- .../pcj/fluo/app/PeriodicQueryUpdater.java | 14 +- .../pcj/fluo/app/ProjectionResultUpdater.java | 2 +- .../fluo/app/batch/JoinBatchInformation.java | 3 +- .../KryoVisibilityBindingSetSerializer.java | 29 +- .../fluo/app/observers/AggregationObserver.java | 2 +- .../pcj/fluo/app/observers/FilterObserver.java | 2 +- .../pcj/fluo/app/observers/JoinObserver.java | 2 +- .../app/observers/StatementPatternObserver.java | 2 +- .../pcj/fluo/app/observers/TripleObserver.java | 3 +- .../fluo/app/query/ConstructQueryMetadata.java | 6 +- .../pcj/fluo/app/query/PeriodicQueryNode.java | 10 +- .../fluo/app/query/SparqlFluoQueryBuilder.java | 77 +- .../app/util/BindingHashShardingFunction.java | 2 +- .../pcj/fluo/app/util/BindingSetUtil.java | 6 +- .../pcj/fluo/app/util/FilterSerializer.java | 20 +- .../pcj/fluo/app/util/PeriodicQueryUtil.java | 58 +- .../indexing/pcj/fluo/app/util/RowKeyUtil.java | 2 +- .../pcj/fluo/app/ConstructGraphTest.java | 29 +- .../pcj/fluo/app/ConstructGraphTestUtils.java | 3 +- .../pcj/fluo/app/ConstructProjectionTest.java | 33 +- .../pcj/fluo/app/FluoStringConverterTest.java | 43 +- .../pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java | 5 +- .../BatchInformationSerializerTest.java | 10 +- .../fluo/app/query/PeriodicQueryUtilTest.java | 40 +- .../util/BindingHashShardingFunctionTest.java | 16 +- .../pcj/fluo/app/util/FilterSerializerTest.java | 8 +- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 18 +- .../pcj/fluo/client/PcjAdminClient.java | 21 +- .../fluo/client/command/LoadTriplesCommand.java | 8 +- .../fluo/client/command/NewQueryCommand.java | 21 +- .../pcj/fluo/client/util/FluoLoader.java | 21 +- .../fluo/client/util/PcjMetadataRenderer.java | 6 +- .../fluo/client/util/QueryReportRenderer.java | 6 +- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml | 4 +- .../apache/rya/indexing/pcj/fluo/demo/Demo.java | 3 +- .../rya/indexing/pcj/fluo/demo/DemoDriver.java | 11 +- .../pcj/fluo/demo/FluoAndHistoricPcjsDemo.java | 18 +- .../pcj/fluo/ConstructGraphTestUtils.java | 3 +- .../indexing/pcj/fluo/api/GetPcjMetadataIT.java | 8 +- .../fluo/app/query/FluoQueryMetadataDAOIT.java | 12 +- .../indexing/pcj/fluo/integration/BatchIT.java | 24 +- .../pcj/fluo/integration/CreateDeleteIT.java | 34 +- .../integration/CreateDeletePeriodicPCJ.java | 24 +- .../indexing/pcj/fluo/integration/InputIT.java | 64 +- .../pcj/fluo/integration/KafkaExportIT.java | 262 +- .../integration/KafkaRyaSubGraphExportIT.java | 56 +- .../indexing/pcj/fluo/integration/QueryIT.java | 419 +-- .../pcj/fluo/integration/RyaExportIT.java | 30 +- .../RyaInputIncrementalUpdateIT.java | 82 +- .../pcj/fluo/integration/StreamingTestIT.java | 19 +- .../HistoricStreamingVisibilityIT.java | 32 +- .../pcj/fluo/visibility/PcjVisibilityIT.java | 78 +- .../rya/pcj/fluo/test/base/FluoITBase.java | 31 +- .../pcj/fluo/test/base/KafkaExportITBase.java | 6 +- .../rya.pcj.fluo/rya.pcj.functions.geo/pom.xml | 5 +- .../pcj/functions/geo/FunctionAdapter.java | 18 +- ...j.query.algebra.evaluation.function.Function | 30 + ...f.query.algebra.evaluation.function.Function | 30 - .../pcj/functions/geo/GeoFunctionsIT.java | 138 +- .../pcj/functions/geo/GeoFunctionsTest.java | 4 +- .../joinselect/AccumuloSelectivityEvalDAO.java | 62 +- .../rya/joinselect/CardinalityCalcUtil.java | 6 +- .../rya/prospector/plans/IndexWorkPlan.java | 2 +- .../rya/prospector/plans/impl/CountPlan.java | 4 +- .../service/ProspectorServiceEvalStatsDAO.java | 4 +- .../AccumuloSelectivityEvalDAOTest.java | 26 +- .../mr/JoinSelectProspectOutputTest.java | 17 +- .../rya/prospector/mr/ProspectorTest.java | 4 +- .../ProspectorServiceEvalStatsDAOTest.java | 23 +- extras/rya.reasoning/README.md | 8 +- extras/rya.reasoning/pom.xml | 18 +- .../apache/rya/reasoning/AbstractReasoner.java | 8 +- .../org/apache/rya/reasoning/Derivation.java | 16 +- .../java/org/apache/rya/reasoning/Fact.java | 49 +- .../org/apache/rya/reasoning/LocalReasoner.java | 44 +- .../java/org/apache/rya/reasoning/OWL2.java | 22 +- .../java/org/apache/rya/reasoning/OwlClass.java | 16 +- .../org/apache/rya/reasoning/OwlProperty.java | 28 +- .../java/org/apache/rya/reasoning/Schema.java | 42 +- .../org/apache/rya/reasoning/TypeReasoner.java | 15 +- .../rya/reasoning/mr/AbstractReasoningTool.java | 17 +- .../rya/reasoning/mr/ConformanceTest.java | 60 +- .../apache/rya/reasoning/mr/ForwardChain.java | 15 +- .../rya/reasoning/mr/ResourceWritable.java | 8 +- .../apache/rya/reasoning/mr/SchemaWritable.java | 4 +- .../apache/rya/reasoning/LocalReasonerTest.java | 19 +- .../apache/rya/reasoning/ReasonerFactTest.java | 17 +- .../rya/reasoning/SchemaReasoningTest.java | 9 +- .../org/apache/rya/reasoning/SchemaTest.java | 45 +- .../org/apache/rya/reasoning/TestUtils.java | 33 +- .../reasoning/mr/DuplicateEliminationTest.java | 21 +- .../rya/reasoning/mr/ForwardChainTest.java | 39 +- extras/rya.streams/api/pom.xml | 4 +- .../interactor/defaults/DefaultAddQuery.java | 4 +- .../api/queries/InMemoryQueryChangeLog.java | 3 +- .../api/queries/InMemoryQueryRepository.java | 4 +- .../rya/streams/api/queries/QueryChangeLog.java | 3 +- extras/rya.streams/client/pom.xml | 24 +- .../streams/client/command/AddQueryCommand.java | 2 +- .../client/command/StreamResultsCommand.java | 8 +- .../client/util/QueryResultsOutputUtil.java | 18 +- .../client/command/LoadStatementsCommandIT.java | 19 +- .../client/command/RunQueryCommandIT.java | 38 +- .../client/util/QueryResultsOutputUtilTest.java | 20 +- .../kafka/processors/filter/GeoFilterIT.java | 29 +- .../aggregation/AggregationProcessorIT.java | 128 +- .../processors/filter/FilterProcessorIT.java | 14 +- .../processors/filter/FilterProcessorTest.java | 12 +- .../processors/filter/TemporalFilterIT.java | 41 +- .../kafka/processors/join/JoinProcessorIT.java | 124 +- .../projection/MultiProjectionProcessorIT.java | 20 +- .../projection/ProjectionProcessorIT.java | 14 +- .../sp/StatementPatternProcessorIT.java | 62 +- extras/rya.streams/kafka/pom.xml | 4 + .../kafka/SingleThreadKafkaStreamsFactory.java | 2 +- .../kafka/interactor/KafkaLoadStatements.java | 24 +- .../StatementPatternProcessorSupplier.java | 4 +- .../AggregationProcessorSupplier.java | 2 +- .../KeyValueAggregationStateStore.java | 2 +- .../processors/join/KeyValueJoinStateStore.java | 2 +- .../StatementOutputFormatterSupplier.java | 18 +- .../kafka/queries/KafkaQueryChangeLog.java | 2 +- .../kafka/topology/TopologyBuilderFactory.java | 2 +- .../streams/kafka/topology/TopologyFactory.java | 34 +- .../interactor/KafkaGetQueryResultStreamIT.java | 18 +- .../kafka/interactor/KafkaLoadStatementsIT.java | 14 +- .../kafka/interactor/KafkaRunQueryIT.java | 38 +- .../output/BindingSetOutputFormatterTest.java | 14 +- .../output/StatementOutputFormatterTest.java | 48 +- .../MultiProjectionProcessorTest.java | 28 +- .../projection/ProjectionProcessorTest.java | 22 +- .../kafka/queries/KafkaQueryChangeLogIT.java | 3 +- .../VisibilityBindingSetKafkaIT.java | 10 +- .../VisibilityBindingSetSerdeTest.java | 8 +- .../VisibilityStatementKafkaIT.java | 12 +- .../VisibilityStatementSerdeTest.java | 14 +- .../kafka/topology/TopologyFactoryTest.java | 19 +- .../rya/streams/querymanager/QueryExecutor.java | 2 +- .../kafka/LocalQueryExecutorIT.java | 38 +- .../java/org/apache/rya/shell/RyaCommands.java | 12 +- .../apache/rya/shell/RyaStreamsCommands.java | 2 +- .../rya/shell/util/StreamsQueryFormatter.java | 6 +- .../org/apache/rya/shell/RyaCommandsTest.java | 5 +- .../vagrantExample/src/main/vagrant/Vagrantfile | 56 +- .../vagrantExample/src/main/vagrant/readme.md | 41 +- mapreduce/pom.xml | 12 +- .../rya/accumulo/mr/AbstractAccumuloMRTool.java | 15 +- .../org/apache/rya/accumulo/mr/MRUtils.java | 15 +- .../rya/accumulo/mr/RdfFileInputFormat.java | 19 +- .../apache/rya/accumulo/mr/RyaOutputFormat.java | 4 +- .../apache/rya/accumulo/mr/RyaTypeWritable.java | 11 +- .../accumulo/mr/examples/TextOutputExample.java | 16 +- .../accumulo/mr/tools/AccumuloRdfCountTool.java | 10 +- .../rya/accumulo/mr/tools/RdfFileInputTool.java | 3 +- .../rya/accumulo/mr/tools/Upgrade322Tool.java | 21 +- .../rya/accumulo/mr/RdfFileInputFormatTest.java | 82 +- .../rya/accumulo/mr/RyaOutputFormatTest.java | 13 +- .../accumulo/mr/RyaStatementWritableTest.java | 11 +- .../mr/tools/AccumuloRdfCountToolTest.java | 139 +- .../accumulo/mr/tools/RdfFileInputToolTest.java | 8 +- .../accumulo/mr/tools/Upgrade322ToolTest.java | 42 +- .../tools/UpgradeObjectSerializationTest.java | 12 +- osgi/alx.rya.console/pom.xml | 4 +- .../rya/alx/command/AbstractRyaCommand.java | 6 +- .../alx/command/GetStatementsRyaCommand.java | 16 +- .../apache/rya/alx/command/InfoRyaCommand.java | 6 +- .../src/main/features/alx.rya-features.xml | 80 +- .../rya/camel/cbsail/CbSailComponent.java | 14 +- .../apache/rya/camel/cbsail/CbSailEndpoint.java | 12 +- .../apache/rya/camel/cbsail/CbSailProducer.java | 57 +- .../org/apache/rya/camel/cbsail/CbSailTest.java | 68 +- osgi/pom.xml | 4 +- osgi/rdf4j-runtime-osgi/eclipse-rdf4j-osgi.bnd | 7 + osgi/rdf4j-runtime-osgi/pom.xml | 139 + .../sesame-runtime-osgi/openrdf-sesame-osgi.bnd | 7 - osgi/sesame-runtime-osgi/pom.xml | 139 - pig/accumulo.pig/pom.xml | 4 +- .../rya/accumulo/pig/IndexWritingTool.java | 10 +- .../rya/accumulo/pig/SparqlQueryPigEngine.java | 47 +- .../pig/SparqlToPigTransformVisitor.java | 33 +- .../accumulo/pig/StatementPatternStorage.java | 40 +- .../pig/optimizer/SimilarVarJoinOptimizer.java | 32 +- .../pig/SparqlToPigTransformVisitorTest.java | 12 +- .../pig/StatementPatternStorageTest.java | 21 +- pom.xml | 125 +- sail/pom.xml | 11 +- .../rya/rdftriplestore/RdfCloudTripleStore.java | 14 +- .../RdfCloudTripleStoreConnection.java | 104 +- .../rya/rdftriplestore/RyaSailRepository.java | 12 +- .../RyaSailRepositoryConnection.java | 23 +- .../evaluation/ExternalBatchingIterator.java | 9 +- .../ExternalMultipleBindingSetsIterator.java | 14 +- .../evaluation/FilterRangeVisitor.java | 37 +- .../evaluation/MultipleBindingSetsIterator.java | 16 +- .../ParallelEvaluationStrategyImpl.java | 77 +- .../evaluation/ParallelJoinIterator.java | 21 +- .../evaluation/PushJoinDownVisitor.java | 10 +- .../evaluation/QueryJoinOptimizer.java | 48 +- .../evaluation/QueryJoinSelectOptimizer.java | 19 +- ...RdfCloudTripleStoreEvaluationStatistics.java | 35 +- ...pleStoreSelectivityEvaluationStatistics.java | 6 +- .../evaluation/ReorderJoinVisitor.java | 12 +- .../evaluation/SeparateFilterJoinsVisitor.java | 15 +- .../inference/AbstractInferVisitor.java | 12 +- .../inference/AllValuesFromVisitor.java | 16 +- .../rdftriplestore/inference/DoNotExpandSP.java | 6 +- .../inference/DomainRangeVisitor.java | 24 +- .../inference/HasSelfVisitor.java | 20 +- .../inference/HasValueVisitor.java | 22 +- .../rya/rdftriplestore/inference/InferJoin.java | 8 +- .../rdftriplestore/inference/InferUnion.java | 8 +- .../inference/InferenceEngine.java | 382 ++- .../inference/IntersectionOfVisitor.java | 17 +- .../inference/InverseOfVisitor.java | 22 +- .../rdftriplestore/inference/InverseURI.java | 8 +- .../rdftriplestore/inference/OneOfVisitor.java | 14 +- .../inference/PropertyChainVisitor.java | 24 +- .../inference/ReflexivePropertyVisitor.java | 10 +- .../rdftriplestore/inference/SameAsVisitor.java | 34 +- .../inference/SomeValuesFromVisitor.java | 16 +- .../inference/SubClassOfVisitor.java | 16 +- .../inference/SubPropertyOfVisitor.java | 20 +- .../inference/SymmetricPropertyVisitor.java | 20 +- .../inference/TransitivePropertyVisitor.java | 16 +- .../namespace/NamespaceManager.java | 21 +- .../utils/CombineContextsRdfInserter.java | 27 +- .../rdftriplestore/utils/DefaultStatistics.java | 6 +- .../utils/FixedStatementPattern.java | 6 +- .../rdftriplestore/utils/RdfFormatUtils.java | 101 + .../utils/TransitivePropertySP.java | 6 +- .../apache/rya/ArbitraryLengthQueryTest.java | 30 +- .../test/java/org/apache/rya/HashJoinTest.java | 19 +- .../java/org/apache/rya/IterativeJoinTest.java | 17 +- .../test/java/org/apache/rya/MergeJoinTest.java | 19 +- .../rya/RdfCloudTripleStoreConnectionTest.java | 275 +- .../org/apache/rya/RdfCloudTripleStoreTest.java | 218 +- .../rya/RdfCloudTripleStoreUtilsTest.java | 20 +- .../QueryJoinSelectOptimizerTest.java | 29 +- ...toreSelectivityEvaluationStatisticsTest.java | 28 +- .../evaluation/StatementPatternEvalTest.java | 61 +- .../inference/AllValuesFromVisitorTest.java | 50 +- .../inference/DomainRangeVisitorTest.java | 42 +- .../inference/HasSelfVisitorTest.java | 36 +- .../inference/HasValueVisitorTest.java | 92 +- .../inference/InferenceEngineTest.java | 334 +- .../rdftriplestore/inference/InferenceIT.java | 140 +- .../inference/IntersectionOfVisitorTest.java | 44 +- .../inference/OneOfVisitorTest.java | 70 +- .../inference/PropertyChainTest.java | 54 +- .../inference/ReflexivePropertyVisitorTest.java | 28 +- .../rdftriplestore/inference/SameAsTest.java | 47 +- .../inference/SomeValuesFromVisitorTest.java | 50 +- spark/pom.xml | 12 +- test/rdf/pom.xml | 8 +- .../apache/rya/streams/kafka/RdfTestUtil.java | 24 +- web/web.rya/pom.xml | 8 +- .../cloudbase/sail/AbstractRDFWebServlet.java | 6 +- .../web/cloudbase/sail/DeleteDataServlet.java | 10 +- .../rdf/web/cloudbase/sail/LoadDataServlet.java | 10 +- .../web/cloudbase/sail/QueryDataServlet.java | 46 +- .../cloudbase/sail/QuerySerqlDataServlet.java | 16 +- .../cloud/rdf/web/sail/RdfController.java | 65 +- .../WEB-INF/spring/spring-root-extensions.xml | 2 +- .../rdf/web/sail/RdfControllerAccumuloTest.java | 17 +- .../cloud/rdf/web/sail/RdfControllerTest.java | 16 +- .../test/resources/controllerTest-context.xml | 4 +- 777 files changed, 12039 insertions(+), 12291 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 45399de..fa79ef9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ under the License. --> ## Overview -[Apache Rya] is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to OpenRdf to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc). +[Apache Rya] is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to RDF4J to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc). Rya stands for RDF y(and) Accumulo. @@ -125,6 +125,47 @@ Start the Tomcat server. `./bin/startup.sh` ### Load Data +#### Direct Code + +Here is a code snippet for directly running against Accumulo with the code. You will need at least accumulo.rya.jar, rya.api, rya.sail.impl on the classpath and transitive dependencies. I find that Maven is the easiest way to get a project dependency tree set up. + +``` JAVA +Connector connector = new ZooKeeperInstance("instance", "zoo1,zoo2,zoo3").getConnector("user", "password"); + +final RdfCloudTripleStore store = new RdfCloudTripleStore(); +AccumuloRyaDAO crdfdao = new AccumuloRyaDAO(); +crdfdao.setConnector(connector); + +AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); +conf.setTablePrefix("rya_"); +conf.setDisplayQueryPlan(true); +crdfdao.setConf(conf); +store.setRyaDAO(crdfdao); + +InferenceEngine inferenceEngine = new InferenceEngine(); +inferenceEngine.setRyaDAO(crdfdao); +inferenceEngine.setConf(conf); +store.setInferenceEngine(inferenceEngine); + +Repository myRepository = new RyaSailRepository(store); +myRepository.initialize(); + +String query = "select * where {\n" + + "<http://mynamespace/ProductType1> ?p ?o.\n" + + "}"; +RepositoryConnection conn = myRepository.getConnection(); +System.out.println(query); +TupleQuery tupleQuery = conn.prepareTupleQuery( + QueryLanguage.SPARQL, query); +ValueFactory vf = ValueFactoryImpl.getInstance(); + +TupleQueryResultHandler writer = new SPARQLResultsXMLWriter(System.out); +tupleQuery.evaluate(writer); + +conn.close(); +myRepository.shutDown(); +``` + #### Web REST endpoint The War sets up a Web REST endpoint at `http://server/web.rya/loadrdf` that allows POST data to get loaded into the Rdf Store. This short tutorial will use Java code to post data. @@ -208,14 +249,14 @@ Options: * rdf.tablePrefix : The tables (spo, po, osp) are prefixed with this qualifier. The tables become: (rdf.tablePrefix)spo,(rdf.tablePrefix)po,(rdf.tablePrefix)osp * ac.* : Accumulo connection parameters -* rdf.format : See RDFFormat from openrdf, samples include (Trig, N-Triples, RDF/XML) +* rdf.format : See RDFFormat from RDF4J, samples include (Trig, N-Triples, RDF/XML) * io.sort.mb : Higher the value, the faster the job goes. Just remember that you will need this much ram at least per mapper The argument is the directory/file to load. This file needs to be loaded into HDFS before running. -#### Direct OpenRDF API +#### Direct RDF4J API -Here is some sample code to load data directly through the OpenRDF API. (Loading N-Triples data) +Here is some sample code to load data directly through the RDF4J API. (Loading N-Triples data) You will need at least accumulo.rya-<version>, rya.api, rya.sail.impl on the classpath and transitive dependencies. I find that Maven is the easiest way to get a project dependency tree set up. ``` JAVA @@ -297,47 +338,6 @@ public class QueryDataServletRun { Compile and run this code above, changing the url that your Rdf War is running at. -#### Direct Code - -Here is a code snippet for directly running against Accumulo with the code. You will need at least accumulo.rya.jar, rya.api, rya.sail.impl on the classpath and transitive dependencies. I find that Maven is the easiest way to get a project dependency tree set up. - -``` JAVA -Connector connector = new ZooKeeperInstance("instance", "zoo1,zoo2,zoo3").getConnector("user", "password"); - -final RdfCloudTripleStore store = new RdfCloudTripleStore(); -AccumuloRyaDAO crdfdao = new AccumuloRyaDAO(); -crdfdao.setConnector(connector); - -AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); -conf.setTablePrefix("rya_"); -conf.setDisplayQueryPlan(true); -crdfdao.setConf(conf); -store.setRyaDAO(crdfdao); - -InferenceEngine inferenceEngine = new InferenceEngine(); -inferenceEngine.setRyaDAO(crdfdao); -inferenceEngine.setConf(conf); -store.setInferenceEngine(inferenceEngine); - -Repository myRepository = new RyaSailRepository(store); -myRepository.initialize(); - -String query = "select * where {\n" + - "<http://mynamespace/ProductType1> ?p ?o.\n" + - "}"; -RepositoryConnection conn = myRepository.getConnection(); -System.out.println(query); -TupleQuery tupleQuery = conn.prepareTupleQuery( - QueryLanguage.SPARQL, query); -ValueFactory vf = ValueFactoryImpl.getInstance(); - -TupleQueryResultHandler writer = new SPARQLResultsXMLWriter(System.out); -tupleQuery.evaluate(writer); - -conn.close(); -myRepository.shutDown(); -``` - [Apache Rya]: http://rya.incubator.apache.org/ [Accumulo]: https://accumulo.apache.org/ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/pom.xml ---------------------------------------------------------------------- diff --git a/common/rya.api.function/pom.xml b/common/rya.api.function/pom.xml index cb09c2b..293019f 100644 --- a/common/rya.api.function/pom.xml +++ b/common/rya.api.function/pom.xml @@ -39,12 +39,12 @@ under the License. <!-- Third Party Dependencies --> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryalgebra-model</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryalgebra-model</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryalgebra-evaluation</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryalgebra-evaluation</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationState.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationState.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationState.java index 2551696..8e3175d 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationState.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationState.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationType.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationType.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationType.java index 5383da1..fb0e876 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationType.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationType.java @@ -22,12 +22,12 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; -import org.openrdf.query.algebra.AggregateOperator; -import org.openrdf.query.algebra.Avg; -import org.openrdf.query.algebra.Count; -import org.openrdf.query.algebra.Max; -import org.openrdf.query.algebra.Min; -import org.openrdf.query.algebra.Sum; +import org.eclipse.rdf4j.query.algebra.AggregateOperator; +import org.eclipse.rdf4j.query.algebra.Avg; +import org.eclipse.rdf4j.query.algebra.Count; +import org.eclipse.rdf4j.query.algebra.Max; +import org.eclipse.rdf4j.query.algebra.Min; +import org.eclipse.rdf4j.query.algebra.Sum; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationsEvaluator.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationsEvaluator.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationsEvaluator.java index 2aa716f..d0a89fc 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationsEvaluator.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AggregationsEvaluator.java @@ -28,12 +28,12 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.model.visibility.VisibilitySimplifier; -import org.openrdf.query.algebra.AggregateOperator; -import org.openrdf.query.algebra.Group; -import org.openrdf.query.algebra.GroupElem; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.algebra.AggregateOperator; +import org.eclipse.rdf4j.query.algebra.Group; +import org.eclipse.rdf4j.query.algebra.GroupElem; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import com.google.common.collect.ImmutableMap; @@ -113,7 +113,7 @@ public class AggregationsEvaluator { final String resultBindingName = groupElem.getName(); final AtomicReference<String> aggregatedBindingName = new AtomicReference<>(); - groupElem.visitChildren(new QueryModelVisitorBase<RuntimeException>() { + groupElem.visitChildren(new AbstractQueryModelVisitor<RuntimeException>() { @Override public void meet(final Var node) { aggregatedBindingName.set( node.getName() ); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AverageFunction.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AverageFunction.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AverageFunction.java index 4a31fce..b2c92e6 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AverageFunction.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/AverageFunction.java @@ -26,15 +26,15 @@ import java.math.BigInteger; import java.util.Map; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.impl.DecimalLiteralImpl; -import org.openrdf.model.impl.IntegerLiteralImpl; -import org.openrdf.query.algebra.MathExpr.MathOp; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.util.MathUtil; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.util.MathUtil; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,6 +48,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; @DefaultAnnotation(NonNull.class) public final class AverageFunction implements AggregationFunction { private static final Logger log = LoggerFactory.getLogger(AverageFunction.class); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Override public void update(final AggregationElement aggregation, final AggregationState state, final VisibilityBindingSet childBindingSet) { @@ -73,15 +74,15 @@ public final class AverageFunction implements AggregationFunction { if (childLiteral.getDatatype() != null && XMLDatatypeUtil.isNumericDatatype(childLiteral.getDatatype())) { try { // Update the sum. - final Literal oldSum = new DecimalLiteralImpl(averageState.getSum()); + final Literal oldSum = VF.createLiteral(averageState.getSum()); final BigDecimal sum = MathUtil.compute(oldSum, childLiteral, MathOp.PLUS).decimalValue(); // Update the count. final BigInteger count = averageState.getCount().add( BigInteger.ONE ); // Update the BindingSet to include the new average. - final Literal sumLiteral = new DecimalLiteralImpl(sum); - final Literal countLiteral = new IntegerLiteralImpl(count); + final Literal sumLiteral = VF.createLiteral(sum); + final Literal countLiteral = VF.createLiteral(count); final Literal average = MathUtil.compute(sumLiteral, countLiteral, MathOp.DIVIDE); result.addBinding(resultName, average); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/CountFunction.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/CountFunction.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/CountFunction.java index 879df5e..c6d76f9 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/CountFunction.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/CountFunction.java @@ -24,9 +24,10 @@ import static java.util.Objects.requireNonNull; import java.math.BigInteger; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.Literal; -import org.openrdf.model.impl.IntegerLiteralImpl; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -37,6 +38,8 @@ import edu.umd.cs.findbugs.annotations.NonNull; */ @DefaultAnnotation(NonNull.class) public final class CountFunction implements AggregationFunction { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + @Override public void update(final AggregationElement aggregation, final AggregationState state, final VisibilityBindingSet childBindingSet) { checkArgument(aggregation.getAggregationType() == AggregationType.COUNT, "The CountFunction only accepts COUNT AggregationElements."); @@ -52,12 +55,12 @@ public final class CountFunction implements AggregationFunction { if(newBinding) { // Initialize the binding. - result.addBinding(resultName, new IntegerLiteralImpl(BigInteger.ONE)); + result.addBinding(resultName, VF.createLiteral(BigInteger.ONE)); } else { // Update the existing binding. final Literal count = (Literal) result.getValue(resultName); final BigInteger updatedCount = count.integerValue().add( BigInteger.ONE ); - result.addBinding(resultName, new IntegerLiteralImpl(updatedCount)); + result.addBinding(resultName, VF.createLiteral(updatedCount)); } } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MaxFunction.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MaxFunction.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MaxFunction.java index 5b5d493..3700076 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MaxFunction.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MaxFunction.java @@ -22,9 +22,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.evaluation.util.ValueComparator; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.evaluation.util.ValueComparator; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MinFunction.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MinFunction.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MinFunction.java index f1b083c..9cd233c 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MinFunction.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/MinFunction.java @@ -22,9 +22,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.evaluation.util.ValueComparator; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.evaluation.util.ValueComparator; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/SumFunction.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/SumFunction.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/SumFunction.java index 7ddc9ae..e248ee4 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/SumFunction.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/aggregation/SumFunction.java @@ -24,14 +24,15 @@ import static java.util.Objects.requireNonNull; import java.math.BigInteger; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.impl.IntegerLiteralImpl; -import org.openrdf.query.algebra.MathExpr.MathOp; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.util.MathUtil; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.util.MathUtil; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,6 +46,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; @DefaultAnnotation(NonNull.class) public final class SumFunction implements AggregationFunction { private static final Logger log = LoggerFactory.getLogger(SumFunction.class); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Override public void update(final AggregationElement aggregation, final AggregationState state, final VisibilityBindingSet childBindingSet) { @@ -62,7 +64,7 @@ public final class SumFunction implements AggregationFunction { // Get the starting number for the sum. Literal sum; if(newBinding) { - sum = new IntegerLiteralImpl(BigInteger.ZERO); + sum = VF.createLiteral(BigInteger.ZERO); } else { sum = (Literal) state.getBindingSet().getValue(resultName); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/filter/FilterEvaluator.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/filter/FilterEvaluator.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/filter/FilterEvaluator.java index 3ec97cb..a70fc53 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/filter/FilterEvaluator.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/filter/FilterEvaluator.java @@ -21,24 +21,24 @@ package org.apache.rya.api.function.filter; import static java.util.Objects.requireNonNull; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.evaluation.TripleSource; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStrategyImpl; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategy; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; -import info.aduna.iteration.CloseableIteration; /** * Processes a {@link Filter} node from a SPARQL query. @@ -50,9 +50,9 @@ public class FilterEvaluator { /** * Is used to evaluate the conditions of a {@link Filter}. */ - private static final EvaluationStrategyImpl EVALUATOR = new EvaluationStrategyImpl( + private static final StrictEvaluationStrategy EVALUATOR = new StrictEvaluationStrategy( new TripleSource() { - private final ValueFactory valueFactory = new ValueFactoryImpl(); + private final ValueFactory valueFactory = SimpleValueFactory.getInstance(); @Override public ValueFactory getValueFactory() { @@ -62,12 +62,13 @@ public class FilterEvaluator { @Override public CloseableIteration<? extends Statement, QueryEvaluationException> getStatements( final Resource arg0, - final URI arg1, + final IRI arg1, final Value arg2, final Resource... arg3) throws QueryEvaluationException { throw new UnsupportedOperationException(); } - }); + }, + null); private final ValueExpr condition; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LazyJoiningIterator.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LazyJoiningIterator.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LazyJoiningIterator.java index b504a7e..e41a6e8 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LazyJoiningIterator.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LazyJoiningIterator.java @@ -24,9 +24,9 @@ import java.util.Iterator; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.model.visibility.VisibilitySimplifier; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LeftOuterJoin.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LeftOuterJoin.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LeftOuterJoin.java index 79af26c..b4b9f7e 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LeftOuterJoin.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/join/LeftOuterJoin.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.rya.api.function.join.LazyJoiningIterator.Side; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/MultiProjectionEvaluator.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/MultiProjectionEvaluator.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/MultiProjectionEvaluator.java index 0e9093d..9a7eac5 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/MultiProjectionEvaluator.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/MultiProjectionEvaluator.java @@ -27,15 +27,15 @@ import java.util.Optional; import java.util.Set; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.BNode; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.BNodeGenerator; -import org.openrdf.query.algebra.Extension; -import org.openrdf.query.algebra.ExtensionElem; -import org.openrdf.query.algebra.MultiProjection; -import org.openrdf.query.algebra.ProjectionElemList; -import org.openrdf.query.algebra.TupleExpr; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.BNodeGenerator; +import org.eclipse.rdf4j.query.algebra.Extension; +import org.eclipse.rdf4j.query.algebra.ExtensionElem; +import org.eclipse.rdf4j.query.algebra.MultiProjection; +import org.eclipse.rdf4j.query.algebra.ProjectionElemList; +import org.eclipse.rdf4j.query.algebra.TupleExpr; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -48,7 +48,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; @DefaultAnnotation(NonNull.class) public class MultiProjectionEvaluator { - private final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private final Set<ProjectionEvaluator> projections; private final Set<String> blankNodeSourceNames; @@ -116,7 +116,7 @@ public class MultiProjectionEvaluator { // Generate an ID for each blank node that will appear in the results. final Map<String, BNode> blankNodes = new HashMap<>(); for(final String blankNodeSourceName : blankNodeSourceNames) { - blankNodes.put(blankNodeSourceName, vf.createBNode(bNodeIdFactory.nextId())); + blankNodes.put(blankNodeSourceName, VF.createBNode(bNodeIdFactory.nextId())); } // Iterate through each of the projections and create the results from them. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/ProjectionEvaluator.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/ProjectionEvaluator.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/ProjectionEvaluator.java index 4b37448..d4b3a2d 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/ProjectionEvaluator.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/projection/ProjectionEvaluator.java @@ -28,20 +28,20 @@ import java.util.Set; import java.util.UUID; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.BNodeGenerator; -import org.openrdf.query.algebra.Extension; -import org.openrdf.query.algebra.ExtensionElem; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.ProjectionElem; -import org.openrdf.query.algebra.ProjectionElemList; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.ValueConstant; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.BNodeGenerator; +import org.eclipse.rdf4j.query.algebra.Extension; +import org.eclipse.rdf4j.query.algebra.ExtensionElem; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.ProjectionElem; +import org.eclipse.rdf4j.query.algebra.ProjectionElemList; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.ValueConstant; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -63,7 +63,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; @DefaultAnnotation(NonNull.class) public class ProjectionEvaluator { - private final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); /** * All off the projection elements that define what will appear in the resulting binding sets. @@ -175,7 +175,7 @@ public class ProjectionEvaluator { if(blankNodes.containsKey(sourceName)) { value = blankNodes.get(sourceName); } else { - value = vf.createBNode( UUID.randomUUID().toString() ); + value = VF.createBNode( UUID.randomUUID().toString() ); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/sp/StatementPatternMatcher.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/sp/StatementPatternMatcher.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/sp/StatementPatternMatcher.java index 208f8d1..090482d 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/sp/StatementPatternMatcher.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/sp/StatementPatternMatcher.java @@ -22,12 +22,12 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalInstantRelationFunction.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalInstantRelationFunction.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalInstantRelationFunction.java index d622329..ae1b846 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalInstantRelationFunction.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalInstantRelationFunction.java @@ -21,10 +21,10 @@ package org.apache.rya.api.function.temporal; import java.time.ZonedDateTime; import java.time.format.DateTimeParseException; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIntervalRelationFunction.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIntervalRelationFunction.java b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIntervalRelationFunction.java index 4a0d4bd..889353d 100644 --- a/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIntervalRelationFunction.java +++ b/common/rya.api.function/src/main/java/org/apache/rya/api/function/temporal/TemporalIntervalRelationFunction.java @@ -21,10 +21,10 @@ package org.apache.rya.api.function.temporal; import java.time.ZonedDateTime; import java.time.format.DateTimeParseException; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/resources/META-INF/services/org.eclipse.rdf4j.query.algebra.evaluation.function.Function ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/resources/META-INF/services/org.eclipse.rdf4j.query.algebra.evaluation.function.Function b/common/rya.api.function/src/main/resources/META-INF/services/org.eclipse.rdf4j.query.algebra.evaluation.function.Function new file mode 100644 index 0000000..1172844 --- /dev/null +++ b/common/rya.api.function/src/main/resources/META-INF/services/org.eclipse.rdf4j.query.algebra.evaluation.function.Function @@ -0,0 +1,22 @@ +# +# 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. +# +org.apache.rya.api.function.temporal.EqualsTemporalInstant +org.apache.rya.api.function.temporal.BeforeTemporalInstant +org.apache.rya.api.function.temporal.AfterTemporalInstant +org.apache.rya.api.function.temporal.WithinTemporalInterval http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function b/common/rya.api.function/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function deleted file mode 100644 index 1172844..0000000 --- a/common/rya.api.function/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function +++ /dev/null @@ -1,22 +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. -# -org.apache.rya.api.function.temporal.EqualsTemporalInstant -org.apache.rya.api.function.temporal.BeforeTemporalInstant -org.apache.rya.api.function.temporal.AfterTemporalInstant -org.apache.rya.api.function.temporal.WithinTemporalInterval
