@@ -18,7 +18,7 @@ package io.snappydata.externalstore
1818
1919import java .sql .{PreparedStatement , SQLException }
2020import java .util .concurrent .atomic .AtomicInteger
21- import java .util .concurrent .{CountDownLatch , CyclicBarrier , Executors , TimeoutException }
21+ import java .util .concurrent .{CyclicBarrier , Executors , TimeoutException }
2222
2323import scala .concurrent .{Await , ExecutionContext , ExecutionContextExecutor , Future }
2424import scala .util .Try
@@ -207,11 +207,11 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
207207 ps.setString(2 , " str" + i)
208208 ps.addBatch()
209209 if (i % 10 == 0 ) {
210- var records = ps.executeBatch()
210+ val records = ps.executeBatch()
211211 records.foreach(r => numRows += r)
212212 }
213213 }
214- var records = ps.executeBatch()
214+ val records = ps.executeBatch()
215215 records.foreach(r => numRows += r)
216216 (1 , numRows)
217217 }
@@ -222,17 +222,16 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
222222 val conn = getANetConnection(netPort1)
223223 val query1 = " update t3 set fs = ? where fs = ?"
224224 ps = conn.prepareStatement(query1)
225- var fs1 = 1
226225 for (i <- val1 to val2) {
227226 ps.setString(1 , " temp" + i)
228227 ps.setString(2 , " str" + i)
229228 ps.addBatch()
230229 if (i % 10 == 0 ) {
231- var records = ps.executeBatch()
230+ val records = ps.executeBatch()
232231 records.foreach(r => numRows += r)
233232 }
234233 }
235- var records = ps.executeBatch()
234+ val records = ps.executeBatch()
236235 records.foreach(r => numRows += r)
237236 (1 , numRows)
238237 }
@@ -247,16 +246,16 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
247246 ps.setString(1 , " temp" + i2)
248247 ps.addBatch()
249248 if (i2 % 10 == 0 ) {
250- var records = ps.executeBatch()
249+ val records = ps.executeBatch()
251250 records.foreach(r => numRows += r)
252251 }
253252 }
254- var records = ps.executeBatch()
253+ val records = ps.executeBatch()
255254 records.foreach(r => numRows += r)
256255 (1 , numRows)
257256 }
258257
259- def testComplexDataTypes () : Unit = {
258+ def testComplexDataTypes (): Unit = {
260259 vm2.invoke(classOf [ClusterManagerTestBase ], " startNetServer"
261260 val conn = getANetConnection(netPort1)
262261 val stmt = conn.createStatement()
@@ -302,42 +301,40 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
302301 val stmt = conn.createStatement()
303302 stmt.execute(" drop table if exists t3"
304303 stmt.execute(" create table t3(id integer, fs string) using column options" +
305- " (key_columns 'id', COLUMN_MAX_DELTA_ROWS '7', BUCKETS '2')"
306-
307- var thrCount1 : Integer = 0
308- var insertedRecords = 0
309- val colThread1 = new Thread (new Runnable {def run () {
310- (1 to 5 ) foreach (i => {
311- var result = insertRecords(1 , 10 )
312- thrCount1 += result._1
313- insertedRecords += result._2
314- })
315- }
304+ " (COLUMN_MAX_DELTA_ROWS '7', BUCKETS '2')"
305+
306+ val insertedRecords = new AtomicInteger (0 )
307+ val colThread1 = new Thread (new Runnable {
308+ def run (): Unit = {
309+ (1 to 5 ) foreach { _ =>
310+ val result = insertRecords(1 , 10 )
311+ insertedRecords.getAndAdd(result._2)
312+ }
313+ }
316314 })
317315 colThread1.start()
318316
319- var thrCount2 : Integer = 0
320- val colThread2 = new Thread (new Runnable {def run () {
321- (1 to 5 ) foreach (i => {
322- var result = insertRecords(11 , 20 )
323- thrCount2 += result._1
324- insertedRecords += result._2
325- })
326- }
317+ val colThread2 = new Thread (new Runnable {
318+ def run (): Unit = {
319+ (1 to 5 ) foreach { _ =>
320+ val result = insertRecords(11 , 20 )
321+ insertedRecords.getAndAdd(result._2)
322+ }
323+ }
327324 })
328325 colThread2.start()
329326
330327 colThread1.join()
331328 colThread2.join()
332329
330+ conn.commit()
333331 var rscnt = stmt.executeQuery(" select count(*) from t3"
334332 rscnt.next()
335333 assertEquals(100 , rscnt.getInt(1 ))
336- assertEquals(100 , insertedRecords)
334+ assertEquals(100 , insertedRecords.get() )
337335
338336 val rs = stmt.executeQuery(" select * from t3 order by id"
339337
340-
341338 var i = 1
342339 var cnt = 0
343340
@@ -351,51 +348,47 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
351348 cnt = cnt + 1
352349 }
353350
354- var thrCount3 : Integer = 0
355- var updatedRecords = 0
356- val colThread3 = new Thread (new Runnable {def run () {
357- (1 to 5 ) foreach (i => {
358- var result = updateRecords(1 , 20 )
359- thrCount3 += result._1
360- updatedRecords += result._2
361- })
362- }
351+ val updatedRecords = new AtomicInteger (0 )
352+ val colThread3 = new Thread (new Runnable {
353+ def run (): Unit = {
354+ (1 to 5 ) foreach { _ =>
355+ val result = updateRecords(1 , 20 )
356+ updatedRecords.getAndAdd(result._2)
357+ }
358+ }
363359 })
364360 colThread3.start()
365361
366- var thrCount4 : Integer = 0
367- val colThread4 = new Thread (new Runnable {def run () {
368- (1 to 5 ) foreach (i => {
369- var result = updateRecords(11 , 20 )
370- thrCount4 += result._1
371- updatedRecords += result._2
372- })
373- }
362+ val colThread4 = new Thread (new Runnable {
363+ def run (): Unit = {
364+ (1 to 5 ) foreach { _ =>
365+ val result = updateRecords(11 , 20 )
366+ updatedRecords.getAndAdd(result._2)
367+ }
368+ }
374369 })
375370 colThread4.start()
376371
377- var thrCount5 : Integer = 0
378- val colThread5 = new Thread (new Runnable {def run () {
379- (1 to 5 ) foreach (i => {
380- var result = updateRecords(21 , 30 )
381- thrCount5 += result._1
382- updatedRecords += result._2
383- })
384- }
372+ val colThread5 = new Thread (new Runnable {
373+ def run (): Unit = {
374+ (1 to 5 ) foreach { _ =>
375+ val result = updateRecords(21 , 30 )
376+ updatedRecords.getAndAdd(result._2)
377+ }
378+ }
385379 })
386380 colThread5.start()
387381
388382 colThread3.join()
389383 colThread4.join()
390384 colThread5.join()
391385
392-
393386 rscnt = stmt.executeQuery(" select count(*) from t3"
394387 rscnt.next()
395388 assertEquals(100 , rscnt.getInt(1 ))
396- assertEquals(100 , updatedRecords)
389+ assertEquals(100 , updatedRecords.get() )
397390
398- var rs1 = stmt.executeQuery(" select * from t3 order by id"
391+ val rs1 = stmt.executeQuery(" select * from t3 order by id"
399392 var i2 = 1
400393 cnt = 0
401394 while (rs1.next()) {
@@ -408,37 +401,34 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
408401 cnt = cnt + 1
409402 }
410403
411- var thrCount6 : Integer = 0
412404 val deletedRecords = new AtomicInteger (0 )
413- val colThread6 = new Thread (new Runnable {def run () {
414- ( 1 to 5 ) foreach (i => {
415- val result = deleteRecords( 1 , 20 )
416- thrCount6 += result._1
417- deletedRecords.getAndAdd(result._2)
418- })
419- }
405+ val colThread6 = new Thread (new Runnable {
406+ def run () : Unit = {
407+ ( 1 to 5 ) foreach { _ =>
408+ val result = deleteRecords( 1 , 20 )
409+ deletedRecords.getAndAdd(result._2)
410+ }
411+ }
420412 })
421413 colThread6.start()
422414
423- var thrCount7 : Integer = 0
424- val colThread7 = new Thread (new Runnable {def run () {
425- (1 to 5 ) foreach (i => {
426- val result = deleteRecords(11 , 20 )
427- thrCount7 += result._1
428- deletedRecords.getAndAdd(result._2)
429- })
430- }
415+ val colThread7 = new Thread (new Runnable {
416+ def run (): Unit = {
417+ (1 to 5 ) foreach { _ =>
418+ val result = deleteRecords(11 , 20 )
419+ deletedRecords.getAndAdd(result._2)
420+ }
421+ }
431422 })
432423 colThread7.start()
433424
434- var thrCount8 : Integer = 0
435- val colThread8 = new Thread (new Runnable {def run () {
436- (1 to 5 ) foreach (i => {
437- val result = deleteRecords(21 , 30 )
438- thrCount8 += result._1
439- deletedRecords.getAndAdd(result._2)
440- })
441- }
425+ val colThread8 = new Thread (new Runnable {
426+ def run (): Unit = {
427+ (1 to 5 ) foreach { _ =>
428+ val result = deleteRecords(21 , 30 )
429+ deletedRecords.getAndAdd(result._2)
430+ }
431+ }
442432 })
443433 colThread8.start()
444434
@@ -449,7 +439,7 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
449439 rscnt = stmt.executeQuery(" select count(*) from t3"
450440 rscnt.next()
451441 assertEquals(0 , rscnt.getInt(1 ))
452- assertEquals(100 , deletedRecords.get)
442+ assertEquals(100 , deletedRecords.get() )
453443 }
454444
455445 def testQueryCancellation (): Unit = {
@@ -462,7 +452,7 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
462452 // significantly long duration.
463453 stmt.execute(
464454 s """ create table $table (col1 int, col2 int) using column as
465- |select id as col1, id as col2 from range(10000000) """ .stripMargin)
455+ |select id as col1, id as col2 from range(10000000) """ .stripMargin)
466456 val barrier = new CyclicBarrier (2 )
467457 try {
468458 implicit val context : ExecutionContextExecutor =
0 commit comments