Cleanup
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b810acbc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b810acbc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b810acbc Branch: refs/heads/ignite-6022-proto Commit: b810acbc911753bd2791373faa86d69186fb0c3e Parents: 478fb43 Author: Alexander Paschenko <[email protected]> Authored: Sun Dec 17 21:38:43 2017 +0300 Committer: Alexander Paschenko <[email protected]> Committed: Sun Dec 17 21:38:43 2017 +0300 ---------------------------------------------------------------------- .../processors/query/h2/dml/DmlAstUtils.java | 18 -------- .../processors/query/h2/dml/UpdatePlan.java | 44 -------------------- 2 files changed, 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b810acbc/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java index b6c4a2a..161ff4a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java @@ -222,24 +222,6 @@ public final class DmlAstUtils { } /** - * Create operand based on exact type of SQL element. - * - * @param el element. - * @return Operand. - */ - private static FastUpdateArgument operandForElement(GridSqlElement el) { - assert el == null ^ (el instanceof GridSqlConst || el instanceof GridSqlParameter); - - if (el == null) - return FastUpdateArguments.NULL_ARGUMENT; - - if (el instanceof GridSqlConst) - return new FastUpdateArguments.ValueArgument(((GridSqlConst)el).value().getObject()); - else - return new FastUpdateArguments.ParamArgument(((GridSqlParameter)el).index()); - } - - /** * @param del DELETE statement. * @return {@code true} if given statement filters by single non expression key. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b810acbc/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlan.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlan.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlan.java index 96298d8..b1b5ada 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlan.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlan.java @@ -85,12 +85,6 @@ public final class UpdatePlan { /** Additional info for distributed update. */ private final DmlDistributedPlanInfo distributed; - /* - private UpdatePlan(UpdateMode mode, GridH2Table tbl, String[] colNames, int[] colTypes, KeyValueSupplier keySupplier, - KeyValueSupplier valSupplier, int keyColIdx, int valColIdx, String selectQry, boolean isLocSubqry, - List<List<FastUpdateArgument>> rows, int rowsNum, FastUpdateArguments fastUpdateArgs) { - */ - /** * Constructor. * @@ -440,42 +434,4 @@ public final class UpdatePlan { public GridH2Table table() { return tbl; } - - /* - public static UpdatePlan forMerge(GridH2Table tbl, String[] colNames, int[] colTypes, KeyValueSupplier keySupplier, - KeyValueSupplier valSupplier, int keyColIdx, int valColIdx, String selectQry, boolean isLocSubqry, - List<List<FastUpdateArgument>> rows, int rowsNum) { - assert !F.isEmpty(colNames); - - return new UpdatePlan(UpdateMode.MERGE, tbl, colNames, colTypes, keySupplier, valSupplier, keyColIdx, valColIdx, - selectQry, isLocSubqry, rows, rowsNum, null); - } - - public static UpdatePlan forInsert(GridH2Table tbl, String[] colNames, int[] colTypes, KeyValueSupplier keySupplier, - KeyValueSupplier valSupplier, int keyColIdx, int valColIdx, String selectQry, boolean isLocSubqry, - List<List<FastUpdateArgument>> rows, int rowsNum) { - assert !F.isEmpty(colNames); - - return new UpdatePlan(UpdateMode.INSERT, tbl, colNames, colTypes, keySupplier, valSupplier, keyColIdx, valColIdx, - selectQry, isLocSubqry, rows, rowsNum, null); - } - - public static UpdatePlan forUpdate(GridH2Table tbl, String[] colNames, int[] colTypes, KeyValueSupplier valSupplier, - int valColIdx, String selectQry) { - assert !F.isEmpty(colNames); - - return new UpdatePlan(UpdateMode.UPDATE, tbl, colNames, colTypes, null, valSupplier, -1, valColIdx, selectQry, - false, null, 0, null); - } - - public static UpdatePlan forDelete(GridH2Table tbl, String selectQry) { - return new UpdatePlan(UpdateMode.DELETE, tbl, null, null, null, null, -1, -1, selectQry, false, null, 0, null); - } - - public static UpdatePlan forFastUpdate(UpdateMode mode, GridH2Table tbl, FastUpdateArguments fastUpdateArgs) { - assert mode == UpdateMode.UPDATE || mode == UpdateMode.DELETE; - - return new UpdatePlan(mode, tbl, null, null, null, null, -1, -1, null, false, null, 0, fastUpdateArgs); - } - */ }
