Merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/771422cb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/771422cb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/771422cb Branch: refs/heads/ignite-6022-proto Commit: 771422cb1e1f2503c93fd0317c65f5ef315a2a52 Parents: eeb116b Author: devozerov <[email protected]> Authored: Tue Dec 19 15:15:57 2017 +0300 Committer: devozerov <[email protected]> Committed: Tue Dec 19 15:15:57 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/query/h2/DmlStatementsProcessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/771422cb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java index 60c67d8..a52881d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java @@ -235,7 +235,7 @@ public class DmlStatementsProcessor { List<List<?>> cur = plan.createRows(argss); UpdateResult res = - processDmlSelectResultBatched(cctx, plan, cur, fieldsQry.getPageSize(), fieldsQry.isStreaming()); + processDmlSelectResultBatched(plan, cur, fieldsQry.getPageSize(), fieldsQry.isStreaming()); Collection<UpdateResult> ress = new ArrayList<>(1); @@ -504,8 +504,8 @@ public class DmlStatementsProcessor { return processDmlSelectResult(cctx, plan, cur, pageSize); } - private UpdateResult processDmlSelectResultBatched(GridCacheContext cctx, UpdatePlan plan, Collection<List<?>> rows, - int pageSize, boolean streaming) throws IgniteCheckedException { + private UpdateResult processDmlSelectResultBatched(UpdatePlan plan, Collection<List<?>> rows, int pageSize, + boolean streaming) throws IgniteCheckedException { switch (plan.mode()) { case MERGE: // TODO
