[jboss-cvs] JBoss Messaging SVN: r3899 - in trunk: tests/src/org/jboss/messaging/core/journal/impl/test/unit and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2008-03-20 13:03:19 -0400 (Thu, 20 Mar 2008)
New Revision: 3899

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
   trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java
   trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/JournalImplTestBase.java
   trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/RealJournalImplTest.java
Log:
A few tweak


Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-03-20 16:43:57 UTC (rev 3898)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-03-20 17:03:19 UTC (rev 3899)
@@ -939,7 +939,7 @@
 		try
 		{   					
 			checkFile(size);
-			currentFile.getFile().write(bb, false);			
+			currentFile.getFile().write(bb, sync);			
 			currentFile.extendOffset(size);
 		}
 		finally

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java	2008-03-20 16:43:57 UTC (rev 3898)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java	2008-03-20 17:03:19 UTC (rev 3899)
@@ -130,7 +130,7 @@
 		{
 			channel.force(false);
 		}
-		
+
 		return bytesRead;
 	}
 

Modified: trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/JournalImplTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/JournalImplTestBase.java	2008-03-20 16:43:57 UTC (rev 3898)
+++ trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/JournalImplTestBase.java	2008-03-20 17:03:19 UTC (rev 3899)
@@ -1126,7 +1126,7 @@
 	
 	// Private ---------------------------------------------------------------------------------
 	
-	private void setup(int minFiles, int minAvailableFiles, int fileSize, boolean sync)
+	void setup(int minFiles, int minAvailableFiles, int fileSize, boolean sync)
 	{		
 		this.minFiles = minFiles;
 		this.minAvailableFiles = minAvailableFiles;

Modified: trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/RealJournalImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/RealJournalImplTest.java	2008-03-20 16:43:57 UTC (rev 3898)
+++ trunk/tests/src/org/jboss/messaging/core/journal/impl/test/unit/RealJournalImplTest.java	2008-03-20 17:03:19 UTC (rev 3899)
@@ -22,8 +22,12 @@
 package org.jboss.messaging.core.journal.impl.test.unit;
 
 import java.io.File;
+import java.util.ArrayList;
 
+import org.jboss.messaging.core.journal.Journal;
+import org.jboss.messaging.core.journal.RecordInfo;
 import org.jboss.messaging.core.journal.SequentialFileFactory;
+import org.jboss.messaging.core.journal.impl.JournalImpl;
 import org.jboss.messaging.core.journal.impl.NIOSequentialFileFactory;
 import org.jboss.messaging.core.logging.Logger;
 
@@ -44,6 +48,8 @@
 	{				
 		File file = new File(journalDir);
 		
+		log.info("deleting directory " + journalDir);
+		
 		deleteDirectory(file);
 		
 		file.mkdir();		
@@ -53,4 +59,34 @@
 	{
 		return new NIOSequentialFileFactory(journalDir);
 	}
+	
+	public void testSpeed() throws Exception
+	{
+		Journal journal =
+			new JournalImpl(10 * 1024 * 1024, 10, 10, true, new NIOSequentialFileFactory(journalDir),
+					5000, "jbm-data", "jbm");
+		
+		journal.start();
+		
+		journal.load(new ArrayList<RecordInfo>(), null);
+		
+		final int numMessages = 10000;
+		
+		byte[] data = new byte[1024];
+		
+		long start = System.currentTimeMillis();
+		
+		for (int i = 0; i < numMessages; i++)
+		{
+			journal.appendAddRecord(i, data);
+		}
+		
+		long end = System.currentTimeMillis();
+		
+		double rate = 1000 * (double)numMessages / (end - start);
+		
+		log.info("Rate " + rate + " records/sec");
+
+	}
+	
 }