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 2011/12/12 17:53:29 UTC

svn commit: r1213307 - in /incubator/jena: Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java Scratch/AFS/Jena-Dev/trunk/src/dev/Jena163_TDBDifferentIds.java

Author: andy
Date: Mon Dec 12 16:53:29 2011
New Revision: 1213307

URL: http://svn.apache.org/viewvc?rev=1213307&view=rev
Log: (empty)

Modified:
    incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena163_TDBDifferentIds.java

Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java?rev=1213307&r1=1213306&r2=1213307&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java Mon Dec 12 16:53:29 2011
@@ -194,7 +194,7 @@ public class NodeTableTrans implements N
         this.nodeTableJournal = NodeTableInline.create(nodeTableJournal) ;
     }
     
-    static final boolean APPEND_LOG = false ; 
+    static public boolean APPEND_LOG = false ; 
     
     /** Copy from the journal file to the real file */
     /*package*/ void append()
@@ -240,6 +240,13 @@ public class NodeTableTrans implements N
             System.out.printf("+ First: %s -> %s\n", firstPair.car(), mapFromJournal(firstPair.car())) ;
             System.out.printf("+ Last: %s -> %s\n", lastPair.car(), mapFromJournal(lastPair.car())) ;
             System.out.printf("+ New base: %s\n", base.allocOffset()) ;
+            Node n1 = firstPair.cdr() ;
+            Node n2 = lastPair.cdr() ;
+            
+            if ( base.getNodeIdForNode(n1) == null )
+                throw new TDBException("1") ;
+            if ( base.getNodeIdForNode(n2) == null )
+                throw new TDBException("2") ;
         }
         
         //debug("<< append: %s",label) ;

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena163_TDBDifferentIds.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena163_TDBDifferentIds.java?rev=1213307&r1=1213306&r2=1213307&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena163_TDBDifferentIds.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena163_TDBDifferentIds.java Mon Dec 12 16:53:29 2011
@@ -110,14 +110,15 @@ public class Jena163_TDBDifferentIds
     private static int numIterationsPerBlock    = 100 ;
     private static int colCount                 = 0 ;
     private static int colMax                   = 200 ;
-    private static boolean inlineProgress       = false ;   // Set true so that every transaction print a letter for what it does.
+    private static boolean inlineProgress       = true ;   // Set true so that every transaction print a letter for what it does.
     
     static {
         // Clearup !!!!!!!!!!!!!
         TransactionManager.DEBUG = inlineProgress ; 
         //ObjectFileStorage.logging = true ;
-        FileBase.DEBUG = inlineProgress ;
+        //FileBase.DEBUG = inlineProgress ;
         NodeTableTrans.FIXUP = true ;
+        NodeTableTrans.APPEND_LOG = true ;
         // See also log4j.properties.
     }