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 007fa67edced0b01aaca50e792ce96c296286371 Author: David Pecollet <[email protected]> AuthorDate: Tue Dec 15 15:23:04 2020 +0000 styling fixes & edited changes file --- .../protocol/bolt/sampler/AbstractBoltTestElement.java | 3 +++ .../org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java | 12 +++++++++--- xdocs/changes.xml | 7 +++++++ 3 files changed, 19 insertions(+), 3 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 b30f750..807b7ad 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 @@ -85,6 +85,7 @@ public abstract class AbstractBoltTestElement extends AbstractTestElement { this.recordQueryResults = recordQueryResults; } + //returns a SessionConfig object that can be passed to the driver session public SessionConfig getSessionConfig() { SessionConfig.Builder sessionConfigBuilder = SessionConfig.builder() .withDefaultAccessMode(Enum.valueOf(AccessMode.class, getAccessMode())); @@ -95,6 +96,8 @@ public abstract class AbstractBoltTestElement extends AbstractTestElement { return sessionConfigBuilder.build(); } + + //returns a TransactionConfig object that can be passed to the driver transaction public TransactionConfig getTransactionConfig() { TransactionConfig.Builder txConfigBuilder = TransactionConfig.builder(); diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java index e0fa5e3..d717cc8 100644 --- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java +++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java @@ -86,8 +86,13 @@ public class BoltSampler extends AbstractBoltTestElement implements Sampler, Tes try { res.setResponseHeaders("Cypher request: " + getCypher()); res.setResponseData( - execute(BoltConnectionElement.getDriver(), getCypher(), params, - getSessionConfig(), getTransactionConfig()), StandardCharsets.UTF_8.name()); + execute( + BoltConnectionElement.getDriver(), + getCypher(), + params, + getSessionConfig(), + getTransactionConfig()), + StandardCharsets.UTF_8.name()); } catch (Exception ex) { res = handleException(res, ex); } finally { @@ -105,7 +110,8 @@ public class BoltSampler extends AbstractBoltTestElement implements Sampler, Tes return APPLICABLE_CONFIG_CLASSES.contains(guiClass); } - private String execute(Driver driver, String cypher, Map<String, Object> params, SessionConfig sessionConfig, TransactionConfig txConfig) { + private String execute(Driver driver, String cypher, Map<String, Object> params, + SessionConfig sessionConfig, TransactionConfig txConfig) { try (Session session = driver.session(sessionConfig)) { Result statementResult = session.run(cypher, params, txConfig); return response(statementResult); diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 8162185..01aee2c 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -86,6 +86,12 @@ Summary <h3>Other samplers</h3> <ul> <li><bug>65149</bug><pr>644</pr>Encode the personal part of email addresses in SMTP Sampler</li> +<ul>Bolt Sampler : added "transaction timeout" option +</ul> +<ul>Bolt Sampler : added "database" option, required for Neo4j 4.x (with multi-database support) +</ul> +<ul>Bolt Sampler : added "access mode" option, that allows running against a Neo4j Enterprise causal cluster, + with proper query routing using the "neo4://" or "bolt+routing://" URL schemes. </ul> <h3>Controllers</h3> @@ -135,6 +141,7 @@ Summary <h3>Other Samplers</h3> <ul> <li><bug>65152</bug>OS Process Sampler - Cannot <code>Add from Clipboard</code> Command parameters</li> +<ul>Bolt Sampler : fixed error displaying results when "Record Query Results" is enabled. </ul> <h3>Controllers</h3>
