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/11/14 09:12:02 UTC
[jena] branch main updated (914966c -> e30b880)
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 914966c Merge pull request #1105 from afs/qexec2
new 606f1b3 Cleanup TDB2 xloader
new fcd99b2 JENA-2185: General purpose ProgressMonitor
new 8c9cdb1 Code cleaning
new 245dfb8 Add convenience methods to Binding and RowSet
new 55d1a58 Code clean
new f980c8d JENA-2196: Improved xloader for TDB2
new e30b880 Merge pull request #1106 from afs/xloader
The 9391 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:
apache-jena/bin/tdb2.xloader | 284 +++++++++++++-
apache-jena/bin/{tdb2.xloader => tdb2.xloader0} | 5 +-
.../apache/jena/riot/system/ProgressStreamRDF.java | 65 ----
.../java/org/apache/jena/riot/system/RiotLib.java | 4 +-
.../org/apache/jena/riot/tokens/TokenType.java | 4 +-
.../org/apache/jena/riot/tokens/TokenizerText.java | 4 +-
.../apache/jena/riot/tokens/TokenizerWrapper.java | 15 +-
.../apache/jena/sparql/engine/binding/Binding.java | 5 +
.../java/org/apache/jena/sparql/exec/RowSet.java | 31 +-
.../jena/system/progress}/MonitorOutput.java | 2 +-
.../jena/system/progress/MonitorOutputs.java | 53 +++
.../jena/system/progress/ProgressIterator.java | 28 +-
.../jena/system/progress}/ProgressMonitor.java | 2 +-
.../system/progress}/ProgressMonitorBasic.java | 7 +-
.../system/progress}/ProgressMonitorContext.java | 2 +-
.../system/progress}/ProgressMonitorFactory.java | 2 +-
.../system/progress}/ProgressMonitorOutput.java | 11 +-
.../jena/system/progress}/ProgressStreamRDF.java | 2 +-
.../org/apache/jena/riot/tokens/TestTokenizer.java | 4 +-
.../src/main/java/org/apache/jena/atlas/io/IO.java | 1 +
.../main/java/org/apache/jena/atlas/lib/Chars.java | 1 +
.../org/apache/jena/atlas/lib/ProgressMonitor.java | 18 +-
.../java/org/apache/jena/atlas/lib/StrUtils.java | 2 +-
jena-cmds/src/main/java/tdb2/tdbdumpnodes.java | 119 ++++++
jena-cmds/src/main/java/tdb2/tdbloader.java | 41 +-
.../main/java/tdb2/xloader/AbstractCmdxLoad.java | 122 ++++++
.../src/main/java/tdb2/xloader/CmdxBuildIndex.java | 97 +++++
.../main/java/tdb2/xloader/CmdxBuildNodeTable.java | 94 +++++
.../src/main/java/tdb2/xloader/CmdxIngestData.java | 122 ++++++
.../src/main/java/tdb2/xloader/CmdxLoader.java | 106 ++++++
.../tdb2/{xloader => xloader0}/CmdIndexBuild.java | 4 +-
.../{xloader => xloader0}/CmdNodeTableBuilder.java | 17 +-
.../rdf/model/impl/RDFDefaultErrorHandler.java | 19 +-
.../java/org/apache/jena/tdb2/loader/Loader.java | 7 +-
.../org/apache/jena/tdb2/loader/LoaderFactory.java | 2 +-
.../apache/jena/tdb2/loader/base/LoaderBase.java | 2 +
.../apache/jena/tdb2/loader/base/LoaderOps.java | 30 +-
.../apache/jena/tdb2/loader/basic/LoaderBasic.java | 6 +-
.../apache/jena/tdb2/loader/main/DataBatcher.java | 2 +-
.../apache/jena/tdb2/loader/main/DataToTuples.java | 2 +-
.../jena/tdb2/loader/main/DataToTuplesInline.java | 2 +-
.../tdb2/loader/main/DataToTuplesInlineSingle.java | 2 +-
.../org/apache/jena/tdb2/loader/main/Indexer.java | 2 +-
.../jena/tdb2/loader/main/IndexerInline.java | 2 +-
.../apache/jena/tdb2/loader/main/LoaderMain.java | 3 +
.../jena/tdb2/loader/main/LoaderParallel.java | 2 +-
.../apache/jena/tdb2/loader/main/LoaderPhased.java | 2 +-
.../apache/jena/tdb2/loader/main/PhasedOps.java | 6 +-
.../jena/tdb2/loader/main/PrefixHandlerBulk.java | 2 +-
.../loader/sequential/BuilderSecondaryIndexes.java | 6 +-
.../loader/sequential/LoaderNodeTupleTable.java | 2 +-
.../tdb2/loader/sequential/LoaderSequential.java | 6 +-
.../org/apache/jena/tdb2/sys/NodeTableLib.java | 48 +++
.../main/java/org/apache/jena/tdb2/sys/Util.java | 2 +-
.../org/apache/jena/tdb2/xloader/BulkLoaderX.java | 68 ++--
.../apache/jena/tdb2/xloader/ProcIndexBuildX.java | 254 +++++++++++++
...eTableDataBuilder.java => ProcIngestDataX.java} | 136 +++----
.../jena/tdb2/xloader/ProcNodeTableBuilderX.java | 416 +++++++++++++++++++++
.../apache/jena/tdb2/xloader/RecordsFromInput.java | 155 --------
.../org/apache/jena/tdb2/xloader/WriteRows.java | 24 +-
.../XLoaderFiles.java} | 33 +-
.../BulkLoaderX0.java} | 34 +-
.../tdb2/{xloader => xloader0}/ProcIndexBuild.java | 24 +-
.../ProcNodeTableDataBuilder.java | 122 +++---
.../jena/tdb2/xloader0/RecordsFromInput.java | 155 ++++++++
.../jena/tdb2/{xloader => xloader0}/WriteRows.java | 24 +-
.../test/java/org/apache/jena/tdb2/ConfigTest.java | 28 +-
.../jena/tdb2/loader/AbstractTestLoader.java | 6 +-
.../main/java/org/apache/jena/example/Base.java | 9 +-
.../java/org/apache/jena/example/CheeseBase.java | 9 -
.../apache/jena/example/helloworld/HelloWorld.java | 11 +-
.../jena/example/pizza/PizzaSparqlNoInf.java | 17 +-
.../example/streaming/StreamRDFToConnection.java | 34 +-
.../apache/jena/fuseki/cmd/JettyFusekiWebapp.java | 10 +-
.../java/org/apache/jena/shacl/compact/SHACLC.java | 1 -
.../jena/tdb/store/bulkloader/BulkLoader.java | 308 +++++++--------
.../jena/tdb/store/xloader/ProcIndexCopy.java | 11 +-
.../store/xloader/ProcNodeTableDataBuilder.java | 171 ++++-----
.../test/java/org/apache/jena/tdb/ConfigTest.java | 84 ++---
79 files changed, 2576 insertions(+), 999 deletions(-)
copy apache-jena/bin/{tdb2.xloader => tdb2.xloader0} (95%)
delete mode 100644 jena-arq/src/main/java/org/apache/jena/riot/system/ProgressStreamRDF.java
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base => jena-arq/src/main/java/org/apache/jena/system/progress}/MonitorOutput.java (95%)
create mode 100644 jena-arq/src/main/java/org/apache/jena/system/progress/MonitorOutputs.java
copy jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/ProgressStreamRDF.java => jena-arq/src/main/java/org/apache/jena/system/progress/ProgressIterator.java (60%)
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base => jena-arq/src/main/java/org/apache/jena/system/progress}/ProgressMonitor.java (98%)
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base => jena-arq/src/main/java/org/apache/jena/system/progress}/ProgressMonitorBasic.java (92%)
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base => jena-arq/src/main/java/org/apache/jena/system/progress}/ProgressMonitorContext.java (97%)
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base => jena-arq/src/main/java/org/apache/jena/system/progress}/ProgressMonitorFactory.java (97%)
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base => jena-arq/src/main/java/org/apache/jena/system/progress}/ProgressMonitorOutput.java (95%)
rename {jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base => jena-arq/src/main/java/org/apache/jena/system/progress}/ProgressStreamRDF.java (97%)
create mode 100644 jena-cmds/src/main/java/tdb2/tdbdumpnodes.java
create mode 100644 jena-cmds/src/main/java/tdb2/xloader/AbstractCmdxLoad.java
create mode 100644 jena-cmds/src/main/java/tdb2/xloader/CmdxBuildIndex.java
create mode 100644 jena-cmds/src/main/java/tdb2/xloader/CmdxBuildNodeTable.java
create mode 100644 jena-cmds/src/main/java/tdb2/xloader/CmdxIngestData.java
create mode 100644 jena-cmds/src/main/java/tdb2/xloader/CmdxLoader.java
rename jena-cmds/src/main/java/tdb2/{xloader => xloader0}/CmdIndexBuild.java (96%)
rename jena-cmds/src/main/java/tdb2/{xloader => xloader0}/CmdNodeTableBuilder.java (88%)
create mode 100644 jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/NodeTableLib.java
create mode 100644 jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/xloader/ProcIndexBuildX.java
copy jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/xloader/{ProcNodeTableDataBuilder.java => ProcIngestDataX.java} (70%)
create mode 100644 jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/xloader/ProcNodeTableBuilderX.java
delete mode 100644 jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/xloader/RecordsFromInput.java
copy jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/{loader/main/LoaderParallel.java => xloader/XLoaderFiles.java} (50%)
copy jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/{xloader/BulkLoaderX.java => xloader0/BulkLoaderX0.java} (63%)
rename jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/{xloader => xloader0}/ProcIndexBuild.java (91%)
rename jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/{xloader => xloader0}/ProcNodeTableDataBuilder.java (75%)
create mode 100644 jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/xloader0/RecordsFromInput.java
copy jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/{xloader => xloader0}/WriteRows.java (85%)