JENA-1612: Merge commit 'refs/pull/478/head' of https://github.com/apache/jena
This closes #478. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6e2a7e6c Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6e2a7e6c Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6e2a7e6c Branch: refs/heads/master Commit: 6e2a7e6c0b12ccfea040626955dbfc796810dc0f Parents: 0e904ec f5de341 Author: Andy Seaborne <[email protected]> Authored: Thu Oct 11 13:12:14 2018 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu Oct 11 13:12:14 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/jena/atlas/lib/Timer.java | 18 +++- jena-cmds/src/main/java/tdb2/tdbloader.java | 31 +++++- .../apache/jena/tdb2/loader/LoaderFactory.java | 21 ++++ .../jena/tdb2/loader/base/LoaderBase.java | 54 ++++++++-- .../apache/jena/tdb2/loader/base/LoaderOps.java | 11 +- .../jena/tdb2/loader/base/ProgressMonitor.java | 19 +++- .../tdb2/loader/base/ProgressMonitorBasic.java | 48 ++++++++- .../loader/base/ProgressMonitorContext.java | 61 +++++++++++ .../tdb2/loader/base/ProgressMonitorOutput.java | 108 ++++++++++++++----- .../tdb2/loader/base/ProgressStreamRDF.java | 16 --- .../jena/tdb2/loader/basic/LoaderBasic.java | 6 +- .../jena/tdb2/loader/main/DataToTuples.java | 4 +- .../tdb2/loader/main/DataToTuplesInline.java | 2 +- .../jena/tdb2/loader/main/InputStage.java | 2 +- .../jena/tdb2/loader/main/LoaderMain.java | 16 +-- .../jena/tdb2/loader/main/LoaderPlans.java | 21 ++++ .../sequential/BuilderSecondaryIndexes.java | 16 ++- .../loader/sequential/LoaderSequential.java | 8 +- .../apache/jena/tdb2/loader/TestLoaderMain.java | 1 + .../apache/jena/tdb2/loader/TestLoaderStd.java | 3 + 20 files changed, 368 insertions(+), 98 deletions(-) ----------------------------------------------------------------------
