[infinispan-commits] Infinispan SVN: r646 - in trunk/core/src: test/java/org/infinispan/api/mvcc and 2 other directories.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-08-10 10:18:39 -0400 (Mon, 10 Aug 2009)
New Revision: 646

Modified:
   trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java
   trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
   trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
Log:
[ISPN-149] - (Infinispan transaction commit with many modifications) - fixed

Modified: trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java	2009-08-10 11:16:16 UTC (rev 645)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java	2009-08-10 14:18:39 UTC (rev 646)
@@ -46,8 +46,8 @@
       ReplicableCommand command = (ReplicableCommand) subject;
       output.writeShort(command.getCommandId());
       Object[] args = command.getParameters();
-      byte numArgs = (byte) (args == null ? 0 : args.length);
-      output.writeByte(numArgs);
+      int numArgs = (args == null ? 0 : args.length);
+      output.writeInt(numArgs);
       for (int i = 0; i < numArgs; i++) {
          output.writeObject(args[i]);
       }
@@ -55,7 +55,7 @@
 
    public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
       short methodId = input.readShort();
-      byte numArgs = input.readByte();
+      int numArgs = input.readInt();
       Object[] args = null;
       if (numArgs > 0) {
          args = new Object[numArgs];

Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java	2009-08-10 11:16:16 UTC (rev 645)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java	2009-08-10 14:18:39 UTC (rev 646)
@@ -212,7 +212,8 @@
     *
     * @throws Exception
     */
-   public void testSimpleCacheModeLocal() throws Exception {
+   public void
+   testSimpleCacheModeLocal() throws Exception {
       cacheModeLocalTest(false);
    }
 

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-10 11:16:16 UTC (rev 645)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-10 14:18:39 UTC (rev 646)
@@ -29,8 +29,8 @@
       return new DefaultCacheManager(globalConfiguration);
    }
 
-   public static GlobalConfiguration getGlobalConfigurtion() {
-      GlobalConfiguration globalConfiguration = GlobalConfiguration.getNonClusteredDefault();
+   public static GlobalConfiguration getGlobalClusteredConfigurtion() {
+      GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       amendMarshaller(globalConfiguration);
       return globalConfiguration;
    }

Modified: trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java	2009-08-10 11:16:16 UTC (rev 645)
+++ trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java	2009-08-10 14:18:39 UTC (rev 646)
@@ -4,22 +4,28 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 import org.testng.annotations.Test;
 
 import javax.transaction.TransactionManager;
 
 /**
- *  Test for: https://jira.jboss.org/jira/browse/ISPN-149.
+ * Test for: https://jira.jboss.org/jira/browse/ISPN-149.
  *
  * @author Mircea.Markus at jboss.com
  */
 @Test(testName = "tx.LargeTransactionTest", groups = "functional")
 public class LargeTransactionTest extends MultipleCacheManagersTest {
-   private Cache cache;
 
+   private static Log log = LogFactory.getLog(LargeTransactionTest.class);
+
+   private Cache cache1;
+   private Cache cache2;
+
    protected void createCacheManagers() throws Throwable {
 
       Configuration c = new Configuration();
@@ -27,33 +33,51 @@
       c.setCacheMode(Configuration.CacheMode.REPL_SYNC);
       c.setSyncReplTimeout(30000);
       c.setLockAcquisitionTimeout(60000);
+      c.setSyncCommitPhase(true);
+      c.setSyncRollbackPhase(true);
       c.setUseLockStriping(false);
 
-      CacheManager manager = new DefaultCacheManager(TestCacheManagerFactory.getGlobalConfigurtion(), c);
+      CacheManager manager = new DefaultCacheManager(TestCacheManagerFactory.getGlobalClusteredConfigurtion(), c);
+      manager.start();
+      manager.getCache();
       registerCacheManager(manager);
-      cache = manager.getCache("TestCache");
+      cache1 = manager.getCache("TestCache");
+      assert cache1.getConfiguration().getCacheMode().equals(Configuration.CacheMode.REPL_SYNC);
+      cache1.start();
 
-      manager = new DefaultCacheManager(TestCacheManagerFactory.getGlobalConfigurtion(), c);
+      manager = new DefaultCacheManager(TestCacheManagerFactory.getGlobalClusteredConfigurtion(), c);
+      manager.start();
       registerCacheManager(manager);
-      manager.getCache("TestCache");
+      cache2 = manager.getCache("TestCache");
+      assert cache1.getConfiguration().getCacheMode().equals(Configuration.CacheMode.REPL_SYNC);
    }
 
-   @Override
-   protected void assertSupportedConfig() {
-      //yep!
-   }
-
-   public void simpleTest() throws Exception {
-      TransactionManager tm = TestingUtil.getTransactionManager(cache);
+   public void testLargeTx() throws Exception {
+      TransactionManager tm = TestingUtil.getTransactionManager(cache1);
       tm.begin();
       for (int i = 0; i < 200; i++)
-         cache.put("key" + i, "value" + i);
+         cache1.put("key" + i, "value" + i);
+      log.trace("___________ before commit");
       tm.commit();
 
-      Cache cache2 = cache(1, "TestCache");
       for (int i = 0; i < 200; i++) {
-         assert cache2.get("key" + i).equals("value+i");
+         assert cache2.get("key" + i).equals("value"+i);
       }
+   }
 
+   public void testSinglePutInTx() throws Exception {
+      TransactionManager tm = TestingUtil.getTransactionManager(cache1);
+
+      tm.begin();
+      cache1.put("key", "val");
+      log.trace("___________ before commit");
+      tm.commit();
+
+      assert cache2.get("key").equals("val");
    }
+
+   public void testSimplePutNoTx() {
+      cache1.put("key", "val");
+      assert cache2.get("key").equals("val");
+   }
 }