You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/09/05 12:29:37 UTC
[01/10] jena git commit: Merge pull request #2 from apache/master
Repository: jena
Updated Branches:
refs/heads/master 26958bb2a -> 9d5f675a8
Merge pull request #2 from apache/master
Syncing from original
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c88e008a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c88e008a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c88e008a
Branch: refs/heads/master
Commit: c88e008a216e684711171c507d9744dffbd09025
Parents: 222b77d 275fa9c
Author: Chris Dollin <eh...@gmail.com>
Authored: Wed Jul 27 14:47:10 2016 +0100
Committer: GitHub <no...@github.com>
Committed: Wed Jul 27 14:47:10 2016 +0100
----------------------------------------------------------------------
.gitignore | 3 +
apache-jena-libs/pom.xml | 8 +-
apache-jena-osgi/jena-osgi-features/pom.xml | 101 +
.../src/main/resources/features.xml | 46 +
apache-jena-osgi/jena-osgi-test/pom.xml | 165 +-
.../org/apache/jena/osgi/test/JenaOSGITest.java | 131 +-
apache-jena-osgi/jena-osgi/pom.xml | 144 +-
.../java/org/apache/jena/osgi/Activator.java | 37 +
...rg.apache.jena.system.JenaSubsystemLifecycle | 4 +
apache-jena-osgi/pom.xml | 10 +-
apache-jena/assembly-jena-zip.xml | 61 +-
apache-jena/bat/arq.bat | 2 +-
apache-jena/bat/infer.bat | 2 +-
apache-jena/bat/iri.bat | 2 +-
apache-jena/bat/juuid.bat | 2 +-
apache-jena/bat/nquads.bat | 2 +-
apache-jena/bat/ntriples.bat | 2 +-
apache-jena/bat/qparse.bat | 2 +-
apache-jena/bat/rdfcat.bat | 2 +-
apache-jena/bat/rdfcompare.bat | 2 +-
apache-jena/bat/rdfcopy.bat | 2 +-
apache-jena/bat/rdfdiff.bat | 2 +-
apache-jena/bat/rdfparse.bat | 2 +-
apache-jena/bat/rdfxml.bat | 2 +-
apache-jena/bat/riot.bat | 2 +-
apache-jena/bat/rset.bat | 2 +-
apache-jena/bat/rsparql.bat | 2 +-
apache-jena/bat/rupdate.bat | 2 +-
apache-jena/bat/schemagen.bat | 2 +-
apache-jena/bat/sparql.bat | 2 +-
apache-jena/bat/tdbbackup.bat | 2 +-
apache-jena/bat/tdbdump.bat | 2 +-
apache-jena/bat/tdbloader.bat | 2 +-
apache-jena/bat/tdbquery.bat | 2 +-
apache-jena/bat/tdbstats.bat | 2 +-
apache-jena/bat/tdbupdate.bat | 2 +-
apache-jena/bat/trig.bat | 2 +-
apache-jena/bat/turtle.bat | 2 +-
apache-jena/bat/uparse.bat | 2 +-
apache-jena/bat/update.bat | 2 +-
apache-jena/bat/utf8.bat | 2 +-
apache-jena/bat/wwwdec.bat | 2 +-
apache-jena/bat/wwwenc.bat | 2 +-
apache-jena/bin/arq | 2 +-
apache-jena/bin/infer | 2 +-
apache-jena/bin/iri | 2 +-
apache-jena/bin/juuid | 2 +-
apache-jena/bin/nquads | 2 +-
apache-jena/bin/ntriples | 2 +-
apache-jena/bin/qparse | 2 +-
apache-jena/bin/rdfcat | 2 +-
apache-jena/bin/rdfcompare | 2 +-
apache-jena/bin/rdfcopy | 2 +-
apache-jena/bin/rdfdiff | 2 +-
apache-jena/bin/rdfparse | 2 +-
apache-jena/bin/rdfxml | 2 +-
apache-jena/bin/riot | 2 +-
apache-jena/bin/rset | 2 +-
apache-jena/bin/rsparql | 2 +-
apache-jena/bin/rupdate | 2 +-
apache-jena/bin/schemagen | 2 +-
apache-jena/bin/sparql | 2 +-
apache-jena/bin/tdbbackup | 2 +-
apache-jena/bin/tdbdump | 2 +-
apache-jena/bin/tdbloader | 2 +-
apache-jena/bin/tdbquery | 2 +-
apache-jena/bin/tdbstats | 2 +-
apache-jena/bin/tdbupdate | 2 +-
apache-jena/bin/trig | 2 +-
apache-jena/bin/turtle | 2 +-
apache-jena/bin/uparse | 2 +-
apache-jena/bin/update | 2 +-
apache-jena/bin/utf8 | 2 +-
apache-jena/bin/wwwdec | 2 +-
apache-jena/bin/wwwenc | 2 +-
apache-jena/pom.xml | 34 +-
apache-jena/template.bat | 2 +-
apache-jena/template.bin | 2 +-
jena-arq/Grammar/Notes | 92 +-
jena-arq/Grammar/arq.jj | 106 +-
jena-arq/Grammar/grammarExtracts | 114 +-
jena-arq/Grammar/master.jj | 114 +-
jena-arq/Grammar/sparql_11.jj | 76 +-
jena-arq/Grammar/tokens.txt | 7 +
jena-arq/README.txt | 28 +-
jena-arq/Vocabularies/EARL-v0.rdf | 486 +--
jena-arq/Vocabularies/FOAF.rdf | 1214 +++---
jena-arq/Vocabularies/FOAF.ttl | 1866 ++++-----
jena-arq/Vocabularies/doap.ttl | 806 ++--
jena-arq/Vocabularies/list-pfunction.ttl | 86 +-
jena-arq/Vocabularies/result-set.ttl | 194 +-
jena-arq/Vocabularies/test-dawg.ttl | 276 +-
jena-arq/Vocabularies/test-manifest-1_0.ttl | 302 +-
jena-arq/Vocabularies/test-manifest-1_1.ttl | 116 +-
jena-arq/Vocabularies/test-manifest-x.ttl | 134 +-
jena-arq/Vocabularies/test-manifest.ttl | 306 +-
jena-arq/Vocabularies/test-query.ttl | 94 +-
jena-arq/etc/dataset-db.ttl | 96 +-
jena-arq/etc/dataset-owl-inf.ttl | 96 +-
jena-arq/etc/dataset-owl.ttl | 66 +-
jena-arq/etc/dataset-rdfs.ttl | 70 +-
jena-arq/etc/dataset-rules.ttl | 78 +-
jena-arq/etc/dataset-trans.ttl | 70 +-
jena-arq/etc/dataset.ttl | 86 +-
jena-arq/etc/graphstore.ttl | 84 +-
jena-arq/etc/update-data.ttl | 38 +-
jena-arq/pom.xml | 34 +-
.../examples/aggregates/CustomAggregate.java | 2 +-
.../constructquads/ExampleConstructQuads.java | 382 +-
.../arq/examples/riot/ExRIOT_2.java | 2 +-
.../main/java/org/apache/jena/query/ARQ.java | 64 +-
.../java/org/apache/jena/query/Dataset.java | 24 +-
.../org/apache/jena/query/DatasetFactory.java | 75 +-
.../jena/query/ParameterizedSparqlString.java | 3420 ++++++++--------
.../jena/query/QueryExecutionFactory.java | 209 +-
.../java/org/apache/jena/query/package.html | 22 +-
.../java/org/apache/jena/riot/RDFDataMgr.java | 22 +-
.../java/org/apache/jena/riot/RDFFormat.java | 17 +
.../org/apache/jena/riot/RDFParserRegistry.java | 2 -
.../main/java/org/apache/jena/riot/RIOT.java | 9 +-
.../main/java/org/apache/jena/riot/SysRIOT.java | 20 +-
.../org/apache/jena/riot/WriterDatasetRIOT.java | 9 -
.../jena/riot/adapters/AdapterFileManager.java | 18 +-
.../jena/riot/adapters/AdapterRDFWriter.java | 18 +
.../jena/riot/adapters/RDFWriterRIOT.java | 24 +-
.../jena/riot/checker/CheckerBlankNodes.java | 15 +-
.../apache/jena/riot/checker/CheckerIRI.java | 88 +-
.../java/org/apache/jena/riot/lang/LangCSV.java | 304 +-
.../org/apache/jena/riot/lang/LangEngine.java | 12 +-
.../org/apache/jena/riot/lang/LangRDFXML.java | 102 +-
.../apache/jena/riot/lang/PipedQuadsStream.java | 106 +-
.../apache/jena/riot/lang/PipedRDFIterator.java | 784 ++--
.../apache/jena/riot/lang/PipedRDFStream.java | 140 +-
.../jena/riot/lang/PipedTriplesStream.java | 106 +-
.../jena/riot/lang/PipedTuplesStream.java | 110 +-
.../org/apache/jena/riot/lang/ReaderTriX.java | 5 +-
.../org/apache/jena/riot/lang/RiotParsers.java | 154 +-
.../java/org/apache/jena/riot/lang/TriX.java | 24 +-
.../org/apache/jena/riot/out/JsonLDWriter.java | 20 +-
.../jena/riot/out/SinkQuadBracedOutput.java | 274 +-
.../process/normalize/CanonicalizeLiteral.java | 16 +-
.../riot/process/normalize/DatatypeHandler.java | 1 +
.../riot/process/normalize/NormalizeValue.java | 263 +-
.../riot/process/normalize/NormalizeValue2.java | 56 +-
.../org/apache/jena/riot/system/FactoryRDF.java | 57 +
.../jena/riot/system/FactoryRDFCaching.java | 114 +
.../apache/jena/riot/system/FactoryRDFStd.java | 100 +
.../apache/jena/riot/system/IRIResolver.java | 4 +-
.../apache/jena/riot/system/ParserProfile.java | 14 +-
.../jena/riot/system/ParserProfileBase.java | 88 +-
.../jena/riot/system/ParserProfileChecker.java | 46 +-
.../jena/riot/system/ProgressStreamRDF.java | 65 +
.../org/apache/jena/riot/system/RiotLib.java | 55 +-
.../riot/system/SerializationFactoryFinder.java | 12 +-
.../apache/jena/riot/system/StreamRDFLib.java | 2 +-
.../jena/riot/system/StreamRDFWrapper.java | 20 +-
.../jena/riot/system/StreamRDFWriter.java | 2 +-
.../java/org/apache/jena/riot/web/HttpOp.java | 145 +-
.../jena/riot/web/TypedInputStreamHttp.java | 51 -
.../jena/riot/writer/StreamWriterTriX.java | 1 +
.../org/apache/jena/riot/writer/TriGWriter.java | 16 +-
.../apache/jena/riot/writer/WriterConst.java | 24 +-
.../org/apache/jena/sparql/ARQConstants.java | 7 +
.../jena/sparql/algebra/AlgebraGenerator.java | 4 +-
.../apache/jena/sparql/algebra/AlgebraQuad.java | 10 +-
.../jena/sparql/algebra/BeforeAfterVisitor.java | 82 -
.../apache/jena/sparql/algebra/OpAsQuery.java | 4 +-
.../org/apache/jena/sparql/algebra/OpVars.java | 2 +-
.../apache/jena/sparql/algebra/OpVisitor.java | 4 +-
.../jena/sparql/algebra/OpVisitorBase.java | 6 +-
.../jena/sparql/algebra/OpVisitorByType.java | 6 +-
.../apache/jena/sparql/algebra/OpWalker.java | 2 +-
.../jena/sparql/algebra/TransformBase.java | 3 +
.../jena/sparql/algebra/TransformQuadGraph.java | 4 +
.../apache/jena/sparql/algebra/Transformer.java | 470 +--
.../apache/jena/sparql/algebra/op/OpBGP.java | 2 +-
.../jena/sparql/algebra/op/OpQuadPattern.java | 5 +-
.../optimize/ExprTransformApplyTransform.java | 1 +
.../jena/sparql/algebra/optimize/Optimize.java | 9 +-
.../optimize/TransformDistinctToReduced.java | 1 -
.../optimize/TransformFilterEquality.java | 42 +-
.../optimize/TransformFilterPlacement.java | 53 +-
.../jena/sparql/algebra/table/Table1.java | 2 +-
.../algebra/walker/ApplyTransformVisitor.java | 478 +++
.../algebra/walker/ElementWalker_New.java | 196 +
.../algebra/walker/ExprVisitorFunction.java | 38 +
.../sparql/algebra/walker/OpVisitorByType.java | 215 +
.../algebra/walker/OpVisitorByTypeAndExpr.java | 237 ++
.../jena/sparql/algebra/walker/Walker.java | 236 ++
.../sparql/algebra/walker/WalkerVisitor.java | 301 ++
.../walker/WalkerVisitorSkipService.java | 40 +
.../algebra/walker/WalkerVisitorVisible.java | 67 +
.../apache/jena/sparql/core/DatasetGraph.java | 22 +-
.../core/DatasetGraphAltDefaultGraph.java | 65 -
.../jena/sparql/core/DatasetGraphBase.java | 119 +-
.../jena/sparql/core/DatasetGraphCaching.java | 135 -
.../sparql/core/DatasetGraphCollection.java | 3 +
.../jena/sparql/core/DatasetGraphCopyAdd.java | 2 +-
.../jena/sparql/core/DatasetGraphFactory.java | 59 +-
.../jena/sparql/core/DatasetGraphMaker.java | 56 -
.../jena/sparql/core/DatasetGraphMap.java | 168 +-
.../jena/sparql/core/DatasetGraphMapLink.java | 195 +
.../jena/sparql/core/DatasetGraphOne.java | 166 +-
.../jena/sparql/core/DatasetGraphQuad.java | 54 -
.../jena/sparql/core/DatasetGraphQuads.java | 54 +
.../jena/sparql/core/DatasetGraphSimpleMem.java | 238 --
.../sparql/core/DatasetGraphTrackActive.java | 155 +-
.../sparql/core/DatasetGraphTriplesQuads.java | 41 +-
.../jena/sparql/core/DatasetGraphWithLock.java | 71 +-
.../jena/sparql/core/DatasetGraphWrapper.java | 34 +-
.../apache/jena/sparql/core/DatasetImpl.java | 157 +-
.../jena/sparql/core/DatasetPrefixStorage.java | 5 +-
.../jena/sparql/core/DynamicDatasets.java | 19 +-
.../org/apache/jena/sparql/core/GraphView.java | 15 +-
.../java/org/apache/jena/sparql/core/Quad.java | 11 +-
.../sparql/core/TransactionalComponent.java | 22 +-
.../jena/sparql/core/TransactionalLock.java | 140 +
.../jena/sparql/core/TransactionalMutex.java | 63 +
.../sparql/core/TransactionalNotSupported.java | 81 +
.../core/TransactionalNotSupportedMixin.java | 52 +
.../jena/sparql/core/TransactionalOfOne.java | 61 -
.../apache/jena/sparql/core/VarExprList.java | 48 +-
.../sparql/core/assembler/AssemblerUtils.java | 8 +-
.../sparql/core/assembler/DatasetAssembler.java | 44 +-
.../core/assembler/DatasetNullAssembler.java | 61 -
.../core/journaling/DatasetGraphWithRecord.java | 247 --
.../journaling/ListBackedOperationRecord.java | 73 -
.../jena/sparql/core/journaling/Operation.java | 59 -
.../sparql/core/journaling/QuadOperation.java | 133 -
.../journaling/ReversibleOperationRecord.java | 55 -
.../sparql/core/journaling/package-info.java | 19 -
.../sparql/core/mem/DatasetGraphInMemory.java | 6 +
.../jena/sparql/core/mem/OrderedTupleTable.java | 152 +
.../jena/sparql/core/mem/PMapQuadTable.java | 130 +-
.../jena/sparql/core/mem/PMapTripleTable.java | 123 +-
.../jena/sparql/core/mem/PMapTupleTable.java | 17 +-
.../apache/jena/sparql/core/mem/QuadTable.java | 11 +-
.../jena/sparql/core/mem/QuadTableForm.java | 152 +-
.../sparql/core/mem/TransactionalComponent.java | 47 +
.../jena/sparql/core/mem/TripleTable.java | 3 +-
.../jena/sparql/core/mem/TripleTableForm.java | 101 +-
.../apache/jena/sparql/core/mem/TupleTable.java | 2 -
.../engine/binding/BindingInputStream.java | 4 +-
.../sparql/engine/index/HashIndexTable.java | 436 +-
.../jena/sparql/engine/index/IndexFactory.java | 90 +-
.../jena/sparql/engine/index/IndexTable.java | 64 +-
.../jena/sparql/engine/index/LinearIndex.java | 224 +-
.../sparql/engine/iterator/QueryIterMinus.java | 91 +-
.../engine/iterator/QueryIterPlainWrapper.java | 2 +-
.../jena/sparql/engine/main/JoinClassifier.java | 61 +-
.../sparql/engine/main/LeftJoinClassifier.java | 49 +-
.../jena/sparql/engine/main/OpExecutor.java | 6 +-
.../jena/sparql/engine/main/VarFinder.java | 149 +-
.../engine/main/iterator/QueryIterGraph.java | 2 +-
.../engine/optimizer/reorder/ReorderLib.java | 9 +
.../org/apache/jena/sparql/expr/E_Bound.java | 6 +-
.../org/apache/jena/sparql/expr/E_Call.java | 4 +-
.../org/apache/jena/sparql/expr/E_Function.java | 58 +-
.../apache/jena/sparql/expr/E_StrReplace.java | 44 +-
.../java/org/apache/jena/sparql/expr/Expr.java | 3 +
.../jena/sparql/expr/ExprEvalException.java | 8 +-
.../org/apache/jena/sparql/expr/ExprLib.java | 75 +-
.../org/apache/jena/sparql/expr/ExprList.java | 12 +-
.../org/apache/jena/sparql/expr/ExprNode.java | 5 +-
.../org/apache/jena/sparql/expr/ExprNone.java | 66 +
.../apache/jena/sparql/expr/ExprTransform.java | 2 +
.../jena/sparql/expr/ExprTransformBase.java | 1 +
.../jena/sparql/expr/ExprTransformCopy.java | 81 +-
.../jena/sparql/expr/ExprTransformOp.java | 1 +
.../jena/sparql/expr/ExprTransformer.java | 192 +-
.../org/apache/jena/sparql/expr/ExprVar.java | 5 +-
.../org/apache/jena/sparql/expr/ExprVars.java | 7 +-
.../apache/jena/sparql/expr/ExprVisitor.java | 7 +-
.../jena/sparql/expr/ExprVisitorBase.java | 6 -
.../org/apache/jena/sparql/expr/ExprWalker.java | 119 -
.../org/apache/jena/sparql/expr/NodeValue.java | 5 +-
.../jena/sparql/expr/aggregate/Accumulator.java | 1 -
.../expr/aggregate/AccumulatorDistinctExpr.java | 75 -
.../sparql/expr/aggregate/AccumulatorExpr.java | 64 +-
.../expr/aggregate/AccumulatorFactory.java | 6 +-
.../jena/sparql/expr/aggregate/AggAvg.java | 2 +-
.../sparql/expr/aggregate/AggAvgDistinct.java | 6 +-
.../jena/sparql/expr/aggregate/AggCountVar.java | 2 +-
.../expr/aggregate/AggCountVarDistinct.java | 10 +-
.../jena/sparql/expr/aggregate/AggCustom.java | 222 +-
.../sparql/expr/aggregate/AggGroupConcat.java | 2 +-
.../expr/aggregate/AggGroupConcatDistinct.java | 10 +-
.../jena/sparql/expr/aggregate/AggMaxBase.java | 2 +-
.../jena/sparql/expr/aggregate/AggMinBase.java | 2 +-
.../jena/sparql/expr/aggregate/AggSample.java | 20 +-
.../expr/aggregate/AggSampleDistinct.java | 26 +-
.../jena/sparql/expr/aggregate/AggSum.java | 2 +-
.../sparql/expr/aggregate/AggSumDistinct.java | 6 +-
.../expr/aggregate/AggregateRegistry.java | 17 +-
.../jena/sparql/expr/aggregate/Aggregator.java | 2 +-
.../expr/aggregate/AggregatorFactory.java | 12 +-
.../apache/jena/sparql/expr/aggregate/Args.java | 28 +
.../sparql/expr/aggregate/lib/AccStatBase.java | 99 +
.../sparql/expr/aggregate/lib/AccStatLib.java | 46 +
.../aggregate/lib/AccStatStdDevPopulation.java | 34 +
.../expr/aggregate/lib/AccStatStdDevSample.java | 34 +
.../aggregate/lib/AccStatVarPopulation.java | 34 +
.../expr/aggregate/lib/AccStatVarSample.java | 34 +
.../jena/sparql/expr/aggregate/lib/AggURI.java | 29 +
.../expr/aggregate/lib/StandardAggregates.java | 72 +
.../jena/sparql/expr/nodevalue/XSDFuncOp.java | 281 +-
.../jena/sparql/function/FunctionBase.java | 37 +-
.../sparql/function/FunctionFactoryAuto.java | 27 +-
.../jena/sparql/function/FunctionRegistry.java | 38 +-
.../jena/sparql/function/StandardFunctions.java | 219 +-
.../library/FN_AdjustDatetimeToTimezone.java | 55 +
.../function/library/FN_FormatNumber.java | 52 +
.../jena/sparql/function/library/FN_Round.java | 38 +-
.../function/library/FN_Round_Half_Even.java | 58 +
.../function/library/FN_StrNormalizeSpace.java | 38 +
.../library/FN_StrNormalizeUnicode.java | 56 +
.../sparql/function/library/FN_StrReplace.java | 46 +
.../function/library/FN_StrSubstring.java | 5 +-
.../sparql/function/library/Math_atan2.java | 37 +
.../jena/sparql/function/library/Math_exp.java | 32 +
.../sparql/function/library/Math_exp10.java | 48 +
.../jena/sparql/function/library/Math_log.java | 31 +
.../sparql/function/library/Math_log10.java | 31 +
.../jena/sparql/function/library/Math_pow.java | 59 +
.../jena/sparql/function/library/SystemVar.java | 28 +-
.../jena/sparql/function/library/eval.java | 43 +-
.../sparql/function/library/evenInteger.java | 1 -
.../jena/sparql/function/library/execTime.java | 57 +
.../jena/sparql/function/library/sprintf.java | 57 +
.../jena/sparql/function/library/substring.java | 5 +-
.../org/apache/jena/sparql/graph/GraphOps.java | 66 +-
.../sparql/graph/GraphPrefixesProjection.java | 10 +-
.../apache/jena/sparql/graph/GraphSPARQL.java | 206 -
.../jena/sparql/graph/GraphUnionRead.java | 91 +-
.../org/apache/jena/sparql/graph/NodeConst.java | 1 +
.../org/apache/jena/sparql/lang/ParserARQ.java | 1 -
.../jena/sparql/lang/ParserARQUpdate.java | 21 +-
.../org/apache/jena/sparql/lang/ParserBase.java | 390 +-
.../apache/jena/sparql/lang/ParserSPARQL10.java | 1 -
.../apache/jena/sparql/lang/ParserSPARQL11.java | 1 -
.../apache/jena/sparql/lang/SPARQLParser.java | 4 +-
.../jena/sparql/lang/SPARQLParserBase.java | 28 +-
.../apache/jena/sparql/lang/SyntaxVarScope.java | 26 +-
.../apache/jena/sparql/lang/arq/ARQParser.java | 1771 +++++----
.../sparql/lang/arq/ARQParserConstants.java | 313 +-
.../sparql/lang/arq/ARQParserTokenManager.java | 1424 +++----
.../sparql/lang/sparql_11/SPARQLParser11.java | 77 +-
.../lang/sparql_11/SPARQLParser11Constants.java | 301 +-
.../sparql_11/SPARQLParser11TokenManager.java | 1407 +++----
.../jena/sparql/modify/GraphStoreAction.java | 23 -
.../jena/sparql/modify/GraphStoreBasic.java | 8 +-
.../jena/sparql/modify/GraphStoreNull.java | 73 -
.../modify/GraphStoreNullTransactional.java | 64 -
.../jena/sparql/modify/GraphStoreWrapper.java | 35 -
.../apache/jena/sparql/modify/UpdateEngine.java | 86 +-
.../jena/sparql/modify/UpdateEngineWorker.java | 71 +-
.../jena/sparql/modify/UpdateRequestSink.java | 150 +-
.../apache/jena/sparql/modify/UpdateSink.java | 80 +-
.../jena/sparql/modify/UpdateVisitorSink.java | 136 +-
.../apache/jena/sparql/modify/UsingList.java | 88 +-
.../jena/sparql/modify/UsingUpdateSink.java | 186 +-
.../sparql/modify/request/UpdateDataWriter.java | 114 +-
.../modify/request/UpdateVisitorBase.java | 43 +
.../apache/jena/sparql/path/P_OneOrMore1.java | 1 +
.../apache/jena/sparql/path/P_OneOrMoreN.java | 1 +
.../org/apache/jena/sparql/path/PathLib.java | 186 +-
.../jena/sparql/path/eval/PathEngine.java | 16 +-
.../jena/sparql/path/eval/PathEngine1.java | 34 +-
.../jena/sparql/path/eval/PathEngineN.java | 13 +-
.../jena/sparql/path/eval/PathEngineSPARQL.java | 42 +-
.../apache/jena/sparql/path/eval/PathEval.java | 4 +-
.../jena/sparql/pfunction/PropFuncArg.java | 83 +-
.../pfunction/PropertyFunctionFactoryAuto.java | 34 +-
.../pfunction/PropertyFunctionRegistry.java | 56 +-
.../pfunction/StandardPropertyFunctions.java | 46 +
.../sparql/resultset/JSONOutputResultSet.java | 4 +-
.../jena/sparql/resultset/JSONResultsKW.java | 1 +
.../jena/sparql/resultset/SortedResultSet.java | 147 -
.../jena/sparql/serializer/FmtExprSPARQL.java | 7 -
.../sparql/serializer/FormatterElement.java | 2 +-
.../jena/sparql/serializer/QuerySerializer.java | 45 +-
.../jena/sparql/sse/builders/BuilderExpr.java | 5 +-
.../jena/sparql/sse/writers/WriterExpr.java | 111 +-
.../jena/sparql/sse/writers/WriterOp.java | 502 +--
.../jena/sparql/syntax/ElementWalker.java | 18 +-
.../apache/jena/sparql/syntax/PatternVars.java | 4 +-
.../ElementTransformCopyBase.java | 2 +-
.../syntaxtransform/ElementTransformSubst.java | 2 +-
.../syntaxtransform/ElementTransformer.java | 9 +-
.../ExprTransformNodeElement.java | 13 +-
.../syntaxtransform/NodeTransformSubst.java | 4 +-
.../syntaxtransform/QueryTransformOps.java | 12 +-
.../org/apache/jena/sparql/util/Context.java | 63 +-
.../apache/jena/sparql/util/DatasetUtils.java | 45 +-
.../org/apache/jena/sparql/util/ExprUtils.java | 3 +-
.../jena/sparql/util/NodeIsomorphismMap.java | 18 +-
.../jena/sparql/util/graph/GraphUtils.java | 14 +
.../java/org/apache/jena/system/ThreadTxn.java | 151 +
.../main/java/org/apache/jena/system/Txn.java | 111 +
.../java/org/apache/jena/system/TxnCounter.java | 240 ++
.../apache/jena/web/DatasetGraphAccessor.java | 52 +-
.../jena/web/DatasetGraphAccessorBasic.java | 76 +-
.../jena/web/DatasetGraphAccessorHTTP.java | 2 +-
...rg.apache.jena.system.JenaSubsystemLifecycle | 2 +-
.../org/apache/jena/query/TS_ParamString.java | 62 +-
.../query/TestParameterizedSparqlString.java | 3762 +++++++++---------
.../test/java/org/apache/jena/riot/TC_Riot.java | 2 +-
.../org/apache/jena/riot/TS_ReaderRIOT.java | 40 -
.../org/apache/jena/riot/TS_RiotGeneral.java | 39 +
.../org/apache/jena/riot/TestRiotReader.java | 170 +-
.../java/org/apache/jena/riot/TestSysRIOT.java | 42 +
.../jena/riot/adapters/TestFileManager.java | 19 +
.../apache/jena/riot/lang/TestLangNTriples.java | 1 -
.../apache/jena/riot/lang/TestLangNTuples.java | 1 -
.../apache/jena/riot/lang/TestLangRdfJson.java | 1 -
.../jena/riot/lang/TestParserFactory.java | 3 -
.../apache/jena/riot/lang/TestTriXReader.java | 5 +-
.../apache/jena/riot/lang/TestTurtleTerms.java | 1 -
.../apache/jena/riot/system/TS_RiotSystem.java | 5 +
.../apache/jena/riot/system/TestFactoryRDF.java | 117 +
.../jena/riot/system/TestFactoryRDFCaching.java | 47 +
.../apache/jena/riot/writer/TS_RiotWriter.java | 1 +
.../jena/riot/writer/TestWriteRDFXML.java | 59 +
.../org/apache/jena/sparql/ARQTestSuite.java | 2 +
.../java/org/apache/jena/sparql/TC_General.java | 19 +-
.../jena/sparql/algebra/TestClassify.java | 35 +-
.../jena/sparql/algebra/TestTransformOpExt.java | 2 +-
.../jena/sparql/algebra/TestTransformQuads.java | 37 +-
.../jena/sparql/algebra/TestVarFinder.java | 51 +-
.../algebra/optimize/AbstractTestTransform.java | 15 +
.../algebra/optimize/TS_Optimization.java | 1 +
.../sparql/algebra/optimize/TestReorderBGP.java | 5 +-
.../TestTransformEliminateAssignments.java | 125 +-
.../optimize/TestTransformFilterEquality.java | 232 ++
.../algebra/optimize/TestTransformFilters.java | 173 +-
.../uniongraph/AbstractTestUnionTransform.java | 95 -
.../algebra/uniongraph/Dev_TS_UnionGraph.java | 35 -
.../algebra/uniongraph/TestUnionGraph.java | 106 -
.../uniongraph/TestUnionTransformQuads.java | 35 -
.../uniongraph/TestUnionTransformTriples.java | 34 -
.../org/apache/jena/sparql/api/TestAPI.java | 4 +-
.../jena/sparql/core/DatasetGraphSimpleMem.java | 242 ++
.../org/apache/jena/sparql/core/TS_Core.java | 2 +
.../core/TestDatasetGraphMemTriplesQuads.java | 3 +-
.../sparql/core/TestDatasetGraphWithLock.java | 95 +-
.../jena/sparql/core/TestSpecialGraphs.java | 218 +
.../sparql/core/journaling/TS_Journaling.java | 27 -
.../journaling/TestDatasetGraphWithRecord.java | 265 --
.../TestListBackedOperationRecord.java | 124 -
.../core/journaling/TestQuadOperation.java | 92 -
.../TestDatasetGraphInMemoryTransactions.java | 4 +-
.../sparql/engine/index/TestIndexTable.java | 410 +-
.../apache/jena/sparql/expr/LibTestExpr.java | 114 +
.../org/apache/jena/sparql/expr/TS_Expr.java | 3 +-
.../jena/sparql/expr/TestCustomAggregates.java | 4 +-
.../jena/sparql/expr/TestExpressions2.java | 6 +-
.../jena/sparql/expr/TestExpressionsMath.java | 95 +
.../apache/jena/sparql/expr/TestFunctions.java | 307 +-
.../apache/jena/sparql/expr/TestFunctions2.java | 6 +-
.../sparql/expr/TestLeviathanFunctions.java | 123 +-
.../sparql/expr/TestStatisticsAggregates.java | 324 ++
.../apache/jena/sparql/expr/TestXSDFuncOp.java | 7 +-
.../apache/jena/sparql/lang/TestVarScope.java | 18 +-
.../syntaxtransform/TestSyntaxTransform.java | 19 +-
.../transaction/AbstractTestTransaction.java | 314 --
.../AbstractTestTransactionLifecycle.java | 425 ++
.../jena/sparql/transaction/TS_Transaction.java | 4 +-
.../TestTransactionDSGWithLockNoAbort.java | 41 +
.../TestTransactionDSGWithLockWithAbort.java | 38 +
.../sparql/transaction/TestTransactionMem.java | 48 -
.../transaction/TestTransactionSupport.java | 80 +
.../apache/jena/system/ExceptionFromTest.java | 21 +
.../java/org/apache/jena/system/TS_System.java | 32 +
.../org/apache/jena/system/TestCounter.java | 145 +
.../java/org/apache/jena/system/TestTxn.java | 238 ++
.../apache/jena/system/TestTxnLifecycle.java | 167 +
.../org/apache/jena/system/TestTxnThread.java | 92 +
.../web/AbstractTestDatasetGraphAccessor.java | 252 +-
.../jena/web/TestDatasetGraphAccessorMem.java | 24 +-
.../Construct/results-construct-quad-data-2.ttl | 2 +-
.../results-construct-quad-dataset.trig | 6 +-
.../results-construct-quad-default-graph.ttl | 6 +-
.../results-construct-quad-named-graph.trig | 4 +-
.../results-construct-quad-short-form-1.trig | 4 +-
.../results-construct-quad-short-form-2.ttl | 2 +-
.../results-construct-quad-short-form-3.trig | 6 +-
.../results-construct-quad-syntax-1.trig | 2 +-
.../results-construct-quad-syntax-3.ttl | 2 +-
.../results-construct-quad-syntax-4.trig | 10 +-
.../results-construct-quad-syntax-5.trig | 10 +-
.../results-construct-quad-syntax-6.trig | 10 +-
.../results-construct-quad-syntax-7.ttl | 2 +-
jena-arq/testing/ARQ/README | 8 +-
.../Syntax/Syntax-SPARQL-Update/manifest.ttl | 41 +-
.../syntax-update-bad-13.ru | 7 +
.../syntax-update-bad-14.ru | 1 +
.../syntax-update-bad-15.ru | 1 +
.../syntax-update-bad-16.ru | 1 +
jena-arq/testing/ARQ/Syntax/syn-arq.sh | 12 +
jena-arq/testing/ARQ/Syntax/syn-up.sh | 2 +-
jena-arq/testing/ARQ/Syntax/syn-update.sh | 24 +
.../testing/DAWG-Final/sort/.manifest.ttl.swp | Bin 20480 -> 0 bytes
jena-arq/testing/RIOT/FileManager/data.ttl | 7 +
jena-arq/testing/RIOT/FileManager/data1.ttl | 6 +
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.nq | 0
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.trix | 2 +
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.nq | 1 +
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.trix | 9 +
.../TrigStd/literal_with_CARRIAGE_RETURN.trig | 2 +-
jena-base/pom.xml | 12 +-
.../apache/jena/atlas/io/IndentedWriter.java | 20 +-
.../org/apache/jena/atlas/iterator/Iter.java | 62 +-
.../org/apache/jena/atlas/lib/AlarmClock.java | 11 +-
.../org/apache/jena/atlas/lib/BitsLong.java | 3 +-
.../org/apache/jena/atlas/lib/CacheStats.java | 28 -
.../apache/jena/atlas/lib/CollectionUtils.java | 7 +-
.../java/org/apache/jena/atlas/lib/Lib.java | 41 +-
.../apache/jena/atlas/lib/ProgressMonitor.java | 160 +
.../apache/jena/atlas/lib/RefCountingMap.java | 185 +
.../org/apache/jena/atlas/lib/SetUtils.java | 39 +-
.../apache/jena/atlas/lib/cache/CacheGuava.java | 8 +-
.../apache/jena/atlas/lib/cache/CacheInfo.java | 48 +
.../apache/jena/atlas/lib/tuple/TConsumer3.java | 32 +
.../apache/jena/atlas/lib/tuple/TConsumer4.java | 32 +
.../apache/jena/atlas/lib/tuple/TFunction3.java | 32 +
.../apache/jena/atlas/lib/tuple/TFunction4.java | 32 +
.../org/apache/jena/atlas/logging/LogCtl.java | 16 +-
.../jena/atlas/logging/ProgressLogger.java | 105 +-
.../java/org/apache/jena/atlas/lib/TS_Lib.java | 2 +
.../jena/atlas/lib/TestCollectionUtils.java | 76 +
.../jena/atlas/lib/TestFilenameProcessing.java | 8 +-
.../jena/atlas/lib/TestRefCountingMap.java | 150 +
.../org/apache/jena/atlas/lib/TestSetUtils.java | 48 +-
jena-cmds/pom.xml | 31 +-
.../src/main/java/arq/cmdline/ModContext.java | 2 +
.../java/arq/cmdline/ModDatasetGeneral.java | 19 +-
jena-cmds/src/main/java/arq/iri.java | 3 +
jena-cmds/src/main/java/arq/qexpr.java | 7 +-
jena-cmds/src/main/java/arq/qparse.java | 22 +-
jena-cmds/src/main/java/arq/rdfdiff.java | 8 +-
jena-cmds/src/main/java/arq/update.java | 8 +-
jena-cmds/src/main/java/jena/qparse.java | 25 +
jena-cmds/src/main/java/jena/riot.java | 25 +
jena-cmds/src/main/java/jena/schemagen.java | 19 +-
jena-cmds/src/main/java/jena/sparql.java | 2 +-
.../src/main/java/riotcmd/CmdLangParse.java | 22 +-
jena-cmds/src/main/java/tdb/tdbdump.java | 24 +-
jena-cmds/src/test/java/arq/qtest.java | 274 ++
jena-cmds/src/test/java/jena/cmd/qtest.java | 274 --
jena-core/pom.xml | 59 +-
jena-core/src-examples/data/eswc-2006-09-21.rdf | 1438 +++----
jena-core/src-examples/data/test1.owl | 52 +-
.../org/apache/jena/assembler/Assembler.java | 5 +
.../assembler/assemblers/AssemblerGroup.java | 15 +-
.../org/apache/jena/datatypes/BaseDatatype.java | 20 +
.../jena/datatypes/xsd/AbstractDateTime.java | 25 +-
.../jena/datatypes/xsd/impl/RDFLangString.java | 8 +-
.../apache/jena/datatypes/xsd/impl/RDFhtml.java | 55 +
.../java/org/apache/jena/graph/NodeFactory.java | 17 +-
.../jena/graph/impl/TransactionHandlerBase.java | 45 +-
.../main/java/org/apache/jena/mem/BunchMap.java | 8 +
.../java/org/apache/jena/mem/HashCommon.java | 34 +-
.../org/apache/jena/mem/HashedBunchMap.java | 31 +-
.../org/apache/jena/mem/NodeToTriplesMap.java | 4 +
.../apache/jena/mem/NodeToTriplesMapMem.java | 4 +
.../org/apache/jena/mem/WrappedHashMap.java | 8 +
.../java/org/apache/jena/rdf/model/Literal.java | 6 +-
.../apache/jena/rdf/model/ResourceFactory.java | 74 +-
.../org/apache/jena/rdf/model/impl/Util.java | 2 +
.../jena/rdfxml/xmlinput/impl/XMLHandler.java | 2 +-
.../apache/jena/reasoner/rulesys/Builtin.java | 2 +-
.../jena/reasoner/rulesys/BuiltinRegistry.java | 88 +-
.../jena/reasoner/rulesys/FBRuleReasoner.java | 2 +-
.../apache/jena/reasoner/rulesys/Functor.java | 57 +-
.../reasoner/rulesys/GenericRuleReasoner.java | 22 +-
.../reasoner/rulesys/MapBuiltinRegistry.java | 68 +
.../rulesys/OverrideBuiltinRegistry.java | 61 +
.../org/apache/jena/reasoner/rulesys/Rule.java | 72 +-
.../reasoner/rulesys/impl/BindingStack.java | 2 +-
.../reasoner/rulesys/impl/BindingVector.java | 2 +-
.../reasoner/rulesys/impl/LPBRuleEngine.java | 218 +-
.../jena/reasoner/rulesys/impl/package.html | 16 +-
.../apache/jena/reasoner/rulesys/package.html | 44 +-
.../java/org/apache/jena/shared/LockMRSW.java | 1 -
.../java/org/apache/jena/shared/LockMutex.java | 17 +-
.../jena/shared/impl/PrefixMappingImpl.java | 22 +-
.../java/org/apache/jena/shared/uuid/Bits.java | 259 --
.../org/apache/jena/shared/uuid/JenaUUID.java | 21 +-
.../org/apache/jena/shared/uuid/UUID_V1.java | 12 +-
.../apache/jena/shared/uuid/UUID_V1_Gen.java | 19 +-
.../apache/jena/shared/uuid/UUID_V4_Gen.java | 18 +-
.../org/apache/jena/system/InitJenaCore.java | 11 +-
.../jena/system/JenaSubsystemRegistryBasic.java | 8 +-
.../java/org/apache/jena/system/JenaSystem.java | 53 +-
.../main/java/org/apache/jena/util/package.html | 18 +-
.../java/org/apache/jena/vocabulary/DB.java | 76 -
.../java/org/apache/jena/vocabulary/DCAT.java | 64 +
.../java/org/apache/jena/vocabulary/ORG.java | 92 +
.../java/org/apache/jena/vocabulary/RDF.java | 48 +-
.../java/org/apache/jena/vocabulary/ROV.java | 55 +
.../java/org/apache/jena/vocabulary/SKOS.java | 192 +-
.../java/org/apache/jena/vocabulary/SKOSXL.java | 124 +-
.../java/org/apache/jena/vocabulary/VOID.java | 79 +
...rg.apache.jena.system.JenaSubsystemLifecycle | 1 -
.../src/main/resources/etc/owl-fb-micro.rules | 1164 +++---
.../src/main/resources/etc/owl-fb-mini.rules | 1496 +++----
jena-core/src/main/resources/etc/owl.rules | 610 +--
jena-core/src/main/resources/etc/rdfs.rules | 166 +-
.../rdf/model/test/TestResourceFactory.java | 2 +-
.../rulesys/impl/TestLPBRuleEngine.java | 163 +
.../test/TestGenericRuleReasonerConfig.java | 46 +
.../jena/reasoner/rulesys/test/TestPackage.java | 12 +-
.../org/apache/jena/shared/uuid/TestBits.java | 457 ---
.../apache/jena/shared/uuid/UUIDTestSuite.java | 1 -
.../jena/vocabulary/test/TestVocabDB.java | 65 -
.../jena/vocabulary/test/TestVocabularies.java | 1 -
.../src/test/resources/ont-policy-test.rdf | 116 +-
jena-core/src/test/resources/ontology/list0.rdf | 40 +-
jena-core/src/test/resources/ontology/list1.rdf | 42 +-
jena-core/src/test/resources/ontology/list2.rdf | 44 +-
jena-core/src/test/resources/ontology/list3.rdf | 46 +-
jena-core/src/test/resources/ontology/list4.rdf | 48 +-
jena-core/src/test/resources/ontology/list5.rdf | 50 +-
jena-core/testing/Turtle/build | 60 +-
jena-core/testing/arp/i18n/badbom16be.rdf | Bin 1882 -> 906 bytes
jena-core/testing/arp/i18n/badbom16le.rdf | Bin 1882 -> 906 bytes
jena-core/testing/arp/i18n/badbom8.rdf | 68 +-
jena-core/testing/arp/i18n/bom16be.rdf | Bin 1792 -> 862 bytes
jena-core/testing/arp/i18n/bom16le.rdf | Bin 1792 -> 862 bytes
jena-core/testing/arp/i18n/bom8.rdf | 66 +-
jena-core/testing/arp/i18n/i18nID.rdf | 52 +-
jena-core/testing/arp/xml-prop.rdf | 10 +-
jena-core/testing/ontology/list0.rdf | 40 +-
jena-core/testing/ontology/list1.rdf | 42 +-
jena-core/testing/ontology/list2.rdf | 44 +-
jena-core/testing/ontology/list3.rdf | 46 +-
jena-core/testing/ontology/list4.rdf | 48 +-
jena-core/testing/ontology/list5.rdf | 50 +-
jena-core/testing/ontology/owl/Wine/food.owl | 2700 ++++++-------
.../ontology/owl/list-syntax/test-proptypes.rdf | 64 +-
jena-core/testing/ontology/relativenames.rdf | 44 +-
jena-core/testing/ontology/testImport1/a.owl | 28 +-
jena-core/testing/ontology/testImport1/readme | 2 +-
jena-core/testing/ontology/testImport2/a.owl | 30 +-
jena-core/testing/ontology/testImport2/b.owl | 28 +-
jena-core/testing/ontology/testImport2/readme | 2 +-
jena-core/testing/ontology/testImport3/a.owl | 28 +-
jena-core/testing/ontology/testImport3/b.owl | 28 +-
jena-core/testing/ontology/testImport3/c.owl | 26 +-
jena-core/testing/ontology/testImport3/readme | 2 +-
jena-core/testing/ontology/testImport4/a.owl | 30 +-
jena-core/testing/ontology/testImport4/b.owl | 32 +-
jena-core/testing/ontology/testImport4/readme | 2 +-
jena-core/testing/ontology/testImport5/a.owl | 30 +-
jena-core/testing/ontology/testImport5/b.owl | 28 +-
jena-core/testing/ontology/testImport5/readme | 4 +-
jena-core/testing/ontology/testImport6/a.owl | 32 +-
jena-core/testing/ontology/testImport6/b.owl | 30 +-
jena-core/testing/ontology/testImport6/c.owl | 28 +-
jena-core/testing/ontology/testImport6/d.owl | 30 +-
jena-core/testing/ontology/testImport6/readme | 6 +-
jena-core/testing/ontology/testImport7/a.owl | 20 +-
jena-core/testing/ontology/testImport8/a.owl | 50 +-
jena-core/testing/ontology/testImport8/b.owl | 38 +-
jena-core/testing/reasoners/bugs/sbug.owl | 80 +-
jena-core/testing/reasoners/bugs/sbug.rdf | 48 +-
.../testing/reasoners/bugs/userDatatypes.owl | 98 +-
jena-core/testing/reasoners/include.rules | 10 +-
.../testing/reasoners/owl/inconsistent7.rdf | 58 +-
jena-core/testing/reasoners/owl/nondetbug.rdf | 64 +-
jena-core/testing/reasoners/owl/nondetbug.rules | 38 +-
jena-core/testing/reasoners/rdfs/data1.rdf | 36 +-
jena-core/testing/reasoners/rdfs/data2.rdf | 38 +-
jena-core/testing/reasoners/rdfs/data3.rdf | 54 +-
jena-core/testing/reasoners/rdfs/dttest1.nt | 4 +-
jena-core/testing/reasoners/rdfs/dttest2.nt | 4 +-
jena-core/testing/reasoners/rdfs/dttest3.nt | 4 +-
.../reasoners/rdfs/manifest-nodirect.rdf | 350 +-
jena-core/testing/reasoners/rdfs/manifest.rdf | 378 +-
jena-core/testing/reasoners/rdfs/query-res.nt | 8 +-
jena-core/testing/reasoners/rdfs/query10.nt | 6 +-
jena-core/testing/reasoners/rdfs/query11.nt | 6 +-
jena-core/testing/reasoners/rdfs/query12.nt | 6 +-
jena-core/testing/reasoners/rdfs/query13.nt | 6 +-
jena-core/testing/reasoners/rdfs/query14.nt | 6 +-
jena-core/testing/reasoners/rdfs/query15.nt | 6 +-
jena-core/testing/reasoners/rdfs/query16.nt | 6 +-
jena-core/testing/reasoners/rdfs/query17.nt | 10 +-
jena-core/testing/reasoners/rdfs/query18.nt | 8 +-
jena-core/testing/reasoners/rdfs/query19.nt | 10 +-
jena-core/testing/reasoners/rdfs/query2.nt | 8 +-
jena-core/testing/reasoners/rdfs/query20.nt | 8 +-
jena-core/testing/reasoners/rdfs/query21.nt | 6 +-
jena-core/testing/reasoners/rdfs/query22.nt | 6 +-
jena-core/testing/reasoners/rdfs/query3.nt | 8 +-
jena-core/testing/reasoners/rdfs/query4.nt | 8 +-
jena-core/testing/reasoners/rdfs/query5.nt | 8 +-
jena-core/testing/reasoners/rdfs/query7.nt | 8 +-
jena-core/testing/reasoners/rdfs/query8.nt | 6 +-
jena-core/testing/reasoners/rdfs/query9.nt | 6 +-
jena-core/testing/reasoners/rdfs/result1.rdf | 28 +-
jena-core/testing/reasoners/rdfs/result10.rdf | 32 +-
jena-core/testing/reasoners/rdfs/result11.rdf | 418 +-
jena-core/testing/reasoners/rdfs/result12.rdf | 178 +-
jena-core/testing/reasoners/rdfs/result13.rdf | 70 +-
jena-core/testing/reasoners/rdfs/result14.rdf | 26 +-
jena-core/testing/reasoners/rdfs/result15.rdf | 26 +-
.../reasoners/rdfs/result16-noresource.rdf | 62 +-
jena-core/testing/reasoners/rdfs/result16.rdf | 126 +-
jena-core/testing/reasoners/rdfs/result17.rdf | 62 +-
jena-core/testing/reasoners/rdfs/result18.rdf | 46 +-
.../reasoners/rdfs/result19-nodirect.rdf | 464 +--
jena-core/testing/reasoners/rdfs/result19.rdf | 462 +--
jena-core/testing/reasoners/rdfs/result2.rdf | 26 +-
.../reasoners/rdfs/result20-nodirect.rdf | 42 +-
jena-core/testing/reasoners/rdfs/result20.rdf | 48 +-
jena-core/testing/reasoners/rdfs/result3.rdf | 38 +-
jena-core/testing/reasoners/rdfs/result4.rdf | 34 +-
jena-core/testing/reasoners/rdfs/result7.rdf | 26 +-
jena-core/testing/reasoners/rdfs/result8.rdf | 28 +-
jena-core/testing/reasoners/rdfs/result9.rdf | 26 +-
jena-core/testing/reasoners/rdfs/tbox1.rdf | 64 +-
.../testing/reasoners/rdfs/timing-data.rdf | 108 +-
.../testing/reasoners/rdfs/timing-tbox.rdf | 78 +-
.../testing/reasoners/ruleParserTest1.rules | 24 +-
.../testing/reasoners/transitive/data1.rdf | 50 +-
.../testing/reasoners/transitive/data2.rdf | 40 +-
.../testing/reasoners/transitive/data3.rdf | 30 +-
.../testing/reasoners/transitive/data6.rdf | 30 +-
.../testing/reasoners/transitive/data8.rdf | 74 +-
.../testing/reasoners/transitive/data9.rdf | 72 +-
.../testing/reasoners/transitive/empty.rdf | 24 +-
.../testing/reasoners/transitive/manifest.rdf | 194 +-
.../testing/reasoners/transitive/query-all.nt | 10 +-
.../testing/reasoners/transitive/query2.nt | 10 +-
.../testing/reasoners/transitive/querysc.nt | 10 +-
.../testing/reasoners/transitive/querysp.nt | 12 +-
.../testing/reasoners/transitive/querysp2.nt | 12 +-
.../testing/reasoners/transitive/result2.rdf | 28 +-
.../testing/reasoners/transitive/result4.rdf | 62 +-
.../testing/reasoners/transitive/result5.rdf | 34 +-
.../testing/reasoners/transitive/result6.rdf | 48 +-
.../testing/reasoners/transitive/tbox1.rdf | 70 +-
.../testing/reasoners/transitive/tbox7.rdf | 70 +-
.../testing/wg/cardinality/Manifest005.rdf | 90 +-
.../testing/wg/cardinality/conclusions005.rdf | 80 +-
.../testing/wg/cardinality/premises005.rdf | 60 +-
jena-core/testing/wg/localtests/Manifest008.rdf | 60 +-
.../wg/localtests/ManifestRestriction001.rdf | 60 +-
.../wg/localtests/ManifestSubclass001.rdf | 60 +-
.../testing/wg/localtests/conclusions008.rdf | 48 +-
.../wg/localtests/conclusionsRestriction001.rdf | 34 +-
.../wg/localtests/conclusionsSubclass001.rdf | 40 +-
jena-core/testing/wg/localtests/premises008.rdf | 62 +-
.../wg/localtests/premisesRestriction001.rdf | 66 +-
.../wg/localtests/premisesSubclass001.rdf | 62 +-
jena-csv/pom.xml | 15 +-
.../org/apache/jena/propertytable/Column.java | 90 +-
.../jena/propertytable/PropertyTable.java | 252 +-
.../java/org/apache/jena/propertytable/Row.java | 150 +-
.../jena/propertytable/graph/GraphCSV.java | 124 +-
.../propertytable/graph/GraphPropertyTable.java | 400 +-
.../graph/QueryIterPropertyTable.java | 228 +-
.../graph/QueryIterPropertyTableRow.java | 486 +--
.../jena/propertytable/graph/RowMatch.java | 96 +-
.../graph/StageGeneratorPropertyTable.java | 114 +-
.../jena/propertytable/impl/ColumnImpl.java | 114 +-
.../impl/PropertyTableArrayImpl.java | 690 ++--
.../impl/PropertyTableBuilder.java | 270 +-
.../impl/PropertyTableHashMapImpl.java | 704 ++--
.../apache/jena/propertytable/lang/LangCSV.java | 308 +-
jena-csv/src/main/java/riotcmdx/csv2rdf.java | 104 +-
.../jena/propertytable/AbstractColumnTest.java | 158 +-
.../AbstractPropertyTableTest.java | 112 +-
.../jena/propertytable/AbstractRowTest.java | 210 +-
.../org/apache/jena/propertytable/BaseTest.java | 94 +-
.../jena/propertytable/TS_PropertyTable.java | 84 +-
.../jena/propertytable/graph/GraphCSVTest.java | 308 +-
.../impl/AbstractPropertyTableBuilderTest.java | 276 +-
.../impl/PropertyTableArrayImplTest.java | 168 +-
.../PropertyTableBuilderForArrayImplTest.java | 78 +-
.../PropertyTableBuilderForHashMapImplTest.java | 68 +-
.../impl/PropertyTableHashMapImplTest.java | 92 +-
jena-elephas/jena-elephas-common/pom.xml | 2 +-
.../rdf/types/AbstractNodeTupleWritable.java | 388 +-
.../rdf/types/CharacteristicSetWritable.java | 42 +-
.../rdf/types/CharacteristicWritable.java | 40 +-
.../hadoop/rdf/types/NodeTupleWritable.java | 52 +-
.../jena/hadoop/rdf/types/NodeWritable.java | 376 +-
.../jena/hadoop/rdf/types/QuadWritable.java | 270 +-
.../jena/hadoop/rdf/types/TripleWritable.java | 274 +-
.../comparators/SimpleBinaryComparator.java | 68 +-
.../rdf/io/types/CharacteristicTests.java | 46 +-
.../jena/hadoop/rdf/io/types/RdfTypesTest.java | 802 ++--
jena-elephas/jena-elephas-io/pom.xml | 2 +-
.../jena/hadoop/rdf/io/HadoopIOConstants.java | 36 +-
.../jena/hadoop/rdf/io/RdfIOConstants.java | 162 +-
.../io/input/AbstractNLineFileInputFormat.java | 60 +-
.../io/input/AbstractWholeFileInputFormat.java | 36 +-
.../hadoop/rdf/io/input/QuadsInputFormat.java | 40 +-
.../hadoop/rdf/io/input/TriplesInputFormat.java | 78 +-
.../rdf/io/input/TriplesOrQuadsInputFormat.java | 40 +-
.../input/nquads/BlockedNQuadsInputFormat.java | 42 +-
.../rdf/io/input/nquads/NQuadsInputFormat.java | 44 +-
.../nquads/WholeFileNQuadsInputFormat.java | 42 +-
.../ntriples/BlockedNTriplesInputFormat.java | 42 +-
.../io/input/ntriples/NTriplesInputFormat.java | 44 +-
.../ntriples/WholeFileNTriplesInputFormat.java | 42 +-
.../io/input/rdfjson/RdfJsonInputFormat.java | 42 +-
.../rdf/io/input/rdfxml/RdfXmlInputFormat.java | 42 +-
.../AbstractBlockBasedNodeTupleReader.java | 688 ++--
.../readers/AbstractBlockBasedQuadReader.java | 46 +-
.../readers/AbstractBlockBasedTripleReader.java | 46 +-
.../AbstractLineBasedNodeTupleReader.java | 528 +--
.../readers/AbstractLineBasedQuadReader.java | 42 +-
.../readers/AbstractLineBasedTripleReader.java | 42 +-
.../rdf/io/input/readers/AbstractRdfReader.java | 216 +-
.../AbstractWholeFileNodeTupleReader.java | 656 +--
.../readers/AbstractWholeFileQuadReader.java | 46 +-
.../readers/AbstractWholeFileTripleReader.java | 46 +-
.../rdf/io/input/readers/QuadsReader.java | 96 +-
.../io/input/readers/TriplesOrQuadsReader.java | 142 +-
.../rdf/io/input/readers/TriplesReader.java | 96 +-
.../io/input/readers/TriplesToQuadsReader.java | 46 +-
.../readers/nquads/BlockedNQuadsReader.java | 38 +-
.../io/input/readers/nquads/NQuadsReader.java | 42 +-
.../readers/nquads/WholeFileNQuadsReader.java | 38 +-
.../readers/ntriples/BlockedNTriplesReader.java | 38 +-
.../input/readers/ntriples/NTriplesReader.java | 42 +-
.../ntriples/WholeFileNTriplesReader.java | 38 +-
.../io/input/readers/rdfjson/RdfJsonReader.java | 38 +-
.../io/input/readers/rdfxml/RdfXmlReader.java | 38 +-
.../rdf/io/input/readers/trig/TriGReader.java | 38 +-
.../rdf/io/input/readers/trix/TriXReader.java | 38 +-
.../io/input/readers/turtle/TurtleReader.java | 38 +-
.../rdf/io/input/trig/TriGInputFormat.java | 42 +-
.../rdf/io/input/trix/TriXInputFormat.java | 78 +-
.../rdf/io/input/turtle/TurtleInputFormat.java | 42 +-
.../rdf/io/input/util/BlockInputStream.java | 36 +-
.../hadoop/rdf/io/input/util/RdfIOUtils.java | 199 +-
.../rdf/io/input/util/TrackableInputStream.java | 36 +-
.../rdf/io/input/util/TrackedInputStream.java | 36 +-
.../io/input/util/TrackedPipedQuadsStream.java | 40 +-
.../io/input/util/TrackedPipedRDFStream.java | 36 +-
.../input/util/TrackedPipedTriplesStream.java | 40 +-
.../AbstractBatchedNodeTupleOutputFormat.java | 44 +-
.../rdf/io/output/AbstractNodeOutputFormat.java | 38 +-
.../output/AbstractNodeTupleOutputFormat.java | 218 +-
.../io/output/nquads/NQuadsOutputFormat.java | 48 +-
.../ntriples/NTriplesNodeOutputFormat.java | 42 +-
.../output/ntriples/NTriplesOutputFormat.java | 48 +-
.../io/output/rdfjson/RdfJsonOutputFormat.java | 48 +-
.../io/output/rdfxml/RdfXmlOutputFormat.java | 48 +-
.../io/output/trig/BatchedTriGOutputFormat.java | 106 +-
.../turtle/BatchedTurtleOutputFormat.java | 98 +-
.../io/output/turtle/TurtleOutputFormat.java | 110 +-
.../writers/AbstractBatchedNodeTupleWriter.java | 38 +-
.../writers/AbstractBatchedQuadWriter.java | 48 +-
.../writers/AbstractBatchedTripleWriter.java | 46 +-
.../AbstractLineBasedNodeTupleWriter.java | 42 +-
.../writers/AbstractLineBasedQuadWriter.java | 44 +-
.../writers/AbstractLineBasedTripleWriter.java | 134 +-
.../io/output/writers/AbstractNodeWriter.java | 384 +-
.../AbstractWholeFileNodeTupleWriter.java | 38 +-
.../writers/AbstractWholeFileQuadWriter.java | 46 +-
.../writers/AbstractWholeFileTripleWriter.java | 46 +-
.../io/output/writers/nquads/NQuadsWriter.java | 44 +-
.../writers/ntriples/NTriplesNodeWriter.java | 44 +-
.../output/writers/ntriples/NTriplesWriter.java | 44 +-
.../output/writers/rdfjson/RdfJsonWriter.java | 38 +-
.../io/output/writers/rdfxml/RdfXmlWriter.java | 38 +-
.../output/writers/trig/BatchedTriGWriter.java | 104 +-
.../writers/turtle/BatchedTurtleWriter.java | 108 +-
.../rdf/io/RdfTriplesInputTestMapper.java | 38 +-
.../AbstractBlockedQuadInputFormatTests.java | 36 +-
.../AbstractBlockedTripleInputFormatTests.java | 36 +-
.../AbstractNodeTupleInputFormatTests.java | 1228 +++---
.../io/input/AbstractQuadsInputFormatTests.java | 48 +-
.../input/AbstractTriplesInputFormatTests.java | 52 +-
.../AbstractWholeFileQuadInputFormatTests.java | 66 +-
...AbstractWholeFileTripleInputFormatTests.java | 66 +-
.../io/input/bnodes/AbstractBlankNodeTests.java | 10 +-
...ractCompressedNodeTupleInputFormatTests.java | 48 +-
...AbstractCompressedQuadsInputFormatTests.java | 48 +-
...stractCompressedTriplesInputFormatTests.java | 48 +-
...CompressedWholeFileQuadInputFormatTests.java | 70 +-
...mpressedWholeFileTripleInputFormatTests.java | 286 +-
...actCompressedJsonLDQuadInputFormatTests.java | 74 +-
...tCompressedJsonLDTripleInputFormatTests.java | 74 +-
.../jsonld/BZippedJsonLDQuadInputTest.java | 68 +-
.../jsonld/BZippedJsonLDTripleInputTest.java | 68 +-
.../jsonld/DeflatedJsonLDQuadInputTest.java | 36 +-
.../jsonld/DeflatedJsonLDTripleInputTest.java | 36 +-
.../jsonld/GZippedJsonLDQuadInputTest.java | 36 +-
.../jsonld/GZippedJsonLDTripleInputTest.java | 36 +-
...bstractCompressedNQuadsInputFormatTests.java | 42 +-
...mpressedWholeFileNQuadsInputFormatTests.java | 42 +-
.../nquads/BZipppedNQuadsInputTest.java | 36 +-
.../BZipppedWholeFileNQuadsInputTest.java | 36 +-
.../nquads/DeflatedNQuadsInputTest.java | 36 +-
.../DeflatedWholeFileNQuadsInputTest.java | 36 +-
.../nquads/GZippedNQuadsInputTest.java | 36 +-
.../nquads/GZippedWholeFileNQuadsInputTest.java | 36 +-
...mpressedBlockedNTriplesInputFormatTests.java | 40 +-
...tractCompressedNTriplesInputFormatTests.java | 42 +-
...ressedWholeFileNTriplesInputFormatTests.java | 42 +-
.../ntriples/BZippedBlockedNTriplesInput.java | 36 +-
.../ntriples/BZippedNTriplesInputTest.java | 36 +-
.../BZippedWholeFileNTriplesInputTest.java | 36 +-
.../ntriples/DeflatedBlockedNTriplesInput.java | 36 +-
.../ntriples/DeflatedNTriplesInputTest.java | 36 +-
.../DeflatedWholeFileNTriplesInputTest.java | 36 +-
.../ntriples/GZippedBlockedNTriplesInput.java | 36 +-
.../ntriples/GZippedNTriplesInputTest.java | 36 +-
.../GZippedWholeFileNTriplesInputTest.java | 36 +-
...stractCompressedRdfJsonInputFormatTests.java | 42 +-
.../rdfjson/BZippedRdfJsonInputTest.java | 36 +-
.../rdfjson/DeflatedRdfJsonInputTest.java | 36 +-
.../rdfjson/GZippedRdfJsonInputTest.java | 36 +-
...bstractCompressedRdfXmlInputFormatTests.java | 42 +-
.../rdfxml/BZippedRdfXmlInputTest.java | 36 +-
.../rdfxml/DeflatedRdfXmlInputTest.java | 36 +-
.../rdfxml/GZippedRdfXmlInputTest.java | 36 +-
...actCompressedThriftQuadInputFormatTests.java | 142 +-
...tCompressedThriftTripleInputFormatTests.java | 142 +-
.../thrift/BZippedThriftQuadInputTest.java | 68 +-
.../thrift/BZippedThriftTripleInputTest.java | 68 +-
.../thrift/DeflatedThriftQuadInputTest.java | 36 +-
.../thrift/DeflatedThriftTripleInputTest.java | 36 +-
.../thrift/GZippedThriftQuadInputTest.java | 36 +-
.../thrift/GZippedThriftTripleInputTest.java | 36 +-
.../AbstractCompressedTriGInputFormatTests.java | 42 +-
.../compressed/trig/BZippedTriGInputTest.java | 36 +-
.../compressed/trig/DeflatedTriGInputTest.java | 36 +-
.../compressed/trig/GZippedTriGInputTest.java | 36 +-
.../AbstractCompressedTriXInputFormatTests.java | 42 +-
.../compressed/trix/BZippedTriXInputTest.java | 38 +-
.../compressed/trix/DeflatedTriXInputTest.java | 70 +-
.../compressed/trix/GZippedTriXInputTest.java | 38 +-
...bstractCompressedTurtleInputFormatTests.java | 42 +-
.../turtle/BZippedTurtleInputTest.java | 36 +-
.../turtle/DeflatedTurtleInputTest.java | 36 +-
.../turtle/GZippedTurtleInputTest.java | 36 +-
.../io/input/jsonld/JsonLDQuadInputTest.java | 72 +-
.../io/input/jsonld/JsonLDTripleInputTest.java | 78 +-
.../io/input/nquads/BlockedNQuadsInputTest.java | 40 +-
.../rdf/io/input/nquads/NQuadsInputTest.java | 40 +-
.../input/nquads/WholeFileNQuadsInputTest.java | 40 +-
.../ntriples/BlockedNTriplesInputTest.java | 40 +-
.../io/input/ntriples/NTriplesInputTest.java | 40 +-
.../ntriples/WholeFileNTriplesInputTest.java | 40 +-
.../rdf/io/input/rdfjson/RdfJsonInputTest.java | 40 +-
.../rdf/io/input/rdfxml/RdfXmlInputTest.java | 40 +-
.../io/input/thrift/ThriftQuadInputTest.java | 42 +-
.../io/input/thrift/ThriftTripleInputTest.java | 42 +-
.../hadoop/rdf/io/input/trig/TriGInputTest.java | 40 +-
.../hadoop/rdf/io/input/trix/TriXInputTest.java | 40 +-
.../rdf/io/input/turtle/TurtleInputTest.java | 102 +-
.../util/AbstractTrackableInputStreamTests.java | 38 +-
.../rdf/io/input/util/BlockInputStreamTest.java | 40 +-
.../io/input/util/TrackedInputStreamTest.java | 42 +-
.../AbstractNodeTupleOutputFormatTests.java | 510 +--
.../output/AbstractQuadOutputFormatTests.java | 46 +-
.../output/AbstractTripleOutputFormatTests.java | 46 +-
.../io/output/jsonld/JsonLdQuadOutputTest.java | 94 +-
.../output/jsonld/JsonLdTripleOutputTest.java | 94 +-
.../rdf/io/output/nquads/NQuadsOutputTest.java | 40 +-
.../io/output/ntriples/NTriplesOutputTest.java | 40 +-
.../io/output/rdfjson/RdfJsonOutputTest.java | 40 +-
.../rdf/io/output/rdfxml/RdfXmlOutputTest.java | 40 +-
.../io/output/thrift/ThriftQuadOutputTest.java | 96 +-
.../output/thrift/ThriftTripleOutputTest.java | 96 +-
.../io/output/trig/BatchedTriGOutputTest.java | 42 +-
.../io/output/trig/StreamedTriGOutputTest.java | 42 +-
.../output/trig/TriGBlankNodeOutputTests.java | 238 +-
.../rdf/io/output/trix/TriXOutputTest.java | 94 +-
.../output/turtle/BatchedTurtleOutputTest.java | 42 +-
.../output/turtle/StreamedTurtleOutputTest.java | 42 +-
.../turtle/TurtleBlankNodeOutputTests.java | 234 +-
jena-elephas/jena-elephas-mapreduce/pom.xml | 2 +-
.../jena/hadoop/rdf/mapreduce/KeyMapper.java | 36 +-
.../hadoop/rdf/mapreduce/KeyPlusNullMapper.java | 40 +-
.../hadoop/rdf/mapreduce/NullPlusKeyMapper.java | 40 +-
.../rdf/mapreduce/NullPlusValueMapper.java | 40 +-
.../rdf/mapreduce/RdfMapReduceConstants.java | 36 +-
.../jena/hadoop/rdf/mapreduce/SwapMapper.java | 38 +-
.../hadoop/rdf/mapreduce/TextCountReducer.java | 36 +-
.../jena/hadoop/rdf/mapreduce/ValueMapper.java | 36 +-
.../rdf/mapreduce/ValuePlusNullMapper.java | 38 +-
...tractCharacteristicSetGeneratingReducer.java | 44 +-
.../CharacteristicSetReducer.java | 38 +-
.../QuadCharacteristicSetGeneratingReducer.java | 42 +-
...ripleCharacteristicSetGeneratingReducer.java | 42 +-
.../count/AbstractNodeTupleNodeCountMapper.java | 40 +-
.../rdf/mapreduce/count/NodeCountReducer.java | 38 +-
.../mapreduce/count/QuadNodeCountMapper.java | 42 +-
.../mapreduce/count/TripleNodeCountMapper.java | 42 +-
.../datatypes/QuadDataTypeCountMapper.java | 48 +-
.../datatypes/TripleDataTypeCountMapper.java | 48 +-
.../AbstractNodeTupleNamespaceCountMapper.java | 46 +-
.../namespaces/QuadNamespaceCountMapper.java | 44 +-
.../namespaces/TripleNamespaceCountMapper.java | 44 +-
.../count/positional/QuadGraphCountMapper.java | 84 +-
.../count/positional/QuadObjectCountMapper.java | 46 +-
.../positional/QuadPredicateCountMapper.java | 46 +-
.../positional/QuadSubjectCountMapper.java | 46 +-
.../positional/TripleObjectCountMapper.java | 46 +-
.../positional/TriplePredicateCountMapper.java | 46 +-
.../positional/TripleSubjectCountMapper.java | 46 +-
.../filter/AbstractNodeTupleFilterMapper.java | 42 +-
.../filter/AbstractQuadFilterMapper.java | 40 +-
.../filter/AbstractTripleFilterMapper.java | 40 +-
.../filter/GroundQuadFilterMapper.java | 40 +-
.../filter/GroundTripleFilterMapper.java | 40 +-
.../mapreduce/filter/ValidQuadFilterMapper.java | 40 +-
.../filter/ValidTripleFilterMapper.java | 40 +-
.../AbstractQuadFilterByPositionMapper.java | 44 +-
.../AbstractTripleFilterByPositionMapper.java | 44 +-
.../positional/QuadFilterByGraphUriMapper.java | 44 +-
.../positional/QuadFilterByObjectUriMapper.java | 44 +-
.../positional/QuadFilterByPredicateMapper.java | 44 +-
.../QuadFilterBySubjectUriMapper.java | 44 +-
.../TripleFilterByObjectUriMapper.java | 44 +-
.../TripleFilterByPredicateUriMapper.java | 44 +-
.../TripleFilterBySubjectUriMapper.java | 44 +-
.../group/AbstractNodeTupleGroupingMapper.java | 40 +-
.../group/AbstractQuadGroupingMapper.java | 42 +-
.../group/AbstractTripleGroupingMapper.java | 42 +-
.../mapreduce/group/QuadGroupByGraphMapper.java | 40 +-
.../group/QuadGroupByObjectMapper.java | 40 +-
.../group/QuadGroupByPredicateMapper.java | 40 +-
.../group/QuadGroupBySubjectMapper.java | 40 +-
.../group/TripleGroupByObjectMapper.java | 40 +-
.../group/TripleGroupByPredicateMapper.java | 40 +-
.../group/TripleGroupBySubjectMapper.java | 40 +-
.../AbstractNodeTupleSplitToNodesMapper.java | 40 +-
.../AbstractNodeTupleSplitWithNodesMapper.java | 40 +-
.../mapreduce/split/QuadSplitToNodesMapper.java | 42 +-
.../split/QuadSplitWithNodesMapper.java | 42 +-
.../split/TripleSplitToNodesMapper.java | 42 +-
.../split/TripleSplitWithNodesMapper.java | 42 +-
.../transform/AbstractTriplesToQuadsMapper.java | 48 +-
.../transform/QuadsToTriplesMapper.java | 40 +-
.../TriplesToQuadsBySubjectMapper.java | 40 +-
.../TriplesToQuadsConstantGraphMapper.java | 44 +-
.../rdf/mapreduce/AbstractMapReduceTests.java | 36 +-
.../rdf/mapreduce/AbstractMapperTests.java | 138 +-
...CharacteristicSetGeneratingReducerTests.java | 52 +-
.../CharacteristicSetReducerTest.java | 65 +-
...eCharacteristicSetGeneratingReducerTest.java | 52 +-
.../AbstractNodeTupleNodeCountReducedTests.java | 44 +-
.../count/AbstractNodeTupleNodeCountTests.java | 44 +-
.../count/QuadNodeCountMapReduceTest.java | 54 +-
.../count/QuadNodeCountMapperTest.java | 50 +-
.../count/TripleNodeCountMapReduceTest.java | 50 +-
.../count/TripleNodeCountMapperTest.java | 48 +-
.../filter/AbstractNodeTupleFilterTests.java | 42 +-
.../filter/AbstractQuadValidityFilterTests.java | 44 +-
.../AbstractTripleValidityFilterTests.java | 44 +-
.../TripleFilterByNoPredicateMapperTest.java | 38 +-
.../TripleFilterByPredicateMapperTest.java | 52 +-
...leInvertedFilterByNoPredicateMapperTest.java | 38 +-
...ipleInvertedFilterByPredicateMapperTest.java | 52 +-
.../filter/ValidQuadFilterMapperTest.java | 40 +-
.../filter/ValidTripleFilterMapperTest.java | 40 +-
.../group/AbstractNodeTupleGroupingTests.java | 44 +-
.../group/AbstractQuadGroupingTests.java | 48 +-
.../group/AbstractTripleGroupingTests.java | 46 +-
.../group/QuadGroupByGraphMapperTest.java | 42 +-
.../group/QuadGroupByObjectMapperTest.java | 42 +-
.../group/QuadGroupByPredicateMapperTest.java | 42 +-
.../group/QuadGroupBySubjectMapperTest.java | 42 +-
.../group/TripleGroupByObjectMapperTest.java | 42 +-
.../group/TripleGroupByPredicateMapperTest.java | 42 +-
.../group/TripleGroupBySubjectMapperTest.java | 42 +-
.../AbstractNodeTupleSplitToNodesTests.java | 44 +-
.../AbstractNodeTupleSplitWithNodesTests.java | 44 +-
.../split/AbstractQuadSplitToNodesTests.java | 50 +-
.../split/AbstractQuadSplitWithNodesTests.java | 50 +-
.../split/AbstractTripleSplitToNodesTests.java | 48 +-
.../AbstractTripleSplitWithNodesTests.java | 48 +-
.../split/QuadSplitToNodesMapperTest.java | 42 +-
.../split/QuadSplitWithNodesMapperTest.java | 42 +-
.../split/TripleSplitToNodesMapperTest.java | 42 +-
.../split/TripleSplitWithNodesMapperTest.java | 44 +-
.../transform/QuadsToTriplesMapperTest.java | 54 +-
.../TriplesToQuadsBySubjectMapperTest.java | 54 +-
.../TriplesToQuadsConstantGraphMapperTest.java | 54 +-
jena-elephas/jena-elephas-stats/pom.xml | 2 +-
.../apache/jena/hadoop/rdf/stats/RdfStats.java | 842 ++--
.../jena/hadoop/rdf/stats/jobs/JobFactory.java | 232 +-
jena-elephas/pom.xml | 10 +-
jena-examples/pom.xml | 4 +-
jena-extras/jena-querybuilder/pom.xml | 2 +-
.../arq/querybuilder/AbstractQueryBuilder.java | 164 +-
.../jena/arq/querybuilder/AskBuilder.java | 152 +-
.../jena/arq/querybuilder/ConstructBuilder.java | 165 +-
.../org/apache/jena/arq/querybuilder/Order.java | 25 +
.../jena/arq/querybuilder/SelectBuilder.java | 199 +-
.../arq/querybuilder/clauses/SelectClause.java | 15 +-
.../clauses/SolutionModifierClause.java | 105 +-
.../handlers/AggregationHandler.java | 110 +
.../arq/querybuilder/handlers/HandlerBlock.java | 268 ++
.../querybuilder/handlers/PrologHandler.java | 12 +
.../querybuilder/handlers/SelectHandler.java | 157 +-
.../handlers/SolutionModifierHandler.java | 65 +-
.../arq/querybuilder/handlers/WhereHandler.java | 320 +-
.../querybuilder/rewriters/ElementRewriter.java | 4 +-
.../querybuilder/rewriters/ExprRewriter.java | 16 +-
.../jena/arq/AbstractRegexpBasedTest.java | 8 +-
.../querybuilder/AbstractQueryBuilderTest.java | 15 +
.../jena/arq/querybuilder/AskBuilderTest.java | 140 +
.../arq/querybuilder/ConstructBuilderTest.java | 144 +
.../arq/querybuilder/SelectBuilderTest.java | 229 +-
.../clauses/SolutionModifierTest.java | 182 +-
.../querybuilder/clauses/WhereClauseTest.java | 24 +-
.../handlers/SelectHandlerTest.java | 24 +-
.../handlers/SolutionModifierHandlerTest.java | 112 +-
.../querybuilder/handlers/WhereHandlerTest.java | 351 +-
jena-extras/pom.xml | 6 +-
jena-fuseki1/assembly-soh.xml | 2 +-
jena-fuseki1/pom.xml | 106 +-
.../apache/jena/fuseki/server/FusekiConfig.java | 2 +-
.../apache/jena/fuseki/servlets/HttpAction.java | 42 +-
.../java/org/apache/jena/fuseki/ServerTest.java | 22 +-
.../http/TestDatasetGraphAccessorHTTP.java | 30 +-
.../apache-jena-fuseki/assembly-dist.xml | 18 +-
jena-fuseki2/apache-jena-fuseki/bin/s-delete | 14 +-
jena-fuseki2/apache-jena-fuseki/bin/s-get | 14 +-
jena-fuseki2/apache-jena-fuseki/bin/s-head | 14 +-
jena-fuseki2/apache-jena-fuseki/bin/s-post | 14 +-
jena-fuseki2/apache-jena-fuseki/bin/s-put | 14 +-
jena-fuseki2/apache-jena-fuseki/bin/s-query | 14 +-
jena-fuseki2/apache-jena-fuseki/bin/s-update | 14 +-
.../apache-jena-fuseki/bin/s-update-form | 14 +-
jena-fuseki2/apache-jena-fuseki/bin/soh | 14 +-
jena-fuseki2/apache-jena-fuseki/pom.xml | 18 +-
jena-fuseki2/examples/fuseki-jetty-https.xml | 5 +-
jena-fuseki2/jena-fuseki-core/pom.xml | 147 +-
.../java/org/apache/jena/fuseki/Fuseki.java | 29 +-
.../org/apache/jena/fuseki/build/Builder.java | 35 +-
.../build/DatasetDescriptionRegistry.java | 69 +
.../apache/jena/fuseki/build/FusekiConfig.java | 61 +-
.../jena/fuseki/build/RefCountingMap.java | 185 +
.../org/apache/jena/fuseki/build/Template.java | 4 -
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 19 +-
.../apache/jena/fuseki/jetty/JettyFuseki.java | 37 +-
.../apache/jena/fuseki/mgt/ActionDatasets.java | 7 +-
.../jena/fuseki/server/DataAccessPoint.java | 19 +-
.../apache/jena/fuseki/server/DataService.java | 2 +-
.../apache/jena/fuseki/server/FusekiServer.java | 36 +-
.../server/FusekiServerEnvironmentInit.java | 11 +-
.../fuseki/server/FusekiServerListener.java | 5 +-
.../apache/jena/fuseki/server/RequestLog.java | 7 +-
.../jena/fuseki/server/ServerInitialConfig.java | 2 +
.../apache/jena/fuseki/servlets/ActionBase.java | 10 +-
.../fuseki/servlets/ActionErrorException.java | 14 +-
.../jena/fuseki/servlets/CrossOriginFilter.java | 2 +-
.../apache/jena/fuseki/servlets/HttpAction.java | 44 +-
.../jena/fuseki/servlets/REST_Quads_R.java | 15 +-
.../jena/fuseki/servlets/REST_Quads_RW.java | 3 +
.../jena/fuseki/servlets/ResponseDataset.java | 21 +-
.../jena/fuseki/servlets/SPARQL_GSP_R.java | 17 +-
.../fuseki/servlets/SPARQL_UberServlet.java | 98 +-
.../jena/fuseki/servlets/SPARQL_Update.java | 1 -
.../jena/fuseki/servlets/ServletBase.java | 5 +-
.../fuseki/validation/ValidatorBaseJson.java | 10 +-
.../src/main/webapp/css/yasqe.min.css | 2 +-
.../src/main/webapp/css/yasr.min.css | 2 +-
.../src/main/webapp/js/lib/qonsole.js | 17 +-
.../src/main/webapp/js/lib/yasqe.min.js | 14 +-
.../src/main/webapp/js/lib/yasqe.min.js.map | 2 +-
.../src/main/webapp/js/lib/yasr.min.js | 11 +-
.../src/main/webapp/js/lib/yasr.min.js.map | 2 +-
.../java/org/apache/jena/fuseki/FusekiTest.java | 16 +-
.../java/org/apache/jena/fuseki/ServerTest.java | 22 +-
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 3 +
.../apache/jena/fuseki/TestHttpOperations.java | 158 +
.../apache/jena/fuseki/build/TestBuilder.java | 66 +
.../http/TestDatasetGraphAccessorHTTP.java | 30 +-
jena-fuseki2/jena-fuseki-server/pom.xml | 18 +-
jena-fuseki2/jena-fuseki-war/pom.xml | 17 +-
jena-fuseki2/pom.xml | 4 +-
jena-iri/assembly.xml | 2 +-
jena-iri/pom.xml | 4 +-
.../java/org/apache/jena/iri/impl/IDNP.java | 2 +
jena-jdbc/jena-jdbc-core/pom.xml | 17 +-
.../AbstractJenaConnectionTests.java | 2 +-
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 20 +-
jena-jdbc/jena-jdbc-driver-mem/pom.xml | 6 +-
.../jdbc/mem/connections/MemConnection.java | 9 +-
.../mem/connections/TestDatasetConnection.java | 2 +-
.../metadata/TestDatasetConnectionMetadata.java | 16 +-
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 10 +-
jena-jdbc/jena-jdbc-driver-tdb/pom.xml | 10 +-
jena-jdbc/pom.xml | 4 +-
jena-maven-tools/pom.xml | 238 +-
.../jena/tools/schemagen/SchemagenMojo.java | 9 +-
.../jena/tools/schemagen/SchemagenMojoTest.java | 166 +-
jena-parent/pom.xml | 279 +-
jena-permissions/pom.xml | 4 +-
jena-sdb/Data/data.ttl | 68 +-
jena-sdb/Data/data2.ttl | 40 +-
jena-sdb/Reports/explain.rb | 58 +-
jena-sdb/Reports/format.rb | 82 +-
jena-sdb/Reports/jdbc.rb | 278 +-
jena-sdb/assembly.xml | 18 +-
jena-sdb/bin2/sdbscript | 18 +-
jena-sdb/pom.xml | 34 +-
.../src/main/java/org/apache/jena/sdb/SDB.java | 11 +-
.../jena/sdb/compiler/QueryCompilerMain.java | 2 +-
.../jena/sdb/compiler/QueryIterOpSQL.java | 43 +-
.../apache/jena/sdb/compiler/SDBCompile.java | 3 +-
.../org/apache/jena/sdb/compiler/SDB_QC.java | 20 -
.../org/apache/jena/sdb/core/SDBRequest.java | 13 +-
.../sdb/core/sqlnode/GenerateSQLVisitor.java | 2 +-
.../apache/jena/sdb/engine/QueryEngineSDB.java | 3 +-
.../apache/jena/sdb/exprmatch/ExprMatcher.java | 8 -
.../org/apache/jena/sdb/graph/GraphSDB.java | 246 +-
.../jena/sdb/layout2/LoaderTuplesNodes.java | 359 +-
.../apache/jena/sdb/layout2/NodeLayout2.java | 2 +-
.../main/java/org/apache/jena/sdb/sql/JDBC.java | 32 +-
.../org/apache/jena/sdb/store/DatabaseType.java | 7 +-
.../apache/jena/sdb/store/DatasetGraphSDB.java | 120 +-
.../java/org/apache/jena/sdb/store/LibSDB.java | 150 +
.../org/apache/jena/sdb/store/StoreFactory.java | 21 +-
.../org/apache/jena/sdb/util/StoreUtils.java | 11 +-
jena-sdb/src/main/java/sdb/cmd/CmdArgsDB.java | 8 -
jena-sdb/src/main/java/sdb/cmd/ModGraph.java | 7 +-
jena-sdb/src/main/java/sdb/sdbdump.java | 63 +-
jena-sdb/src/main/java/sdb/sdbload.java | 278 +-
jena-sdb/src/main/java/sdb/sdbupdate.java | 100 +
.../org/apache/jena/sdb/sdb-properties.xml | 18 +-
jena-shaded-guava/pom.xml | 22 +-
jena-spatial/pom.xml | 168 +-
.../jena/query/spatial/DatasetGraphSpatial.java | 30 +-
.../jena/query/spatial/DistanceUnitsUtils.java | 174 +-
.../query/spatial/SpatialDatasetFactory.java | 210 +-
.../jena/query/spatial/SpatialIndexContext.java | 206 +-
.../query/spatial/SpatialPredicatePair.java | 148 +-
.../spatial/SpatialPredicatePairValue.java | 218 +-
.../apache/jena/query/spatial/SpatialQuery.java | 9 +-
.../jena/query/spatial/SpatialValueUtil.java | 120 +-
.../pfunction/DirectionWithPointPFBase.java | 292 +-
.../query/spatial/pfunction/SpatialMatch.java | 134 +-
.../pfunction/SpatialOperationPFBase.java | 326 +-
.../SpatialOperationWithBoxPFBase.java | 328 +-
.../query/spatial/pfunction/library/EastPF.java | 88 +-
.../pfunction/library/IntersectsBoxPF.java | 70 +-
.../spatial/pfunction/library/IsNearByPF.java | 46 +-
.../pfunction/library/IsWithinBoxPF.java | 68 +-
.../pfunction/library/IsWithinCirclePF.java | 70 +-
.../spatial/pfunction/library/NorthPF.java | 90 +-
.../spatial/pfunction/library/SouthPF.java | 86 +-
.../query/spatial/pfunction/library/WestPF.java | 88 +-
.../AbstractTestIndexingSpatialData.java | 186 +-
.../TestIndexingSpatialDataWithLucene.java | 84 +-
.../TestIndexingSpatialDataWithSolr.java | 80 +-
.../spatial/TestSpatialPredicatePairValue.java | 118 +-
.../TestTDBDatasetWithLuceneSpatialIndex.java | 190 +-
.../spatial/pfunction/AbstractTestEastPF.java | 284 +-
.../pfunction/AbstractTestIntersectsBoxPF.java | 284 +-
.../pfunction/AbstractTestIsNearByPF.java | 670 ++--
.../pfunction/AbstractTestIsWithinBoxPF.java | 284 +-
.../pfunction/AbstractTestIsWithinCirclePF.java | 672 ++--
.../spatial/pfunction/AbstractTestNorthPF.java | 284 +-
.../spatial/pfunction/AbstractTestSouthPF.java | 284 +-
.../spatial/pfunction/AbstractTestWestPF.java | 282 +-
.../SolrHome/SolrARQCollection/conf/schema.xml | 112 +-
.../SolrARQCollection/conf/solrconfig.xml | 154 +-
.../src/test/resources/SolrHome/solr.xml | 14 +-
.../src/test/resources/geoarq-data-1.ttl | 172 +-
.../resources/spatial-config-spatialindexer.ttl | 104 +-
.../src/test/resources/spatial-config.ttl | 108 +-
.../src/test/resources/spatial-solr-config.ttl | 100 +-
jena-tdb/pom.xml | 16 +-
jena-tdb/src-examples/tdb/examples/ExTDB1.java | 102 +-
jena-tdb/src-examples/tdb/examples/ExTDB2.java | 86 +-
jena-tdb/src-examples/tdb/examples/ExTDB3.java | 132 +-
jena-tdb/src-examples/tdb/examples/ExTDB4.java | 120 +-
jena-tdb/src-examples/tdb/examples/ExTDB5.java | 140 +-
.../org/apache/jena/tdb/StoreConnection.java | 7 +
.../src/main/java/org/apache/jena/tdb/TDB.java | 9 +-
.../org/apache/jena/tdb/assembler/VocabTDB.java | 7 +-
.../jena/tdb/base/file/BlockAccessBase.java | 4 +-
.../jena/tdb/base/file/BlockAccessMem.java | 2 +-
.../jena/tdb/base/file/BufferAllocator.java | 86 +-
.../tdb/base/file/BufferAllocatorDirect.java | 92 +-
.../tdb/base/file/BufferAllocatorMapped.java | 290 +-
.../jena/tdb/base/file/BufferAllocatorMem.java | 92 +-
.../apache/jena/tdb/base/file/LocationLock.java | 30 +-
.../apache/jena/tdb/store/DatasetGraphTDB.java | 49 +-
.../jena/tdb/store/DatasetPrefixesTDB.java | 4 +-
.../org/apache/jena/tdb/store/GraphTDB.java | 30 -
.../tdb/store/bulkloader2/ProcIndexCopy.java | 4 +-
.../store/bulkloader2/ProcNodeTableBuilder.java | 8 +-
.../nodetupletable/NodeTupleTableConcrete.java | 2 -
.../java/org/apache/jena/tdb/sys/Session.java | 46 -
.../org/apache/jena/tdb/sys/TDBInternal.java | 38 +-
.../transaction/DatasetGraphTransaction.java | 48 +-
.../jena/tdb/transaction/DatasetGraphTxn.java | 74 +-
.../jena/tdb/transaction/NodeTableTrans.java | 3 +-
.../tdb/transaction/TransactionManager.java | 178 +-
.../test/java/org/apache/jena/tdb/TC_TDB.java | 9 +-
.../jena/tdb/assembler/TS_TDBAssembler.java | 4 +-
.../jena/tdb/extra/T_QuadsObjectIsNull.java | 220 +-
.../jena/tdb/extra/T_TimeoutTDBPattern.java | 224 +-
.../tdb/graph/TestDatasetGraphAccessorTDB.java | 22 +-
.../tdb/store/AbstractStoreConnections.java | 115 +-
.../jena/tdb/transaction/TS_TransactionTDB.java | 2 +
.../jena/tdb/transaction/TestMiscTDB.java | 32 +
.../jena/tdb/transaction/TestTDBInternal.java | 133 +
.../tdb/transaction/TestTransactionTDB.java | 35 +-
.../transaction/TestTransactionUnionGraph.java | 15 +-
.../testing/Assembler/tdb-dataset-embed.ttl | 4 -
jena-tdb/testing/Assembler/tdb-dataset.ttl | 2 -
jena-tdb/testing/Assembler/tdb-graph-embed.ttl | 4 -
.../testing/Assembler/tdb-graph-ref-dataset.ttl | 2 -
jena-tdb/testing/Assembler/tdb-graph.ttl | 2 -
.../testing/Assembler/tdb-named-graph-1.ttl | 2 -
.../testing/Assembler/tdb-named-graph-2.ttl | 2 -
jena-text/pom.xml | 155 +-
jena-text/src/main/java/jena/textindexer.java | 7 +
.../jena/query/text/DatasetGraphText.java | 28 +-
.../apache/jena/query/text/TextIndexConfig.java | 9 +
.../apache/jena/query/text/TextIndexLucene.java | 34 +-
.../query/text/TextIndexLuceneMultilingual.java | 4 +-
.../org/apache/jena/query/text/TextQuery.java | 9 +-
.../apache/jena/query/text/TextQueryFuncs.java | 12 +-
.../org/apache/jena/query/text/TextQueryPF.java | 10 +-
.../assembler/TextIndexLuceneAssembler.java | 12 +
.../jena/query/text/assembler/TextVocab.java | 1 +
.../text/AbstractTestDatasetWithAnalyzer.java | 111 +
.../org/apache/jena/query/text/TS_Text.java | 6 +-
.../TestDatasetWithAnalyzingQueryParser.java | 64 +
...TestDatasetWithComplexPhraseQueryParser.java | 67 +
.../text/TestDatasetWithKeywordAnalyzer.java | 77 +-
...DatasetWithLuceneTextIndexWithLangField.java | 28 +
.../text/TestLuceneWithMultipleThreads.java | 55 +-
.../org/apache/jena/query/text/TestTextTDB.java | 59 +
pom.xml | 50 +-
1341 files changed, 59892 insertions(+), 51940 deletions(-)
----------------------------------------------------------------------
[10/10] jena git commit: JENA-1229: Integrate into ARQ tests.
Posted by an...@apache.org.
JENA-1229: Integrate into ARQ tests.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9d5f675a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9d5f675a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9d5f675a
Branch: refs/heads/master
Commit: 9d5f675a87f522067f0a4ec92f50dfb187824715
Parents: 0aff0e6
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 5 13:22:28 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 5 13:22:28 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/engine/iterator/QueryIter2.java | 1 +
.../jena/sparql/engine/iterator/QueryIterDistinct.java | 2 +-
.../org/apache/jena/sparql/engine/iterator/QueryIterSub.java | 2 +-
.../jena/sparql/engine/iterator/TS_QueryIterators.java | 1 +
.../jena/sparql/engine/iterator/TestCancelDistinct.java | 8 ++++----
5 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
index ba5118e..a3cb674 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
@@ -57,6 +57,7 @@ public abstract class QueryIter2 extends QueryIter
protected final
void requestCancel()
{
+ requestSubCancel() ;
performRequestCancel(leftInput) ;
performRequestCancel(rightInput) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
index 1860226..4b7d82d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
@@ -43,7 +43,7 @@ import org.apache.jena.sparql.engine.binding.BindingProjectNamed ;
public class QueryIterDistinct extends QueryIter1
{
private long memThreshold = Long.MAX_VALUE ; // Default "off" value.
- protected DistinctDataBag<Binding> db = null ;
+ /*package*/ DistinctDataBag<Binding> db = null ;
private Iterator<Binding> iterator = null ;
private Set<Binding> seen = new HashSet<>() ;
private Binding slot = null ;
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
index e6d74e7..cfc9913 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
@@ -23,7 +23,7 @@ import org.apache.jena.sparql.engine.QueryIterator ;
/**
* This class supports a QueryIter that uses a single sub iterator.
- * Unlike QueryIter1, it's assumes the subiterator will be reset and manipulated.
+ * Unlike QueryIter1, it assumes the subiterator will be reset and manipulated.
*/
public abstract class QueryIterSub extends QueryIter
{
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
index d0eb2ac..3a3cd35 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
@@ -27,6 +27,7 @@ import org.junit.runners.Suite ;
, TestDistinctMem.class
, TestDistinctDataBag.class
, TestDistinctDataBagLimited.class
+ , TestCancelDistinct.class
})
public class TS_QueryIterators {
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
index 4ade0ea..2300197 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
@@ -92,9 +92,9 @@ public class TestCancelDistinct {
QueryIteratorBase base = new MockQueryIterator();
QueryIterDistinct d = new QueryIterDistinct(base, c);
- assertFalse(base.requestingCancel);
+ assertFalse(base.getRequestingCancel());
d.cancel();
- assertTrue(base.requestingCancel);
+ assertTrue(base.getRequestingCancel());
}
final Context params = new Context();
@@ -122,9 +122,9 @@ public class TestCancelDistinct {
assertNotNull(d.db);
DistinctDataBag<Binding> db = d.db;
- assertFalse(base.requestingCancel);
+ assertFalse(base.getRequestingCancel());
d.cancel();
- assertTrue(base.requestingCancel);
+ assertTrue(base.getRequestingCancel());
}
[02/10] jena git commit: Merge https://github.com/apache/jena
Posted by an...@apache.org.
Merge https://github.com/apache/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/18d28f5f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/18d28f5f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/18d28f5f
Branch: refs/heads/master
Commit: 18d28f5f77ba1273471b2bc82573c7aae2f42115
Parents: c88e008 e3c6a0b
Author: Chris Dollin <eh...@googlemail.com>
Authored: Wed Aug 31 14:22:13 2016 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Wed Aug 31 14:22:13 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/json/JSON.java | 117 +++--
.../org/apache/jena/atlas/json/JsonArray.java | 86 ++--
.../org/apache/jena/atlas/json/JsonBuilder.java | 6 +-
.../org/apache/jena/atlas/json/JsonObject.java | 75 ++-
.../jena/query/ParameterizedSparqlString.java | 5 +
.../org/apache/jena/riot/out/JsonLDWriter.java | 1 -
.../riot/system/FastAbbreviatingPrefixMap.java | 7 +
.../apache/jena/riot/system/IRIResolver.java | 2 +-
.../org/apache/jena/riot/system/PrefixMap.java | 5 +
.../jena/riot/system/PrefixMapExtended.java | 7 +
.../apache/jena/riot/system/PrefixMapNull.java | 61 +--
.../apache/jena/riot/system/PrefixMapStd.java | 5 +
.../jena/riot/system/PrefixMapWrapper.java | 4 +
.../apache/jena/sparql/algebra/OpVisitor.java | 4 +-
.../apache/jena/sparql/algebra/op/OpFilter.java | 100 ++--
.../jena/sparql/algebra/optimize/Optimize.java | 289 ++---------
.../sparql/algebra/optimize/OptimizeStd.java | 293 +++++++++++
.../sparql/algebra/optimize/RewriteFactory.java | 27 +
.../optimize/TransformEliminateAssignments.java | 2 +-
.../algebra/optimize/TransformExpandOneOf.java | 2 +-
.../optimize/TransformFilterDisjunction.java | 2 +-
.../optimize/TransformFilterEquality.java | 4 +-
.../optimize/TransformFilterImplicitJoin.java | 4 +-
.../optimize/TransformFilterInequality.java | 4 +-
.../optimize/TransformFilterPlacement.java | 14 +-
.../algebra/optimize/TransformJoinStrategy.java | 2 +-
.../algebra/walker/ApplyTransformVisitor.java | 30 +-
.../apache/jena/sparql/core/DatasetGraph.java | 4 +-
.../sparql/core/DatasetGraphTrackActive.java | 2 +-
.../jena/sparql/core/DatasetGraphWrapper.java | 76 +--
.../apache/jena/sparql/core/DatasetImpl.java | 10 +-
.../jena/sparql/core/DatasetPrefixStorage.java | 5 +-
.../org/apache/jena/sparql/core/Substitute.java | 2 +-
.../apache/jena/sparql/core/Transactional.java | 6 +-
.../jena/sparql/core/TransactionalLock.java | 5 -
.../sparql/core/mem/DatasetGraphInMemory.java | 1 +
.../core/mem/DatasetPrefixStorageInMemory.java | 5 +
.../sparql/engine/http/QueryEngineHTTP.java | 11 +-
.../org/apache/jena/sparql/expr/ExprList.java | 2 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 4 +-
.../jena/sparql/graph/NodeTransformOp.java | 2 +-
.../jena/sparql/resultset/ResultSetWrapper.java | 72 +++
.../jena/sparql/sse/builders/BuilderOp.java | 2 +-
.../syntaxtransform/QueryTransformOps.java | 27 +-
.../apache/jena/sparql/util/PrefixMapping2.java | 7 +
.../org/apache/jena/system/ThreadAction.java | 140 +++++
.../java/org/apache/jena/system/ThreadTxn.java | 134 ++---
.../java/org/apache/jena/system/TxnCounter.java | 2 +-
.../org/apache/jena/atlas/json/TestJson.java | 66 ++-
.../algebra/optimize/TestTransformFilters.java | 27 +
.../org/apache/jena/sparql/api/TestAPI.java | 23 +-
.../apache/jena/sparql/expr/TestNodeValue.java | 52 +-
.../sparql/modify/TestUpdateOperations.java | 4 +-
.../java/org/apache/jena/system/TS_System.java | 1 +
.../apache/jena/system/TestThreadAction.java | 140 +++++
.../org/apache/jena/system/TestTxnThread.java | 14 +-
.../apache/jena/atlas/io/IndentedWriter.java | 197 ++++---
.../java/org/apache/jena/atlas/lib/Trie.java | 15 +
.../org/apache/jena/atlas/logging/LogCtl.java | 144 +++---
.../logging/java/ConsoleHandlerStdout.java | 59 +--
.../logging/java/ConsoleHandlerStream.java | 117 +++++
.../jena/atlas/logging/java/FlatFormatter.java | 45 ++
.../jena/atlas/logging/java/FlatHandler.java | 45 ++
.../jena/atlas/logging/java/TextFormatter.java | 89 +++-
.../jena/atlas/io/TestIndentedWriter.java | 71 ++-
.../org/apache/jena/atlas/lib/TestTrie.java | 16 +
jena-cmds/src/main/java/arq/qparse.java | 2 +-
.../src/main/java/tdb/cmdline/CmdTDBGraph.java | 9 +-
jena-cmds/src/main/java/tdb/tdbloader.java | 6 +-
.../compose/PolyadicPrefixMappingImpl.java | 7 +
.../apache/jena/rdf/model/impl/ModelCom.java | 7 +
.../org/apache/jena/shared/PrefixMapping.java | 6 +
.../jena/shared/impl/PrefixMappingImpl.java | 17 +-
.../test/TestGenericRuleReasonerConfig.java | 15 +-
.../jena/shared/AbstractTestPrefixMapping.java | 17 +
.../arq/querybuilder/rewriters/OpRewriter.java | 2 +-
jena-fuseki2/apache-jena-fuseki/fuseki | 9 +-
.../java/org/apache/jena/fuseki/Fuseki.java | 2 -
.../org/apache/jena/fuseki/FusekiLogging.java | 19 +-
.../org/apache/jena/fuseki/build/Builder.java | 157 ------
.../apache/jena/fuseki/build/FusekiBuilder.java | 166 ++++++
.../apache/jena/fuseki/build/FusekiConfig.java | 21 +-
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 24 +-
.../jena/fuseki/jetty/FusekiErrorHandler.java | 6 +-
.../jena/fuseki/jetty/FusekiErrorHandler1.java | 57 +++
.../jena/fuseki/jetty/JettyServerConfig.java | 15 +-
.../org/apache/jena/fuseki/mgt/ActionCtl.java | 3 +-
.../apache/jena/fuseki/mgt/ActionDatasets.java | 18 +-
.../jena/fuseki/mgt/ActionServerStatus.java | 6 +-
.../org/apache/jena/fuseki/mgt/ActionStats.java | 62 +--
.../apache/jena/fuseki/mgt/JsonDescription.java | 2 +-
.../fuseki/server/DataAccessPointRegistry.java | 43 +-
.../apache/jena/fuseki/server/FusekiEnv.java | 4 +-
.../apache/jena/fuseki/server/FusekiServer.java | 31 +-
.../server/FusekiServerEnvironmentInit.java | 5 +-
.../fuseki/server/FusekiServerListener.java | 21 +-
.../apache/jena/fuseki/server/FusekiVocab.java | 10 +-
.../fuseki/server/ShiroEnvironmentLoader.java | 4 +-
.../apache/jena/fuseki/servlets/ActionLib.java | 4 +-
.../jena/fuseki/servlets/ActionSPARQL.java | 2 +-
.../jena/fuseki/servlets/FusekiFilter.java | 9 +-
.../apache/jena/fuseki/servlets/HttpAction.java | 14 +-
.../apache/jena/fuseki/servlets/SPARQL_GSP.java | 9 +-
.../jena/fuseki/servlets/SPARQL_GSP_R.java | 4 +-
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 15 +-
.../jena/fuseki/servlets/SPARQL_Query.java | 13 +-
.../fuseki/servlets/SPARQL_UberServlet.java | 24 +-
.../org/apache/jena/fuseki/log4j.properties | 1 -
.../java/org/apache/jena/fuseki/ServerTest.java | 1 -
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 24 +-
.../java/org/apache/jena/fuseki/TestAuth.java | 6 +-
.../apache/jena/fuseki/build/TestBuilder.java | 8 +-
jena-fuseki2/jena-fuseki-embedded/pom.xml | 131 +++++
.../fuseki/embedded/FusekiEmbeddedServer.java | 305 +++++++++++
.../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 49 ++
.../fuseki/embedded/TestEmbeddedFuseki.java | 269 ++++++++++
.../testing/FusekiEmbedded/config.ttl | 18 +
jena-fuseki2/pom.xml | 1 +
.../jdbc/results/AbstractResultSetTests.java | 6 +-
.../tdb/results/AbstractTdbResultSetTests.java | 2 +-
.../jdbc/tdb/results/TestTdbDiskResultSets.java | 97 +++-
.../graph/impl/SecuredPrefixMappingImpl.java | 7 +
.../model/impl/SecuredModelImpl.java | 18 +-
.../permissions/query/rewriter/OpRewriter.java | 2 +-
.../jena/permissions/MockPrefixMapping.java | 6 +
.../apache/jena/sdb/layout2/QueryCompiler2.java | 2 +-
.../jena/query/spatial/DatasetGraphSpatial.java | 16 +-
.../java/org/apache/jena/tdb/TDBLoader.java | 36 +-
.../tdb/base/file/BufferAllocatorDirect.java | 16 +-
.../apache/jena/tdb/solver/OpExecutorTDB1.java | 20 +-
.../apache/jena/tdb/store/DatasetGraphTDB.java | 25 +-
.../tdb/store/DatasetPrefixStorageLogger.java | 6 +
.../jena/tdb/store/DatasetPrefixesTDB.java | 21 +-
.../apache/jena/tdb/store/GraphNonTxnTDB.java | 49 ++
.../org/apache/jena/tdb/store/GraphTDB.java | 188 ++-----
.../org/apache/jena/tdb/store/GraphTxnTDB.java | 63 +++
.../transaction/DatasetGraphTransaction.java | 39 ++
.../jena/tdb/transaction/DatasetGraphTxn.java | 2 +-
.../jena/tdb/transaction/Transaction.java | 20 +-
.../tdb/transaction/TransactionManager.java | 512 ++++++++++---------
.../jena/tdb/assembler/TestTDBAssembler.java | 4 +-
.../org/apache/jena/tdb/store/TestLoader.java | 6 +-
.../transaction/AbstractTestNodeTableTrans.java | 2 +-
.../AbstractTestObjectFileTrans.java | 2 +-
.../jena/tdb/transaction/TS_TransactionTDB.java | 2 +
.../jena/tdb/transaction/TestTransControl.java | 213 ++++++++
.../jena/tdb/transaction/TestTransPromote.java | 394 ++++++++++++++
.../tdb/transaction/TestTransactionTDB.java | 10 +
.../jena/query/text/DatasetGraphText.java | 12 +-
...TestDatasetWithComplexPhraseQueryParser.java | 9 +-
.../text/TestDatasetWithKeywordAnalyzer.java | 1 +
151 files changed, 4431 insertions(+), 1859 deletions(-)
----------------------------------------------------------------------
[08/10] jena git commit: JENA-1229: Cancellation is on another
thread. Leave to close().
Posted by an...@apache.org.
JENA-1229: Cancellation is on another thread. Leave to close().
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1c39de90
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1c39de90
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1c39de90
Branch: refs/heads/master
Commit: 1c39de9032743094b10bc8ce52990a93971c5ea8
Parents: 68bf345
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 5 13:21:18 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 5 13:21:18 2016 +0100
----------------------------------------------------------------------
.../jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java | 2 +-
.../jena/sparql/engine/iterator/QueryIterDistinctReduced.java | 3 +--
.../apache/jena/sparql/engine/join/AbstractIterHashJoin.java | 6 ++----
3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1c39de90/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
index 755b1bb..50a2b6a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
@@ -46,7 +46,7 @@ public abstract class QueryIter2LoopOnLeft extends QueryIter2
@Override
protected void requestSubCancel()
- { tableRight.close() ; }
+ { }
@Override
protected final boolean hasNextBinding()
http://git-wip-us.apache.org/repos/asf/jena/blob/1c39de90/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
index 0824b5b..7921f02 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
@@ -37,10 +37,9 @@ public abstract class QueryIterDistinctReduced extends QueryIter1
protected void closeSubIterator()
{ slot = null ; }
- // Subclasses may want to implement this as well.
@Override
protected void requestSubCancel()
- { closeSubIterator() ; }
+ { }
@Override
final
http://git-wip-us.apache.org/repos/asf/jena/blob/1c39de90/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
index 11701e1..730d772 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
@@ -233,10 +233,8 @@ public abstract class AbstractIterHashJoin extends QueryIter2 {
}
@Override
- protected void requestSubCancel() {
- iterStream.close() ;
- hashTable.clear();
- }
+ protected void requestSubCancel()
+ { }
}
[07/10] jena git commit: JENA-1229:Merge commit 'refs/pull/166/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1229:Merge commit 'refs/pull/166/head' of github.com:apache/jena
This closes #166.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/68bf3456
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/68bf3456
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/68bf3456
Branch: refs/heads/master
Commit: 68bf3456d2558258490afba3cc35d8ff2cd2ef14
Parents: 1d74468 bcb20c6
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 5 13:11:33 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 5 13:11:33 2016 +0100
----------------------------------------------------------------------
.../apache/jena/atlas/data/SortedDataBag.java | 8 +
.../engine/iterator/QueryIterDistinct.java | 7 +-
.../engine/iterator/QueryIteratorBase.java | 7 +-
.../engine/iterator/TestCancelDistinct.java | 157 +++++++++++++++++++
4 files changed, 175 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[05/10] jena git commit: Add licence
Posted by an...@apache.org.
Add licence
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bcb20c64
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bcb20c64
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bcb20c64
Branch: refs/heads/master
Commit: bcb20c6439c531ad133e925ec184ce56422cc84d
Parents: ed7bbb6
Author: chris dollin <eh...@gmail.com>
Authored: Fri Sep 2 15:59:08 2016 +0100
Committer: chris dollin <eh...@gmail.com>
Committed: Fri Sep 2 15:59:08 2016 +0100
----------------------------------------------------------------------
.../sparql/engine/iterator/TestCancelDistinct.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bcb20c64/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
index 7774d3b..4ade0ea 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
@@ -1,3 +1,20 @@
+/**
+ * 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.jena.sparql.engine.iterator;
import static org.junit.Assert.*;
[04/10] jena git commit: Added some QueryIterDistinct tests:
Posted by an...@apache.org.
Added some QueryIterDistinct tests:
- that cancelling a QID cancels its base iterator
- likewise if we're serialising to disc
- closing an unbagged QID doesn't make a bag
- closing a bagged QID closes the bag
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ed7bbb65
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ed7bbb65
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ed7bbb65
Branch: refs/heads/master
Commit: ed7bbb65ae2af16c63bc0b6a70be9eb712d38d85
Parents: efd4dfd
Author: Chris Dollin <eh...@googlemail.com>
Authored: Thu Sep 1 15:04:33 2016 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Thu Sep 1 15:04:33 2016 +0100
----------------------------------------------------------------------
.../apache/jena/atlas/data/SortedDataBag.java | 8 ++
.../engine/iterator/QueryIterDistinct.java | 5 +-
.../engine/iterator/QueryIteratorBase.java | 7 +-
.../engine/iterator/TestCancelDistinct.java | 140 +++++++++++++++++++
4 files changed, 157 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ed7bbb65/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
index 26ba388..1728129 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
@@ -103,6 +103,14 @@ public class SortedDataBag<E> extends AbstractDataBag<E> {
public boolean isCancelled() {
return comparator.cancelled;
}
+
+ /**
+ * isClosed returns true iff this bag has been closed.
+ * (Used in testing.)
+ */
+ public boolean isClosed() {
+ return closed;
+ }
protected void checkClosed() {
if (closed)
http://git-wip-us.apache.org/repos/asf/jena/blob/ed7bbb65/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
index ee088ec..1860226 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
@@ -43,7 +43,7 @@ import org.apache.jena.sparql.engine.binding.BindingProjectNamed ;
public class QueryIterDistinct extends QueryIter1
{
private long memThreshold = Long.MAX_VALUE ; // Default "off" value.
- private DistinctDataBag<Binding> db = null ;
+ protected DistinctDataBag<Binding> db = null ;
private Iterator<Binding> iterator = null ;
private Set<Binding> seen = new HashSet<>() ;
private Binding slot = null ;
@@ -141,6 +141,9 @@ public class QueryIterDistinct extends QueryIter1
db = null ;
}
+ // We don't need to do anything. We're a QueryIter1
+ // and that handles the cancellation of the wrapped
+ // iterator.
@Override
protected void requestSubCancel()
{ }
http://git-wip-us.apache.org/repos/asf/jena/blob/ed7bbb65/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
index dee0661..7c1f836 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
@@ -52,8 +52,11 @@ public abstract class QueryIteratorBase
// ONLY the requestingCancel variable needs to be volatile. The abortIterator is guaranteed to
// be visible because it is written to before requestingCancel, and read from after.
- /** In the process of requesting a cancel, or one has been done */
- private volatile boolean requestingCancel = false;
+ /**
+ In the process of requesting a cancel, or one has been done.
+ `protected` to allow tests to read it.
+ */
+ protected volatile boolean requestingCancel = false;
/* If set, any hasNext/next throws QueryAbortedException
* In normal operation, this is the same setting as requestingCancel.
http://git-wip-us.apache.org/repos/asf/jena/blob/ed7bbb65/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
new file mode 100644
index 0000000..7774d3b
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
@@ -0,0 +1,140 @@
+package org.apache.jena.sparql.engine.iterator;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.jena.atlas.data.DistinctDataBag;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.query.ARQ;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.engine.ExecutionContext;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.engine.binding.BindingFactory;
+import org.apache.jena.sparql.engine.main.OpExecutorFactory;
+import org.apache.jena.sparql.serializer.SerializationContext;
+import org.apache.jena.sparql.util.Context;
+import org.junit.Test;
+
+public class TestCancelDistinct {
+
+ private final class MockQueryIterator extends QueryIteratorBase {
+
+ Iterator<Binding> bindings;
+
+ MockQueryIterator() {
+ this(new ArrayList<Binding>());
+ }
+
+ MockQueryIterator(Binding ... bindings) {
+ this(Arrays.asList(bindings));
+ }
+
+ MockQueryIterator(List<Binding> bindings) {
+ this.bindings = bindings.iterator();
+ }
+
+ @Override
+ public void output(IndentedWriter out, SerializationContext sCxt) {
+
+ }
+
+ @Override
+ protected boolean hasNextBinding() {
+ return bindings.hasNext();
+ }
+
+ @Override
+ protected Binding moveToNextBinding() {
+ return bindings.next();
+ }
+
+ @Override
+ protected void closeIterator() {
+
+ }
+
+ @Override
+ protected void requestCancel() {
+
+ }
+ }
+
+ /**
+ test that of a QueryIterDistinct is cancelled, so is the
+ iterator that it wraps.
+ */
+ @Test public void testUnbaggedCancelPropagates() {
+ // Something better than null would be good. But making
+ // an ExecutionContext is non-trivial.
+ ExecutionContext c = null;
+ QueryIteratorBase base = new MockQueryIterator();
+
+ QueryIterDistinct d = new QueryIterDistinct(base, c);
+ assertFalse(base.requestingCancel);
+ d.cancel();
+ assertTrue(base.requestingCancel);
+ }
+
+ final Context params = new Context();
+
+ final Graph activeGraph = null;
+ final DatasetGraph dataset = null;
+ final OpExecutorFactory factory = null;
+
+ final ExecutionContext c = new ExecutionContext(params, activeGraph, dataset, factory);
+
+ /**
+ test that of a QueryIterDistinct with an active databag is
+ cancelled, so is the iterator that it wraps.
+ */
+ @Test public void testBaggedCancelPropagates() {
+ params.set(ARQ.spillToDiskThreshold, 0);
+
+ QueryIteratorBase base = new MockQueryIterator(BindingFactory.create());
+ QueryIterDistinct d = new QueryIterDistinct(base, c);
+
+ assertNull(d.db);
+
+ Binding b = d.next();
+
+ assertNotNull(d.db);
+ DistinctDataBag<Binding> db = d.db;
+
+ assertFalse(base.requestingCancel);
+ d.cancel();
+ assertTrue(base.requestingCancel);
+
+ }
+
+ @Test public void testCloseWhenNoBag() {
+ params.set(ARQ.spillToDiskThreshold, 0);
+
+ QueryIteratorBase base = new MockQueryIterator(BindingFactory.create());
+ QueryIterDistinct d = new QueryIterDistinct(base, c);
+
+ // when there is no databag, close leaves it null
+ assertNull(d.db);
+ d.close();
+ assertNull(d.db);
+ }
+
+ @Test public void testCloseWhenBagPresent() {
+ params.set(ARQ.spillToDiskThreshold, 0);
+
+ QueryIteratorBase base = new MockQueryIterator(BindingFactory.create());
+ QueryIterDistinct d = new QueryIterDistinct(base, c);
+
+ assertNull(d.db);
+ Binding ignored = d.next();
+ assertNotNull(d.db);
+ DistinctDataBag<Binding> bag = d.db;
+ d.close();
+ assertTrue(bag.isClosed());
+ assertNull(d.db);
+ }
+}
[09/10] jena git commit: JENA-1229: Provide package visible accessor
for tests.
Posted by an...@apache.org.
JENA-1229: Provide package visible accessor for tests.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0aff0e6d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0aff0e6d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0aff0e6d
Branch: refs/heads/master
Commit: 0aff0e6d42404e62c87a8fc0b0b8086fe00a7cd3
Parents: 1c39de9
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 5 13:21:51 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 5 13:21:51 2016 +0100
----------------------------------------------------------------------
.../jena/sparql/engine/iterator/QueryIteratorBase.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0aff0e6d/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
index 7c1f836..6401f11 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
@@ -52,11 +52,7 @@ public abstract class QueryIteratorBase
// ONLY the requestingCancel variable needs to be volatile. The abortIterator is guaranteed to
// be visible because it is written to before requestingCancel, and read from after.
- /**
- In the process of requesting a cancel, or one has been done.
- `protected` to allow tests to read it.
- */
- protected volatile boolean requestingCancel = false;
+ private volatile boolean requestingCancel = false;
/* If set, any hasNext/next throws QueryAbortedException
* In normal operation, this is the same setting as requestingCancel.
@@ -90,6 +86,10 @@ public abstract class QueryIteratorBase
/** Propagates the cancellation request - called asynchronously with the iterator itself */
protected abstract void requestCancel();
+ /* package */ boolean getRequestingCancel() {
+ return requestingCancel ;
+ }
+
// -------- The contract with the subclasses
protected boolean isFinished() { return finished ; }
[03/10] jena git commit: Address Jena-1229,
fuseki timeouts not working properly with DISTINCT.
Posted by an...@apache.org.
Address Jena-1229, fuseki timeouts not working properly with DISTINCT.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/efd4dfd7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/efd4dfd7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/efd4dfd7
Branch: refs/heads/master
Commit: efd4dfd7025ee26b40289b77067f5e164729fd57
Parents: 18d28f5
Author: Chris Dollin <eh...@googlemail.com>
Authored: Wed Aug 31 14:57:00 2016 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Wed Aug 31 14:57:00 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/efd4dfd7/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
index d373ce6..ee088ec 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
@@ -143,6 +143,6 @@ public class QueryIterDistinct extends QueryIter1
@Override
protected void requestSubCancel()
- { super.close(); }
+ { }
}
[06/10] jena git commit: Exclude slf4j-jul bridge.
Posted by an...@apache.org.
Exclude slf4j-jul bridge.
The dependency jena-fuseki-core may change.
This protects against that.
Expand comment.
Remove example logging dependencies.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1d744688
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1d744688
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1d744688
Branch: refs/heads/master
Commit: 1d7446882575851d840d2b5ea285d38573638c9c
Parents: 26958bb
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Sep 4 18:34:09 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Sep 4 18:34:09 2016 +0100
----------------------------------------------------------------------
jena-fuseki2/jena-fuseki-embedded/pom.xml | 41 ++++++++------------------
1 file changed, 13 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1d744688/jena-fuseki2/jena-fuseki-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/pom.xml b/jena-fuseki2/jena-fuseki-embedded/pom.xml
index 58429a1..4bd4e99 100644
--- a/jena-fuseki2/jena-fuseki-embedded/pom.xml
+++ b/jena-fuseki2/jena-fuseki-embedded/pom.xml
@@ -39,8 +39,10 @@
<version>2.4.1-SNAPSHOT</version>
<!-- No specific logging - leave to the application -->
<exclusions>
-
- <!-- Parts of Jena not needed but picked up via jena-fuseki-core -->
+ <!-- Parts of Jena not needed but picked up via jena-fuseki-core.
+ The application can put back any of these if it wants to use
+ them, e.g. a text-indexed dataset, providing the version is compatible.
+ -->
<exclusion>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
@@ -53,8 +55,11 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-spatial</artifactId>
</exclusion>
-
- <!-- Exclude choice of logging. Application responsibility. -->
+ <!-- Jena use SLF4J as its API. Exclude any logging bindings picked up via Jena.
+ For example, jena-fuseki-core has logging output and so some logging provider.
+ For embedded use, it is the enclosing application that chooses the kind of
+ logging system.
+ -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -63,33 +68,13 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
-
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <!-- Logging examples -->
- <!-- java.util.logging.
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.7.21</version>
- </dependency>
- -->
-
- <!-- Log4j : need 2 dependencies.
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.21</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- -->
-
</dependencies>
<build>