From 77b0d4bbbbbc6a539675885edced6e1fce1a0f88 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Fri, 4 Sep 2020 19:32:06 +0300 Subject: [PATCH] SQL batch processing refactoring --- .../src/io/cloudbeaver/service/sql/WebSQLProcessor.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java index e7185a2244..796fcb5e24 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java @@ -41,10 +41,7 @@ import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.utils.CommonUtils; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; /** @@ -284,7 +281,7 @@ public class WebSQLProcessor { DBSDataManipulator.ExecuteBatch updateBatch = dataManipulator.updateData(session, updateAttributes, keyAttributes, null, executionSource); updateBatch.add(rowValues); - DBCStatistics statistics = updateBatch.execute(session); + DBCStatistics statistics = updateBatch.execute(session, Collections.emptyMap()); // Returns fake resultset with updated row values WebSQLQueryResultSet updatedResultSet = new WebSQLQueryResultSet(); @@ -381,7 +378,7 @@ public class WebSQLProcessor { DBSDataManipulator.ExecuteBatch updateBatch = dataManipulator.updateData(session, updateAttributes, keyAttributes, null, executionSource); updateBatch.add(rowValues); - DBCStatistics statistics = updateBatch.execute(session); + DBCStatistics statistics = updateBatch.execute(session, Collections.emptyMap()); totalUpdateCount += statistics.getRowsUpdated(); result.setDuration(result.getDuration() + statistics.getExecuteTime());