@@ -137,7 +137,7 @@ public class CassandraStatement extends AbstractStatement
137137 * The consistency level used for the statement.
138138 */
139139 protected ConsistencyLevel consistencyLevel ;
140-
140+ private boolean isClosed ;
141141 private DriverExecutionProfile customTimeoutProfile ;
142142
143143 /**
@@ -210,6 +210,7 @@ public class CassandraStatement extends AbstractStatement
210210 this .cql = cql ;
211211 this .batchQueries = new ArrayList <>();
212212 this .consistencyLevel = connection .getDefaultConsistencyLevel ();
213+ this .isClosed = false ;
213214
214215 if (!(resultSetType == ResultSet .TYPE_FORWARD_ONLY
215216 || resultSetType == ResultSet .TYPE_SCROLL_INSENSITIVE
@@ -264,7 +265,7 @@ public void clearWarnings() throws SQLException {
264265
265266 @ Override
266267 public void close () {
267- this .connection = null ;
268+ this .isClosed = true ;
268269 this .cql = null ;
269270 }
270271
@@ -284,67 +285,68 @@ private void doExecute(final String cql) throws SQLException {
284285
285286 try {
286287 final String [] cqlQueries = cql .split (STATEMENTS_SEPARATOR_REGEX );
287- if (cqlQueries .length > 1 && !(cql .trim ().toLowerCase ().startsWith ("begin" )
288+ if (cqlQueries .length > 1
289+ && !(cql .trim ().toLowerCase ().startsWith ("begin" )
288290 && cql .toLowerCase ().contains ("batch" ) && cql .toLowerCase ().contains ("apply" ))) {
289- // Several statements in the query to execute asynchronously...
290-
291291 final ArrayList <com .datastax .oss .driver .api .core .cql .ResultSet > results = new ArrayList <>();
292+
293+ // Several statements in the query to execute asynchronously...
292294 if (cqlQueries .length > MAX_ASYNC_QUERIES * 1.1 ) {
293295 // Protect the cluster from receiving too many queries at once and force the dev to split the load
294296 throw new SQLNonTransientException ("Too many queries at once (" + cqlQueries .length
295297 + "). You must split your queries into more batches !" );
296298 }
297299
298- StringBuilder prevCqlQuery = new StringBuilder ();
299- for (final String cqlQuery : cqlQueries ) {
300- if ((cqlQuery .contains ("'" ) && ((StringUtils .countMatches (cqlQuery , "'" ) % 2 == 1
301- && prevCqlQuery .length () == 0 )
302- || (StringUtils .countMatches (cqlQuery , "'" ) % 2 == 0 && prevCqlQuery .length () > 0 )))
303- || (prevCqlQuery .toString ().length () > 0 && !cqlQuery .contains ("'" ))) {
304- prevCqlQuery .append (cqlQuery ).append (";" );
305- } else {
306- prevCqlQuery .append (cqlQuery );
307- if (LOG .isTraceEnabled () || this .connection .isDebugMode ()) {
308- LOG .debug ("CQL: {}" , prevCqlQuery );
309- }
310- SimpleStatement stmt = SimpleStatement .newInstance (prevCqlQuery .toString ())
311- .setConsistencyLevel (this .connection .getDefaultConsistencyLevel ())
312- .setPageSize (this .fetchSize );
313- if (this .customTimeoutProfile != null ) {
314- stmt = stmt .setExecutionProfile (this .customTimeoutProfile );
300+ // If we should not execute the queries asynchronously, for example if they must be executed in the
301+ // specified order (e.g. in Liquibase scripts with queries such as CREATE TABLE t, then
302+ // INSERT INTO t ...).
303+ if (!this .connection .getOptionSet ().executeMultipleQueriesByStatementAsync ()) {
304+ for (final String cqlQuery : cqlQueries ) {
305+ final com .datastax .oss .driver .api .core .cql .ResultSet rs = executeSingleStatement (cqlQuery );
306+ results .add (rs );
307+ }
308+ } else {
309+ StringBuilder prevCqlQuery = new StringBuilder ();
310+ for (final String cqlQuery : cqlQueries ) {
311+ if ((cqlQuery .contains ("'" ) && ((StringUtils .countMatches (cqlQuery , "'" ) % 2 == 1
312+ && prevCqlQuery .length () == 0 )
313+ || (StringUtils .countMatches (cqlQuery , "'" ) % 2 == 0 && prevCqlQuery .length () > 0 )))
314+ || (!prevCqlQuery .toString ().isEmpty () && !cqlQuery .contains ("'" ))) {
315+ prevCqlQuery .append (cqlQuery ).append (";" );
316+ } else {
317+ prevCqlQuery .append (cqlQuery );
318+ if (LOG .isTraceEnabled () || this .connection .isDebugMode ()) {
319+ LOG .debug ("CQL: {}" , prevCqlQuery );
320+ }
321+ SimpleStatement stmt = SimpleStatement .newInstance (prevCqlQuery .toString ())
322+ .setConsistencyLevel (this .connection .getDefaultConsistencyLevel ())
323+ .setPageSize (this .fetchSize );
324+ if (this .customTimeoutProfile != null ) {
325+ stmt = stmt .setExecutionProfile (this .customTimeoutProfile );
326+ }
327+ final CompletionStage <AsyncResultSet > resultSetFuture =
328+ ((CqlSession ) this .connection .getSession ()).executeAsync (stmt );
329+ futures .add (resultSetFuture );
330+ prevCqlQuery = new StringBuilder ();
315331 }
316- final CompletionStage <AsyncResultSet > resultSetFuture =
317- ((CqlSession ) this .connection .getSession ()).executeAsync (stmt );
318- futures .add (resultSetFuture );
319- prevCqlQuery = new StringBuilder ();
320332 }
321- }
322333
323- for (final CompletionStage <AsyncResultSet > future : futures ) {
324- final AsyncResultSet asyncResultSet = CompletableFutures .getUninterruptibly (future );
325- final com .datastax .oss .driver .api .core .cql .ResultSet rows ;
326- if (asyncResultSet .hasMorePages ()) {
327- rows = new MultiPageResultSet (asyncResultSet );
328- } else {
329- rows = new SinglePageResultSet (asyncResultSet );
334+ for (final CompletionStage <AsyncResultSet > future : futures ) {
335+ final AsyncResultSet asyncResultSet = CompletableFutures .getUninterruptibly (future );
336+ final com .datastax .oss .driver .api .core .cql .ResultSet rows ;
337+ if (asyncResultSet .hasMorePages ()) {
338+ rows = new MultiPageResultSet (asyncResultSet );
339+ } else {
340+ rows = new SinglePageResultSet (asyncResultSet );
341+ }
342+ results .add (rows );
330343 }
331- results .add (rows );
332344 }
333345
334346 this .currentResultSet = new CassandraResultSet (this , results );
335347 } else {
336348 // Only one statement to execute, so do it synchronously.
337- if (LOG .isTraceEnabled () || this .connection .isDebugMode ()) {
338- LOG .debug ("CQL: " + cql );
339- }
340- SimpleStatement stmt = SimpleStatement .newInstance (cql )
341- .setConsistencyLevel (this .connection .getDefaultConsistencyLevel ())
342- .setPageSize (this .fetchSize );
343- if (this .customTimeoutProfile != null ) {
344- stmt = stmt .setExecutionProfile (this .customTimeoutProfile );
345- }
346- this .currentResultSet = new CassandraResultSet (this ,
347- ((CqlSession ) this .connection .getSession ()).execute (stmt ));
349+ this .currentResultSet = new CassandraResultSet (this , executeSingleStatement (cql ));
348350 }
349351 } catch (final Exception e ) {
350352 for (final CompletionStage <AsyncResultSet > future : futures ) {
@@ -354,6 +356,19 @@ private void doExecute(final String cql) throws SQLException {
354356 }
355357 }
356358
359+ private com .datastax .oss .driver .api .core .cql .ResultSet executeSingleStatement (final String cql ) {
360+ if (LOG .isTraceEnabled () || this .connection .isDebugMode ()) {
361+ LOG .debug ("CQL: " + cql );
362+ }
363+ SimpleStatement stmt = SimpleStatement .newInstance (cql )
364+ .setConsistencyLevel (this .connection .getDefaultConsistencyLevel ())
365+ .setPageSize (this .fetchSize );
366+ if (this .customTimeoutProfile != null ) {
367+ stmt = stmt .setExecutionProfile (this .customTimeoutProfile );
368+ }
369+ return ((CqlSession ) this .connection .getSession ()).execute (stmt );
370+ }
371+
357372 @ Override
358373 public boolean execute (final String query ) throws SQLException {
359374 checkNotClosed ();
@@ -647,7 +662,7 @@ public SQLWarning getWarnings() throws SQLException {
647662
648663 @ Override
649664 public boolean isClosed () {
650- return this .connection == null ;
665+ return this .isClosed ;
651666 }
652667
653668 /**
0 commit comments