From d9b133a247e7c8a5fd4f8dfcee00e7438eb3a4f2 Mon Sep 17 00:00:00 2001 From: Andy Seaborne Date: Wed, 12 Dec 2018 13:53:27 +0000 Subject: [PATCH] Cleanup of comments and javadoc. Remove one "abstract" in an interface. --- .../java/org/apache/jena/query/ResultSetFormatter.java | 2 +- .../jena/sparql/engine/optimizer/reorder/ReorderLib.java | 2 +- .../java/org/apache/jena/sparql/util/QueryExecUtils.java | 6 +++++- .../main/java/org/apache/jena/dboe/base/block/Block.java | 2 +- .../java/org/apache/jena/dboe/base/block/BlockMgr.java | 2 +- .../org/apache/jena/dboe/base/block/BlockMgrCache.java | 2 +- .../src/main/java/org/apache/jena/dboe/base/page/Page.java | 4 ++-- .../java/org/apache/jena/dboe/base/page/PageBlockMgr.java | 6 +++--- .../java/org/apache/jena/dboe/trans/bplustree/BPT.java | 5 ++++- .../org/apache/jena/dboe/trans/bplustree/BPTreeNode.java | 7 ++++--- .../apache/jena/dboe/trans/bplustree/BPTreeRecords.java | 2 -- 11 files changed, 23 insertions(+), 17 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java index 359de9111c6..b3984aec77e 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java +++ b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java @@ -281,7 +281,7 @@ static public void output(ResultSet resultSet, ResultsFormat rFmt) { output(System.out, resultSet, rFmt) ; } /** Output a ResultSet in some format. - * To get detailed control over each format, call the appropropiate operation directly. + * To get detailed control over each format, call the appropriate operation directly. * * @param outStream Output * @param resultSet Result set diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderLib.java index 0bc7fd138c3..308cbd96ca7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderLib.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderLib.java @@ -68,7 +68,7 @@ public static ReorderTransformation identity() { } /** - * Return a ReorderTransformation that performance some basic reordering + * Return a ReorderTransformation that performs some basic reordering * based on most grounded triples first, but otherwise leaves things * in query-written order. */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java index e4ddf99e8d0..6ba03fdc907 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java @@ -138,10 +138,14 @@ public static void outputResultSet(ResultSet results, Prologue prologue, Results if ( outputFormat.equals(ResultsFormat.FMT_RDF_XML) || outputFormat.equals(ResultsFormat.FMT_RDF_N3) || outputFormat.equals(ResultsFormat.FMT_RDF_TTL) ) { + Lang langx = Lang.TURTLE; + if ( outputFormat.equals(ResultsFormat.FMT_RDF_XML) ) + langx = Lang.RDFXML; + Model m = RDFOutput.encodeAsModel(results) ; m.setNsPrefixes(prologue.getPrefixMapping()) ; m.setNsPrefix("rs", ResultSetGraphVocab.getURI()) ; - RDFDataMgr.write(System.out, m, Lang.TURTLE) ; + RDFDataMgr.write(System.out, m, langx) ; done = true ; } diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/Block.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/Block.java index 20a32189695..eac355d9bef 100644 --- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/Block.java +++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/Block.java @@ -56,7 +56,7 @@ public Block(Long id, ByteBuffer byteBuffer) { this.id = id ; this.byteBuffer = byteBuffer ; // this.blockRef = null ; - // Default - writeable, unmodified block. + // Default - writable, unmodified block. this.readOnly = false ; this.modified = false ; this.underlyingByteBuffer = null ; diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgr.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgr.java index f32731c8458..10b5a4c54e3 100644 --- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgr.java +++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgr.java @@ -48,7 +48,7 @@ public interface BlockMgr extends Sync, Closeable /*UnitMgr*/ /** Release a block, unmodified or already written. */ public void release(Block block) ; - /** Promote to writeable : it's OK to promote an already writeable block */ + /** Promote to writable : it's OK to promote an already writable block */ public Block promote(Block block); // Bad name? "endWrite", "put" -- for a mapped block, the changes are made directly, not on the write() */ diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgrCache.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgrCache.java index bdb4809eed3..d32fdf8730d 100644 --- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgrCache.java +++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/block/BlockMgrCache.java @@ -115,7 +115,7 @@ synchronized public Block getRead(long id) { // A requested block may be in the other cache. // Writable blocks are readable. - // readable blocks are not writeable (see below). + // readable blocks are not writable (see below). if ( writeCache != null ) // Might still be in the dirty blocks. // Leave in write cache diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/Page.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/Page.java index 17f32c4e300..4d8a7adb291 100644 --- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/Page.java +++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/Page.java @@ -38,8 +38,8 @@ public interface Page extends Printable /** * The underlying block for this page has changed (e.g. it's been - * promoted and the promotion may have caused the block to change. + * promoted and the promotion may have caused the block to change). */ - public abstract void reset(Block block) ; + public void reset(Block block) ; } diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/PageBlockMgr.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/PageBlockMgr.java index fa72b93f26a..8b2dd7234c5 100644 --- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/PageBlockMgr.java +++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/page/PageBlockMgr.java @@ -155,6 +155,7 @@ public void free(Page page) { public void promoteInPlace(Page page) { Block block = page.getBackingBlock() ; block.getByteBuffer().rewind() ; + Block block2 = blockMgr.promote(block) ; block2.setReadOnly(false) ; if ( block2.getId() != block.getId() ) @@ -171,7 +172,6 @@ public boolean promoteDuplicate(Page page) { Block block = page.getBackingBlock() ; block.getByteBuffer().rewind() ; - // --- TODO Always new Block block2 = blockMgr.allocate(-1) ; block2.getByteBuffer().put(block.getByteBuffer()) ; block2.getByteBuffer().rewind() ; @@ -202,10 +202,10 @@ public void dump() { /** Signal the completion of an update operation */ public void finishUpdate() { blockMgr.endUpdate() ; } - /** Signal the start of an update operation */ + /** Signal the start of an read operation */ public void startRead() { blockMgr.beginRead() ; } - /** Signal the completion of an update operation */ + /** Signal the completion of an read operation */ public void finishRead() { blockMgr.endRead() ; } @Override diff --git a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPT.java b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPT.java index f1119142cba..b777b5c9f23 100644 --- a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPT.java +++ b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPT.java @@ -36,13 +36,16 @@ public final class BPT { public static boolean Logging = false ; // Turn on/off logging + /** Enable forces promotion of blocks; otherwise blocks are promoted as needed. */ public static boolean forcePromoteModes = false ; + /** Whether to duplicate a records block on a promotion call if forcePromoteModes=true */ public static boolean promoteDuplicateRecords = false ; + /** Whether to duplicate a nodes block on a promotion call if forcePromoteModes=true */ public static boolean promoteDuplicateNodes = false ; // Check within BPTreeNode public static boolean CheckingNode = false ; - // Check on exit of B+Tree modifiying operations + // Check on exit of B+Tree modifying operations // Not done? public static boolean CheckingConcurrency = SystemIndex.Checking ; diff --git a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeNode.java b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeNode.java index f808cb9b141..c19355f66c3 100644 --- a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeNode.java +++ b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeNode.java @@ -52,6 +52,7 @@ public final class BPTreeNode extends BPTreePage */ /*package*/int id ; // Or block.getId() + // Parent is a debugging aid. It records how we go to this BPTreeNode and also whether this is a root. private int parent ; private int count ; // Number of records. Number of pointers is +1 @@ -391,7 +392,7 @@ final Record getHighRecord() { public final PtrBuffer getPtrBuffer() { return ptrs ; } final void setParent(int parentId) { this.parent = parentId ; } - public final int getParent() { return parent ; } + final int getParent() { return parent ; } public final void setIsLeaf(boolean isLeaf) { this.isLeaf = isLeaf ; } @@ -748,8 +749,8 @@ final Record internalDelete(AccessPath path, Record rec) { if ( page.isMinSize() ) { // Ensure that a node is at least min+1 so a delete can happen. - // Can't be the root - we decended in the get(). - rebalance(path, page, y) ; // Ignore return - need to refind. + // Can't be the root - we descended in the get(). + rebalance(path, page, y) ; // Ignore return - need to re-find. page.release(); // TODO But rebalance may have freed this? // Rebalance may have moved the record due to shuffling. x = findSlot(rec) ; diff --git a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeRecords.java b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeRecords.java index 18030a1b967..69cef5e7b22 100644 --- a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeRecords.java +++ b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BPTreeRecords.java @@ -129,8 +129,6 @@ final boolean promote() { if ( promoteInPlace ) { bprRecordsMgr.promoteInPlace(this) ; - // TODO Is this needed? - // Is this replicated in BPTreeNode? if ( getBackingBlock().isReadOnly() ) bprRecordsMgr.getBlockMgr().promote(getBackingBlock()) ; return false ;