geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmil...@apache.org
Subject [1/2] geode-native git commit: GEODE-2513 Unbrand Transactions section of doc
Date Wed, 15 Mar 2017 23:34:07 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop 125624f5b -> 450d5d7f2


GEODE-2513 Unbrand Transactions section of doc

- Also updated an instance of an old package namespace


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/89245fb3
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/89245fb3
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/89245fb3

Branch: refs/heads/develop
Commit: 89245fb378808d594debdd721d8ef199b3017f1d
Parents: 39a0d71
Author: Karen Miller <kmiller@pivotal.io>
Authored: Wed Mar 15 15:27:47 2017 -0700
Committer: Karen Miller <kmiller@pivotal.io>
Committed: Wed Mar 15 15:27:47 2017 -0700

----------------------------------------------------------------------
 .../source/subnavs/geode-nc-nav.erb             |  4 ++--
 .../how-native-client-xacts-work.html.md.erb    | 21 +++++++++--------
 .../running-native-client-xact.html.md.erb      | 14 ++++++------
 .../suspend-resume-xacts.html.md.erb            |  2 +-
 .../transactions/transactions.html.md.erb       | 24 ++++++++++++++------
 5 files changed, 38 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/89245fb3/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
index e61c9ea..7f2435a 100644
--- a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
+++ b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
@@ -824,10 +824,10 @@ limitations under the License.
                         <a href="/docs/guide-native/11/transactions/transactions.html">Transactions</a>
                         <ul>
                             <li>
-                                <a href="/docs/guide-native/11/transactions/how-native-client-xacts-work.html">How
Native Client Transactions Work</a>
+                                <a href="/docs/guide-native/11/transactions/how-native-client-xacts-work.html">How
Client Transactions Work</a>
                             </li>
                             <li>
-                                <a href="/docs/guide-native/11/transactions/running-native-client-xact.html">Running
a Native Client Transaction</a>
+                                <a href="/docs/guide-native/11/transactions/running-native-client-xact.html">Running
a Client Transaction</a>
                             </li>
                             <li>
                                 <a href="/docs/guide-native/11/transactions/suspend-resume-xacts.html">Suspending
and Resuming Transactions</a>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/89245fb3/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
b/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
index 14ccee4..7a2737e 100644
--- a/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
+++ b/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  How Native Client Transactions Work
+title:  How Client Transactions Work
 ---
 
 <!--
@@ -23,12 +23,15 @@ The syntax for writing client transactions is the same as with server
or peer tr
 
 ## <a id="how-native-client-xacts-work__section_C804F1FE5BDF49CEA037AA589BBF284E" class="no-quick-link"></a>Role
of Server Delegates in Transactions
 
-The Geode native client can run transactions on the Java cache server, using a server delegate
to actually run the transaction code.
+The client can run transactions on the Java cache server, using a server delegate to actually
run the transaction code.
 
-For information on transaction requirements and activities on the server side, see [Transactions](geodeman/developing/transactions/chapter_overview.html).
+For information on transaction requirements and activities on the
+server side, see the server documentation at
+[Transactions](geodeman/developing/transactions/chapter_overview.html).
 
 **Note:**
-The client cache blocks until the transaction is successfully committed. However, the client
cache block is removed if the transaction is suspended.
+The client cache blocks until the transaction is successfully committed.
+However, the block is removed if the transaction is suspended.
 
 Depending on where the data resides, the server transaction delegate may or not be the same
member that hosts the transaction. This is the same as for transactions run by the servers,
but for server-run transactions, there is no delegate. There is just the member that is directly
running its own transaction code.
 
@@ -43,13 +46,11 @@ To maintain cache consistency, the local client cache is not accessible
during a
 
 In addition to the failure conditions common to all transactions, client transactions can
also fail if the transaction delegate fails. If the delegate performing the transaction fails,
the transaction code throws a `TransactionException`.
 
-## <a id="how-native-client-xacts-work__section_434BA87403C1449FADC3E7796E30F3C7" class="no-quick-link"></a>Native
Client Transaction APIs
+## <a id="how-native-client-xacts-work__section_434BA87403C1449FADC3E7796E30F3C7" class="no-quick-link"></a>Client
Transaction APIs
 
-The Geode API for distributed transactions has the familiar relational database methods,
`begin`, `commit`, and `rollback`. There are also APIs available to suspend and resume transactions.
+The API for distributed transactions has the familiar relational database methods, `begin`,
`commit`, and `rollback`. There are also APIs available to suspend and resume transactions.
 
 The .NET classes for executing transactions are:
 
-**GemStone::GemFire::Cache::Generic**
-
--   CacheTransactionManager
--   TransactionId
+-   Apache.Geode.Client.CacheTransactionManager
+-   Apache.Geode.Client.TransactionId

http://git-wip-us.apache.org/repos/asf/geode-native/blob/89245fb3/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb b/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb
index 3723688..62759d8 100644
--- a/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb
+++ b/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Running a Native Client Transaction
+title:  Running a Transaction
 ---
 
 <!--
