[jbosscache-commits] JBoss Cache SVN: r6895 - in core/branches/flat/src/main/java/org/jboss: starobrno and 2 other directories.

Author: manik.surtani(a)jboss.com Date: 2008-10-09 05:55:17 -0400 (Thu, 09 Oct 2008) New Revision: 6895 Modified: core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/MVCCEntryWrapper.java core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/NullMarkerEntry.java core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/ReadCommittedEntry.java core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/RepeatableReadEntry.java Log: Several pints of Starobrno Modified: core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -31,7 +31,6 @@ import org.jboss.cache.loader.CacheLoader; import org.jboss.cache.marshall.NodeData; import org.jboss.cache.marshall.NodeDataExceptionMarker; -import org.jboss.starobrno.factories.annotations.Start; import java.io.IOException; import java.io.ObjectOutputStream; @@ -58,11 +57,11 @@ // this.cache = cache; // } - @Start(priority = 14) - private void start() - { - this.internalFqns = cache.getInternalFqns(); - } +// @Start(priority = 14) +// private void start() +// { +// this.internalFqns = cache.getInternalFqns(); +// } public void generateState(ObjectOutputStream out, Object rootNode, boolean generateTransient, boolean generatePersistent, boolean suppressErrors) throws Exception Modified: core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -70,10 +70,11 @@ this.cfg = cfg; } + @Start(priority = 14) public void start() { - this.internalFqns = cache.getInternalFqns(); +// this.internalFqns = cache.getInternalFqns(); needToPersistState = cfg.getCacheLoaderConfig() != null && !cfg.getCacheLoaderConfig().isFetchPersistentState() && !cfg.getCacheLoaderConfig().isShared(); } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -149,7 +149,8 @@ public V remove(Object key) { RemoveCommand command = commandsFactory.buildRemoveCommand(key, null); - return (V) invoker.invoke(buildCtx(), command); + V oldval = (V) invoker.invoke(buildCtx(), command); + return oldval; } public void putAll(Map<? extends K, ? extends V> t) @@ -328,7 +329,7 @@ public ComponentRegistry getComponentRegistry() { - return null; //TODO: Autogenerated. Implement me properly + return componentRegistry; } public CacheStatus getCacheStatus() Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -51,13 +51,13 @@ return visitor.visitRemoveCommand(ctx, this); } - public Boolean perform(InvocationContext ctx) throws Throwable + public Object perform(InvocationContext ctx) throws Throwable { MVCCEntry e = ctx.lookupEntry(key); - if (e == null || e.isNullEntry()) return false; + if (e == null || e.isNullEntry()) return null; e.setDeleted(true); e.setValid(false); - return true; + return e.getValue(); } public int getCommandId() Modified: core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/MVCCEntryWrapper.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/MVCCEntryWrapper.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/MVCCEntryWrapper.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -139,7 +139,7 @@ { // now to lock and create the node. Lock first to prevent concurrent creation! acquireLock(ctx, key); - entry = entryFactory.createEntry(key, null, true); + entry = entryFactory.createEntry(key, null, false); mvccEntry = entryFactory.createWrappedEntry(entry); mvccEntry.setCreated(true); ctx.putLookedUpEntry(mvccEntry); Modified: core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/NullMarkerEntry.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/NullMarkerEntry.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/NullMarkerEntry.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -32,11 +32,18 @@ */ public class NullMarkerEntry extends RepeatableReadEntry { + private static final Object NULL = new Object(); + public NullMarkerEntry() { super(null); } + public Object getKey() + { + return NULL; + } + /** * @return always returns true */ Modified: core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/ReadCommittedEntry.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/ReadCommittedEntry.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/ReadCommittedEntry.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -147,7 +147,14 @@ if (trace) log.trace("Updating entry [" + getKey() + "]. deleted=" + isDeleted() + " valid=" + isValid() + " changed=" + isChanged() + " created=" + isFlagSet(CREATED)); updateEntry(container); - container.putEntry(entry); + if (isFlagSet(DELETED)) + { + container.removeEntry(getKey()); + } + else + { + container.putEntry(entry); + } reset(); } } @@ -170,7 +177,6 @@ { // swap refs if (!isFlagSet(CREATED)) ((EntryReference) backup).setDelegate(entry); - entry = backup; } public void rollbackUpdate() Modified: core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/RepeatableReadEntry.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/RepeatableReadEntry.java 2008-10-09 09:31:22 UTC (rev 6894) +++ core/branches/flat/src/main/java/org/jboss/starobrno/mvcc/RepeatableReadEntry.java 2008-10-09 09:55:17 UTC (rev 6895) @@ -75,6 +75,6 @@ @SuppressWarnings("unchecked") protected void updateEntry(DataContainer dataContainer) { - entry = backup; + // do nothing } } \ No newline at end of file