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 2021/04/22 18:10:19 UTC
[jena] branch main updated (0ecfcc0 -> e41904e)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git.
from 0ecfcc0 Merge pull request #987 from afs/jena-2094-iri-2
new 3d33b39 Allow ja:data for external content
new c72398e Protect system initialization
new 980dc18 Cleanup
new d989ec4 JENA-2082: Single test manifest runner.
new 49dc227 JENA-2090: Add Graph.stream
new 3599d36 JENA-2091: Add methods Graph.add(s,p,o) and .delete(s,p,o)
new d2a1806 JENA-2088: Quad execution, node Solver and code rework
new e41904e Merge pull request #984 from afs/jena2088-solver
The 9027 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../examples/bgpmatching/StageGeneratorAlt.java | 12 +-
.../arq/examples/propertyfunction/localname.java | 2 +-
.../arq/examples/riot/ExRIOT6_AddNewReader.java | 18 +-
.../main/java/org/apache/jena/query/BIOInput.java | 6 +-
.../org/apache/jena/riot/RDFParserRegistry.java | 24 --
.../jena/riot/adapters/AdapterFileManager.java | 1 +
.../jena/riot/process/StreamRDFApplyObject.java | 11 +-
.../riot/process/normalize/NormalizeValue.java | 49 ++--
.../riot/resultset/rw/ResultSetReaderJSON.java | 2 +-
.../jena/sparql/algebra/op/OpQuadPattern.java | 120 +++++-----
.../apache/jena/sparql/algebra/table/TableN.java | 4 +-
.../jena/sparql/engine/ExecutionContext.java | 33 ++-
.../jena/sparql/engine/QueryEngineFactory.java | 50 ++--
.../jena/sparql/engine/QueryEngineRegistry.java | 127 +++++------
.../jena/sparql/engine/binding/BindingUtils.java | 2 +
.../jena/sparql/engine/iterator}/Abortable.java | 4 +-
.../jena/sparql/engine/iterator/IterAbortable.java | 57 +++++
.../sparql/engine/iterator/QueryIterAbortable.java | 28 +--
.../engine/iterator/QueryIterBlockTriples.java | 17 +-
.../engine/iterator/QueryIterBlockTriplesStar.java | 30 ++-
.../engine/iterator/QueryIterPlainWrapper.java | 59 ++---
.../engine/iterator/QueryIterTriplePattern.java | 7 +-
.../engine/iterator/QueryIteratorCaching.java | 19 +-
.../sparql/engine/iterator/QueryIteratorCopy.java | 2 +-
.../org/apache/jena/sparql/engine/join/Join.java | 38 +--
.../engine/join/QueryIterHashLeftJoin_Left.java | 2 +-
.../apache/jena/sparql/engine/main/OpExecutor.java | 6 +-
.../org/apache/jena/sparql/engine/main/QC.java | 62 ++---
.../jena/sparql/engine/main/StageBuilder.java | 43 +---
.../sparql/engine/main/StageGeneratorGeneric.java | 28 +--
.../engine/main/StageGeneratorGenericStar.java | 58 +----
.../sparql/engine/main/solver/OpExecutorQuads.java | 43 ++++
.../engine/main/solver/PatternMatchData.java | 108 +++++++++
.../engine/{iterator => main/solver}/RX_PG.java | 6 +-
.../jena/sparql/engine/main/solver/SolverLib.java | 115 ++++++++++
.../RX.java => main/solver/SolverRX3.java} | 117 +++-------
.../RX.java => main/solver/SolverRX4.java} | 127 ++++-------
.../sparql/engine/main/solver/StageMatchData.java | 188 +++++++++++++++
.../engine/main/solver/StageMatchTriple.java | 98 ++++++++
.../jena/sparql/engine/ref/EvaluatorDispatch.java | 6 +-
.../jena/sparql/engine/ref/EvaluatorSimple.java | 2 +-
.../jena/sparql/engine/ref/QueryEngineRef.java | 2 +-
.../sparql/engine/ref/{Eval.java => RefEval.java} | 124 ++--------
.../apache/jena/sparql/engine/ref/TableJoin.java | 2 +-
.../apache/jena/sparql/expr/ExprAggregator.java | 48 ++--
.../org/apache/jena/sparql/expr/NodeValue.java | 3 +-
.../jena/sparql/expr/nodevalue/NodeFunctions.java | 52 ++---
.../org/apache/jena/sparql/graph/GraphOps.java | 16 +-
.../java/org/apache/jena/sparql/path/PathLib.java | 2 +-
.../jena/sparql/pfunction/library/container.java | 5 +-
.../jena/sparql/pfunction/library/listIndex.java | 2 +-
.../jena/sparql/pfunction/library/strSplit.java | 2 +-
.../jena/sparql/pfunction/library/version.java | 2 +-
.../jena/sparql/sse/builders/BuilderResultSet.java | 2 +-
.../org/apache/jena/sparql/util/ExprUtils.java | 1 +
.../apache/jena/sparql/util/NodeFactoryExtra.java | 8 -
.../junit/{sparql/tests => }/SurpressedTest.java | 7 +-
.../org/apache/jena/arq/junit/riot/RiotTests.java | 14 +-
.../apache/jena/arq/junit/riot/SurpressedTest.java | 29 ---
.../apache/jena/arq/junit/sparql/SparqlTests.java | 155 ++++++-------
.../jena/arq/junit/sparql/tests/QueryExecTest.java | 4 +-
.../jena/sparql/engine/index/TestIndexTable.java | 4 +-
.../engine/iterator/TestDistinctDataBag.java | 2 +-
.../iterator/TestDistinctDataBagLimited.java | 2 +-
.../sparql/engine/iterator/TestDistinctMem.java | 2 +-
.../apache/jena/sparql/expr/TestNodeFunctions.java | 20 +-
.../org/apache/jena/sparql/junit/EarlReport.java | 98 +++-----
.../jena/sparql/resultset/TestResultSet.java | 2 +-
.../java/org/apache/jena/atlas/iterator/Iter.java | 45 ++--
.../jena/atlas/iterator/IteratorOnClose.java | 40 +++-
.../org/apache/jena/atlas/lib/CollectionUtils.java | 12 +
.../java/org/apache/jena/atlas/lib/ListUtils.java | 38 ++-
.../java/org/apache/jena/atlas/lib/StreamOps.java | 25 +-
jena-cmds/src/main/java/tdb/tdbstats.java | 4 +-
jena-cmds/src/main/java/tdb2/tdbstats.java | 4 +-
jena-cmds/src/test/java/arq/qtest.java | 157 +------------
jena-cmds/src/test/java/arq/rdftests.java | 254 +++++++++++++++++++++
jena-cmds/src/test/java/riotcmd/rdflangtest.java | 189 +--------------
.../assembler/assemblers/ContentAssembler.java | 49 ++--
.../org/apache/jena/ext/xerces/xs/ItemPSVI.java | 4 +
.../jena/ext/xerces/xs/XSAttributeDeclaration.java | 4 +
.../apache/jena/ext/xerces/xs/XSAttributeUse.java | 4 +
.../jena/ext/xerces/xs/XSElementDeclaration.java | 4 +
.../src/main/java/org/apache/jena/graph/Graph.java | 50 +++-
.../java/org/apache/jena/graph/compose/Dyadic.java | 18 +-
.../org/apache/jena/graph/impl/GraphMatcher.java | 124 +++++-----
.../java/org/apache/jena/util/FileManager.java | 1 +
.../java/org/apache/jena/util/LocationMapper.java | 1 +
.../jena/dboe/base/file/BufferChannelMem.java | 2 +-
.../src/main/java/org/apache/jena/tdb2/TDB2.java | 2 +-
.../apache/jena/tdb2/solver/OpExecutorTDB2.java | 10 +-
.../solver/{Solver.java => PatternMatchTDB2.java} | 43 ++--
.../org/apache/jena/tdb2/solver/QueryIterTDB.java | 59 -----
.../solver/{SolverLib.java => SolverLibTDB.java} | 72 +-----
.../java/org/apache/jena/tdb2/solver/SolverRX.java | 20 +-
.../jena/tdb2/solver/StageGeneratorDirectTDB.java | 2 +-
.../apache/jena/tdb2/solver/StageMatchTuple.java | 45 ++--
.../java/org/apache/jena/tdb2/sys/DatabaseOps.java | 2 +-
.../org/apache/jena/tdb2/solver/TestSolverTDB.java | 27 ++-
.../org/apache/jena/fuseki/main/cmds/DSGSetup.java | 14 +-
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../java/org/apache/jena/test/TestSettings.java | 3 +-
.../java/org/apache/jena/shacl/ShaclValidator.java | 6 +-
.../java/org/apache/jena/shacl/compact/SHACLC.java | 31 ++-
.../jena/shacl/validation/ShaclPlainValidator.java | 4 +-
.../java/org/apache/jena/tdb/solver/Abortable.java | 21 --
.../org/apache/jena/tdb/solver/OpExecutorTDB1.java | 10 +-
.../solver/{Solver.java => PatternMatchTDB1.java} | 43 ++--
.../solver/{SolverLib.java => SolverLibTDB.java} | 72 +-----
.../java/org/apache/jena/tdb/solver/SolverRX.java | 22 +-
.../jena/tdb/solver/StageGeneratorDirectTDB.java | 2 +-
.../apache/jena/tdb/solver/StageMatchTuple.java | 46 ++--
.../org/apache/jena/tdb/solver/TestSolverTDB.java | 66 ++++--
.../org/apache/jena/query/text/TextQueryPF.java | 2 +-
114 files changed, 2120 insertions(+), 1878 deletions(-)
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver => jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator}/Abortable.java (89%)
create mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/IterAbortable.java
rename jena-tdb/src/main/java/org/apache/jena/tdb/solver/QueryIterTDB.java => jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAbortable.java (70%)
create mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/OpExecutorQuads.java
create mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/PatternMatchData.java
rename jena-arq/src/main/java/org/apache/jena/sparql/engine/{iterator => main/solver}/RX_PG.java (97%)
create mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
copy jena-arq/src/main/java/org/apache/jena/sparql/engine/{iterator/RX.java => main/solver/SolverRX3.java} (56%)
rename jena-arq/src/main/java/org/apache/jena/sparql/engine/{iterator/RX.java => main/solver/SolverRX4.java} (54%)
create mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchData.java
create mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
rename jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/{Eval.java => RefEval.java} (65%)
rename jena-arq/src/test/java/org/apache/jena/arq/junit/{sparql/tests => }/SurpressedTest.java (92%)
delete mode 100644 jena-arq/src/test/java/org/apache/jena/arq/junit/riot/SurpressedTest.java
create mode 100644 jena-cmds/src/test/java/arq/rdftests.java
rename jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/{Solver.java => PatternMatchTDB2.java} (84%)
delete mode 100644 jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/QueryIterTDB.java
rename jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/{SolverLib.java => SolverLibTDB.java} (79%)
delete mode 100644 jena-tdb/src/main/java/org/apache/jena/tdb/solver/Abortable.java
rename jena-tdb/src/main/java/org/apache/jena/tdb/solver/{Solver.java => PatternMatchTDB1.java} (84%)
rename jena-tdb/src/main/java/org/apache/jena/tdb/solver/{SolverLib.java => SolverLibTDB.java} (79%)