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/11/30 14:45:10 UTC
svn commit: r1208425 - in /incubator/jena:
Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java
Scratch/AFS/Jena-Dev/trunk/src/dev/Jena163_TDBDifferentIds.java
Author: andy
Date: Wed Nov 30 13:45:09 2011
New Revision: 1208425
URL: http://svn.apache.org/viewvc?rev=1208425&view=rev
Log: (empty)
Modified:
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.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/TransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java?rev=1208425&r1=1208424&r2=1208425&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java Wed Nov 30 13:45:09 2011
@@ -300,7 +300,7 @@ public class TransactionManager
return begin$(mode, label) ;
}
- public static boolean tmpDebugNoteBegin = false ;
+ public static boolean tmpDebugNoteActions = false ;
synchronized
private DatasetGraphTxn begin$(ReadWrite mode, String label)
@@ -317,7 +317,7 @@ public class TransactionManager
if ( mode == ReadWrite.WRITE && activeWriters.get() > 0 ) // Guard
throw new TDBTransactionException("Existing active write transaction") ;
- if ( tmpDebugNoteBegin )
+ if ( tmpDebugNoteActions )
switch ( mode )
{
case READ : System.out.print("r") ; break ;
@@ -329,12 +329,12 @@ public class TransactionManager
DatasetGraphTDB dsg = baseDataset ;
// *** But, if there are pending, committed transactions, use latest.
if ( ! commitedAwaitingFlush.isEmpty() )
- { if ( tmpDebugNoteBegin ) System.out.print(commitedAwaitingFlush.size()) ;
+ { if ( tmpDebugNoteActions ) System.out.print(commitedAwaitingFlush.size()) ;
dsg = commitedAwaitingFlush.get(commitedAwaitingFlush.size()-1).getActiveDataset() ;
}
else
{
- if ( tmpDebugNoteBegin ) System.out.print('_') ;
+ if ( tmpDebugNoteActions ) System.out.print('_') ;
}
Transaction txn = createTransaction(dsg, mode, label) ;
DatasetGraphTxn dsgTxn = (DatasetGraphTxn)new DatasetBuilderTxn(this).build(txn, mode, dsg) ;
@@ -413,6 +413,9 @@ public class TransactionManager
return ;
}
+ if ( tmpDebugNoteActions && queue.size() > 0 )
+ System.out.print("!"+queue.size()+"!") ;
+
while ( queue.size() > 0 )
{
// Currently, replay is replay everything
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=1208425&r1=1208424&r2=1208425&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 Wed Nov 30 13:45:09 2011
@@ -107,7 +107,7 @@ public class Jena163_TDBDifferentIds
private static boolean inlineProgress = true ; // Set true so that every transaction print a letter for what it does.
static {
- TransactionManager.tmpDebugNoteBegin = inlineProgress ;
+ TransactionManager.tmpDebugNoteActions = inlineProgress ;
}
// Queue treads starting