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/09/22 19:36:37 UTC

svn commit: r1174275 - in /incubator/jena/Experimental/TxTDB/trunk: src-dev/tx/TestTransSystemJena91.java src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSystem.java

Author: andy
Date: Thu Sep 22 17:36:36 2011
New Revision: 1174275

URL: http://svn.apache.org/viewvc?rev=1174275&view=rev
Log:
Debugging info for JENA-91

Modified:
    incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestTransSystemJena91.java
    incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSystem.java

Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestTransSystemJena91.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestTransSystemJena91.java?rev=1174275&r1=1174274&r2=1174275&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestTransSystemJena91.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestTransSystemJena91.java Thu Sep 22 17:36:36 2011
@@ -22,6 +22,7 @@ import static com.hp.hpl.jena.tdb.transa
 import static java.lang.String.format ;
 
 import java.util.ArrayList ;
+import java.util.Date ;
 import java.util.List ;
 import java.util.Random ;
 import java.util.concurrent.Callable ;
@@ -108,13 +109,44 @@ public class TestTransSystemJena91
     static final int writerAbortSeqRepeats  = 4 ;
     static final int writerCommitSeqRepeats = 4 ;
     static final int writerMaxPause         = 20 ;
+
+    static String[] properties = { 
+        "java.version", 
+        "java.vendor",
+        "java.runtime.name",
+        "java.runtime.version" ,
+        "java.vm.version" ,
+        "java.vm.vendor" ,
+        "java.vm.name" ,
+        "java.vm.specification.name" ,
+        "java.vm.info", 
+        "java.class.version", 
+        "java.specification.version" ,
+        "java.specification.vendor", 
+        "os.name", 
+        "os.version", 
+        "java.class.path", 
+        "java.home" 
+    } ;
     
     public static void main(String...args)
     {
+        System.out.println(TestTransSystemJena91.class.getSimpleName()) ;
+        System.out.println() ;
+        System.out.println(new Date().toString()) ;
+        for ( String k : properties )
+        {
+            String v = System.getProperty(k) ;
+            System.out.printf("%-30s = %s\n", k, v) ;
+        }
+        System.out.println() ;
+
+        String x = (MEM?"memory":"disk["+SystemTDB.fileMode()+"]") ;
+        
         if ( logging )
-            log.info("START ("+ (MEM?"memory":"disk") + ", {} iterations)", Iterations) ;
+            log.info("START ({}, {} iterations)", x, Iterations) ;
         else
-            printf("START (%s, %d iterations)\n", (MEM?"memory":"disk"), Iterations) ;
+            printf("START (%s, %d iterations)\n", x, Iterations) ;
         
         int N = (Iterations < 10) ? 1 : Iterations / 10 ;
         N = Math.min(N, 100) ;

Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSystem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSystem.java?rev=1174275&r1=1174274&r2=1174275&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSystem.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSystem.java Thu Sep 22 17:36:36 2011
@@ -34,6 +34,7 @@ import org.openjena.atlas.lib.Lib ;
 import org.openjena.atlas.lib.RandomLib ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
+import tx.TestTransSystemJena91 ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
@@ -43,16 +44,32 @@ import com.hp.hpl.jena.tdb.ConfigTest ;
 import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
 import com.hp.hpl.jena.tdb.ReadWrite ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
+import com.hp.hpl.jena.tdb.base.block.FileMode ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.sys.SystemTDB ;
 
 /** System testing of the transactions. */
 public class TestTransSystem
 {
-    //static { SystemTDB.setFileMode(FileMode.direct) ; }
     static { org.openjena.atlas.logging.Log.setLog4j() ; }
-    private static Logger log = LoggerFactory.getLogger(TestTransSystem.class) ;
+    private static Logger log = LoggerFactory.getLogger(TestTransSystemJena91.class) ;
 
-    static boolean MEM = true ;
+    /* Notes:
+     * MS Windows does not allow memory mapped files to be deleted during the run of a JVM.
+     * This means we can't delete a database and reuse it's directory (see clean()).
+     * Therefore, this test program this does not run on MS Windows 64 bit mode.
+     */
+    
+    static { 
+        //SystemTDB.isWindows
+        if ( true )
+            SystemTDB.setFileMode(FileMode.direct) ;
+        
+        if ( SystemTDB.isWindows && SystemTDB.fileMode() == FileMode.mapped )
+            log.error("**** Running with file mapped mode on MS Windows - expected test failure") ;
+    }
+    
+    static boolean MEM = false ;
     
     static final Location LOC = MEM ? Location.mem() : new Location(ConfigTest.getTestingDirDB()) ;
 
@@ -79,10 +96,12 @@ public class TestTransSystem
     
     public static void main(String...args)
     {
+        String x = (MEM?"memory":"disk["+SystemTDB.fileMode()+"]") ;
+        
         if ( logging )
-            log.info("START ("+ (MEM?"memory":"disk") + ", {} iterations)", Iterations) ;
+            log.info("START ({}, {} iterations)", x, Iterations) ;
         else
-            printf("START (%s, %d iterations)\n", (MEM?"memory":"disk"), Iterations) ;
+            printf("START (%s, %d iterations)\n", x, Iterations) ;
         
         int N = (Iterations < 10) ? 1 : Iterations / 10 ;
         N = Math.min(N, 100) ;