GEODE-7203: Some updates in examples (#522)
Clean up server and locator directories after running examples. Aside from keeping things tidy, this makes a big difference in startup times when running examples multiple times.
diff --git a/examples/cpp/authinitialize/stopserver.ps1 b/examples/cpp/authinitialize/stopserver.ps1
index ec2c218..801c273 100644
--- a/examples/cpp/authinitialize/stopserver.ps1
+++ b/examples/cpp/authinitialize/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=region' -e 'stop server --name=server' -e 'stop locator --name=locator'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/authinitialize/stopserver.sh b/examples/cpp/authinitialize/stopserver.sh
index 67a0f85..4176d8e 100644
--- a/examples/cpp/authinitialize/stopserver.sh
+++ b/examples/cpp/authinitialize/stopserver.sh
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/cpp/continuousquery/stopserver.ps1 b/examples/cpp/continuousquery/stopserver.ps1
index 10d2352..49a23fe 100644
--- a/examples/cpp/continuousquery/stopserver.ps1
+++ b/examples/cpp/continuousquery/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_orderobject' -e 'stop server --name=server' -e 'stop locator --name=locator'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/continuousquery/stopserver.sh b/examples/cpp/continuousquery/stopserver.sh
index f80cd6e..e12c0ef 100755
--- a/examples/cpp/continuousquery/stopserver.sh
+++ b/examples/cpp/continuousquery/stopserver.sh
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/cpp/dataserializable/stopserver.ps1 b/examples/cpp/dataserializable/stopserver.ps1
index 10d2352..49a23fe 100644
--- a/examples/cpp/dataserializable/stopserver.ps1
+++ b/examples/cpp/dataserializable/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_orderobject' -e 'stop server --name=server' -e 'stop locator --name=locator'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/dataserializable/stopserver.sh b/examples/cpp/dataserializable/stopserver.sh
index 3b90a16..3a62601 100755
--- a/examples/cpp/dataserializable/stopserver.sh
+++ b/examples/cpp/dataserializable/stopserver.sh
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#!/bin/env bash
+#!/usr/bin/env bash
GFSH_PATH=""
which gfsh 2> /dev/null
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "destroy region --name=custom_orders" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/cpp/functionexecution/startserver.ps1 b/examples/cpp/functionexecution/startserver.ps1
index bc38327..255bab9 100644
--- a/examples/cpp/functionexecution/startserver.ps1
+++ b/examples/cpp/functionexecution/startserver.ps1
@@ -35,5 +35,5 @@
if ($GFSH_PATH -ne "")
{
- Invoke-Expression "$GFSH_PATH -e 'start locator --name=locator --dir=$PSScriptRoot/locator' -e 'deploy --jar=../../utilities/example.jar' -e 'start server --name=the-server --server-port=50505' -e 'create region --name=partition_region --type=PARTITION'"
-}
\ No newline at end of file
+ Invoke-Expression "$GFSH_PATH -e 'start locator --name=locator --dir=$PSScriptRoot/locator' -e 'deploy --jar=../../utilities/example.jar' -e 'start server --name=server --server-port=50505' -e 'create region --name=partition_region --type=PARTITION'"
+}
diff --git a/examples/cpp/functionexecution/startserver.sh b/examples/cpp/functionexecution/startserver.sh
index b5b8562..8bd6da8 100755
--- a/examples/cpp/functionexecution/startserver.sh
+++ b/examples/cpp/functionexecution/startserver.sh
@@ -28,6 +28,6 @@
fi
fi
-$GFSH_PATH -e "start locator --name=locator" -e "deploy --jar=../../utilities/example.jar" -e "start server --name=the-server --server-port=50505" -e "create region --name=partition_region --type=PARTITION"
+$GFSH_PATH -e "start locator --name=locator" -e "deploy --jar=../../utilities/example.jar" -e "start server --name=server --server-port=50505" -e "create region --name=partition_region --type=PARTITION"
diff --git a/examples/cpp/functionexecution/stopserver.ps1 b/examples/cpp/functionexecution/stopserver.ps1
index 742ce8d..0b57682 100644
--- a/examples/cpp/functionexecution/stopserver.ps1
+++ b/examples/cpp/functionexecution/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'shutdown --include-locators=true'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/functionexecution/stopserver.sh b/examples/cpp/functionexecution/stopserver.sh
index a9d0c5b..8b6f9a3 100755
--- a/examples/cpp/functionexecution/stopserver.sh
+++ b/examples/cpp/functionexecution/stopserver.sh
@@ -30,3 +30,4 @@
$GFSH_PATH -e "connect" -e "shutdown --include-locators=true"
+rm -rf locator server
diff --git a/examples/cpp/pdxserializable/Order.cpp b/examples/cpp/pdxserializable/Order.cpp
index cff2c2d..4ea1138 100644
--- a/examples/cpp/pdxserializable/Order.cpp
+++ b/examples/cpp/pdxserializable/Order.cpp
@@ -40,8 +40,8 @@
}
std::string Order::toString() const {
- return "OrderID: " + std::to_string(order_id_) + " Product Name: " + name_ +
- " Quantity: " + std::to_string(quantity_);
+ return "OrderID: " + std::to_string(order_id_) + std::endl + " Product Name: " +
+ name_ + std::endl + " Quantity: " + std::to_string(quantity_);
}
const std::string& Order::getClassName() const {
diff --git a/examples/cpp/pdxserializable/stopserver.ps1 b/examples/cpp/pdxserializable/stopserver.ps1
index 10d2352..49a23fe 100644
--- a/examples/cpp/pdxserializable/stopserver.ps1
+++ b/examples/cpp/pdxserializable/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_orderobject' -e 'stop server --name=server' -e 'stop locator --name=locator'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/pdxserializable/stopserver.sh b/examples/cpp/pdxserializable/stopserver.sh
index f80cd6e..e12c0ef 100755
--- a/examples/cpp/pdxserializable/stopserver.sh
+++ b/examples/cpp/pdxserializable/stopserver.sh
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/cpp/pdxserializer/stopserver.ps1 b/examples/cpp/pdxserializer/stopserver.ps1
index 10d2352..49a23fe 100644
--- a/examples/cpp/pdxserializer/stopserver.ps1
+++ b/examples/cpp/pdxserializer/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_orderobject' -e 'stop server --name=server' -e 'stop locator --name=locator'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/pdxserializer/stopserver.sh b/examples/cpp/pdxserializer/stopserver.sh
index f80cd6e..e12c0ef 100755
--- a/examples/cpp/pdxserializer/stopserver.sh
+++ b/examples/cpp/pdxserializer/stopserver.sh
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/cpp/putgetremove/stopserver.ps1 b/examples/cpp/putgetremove/stopserver.ps1
index 4857a2d..22c768b 100644
--- a/examples/cpp/putgetremove/stopserver.ps1
+++ b/examples/cpp/putgetremove/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_userinfo' -e 'stop server --name=server' -e 'stop locator --name=locator'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/putgetremove/stopserver.sh b/examples/cpp/putgetremove/stopserver.sh
index 67a0f85..4176d8e 100755
--- a/examples/cpp/putgetremove/stopserver.sh
+++ b/examples/cpp/putgetremove/stopserver.sh
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/cpp/remotequery/stopserver.ps1 b/examples/cpp/remotequery/stopserver.ps1
index 5ac5117..98b1794 100644
--- a/examples/cpp/remotequery/stopserver.ps1
+++ b/examples/cpp/remotequery/stopserver.ps1
@@ -36,4 +36,7 @@
if ($GFSH_PATH -ne "")
{
Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=custom_orders' -e 'stop server --name=server' -e 'stop locator --name=locator'"
-}
\ No newline at end of file
+}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/remotequery/stopserver.sh b/examples/cpp/remotequery/stopserver.sh
index f80cd6e..e12c0ef 100755
--- a/examples/cpp/remotequery/stopserver.sh
+++ b/examples/cpp/remotequery/stopserver.sh
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/cpp/sslputget/stopserver.ps1 b/examples/cpp/sslputget/stopserver.ps1
index 4e59f7a..6ab4d6e 100644
--- a/examples/cpp/sslputget/stopserver.ps1
+++ b/examples/cpp/sslputget/stopserver.ps1
@@ -37,3 +37,6 @@
{
Invoke-Expression "$GFSH_PATH -e 'connect --use-ssl=true --key-store=$PSScriptRoot\ServerSslKeys\server_keystore.jks --trust-store=$PSScriptRoot\ServerSslKeys\server_truststore.jks --trust-store-password=gemstone --key-store-password=gemstone' -e 'shutdown --include-locators=true'"
}
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/sslputget/stopserver.sh b/examples/cpp/sslputget/stopserver.sh
index afa1c0f..805517b 100755
--- a/examples/cpp/sslputget/stopserver.sh
+++ b/examples/cpp/sslputget/stopserver.sh
@@ -32,3 +32,4 @@
$GFSH_PATH -e "connect --use-ssl=true --key-store=${BASEDIR}/ServerSslKeys/server_keystore.jks --trust-store=${BASEDIR}/ServerSslKeys/server_truststore.jks --trust-store-password=gemstone --key-store-password=gemstone" -e "shutdown --include-locators=true"
+rm -rf locator server
diff --git a/examples/cpp/transaction/README.md b/examples/cpp/transaction/README.md
index af0fb37..2c82d66 100644
--- a/examples/cpp/transaction/README.md
+++ b/examples/cpp/transaction/README.md
@@ -37,7 +37,7 @@
$ ./startserver.sh
```
-3. Execute `cpp-transaction`. Expect the following output:
+3. Execute `cpp-transaction`. The output will show the cache and region creation, up to five rolled back transactions, and finally the commit of the transaction if the maximum of five rollback were not executed. For example:
```bash
$ ./cpp-transaction
@@ -48,6 +48,17 @@
Rolled back transaction - retrying(2)
Committed transaction - exiting
```
+
+ ```bash
+ $ ./cpp-transaction
+ Created cache
+ Created region 'exampleRegion'
+ Rolled back transaction - retrying(4)
+ Rolled back transaction - retrying(3)
+ Rolled back transaction - retrying(2)
+ Rolled back transaction - retrying(1)
+ Rolled back transaction - retrying(0)
+ ```
4. Run the `stopserver` script to gracefully shutdown the Geode cluster.
diff --git a/examples/cpp/transaction/stopserver.ps1 b/examples/cpp/transaction/stopserver.ps1
index e5e7f7f..c9e7544 100644
--- a/examples/cpp/transaction/stopserver.ps1
+++ b/examples/cpp/transaction/stopserver.ps1
@@ -23,4 +23,7 @@
$GFSH_PATH = "$env:GEODE_HOME\bin\gfsh.bat"
}
-Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_orderobject' -e 'stop server --name=server' -e 'stop locator --name=locator'"
\ No newline at end of file
+Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_orderobject' -e 'stop server --name=server' -e 'stop locator --name=locator'"
+
+Remove-Item -Path locator -Recurse -Force
+Remove-Item -Path server -Recurse -Force
diff --git a/examples/cpp/transaction/stopserver.sh b/examples/cpp/transaction/stopserver.sh
index 67a0f85..4176d8e 100755
--- a/examples/cpp/transaction/stopserver.sh
+++ b/examples/cpp/transaction/stopserver.sh
@@ -29,3 +29,5 @@
fi
$GFSH_PATH -e "connect" -e "stop server --name=server" -e "stop locator --name=locator"
+
+rm -rf locator server
diff --git a/examples/utilities/startserver.sh b/examples/utilities/startserver.sh
index f26f4b3..53bcfee 100755
--- a/examples/utilities/startserver.sh
+++ b/examples/utilities/startserver.sh
@@ -29,6 +29,6 @@
fi
fi
-$GFSH_PATH -e "start locator --name=locator" -e "deploy --jar=../../build/utilities/example.jar" -e "start server --name=the-server --server-port=50505" -e "create region --name=partition_region --type=PARTITION"
+$GFSH_PATH -e "start locator --name=locator" -e "deploy --jar=../../build/utilities/example.jar" -e "start server --name=server --server-port=50505" -e "create region --name=partition_region --type=PARTITION"