@@ -19,9 +19,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Before you can run a native client transaction, you must configure your clients and servers;
define your server regions for your transactions; and define your client regions.
+Before you can run a transaction, you must configure your clients and servers, define your
server regions for your transactions, and define your client regions.
 
-1.  Retrieve the Geode cache transaction manager.
+1.  Retrieve the transaction manager.
 
     **C++ example**
 
@@ -37,7 +37,7 @@ Before you can run a native client transaction, you must configure your
clients
           cache.CacheTransactionManager;
     ```
 
-2.  Run your transaction. (Detailed steps follow the examples.)
+2.  Run the transaction. (Detailed steps follow the examples.)
 
     **C++ example**
 
@@ -73,9 +73,9 @@ Before you can run a native client transaction, you must configure your
clients
     } catch (CommitConflictException e)
     ```
     -   Start each transaction with a `begin` operation.
-    -   If your transaction runs on server regions that are a mix of partitioned and replicated
regions, perform your first transaction operation on a partitioned region. This sets the server
data host for the entire transaction. If you are using PR single-hop, single-hop will be applied
as usual to this first operation.
-    -   Run the Geode operations and other operations that you want included in the transaction.
-    -   End each transaction with a `commit` or a `rollback`.
+    -   If the transaction runs on server regions that are a mix of partitioned and replicated
regions, perform the first transaction operation on a partitioned region. This sets the server
data host for the entire transaction. If you are using PR single-hop, single-hop will be applied
as usual to this first operation.
+    -   Run the operations that you want included in the transaction.
+    -   End the transaction with a `commit` or a `rollback`.
         **Note:**
         Do not leave any transaction in an uncommitted and unrolled back state unless you
have suspended the transaction. Transactions that have not been explicitly suspended do not
time out, so will remain in the system for the life of your application.
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/89245fb3/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb b/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
index bae2194..3dfeea0 100644
--- a/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
+++ b/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
@@ -29,6 +29,6 @@ If the member with the primary copy of the data crashes, the transactional
view
 
 If a suspended transaction is not touched for a period of time, Geode cleans it up automatically.
By default, the timeout for a suspended transaction is 30 minutes and can be configured by
using the `suspended-tx-timeout` property of the `geode.properties` file. The suspended transaction
timeout value is specified in milliseconds.
 
-See [Running a Native Client Transaction](running-native-client-xact.html) for code examples
of how to suspend and resume a transaction.
+See [Running a Client Transaction](running-native-client-xact.html) for code examples that
show a how to suspend and resume a transaction.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/89245fb3/docs/geode-native-docs/transactions/transactions.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/transactions.html.md.erb b/docs/geode-native-docs/transactions/transactions.html.md.erb
index ec2ab29..d719f9b 100644
--- a/docs/geode-native-docs/transactions/transactions.html.md.erb
+++ b/docs/geode-native-docs/transactions/transactions.html.md.erb
@@ -19,17 +19,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-*Transactions* describes how transactions work on the client side. It provides examples for
running, suspending, and resuming transactions.
-
-Geode client transactions run on the server tier. The client uses a server delegate that
runs the transaction as it would a local transaction. Thus, the key to running client transactions
lies in making sure the server is properly configured and programmed. For complete information
about Geode transactions in the Java server, see [Transactions](geodeman/developing/transactions/chapter_overview.html).
It provides detailed information including server data requirements, interactions of Geode
transactions with other operations running on the server tier, server-side application plug-ins
with transactions, and querying with transactions.
-
--   **[How Native Client Transactions Work](how-native-client-xacts-work.html)**
+This section describes how transactions work on the client side. It provides examples for
running, suspending, and resuming transactions.
+
+Client transactions run on the server tier. The client uses a server delegate
+that runs the transaction as it would a local transaction.
+Thus, the key to running client transactions lies in making sure the server
+is properly configured and programmed.
+For complete information about transactions in the Java server,
+see the server documentation at
+[Transactions](geodeman/developing/transactions/chapter_overview.html).
+It provides detailed information including server data requirements,
+interactions of transactions with other operations running on the server tier,
+server-side application plug-ins with transactions,
+and querying with transactions.
+
+-   **[How Client Transactions Work](how-native-client-xacts-work.html)**
 
     The syntax for writing client transactions is the same as with server or peer transactions,
but when a client performs a transaction, the transaction is delegated to a server that brokers
the transaction.
 
--   **[Running a Native Client Transaction](running-native-client-xact.html)**
+-   **[Running a Client Transaction](running-native-client-xact.html)**
 
-    Before you can run a native client transaction, you must configure your clients and servers;
define your server regions for your transactions; and define your client regions.
+    Before you can run a client transaction, you must configure your clients and servers;
define your server regions for your transactions; and define your client regions.
 
 -   **[Suspending and Resuming Transactions](suspend-resume-xacts.html)**
 


Mime
View raw message