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 2015/02/20 11:02:51 UTC
jena git commit: Clean up
Repository: jena
Updated Branches:
refs/heads/master 30e437157 -> 863c246a6
Clean up
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/863c246a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/863c246a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/863c246a
Branch: refs/heads/master
Commit: 863c246a60f54617279874d33d7602e3d9db4063
Parents: 30e4371
Author: Andy Seaborne <an...@seaborne.org>
Authored: Fri Feb 20 10:02:40 2015 +0000
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Fri Feb 20 10:02:40 2015 +0000
----------------------------------------------------------------------
jena-tdb/src/main/java/tdb/tools/dumpbpt.java | 135 ++++++++-----------
.../src/main/java/tdb/tools/dumpnodetable.java | 124 +++++++----------
.../src/main/java/tdb/tools/tdbgenindex.java | 51 +++----
3 files changed, 126 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/863c246a/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/tdb/tools/dumpbpt.java b/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
index 7f596ec..98e9c3a 100644
--- a/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
+++ b/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package tdb.tools;
+package tdb.tools ;
import java.io.PrintStream ;
import java.util.Arrays ;
@@ -42,26 +42,21 @@ import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ;
import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-
-public class dumpbpt extends CmdGeneral
-{
+public class dumpbpt extends CmdGeneral {
ModLocation modLocation = new ModLocation() ;
-
- static public void main(String... argv)
- {
+
+ static public void main(String... argv) {
LogCtl.setLog4j() ;
new dumpbpt(argv).mainRun() ;
}
- protected dumpbpt(String[] argv)
- {
+ protected dumpbpt(String[] argv) {
super(argv) ;
super.addModule(modLocation) ;
}
@Override
- protected void processModulesAndArgs()
- {
+ protected void processModulesAndArgs() {
if ( modVersion.getVersionFlag() )
modVersion.printVersionAndExit() ;
if ( modLocation.getLocation() == null )
@@ -71,132 +66,112 @@ public class dumpbpt extends CmdGeneral
}
@Override
- protected String getSummary()
- {
- return getCommandName()+" --loc=DIR IndexName" ;
+ protected String getSummary() {
+ return getCommandName() + " --loc=DIR IndexName" ;
}
@Override
- protected String getCommandName()
- {
+ protected String getCommandName() {
return Utils.className(this) ;
}
-
+
@Override
- protected void exec()
- {
+ protected void exec() {
List<String> tripleIndexes = Arrays.asList(Names.tripleIndexes) ;
List<String> quadIndexes = Arrays.asList(Names.quadIndexes) ;
Location loc = modLocation.getLocation() ;
-
+
// The name is the order.
- for ( String indexName : super.getPositional() )
- {
+ for ( String indexName : super.getPositional() ) {
String primary ;
- if ( indexName.length() == 3 )
- {
+ if ( indexName.length() == 3 ) {
primary = Names.primaryIndexTriples ;
- }
- else if ( indexName.length() == 4 )
- {
+ } else if ( indexName.length() == 4 ) {
primary = Names.primaryIndexQuads ;
+ } else {
+ cmdError("Wrong length: " + indexName) ;
+ primary = null ;
}
- else
- {
- cmdError("Wrong length: "+indexName) ;
- primary = null ;
- }
-
- int keySubLen = SystemTDB.SizeOfNodeId ;
+
+ int keySubLen = SystemTDB.SizeOfNodeId ;
int keyUnitLen = indexName.length() ;
- int keyLength = keySubLen*keyUnitLen ;
+ int keyLength = keySubLen * keyUnitLen ;
int valueLength = 0 ;
-
-
+
RecordFactory rf = new RecordFactory(keyLength, valueLength) ;
RangeIndex rIndex = IndexFactory.buildRangeIndex(loc, indexName, rf) ;
BPlusTree bpt = (BPlusTree)rIndex ;
-
- if ( false )
- {
+
+ if ( false ) {
System.out.println("---- Index structure") ;
bpt.dump() ;
}
- if ( true )
- {
+ if ( true ) {
System.out.println("---- Index contents") ;
Iterator<Record> iter = bpt.iterator() ;
- if ( ! iter.hasNext() )
+ if ( !iter.hasNext() )
System.out.println("<<Empty>>") ;
-
- for ( ; iter.hasNext() ; )
- {
- Record r = iter.next();
+
+ for ( ; iter.hasNext() ; ) {
+ Record r = iter.next() ;
printRecord("", System.out, r, keyUnitLen) ;
}
}
-
+
// Check.
Iterator<Record> iterCheck = bpt.iterator() ;
Record r1 = null ;
int i = 0 ;
- for ( ; iterCheck.hasNext() ; )
- {
- Record r2 = iterCheck.next();
+ for ( ; iterCheck.hasNext() ; ) {
+ Record r2 = iterCheck.next() ;
i++ ;
-
- if ( r1 != null )
- {
- if ( ! Record.keyLT(r1, r2) )
- {
- System.err.println("key error@ "+i) ;
+
+ if ( r1 != null ) {
+ if ( !Record.keyLT(r1, r2) ) {
+ System.err.println("key error@ " + i) ;
printRecord(" ", System.err, r1, keyUnitLen) ;
printRecord(" ", System.err, r2, keyUnitLen) ;
}
}
r1 = r2 ;
}
-
- if ( false )
- {
+
+ if ( false ) {
// Dump in tuple order.
- TupleIndex tupleIndex = new TupleIndexRecord(primary.length(), new ColumnMap(primary, indexName), indexName, rIndex.getRecordFactory(), rIndex) ;
- if ( true )
- {
+ TupleIndex tupleIndex = new TupleIndexRecord(primary.length(), new ColumnMap(primary, indexName), indexName,
+ rIndex.getRecordFactory(), rIndex) ;
+ if ( true ) {
System.out.println("---- Tuple contents") ;
Iterator<Tuple<NodeId>> iter2 = tupleIndex.all() ;
- if ( ! iter2.hasNext() )
+ if ( !iter2.hasNext() )
System.out.println("<<Empty>>") ;
- for ( ; iter2.hasNext() ; )
- {
- Tuple<NodeId> row = iter2.next();
+ for ( ; iter2.hasNext() ; ) {
+ Tuple<NodeId> row = iter2.next() ;
System.out.println(row) ;
}
}
}
}
}
-
- private static void printRecord(String label, PrintStream out, Record r, int keyUnitLen)
- {
- //out.println(r) ;
- int keySubLen = r.getKey().length/keyUnitLen ;
+ private static void printRecord(String label, PrintStream out, Record r, int keyUnitLen) {
+ // out.println(r) ;
+
+ int keySubLen = r.getKey().length / keyUnitLen ;
if ( label != null )
out.print(label) ;
- for ( int i = 0 ; i < keyUnitLen ; i++ )
- {
+ for ( int i = 0 ; i < keyUnitLen ; i++ ) {
if ( i != 0 )
out.print(" ") ;
-
+
// Print in chunks
- int k = i*keySubLen ;
- for ( int j = k ; j < k+keySubLen ; j++ )
+ int k = i * keySubLen ;
+ for ( int j = k ; j < k + keySubLen ; j++ )
out.printf("%02x", r.getKey()[j]) ;
-
-// long x = Bytes.getLong(r.getKey(), i*SystemTDB.SizeOfNodeId) ;
-// System.out.printf("%016x", x) ;
+
+ // long x = Bytes.getLong(r.getKey(), i*SystemTDB.SizeOfNodeId) ;
+ // System.out.printf("%016x", x) ;
}
out.println() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/863c246a/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java b/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
index fcd2666..2d93294 100644
--- a/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
+++ b/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package tdb.tools;
+package tdb.tools ;
import java.io.OutputStream ;
import java.util.Arrays ;
@@ -43,71 +43,58 @@ import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-public class dumpnodetable extends CmdGeneral
-{
+public class dumpnodetable extends CmdGeneral {
ModLocation modLocation = new ModLocation() ;
-
- static public void main(String... argv)
- {
+
+ static public void main(String... argv) {
LogCtl.setLog4j() ;
new dumpnodetable(argv).mainRun() ;
}
@Override
- protected void exec()
- {
+ protected void exec() {
List<String> tripleIndexes = Arrays.asList(Names.tripleIndexes) ;
List<String> quadIndexes = Arrays.asList(Names.quadIndexes) ;
Location loc = modLocation.getLocation() ;
-
- StoreConnection sConn = StoreConnection.make(loc) ;
+
+ StoreConnection sConn = StoreConnection.make(loc) ;
DatasetGraphTDB dsg = sConn.getBaseDataset() ;
NodeTable nodeTable = dsg.getQuadTable().getNodeTupleTable().getNodeTable() ;
dump(System.out, nodeTable) ;
}
-
- protected dumpnodetable(String[] argv)
- {
+
+ protected dumpnodetable(String[] argv) {
super(argv) ;
super.addModule(modLocation) ;
}
- public static void dumpNodes(OutputStream w, String location)
- {
- dump(w, location, Names.indexNode2Id, SystemTDB.Node2NodeIdCacheSize, Names.indexId2Node, SystemTDB.NodeId2NodeCacheSize, SystemTDB.NodeMissCacheSize) ;
+ public static void dumpNodes(OutputStream w, String location) {
+ dump(w, location, Names.indexNode2Id, SystemTDB.Node2NodeIdCacheSize, Names.indexId2Node, SystemTDB.NodeId2NodeCacheSize,
+ SystemTDB.NodeMissCacheSize) ;
}
- public static void dumpPrefixes(OutputStream w, String location)
- {
+ public static void dumpPrefixes(OutputStream w, String location) {
dump(w, location, Names.prefixNode2Id, 100, Names.prefixId2Node, 100, 10) ;
}
-
- public static void dump(OutputStream w, String location,
- String indexNode2Id, int node2NodeIdCacheSize,
- String indexId2Node, int nodeId2NodeCacheSize, //
-
- int sizeNodeMissCacheSize)
- {
- NodeTable nodeTable = Build.makeNodeTable(Location.create(location),
- indexNode2Id, node2NodeIdCacheSize,
- indexId2Node, nodeId2NodeCacheSize,
- sizeNodeMissCacheSize) ;
+ public static void dump(OutputStream w, String location, String indexNode2Id, int node2NodeIdCacheSize, String indexId2Node,
+ int nodeId2NodeCacheSize, //
+
+ int sizeNodeMissCacheSize) {
+ NodeTable nodeTable = Build.makeNodeTable(Location.create(location), indexNode2Id, node2NodeIdCacheSize, indexId2Node,
+ nodeId2NodeCacheSize, sizeNodeMissCacheSize) ;
}
-
-
- public static void dump(OutputStream w, NodeTable nodeTable)
- {
+
+ public static void dump(OutputStream w, NodeTable nodeTable) {
// Better to hack the indexes?
Iterator<Pair<NodeId, Node>> iter = nodeTable.all() ;
long count = 0 ;
- try(IndentedWriter iw = new IndentedWriter(w)) {
- for ( ; iter.hasNext() ; )
- {
+ try (IndentedWriter iw = new IndentedWriter(w)) {
+ for ( ; iter.hasNext() ; ) {
Pair<NodeId, Node> pair = iter.next() ;
iw.print(pair.car().toString()) ;
iw.print(" : ") ;
- //iw.print(pair.cdr()) ;
+ // iw.print(pair.cdr()) ;
Node n = pair.cdr() ;
String $ = stringForNode(n) ;
iw.print($) ;
@@ -115,74 +102,67 @@ public class dumpnodetable extends CmdGeneral
count++ ;
}
iw.println() ;
- iw.printf("Total: "+count) ;
+ iw.printf("Total: " + count) ;
iw.println() ;
iw.flush() ;
}
}
-
- private static String stringForNode(Node n)
- {
+
+ private static String stringForNode(Node n) {
if ( n == null )
return "<<null>>" ;
-
+
if ( n.isBlank() )
- return "_:"+n.getBlankNodeLabel() ;
-
+ return "_:" + n.getBlankNodeLabel() ;
+
if ( n.isLiteral() )
return stringForLiteral((Node_Literal)n) ;
- if ( n.isURI() )
- {
+ if ( n.isURI() ) {
String uri = n.getURI() ;
return stringForURI(uri) ;
}
-
+
if ( n.isVariable() )
- return "?"+n.getName() ;
-
+ return "?" + n.getName() ;
+
if ( n.equals(Node.ANY) )
return "ANY" ;
- Log.warn(FmtUtils.class, "Failed to turn a node into a string: "+n) ;
+ Log.warn(FmtUtils.class, "Failed to turn a node into a string: " + n) ;
return n.toString() ;
}
-
- public static String stringForURI(String uri)
- {
- return "<"+uri+">" ;
+
+ public static String stringForURI(String uri) {
+ return "<" + uri + ">" ;
}
-
- public static String stringForLiteral(Node_Literal literal)
- {
+
+ public static String stringForLiteral(Node_Literal literal) {
String datatype = literal.getLiteralDatatypeURI() ;
String lang = literal.getLiteralLanguage() ;
String s = literal.getLiteralLexicalForm() ;
-
+
StringBuilder sbuff = new StringBuilder() ;
sbuff.append("\"") ;
FmtUtils.stringEsc(sbuff, s, true) ;
sbuff.append("\"") ;
-
- // Format the language tag
- if ( lang != null && lang.length()>0)
- {
+
+ // Format the language tag
+ if ( lang != null && lang.length() > 0 ) {
sbuff.append("@") ;
sbuff.append(lang) ;
}
- if ( datatype != null )
- {
+ if ( datatype != null ) {
sbuff.append("^^") ;
sbuff.append(stringForURI(datatype)) ;
}
-
+
return sbuff.toString() ;
}
@Override
- protected void processModulesAndArgs()
- {
+ protected void processModulesAndArgs() {
if ( modVersion.getVersionFlag() )
modVersion.printVersionAndExit() ;
if ( modLocation.getLocation() == null )
@@ -190,15 +170,13 @@ public class dumpnodetable extends CmdGeneral
}
@Override
- protected String getSummary()
- {
- return getCommandName()+" --loc=DIR IndexName" ;
+ protected String getSummary() {
+ return getCommandName() + " --loc=DIR IndexName" ;
}
@Override
- protected String getCommandName()
- {
+ protected String getCommandName() {
return Utils.className(this) ;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/jena/blob/863c246a/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java b/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java
index 723a964..bc2fc8e 100644
--- a/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java
+++ b/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package tdb.tools;
+package tdb.tools ;
import java.util.Iterator ;
@@ -30,64 +30,54 @@ import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SetupTDB ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-/** copy one index to another, possibly chnagign the order */
-public class tdbgenindex
-{
- public static void main(String...argv)
- {
+/** copy one index to another, possibly changing the order */
+public class tdbgenindex {
+ public static void main(String... argv) {
// Usage: srcLocation indexName dstLocation indexName
- if ( argv.length != 4 )
- {
- System.err.println("Usage: "+Utils.classShortName(tdbgenindex.class)+" srcLocation srcIndex dstLocation dstIndex") ;
+ if ( argv.length != 4 ) {
+ System.err.println("Usage: " + Utils.classShortName(tdbgenindex.class) + " srcLocation srcIndex dstLocation dstIndex") ;
System.exit(1) ;
}
-
+
Location srcLoc = Location.create(argv[0]) ;
String srcIndexName = argv[1] ;
-
+
Location dstLoc = Location.create(argv[2]) ;
String dstIndexName = argv[3] ;
-
+
int readCacheSize = 0 ;
int writeCacheSize = -1 ;
-
- if ( srcIndexName.length() != dstIndexName.length() )
- {
- System.err.println("srcIndexName.length() != dstIndexName.length() "+srcIndexName+" :: "+dstIndexName ) ;
+
+ if ( srcIndexName.length() != dstIndexName.length() ) {
+ System.err.println("srcIndexName.length() != dstIndexName.length() " + srcIndexName + " :: " + dstIndexName) ;
System.exit(1) ;
}
-
+
String primary ;
int dftKeyLength ;
int dftValueLength ;
-
- if ( srcIndexName.length() == 3 )
- {
+
+ if ( srcIndexName.length() == 3 ) {
primary = Names.primaryIndexTriples ;
dftKeyLength = SystemTDB.LenIndexTripleRecord ;
dftValueLength = 0 ;
- }
- else if ( srcIndexName.length() == 4 )
- {
+ } else if ( srcIndexName.length() == 4 ) {
primary = Names.primaryIndexQuads ;
dftKeyLength = SystemTDB.LenIndexQuadRecord ;
dftValueLength = 0 ;
- }
- else
- {
+ } else {
System.err.println("indexlength != 3 or 4") ;
System.exit(1) ;
primary = null ;
dftKeyLength = 0 ;
dftValueLength = 0 ;
}
-
+
TupleIndex srcIdx = SetupTDB.makeTupleIndex(srcLoc, primary, srcIndexName, srcIndexName, dftKeyLength) ;
TupleIndex dstIdx = SetupTDB.makeTupleIndex(dstLoc, primary, dstIndexName, dstIndexName, dftKeyLength) ;
-
+
Iterator<Tuple<NodeId>> iter = srcIdx.all() ;
- for ( ; iter.hasNext() ; )
- {
+ for ( ; iter.hasNext() ; ) {
Tuple<NodeId> tuple = iter.next() ;
dstIdx.add(tuple) ;
}
@@ -95,4 +85,3 @@ public class tdbgenindex
dstIdx.close() ;
}
}
-