@@ -21,7 +21,7 @@ class NoTransactionInScopeException extends RuntimeException
class TransactionRetryException(message: String) extends RuntimeException(message)
/**
- * Example of atomic transaction management.
+ * Example of atomic transaction management using high-order functions:
* <pre>
* import se.scalablesolutions.akka.stm.Transaction._
* atomic {
@@ -39,13 +39,52 @@ class TransactionRetryException(message: String) extends RuntimeException(messag
* }
* </pre>
*
+ * Example of atomic transaction management using for comprehensions (monadic usage):
+ *
+ * <pre>
+ * import se.scalablesolutions.akka.stm.Transaction._
+ * for (tx <- Transaction) {
+ * ... // do transactional stuff
+ * }
+ *
+ * val result = for (tx <- Transaction) yield {
+ * ... // do transactional stuff yielding a result
+ * }
+ * </pre>
+ *
+ * Example of using Transaction and TransactionalRef in for comprehensions (monadic usage):
+ *
+ * <pre>
+ * // For example, if you have a List with TransactionalRef
+ * val refs: List[TransactionalRef] = ...
+ *
+ * // You can use them together with Transaction in a for comprehension since TransactionalRef is also monadic
+ * for {
+ * tx <- Transaction
+ * ref <- refs
+ * } {
+ * ... // use the ref inside a transaction
+ * }
+ *
+ * val result = for {
+ * tx <- Transaction
+ * ref <- refs
+ * } yield {
+ * ... // use the ref inside a transaction, yield a result
+ * }
+ * </pre>
+ *
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
*/
object Transaction extends TransactionManagement {
val idFactory = new AtomicLong(-1L)
- // -- Monad --------------------------
- // FIXME implement Transaction::map/flatMap/filter/foreach
+ // -- monadic api --------------------------
+ def map[T](f: Transaction => T): T = atomic { f(getTransactionInScope) }
+
+ def flatMap[T](f: Transaction => T): T = atomic { f(getTransactionInScope) }
+
+ def foreach(f: Transaction => Unit): Unit = atomic { f(getTransactionInScope) }
// -- atomic block --------------------------
def atomic[T](body: => T): T = new AtomicTemplate[T](
@@ -63,28 +102,51 @@ object Transaction extends TransactionManagement {
}.execute()
// FIXME: add these other atomic methods
-/*
- def atomic[T](retryCount: Int)(body: => T): T = new AtomicTemplate[T](Multiverse.STM, "akka", false, false, retryCount) {
- def execute(mtx: MultiverseTransaction): T = body
- override def postCommit =
- if (isTransactionInScope) getTransactionInScope.commit
- else throw new IllegalStateException("No transaction in scope")
- }.execute
+ def atomic[T](retryCount: Int)(body: => T): T = {
+ new AtomicTemplate[T](getGlobalStmInstance, "akka", false, false, retryCount) {
+ def execute(mtx: MultiverseTransaction): T = body
+ override def postStart(mtx: MultiverseTransaction) = {
+ val tx = new Transaction
+ tx.transaction = Some(mtx)
+ setTransaction(Some(tx))
+ }
+ override def postCommit = {
+ if (isTransactionInScope) {}///getTransactionInScope.commit
+ else throw new IllegalStateException("No transaction in scope")
+ }
+ }.execute
+ }
- def atomicReadOnly[T](retryCount: Int)(body: => T): T = new AtomicTemplate[T](Multiverse.STM, "akka", false, true, retryCount) {
- def execute(mtx: MultiverseTransaction): T = body
- override def postCommit =
- if (isTransactionInScope) getTransactionInScope.commit
- else throw new IllegalStateException("No transaction in scope")
- }.execute
+ def atomicReadOnly[T](retryCount: Int)(body: => T): T = {
+ new AtomicTemplate[T](getGlobalStmInstance, "akka", false, true, retryCount) {
+ def execute(mtx: MultiverseTransaction): T = body
+ override def postStart(mtx: MultiverseTransaction) = {
+ val tx = new Transaction
+ tx.transaction = Some(mtx)
+ setTransaction(Some(tx))
+ }
+ override def postCommit = {
+ if (isTransactionInScope) {}///getTransactionInScope.commit
+ else throw new IllegalStateException("No transaction in scope")
+ }
+ }.execute
+ }
+
+ def atomicReadOnly[T](body: => T): T = {
+ new AtomicTemplate[T](true) {
+ def execute(mtx: MultiverseTransaction): T = body
+ override def postStart(mtx: MultiverseTransaction) = {
+ val tx = new Transaction
+ tx.transaction = Some(mtx)
+ setTransaction(Some(tx))
+ }
+ override def postCommit = {
+ if (isTransactionInScope) {}///getTransactionInScope.commit
+ else throw new IllegalStateException("No transaction in scope")
+ }
+ }.execute
+ }
- def atomicReadOnly[T](body: => T): T = new AtomicTemplate[T](true) {
- def execute(mtx: MultiverseTransaction): T = body
- override def postCommit =
- if (isTransactionInScope) getTransactionInScope.commit
- else throw new IllegalStateException("No transaction in scope")
- }.execute
-*/
// -- Run-OrElse --------------------------
def run[A](orBody: => A) = elseBody(orBody)
def elseBody[A](orBody: => A) = new {
@@ -104,16 +166,10 @@ object Transaction extends TransactionManagement {
val id = Transaction.idFactory.incrementAndGet
@volatile private[this] var status: TransactionStatus = TransactionStatus.New
private[akka] var transaction: Option[MultiverseTransaction] = None
-
private[this] val persistentStateMap = new HashMap[String, Committable]
-
private[akka] val depth = new AtomicInteger(0)
- def increment = depth.incrementAndGet
- def decrement = depth.decrementAndGet
- def isTopLevel = depth.get == 0
-
- def register(uuid: String, storage: Committable) = persistentStateMap.put(uuid, storage)
+ // --- public methods ---------
def commit = synchronized {
atomic {
@@ -123,12 +179,26 @@ object Transaction extends TransactionManagement {
status = TransactionStatus.Completed
}
- def status_? = status
def isNew = synchronized { status == TransactionStatus.New }
+
def isActive = synchronized { status == TransactionStatus.Active }
+
def isCompleted = synchronized { status == TransactionStatus.Completed }
+
def isAborted = synchronized { status == TransactionStatus.Aborted }
+ // --- internal methods ---------
+
+ private[akka] def status_? = status
+
+ private[akka] def increment = depth.incrementAndGet
+
+ private[akka] def decrement = depth.decrementAndGet
+
+ private[akka] def isTopLevel = depth.get == 0
+
+ private[akka] def register(uuid: String, storage: Committable) = persistentStateMap.put(uuid, storage)
+
private def ensureIsActive = if (status != TransactionStatus.Active)
throw new IllegalStateException("Expected ACTIVE transaction - current status [" + status + "]: " + toString)
@@ -158,10 +228,18 @@ object Transaction extends TransactionManagement {
override def toString(): String = synchronized { "Transaction[" + id + ", " + status + "]" }
}
+/**
+ * @author <a href="http://jonasboner.com">Jonas Bonér</a>
+ */
@serializable sealed abstract class TransactionStatus
+
+/**
+ * @author <a href="http://jonasboner.com">Jonas Bonér</a>
+ */
object TransactionStatus {
case object New extends TransactionStatus
case object Active extends TransactionStatus
case object Aborted extends TransactionStatus
case object Completed extends TransactionStatus
}
+
akka-actors/src/main/scala/stm/Transaction.scala
@@ -61,9 +61,9 @@ trait Committable {
object TransactionalRef {
/**
- * An implicit conversion that converts an option to an iterable value
+ * An implicit conversion that converts an Option to an Iterable value.
*/
- implicit def ref2Iterable[T](ref: TransactionalRef[T]): Iterable[T] = ref.toList
+ implicit def ref2Iterable[T](ref: TransactionalRef[T]): Iterable[T] = ref.toList
def apply[T]() = new TransactionalRef[T]
}
akka-actors/src/main/scala/stm/TransactionalState.scala
@@ -5,9 +5,9 @@
</component>
<component name="ChangeListManager" verified="true">
<list default="true" readonly="true" id="188c966f-a83c-4d3a-9128-54d5a2947a12" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" afterPath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/ActorRegistry.scala" afterPath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/ActorRegistry.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" afterPath="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" afterPath="$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" />
</list>
<ignored path="akka.iws" />
<ignored path=".idea/workspace.xml" />
@@ -95,8 +95,8 @@
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="testng.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/akka-fun-test-java/testng.xml">
+ <file leaf-file-name="Actor.scala" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
@@ -104,19 +104,19 @@
</provider>
</entry>
</file>
- <file leaf-file-name="Actor.scala" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala">
+ <file leaf-file-name="Transaction.scala" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.07692308">
+ <state line="54" column="56" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.37169313">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Transaction.scala" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala">
+ <file leaf-file-name="TransactionManagement.scala" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionManagement.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="167" column="0" selection-start="6138" selection-end="6138" vertical-scroll-proportion="0.0">
+ <state line="57" column="41" selection-start="2423" selection-end="2444" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -125,7 +125,7 @@
<file leaf-file-name="TransactionalState.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="79" column="0" selection-start="1902" selection-end="1902" vertical-scroll-proportion="0.0">
+ <state line="12" column="54" selection-start="293" selection-end="293" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -146,10 +146,8 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/config/akka.conf" />
<option value="$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala" />
- <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" />
<option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" />
<option value="$PROJECT_DIR$/akka-rest/src/main/scala/AkkaServlet.scala" />
<option value="$PROJECT_DIR$/config/akka-reference.conf" />
@@ -159,9 +157,11 @@
<option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" />
<option value="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" />
<option value="$PROJECT_DIR$/config/storage-conf.xml" />
- <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" />
<option value="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" />
<option value="$PROJECT_DIR$/akka-actors/src/main/scala/actor/ActorRegistry.scala" />
+ <option value="$PROJECT_DIR$/akka-actors/src/test/scala/InMemoryActorTest.scala" />
+ <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" />
+ <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" />
</list>
</option>
</component>
@@ -516,6 +516,14 @@
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="scala" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1153,9 +1161,10 @@
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17893218" sideWeight="0.7020295" order="0" side_tool="false" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17893218" sideWeight="0.6658163" order="0" side_tool="false" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2915129" sideWeight="0.5" order="1" side_tool="false" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3252551" sideWeight="0.5" order="12" side_tool="false" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
@@ -1167,7 +1176,6 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908162" sideWeight="0.5" order="11" side_tool="false" />
<window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32564574" sideWeight="0.5" order="12" side_tool="false" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
@@ -1205,16 +1213,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/akka-rest/src/main/scala/ActorComponentProviderFactory.scala">
- <provider selected="true" editor-type-id="text-editor">
- <state line="6" column="0" selection-start="91" selection-end="91" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/akka-kernel/src/main/scala/AkkaServlet.scala">
- <provider selected="true" editor-type-id="text-editor">
- <state line="35" column="91" selection-start="1421" selection-end="1421" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="28" selection-start="311" selection-end="311" vertical-scroll-proportion="0.0" />
@@ -1274,23 +1272,37 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala">
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/test/scala/InMemoryActorTest.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="79" column="0" selection-start="1902" selection-end="1902" vertical-scroll-proportion="0.0">
+ <state line="28" column="15" selection-start="933" selection-end="938" vertical-scroll-proportion="0.71794873">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala">
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="167" column="0" selection-start="6138" selection-end="6138" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala">
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionManagement.scala">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="57" column="41" selection-start="2423" selection-end="2444" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="54" selection-start="293" selection-end="293" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.07692308">
+ <state line="54" column="56" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.37169313">
<folding />
</state>
</provider>
akka.iws
927936da6816993e51742ffa182fc025ddecc149
jboner
jboner@109-dynamic.2005275.venues.thecloud.net
http://github.com/jboner/akka/commit/5f4df011521b8aae725a58a7f4fa58e46f747622
5f4df011521b8aae725a58a7f4fa58e46f747622
2009-11-02T13:14:24-08:00
2009-11-02T13:14:24-08:00
added monadic api to the transaction
18f5fabd19944133ff5bba1fa9c204fe224318a0
jboner
jboner@109-dynamic.2005275.venues.thecloud.net