[jmeter] 08/12: getAccessMode with guard clause

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 8a6556c77cb2ddbd47faff768038bc10510c8acf
Author: David Pecollet <da...@gmail.com>
AuthorDate: Mon Jan 11 10:45:44 2021 +0000

    getAccessMode with guard clause
    
    also updated the docs of the Bolt Sampler and Bolt config to reflect the new parameters
    pngquant new images
---
 .../bolt/sampler/AbstractBoltTestElement.java      |   5 ++---
 xdocs/changes.xml                                  |   2 +-
 .../images/screenshots/bolt-connection-config.png  | Bin 46364 -> 18012 bytes
 xdocs/images/screenshots/bolt-request.png          | Bin 139114 -> 57224 bytes
 xdocs/usermanual/component_reference.xml           |  11 ++++++++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java
index 0ec9579..5b99681 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java
@@ -44,11 +44,10 @@ public abstract class AbstractBoltTestElement extends AbstractTestElement {
     }
 
     public String getAccessMode() {
-        if (accessMode != null) {
-            return accessMode;
-        } else {
+        if (accessMode == null) {
             return AccessMode.WRITE.toString();
         }
+        return accessMode;
     }
 
     public void setAccessMode(String accessMode) {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 01aee2c..fc2e6f0 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -105,7 +105,7 @@ Summary
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
-<ul>
+<ul>Bolt Connection Configuration: added ConnectionPoolMaxSize parameter
 </ul>
 
 <h3>Functions</h3>
diff --git a/xdocs/images/screenshots/bolt-connection-config.png b/xdocs/images/screenshots/bolt-connection-config.png
index 3afe34a..72220ce 100644
Binary files a/xdocs/images/screenshots/bolt-connection-config.png and b/xdocs/images/screenshots/bolt-connection-config.png differ
diff --git a/xdocs/images/screenshots/bolt-request.png b/xdocs/images/screenshots/bolt-request.png
index 521772e..b92ecc8 100644
Binary files a/xdocs/images/screenshots/bolt-request.png and b/xdocs/images/screenshots/bolt-request.png differ
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 14a4932..2ed6086 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -1970,7 +1970,7 @@ MongoDB Script is more suitable for functional testing or test setup (setup/tear
         <p>This sampler allows you to run Cypher queries through the Bolt protocol.</p>
         <p>Before using this you need to set up a <complink name="Bolt Connection Configuration"/></p>
         <p>Every request uses a connection acquired from the pool and returns it to the pool when the sampler completes.
-        The connection pool size use the driver defaults (~100) and is not configurable at the moment.</p>
+        The connection pool size defaults to 100 and is configurable.</p>
         <p>The measured response time corresponds to the "full" query execution, including both
         the time to execute the cypher query AND the time to consume the results sent back by the database.</p>
     </description>
@@ -1986,6 +1986,13 @@ MongoDB Script is more suitable for functional testing or test setup (setup/tear
             Whether to add or not query result data to the sampler response (default false).
             Note that activating this has a memory overhead, use it wisely.
         </property>
+        <property name="Access Mode" required="Yes">Whether to access the database in WRITE or READ mode.
+            Use WRITE for a standalone Neo4j instance.
+            For a Neo4j cluster, select mode depending on whether the query writes to the database.
+            That setting will allow correct routing to the cluster leader, followers or read replicas.</property>
+        <property name="Database" required="No">The database to run the query against.
+            Required for Neo4j 4.0+, unless querying the default database. Must be undefined for Neo4j 3.5.</property>
+        <property name="Transaction timeout" required="No">Timeout for the transaction.</property>
     </properties>
 
     <note>It is strongly advised to use query parameters, allowing the database to cache and reuse execution plans.</note>
@@ -4524,6 +4531,8 @@ DB db = MongoDBHolder.getDBFromSource("value of property MongoDB Source",
         <property name="Bolt URI" required="Yes">The database URI.</property>
         <property name="Username" required="No">User account.</property>
         <property name="Password" required="No">User credentials.</property>
+        <property name="Connection Pool Max Size" required="Yes">Max size of the Neo4j driver Bolt connection pool.
+            Raise the value if running large number of concurrent threads, so that JMeter threads are not blocked waiting for a connection to be released to the pool.</property>
     </properties>
 </component>