You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/09 09:13:44 UTC
[01/28] incubator-ignite git commit: # IGNITE-624 Rename
GridSqlSelect --> GridSqlQuery
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-694 32aa57c58 -> 9eb3fceb1
# IGNITE-624 Rename GridSqlSelect --> GridSqlQuery
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b297a4c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b297a4c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b297a4c4
Branch: refs/heads/ignite-694
Commit: b297a4c4fe8db2880733b418c012b7e662ee4b83
Parents: c6b3380
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Mar 31 21:17:06 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Mar 31 21:17:06 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridSqlQuery.java | 375 +++++++++++++++++++
.../query/h2/sql/GridSqlQueryParser.java | 9 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 8 +-
.../processors/query/h2/sql/GridSqlSelect.java | 375 -------------------
.../query/h2/sql/GridSqlSubquery.java | 8 +-
.../query/h2/sql/GridQueryParsingTest.java | 2 +-
6 files changed, 388 insertions(+), 389 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b297a4c4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
new file mode 100644
index 0000000..da71bcb
--- /dev/null
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -0,0 +1,375 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.h2.sql;
+
+import org.h2.util.*;
+
+import java.util.*;
+
+/**
+ * Select query.
+ */
+public class GridSqlQuery implements Cloneable {
+ /** */
+ private boolean distinct;
+
+ /** */
+ private List<GridSqlElement> allExprs;
+
+ /** */
+ private List<GridSqlElement> select = new ArrayList<>();
+
+ /** */
+ private List<GridSqlElement> groups = new ArrayList<>();
+
+ /** */
+ private int[] grpCols;
+
+ /** */
+ private GridSqlElement from;
+
+ /** */
+ private GridSqlElement where;
+
+ /** */
+ private GridSqlElement having;
+
+ /** */
+ private int havingCol = -1;
+
+ /** */
+ private Map<GridSqlElement,GridSqlSortColumn> sort = new LinkedHashMap<>();
+
+ /** */
+ private GridSqlElement offset;
+
+ /** */
+ private GridSqlElement limit;
+
+ /**
+ * @return Offset.
+ */
+ public GridSqlElement offset() {
+ return offset;
+ }
+
+ /**
+ * @param offset Offset.
+ */
+ public void offset(GridSqlElement offset) {
+ this.offset = offset;
+ }
+
+ /**
+ * @param limit Limit.
+ */
+ public void limit(GridSqlElement limit) {
+ this.limit = limit;
+ }
+
+ /**
+ * @return Limit.
+ */
+ public GridSqlElement limit() {
+ return limit;
+ }
+
+ /**
+ * @return Distinct.
+ */
+ public boolean distinct() {
+ return distinct;
+ }
+
+ /**
+ * @param distinct New distinct.
+ */
+ public void distinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ /**
+ * @return Generate sql.
+ */
+ public String getSQL() {
+ StatementBuilder buff = new StatementBuilder("SELECT");
+
+ if (distinct)
+ buff.append(" DISTINCT");
+
+ for (GridSqlElement expression : select) {
+ buff.appendExceptFirst(",");
+ buff.append('\n');
+ buff.append(StringUtils.indent(expression.getSQL(), 4, false));
+ }
+
+ buff.append("\nFROM ").append(from.getSQL());
+
+ if (where != null)
+ buff.append("\nWHERE ").append(StringUtils.unEnclose(where.getSQL()));
+
+ if (!groups.isEmpty()) {
+ buff.append("\nGROUP BY ");
+
+ buff.resetCount();
+
+ for (GridSqlElement expression : groups) {
+ buff.appendExceptFirst(", ");
+
+ if (expression instanceof GridSqlAlias)
+ buff.append(StringUtils.unEnclose((expression.child().getSQL())));
+ else
+ buff.append(StringUtils.unEnclose(expression.getSQL()));
+ }
+ }
+
+ if (having != null)
+ buff.append("\nHAVING ").append(StringUtils.unEnclose(having.getSQL()));
+
+ if (!sort.isEmpty()) {
+ buff.append("\nORDER BY ");
+
+ buff.resetCount();
+
+ for (Map.Entry<GridSqlElement,GridSqlSortColumn> entry : sort.entrySet()) {
+ buff.appendExceptFirst(", ");
+
+ GridSqlElement expression = entry.getKey();
+
+ int idx = select.indexOf(expression);
+
+ if (idx >= 0)
+ buff.append(idx + 1);
+ else
+ buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
+
+ GridSqlSortColumn type = entry.getValue();
+
+ if (!type.asc())
+ buff.append(" DESC");
+
+ if (type.nullsFirst())
+ buff.append(" NULLS FIRST");
+ else if (type.nullsLast())
+ buff.append(" NULLS LAST");
+ }
+ }
+
+ if (limit != null)
+ buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
+
+ if (offset != null)
+ buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
+
+ return buff.toString();
+ }
+
+ /**
+ * @param expression Expression.
+ */
+ public void addExpression(GridSqlElement expression) {
+ if (allExprs == null)
+ allExprs = new ArrayList<>();
+
+ allExprs.add(expression);
+ }
+
+ /**
+ * @return All expressions in select, group by, order by.
+ */
+ public List<GridSqlElement> allExpressions() {
+ return allExprs;
+ }
+
+ /**
+ * @return Expressions.
+ */
+ public List<GridSqlElement> select() {
+ return select;
+ }
+
+ /**
+ * Clears select list.
+ */
+ public void clearSelect() {
+ select = new ArrayList<>();
+ }
+
+ /**
+ * @param expression Expression.
+ */
+ public void addSelectExpression(GridSqlElement expression) {
+ if (expression == null)
+ throw new NullPointerException();
+
+ select.add(expression);
+ }
+
+ /**
+ * @return Expressions.
+ */
+ public List<GridSqlElement> groups() {
+ return groups;
+ }
+
+ /**
+ *
+ */
+ public void clearGroups() {
+ groups = new ArrayList<>();
+ grpCols = null;
+ }
+
+ /**
+ * @param expression Expression.
+ */
+ public void addGroupExpression(GridSqlElement expression) {
+ if (expression == null)
+ throw new NullPointerException();
+
+ groups.add(expression);
+ }
+
+ /**
+ * @return Group columns.
+ */
+ public int[] groupColumns() {
+ return grpCols;
+ }
+
+ /**
+ * @param grpCols Group columns.
+ */
+ public void groupColumns(int[] grpCols) {
+ this.grpCols = grpCols;
+ }
+
+ /**
+ * @return Tables.
+ */
+ public GridSqlElement from() {
+ return from;
+ }
+
+ /**
+ * @param from From element.
+ * @return {@code this}.
+ */
+ public GridSqlQuery from(GridSqlElement from) {
+ this.from = from;
+
+ return this;
+ }
+
+ /**
+ * @return Where.
+ */
+ public GridSqlElement where() {
+ return where;
+ }
+
+ /**
+ * @param where New where.
+ */
+ public void where(GridSqlElement where) {
+ this.where = where;
+ }
+
+ /**
+ * @param condition Adds new WHERE condition using AND operator.
+ * @return {@code this}.
+ */
+ public GridSqlQuery whereAnd(GridSqlElement condition) {
+ if (condition == null)
+ throw new NullPointerException();
+
+ GridSqlElement old = where();
+
+ where(old == null ? condition : new GridSqlOperation(GridSqlOperationType.AND, old, condition));
+
+ return this;
+ }
+
+ /**
+ * @return Having.
+ */
+ public GridSqlElement having() {
+ return having;
+ }
+
+ /**
+ * @param having New having.
+ */
+ public void having(GridSqlElement having) {
+ this.having = having;
+ }
+
+ /**
+ * @param col Index of HAVING column.
+ */
+ public void havingColumn(int col) {
+ this.havingCol = col;
+ }
+
+ /**
+ * @return Index of HAVING column.
+ */
+ public int havingColumn() {
+ return havingCol;
+ }
+
+ /**
+ * @return Sort.
+ */
+ public Map<GridSqlElement,GridSqlSortColumn> sort() {
+ return sort;
+ }
+
+ /**
+ *
+ */
+ public void clearSort() {
+ sort = new LinkedHashMap<>();
+ }
+
+ /**
+ * @param expression Expression.
+ * @param sortType The sort type bit mask (SortOrder.DESCENDING, SortOrder.NULLS_FIRST, SortOrder.NULLS_LAST).
+ */
+ public void addSort(GridSqlElement expression, GridSqlSortColumn sortType) {
+ sort.put(expression, sortType);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"CloneCallsConstructors", "CloneDoesntDeclareCloneNotSupportedException"})
+ @Override public GridSqlQuery clone() {
+ try {
+ GridSqlQuery res = (GridSqlQuery)super.clone();
+
+ res.select = new ArrayList<>(select);
+ res.groups = new ArrayList<>(groups);
+ res.sort = new LinkedHashMap<>(sort);
+ res.allExprs = null;
+
+ return res;
+ }
+ catch (CloneNotSupportedException e) {
+ throw new RuntimeException(e); // Never thrown.
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b297a4c4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index d84666d..d3cd038 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -22,7 +22,6 @@ import org.h2.command.*;
import org.h2.command.dml.*;
import org.h2.engine.*;
import org.h2.expression.*;
-import org.h2.expression.Parameter;
import org.h2.jdbc.*;
import org.h2.result.*;
import org.h2.table.*;
@@ -164,7 +163,7 @@ public class GridSqlQueryParser {
* @param stmt Prepared statement.
* @return Parsed select.
*/
- public static GridSqlSelect parse(JdbcPreparedStatement stmt) {
+ public static GridSqlQuery parse(JdbcPreparedStatement stmt) {
Command cmd = COMMAND.get(stmt);
Getter<Command,Prepared> p = prepared;
@@ -226,13 +225,13 @@ public class GridSqlQueryParser {
/**
* @param select Select.
*/
- public GridSqlSelect parse(Select select) {
- GridSqlSelect res = (GridSqlSelect)h2ObjToGridObj.get(select);
+ public GridSqlQuery parse(Select select) {
+ GridSqlQuery res = (GridSqlQuery)h2ObjToGridObj.get(select);
if (res != null)
return res;
- res = new GridSqlSelect();
+ res = new GridSqlQuery();
h2ObjToGridObj.put(select, res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b297a4c4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 47e5e05..6c32e13 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -64,12 +64,12 @@ public class GridSqlQuerySplitter {
if (params == null)
params = GridCacheSqlQuery.EMPTY_PARAMS;
- GridSqlSelect srcQry = GridSqlQueryParser.parse(stmt);
+ GridSqlQuery srcQry = GridSqlQueryParser.parse(stmt);
final String mergeTable = TABLE_FUNC_NAME + "()"; // table(0); TODO
- GridSqlSelect mapQry = srcQry.clone();
- GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
+ GridSqlQuery mapQry = srcQry.clone();
+ GridSqlQuery rdcQry = new GridSqlQuery().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
List<GridSqlElement> mapExps = new ArrayList<>(srcQry.allExpressions());
@@ -147,7 +147,7 @@ public class GridSqlQuerySplitter {
* @param target Extracted parameters.
* @return Extracted parameters list.
*/
- private static List<Object> findParams(GridSqlSelect qry, Object[] params, ArrayList<Object> target) {
+ private static List<Object> findParams(GridSqlQuery qry, Object[] params, ArrayList<Object> target) {
if (params.length == 0)
return target;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b297a4c4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
deleted file mode 100644
index 0e5bb31..0000000
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.query.h2.sql;
-
-import org.h2.util.*;
-
-import java.util.*;
-
-/**
- * Select query.
- */
-public class GridSqlSelect implements Cloneable {
- /** */
- private boolean distinct;
-
- /** */
- private List<GridSqlElement> allExprs;
-
- /** */
- private List<GridSqlElement> select = new ArrayList<>();
-
- /** */
- private List<GridSqlElement> groups = new ArrayList<>();
-
- /** */
- private int[] grpCols;
-
- /** */
- private GridSqlElement from;
-
- /** */
- private GridSqlElement where;
-
- /** */
- private GridSqlElement having;
-
- /** */
- private int havingCol = -1;
-
- /** */
- private Map<GridSqlElement,GridSqlSortColumn> sort = new LinkedHashMap<>();
-
- /** */
- private GridSqlElement offset;
-
- /** */
- private GridSqlElement limit;
-
- /**
- * @return Offset.
- */
- public GridSqlElement offset() {
- return offset;
- }
-
- /**
- * @param offset Offset.
- */
- public void offset(GridSqlElement offset) {
- this.offset = offset;
- }
-
- /**
- * @param limit Limit.
- */
- public void limit(GridSqlElement limit) {
- this.limit = limit;
- }
-
- /**
- * @return Limit.
- */
- public GridSqlElement limit() {
- return limit;
- }
-
- /**
- * @return Distinct.
- */
- public boolean distinct() {
- return distinct;
- }
-
- /**
- * @param distinct New distinct.
- */
- public void distinct(boolean distinct) {
- this.distinct = distinct;
- }
-
- /**
- * @return Generate sql.
- */
- public String getSQL() {
- StatementBuilder buff = new StatementBuilder("SELECT");
-
- if (distinct)
- buff.append(" DISTINCT");
-
- for (GridSqlElement expression : select) {
- buff.appendExceptFirst(",");
- buff.append('\n');
- buff.append(StringUtils.indent(expression.getSQL(), 4, false));
- }
-
- buff.append("\nFROM ").append(from.getSQL());
-
- if (where != null)
- buff.append("\nWHERE ").append(StringUtils.unEnclose(where.getSQL()));
-
- if (!groups.isEmpty()) {
- buff.append("\nGROUP BY ");
-
- buff.resetCount();
-
- for (GridSqlElement expression : groups) {
- buff.appendExceptFirst(", ");
-
- if (expression instanceof GridSqlAlias)
- buff.append(StringUtils.unEnclose((expression.child().getSQL())));
- else
- buff.append(StringUtils.unEnclose(expression.getSQL()));
- }
- }
-
- if (having != null)
- buff.append("\nHAVING ").append(StringUtils.unEnclose(having.getSQL()));
-
- if (!sort.isEmpty()) {
- buff.append("\nORDER BY ");
-
- buff.resetCount();
-
- for (Map.Entry<GridSqlElement,GridSqlSortColumn> entry : sort.entrySet()) {
- buff.appendExceptFirst(", ");
-
- GridSqlElement expression = entry.getKey();
-
- int idx = select.indexOf(expression);
-
- if (idx >= 0)
- buff.append(idx + 1);
- else
- buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
-
- GridSqlSortColumn type = entry.getValue();
-
- if (!type.asc())
- buff.append(" DESC");
-
- if (type.nullsFirst())
- buff.append(" NULLS FIRST");
- else if (type.nullsLast())
- buff.append(" NULLS LAST");
- }
- }
-
- if (limit != null)
- buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
-
- if (offset != null)
- buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
-
- return buff.toString();
- }
-
- /**
- * @param expression Expression.
- */
- public void addExpression(GridSqlElement expression) {
- if (allExprs == null)
- allExprs = new ArrayList<>();
-
- allExprs.add(expression);
- }
-
- /**
- * @return All expressions in select, group by, order by.
- */
- public List<GridSqlElement> allExpressions() {
- return allExprs;
- }
-
- /**
- * @return Expressions.
- */
- public List<GridSqlElement> select() {
- return select;
- }
-
- /**
- * Clears select list.
- */
- public void clearSelect() {
- select = new ArrayList<>();
- }
-
- /**
- * @param expression Expression.
- */
- public void addSelectExpression(GridSqlElement expression) {
- if (expression == null)
- throw new NullPointerException();
-
- select.add(expression);
- }
-
- /**
- * @return Expressions.
- */
- public List<GridSqlElement> groups() {
- return groups;
- }
-
- /**
- *
- */
- public void clearGroups() {
- groups = new ArrayList<>();
- grpCols = null;
- }
-
- /**
- * @param expression Expression.
- */
- public void addGroupExpression(GridSqlElement expression) {
- if (expression == null)
- throw new NullPointerException();
-
- groups.add(expression);
- }
-
- /**
- * @return Group columns.
- */
- public int[] groupColumns() {
- return grpCols;
- }
-
- /**
- * @param grpCols Group columns.
- */
- public void groupColumns(int[] grpCols) {
- this.grpCols = grpCols;
- }
-
- /**
- * @return Tables.
- */
- public GridSqlElement from() {
- return from;
- }
-
- /**
- * @param from From element.
- * @return {@code this}.
- */
- public GridSqlSelect from(GridSqlElement from) {
- this.from = from;
-
- return this;
- }
-
- /**
- * @return Where.
- */
- public GridSqlElement where() {
- return where;
- }
-
- /**
- * @param where New where.
- */
- public void where(GridSqlElement where) {
- this.where = where;
- }
-
- /**
- * @param condition Adds new WHERE condition using AND operator.
- * @return {@code this}.
- */
- public GridSqlSelect whereAnd(GridSqlElement condition) {
- if (condition == null)
- throw new NullPointerException();
-
- GridSqlElement old = where();
-
- where(old == null ? condition : new GridSqlOperation(GridSqlOperationType.AND, old, condition));
-
- return this;
- }
-
- /**
- * @return Having.
- */
- public GridSqlElement having() {
- return having;
- }
-
- /**
- * @param having New having.
- */
- public void having(GridSqlElement having) {
- this.having = having;
- }
-
- /**
- * @param col Index of HAVING column.
- */
- public void havingColumn(int col) {
- this.havingCol = col;
- }
-
- /**
- * @return Index of HAVING column.
- */
- public int havingColumn() {
- return havingCol;
- }
-
- /**
- * @return Sort.
- */
- public Map<GridSqlElement,GridSqlSortColumn> sort() {
- return sort;
- }
-
- /**
- *
- */
- public void clearSort() {
- sort = new LinkedHashMap<>();
- }
-
- /**
- * @param expression Expression.
- * @param sortType The sort type bit mask (SortOrder.DESCENDING, SortOrder.NULLS_FIRST, SortOrder.NULLS_LAST).
- */
- public void addSort(GridSqlElement expression, GridSqlSortColumn sortType) {
- sort.put(expression, sortType);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"CloneCallsConstructors", "CloneDoesntDeclareCloneNotSupportedException"})
- @Override public GridSqlSelect clone() {
- try {
- GridSqlSelect res = (GridSqlSelect)super.clone();
-
- res.select = new ArrayList<>(select);
- res.groups = new ArrayList<>(groups);
- res.sort = new LinkedHashMap<>(sort);
- res.allExprs = null;
-
- return res;
- }
- catch (CloneNotSupportedException e) {
- throw new RuntimeException(e); // Never thrown.
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b297a4c4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSubquery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSubquery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSubquery.java
index 7861abe..4b60969 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSubquery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSubquery.java
@@ -22,12 +22,12 @@ package org.apache.ignite.internal.processors.query.h2.sql;
*/
public class GridSqlSubquery extends GridSqlElement {
/** */
- private GridSqlSelect select;
+ private GridSqlQuery select;
/**
* @param select Select.
*/
- public GridSqlSubquery(GridSqlSelect select) {
+ public GridSqlSubquery(GridSqlQuery select) {
this.select = select;
}
@@ -39,14 +39,14 @@ public class GridSqlSubquery extends GridSqlElement {
/**
* @return Select.
*/
- public GridSqlSelect select() {
+ public GridSqlQuery select() {
return select;
}
/**
* @param select New select.
*/
- public void select(GridSqlSelect select) {
+ public void select(GridSqlQuery select) {
this.select = select;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b297a4c4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index eada55a..db8e8bd 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -207,7 +207,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
GridSqlQueryParser ses = new GridSqlQueryParser();
- GridSqlSelect gridSelect = ses.parse(select);
+ GridSqlQuery gridSelect = ses.parse(select);
//System.out.println(select.getPlanSQL());
System.out.println(gridSelect.getSQL());
[03/28] incubator-ignite git commit: Merge branches 'ignite-624' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-624
Posted by sb...@apache.org.
Merge branches 'ignite-624' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e89dde7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e89dde7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e89dde7
Branch: refs/heads/ignite-694
Commit: 0e89dde70168433d18fb4bbd67e7d992c2029dda
Parents: 98de490 09a3a82
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 3 13:54:19 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 3 13:54:19 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 19 +-
examples/pom-standalone.xml | 1 -
examples/pom.xml | 19 +-
examples/schema-import/pom.xml | 10 +-
.../examples/datagrid/CacheQueryExample.java | 12 +-
ipc/shmem/README.txt | 2 +-
modules/aop/pom.xml | 6 +-
modules/aws/pom.xml | 4 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-
modules/clients/pom.xml | 10 +-
modules/codegen/pom.xml | 4 +-
modules/core/pom.xml | 38 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +-
.../configuration/CacheConfiguration.java | 52 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../ignite/internal/GridCachePluginContext.java | 72 ++
.../ignite/internal/GridKernalContextImpl.java | 12 +-
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../internal/MarshallerContextAdapter.java | 6 +-
.../ignite/internal/MarshallerContextImpl.java | 90 +-
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../processors/cache/CacheMetricsImpl.java | 1 +
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../processors/cache/CacheProjection.java | 36 -
.../cache/CacheStorePartialUpdateException.java | 2 +-
.../cache/DynamicCacheDescriptor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 278 +---
.../processors/cache/GridCacheAttributes.java | 8 -
.../cache/GridCacheConcurrentMap.java | 34 +-
.../processors/cache/GridCacheContext.java | 26 +-
.../cache/GridCacheDeploymentManager.java | 7 +-
.../processors/cache/GridCacheEntryEx.java | 55 +-
.../processors/cache/GridCacheMapEntry.java | 288 +----
.../cache/GridCacheMapEntryFactory.java | 2 -
.../processors/cache/GridCachePeekMode.java | 81 --
.../processors/cache/GridCacheProcessor.java | 128 +-
.../cache/GridCacheProjectionImpl.java | 11 -
.../processors/cache/GridCacheProxyImpl.java | 24 -
.../processors/cache/GridCacheStoreManager.java | 1202 ------------------
.../processors/cache/GridCacheUtils.java | 50 +-
.../cache/GridCacheWriteBehindStore.java | 1015 ---------------
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java | 31 +-
.../distributed/dht/GridDhtCacheEntry.java | 8 +-
.../distributed/dht/GridDhtLocalPartition.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridNoStorageCacheMap.java | 11 +-
.../dht/atomic/GridDhtAtomicCache.java | 40 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 35 +-
.../colocated/GridDhtColocatedCacheEntry.java | 4 +-
.../colocated/GridDhtDetachedCacheEntry.java | 5 +-
.../distributed/near/GridNearAtomicCache.java | 3 +-
.../distributed/near/GridNearCacheAdapter.java | 75 +-
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/cache/local/GridLocalCache.java | 3 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 7 +-
.../cache/query/GridCacheQueryManager.java | 16 +-
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 30 +-
.../cache/store/CacheOsStoreManager.java | 59 +
.../cache/store/CacheStoreManager.java | 182 +++
.../store/GridCacheStoreManagerAdapter.java | 1111 ++++++++++++++++
.../cache/store/GridCacheWriteBehindStore.java | 1015 +++++++++++++++
.../transactions/IgniteTransactionsImpl.java | 4 +
.../cache/transactions/IgniteTxAdapter.java | 5 +-
.../transactions/IgniteTxLocalAdapter.java | 43 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 14 +-
.../IgniteCacheObjectProcessorImpl.java | 183 ++-
.../datastreamer/DataStreamerImpl.java | 21 +-
.../processors/igfs/IgfsDataManager.java | 11 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +-
.../processors/igfs/IgfsHelperImpl.java | 3 +-
.../processors/plugin/CachePluginManager.java | 113 ++
.../processors/query/GridQueryProcessor.java | 143 ++-
.../messages/GridQueryNextPageResponse.java | 34 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 81 +-
.../cache/VisorCacheDefaultConfiguration.java | 21 -
.../cache/VisorCacheNearConfiguration.java | 11 +-
.../visor/node/VisorGridConfiguration.java | 28 +-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../ignite/marshaller/MarshallerContext.java | 3 +-
.../optimized/OptimizedMarshallerUtils.java | 9 +-
.../ignite/plugin/CachePluginConfiguration.java | 36 +
.../ignite/plugin/CachePluginContext.java | 54 +
.../ignite/plugin/CachePluginProvider.java | 84 ++
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../resources/META-INF/classnames.properties | 94 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 2 +
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
...idCacheConfigurationConsistencySelfTest.java | 3 -
.../cache/GridCacheMemoryModeSelfTest.java | 12 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 16 +-
.../cache/GridCachePartitionedWritesTest.java | 3 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 40 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 189 ---
.../GridCacheWriteBehindStoreAbstractTest.java | 349 -----
.../GridCacheWriteBehindStoreLocalTest.java | 30 -
...heWriteBehindStoreMultithreadedSelfTest.java | 163 ---
...BehindStorePartitionedMultiNodeSelfTest.java | 215 ----
...ridCacheWriteBehindStorePartitionedTest.java | 30 -
...GridCacheWriteBehindStoreReplicatedTest.java | 30 -
.../GridCacheWriteBehindStoreSelfTest.java | 267 ----
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 +
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 +
...maryWriteOrderNearEnabledStoreValueTest.java | 31 +
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 +
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 +
.../IgniteCacheStoreValueAbstractTest.java | 311 +++++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 +
.../cache/IgniteCacheTxStoreValueTest.java | 49 +
.../IgniteCacheSystemTransactionsSelfTest.java | 38 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 24 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 8 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 103 +-
.../near/GridCacheNearOneNodeSelfTest.java | 33 +-
.../near/GridCacheNearReadersSelfTest.java | 154 +--
.../GridCacheReplicatedPreloadSelfTest.java | 11 +-
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 ++
...ridCacheContinuousQueryAbstractSelfTest.java | 2 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 191 +++
.../GridCacheWriteBehindStoreAbstractTest.java | 350 +++++
.../GridCacheWriteBehindStoreLocalTest.java | 30 +
...heWriteBehindStoreMultithreadedSelfTest.java | 163 +++
...BehindStorePartitionedMultiNodeSelfTest.java | 216 ++++
...ridCacheWriteBehindStorePartitionedTest.java | 30 +
...GridCacheWriteBehindStoreReplicatedTest.java | 30 +
.../GridCacheWriteBehindStoreSelfTest.java | 268 ++++
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../processors/igfs/IgfsSizeSelfTest.java | 46 +-
.../processors/igfs/IgsfStartCacheTest.java | 115 ++
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../loadtests/hashmap/GridCacheTestContext.java | 12 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../OptimizedMarshallerNodeFailoverTest.java | 71 +-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 28 +-
.../junits/GridTestKernalContext.java | 2 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/common/GridCommonAbstractTest.java | 44 +-
.../junits/spi/GridSpiAbstractTest.java | 13 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 12 +
.../IgniteCacheWriteBehindTestSuite.java | 3 +-
modules/extdata/p2p/pom.xml | 4 +-
modules/extdata/uri/pom.xml | 4 +-
modules/geospatial/pom.xml | 4 +-
modules/hadoop/pom.xml | 8 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
modules/hibernate/pom.xml | 6 +-
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +
.../testsuites/IgniteHibernateTestSuite.java | 2 +
modules/indexing/pom.xml | 4 +-
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 86 +-
.../query/h2/twostep/GridResultPage.java | 9 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 368 ++++++
.../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 +
.../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 +
...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 +
...TtlOffheapTransactionalAbstractSelfTest.java | 29 +
...cheTtlOffheapTransactionalLocalSelfTest.java | 34 +
...OffheapTransactionalPartitionedSelfTest.java | 34 +
.../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 +
.../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 +
...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 +
...eTtlOnheapTransactionalAbstractSelfTest.java | 29 +
...acheTtlOnheapTransactionalLocalSelfTest.java | 34 +
...lOnheapTransactionalPartitionedSelfTest.java | 34 +
.../IgniteCacheWithIndexingTestSuite.java | 51 +
.../IgniteH2IndexingSpiTestSuite.java | 7 -
modules/jcl/pom.xml | 4 +-
modules/jta/pom.xml | 4 +-
modules/log4j/pom.xml | 4 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 10 +-
modules/schedule/pom.xml | 4 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 8 +-
modules/ssh/pom.xml | 8 +-
.../ant/beautifier/GridJavadocAntTask.java | 8 +-
modules/urideploy/pom.xml | 6 +-
.../GridUriDeploymentFileResourceLoader.java | 2 +-
modules/visor-console/pom.xml | 8 +-
.../commands/cache/VisorCacheCommand.scala | 4 +-
.../commands/disco/VisorDiscoveryCommand.scala | 8 +-
.../commands/events/VisorEventsCommand.scala | 24 +-
.../commands/tasks/VisorTasksCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 8 +-
modules/yardstick/pom.xml | 6 +-
parent/pom.xml | 10 +-
pom.xml | 56 +-
219 files changed, 7409 insertions(+), 5482 deletions(-)
----------------------------------------------------------------------
[22/28] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f458d28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f458d28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f458d28
Branch: refs/heads/ignite-694
Commit: 2f458d28ac965da64ec6e30918bba3541cde9bc1
Parents: 7f4c5ee 7eef373
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 18:27:39 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 18:27:39 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/IgniteKernal.java | 11 ++++++++++-
.../internal/processors/cache/GridCacheProcessor.java | 11 ++++++-----
2 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[19/28] incubator-ignite git commit: # Minor fix to cache object
processor.
Posted by sb...@apache.org.
# Minor fix to cache object processor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7eef373a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7eef373a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7eef373a
Branch: refs/heads/ignite-694
Commit: 7eef373aa8ba17561c9d89dfbc6c0af8bbc23ec9
Parents: 71439bc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Apr 8 17:54:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Apr 8 17:55:49 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/IgniteKernal.java | 11 ++++++++++-
.../internal/processors/cache/GridCacheProcessor.java | 11 ++++++-----
2 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eef373a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 88bec0f..768bbd3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2240,10 +2240,19 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** {@inheritDoc} */
@Override public <K, V> IgniteCache<K, V> cache(@Nullable String name) {
+ return cache(name, true);
+ }
+
+ /**
+ * @param name Cache name.
+ * @param failIfSys Fail if requestsed cache is system cache.
+ * @return Cache.
+ */
+ public <K, V> IgniteCache<K, V> cache(@Nullable String name, boolean failIfSys) {
guard();
try {
- return ctx.cache().publicJCache(name);
+ return ctx.cache().publicJCache(name, true, failIfSys);
}
catch (IgniteCheckedException e) {
throw CU.convertToCacheException(e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eef373a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index fcf65b9..35cfd0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1713,7 +1713,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
*/
public IgniteInternalFuture<?> dynamicStartCache(String cacheName) {
try {
- if (publicJCache(cacheName, false) != null) // Cache with given name already started.
+ if (publicJCache(cacheName, false, true) != null) // Cache with given name already started.
return new GridFinishedFuture<>();
CacheConfiguration cfgTemplate = null;
@@ -2483,21 +2483,22 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If failed.
*/
public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName) throws IgniteCheckedException {
- return publicJCache(cacheName, true);
+ return publicJCache(cacheName, true, true);
}
/**
* @param cacheName Cache name.
* @param failIfNotStarted If {@code true} throws {@link IllegalArgumentException} if cache is not started,
* otherwise returns {@code null} in this case.
+ * @param failIfSys Fail is cache is system.
* @param <K> type of keys.
* @param <V> type of values.
* @return Cache instance for given name.
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- @Nullable private <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName, boolean failIfNotStarted)
- throws IgniteCheckedException
+ @Nullable public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName, boolean failIfNotStarted,
+ boolean failIfSys) throws IgniteCheckedException
{
if (log.isDebugEnabled())
log.debug("Getting public cache for name: " + cacheName);
@@ -2508,7 +2509,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
DynamicCacheDescriptor desc = registeredCaches.get(masked);
- if (desc != null && !desc.cacheType().userCache())
+ if (desc != null && !desc.cacheType().userCache() && failIfSys)
throw new IllegalStateException("Failed to get cache because it is a system cache: " + cacheName);
if (cache == null) {
[15/28] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0d88d3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0d88d3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0d88d3a
Branch: refs/heads/ignite-694
Commit: e0d88d3a0dc0f07316d9f48910203a8dd1428346
Parents: d9e2a64 0cf79e4
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 13:12:36 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 13:12:36 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 37 ++
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 349 +++++++++++++++---
.../dht/GridClientPartitionTopology.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 +--
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 1 +
.../cache/transactions/IgniteTxManager.java | 6 +-
.../resources/META-INF/classnames.properties | 19 +-
...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
.../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +-
.../org/apache/ignite/IgniteSpringBean.java | 14 +
.../commands/cache/VisorCacheClearCommand.scala | 3 +-
.../scala/org/apache/ignite/visor/visor.scala | 12 +-
23 files changed, 1011 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
[10/28] incubator-ignite git commit: # IGNITE-30 Use ByteBuffer to
serialize metrics.
Posted by sb...@apache.org.
# IGNITE-30 Use ByteBuffer to serialize metrics.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb21533e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb21533e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb21533e
Branch: refs/heads/ignite-694
Commit: cb21533eb665776bcd11531f678b1e87b1d3951d
Parents: 1e55e2d
Author: sevdokimov <se...@gridgain.com>
Authored: Tue Apr 7 18:33:53 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue Apr 7 18:33:53 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/ClusterMetricsSnapshot.java | 384 ++++++-------------
1 file changed, 115 insertions(+), 269 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb21533e/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
index 6e933ab..558b0c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
@@ -22,6 +22,7 @@ import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
+import java.nio.*;
import java.util.*;
import static java.lang.Math.*;
@@ -1252,63 +1253,63 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
* @return New offset.
*/
public static int serialize(byte[] data, int off, ClusterMetrics metrics) {
- int start = off;
-
- off = U.intToBytes(metrics.getMaximumActiveJobs(), data, off);
- off = U.intToBytes(metrics.getCurrentActiveJobs(), data, off);
- off = U.floatToBytes(metrics.getAverageActiveJobs(), data, off);
- off = U.intToBytes(metrics.getMaximumWaitingJobs(), data, off);
- off = U.intToBytes(metrics.getCurrentWaitingJobs(), data, off);
- off = U.floatToBytes(metrics.getAverageWaitingJobs(), data, off);
- off = U.intToBytes(metrics.getMaximumRejectedJobs(), data, off);
- off = U.intToBytes(metrics.getCurrentRejectedJobs(), data, off);
- off = U.floatToBytes(metrics.getAverageRejectedJobs(), data, off);
- off = U.intToBytes(metrics.getMaximumCancelledJobs(), data, off);
- off = U.intToBytes(metrics.getCurrentCancelledJobs(), data, off);
- off = U.floatToBytes(metrics.getAverageCancelledJobs(), data, off);
- off = U.intToBytes(metrics.getTotalRejectedJobs(), data, off);
- off = U.intToBytes(metrics.getTotalCancelledJobs(), data, off);
- off = U.intToBytes(metrics.getTotalExecutedJobs(), data, off);
- off = U.longToBytes(metrics.getMaximumJobWaitTime(), data, off);
- off = U.longToBytes(metrics.getCurrentJobWaitTime(), data, off);
- off = U.doubleToBytes(metrics.getAverageJobWaitTime(), data, off);
- off = U.longToBytes(metrics.getMaximumJobExecuteTime(), data, off);
- off = U.longToBytes(metrics.getCurrentJobExecuteTime(), data, off);
- off = U.doubleToBytes(metrics.getAverageJobExecuteTime(), data, off);
- off = U.intToBytes(metrics.getTotalExecutedTasks(), data, off);
- off = U.longToBytes(metrics.getCurrentIdleTime(), data, off);
- off = U.longToBytes(metrics.getTotalIdleTime(), data, off);
- off = U.intToBytes(metrics.getTotalCpus(), data, off);
- off = U.doubleToBytes(metrics.getCurrentCpuLoad(), data, off);
- off = U.doubleToBytes(metrics.getAverageCpuLoad(), data, off);
- off = U.doubleToBytes(metrics.getCurrentGcCpuLoad(), data, off);
- off = U.longToBytes(metrics.getHeapMemoryInitialized(), data, off);
- off = U.longToBytes(metrics.getHeapMemoryUsed(), data, off);
- off = U.longToBytes(metrics.getHeapMemoryCommitted(), data, off);
- off = U.longToBytes(metrics.getHeapMemoryMaximum(), data, off);
- off = U.longToBytes(metrics.getHeapMemoryTotal(), data, off);
- off = U.longToBytes(metrics.getNonHeapMemoryInitialized(), data, off);
- off = U.longToBytes(metrics.getNonHeapMemoryUsed(), data, off);
- off = U.longToBytes(metrics.getNonHeapMemoryCommitted(), data, off);
- off = U.longToBytes(metrics.getNonHeapMemoryMaximum(), data, off);
- off = U.longToBytes(metrics.getNonHeapMemoryTotal(), data, off);
- off = U.longToBytes(metrics.getStartTime(), data, off);
- off = U.longToBytes(metrics.getNodeStartTime(), data, off);
- off = U.longToBytes(metrics.getUpTime(), data, off);
- off = U.intToBytes(metrics.getCurrentThreadCount(), data, off);
- off = U.intToBytes(metrics.getMaximumThreadCount(), data, off);
- off = U.longToBytes(metrics.getTotalStartedThreadCount(), data, off);
- off = U.intToBytes(metrics.getCurrentDaemonThreadCount(), data, off);
- off = U.longToBytes(metrics.getLastDataVersion(), data, off);
- off = U.intToBytes(metrics.getSentMessagesCount(), data, off);
- off = U.longToBytes(metrics.getSentBytesCount(), data, off);
- off = U.intToBytes(metrics.getReceivedMessagesCount(), data, off);
- off = U.longToBytes(metrics.getReceivedBytesCount(), data, off);
- off = U.intToBytes(metrics.getOutboundMessagesQueueSize(), data, off);
- off = U.intToBytes(metrics.getTotalNodes(), data, off);
-
- assert off - start == METRICS_SIZE : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual=" +
- (off - start) + ']';
+ ByteBuffer buf = ByteBuffer.wrap(data, off, METRICS_SIZE);
+
+ buf.putInt(metrics.getMaximumActiveJobs());
+ buf.putInt(metrics.getCurrentActiveJobs());
+ buf.putFloat(metrics.getAverageActiveJobs());
+ buf.putInt(metrics.getMaximumWaitingJobs());
+ buf.putInt(metrics.getCurrentWaitingJobs());
+ buf.putFloat(metrics.getAverageWaitingJobs());
+ buf.putInt(metrics.getMaximumRejectedJobs());
+ buf.putInt(metrics.getCurrentRejectedJobs());
+ buf.putFloat(metrics.getAverageRejectedJobs());
+ buf.putInt(metrics.getMaximumCancelledJobs());
+ buf.putInt(metrics.getCurrentCancelledJobs());
+ buf.putFloat(metrics.getAverageCancelledJobs());
+ buf.putInt(metrics.getTotalRejectedJobs());
+ buf.putInt(metrics.getTotalCancelledJobs());
+ buf.putInt(metrics.getTotalExecutedJobs());
+ buf.putLong(metrics.getMaximumJobWaitTime());
+ buf.putLong(metrics.getCurrentJobWaitTime());
+ buf.putDouble(metrics.getAverageJobWaitTime());
+ buf.putLong(metrics.getMaximumJobExecuteTime());
+ buf.putLong(metrics.getCurrentJobExecuteTime());
+ buf.putDouble(metrics.getAverageJobExecuteTime());
+ buf.putInt(metrics.getTotalExecutedTasks());
+ buf.putLong(metrics.getCurrentIdleTime());
+ buf.putLong(metrics.getTotalIdleTime());
+ buf.putInt(metrics.getTotalCpus());
+ buf.putDouble(metrics.getCurrentCpuLoad());
+ buf.putDouble(metrics.getAverageCpuLoad());
+ buf.putDouble(metrics.getCurrentGcCpuLoad());
+ buf.putLong(metrics.getHeapMemoryInitialized());
+ buf.putLong(metrics.getHeapMemoryUsed());
+ buf.putLong(metrics.getHeapMemoryCommitted());
+ buf.putLong(metrics.getHeapMemoryMaximum());
+ buf.putLong(metrics.getHeapMemoryTotal());
+ buf.putLong(metrics.getNonHeapMemoryInitialized());
+ buf.putLong(metrics.getNonHeapMemoryUsed());
+ buf.putLong(metrics.getNonHeapMemoryCommitted());
+ buf.putLong(metrics.getNonHeapMemoryMaximum());
+ buf.putLong(metrics.getNonHeapMemoryTotal());
+ buf.putLong(metrics.getStartTime());
+ buf.putLong(metrics.getNodeStartTime());
+ buf.putLong(metrics.getUpTime());
+ buf.putInt(metrics.getCurrentThreadCount());
+ buf.putInt(metrics.getMaximumThreadCount());
+ buf.putLong(metrics.getTotalStartedThreadCount());
+ buf.putInt(metrics.getCurrentDaemonThreadCount());
+ buf.putLong(metrics.getLastDataVersion());
+ buf.putInt(metrics.getSentMessagesCount());
+ buf.putLong(metrics.getSentBytesCount());
+ buf.putInt(metrics.getReceivedMessagesCount());
+ buf.putLong(metrics.getReceivedBytesCount());
+ buf.putInt(metrics.getOutboundMessagesQueueSize());
+ buf.putInt(metrics.getTotalNodes());
+
+ assert !buf.hasRemaining() : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual="
+ + (buf.position() - off) + ']';
return off;
}
@@ -1321,222 +1322,67 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
* @return Deserialized node metrics.
*/
public static ClusterMetrics deserialize(byte[] data, int off) {
- int start = off;
-
ClusterMetricsSnapshot metrics = new ClusterMetricsSnapshot();
- metrics.setLastUpdateTime(U.currentTimeMillis());
-
- metrics.setMaximumActiveJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setCurrentActiveJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setAverageActiveJobs(U.bytesToFloat(data, off));
-
- off += 4;
-
- metrics.setMaximumWaitingJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setCurrentWaitingJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setAverageWaitingJobs(U.bytesToFloat(data, off));
-
- off += 4;
-
- metrics.setMaximumRejectedJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setCurrentRejectedJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setAverageRejectedJobs(U.bytesToFloat(data, off));
-
- off += 4;
-
- metrics.setMaximumCancelledJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setCurrentCancelledJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setAverageCancelledJobs(U.bytesToFloat(data, off));
-
- off += 4;
-
- metrics.setTotalRejectedJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setTotalCancelledJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setTotalExecutedJobs(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setMaximumJobWaitTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setCurrentJobWaitTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setAverageJobWaitTime(U.bytesToDouble(data, off));
-
- off += 8;
-
- metrics.setMaximumJobExecuteTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setCurrentJobExecuteTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setAverageJobExecuteTime(U.bytesToDouble(data, off));
-
- off += 8;
-
- metrics.setTotalExecutedTasks(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setCurrentIdleTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setTotalIdleTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setAvailableProcessors(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setCurrentCpuLoad(U.bytesToDouble(data, off));
+ ByteBuffer buf = ByteBuffer.wrap(data, off, METRICS_SIZE);
- off += 8;
-
- metrics.setAverageCpuLoad(U.bytesToDouble(data, off));
-
- off += 8;
-
- metrics.setCurrentGcCpuLoad(U.bytesToDouble(data, off));
-
- off += 8;
-
- metrics.setHeapMemoryInitialized(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setHeapMemoryUsed(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setHeapMemoryCommitted(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setHeapMemoryMaximum(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setHeapMemoryTotal(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setNonHeapMemoryInitialized(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setNonHeapMemoryUsed(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setNonHeapMemoryCommitted(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setNonHeapMemoryMaximum(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setNonHeapMemoryTotal(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setStartTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setNodeStartTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setUpTime(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setCurrentThreadCount(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setMaximumThreadCount(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setTotalStartedThreadCount(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setCurrentDaemonThreadCount(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setLastDataVersion(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setSentMessagesCount(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setSentBytesCount(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setReceivedMessagesCount(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setReceivedBytesCount(U.bytesToLong(data, off));
-
- off += 8;
-
- metrics.setOutboundMessagesQueueSize(U.bytesToInt(data, off));
-
- off += 4;
-
- metrics.setTotalNodes(U.bytesToInt(data, off));
-
- off += 4;
+ metrics.setLastUpdateTime(U.currentTimeMillis());
- assert off - start == METRICS_SIZE : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual=" +
- (off - start) + ']';
+ metrics.setMaximumActiveJobs(buf.getInt());
+ metrics.setCurrentActiveJobs(buf.getInt());
+ metrics.setAverageActiveJobs(buf.getFloat());
+ metrics.setMaximumWaitingJobs(buf.getInt());
+ metrics.setCurrentWaitingJobs(buf.getInt());
+ metrics.setAverageWaitingJobs(buf.getFloat());
+ metrics.setMaximumRejectedJobs(buf.getInt());
+ metrics.setCurrentRejectedJobs(buf.getInt());
+ metrics.setAverageRejectedJobs(buf.getFloat());
+ metrics.setMaximumCancelledJobs(buf.getInt());
+ metrics.setCurrentCancelledJobs(buf.getInt());
+ metrics.setAverageCancelledJobs(buf.getFloat());
+ metrics.setTotalRejectedJobs(buf.getInt());
+ metrics.setTotalCancelledJobs(buf.getInt());
+ metrics.setTotalExecutedJobs(buf.getInt());
+ metrics.setMaximumJobWaitTime(buf.getLong());
+ metrics.setCurrentJobWaitTime(buf.getLong());
+ metrics.setAverageJobWaitTime(buf.getDouble());
+ metrics.setMaximumJobExecuteTime(buf.getLong());
+ metrics.setCurrentJobExecuteTime(buf.getLong());
+ metrics.setAverageJobExecuteTime(buf.getDouble());
+ metrics.setTotalExecutedTasks(buf.getInt());
+ metrics.setCurrentIdleTime(buf.getLong());
+ metrics.setTotalIdleTime(buf.getLong());
+ metrics.setAvailableProcessors(buf.getInt());
+ metrics.setCurrentCpuLoad(buf.getDouble());
+ metrics.setAverageCpuLoad(buf.getDouble());
+ metrics.setCurrentGcCpuLoad(buf.getDouble());
+ metrics.setHeapMemoryInitialized(buf.getLong());
+ metrics.setHeapMemoryUsed(buf.getLong());
+ metrics.setHeapMemoryCommitted(buf.getLong());
+ metrics.setHeapMemoryMaximum(buf.getLong());
+ metrics.setHeapMemoryTotal(buf.getLong());
+ metrics.setNonHeapMemoryInitialized(buf.getLong());
+ metrics.setNonHeapMemoryUsed(buf.getLong());
+ metrics.setNonHeapMemoryCommitted(buf.getLong());
+ metrics.setNonHeapMemoryMaximum(buf.getLong());
+ metrics.setNonHeapMemoryTotal(buf.getLong());
+ metrics.setStartTime(buf.getLong());
+ metrics.setNodeStartTime(buf.getLong());
+ metrics.setUpTime(buf.getLong());
+ metrics.setCurrentThreadCount(buf.getInt());
+ metrics.setMaximumThreadCount(buf.getInt());
+ metrics.setTotalStartedThreadCount(buf.getLong());
+ metrics.setCurrentDaemonThreadCount(buf.getInt());
+ metrics.setLastDataVersion(buf.getLong());
+ metrics.setSentMessagesCount(buf.getInt());
+ metrics.setSentBytesCount(buf.getLong());
+ metrics.setReceivedMessagesCount(buf.getInt());
+ metrics.setReceivedBytesCount(buf.getLong());
+ metrics.setOutboundMessagesQueueSize(buf.getInt());
+ metrics.setTotalNodes(buf.getInt());
+
+ assert !buf.hasRemaining() : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual="
+ + (buf.position() - off) + ']';
return metrics;
}
[12/28] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/58f49139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/58f49139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/58f49139
Branch: refs/heads/ignite-694
Commit: 58f4913905c3dccc2fe87da2a58f73da5416955e
Parents: cf1cf9d beedb17
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 01:25:24 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 01:25:24 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +++-
.../communication/tcp/TcpCommunicationSpi.java | 14 +--
.../discovery/tcp/TcpClientDiscoverySpi.java | 47 ++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++++++-------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 ++-----------------
...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +-
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../IgniteCacheEvictionSelfTestSuite.java | 1 +
parent/pom.xml | 2 +-
pom.xml | 1 +
17 files changed, 121 insertions(+), 190 deletions(-)
----------------------------------------------------------------------
[06/28] incubator-ignite git commit: ignite-624
Posted by sb...@apache.org.
ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25f900ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25f900ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25f900ed
Branch: refs/heads/ignite-694
Commit: 25f900edac7d3a213ec30de673251777739848a5
Parents: 71fa3a2
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Apr 7 09:54:56 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Apr 7 09:54:56 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridSqlQuery.java | 103 +++++++++----------
.../query/h2/sql/GridSqlQueryParser.java | 41 +++++---
.../query/h2/sql/GridSqlQuerySplitter.java | 96 ++++++++++++-----
.../processors/query/h2/sql/GridSqlSelect.java | 72 ++++++++-----
.../processors/query/h2/sql/GridSqlUnion.java | 42 +-------
5 files changed, 192 insertions(+), 162 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index db1dcbf..5953d5e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -17,6 +17,9 @@
package org.apache.ignite.internal.processors.query.h2.sql;
+import org.apache.ignite.*;
+import org.h2.util.*;
+
import java.util.*;
/**
@@ -27,13 +30,7 @@ public abstract class GridSqlQuery implements Cloneable {
protected boolean distinct;
/** */
- protected List<GridSqlElement> allExprs;
-
- /** */
- protected List<GridSqlElement> select = new ArrayList<>();
-
- /** */
- protected Map<GridSqlElement,GridSqlSortColumn> sort = new LinkedHashMap<>();
+ protected List<GridSqlSortColumn> sort = new ArrayList<>();
/** */
protected GridSqlElement offset;
@@ -89,66 +86,66 @@ public abstract class GridSqlQuery implements Cloneable {
public abstract String getSQL();
/**
- * @param expression Expression.
- */
- public void addExpression(GridSqlElement expression) {
- if (allExprs == null)
- allExprs = new ArrayList<>();
-
- allExprs.add(expression);
- }
-
- /**
- * @return All expressions in select, group by, order by.
+ * @return Sort.
*/
- public List<GridSqlElement> allExpressions() {
- return allExprs;
+ public List<GridSqlSortColumn> sort() {
+ return sort;
}
/**
- * @return Expressions.
+ *
*/
- public List<GridSqlElement> select() {
- return select;
+ public void clearSort() {
+ sort = new ArrayList<>();
}
/**
- * Clears select list.
+ * @param sortCol The sort column.
*/
- public void clearSelect() {
- select = new ArrayList<>();
+ public void addSort(GridSqlSortColumn sortCol) {
+ sort.add(sortCol);
}
/**
- * @param expression Expression.
+ * @param buff Statement builder.
*/
- public void addSelectExpression(GridSqlElement expression) {
- if (expression == null)
- throw new NullPointerException();
-
- select.add(expression);
- }
+ protected void getSortLimitSQL(StatementBuilder buff) {
+ if (!sort.isEmpty()) {
+ buff.append("\nORDER BY ");
+
+ boolean first = true;
+
+ for (GridSqlSortColumn col : sort) {
+ if (first)
+ first = false;
+ else
+ buff.append(", ");
+
+ int idx = col.column();
+
+ if (idx >= 0)
+ buff.append(idx + 1);
+ else {
+ throw new IgniteException("Failed to generate query: " + buff);
+// buff.append('=').append(StringUtils.unEnclose(entry.getKey().getSQL()));
+ }
+
+ if (!col.asc())
+ buff.append(" DESC");
+
+ if (col.nullsFirst())
+ buff.append(" NULLS FIRST");
+ else if (col.nullsLast())
+ buff.append(" NULLS LAST");
+ }
+ }
- /**
- * @return Sort.
- */
- public Map<GridSqlElement,GridSqlSortColumn> sort() {
- return sort;
- }
+ if (limit != null)
+ buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
- /**
- *
- */
- public void clearSort() {
- sort = new LinkedHashMap<>();
- }
+ if (offset != null)
+ buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
- /**
- * @param expression Expression.
- * @param sortType The sort type bit mask (SortOrder.DESCENDING, SortOrder.NULLS_FIRST, SortOrder.NULLS_LAST).
- */
- public void addSort(GridSqlElement expression, GridSqlSortColumn sortType) {
- sort.put(expression, sortType);
}
/** {@inheritDoc} */
@@ -157,9 +154,7 @@ public abstract class GridSqlQuery implements Cloneable {
try {
GridSqlQuery res = (GridSqlQuery)super.clone();
- res.select = new ArrayList<>(select);
- res.sort = new LinkedHashMap<>(sort);
- res.allExprs = null;
+ res.sort = new ArrayList<>(sort);
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index fb341c1..ea3628f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -293,22 +293,7 @@ public class GridSqlQueryParser {
for (int i = 0; i < select.getColumnCount(); i++)
res.addSelectExpression(parseExpression(expressions.get(i)));
- SortOrder sortOrder = select.getSortOrder();
-
- if (sortOrder != null) {
- int[] indexes = sortOrder.getQueryColumnIndexes();
- int[] sortTypes = sortOrder.getSortTypes();
-
- for (int i = 0; i < indexes.length; i++) {
- int colIdx = indexes[i];
- int type = sortTypes[i];
-
- res.addSort(parseExpression(expressions.get(colIdx)), new GridSqlSortColumn(colIdx,
- (type & SortOrder.DESCENDING) == 0,
- (type & SortOrder.NULLS_FIRST) != 0,
- (type & SortOrder.NULLS_LAST) != 0));
- }
- }
+ processSortOrder(select.getSortOrder(), res);
res.limit(parseExpression(select.getLimit()));
res.offset(parseExpression(select.getOffset()));
@@ -317,6 +302,28 @@ public class GridSqlQueryParser {
}
/**
+ * @param sortOrder Sort order.
+ * @param qry Query.
+ */
+ private void processSortOrder(SortOrder sortOrder, GridSqlQuery qry) {
+ if (sortOrder == null)
+ return;
+
+ int[] indexes = sortOrder.getQueryColumnIndexes();
+ int[] sortTypes = sortOrder.getSortTypes();
+
+ for (int i = 0; i < indexes.length; i++) {
+ int colIdx = indexes[i];
+ int type = sortTypes[i];
+
+ qry.addSort(new GridSqlSortColumn(colIdx,
+ (type & SortOrder.DESCENDING) == 0,
+ (type & SortOrder.NULLS_FIRST) != 0,
+ (type & SortOrder.NULLS_LAST) != 0));
+ }
+ }
+
+ /**
* @param qry Select.
*/
public GridSqlQuery parse(Query qry) {
@@ -348,7 +355,7 @@ public class GridSqlQueryParser {
res.limit(parseExpression(union.getLimit()));
res.offset(parseExpression(union.getOffset()));
- assert UNION_SORT.get(union) == null; // todo IGNITE-624
+ processSortOrder(UNION_SORT.get(union), res);
h2ObjToGridObj.put(union, res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index f343b01..05928c2 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -57,6 +57,17 @@ public class GridSqlQuerySplitter {
}
/**
+ * @param qry Query.
+ * @return Leftest simple query if this is UNION.
+ */
+ private static GridSqlSelect leftest(GridSqlQuery qry) {
+ if (qry instanceof GridSqlUnion)
+ return leftest(((GridSqlUnion)qry).left());
+
+ return (GridSqlSelect)qry;
+ }
+
+ /**
* @param stmt Prepared statement.
* @param params Parameters.
* @return Two step query.
@@ -65,21 +76,58 @@ public class GridSqlQuerySplitter {
if (params == null)
params = GridCacheSqlQuery.EMPTY_PARAMS;
- GridSqlQuery srcQry = GridSqlQueryParser.parse(stmt);
+ GridSqlQuery qry0 = GridSqlQueryParser.parse(stmt);
+
+ GridSqlSelect srcQry;
+
+ if (qry0 instanceof GridSqlSelect)
+ srcQry = (GridSqlSelect)qry0;
+ else {
+ srcQry = new GridSqlSelect().from(new GridSqlSubquery(qry0));
+
+ GridSqlSelect left = leftest(qry0);
+
+ int c = 0;
+
+ for (GridSqlElement expr : left.select()) {
+ String colName;
+
+ if (expr instanceof GridSqlAlias)
+ colName = ((GridSqlAlias)expr).alias();
+ else if (expr instanceof GridSqlColumn)
+ colName = ((GridSqlColumn)expr).columnName();
+ else {
+ colName = columnName(c);
- if (!(srcQry instanceof GridSqlSelect))
- throw new UnsupportedOperationException(); // todo IGNITE-624 Support UNION,
+ expr = alias(colName, expr);
- GridSqlSelect srcSelect = (GridSqlSelect)srcQry;
+ // Set generated alias to the expression.
+ left.select().set(c, expr);
+ left.allExpressions().set(c, expr);
+ }
+
+ srcQry.addSelectExpression(column(colName));
+
+ qry0.sort();
+
+ c++;
+ }
+
+ // ORDER BY
+ if (!qry0.sort().isEmpty()) {
+ for (GridSqlSortColumn col : qry0.sort())
+ srcQry.addSort(col);
+ }
+ }
final String mergeTable = TABLE_FUNC_NAME + "()"; // table(0); TODO
- GridSqlSelect mapQry = srcSelect.clone();
+ GridSqlSelect mapQry = srcQry.clone();
GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = new ArrayList<>(srcSelect.allExpressions());
- GridSqlElement[] rdcExps = new GridSqlElement[srcSelect.select().size()];
+ List<GridSqlElement> mapExps = new ArrayList<>(srcQry.allExpressions());
+ GridSqlElement[] rdcExps = new GridSqlElement[srcQry.select().size()];
Set<String> colNames = new HashSet<>();
@@ -98,31 +146,31 @@ public class GridSqlQuerySplitter {
rdcQry.addSelectExpression(rdcExp);
// -- GROUP BY
- if (!srcSelect.groups().isEmpty()) {
+ if (!srcQry.groups().isEmpty()) {
mapQry.clearGroups();
- for (int col : srcSelect.groupColumns())
+ for (int col : srcQry.groupColumns())
mapQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
- for (int col : srcSelect.groupColumns())
+ for (int col : srcQry.groupColumns())
rdcQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
}
// -- HAVING
- if (srcSelect.having() != null) {
+ if (srcQry.having() != null) {
// TODO Find aggregate functions in HAVING clause.
- rdcQry.whereAnd(column(columnName(srcSelect.havingColumn())));
+ rdcQry.whereAnd(column(columnName(srcQry.havingColumn())));
mapQry.having(null);
}
// -- ORDER BY
- if (!srcSelect.sort().isEmpty()) {
+ if (!srcQry.sort().isEmpty()) {
if (aggregateFound) // Ordering over aggregates does not make sense.
mapQry.clearSort(); // Otherwise map sort will be used by offset-limit.
- for (GridSqlSortColumn sortCol : srcSelect.sort().values())
- rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol);
+ for (GridSqlSortColumn sortCol : srcQry.sort())
+ rdcQry.addSort(sortCol);
}
// -- LIMIT
@@ -134,14 +182,14 @@ public class GridSqlQuerySplitter {
}
// -- OFFSET
- if (srcSelect.offset() != null) {
+ if (srcQry.offset() != null) {
mapQry.offset(null);
- rdcQry.offset(srcSelect.offset());
+ rdcQry.offset(srcQry.offset());
}
// -- DISTINCT
- if (srcSelect.distinct()) {
+ if (srcQry.distinct()) {
mapQry.distinct(false);
rdcQry.distinct(true);
}
@@ -166,7 +214,12 @@ public class GridSqlQuerySplitter {
if (qry instanceof GridSqlSelect)
return findParams((GridSqlSelect)qry, params, target);
- throw new UnsupportedOperationException(); // todo IGNITE-624
+ GridSqlUnion union = (GridSqlUnion)qry;
+
+ findParams(union.left(), params, target);
+ findParams(union.right(), params, target);
+
+ return target;
}
/**
@@ -179,7 +232,7 @@ public class GridSqlQuerySplitter {
if (params.length == 0)
return target;
- for (GridSqlElement el : qry.select())
+ for (GridSqlElement el : qry.allExpressions())
findParams(el, params, target);
findParams(qry.from(), params, target);
@@ -190,9 +243,6 @@ public class GridSqlQuerySplitter {
findParams(qry.having(), params, target);
- for (GridSqlElement el : qry.sort().keySet())
- findParams(el, params, target);
-
findParams(qry.limit(), params, target);
findParams(qry.offset(), params, target);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index 272f8b4..154659b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -26,6 +26,12 @@ import java.util.*;
*/
public class GridSqlSelect extends GridSqlQuery {
/** */
+ private List<GridSqlElement> allExprs;
+
+ /** */
+ private List<GridSqlElement> select = new ArrayList<>();
+
+ /** */
private List<GridSqlElement> groups = new ArrayList<>();
/** */
@@ -79,42 +85,50 @@ public class GridSqlSelect extends GridSqlQuery {
if (having != null)
buff.append("\nHAVING ").append(StringUtils.unEnclose(having.getSQL()));
- if (!sort.isEmpty()) {
- buff.append("\nORDER BY ");
-
- buff.resetCount();
-
- for (Map.Entry<GridSqlElement,GridSqlSortColumn> entry : sort.entrySet()) {
- buff.appendExceptFirst(", ");
-
- GridSqlElement expression = entry.getKey();
+ getSortLimitSQL(buff);
- int idx = select.indexOf(expression);
+ return buff.toString();
+ }
- if (idx >= 0)
- buff.append(idx + 1);
- else
- buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
+ /**
+ * @param expression Expression.
+ */
+ public void addExpression(GridSqlElement expression) {
+ if (allExprs == null)
+ allExprs = new ArrayList<>();
- GridSqlSortColumn type = entry.getValue();
+ allExprs.add(expression);
+ }
- if (!type.asc())
- buff.append(" DESC");
+ /**
+ * @return All expressions in select, group by, order by.
+ */
+ public List<GridSqlElement> allExpressions() {
+ return allExprs;
+ }
- if (type.nullsFirst())
- buff.append(" NULLS FIRST");
- else if (type.nullsLast())
- buff.append(" NULLS LAST");
- }
- }
+ /**
+ * @return Expressions.
+ */
+ public List<GridSqlElement> select() {
+ return select;
+ }
- if (limit != null)
- buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
+ /**
+ * Clears select list.
+ */
+ public void clearSelect() {
+ select = new ArrayList<>();
+ }
- if (offset != null)
- buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
+ /**
+ * @param expression Expression.
+ */
+ public void addSelectExpression(GridSqlElement expression) {
+ if (expression == null)
+ throw new NullPointerException();
- return buff.toString();
+ select.add(expression);
}
/**
@@ -237,6 +251,8 @@ public class GridSqlSelect extends GridSqlQuery {
res.groups = new ArrayList<>(groups);
res.grpCols = grpCols == null ? null : grpCols.clone();
+ res.select = new ArrayList<>(select);
+ res.allExprs = null;
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f900ed/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index 1eae1ef..6fe3f19 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.query.h2.sql;
import org.h2.command.dml.*;
-import org.h2.message.*;
import org.h2.util.*;
import javax.cache.*;
-import java.util.*;
/**
*
@@ -39,7 +37,7 @@ public class GridSqlUnion extends GridSqlQuery {
/** {@inheritDoc} */
@Override public String getSQL() {
- StringBuilder buff = new StringBuilder();
+ StatementBuilder buff = new StatementBuilder();
buff.append('(').append(left.getSQL()).append(')');
@@ -66,43 +64,7 @@ public class GridSqlUnion extends GridSqlQuery {
buff.append('(').append(right.getSQL()).append(')');
- if (!sort.isEmpty()) {
- buff.append("\nORDER BY ");
-
- boolean first = true;
-
- for (Map.Entry<GridSqlElement, GridSqlSortColumn> entry : sort.entrySet()) {
- if (first)
- first = false;
- else
- buff.append(", ");
-
- GridSqlElement expression = entry.getKey();
-
- int idx = select.indexOf(expression);
-
- if (idx >= 0)
- buff.append(idx + 1);
- else
- buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
-
- GridSqlSortColumn type = entry.getValue();
-
- if (!type.asc())
- buff.append(" DESC");
-
- if (type.nullsFirst())
- buff.append(" NULLS FIRST");
- else if (type.nullsLast())
- buff.append(" NULLS LAST");
- }
- }
-
- if (limit != null)
- buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
-
- if (offset != null)
- buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
+ getSortLimitSQL(buff);
return buff.toString();
}
[27/28] incubator-ignite git commit: # ignite-sprint-3 correction for
ignite-680
Posted by sb...@apache.org.
# ignite-sprint-3 correction for ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3e6da9cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3e6da9cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3e6da9cd
Branch: refs/heads/ignite-694
Commit: 3e6da9cda37c094167ec7bad604c3f9baf631fc6
Parents: 9d183c5
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 09:50:42 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 10:11:35 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 11 ++
.../apache/ignite/internal/IgniteKernal.java | 19 ++-
.../cache/DynamicCacheChangeRequest.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 119 +++++++++++--------
...teCacheConfigurationDefaultTemplateTest.java | 111 +++++++++++++++++
...eCacheConfigurationTemplateNotFoundTest.java | 114 ------------------
.../IgniteCacheConfigurationTemplateTest.java | 86 +++++++++++++-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 ++
10 files changed, 309 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 6b49add..40c9bbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -217,6 +217,17 @@ public interface Ignite extends AutoCloseable {
public <K, V> IgniteCache<K, V> createCache(CacheConfiguration<K, V> cacheCfg);
/**
+ * Dynamically starts new cache using template configuration.
+ * <p>
+ * If local node is an affinity node, this method will return the instance of started cache.
+ * Otherwise, it will create a client cache on local node.
+ *
+ * @param cacheName Cache name.
+ * @return Instance of started cache.
+ */
+ public <K, V> IgniteCache<K, V> createCache(String cacheName);
+
+ /**
* Gets existing cache with the given name or creates new one with the given configuration.
*
* @param cacheCfg Cache configuration to use.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 768bbd3..0db2ad6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2282,6 +2282,23 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
/** {@inheritDoc} */
+ @Override public <K, V> IgniteCache<K, V> createCache(String cacheName) {
+ guard();
+
+ try {
+ ctx.cache().createFromTemplate(cacheName).get();
+
+ return ctx.cache().publicJCache(cacheName);
+ }
+ catch (IgniteCheckedException e) {
+ throw CU.convertToCacheException(e);
+ }
+ finally {
+ unguard();
+ }
+ }
+
+ /** {@inheritDoc} */
@Override public <K, V> IgniteCache<K, V> getOrCreateCache(CacheConfiguration<K, V> cacheCfg) {
A.notNull(cacheCfg, "cacheCfg");
@@ -2409,7 +2426,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
guard();
try {
- ctx.cache().dynamicStartCache(cacheName).get();
+ ctx.cache().getOrCreateFromTemplate(cacheName).get();
return ctx.cache().publicJCache(cacheName);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index bd53cdb..c08a179 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -119,7 +119,7 @@ public class DynamicCacheChangeRequest implements Serializable {
* @return {@code True} if this is a start request.
*/
public boolean start() {
- return startCfg != null;
+ return !template && startCfg != null;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 35cfd0c..f0db73e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1365,7 +1365,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
) throws IgniteCheckedException {
for (DynamicCacheChangeRequest req : reqs) {
assert req.start() : req;
- assert req.cacheType() != null : req.cacheType();
+ assert req.cacheType() != null : req;
prepareCacheStart(
req.startCacheConfiguration(),
@@ -1711,81 +1711,102 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param cacheName Cache name.
* @return Future that will be completed when cache is deployed.
*/
- public IgniteInternalFuture<?> dynamicStartCache(String cacheName) {
+ public IgniteInternalFuture<?> createFromTemplate(String cacheName) {
+ CacheConfiguration cfg = createConfigFromTemplate(cacheName);
+
+ return dynamicStartCache(cfg, cacheName, null, true);
+ }
+
+ /**
+ * Dynamically starts cache using template configuration.
+ *
+ * @param cacheName Cache name.
+ * @return Future that will be completed when cache is deployed.
+ */
+ public IgniteInternalFuture<?> getOrCreateFromTemplate(String cacheName) {
try {
if (publicJCache(cacheName, false, true) != null) // Cache with given name already started.
return new GridFinishedFuture<>();
- CacheConfiguration cfgTemplate = null;
+ CacheConfiguration cfg = createConfigFromTemplate(cacheName);
- CacheConfiguration dfltCacheCfg = null;
+ return dynamicStartCache(cfg, cacheName, null, false);
+ }
+ catch (IgniteCheckedException e) {
+ return new GridFinishedFuture<>(e);
+ }
+ }
- List<CacheConfiguration> wildcardNameCfgs = null;
+ /**
+ * @param cacheName Cache name.
+ * @return Cache configuration.
+ */
+ private CacheConfiguration createConfigFromTemplate(String cacheName) {
+ CacheConfiguration cfgTemplate = null;
- for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
- assert desc.template();
+ CacheConfiguration dfltCacheCfg = null;
- CacheConfiguration cfg = desc.cacheConfiguration();
+ List<CacheConfiguration> wildcardNameCfgs = null;
- assert cfg != null;
+ for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
+ assert desc.template();
- if (F.eq(cacheName, cfg.getName())) {
- cfgTemplate = cfg;
+ CacheConfiguration cfg = desc.cacheConfiguration();
- break;
- }
+ assert cfg != null;
- if (cfg.getName() != null ) {
- if (cfg.getName().endsWith("*")) {
- if (cfg.getName().length() > 1) {
- if (wildcardNameCfgs == null)
- wildcardNameCfgs = new ArrayList<>();
+ if (F.eq(cacheName, cfg.getName())) {
+ cfgTemplate = cfg;
- wildcardNameCfgs.add(cfg);
- }
- else
- dfltCacheCfg = cfg; // Template with name '*'.
+ break;
+ }
+
+ if (cfg.getName() != null ) {
+ if (cfg.getName().endsWith("*")) {
+ if (cfg.getName().length() > 1) {
+ if (wildcardNameCfgs == null)
+ wildcardNameCfgs = new ArrayList<>();
+
+ wildcardNameCfgs.add(cfg);
}
+ else
+ dfltCacheCfg = cfg; // Template with name '*'.
}
- else if (dfltCacheCfg == null)
- dfltCacheCfg = cfg;
}
+ else if (dfltCacheCfg == null)
+ dfltCacheCfg = cfg;
+ }
- if (cfgTemplate == null && cacheName != null && wildcardNameCfgs != null) {
- Collections.sort(wildcardNameCfgs, new Comparator<CacheConfiguration>() {
- @Override public int compare(CacheConfiguration cfg1, CacheConfiguration cfg2) {
- Integer len1 = cfg1.getName() != null ? cfg1.getName().length() : 0;
- Integer len2 = cfg2.getName() != null ? cfg2.getName().length() : 0;
+ if (cfgTemplate == null && cacheName != null && wildcardNameCfgs != null) {
+ Collections.sort(wildcardNameCfgs, new Comparator<CacheConfiguration>() {
+ @Override public int compare(CacheConfiguration cfg1, CacheConfiguration cfg2) {
+ Integer len1 = cfg1.getName() != null ? cfg1.getName().length() : 0;
+ Integer len2 = cfg2.getName() != null ? cfg2.getName().length() : 0;
- return len2.compareTo(len1);
- }
- });
+ return len2.compareTo(len1);
+ }
+ });
- for (CacheConfiguration cfg : wildcardNameCfgs) {
- if (cacheName.startsWith(cfg.getName().substring(0, cfg.getName().length() - 1))) {
- cfgTemplate = cfg;
+ for (CacheConfiguration cfg : wildcardNameCfgs) {
+ if (cacheName.startsWith(cfg.getName().substring(0, cfg.getName().length() - 1))) {
+ cfgTemplate = cfg;
- break;
- }
+ break;
}
}
+ }
- if (cfgTemplate == null)
- cfgTemplate = dfltCacheCfg;
+ if (cfgTemplate == null)
+ cfgTemplate = dfltCacheCfg;
- if (cfgTemplate == null)
- throw new IllegalArgumentException("Failed to start cache " +
- "(there is no matching template configuration) : " + cacheName);
+ if (cfgTemplate == null)
+ cfgTemplate = new CacheConfiguration();
- CacheConfiguration cfg = new CacheConfiguration(cfgTemplate);
+ CacheConfiguration cfg = new CacheConfiguration(cfgTemplate);
- cfg.setName(cacheName);
+ cfg.setName(cacheName);
- return dynamicStartCache(cfg, cacheName, null, false);
- }
- catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(e);
- }
+ return cfg;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java
new file mode 100644
index 0000000..0aa9683
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ *
+ */
+public class IgniteCacheConfigurationDefaultTemplateTest extends GridCommonAbstractTest {
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ CacheConfiguration templateCfg = new CacheConfiguration();
+
+ templateCfg.setName("org.apache.ignite.template*");
+ templateCfg.setBackups(3);
+
+ cfg.setCacheConfiguration(templateCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDefaultTemplate() throws Exception {
+ Ignite ignite = startGrid(0);
+
+ checkDefaultTemplate(ignite, "org.apache.ignite");
+
+ checkDefaultTemplate(ignite, "org.apache.ignite.templat");
+
+ checkDefaultTemplate(ignite, null);
+
+ checkGetOrCreate(ignite, "org.apache.ignite.template", 3);
+
+ CacheConfiguration templateCfg = new CacheConfiguration();
+
+ templateCfg.setBackups(4);
+
+ ignite.addCacheConfiguration(templateCfg);
+
+ checkGetOrCreate(ignite, "org.apache.ignite2", 4);
+ }
+
+ /**
+ * @param ignite Ignite.
+ * @param cacheName Cache name.
+ */
+ private void checkDefaultTemplate(final Ignite ignite, final String cacheName) {
+ checkGetOrCreate(ignite, cacheName, 0);
+
+ IgniteCache cache = ignite.getOrCreateCache(cacheName);
+
+ assertNotNull(cache);
+
+ CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+ assertEquals(CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE, cfg.getAtomicityMode());
+ }
+
+ /**
+ * @param ignite Ignite.
+ * @param name Cache name.
+ * @param expBackups Expected number of backups.
+ */
+ private void checkGetOrCreate(Ignite ignite, String name, int expBackups) {
+ IgniteCache cache = ignite.getOrCreateCache(name);
+
+ assertNotNull(cache);
+
+ CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+ assertEquals(name, cfg.getName());
+ assertEquals(expBackups, cfg.getBackups());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
deleted file mode 100644
index 53780da..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
-
-/**
- *
- */
-public class IgniteCacheConfigurationTemplateNotFoundTest extends GridCommonAbstractTest {
- /** */
- private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
-
- CacheConfiguration templateCfg = new CacheConfiguration();
-
- templateCfg.setName("org.apache.ignite.template*");
- templateCfg.setBackups(3);
-
- cfg.setCacheConfiguration(templateCfg);
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- super.afterTest();
-
- stopAllGrids();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTemplateNotFound() throws Exception {
- Ignite ignite = startGrid(0);
-
- checkTemplateNotFound(ignite, "org.apache.ignite");
-
- checkTemplateNotFound(ignite, "org.apache.ignite.templat");
-
- checkTemplateNotFound(ignite, null);
-
- checkGetOrCreate(ignite, "org.apache.ignite.template", 3);
-
- CacheConfiguration templateCfg = new CacheConfiguration();
-
- templateCfg.setBackups(4);
-
- ignite.addCacheConfiguration(templateCfg);
-
- checkGetOrCreate(ignite, "org.apache.ignite", 4);
-
- checkGetOrCreate(ignite, null, 4);
- }
-
- /**
- * @param ignite Ignite.
- * @param cacheName Cache name.
- */
- private void checkTemplateNotFound(final Ignite ignite, final String cacheName) {
- GridTestUtils.assertThrows(log, new Callable<Void>() {
- @Override public Void call() throws Exception {
- ignite.getOrCreateCache(cacheName);
-
- return null;
- }
- }, IllegalArgumentException.class, null);
- }
-
- /**
- * @param ignite Ignite.
- * @param name Cache name.
- * @param expBackups Expected number of backups.
- */
- private void checkGetOrCreate(Ignite ignite, String name, int expBackups) {
- IgniteCache cache = ignite.getOrCreateCache(name);
-
- assertNotNull(cache);
-
- CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
-
- assertEquals(name, cfg.getName());
- assertEquals(expBackups, cfg.getBackups());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
index d0ffab2..a030039 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -96,7 +97,61 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
*/
- public void testCreateFromTemplateConfiguration() throws Exception {
+ public void testCreateFromTemplate() throws Exception {
+ addTemplate = true;
+
+ Ignite ignite0 = startGrid(0);
+
+ checkCreate(ignite0, "org.apache.ignite.test.cache1", 4);
+ checkCreated(ignite0, "org.apache.ignite.test.cache1");
+
+ Ignite ignite1 = startGrid(1);
+
+ checkCreated(ignite1, "org.apache.ignite.test.cache1");
+
+ checkCreate(ignite1, "org.apache.ignite1", 3);
+ checkCreated(ignite1, "org.apache.ignite1");
+
+ checkCreated(ignite0, "org.apache.ignite1");
+
+ checkCreate(ignite0, "org.apache1", 2);
+ checkCreated(ignite0, "org.apache1");
+
+ checkCreated(ignite1, "org.apache1");
+
+ addTemplate = false;
+ clientMode = true;
+
+ Ignite ignite2 = startGrid(2);
+
+ assertNotNull(ignite2.cache("org.apache.ignite.test.cache1"));
+ assertNotNull(ignite2.cache("org.apache.ignite1"));
+ assertNotNull(ignite2.cache("org.apache1"));
+
+ CacheConfiguration template1 = new CacheConfiguration();
+
+ template1.setName(TEMPLATE3);
+ template1.setBackups(5);
+
+ ignite2.addCacheConfiguration(template1);
+
+ checkCreate(ignite0, "org.apache.ignite.test2.cache1", 5);
+
+ checkCreated(ignite0, "org.apache.ignite.test2.cache1");
+ checkCreated(ignite1, "org.apache.ignite.test2.cache1");
+ checkCreated(ignite2, "org.apache.ignite.test2.cache1");
+
+ Ignite ignite3 = startGrid(3);
+
+ checkCreate(ignite3, "org.apache.ignite.test2.cache2", 5);
+
+ checkNoTemplateCaches(4);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testGetOrCreateFromTemplate() throws Exception {
addTemplate = true;
Ignite ignite0 = startGrid(0);
@@ -322,6 +377,35 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
}
/**
+ * @param ignite Ignite.
+ * @param name Cache name.
+ * @param expBackups Expected number of backups.
+ */
+ private void checkCreate(final Ignite ignite, final String name, int expBackups) {
+ IgniteCache cache = ignite.createCache(name);
+
+ assertNotNull(cache);
+
+ CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+ assertEquals(name, cfg.getName());
+ assertEquals(expBackups, cfg.getBackups());
+ }
+
+ /**
+ * @param cacheName Cache name.
+ */
+ private void checkCreated(final Ignite ignite, final String cacheName) {
+ GridTestUtils.assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.createCache(cacheName);
+
+ return null;
+ }
+ }, CacheExistsException.class, null);
+ }
+
+ /**
* @param nodes Nodes number.
*/
private void checkNoTemplateCaches(int nodes) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index b575544..2451f59 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -202,6 +202,11 @@ public class IgniteMock implements Ignite {
}
/** {@inheritDoc} */
+ @Override public <K, V> IgniteCache<K, V> createCache(String cacheName) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
@Override public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 649ce0f..01b45f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -411,7 +411,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class);
suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class);
suite.addTestSuite(IgniteCacheConfigurationTemplateTest.class);
- suite.addTestSuite(IgniteCacheConfigurationTemplateNotFoundTest.class);
+ suite.addTestSuite(IgniteCacheConfigurationDefaultTemplateTest.class);
suite.addTestSuite(GridCacheTxLoadFromStoreOnLockSelfTest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index cd4fd73..3228210 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -283,6 +283,13 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea
}
/** {@inheritDoc} */
+ @Override public <K, V> IgniteCache<K, V> createCache(String cacheName) {
+ assert g != null;
+
+ return g.createCache(cacheName);
+ }
+
+ /** {@inheritDoc} */
@Override public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) {
assert g != null;
[26/28] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d183c50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d183c50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d183c50
Branch: refs/heads/ignite-694
Commit: 9d183c50c1bab91f0fd03a10a588e7c7a63731a7
Parents: fe74390 382229c
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 19:55:42 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 19:55:42 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/ClusterMetricsSnapshot.java | 384 ++++++-------------
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 +-
.../TcpDiscoveryCheckFailedMessage.java | 24 +-
.../TcpDiscoveryClientReconnectMessage.java | 30 +-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-
.../messages/TcpDiscoveryHandshakeRequest.java | 8 -
.../messages/TcpDiscoveryHandshakeResponse.java | 22 --
.../messages/TcpDiscoveryHeartbeatMessage.java | 44 +--
.../TcpDiscoveryJoinRequestMessage.java | 28 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 60 +--
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +-
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -
.../TcpDiscoveryStatusCheckMessage.java | 30 +-
20 files changed, 148 insertions(+), 729 deletions(-)
----------------------------------------------------------------------
[20/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-30
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-30
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c31dbd2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c31dbd2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c31dbd2a
Branch: refs/heads/ignite-694
Commit: c31dbd2a20f0a2715dfa158102e1b879bfee657b
Parents: cb21533 7eef373
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 18:25:27 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 18:25:27 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/include/service.sh | 8 +-
config/hadoop/default-config.xml | 15 +-
.../streaming/StreamTransformerExample.java | 3 +-
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 55 ++-
.../org/apache/ignite/internal/IgnitionEx.java | 171 +++-----
.../internal/managers/GridManagerAdapter.java | 34 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 17 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 350 +++++++++++++--
.../dht/GridClientPartitionTopology.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 6 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 1 +
.../cache/transactions/IgniteTxManager.java | 6 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 ++-
.../ignite/internal/util/lang/GridFunc.java | 33 ++
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../cache/VisorCacheAggregatedMetrics.java | 38 +-
.../visor/cache/VisorCacheConfiguration.java | 17 +-
.../internal/visor/cache/VisorCacheMetrics.java | 53 ++-
.../cache/VisorCacheMetricsCollectorTask.java | 59 ++-
.../visor/cache/VisorCacheStopTask.java | 69 +++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +-
.../communication/tcp/TcpCommunicationSpi.java | 14 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 47 +--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++--
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../resources/META-INF/classnames.properties | 19 +-
...eCacheConfigurationTemplateNotFoundTest.java | 114 +++++
.../IgniteCacheConfigurationTemplateTest.java | 364 ++++++++++++++++
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 +
...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +----
...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +-
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../IgniteCacheEvictionSelfTestSuite.java | 1 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +-
.../processors/query/h2/sql/GridSqlElement.java | 8 -
.../processors/query/h2/sql/GridSqlQuery.java | 183 ++++++++
.../query/h2/sql/GridSqlQueryParser.java | 97 +++--
.../query/h2/sql/GridSqlQuerySplitter.java | 111 ++++-
.../processors/query/h2/sql/GridSqlSelect.java | 209 +++------
.../query/h2/sql/GridSqlSubquery.java | 8 +-
.../processors/query/h2/sql/GridSqlUnion.java | 134 ++++++
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../query/h2/sql/GridQueryParsingTest.java | 26 +-
.../query/h2/sql/IgniteVsH2QueryTest.java | 27 +-
.../org/apache/ignite/IgniteSpringBean.java | 14 +
.../commands/cache/VisorCacheClearCommand.scala | 3 +-
.../commands/cache/VisorCacheCommand.scala | 423 +++++++++++--------
.../commands/cache/VisorCacheStopCommand.scala | 145 +++++++
.../scala/org/apache/ignite/visor/visor.scala | 12 +-
parent/pom.xml | 2 +-
pom.xml | 2 +
66 files changed, 2474 insertions(+), 865 deletions(-)
----------------------------------------------------------------------
[14/28] incubator-ignite git commit: ignite-624 - fix for reduce
invisible columns
Posted by sb...@apache.org.
ignite-624 - fix for reduce invisible columns
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d9e2a648
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d9e2a648
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d9e2a648
Branch: refs/heads/ignite-694
Commit: d9e2a648136b00cb688789a8216f0ae02c73bc93
Parents: bef34cd
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 13:12:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 13:12:23 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/util/lang/GridFunc.java | 9 +++++++++
.../query/h2/sql/GridSqlQuerySplitter.java | 15 +++++++++++----
.../processors/query/h2/sql/GridSqlSelect.java | 9 ++++++++-
.../processors/query/h2/sql/GridSqlUnion.java | 2 +-
4 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 773b9ee..fee53ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5430,6 +5430,15 @@ public class GridFunc {
/**
* @param c Target collection.
+ * @param it Iterable to fetch.
+ * @return Modified target collection.
+ */
+ public static <T, C extends Collection<T>> C addAll(C c, Iterable<? extends T> it) {
+ return it == null ? c : addAll(c, it.iterator());
+ }
+
+ /**
+ * @param c Target collection.
* @param it Iterator to fetch.
* @return Modified target collection.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index b84084b..79c73f0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -83,7 +83,7 @@ public class GridSqlQuerySplitter {
if (qry0 instanceof GridSqlSelect)
srcQry = (GridSqlSelect)qry0;
- else {
+ else { // Handle UNION.
srcQry = new GridSqlSelect().from(new GridSqlSubquery(qry0));
GridSqlSelect left = leftest(qry0);
@@ -124,11 +124,15 @@ public class GridSqlQuerySplitter {
final String mergeTable = TABLE_FUNC_NAME + "()"; // table(0); TODO
+ // Create map and reduce queries.
GridSqlSelect mapQry = srcQry.clone();
GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = F.addAll(new ArrayList<GridSqlElement>(), srcQry.select(false).iterator());
+ List<GridSqlElement> mapExps = F.addAll(
+ new ArrayList<GridSqlElement>(srcQry.allColumns()),
+ srcQry.select(false));
+
GridSqlElement[] rdcExps = new GridSqlElement[srcQry.visibleColumns()];
Set<String> colNames = new HashSet<>();
@@ -141,12 +145,15 @@ public class GridSqlQuerySplitter {
// Fill select expressions.
mapQry.clearSelect();
- for (GridSqlElement exp : mapExps)
+ for (GridSqlElement exp : mapExps) // Add all map expressions as visible.
mapQry.addSelectExpression(exp, true);
- for (GridSqlElement rdcExp : rdcExps)
+ for (GridSqlElement rdcExp : rdcExps) // Add corresponding visible reduce columns.
rdcQry.addSelectExpression(rdcExp, true);
+ for (int i = rdcExps.length; i < mapExps.size(); i++) // Add all extra map columns as invisible reduce columns.
+ rdcQry.addSelectExpression(column(((GridSqlAlias)mapExps.get(i)).alias()), false);
+
// -- GROUP BY
if (srcQry.hasGroupBy()) {
mapQry.clearGroups();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index 398ae10..dadba7c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -22,7 +22,7 @@ import org.h2.util.*;
import java.util.*;
/**
- *
+ * Plain SELECT query.
*/
public class GridSqlSelect extends GridSqlQuery {
/** */
@@ -54,6 +54,13 @@ public class GridSqlSelect extends GridSqlQuery {
return select.size();
}
+ /**
+ * @return Number of columns is select including invisible ones.
+ */
+ public int allColumns() {
+ return allExprs.size();
+ }
+
/** {@inheritDoc} */
@Override protected GridSqlElement expression(int col) {
return allExprs.get(col);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index 90d9e41..dcc2c84 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -23,7 +23,7 @@ import org.h2.util.*;
import javax.cache.*;
/**
- *
+ * Select query with UNION.
*/
public class GridSqlUnion extends GridSqlQuery {
/** */
[09/28] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3daa0b6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3daa0b6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3daa0b6b
Branch: refs/heads/ignite-694
Commit: 3daa0b6bbf501def9e88983194a2bb952709c97e
Parents: 5edf4d9 21e328d
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Apr 7 15:40:25 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Apr 7 15:40:25 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/include/service.sh | 8 ++--
config/hadoop/default-config.xml | 15 ++++--
.../streaming/StreamTransformerExample.java | 3 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 ++++++++++++++------
pom.xml | 1 +
7 files changed, 54 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[24/28] incubator-ignite git commit: ignite-437: test for bigQuery sql
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
deleted file mode 100644
index 5845a2e..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ /dev/null
@@ -1,875 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.query.h2.sql;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-
-/**
- * Test to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
- * which have the same data models and data content.
- */
-public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
- /** */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
- /** Partitioned cache. */
- private static IgniteCache pCache;
-
- /** Replicated cache. */
- private static IgniteCache rCache;
-
- /** H2 db connection. */
- private static Connection conn;
-
- /** {@inheritDoc} */
- @SuppressWarnings("unchecked")
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(IP_FINDER);
-
- c.setDiscoverySpi(disco);
-
- c.setMarshaller(new OptimizedMarshaller(true));
-
- c.setCacheConfiguration(createCache("part", CacheMode.PARTITIONED),
- createCache("repl", CacheMode.REPLICATED)
- );
-
- return c;
- }
-
- /**
- * Creates new cache configuration.
- *
- * @param name Cache name.
- * @param mode Cache mode.
- * @return Cache configuration.
- */
- private static CacheConfiguration createCache(String name, CacheMode mode) {
- CacheConfiguration<?,?> cc = defaultCacheConfiguration();
-
- cc.setName(name);
- cc.setCacheMode(mode);
- cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
-
- if (mode == CacheMode.PARTITIONED)
- cc.setIndexedTypes(
- Integer.class, Organization.class,
- AffinityKey.class, Person.class,
- AffinityKey.class, Purchase.class
- );
- else if (mode == CacheMode.REPLICATED)
- cc.setIndexedTypes(
- Integer.class, Product.class
- );
- else
- throw new IllegalStateException("mode: " + mode);
-
- return cc;
- }
-
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- super.beforeTestsStarted();
-
- Ignite ignite = startGrids(4);
-
- pCache = ignite.cache("part");
-
- rCache = ignite.cache("repl");
-
- awaitPartitionMapExchange();
-
- conn = openH2Connection(false);
-
- initializeH2Schema();
-
- initCacheAndDbData();
-
- checkAllDataEquals();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- conn.close();
-
- stopAllGrids();
- }
-
- /**
- * Populate cache and h2 database with test data.
- */
- @SuppressWarnings("unchecked")
- private void initCacheAndDbData() throws SQLException {
- int idGen = 0;
-
- // Organizations.
- List<Organization> organizations = new ArrayList<>();
-
- for (int i = 0; i < 3; i++) {
- int id = idGen++;
-
- Organization org = new Organization(id, "Org" + id);
-
- organizations.add(org);
-
- pCache.put(org.id, org);
-
- insertInDb(org);
- }
-
- // Persons.
- List<Person> persons = new ArrayList<>();
-
- for (int i = 0; i < 5; i++) {
- int id = idGen++;
-
- Person person = new Person(id, organizations.get(i % organizations.size()),
- "name" + id, "lastName" + id, id * 100.0);
-
- // Add a Person without lastname.
- if (id == organizations.size() + 1)
- person.lastName = null;
-
- persons.add(person);
-
- pCache.put(person.key(), person);
-
- insertInDb(person);
- }
-
- // Products.
- List<Product> products = new ArrayList<>();
-
- for (int i = 0; i < 10; i++) {
- int id = idGen++;
-
- Product product = new Product(id, "Product" + id, id*1000);
-
- products.add(product);
-
- rCache.put(product.id, product);
-
- insertInDb(product);
- }
-
- // Purchases.
- for (int i = 0; i < products.size() * 2; i++) {
- int id = idGen++;
-
- Purchase purchase = new Purchase(id, products.get(i % products.size()), persons.get(i % persons.size()));
-
- pCache.put(purchase.key(), purchase);
-
- insertInDb(purchase);
- }
- }
-
- /**
- * Insert {@link Organization} at h2 database.
- *
- * @param org Organization.
- * @throws SQLException If exception.
- */
- private void insertInDb(Organization org) throws SQLException {
- try(PreparedStatement st = conn.prepareStatement(
- "insert into \"part\".ORGANIZATION (_key, _val, id, name) values(?, ?, ?, ?)")) {
- st.setObject(1, org.id);
- st.setObject(2, org);
- st.setObject(3, org.id);
- st.setObject(4, org.name);
-
- st.executeUpdate();
- }
- }
-
- /**
- * Insert {@link Person} at h2 database.
- *
- * @param p Person.
- * @throws SQLException If exception.
- */
- private void insertInDb(Person p) throws SQLException {
- try(PreparedStatement st = conn.prepareStatement("insert into \"part\".PERSON " +
- "(_key, _val, id, firstName, lastName, orgId, salary) values(?, ?, ?, ?, ?, ?, ?)")) {
- st.setObject(1, p.key());
- st.setObject(2, p);
- st.setObject(3, p.id);
- st.setObject(4, p.firstName);
- st.setObject(5, p.lastName);
- st.setObject(6, p.orgId);
- st.setObject(7, p.salary);
-
- st.executeUpdate();
- }
- }
-
- /**
- * Insert {@link Product} at h2 database.
- *
- * @param p Product.
- * @throws SQLException If exception.
- */
- private void insertInDb(Product p) throws SQLException {
- try(PreparedStatement st = conn.prepareStatement(
- "insert into \"repl\".PRODUCT (_key, _val, id, name, price) values(?, ?, ?, ?, ?)")) {
- st.setObject(1, p.id);
- st.setObject(2, p);
- st.setObject(3, p.id);
- st.setObject(4, p.name);
- st.setObject(5, p.price);
-
- st.executeUpdate();
- }
- }
-
- /**
- * Insert {@link Purchase} at h2 database.
- *
- * @param p Purchase.
- * @throws SQLException If exception.
- */
- private void insertInDb(Purchase p) throws SQLException {
- try(PreparedStatement st = conn.prepareStatement(
- "insert into \"part\".PURCHASE (_key, _val, id, personId, productId) values(?, ?, ?, ?, ?)")) {
- st.setObject(1, p.key());
- st.setObject(2, p);
- st.setObject(3, p.id);
- st.setObject(4, p.personId);
- st.setObject(5, p.productId);
-
- st.executeUpdate();
- }
- }
-
- /**
- * Initialize h2 database schema.
- *
- * @throws SQLException If exception.
- */
- private void initializeH2Schema() throws SQLException {
- Statement st = conn.createStatement();
-
- st.execute("CREATE SCHEMA \"part\"");
- st.execute("CREATE SCHEMA \"repl\"");
-
- st.execute("create table \"part\".ORGANIZATION" +
- " (_key int not null," +
- " _val other not null," +
- " id int unique," +
- " name varchar(255))");
-
- st.execute("create table \"part\".PERSON" +
- " (_key other not null ," +
- " _val other not null ," +
- " id int unique, " +
- " firstName varchar(255), " +
- " lastName varchar(255)," +
- " orgId int not null," +
- " salary double )");
-
- st.execute("create table \"repl\".PRODUCT" +
- " (_key int not null ," +
- " _val other not null ," +
- " id int unique, " +
- " name varchar(255), " +
- " price int)");
-
- st.execute("create table \"part\".PURCHASE" +
- " (_key other not null ," +
- " _val other not null ," +
- " id int unique, " +
- " personId int, " +
- " productId int)");
-
- conn.commit();
- }
-
- /**
- * Gets connection from a pool.
- *
- * @param autocommit {@code true} If connection should use autocommit mode.
- * @return Pooled connection.
- * @throws SQLException In case of error.
- */
- private Connection openH2Connection(boolean autocommit) throws SQLException {
- System.setProperty("h2.serializeJavaObject", "false");
-
- String dbName = "test";
-
- Connection conn = DriverManager.getConnection("jdbc:h2:mem:" + dbName + ";DB_CLOSE_DELAY=-1");
-
- conn.setAutoCommit(autocommit);
-
- return conn;
- }
-
- /**
- * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
- *
- * @param sql SQL query.
- * @param args SQL arguments.
- * then results will compare as ordered queries.
- * @return Result set after SQL query execution.
- * @throws SQLException If exception.
- */
- private List<List<?>> compareQueryRes0(String sql, @Nullable Object... args) throws SQLException {
- return compareQueryRes0(pCache, sql, args, Order.RANDOM);
- }
-
- /**
- * Execute given sql query on h2 database and on ignite cache and compare results.
- * Expected that results are not ordered.
- *
- * @param cache Ignite cache.
- * @param sql SQL query.
- * @param args SQL arguments.
- * then results will compare as ordered queries.
- * @return Result set after SQL query execution.
- * @throws SQLException If exception.
- */
- private List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object... args) throws SQLException {
- return compareQueryRes0(cache, sql, args, Order.RANDOM);
- }
-
- /**
- * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
- * Expected that results are ordered.
- *
- * @param sql SQL query.
- * @param args SQL arguments.
- * then results will compare as ordered queries.
- * @return Result set after SQL query execution.
- * @throws SQLException If exception.
- */
- private List<List<?>> compareOrderedQueryRes0(String sql, @Nullable Object... args) throws SQLException {
- return compareQueryRes0(pCache, sql, args, Order.ORDERED);
- }
-
- /**
- * Execute given sql query on h2 database and on ignite cache and compare results.
- *
- * @param cache Ignite cache.
- * @param sql SQL query.
- * @param args SQL arguments.
- * @param order Expected ordering of SQL results. If {@link Order#ORDERED}
- * then results will compare as ordered queries.
- * @return Result set after SQL query execution.
- * @throws SQLException If exception.
- */
- @SuppressWarnings("unchecked")
- private List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object[] args, Order order) throws SQLException {
- if (args == null)
- args = new Object[] {null};
-
- log.info("Sql=\"" + sql + "\", args=" + Arrays.toString(args));
-
- List<List<?>> h2Res = executeH2Query(sql, args);
-
- List<List<?>> cacheRes = cache.query(new SqlFieldsQuery(sql).setArgs(args)).getAll();
-
- assertRsEquals(h2Res, cacheRes, order);
-
- return cacheRes;
- }
-
- /**
- * Execute SQL query on h2 database.
- *
- * @param sql SQL query.
- * @param args SQL arguments.
- * @return Result of SQL query on h2 database.
- * @throws SQLException If exception.
- */
- private List<List<?>> executeH2Query(String sql, Object[] args) throws SQLException {
- List<List<?>> res = new ArrayList<>();
- ResultSet rs = null;
-
- try(PreparedStatement st = conn.prepareStatement(sql)) {
- for (int idx = 0; idx < args.length; idx++)
- st.setObject(idx + 1, args[idx]);
-
- rs = st.executeQuery();
-
- int colCnt = rs.getMetaData().getColumnCount();
-
- while (rs.next()) {
- List<Object> row = new ArrayList<>(colCnt);
-
- for (int i = 1; i <= colCnt; i++)
- row.add(rs.getObject(i));
-
- res.add(row);
- }
- }
- finally {
- U.closeQuiet(rs);
- }
-
- return res;
- }
-
- /**
- * Assert equals of result sets according to expected ordering.
- *
- * @param rs1 Expected result set.
- * @param rs2 Actual result set.
- * @param order Expected ordering of SQL results. If {@link Order#ORDERED}
- * then results will compare as ordered queries.
- */
- private void assertRsEquals(List<List<?>> rs1, List<List<?>> rs2, Order order) {
- assertEquals("Rows count has to be equal.", rs1.size(), rs2.size());
-
- switch (order){
- case ORDERED:
- for (int rowNum = 0; rowNum < rs1.size(); rowNum++) {
- List<?> row1 = rs1.get(rowNum);
- List<?> row2 = rs2.get(rowNum);
-
- assertEquals("Columns count have to be equal.", row1.size(), row2.size());
-
- for (int colNum = 0; colNum < row1.size(); colNum++)
- assertEquals("Row=" + rowNum + ", column=" + colNum, row1.get(colNum), row2.get(colNum));
- }
-
- break;
- case RANDOM:
- Map<List<?>, Integer> rowsWithCnt1 = extractUniqueRowsWithCounts(rs1);
- Map<List<?>, Integer> rowsWithCnt2 = extractUniqueRowsWithCounts(rs2);
-
- assertEquals("Unique rows count has to be equal.", rowsWithCnt1.size(), rowsWithCnt2.size());
-
- for (Map.Entry<List<?>, Integer> entry1 : rowsWithCnt1.entrySet()) {
- List<?> row = entry1.getKey();
- Integer cnt1 = entry1.getValue();
-
- Integer cnt2 = rowsWithCnt2.get(row);
-
- assertEquals("Row has different occurance number.\nRow=" + row, cnt1, cnt2);
- }
-
- break;
- default:
- throw new IllegalStateException();
- }
- }
-
- /**
- * @param rs Result set.
- * @return Map of unique rows at the result set to number of occuriances at the result set.
- */
- private Map<List<?>, Integer> extractUniqueRowsWithCounts(Iterable<List<?>> rs) {
- Map<List<?>, Integer> res = new HashMap<>();
-
- for (List<?> row : rs) {
- Integer cnt = res.get(row);
-
- if (cnt == null)
- cnt = 0;
-
- res.put(row, cnt + 1);
- }
- return res;
- }
-
- /**
- * @throws Exception If failed.
- */
- private void checkAllDataEquals() throws Exception {
- compareQueryRes0("select _key, _val, id, name from \"part\".Organization");
-
- compareQueryRes0("select _key, _val, id, firstName, lastName, orgId, salary from \"part\".Person");
-
- compareQueryRes0("select _key, _val, id, personId, productId from \"part\".Purchase");
-
- compareQueryRes0(rCache, "select _key, _val, id, name, price from \"repl\".Product");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void _testSimpleReplSelect() throws Exception {
- compareQueryRes0("select id, name, price from \"repl\".Product");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testParamSubstitution() throws Exception {
- compareQueryRes0("select ? from \"part\".Person", "Some arg");
- }
-
- /**
- * @throws SQLException If failed.
- */
- public void testAggregateOrderBy() throws SQLException {
- compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testNullParamSubstitution() throws Exception {
- List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person where lastname is ?", null);
-
- // Ensure we find something.
- assertNotSame(0, rs1.size());
- }
-
- /**
- *
- */
- public void testUnion() throws SQLException {
- String base = "select _val v from \"part\".Person";
-
- compareQueryRes0(base + " union all " + base);
- compareQueryRes0(base + " union " + base);
-
- base = "select firstName||lastName name, salary from \"part\".Person";
-
- assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
- assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testEmptyResult() throws Exception {
- compareQueryRes0("select id from \"part\".Person where 0 = 1");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testSqlQueryWithAggregation() throws Exception {
- compareQueryRes0("select avg(salary) from \"part\".Person, \"part\".Organization where Person.orgId = Organization.id and "
- + "lower(Organization.name) = lower(?)", "Org1");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testSqlFieldsQuery() throws Exception {
- compareQueryRes0("select concat(firstName, ' ', lastName) from \"part\".Person");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testSqlFieldsQueryWithJoin() throws Exception {
- compareQueryRes0("select concat(firstName, ' ', lastName), "
- + "Organization.name from \"part\".Person, \"part\".Organization where "
- + "Person.orgId = Organization.id");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOrdered() throws Exception {
- compareOrderedQueryRes0("select firstName, lastName" +
- " from \"part\".Person" +
- " order by lastName, firstName"
- );
- }
-
- /**
- * //TODO Investigate.
- *
- * @throws Exception If failed.
- */
- public void _testSimpleJoin() throws Exception {
- // Have expected results.
- compareQueryRes0("select id, firstName, lastName" +
- " from \"part\".Person" +
- " where Person.id = ?", 3);
-
- // Ignite cache return 0 results...
- compareQueryRes0("select pe.firstName" +
- " from \"part\".Person pe join \"part\".Purchase pu on pe.id = pu.personId " +
- " where pe.id = ?", 3);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testSimpleReplicatedSelect() throws Exception {
- compareQueryRes0(rCache, "select id, name from \"repl\".Product");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void _testCrossCache() throws Exception {
- //TODO Investigate (should be 20 results instead of 0).
- compareQueryRes0("select firstName, lastName" +
- " from \"part\".Person, \"part\".Purchase" +
- " where Person.id = Purchase.personId");
-
- //TODO Investigate.
- compareQueryRes0("select concat(firstName, ' ', lastName), Product.name " +
- " from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
- " where Person.id = Purchase.personId and Purchase.productId = Product.id" +
- " group by Product.id");
-
- //TODO Investigate.
- compareQueryRes0("select concat(firstName, ' ', lastName), count (Product.id) " +
- " from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
- " where Person.id = Purchase.personId and Purchase.productId = Product.id" +
- " group by Product.id");
- }
-
- /**
- * Person class. Stored at partitioned cache.
- */
- private static class Person implements Serializable {
- /** Person ID (indexed). */
- @QuerySqlField(index = true)
- private int id;
-
- /** Organization ID (indexed). */
- @QuerySqlField(index = true)
- private int orgId;
-
- /** First name (not-indexed). */
- @QuerySqlField
- private String firstName;
-
- /** Last name (not indexed). */
- @QuerySqlField
- private String lastName;
-
- /** Salary (indexed). */
- @QuerySqlField(index = true)
- private double salary;
-
- /**
- * Constructs person record.
- *
- * @param org Organization.
- * @param firstName First name.
- * @param lastName Last name.
- * @param salary Salary.
- */
- Person(int id, Organization org, String firstName, String lastName, double salary) {
- this.id = id;
- this.firstName = firstName;
- this.lastName = lastName;
- this.salary = salary;
- orgId = org.id;
- }
-
- /**
- * @return Custom affinity key to guarantee that person is always collocated with organization.
- */
- public AffinityKey<Integer> key() {
- return new AffinityKey<>(id, orgId);
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- return this == o || o instanceof Person && id == ((Person)o).id;
-
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return id;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Person [firstName=" + firstName +
- ", lastName=" + lastName +
- ", id=" + id +
- ", orgId=" + orgId +
- ", salary=" + salary + ']';
- }
- }
-
- /**
- * Organization class. Stored at partitioned cache.
- */
- private static class Organization implements Serializable {
- /** Organization ID (indexed). */
- @QuerySqlField(index = true)
- private int id;
-
- /** Organization name (indexed). */
- @QuerySqlField(index = true)
- private String name;
-
- /**
- * Create Organization.
- *
- * @param id Organization ID.
- * @param name Organization name.
- */
- Organization(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- return this == o || o instanceof Organization && id == ((Organization)o).id;
-
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return id;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Organization [id=" + id + ", name=" + name + ']';
- }
- }
-
- /**
- * Product class. Stored at replicated cache.
- */
- private static class Product implements Serializable {
- /** Primary key. */
- @QuerySqlField(index = true)
- private int id;
-
- /** Product name. */
- @QuerySqlField
- private String name;
-
- /** Product price */
- @QuerySqlField
- private int price;
-
- /**
- * Create Product.
- *
- * @param id Product ID.
- * @param name Product name.
- * @param price Product price.
- */
- Product(int id, String name, int price) {
- this.id = id;
- this.name = name;
- this.price = price;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- return this == o || o instanceof Product && id == ((Product)o).id;
-
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return id;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Product [id=" + id + ", name=" + name + ", price=" + price + ']';
- }
- }
-
- /**
- * Purchase class. Stored at partitioned cache.
- */
- private static class Purchase implements Serializable {
- /** Primary key. */
- @QuerySqlField(index = true)
- private int id;
-
- /** Product ID. */
- @QuerySqlField
- private int productId;
-
- /** Person ID. */
- @QuerySqlField
- private int personId;
-
- /**
- * Create Purchase.
- *
- * @param id Purchase ID.
- * @param product Purchase product.
- * @param person Purchase person.
- */
- Purchase(int id, Product product, Person person) {
- this.id = id;
- productId = product.id;
- personId = person.id;
- }
-
- /**
- * @return Custom affinity key to guarantee that purchase is always collocated with person.
- */
- public AffinityKey<Integer> key() {
- return new AffinityKey<>(id, personId);
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- return this == o || o instanceof Purchase && id == ((Purchase)o).id;
-
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return id;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Purchase [id=" + id + ", productId=" + productId + ", personId=" + personId + ']';
- }
- }
-
- /**
- * Order type.
- */
- private enum Order {
- /** Random. */
- RANDOM,
- /** Ordered. */
- ORDERED
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 43e54fe..552205a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -100,8 +100,9 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
- // H2 comparison.
- suite.addTestSuite(IgniteVsH2QueryTest.class);
+ // Ignite cache and H2 comparison.
+ suite.addTestSuite(BaseH2CompareQueryTest.class);
+ suite.addTestSuite(H2CompareBigQueryTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql b/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
new file mode 100644
index 0000000..5f5cb74
--- /dev/null
+++ b/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
@@ -0,0 +1,55 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+select *
+from (
+ select rootOrderId as custOrderId, co.date, co.orderId, replace(co.alias,'_ALGO','') as alias, op.parentAlgo
+ from (
+ select date, orderId, rootOrderId, origOrderId, archSeq, alias
+ from "part".CustOrder where alias='CUSTOM'
+
+ union all
+
+ select date, orderId, rootOrderId, refOrderId as origOrderId, archSeq, alias
+ from "part".ReplaceOrder where alias='CUSTOM'
+ ) co, "part".OrderParams op
+ where co.date = op.date and co.orderId = op.orderId and co.archSeq = -- TODO: replace with 'dateToLong(co.date)+archSeq'.
+ (
+ select max(archSeq) -- TODO: replace with 'dateToLong(co.date)+archSeq'.
+ from (
+ select date, orderId, rootOrderId, origOrderId, archSeq, alias
+ from "part".CustOrder where alias='CUSTOM'
+
+ union all
+
+ select date, orderId, rootOrderId, refOrderId as origOrderId, archSeq, alias
+ from "part".ReplaceOrder where alias='CUSTOM'
+ )
+ where origOrderId = co.origOrderId and date = co.date
+ ) and co.alias='CUSTOM'
+) cop
+inner join (
+ select e.date, e.rootOrderId as eRootOrderId, e.rootOrderId, sum(e.execShares) as execShares,
+ sum(e.execShares*e.price)/sum(e.execShares) as price,
+ case when min(e.lastMkt) = max(e.lastMkt) then min(e.lastMkt) else min('XOFF') end as execMeet
+ from "repl".Exec e
+ group by e.date, e.rootOrderId
+) oep on (cop.date = oep.date and cop.custOrderId = oep.eRootOrderId)
+left outer join (
+ select top 1 refOrderId, date from "part".Cancel
+) cc on (cc.refOrderId = cop.orderId and cc.date = cop.date)
+where cop.alias='CUSTOM'
[23/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-30' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-30' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/382229c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/382229c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/382229c5
Branch: refs/heads/ignite-694
Commit: 382229c51c7b869778e8dce846c111f51f70c699
Parents: 2f458d2 c31dbd2
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 19:48:05 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 19:48:05 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/ClusterMetricsSnapshot.java | 384 ++++++-------------
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 +-
.../TcpDiscoveryCheckFailedMessage.java | 24 +-
.../TcpDiscoveryClientReconnectMessage.java | 30 +-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-
.../messages/TcpDiscoveryHandshakeRequest.java | 8 -
.../messages/TcpDiscoveryHandshakeResponse.java | 22 --
.../messages/TcpDiscoveryHeartbeatMessage.java | 44 +--
.../TcpDiscoveryJoinRequestMessage.java | 28 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 60 +--
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +-
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -
.../TcpDiscoveryStatusCheckMessage.java | 30 +-
20 files changed, 148 insertions(+), 729 deletions(-)
----------------------------------------------------------------------
[25/28] incubator-ignite git commit: ignite-437: test for bigQuery sql
Posted by sb...@apache.org.
ignite-437: test for bigQuery sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe743909
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe743909
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe743909
Branch: refs/heads/ignite-694
Commit: fe743909cf483d00ab5189049523ed3353bf5a3d
Parents: 2f458d2
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 19:55:29 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 19:55:29 2015 +0300
----------------------------------------------------------------------
.../h2/sql/AbstractH2CompareQueryTest.java | 341 ++++++++
.../query/h2/sql/BaseH2CompareQueryTest.java | 823 +++++++++++++++++
.../query/h2/sql/H2CompareBigQueryTest.java | 707 +++++++++++++++
.../query/h2/sql/IgniteVsH2QueryTest.java | 875 -------------------
.../IgniteCacheQuerySelfTestSuite.java | 5 +-
.../processors/query/h2/sql/bigQuery.sql | 55 ++
6 files changed, 1929 insertions(+), 877 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
new file mode 100644
index 0000000..c74493f
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@ -0,0 +1,341 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.h2.sql;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+
+/**
+ * Abstract test framework to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
+ * which have the same data models and data content.
+ */
+public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** Partitioned cache. */
+ protected static IgniteCache pCache;
+
+ /** Replicated cache. */
+ protected static IgniteCache rCache;
+
+ /** H2 db connection. */
+ protected static Connection conn;
+
+ /** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(IP_FINDER);
+
+ c.setDiscoverySpi(disco);
+
+ c.setMarshaller(new OptimizedMarshaller(true));
+
+ c.setCacheConfiguration(createCache("part", CacheMode.PARTITIONED),
+ createCache("repl", CacheMode.REPLICATED)
+ );
+
+ return c;
+ }
+
+ /**
+ * Creates new cache configuration.
+ *
+ * @param name Cache name.
+ * @param mode Cache mode.
+ * @return Cache configuration.
+ */
+ private CacheConfiguration createCache(String name, CacheMode mode) {
+ CacheConfiguration<?,?> cc = defaultCacheConfiguration();
+
+ cc.setName(name);
+ cc.setCacheMode(mode);
+ cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ cc.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
+
+ setIndexedTypes(cc, mode);
+
+ return cc;
+ }
+
+ /**
+ * @param cc Cache configuration.
+ * @param mode Cache Mode.
+ */
+ protected abstract void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) ;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ Ignite ignite = startGrids(4);
+
+ pCache = ignite.cache("part");
+
+ rCache = ignite.cache("repl");
+
+ awaitPartitionMapExchange();
+
+ conn = openH2Connection(false);
+
+ initializeH2Schema();
+
+ initCacheAndDbData();
+
+ checkAllDataEquals();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ conn.close();
+
+ stopAllGrids();
+ }
+
+ /**
+ * Populate cache and h2 database with test data.
+ */
+ protected abstract void initCacheAndDbData() throws SQLException;
+
+ /**
+ * @throws Exception If failed.
+ */
+ protected abstract void checkAllDataEquals() throws Exception;
+
+ /**
+ * Initialize h2 database schema.
+ *
+ * @throws SQLException If exception.
+ */
+ protected abstract void initializeH2Schema() throws SQLException;
+
+ /**
+ * Gets connection from a pool.
+ *
+ * @param autocommit {@code true} If connection should use autocommit mode.
+ * @return Pooled connection.
+ * @throws SQLException In case of error.
+ */
+ private Connection openH2Connection(boolean autocommit) throws SQLException {
+ System.setProperty("h2.serializeJavaObject", "false");
+
+ String dbName = "test";
+
+ Connection conn = DriverManager.getConnection("jdbc:h2:mem:" + dbName + ";DB_CLOSE_DELAY=-1");
+
+ conn.setAutoCommit(autocommit);
+
+ return conn;
+ }
+
+ /**
+ * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
+ *
+ * @param sql SQL query.
+ * @param args SQL arguments.
+ * then results will compare as ordered queries.
+ * @return Result set after SQL query execution.
+ * @throws SQLException If exception.
+ */
+ protected final List<List<?>> compareQueryRes0(String sql, @Nullable Object... args) throws SQLException {
+ return compareQueryRes0(pCache, sql, args, Ordering.RANDOM);
+ }
+
+ /**
+ * Execute given sql query on h2 database and on ignite cache and compare results.
+ * Expected that results are not ordered.
+ *
+ * @param cache Ignite cache.
+ * @param sql SQL query.
+ * @param args SQL arguments.
+ * then results will compare as ordered queries.
+ * @return Result set after SQL query execution.
+ * @throws SQLException If exception.
+ */
+ protected final List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object... args) throws SQLException {
+ return compareQueryRes0(cache, sql, args, Ordering.RANDOM);
+ }
+
+ /**
+ * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
+ * Expected that results are ordered.
+ *
+ * @param sql SQL query.
+ * @param args SQL arguments.
+ * then results will compare as ordered queries.
+ * @return Result set after SQL query execution.
+ * @throws SQLException If exception.
+ */
+ protected final List<List<?>> compareOrderedQueryRes0(String sql, @Nullable Object... args) throws SQLException {
+ return compareQueryRes0(pCache, sql, args, Ordering.ORDERED);
+ }
+
+ /**
+ * Execute given sql query on h2 database and on ignite cache and compare results.
+ *
+ * @param cache Ignite cache.
+ * @param sql SQL query.
+ * @param args SQL arguments.
+ * @param ordering Expected ordering of SQL results. If {@link Ordering#ORDERED}
+ * then results will compare as ordered queries.
+ * @return Result set after SQL query execution.
+ * @throws SQLException If exception.
+ */
+ @SuppressWarnings("unchecked")
+ protected final List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object[] args, Ordering ordering) throws SQLException {
+ if (args == null)
+ args = new Object[] {null};
+
+ info("Sql query:\n" + sql + "\nargs=" + Arrays.toString(args));
+
+ List<List<?>> h2Res = executeH2Query(sql, args);
+
+ List<List<?>> cacheRes = cache.query(new SqlFieldsQuery(sql).setArgs(args)).getAll();
+
+ assertRsEquals(h2Res, cacheRes, ordering);
+
+ return h2Res;
+ }
+
+ /**
+ * Execute SQL query on h2 database.
+ *
+ * @param sql SQL query.
+ * @param args SQL arguments.
+ * @return Result of SQL query on h2 database.
+ * @throws SQLException If exception.
+ */
+ private List<List<?>> executeH2Query(String sql, Object[] args) throws SQLException {
+ List<List<?>> res = new ArrayList<>();
+ ResultSet rs = null;
+
+ try(PreparedStatement st = conn.prepareStatement(sql)) {
+ for (int idx = 0; idx < args.length; idx++)
+ st.setObject(idx + 1, args[idx]);
+
+ rs = st.executeQuery();
+
+ int colCnt = rs.getMetaData().getColumnCount();
+
+ while (rs.next()) {
+ List<Object> row = new ArrayList<>(colCnt);
+
+ for (int i = 1; i <= colCnt; i++)
+ row.add(rs.getObject(i));
+
+ res.add(row);
+ }
+ }
+ finally {
+ U.closeQuiet(rs);
+ }
+
+ return res;
+ }
+
+ /**
+ * Assert equals of result sets according to expected ordering.
+ *
+ * @param rs1 Expected result set.
+ * @param rs2 Actual result set.
+ * @param ordering Expected ordering of SQL results. If {@link Ordering#ORDERED}
+ * then results will compare as ordered queries.
+ */
+ private void assertRsEquals(List<List<?>> rs1, List<List<?>> rs2, Ordering ordering) {
+ assertEquals("Rows count has to be equal.", rs1.size(), rs2.size());
+
+ switch (ordering){
+ case ORDERED:
+ for (int rowNum = 0; rowNum < rs1.size(); rowNum++) {
+ List<?> row1 = rs1.get(rowNum);
+ List<?> row2 = rs2.get(rowNum);
+
+ assertEquals("Columns count have to be equal.", row1.size(), row2.size());
+
+ for (int colNum = 0; colNum < row1.size(); colNum++)
+ assertEquals("Row=" + rowNum + ", column=" + colNum, row1.get(colNum), row2.get(colNum));
+ }
+
+ break;
+ case RANDOM:
+ Map<List<?>, Integer> rowsWithCnt1 = extractUniqueRowsWithCounts(rs1);
+ Map<List<?>, Integer> rowsWithCnt2 = extractUniqueRowsWithCounts(rs2);
+
+ assertEquals("Unique rows count has to be equal.", rowsWithCnt1.size(), rowsWithCnt2.size());
+
+ for (Map.Entry<List<?>, Integer> entry1 : rowsWithCnt1.entrySet()) {
+ List<?> row = entry1.getKey();
+ Integer cnt1 = entry1.getValue();
+
+ Integer cnt2 = rowsWithCnt2.get(row);
+
+ assertEquals("Row has different occurance number.\nRow=" + row, cnt1, cnt2);
+ }
+
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ /**
+ * @param rs Result set.
+ * @return Map of unique rows at the result set to number of occuriances at the result set.
+ */
+ private Map<List<?>, Integer> extractUniqueRowsWithCounts(Iterable<List<?>> rs) {
+ Map<List<?>, Integer> res = new HashMap<>();
+
+ for (List<?> row : rs) {
+ Integer cnt = res.get(row);
+
+ if (cnt == null)
+ cnt = 0;
+
+ res.put(row, cnt + 1);
+ }
+ return res;
+ }
+
+ /**
+ * Ordering type.
+ */
+ protected enum Ordering {
+ /** Random. */
+ RANDOM,
+ /** Ordered. */
+ ORDERED
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
new file mode 100644
index 0000000..eea834d
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -0,0 +1,823 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.h2.sql;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+
+import java.io.*;
+import java.sql.*;
+import java.sql.Date;
+import java.util.*;
+
+/**
+ * Base set of queries to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
+ * which have the same data models and data content.
+ */
+public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
+ /** Org count. */
+ public static final int ORG_CNT = 30;
+
+ /** Address count. */
+ public static final int ADDR_CNT = 10;
+
+ /** Person count. */
+ public static final int PERS_CNT = 50;
+
+ /** Product count. */
+ public static final int PROD_CNT = 100;
+
+ /** Purchase count. */
+ public static final int PURCH_CNT = PROD_CNT * 5;
+
+ /** {@inheritDoc} */
+ @Override protected void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) {
+ if (mode == CacheMode.PARTITIONED)
+ cc.setIndexedTypes(
+ Integer.class, Organization.class,
+ AffinityKey.class, Person.class,
+ AffinityKey.class, Purchase.class
+ );
+ else if (mode == CacheMode.REPLICATED)
+ cc.setIndexedTypes(
+ Integer.class, Product.class,
+ Integer.class, Address.class
+ );
+ else
+ throw new IllegalStateException("mode: " + mode);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
+ @Override protected void initCacheAndDbData() throws SQLException {
+ int idGen = 0;
+
+ // Organizations.
+ List<Organization> organizations = new ArrayList<>();
+
+ for (int i = 0; i < ORG_CNT; i++) {
+ int id = idGen++;
+
+ Organization org = new Organization(id, "Org" + id);
+
+ organizations.add(org);
+
+ pCache.put(org.id, org);
+
+ insertInDb(org);
+ }
+
+ // Adresses.
+ List<Address> addreses = new ArrayList<>();
+
+ for (int i = 0; i < ADDR_CNT; i++) {
+ int id = idGen++;
+
+ Address addr = new Address(id, "Addr" + id);
+
+ addreses.add(addr);
+
+ rCache.put(addr.id, addr);
+
+ insertInDb(addr);
+ }
+
+ // Persons.
+ List<Person> persons = new ArrayList<>();
+
+ for (int i = 0; i < PERS_CNT; i++) {
+ int id = idGen++;
+
+ Person person = new Person(id, organizations.get(i % organizations.size()),
+ "name" + id, "lastName" + id, id * 100.0, addreses.get(i % addreses.size()));
+
+ // Add a Person without lastname.
+ if (id == organizations.size() + 1)
+ person.lastName = null;
+
+ persons.add(person);
+
+ pCache.put(person.key(), person);
+
+ insertInDb(person);
+ }
+
+ // Products.
+ List<Product> products = new ArrayList<>();
+
+ for (int i = 0; i < PROD_CNT; i++) {
+ int id = idGen++;
+
+ Product product = new Product(id, "Product" + id, id*1000);
+
+ products.add(product);
+
+ rCache.put(product.id, product);
+
+ insertInDb(product);
+ }
+
+ // Purchases.
+ for (int i = 0; i < PURCH_CNT; i++) {
+ int id = idGen++;
+
+ Person person = persons.get(i % persons.size());
+
+ Purchase purchase = new Purchase(id, products.get(i % products.size()), person.orgId, person);
+
+ pCache.put(purchase.key(), purchase);
+
+ insertInDb(purchase);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void checkAllDataEquals() throws Exception {
+ compareQueryRes0("select _key, _val, id, name from \"part\".Organization");
+
+ compareQueryRes0("select _key, _val, id, firstName, lastName, orgId, salary from \"part\".Person");
+
+ compareQueryRes0("select _key, _val, id, personId, productId, organizationId from \"part\".Purchase");
+
+ compareQueryRes0(rCache, "select _key, _val, id, name, price from \"repl\".Product");
+ }
+
+ /**
+ * *
+ * @throws Exception
+ */
+ public void testAllExamples() throws Exception {
+// compareQueryRes0("select ? limit ? offset ?");
+
+// compareQueryRes0("select cool1()");
+// compareQueryRes0("select cool1() z");
+//
+// compareQueryRes0("select b,a from table0('aaa', 100)");
+// compareQueryRes0("select * from table0('aaa', 100)");
+// compareQueryRes0("select * from table0('aaa', 100) t0");
+// compareQueryRes0("select x.a, y.b from table0('aaa', 100) x natural join table0('bbb', 100) y");
+// compareQueryRes0("select * from table0('aaa', 100) x join table0('bbb', 100) y on x.a=y.a and x.b = 'bbb'");
+// compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y on x.a=y.a and x.b = 'bbb'");
+// compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y on x.a=y.a where x.b = 'bbb'");
+// compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y where x.b = 'bbb'");
+
+ final String addStreet = "Addr" + ORG_CNT + 1;
+
+ List<List<?>> res = compareQueryRes0("select avg(old) from \"part\".Person left join \"repl\".Address " +
+ " on Person.addrId = Address.id where lower(Address.street) = lower(?)", addStreet);
+
+ assertNotSame(0, res);
+
+ compareQueryRes0("select avg(old) from \"part\".Person join \"repl\".Address on Person.addrId = Address.id " +
+ "where lower(Address.street) = lower(?)", addStreet);
+
+ compareQueryRes0("select avg(old) from \"part\".Person left join \"repl\".Address where Person.addrId = Address.id " +
+ "and lower(Address.street) = lower(?)", addStreet);
+
+ compareQueryRes0("select avg(old) from \"part\".Person, \"repl\".Address where Person.addrId = Address.id " +
+ "and lower(Address.street) = lower(?)", addStreet);
+
+ compareQueryRes0("select firstName, date from \"part\".Person");
+ compareQueryRes0("select distinct firstName, date from \"part\".Person");
+
+ final String star = " _key, _val, id, firstName, lastName, orgId, salary, addrId, old, date ";
+
+ compareQueryRes0("select " + star + " from \"part\".Person p");
+ compareQueryRes0("select " + star + " from \"part\".Person");
+ compareQueryRes0("select distinct " + star + " from \"part\".Person");
+ compareQueryRes0("select p.firstName, date from \"part\".Person p");
+
+ compareQueryRes0("select p._key, p._val, p.id, p.firstName, p.lastName, p.orgId, p.salary, p.addrId, p.old, " +
+ " p.date, a._key, a._val, a.id, a.street" +
+ " from \"part\".Person p, \"repl\".Address a");
+// compareQueryRes0("select p.* from \"part\".Person p, \"repl\".Address a");
+// compareQueryRes0("select person.* from \"part\".Person, \"repl\".Address a");
+// compareQueryRes0("select p.*, street from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select p.firstName, a.street from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select distinct p.firstName, a.street from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select distinct firstName, street from \"part\".Person, \"repl\".Address group by firstName, street ");
+ compareQueryRes0("select distinct firstName, street from \"part\".Person, \"repl\".Address");
+ // TODO uncomment and investigate (Rows count has to be equal.: Expected :2500, Actual :900)
+// compareQueryRes0("select p1.firstName, a2.street from \"part\".Person p1, \"repl\".Address a1, \"part\".Person p2, \"repl\".Address a2");
+
+ //TODO look at it (org.h2.jdbc.JdbcSQLException: Feature not supported: "VARCHAR +" // at H2)
+// compareQueryRes0("select p.firstName n, a.street s from \"part\".Person p, \"repl\".Address a");
+ compareQueryRes0("select p.firstName, 1 as i, 'aaa' s from \"part\".Person p");
+
+// compareQueryRes0("select p.firstName + 'a', 1 * 3 as i, 'aaa' s, -p.old, -p.old as old from \"part\".Person p");
+// compareQueryRes0("select p.firstName || 'a' + p.firstName, (p.old * 3) % p.old - p.old / p.old, p.firstName = 'aaa', " +
+// " p.firstName is p.firstName, p.old > 0, p.old >= 0, p.old < 0, p.old <= 0, p.old <> 0, p.old is not p.old, " +
+// " p.old is null, p.old is not null " +
+// " from \"part\".Person p");
+
+ compareQueryRes0("select p.firstName from \"part\".Person p where firstName <> 'ivan'");
+ compareQueryRes0("select p.firstName from \"part\".Person p where firstName like 'i%'");
+ compareQueryRes0("select p.firstName from \"part\".Person p where firstName regexp 'i%'");
+ compareQueryRes0("select p.firstName from \"part\".Person p, \"repl\".Address a where p.firstName <> 'ivan' and a.id > 10 or not (a.id = 100)");
+
+ compareQueryRes0("select case p.firstName when 'a' then 1 when 'a' then 2 end as a from \"part\".Person p");
+ compareQueryRes0("select case p.firstName when 'a' then 1 when 'a' then 2 else -1 end as a from \"part\".Person p");
+
+ compareQueryRes0("select abs(p.old) from \"part\".Person p");
+ compareQueryRes0("select cast(p.old as numeric(10, 2)) from \"part\".Person p");
+ compareQueryRes0("select cast(p.old as numeric(10, 2)) z from \"part\".Person p");
+ compareQueryRes0("select cast(p.old as numeric(10, 2)) as z from \"part\".Person p");
+
+ // TODO alanyse
+// compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in ('a', 'b', '_' + RAND())"); // test ConditionIn
+ compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in ('a', 'b', 'c')"); // test ConditionInConstantSet
+ compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in (select a.street from \"repl\".Address a)"); // test ConditionInConstantSet
+
+ compareQueryRes0("select (select a.street from \"repl\".Address a where a.id = p.addrId) from \"part\".Person p"); // test ConditionInConstantSet
+
+ compareQueryRes0("select p.firstName, ? from \"part\".Person p where firstName regexp ? and p.old < ?", 10, "Iv*n", 40);
+
+ compareQueryRes0("select count(*) as a from \"part\".Person");
+ compareQueryRes0("select count(*) as a, count(p.*), count(p.firstName) from \"part\".Person p");
+ compareQueryRes0("select count(distinct p.firstName) from \"part\".Person p");
+
+ compareQueryRes0("select p.firstName, avg(p.old), max(p.old) from \"part\".Person p group by p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by n");
+
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.addrId, p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName, p.addrId");
+ compareQueryRes0("select p.firstName n, max(p.old) + min(p.old) / count(distinct p.old) from \"part\".Person p group by p.firstName");
+ compareQueryRes0("select p.firstName n, max(p.old) maxOld, min(p.old) minOld from \"part\".Person p group by p.firstName having maxOld > 10 and min(p.old) < 1");
+
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by n");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName, m");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName, max(p.old) desc");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName nulls first");
+ compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName nulls last");
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10");
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10, p.firstName");
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10, p.firstName desc");
+
+ compareQueryRes0("select p.firstName n from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) ");
+ compareQueryRes0("select street from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) ");
+ compareQueryRes0("select addr.street from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) addr");
+
+ compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10");
+
+ compareQueryRes0("select 'foo' as bar union select 'foo' as bar");
+ compareQueryRes0("select 'foo' as bar union all select 'foo' as bar");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testParamSubstitution() throws Exception {
+ compareQueryRes0("select ? from \"part\".Person", "Some arg");
+ }
+
+ /**
+ * @throws SQLException If failed.
+ */
+ public void testAggregateOrderBy() throws SQLException {
+ compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testNullParamSubstitution() throws Exception {
+ List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person where lastname is ?", null);
+
+ // Ensure we find something.
+ assertNotSame(0, rs1.size());
+ }
+
+ /**
+ *
+ */
+ public void testUnion() throws SQLException {
+ String base = "select _val v from \"part\".Person";
+
+ compareQueryRes0(base + " union all " + base);
+ compareQueryRes0(base + " union " + base);
+
+ base = "select firstName||lastName name, salary from \"part\".Person";
+
+ assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
+ assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testEmptyResult() throws Exception {
+ compareQueryRes0("select id from \"part\".Person where 0 = 1");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSqlQueryWithAggregation() throws Exception {
+ compareQueryRes0("select avg(salary) from \"part\".Person, \"part\".Organization where Person.orgId = Organization.id and "
+ + "lower(Organization.name) = lower(?)", "Org1");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSqlFieldsQuery() throws Exception {
+ compareQueryRes0("select concat(firstName, ' ', lastName) from \"part\".Person");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSqlFieldsQueryWithJoin() throws Exception {
+ compareQueryRes0("select concat(firstName, ' ', lastName), "
+ + "Organization.name from \"part\".Person, \"part\".Organization where "
+ + "Person.orgId = Organization.id");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testOrdered() throws Exception {
+ compareOrderedQueryRes0("select firstName, lastName" +
+ " from \"part\".Person" +
+ " order by lastName, firstName"
+ );
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSimpleJoin() throws Exception {
+ // Have expected results.
+ compareQueryRes0("select id, firstName, lastName" +
+ " from \"part\".Person" +
+ " where Person.id = ?", 3);
+
+ // Ignite cache return 0 results...
+ compareQueryRes0("select pe.firstName" +
+ " from \"part\".Person pe join \"part\".Purchase pu on pe.id = pu.personId " +
+ " where pe.id = ?", 3);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSimpleReplicatedSelect() throws Exception {
+ compareQueryRes0(rCache, "select id, name from \"repl\".Product");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void _testCrossCache() throws Exception {
+ //TODO Investigate (should be 20 results instead of 0).
+ compareQueryRes0("select firstName, lastName" +
+ " from \"part\".Person, \"part\".Purchase" +
+ " where Person.id = Purchase.personId");
+
+ //TODO Investigate.
+ compareQueryRes0("select concat(firstName, ' ', lastName), Product.name " +
+ " from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
+ " where Person.id = Purchase.personId and Purchase.productId = Product.id" +
+ " group by Product.id");
+
+ //TODO Investigate.
+ compareQueryRes0("select concat(firstName, ' ', lastName), count (Product.id) " +
+ " from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
+ " where Person.id = Purchase.personId and Purchase.productId = Product.id" +
+ " group by Product.id");
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void initializeH2Schema() throws SQLException {
+ Statement st = conn.createStatement();
+
+ st.execute("CREATE SCHEMA \"part\"");
+ st.execute("CREATE SCHEMA \"repl\"");
+
+ st.execute("create table \"part\".ORGANIZATION" +
+ " (_key int not null," +
+ " _val other not null," +
+ " id int unique," +
+ " name varchar(255))");
+
+ st.execute("create table \"part\".PERSON" +
+ " (_key other not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " firstName varchar(255), " +
+ " lastName varchar(255)," +
+ " orgId int not null," +
+ " salary double," +
+ " addrId int," +
+ " old int," +
+ " date Date )");
+
+ st.execute("create table \"repl\".PRODUCT" +
+ " (_key int not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " name varchar(255), " +
+ " price int)");
+
+ st.execute("create table \"part\".PURCHASE" +
+ " (_key other not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " personId int, " +
+ " organizationId int, " +
+ " productId int)");
+
+ st.execute("create table \"repl\".ADDRESS" +
+ " (_key int not null ," +
+ " _val other not null ," +
+ " id int unique, " +
+ " street varchar(255))");
+
+ conn.commit();
+ }
+
+ /**
+ * Insert {@link Organization} at h2 database.
+ *
+ * @param org Organization.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Organization org) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".ORGANIZATION (_key, _val, id, name) values(?, ?, ?, ?)")) {
+ st.setObject(1, org.id);
+ st.setObject(2, org);
+ st.setObject(3, org.id);
+ st.setObject(4, org.name);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Person} at h2 database.
+ *
+ * @param p Person.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Person p) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement("insert into \"part\".PERSON " +
+ "(_key, _val, id, firstName, lastName, orgId, salary, addrId, old, date) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
+ st.setObject(1, p.key());
+ st.setObject(2, p);
+ st.setObject(3, p.id);
+ st.setObject(4, p.firstName);
+ st.setObject(5, p.lastName);
+ st.setObject(6, p.orgId);
+ st.setObject(7, p.salary);
+ st.setObject(8, p.addrId);
+ st.setObject(9, p.old);
+ st.setObject(10, p.date);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Product} at h2 database.
+ *
+ * @param p Product.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Product p) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"repl\".PRODUCT (_key, _val, id, name, price) values(?, ?, ?, ?, ?)")) {
+ st.setObject(1, p.id);
+ st.setObject(2, p);
+ st.setObject(3, p.id);
+ st.setObject(4, p.name);
+ st.setObject(5, p.price);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Purchase} at h2 database.
+ *
+ * @param p Purchase.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Purchase p) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".PURCHASE (_key, _val, id, personId, productId, organizationId) values(?, ?, ?, ?, ?, ?)")) {
+ st.setObject(1, p.key());
+ st.setObject(2, p);
+ st.setObject(3, p.id);
+ st.setObject(4, p.personId);
+ st.setObject(5, p.productId);
+ st.setObject(6, p.organizationId);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Address} at h2 database.
+ *
+ * @param a Address.
+ * @throws SQLException If exception.
+ */
+ private void insertInDb(Address a) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"repl\".ADDRESS (_key, _val, id, street) values(?, ?, ?, ?)")) {
+ st.setObject(1, a.id);
+ st.setObject(2, a);
+ st.setObject(3, a.id);
+ st.setObject(4, a.street);
+
+ st.executeUpdate();
+ }
+ }
+
+ @QuerySqlFunction
+ public static int cool1() {
+ return 1;
+ }
+
+ @QuerySqlFunction
+ public static ResultSet table0(Connection c, String a, int b) throws SQLException {
+ return c.createStatement().executeQuery("select '" + a + "' as a, " + b + " as b");
+ }
+
+ /**
+ * Person class. Stored at partitioned cache.
+ */
+ private static class Person implements Serializable {
+ /** Person ID (indexed). */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Organization ID (indexed). */
+ @QuerySqlField(index = true)
+ private int orgId;
+
+ /** First name (not-indexed). */
+ @QuerySqlField
+ private String firstName;
+
+ /** Last name (not indexed). */
+ @QuerySqlField
+ private String lastName;
+
+ /** Salary (indexed). */
+ @QuerySqlField(index = true)
+ private double salary;
+
+ /** Address Id (indexed). */
+ @QuerySqlField(index = true)
+ private int addrId;
+
+ /** Date. */
+ @QuerySqlField(index = true)
+ public Date date = new Date(System.currentTimeMillis());
+
+ /** Old. */
+ @QuerySqlField(index = true)
+ public int old = 17;
+
+
+ /**
+ * Constructs person record.
+ *
+ * @param org Organization.
+ * @param firstName First name.
+ * @param lastName Last name.
+ * @param salary Salary.
+ */
+ Person(int id, Organization org, String firstName, String lastName, double salary, Address addr) {
+ this.id = id;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ this.salary = salary;
+ orgId = org.id;
+ addrId = addr.id;
+ }
+
+ /**
+ * @return Custom affinity key to guarantee that person is always collocated with organization.
+ */
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, orgId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Person && id == ((Person)o).id;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Person [firstName=" + firstName +
+ ", lastName=" + lastName +
+ ", id=" + id +
+ ", orgId=" + orgId +
+ ", salary=" + salary +
+ ", addrId=" + addrId + ']';
+ }
+ }
+
+ /**
+ * Organization class. Stored at partitioned cache.
+ */
+ private static class Organization implements Serializable {
+ /** Organization ID (indexed). */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Organization name (indexed). */
+ @QuerySqlField(index = true)
+ private String name;
+
+ /**
+ * Create Organization.
+ *
+ * @param id Organization ID.
+ * @param name Organization name.
+ */
+ Organization(int id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Organization && id == ((Organization)o).id;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Organization [id=" + id + ", name=" + name + ']';
+ }
+ }
+
+ /**
+ * Product class. Stored at replicated cache.
+ */
+ private static class Product implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Product name. */
+ @QuerySqlField
+ private String name;
+
+ /** Product price */
+ @QuerySqlField
+ private int price;
+
+ /**
+ * Create Product.
+ *
+ * @param id Product ID.
+ * @param name Product name.
+ * @param price Product price.
+ */
+ Product(int id, String name, int price) {
+ this.id = id;
+ this.name = name;
+ this.price = price;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Product && id == ((Product)o).id;
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Product [id=" + id + ", name=" + name + ", price=" + price + ']';
+ }
+ }
+
+ /**
+ * Purchase class. Stored at partitioned cache.
+ */
+ private static class Purchase implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Product ID. */
+ @QuerySqlField
+ private int productId;
+
+ /** Person ID. */
+ @QuerySqlField
+ private int personId;
+
+ /** Organization id. */
+ @QuerySqlField
+ private int organizationId;
+
+ /**
+ * Create Purchase.
+ * @param id Purchase ID.
+ * @param product Purchase product.
+ * @param organizationId Organization Id.
+ * @param person Purchase person.
+ */
+ Purchase(int id, Product product, int organizationId, Person person) {
+ this.id = id;
+ productId = product.id;
+ personId = person.id;
+ this.organizationId = organizationId;
+ }
+
+ /**
+ * @return Custom affinity key to guarantee that purchase is always collocated with person.
+ */
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, organizationId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Purchase && id == ((Purchase)o).id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Purchase [id=" + id + ", productId=" + productId + ", personId=" + personId + ']';
+ }
+ }
+
+ /**
+ * Address class. Stored at replicated cache.
+ */
+ private static class Address implements Serializable {
+ @QuerySqlField(index = true)
+ private int id;
+
+ @QuerySqlField(index = true)
+ private String street;
+
+ Address(int id, String street) {
+ this.id = id;
+ this.street = street;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Address && id == ((Address)o).id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "Address [id=" + id + ", street=" + street + ']';
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
new file mode 100644
index 0000000..c5a2cad
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
@@ -0,0 +1,707 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.h2.sql;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+
+import java.io.*;
+import java.sql.Date;
+import java.sql.*;
+import java.util.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ * Executes one big query (and subqueries of the big query) to compare query results from h2 database instance and
+ * mixed ignite caches (replicated and partitioned) which have the same data models and data content.
+ *
+ *
+ * <pre>
+ *
+ * -------------------------------------> rootOrderId (virtual) <--------------------------
+ * | | |
+ * | | |
+ * | --------------------- | |
+ * | ------------------ --part.ReplaceOrder-- | |
+ * | --part.CustOrder-- --------------------- | |
+ * | ------------------ - id PK - | |
+ * | - orderId PK - <-- <---> - orderId - | |
+ * -- - rootOrderId - | - rootOrderId - ----------- |
+ * - origOrderId - | - refOrderId - // = origOrderId |
+ * - date - | - date - |
+ * - alias - | - alias - |
+ * - archSeq - | - archSeq - ------------------- |
+ * ------------------ | --------------------- ----repl.Exec------ |
+ * | ------------------- |
+ * ----------------- | - rootOrderId PK - ----
+ * ---part.Cancel--- | - date -
+ * ----------------- | --------------------- - execShares int -
+ * - id PK - | --part.OrderParams--- - price int -
+ * - refOrderId - ---| --------------------- - lastMkt int -
+ * - date - | - id PK - -------------------
+ * ----------------- ------- - orderId -
+ * - date -
+ * - parentAlgo -
+ * ---------------------
+ * </pre>
+ *
+ */
+public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
+ /** Root order count. */
+ private static final int ROOT_ORDER_CNT = 1000;
+
+ /** Dates count. */
+ private static final int DATES_CNT = 5;
+
+ /** Full the big query. */
+ private String bigQry = getBigQry();
+
+ /**
+ * Extracts the big query from file.
+ *
+ * @return Big query.
+ */
+ private String getBigQry() {
+ String res = "";
+
+ Reader isr = new InputStreamReader(getClass().getResourceAsStream("bigQuery.sql"));
+
+ try(BufferedReader reader = new BufferedReader(isr)) {
+ for(String line; (line = reader.readLine()) != null; )
+ if (!line.startsWith("--")) // Skip commented lines.
+ res += line + '\n';
+ }
+ catch (Throwable e) {
+ e.printStackTrace();
+
+ fail();
+ }
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) {
+ if (mode == CacheMode.PARTITIONED)
+ cc.setIndexedTypes(
+ Integer.class, CustOrder.class,
+ AffinityKey.class, ReplaceOrder.class,
+ AffinityKey.class, OrderParams.class,
+ AffinityKey.class, Cancel.class
+ );
+ else if (mode == CacheMode.REPLICATED)
+ cc.setIndexedTypes(
+ Integer.class, Exec.class
+ );
+ else
+ throw new IllegalStateException("mode: " + mode);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
+ @Override protected void initCacheAndDbData() throws SQLException {
+ final AtomicInteger idGen = new AtomicInteger();
+
+ final Iterable<Integer> rootOrderIds = new ArrayList<Integer>(){{
+ for (int i = 0; i < ROOT_ORDER_CNT; i++)
+ add(idGen.incrementAndGet());
+ }};
+
+ final Date curDate = new Date(new java.util.Date().getTime());
+
+ final List<Date> dates = new ArrayList<Date>(){{
+ for (int i = 0; i < DATES_CNT; i++)
+ add(new Date(curDate.getTime() - i * 24 * 60 * 60 * 1000)); // Minus i days.
+ }};
+
+ final Iterable<CustOrder> orders = new ArrayList<CustOrder>(){{
+ for (int rootOrderId : rootOrderIds) {
+ // Generate 1 - 5 orders for 1 root order.
+ for (int i = 0; i < rootOrderId % 5; i++) {
+ int orderId = idGen.incrementAndGet();
+
+ CustOrder order = new CustOrder(orderId, rootOrderId, dates.get(orderId % dates.size()) ,
+ orderId % 2 == 0 ? "CUSTOM" : "OTHER", orderId);
+
+ add(order);
+
+ pCache.put(order.orderId, order);
+
+ insertInDb(order);
+ }
+ }
+ }};
+
+ final Collection<OrderParams> params = new ArrayList<OrderParams>(){{
+ for (CustOrder o : orders) {
+ OrderParams op = new OrderParams(idGen.incrementAndGet(), o.orderId, o.date,
+ o.orderId % 2 == 0 ? "Algo 1" : "Algo 2");
+
+ add(op);
+
+ pCache.put(op.key(), op);
+
+ insertInDb(op);
+ }
+ }};
+
+ final Collection<ReplaceOrder> replaces = new ArrayList<ReplaceOrder>(){{
+ for (CustOrder o : orders) {
+ if (o.orderId % 7 == 0) {
+ ReplaceOrder replace = new ReplaceOrder(idGen.incrementAndGet(), o.orderId, o.rootOrderId, o.alias,
+ new Date(o.date.getTime() + 12 * 60 * 60 * 1000), o.orderId); // Plus a half of day.
+
+ add(replace);
+
+ pCache.put(replace.key(), replace);
+
+ insertInDb(replace);
+ }
+ }
+ }};
+
+ final Collection<Cancel> cancels = new ArrayList<Cancel>(){{
+ for (CustOrder o : orders) {
+ if (o.orderId % 9 == 0) {
+ Cancel c = new Cancel(idGen.incrementAndGet(), o.orderId,
+ new Date(o.date.getTime() + 12 * 60 * 60 * 1000));// Plus a half of day.
+
+ add(c);
+
+ pCache.put(c.key(), c);
+
+ insertInDb(c);
+ }
+ }
+ }};
+
+ final Collection<Exec> execs = new ArrayList<Exec>(){{
+ for (int rootOrderId : rootOrderIds) {
+ int execShares = 10000 + rootOrderId;
+ int price = 1000 + rootOrderId;
+ int latsMkt = 3000 + rootOrderId;
+
+ Exec exec = new Exec(rootOrderId, dates.get(rootOrderId % dates.size()), execShares, price, latsMkt);
+
+ add(exec);
+
+ rCache.put(exec.rootOrderId, exec);
+
+ insertInDb(exec);
+ }
+ }};
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ @Override protected void checkAllDataEquals() throws Exception {
+ compareQueryRes0("select _key, _val, date, orderId, rootOrderId, alias, archSeq, origOrderId " +
+ "from \"part\".CustOrder");
+ compareQueryRes0("select _key, _val, id, date, orderId, rootOrderId, alias, archSeq, refOrderId " +
+ "from \"part\".ReplaceOrder");
+ compareQueryRes0("select _key, _val, id, date, orderId, parentAlgo from \"part\".OrderParams\n");
+ compareQueryRes0("select _key, _val, id, date, refOrderId from \"part\".Cancel\n");
+ compareQueryRes0(rCache, "select _key, _val, date, rootOrderId, execShares, price, lastMkt from \"repl\".Exec\n");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testUnionAllOrders() throws Exception {
+ compareQueryRes0(
+ " select date, orderId, rootOrderId " +
+ " from \"part\".CustOrder where alias='CUSTOM'");
+
+ compareQueryRes0(
+ " select date, orderId, rootOrderId " +
+ " from \"part\".ReplaceOrder where alias='CUSTOM'");
+
+ compareQueryRes0(
+ " select 10" +
+
+ " union all" +
+
+ " select 20");
+
+ compareQueryRes0(
+ " select date, orderId, rootOrderId " +
+ " from \"part\".CustOrder where alias='CUSTOM'" +
+
+ " union all" +
+
+ " select date, orderId, rootOrderId " +
+ " from \"part\".ReplaceOrder where alias='CUSTOM'");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testBigQuery() throws Exception {
+ List<List<?>> res = compareQueryRes0(bigQry);
+
+ assertTrue(!res.isEmpty()); // Ensure we set good testing data at database.
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void initializeH2Schema() throws SQLException {
+ Statement st = conn.createStatement();
+
+ st.execute("CREATE SCHEMA \"part\"");
+ st.execute("CREATE SCHEMA \"repl\"");
+
+ st.execute("create table \"part\".CustOrder" +
+ " (" +
+ " _key int not null," +
+ " _val other not null," +
+ " orderId int unique," +
+ " rootOrderId int," +
+ " origOrderId int," +
+ " archSeq int," +
+ " date Date, " +
+ " alias varchar(255)" +
+ " )");
+
+ st.execute("create table \"part\".ReplaceOrder" +
+ " (" +
+ " _key other not null," +
+ " _val other not null," +
+ " id int unique," +
+ " orderId int ," +
+ " rootOrderId int," +
+ " refOrderId int," +
+ " archSeq int," +
+ " date Date, " +
+ " alias varchar(255)" +
+ " )");
+
+ st.execute("create table \"part\".OrderParams" +
+ " (" +
+ " _key other not null," +
+ " _val other not null," +
+ " id int unique," +
+ " orderId int ," +
+ " date Date, " +
+ " parentAlgo varchar(255)" +
+ " )");
+
+ st.execute("create table \"part\".Cancel" +
+ " (" +
+ " _key other not null," +
+ " _val other not null," +
+ " id int unique," +
+ " date Date, " +
+ " refOrderId int" +
+ " )");
+
+ st.execute("create table \"repl\".Exec" +
+ " (" +
+ " _key int not null," +
+ " _val other not null," +
+ " rootOrderId int unique," +
+ " date Date, " +
+ " execShares int," +
+ " price int," +
+ " lastMkt int" +
+ " )");
+
+ conn.commit();
+ }
+
+ /**
+ * Insert {@link CustOrder} at h2 database.
+ *
+ * @param o CustOrder.
+ */
+ private void insertInDb(CustOrder o) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".CustOrder (_key, _val, orderId, rootOrderId, date, alias, archSeq, origOrderId) " +
+ "values(?, ?, ?, ?, ?, ?, ?, ?)")) {
+ int i = 0;
+
+ st.setObject(++i, o.orderId);
+ st.setObject(++i, o);
+ st.setObject(++i, o.orderId);
+ st.setObject(++i, o.rootOrderId);
+ st.setObject(++i, o.date);
+ st.setObject(++i, o.alias);
+ st.setObject(++i, o.archSeq);
+ st.setObject(++i, o.origOrderId);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link ReplaceOrder} at h2 database.
+ *
+ * @param o ReplaceOrder.
+ */
+ private void insertInDb(ReplaceOrder o) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".ReplaceOrder (_key, _val, id, orderId, rootOrderId, date, alias, archSeq, refOrderId) " +
+ "values(?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
+ int i = 0;
+
+ st.setObject(++i, o.key());
+ st.setObject(++i, o);
+ st.setObject(++i, o.id);
+ st.setObject(++i, o.orderId);
+ st.setObject(++i, o.rootOrderId);
+ st.setObject(++i, o.date);
+ st.setObject(++i, o.alias);
+ st.setObject(++i, o.archSeq);
+ st.setObject(++i, o.refOrderId);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link OrderParams} at h2 database.
+ *
+ * @param o OrderParams.
+ */
+ private void insertInDb(OrderParams o) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".OrderParams (_key, _val, id, date, orderId, parentAlgo) values(?, ?, ?, ?, ?, ?)")) {
+ int i = 0;
+
+ st.setObject(++i, o.key());
+ st.setObject(++i, o);
+ st.setObject(++i, o.id);
+ st.setObject(++i, o.date);
+ st.setObject(++i, o.orderId);
+ st.setObject(++i, o.parentAlgo);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Cancel} at h2 database.
+ *
+ * @param o Cancel.
+ */
+ private void insertInDb(Cancel o) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"part\".Cancel (_key, _val, id, date, refOrderId) values(?, ?, ?, ?, ?)")) {
+ int i = 0;
+
+ st.setObject(++i, o.key());
+ st.setObject(++i, o);
+ st.setObject(++i, o.id);
+ st.setObject(++i, o.date);
+ st.setObject(++i, o.refOrderId);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Insert {@link Exec} at h2 database.
+ *
+ * @param o Execution.
+ */
+ private void insertInDb(Exec o) throws SQLException {
+ try(PreparedStatement st = conn.prepareStatement(
+ "insert into \"repl\".Exec (_key, _val, date, rootOrderId, execShares, price, lastMkt) " +
+ "values(?, ?, ?, ?, ?, ?, ?)")) {
+ int i = 0;
+
+ st.setObject(++i, o.rootOrderId);
+ st.setObject(++i, o);
+ st.setObject(++i, o.date);
+ st.setObject(++i, o.rootOrderId);
+ st.setObject(++i, o.execShares);
+ st.setObject(++i, o.price);
+ st.setObject(++i, o.lastMkt);
+
+ st.executeUpdate();
+ }
+ }
+
+ /**
+ * Custom Order.
+ */
+ static class CustOrder implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int orderId;
+
+ /** Root order ID*/
+ @QuerySqlField
+ private int rootOrderId;
+
+ /** Orig order ID*/
+ @QuerySqlField
+ private int origOrderId;
+
+ /** Date */
+ @QuerySqlField
+ private Date date ;
+
+ /** */
+ @QuerySqlField
+ private String alias = "CUSTOM";
+
+ /** */
+ @QuerySqlField
+ private int archSeq = 11; // TODO: use it.
+
+ /**
+ * @param orderId Order id.
+ * @param rootOrderId Root order id.
+ * @param date Date.
+ * @param alias Alias.
+ * @param origOrderId Orig order id.
+ */
+ CustOrder(int orderId, int rootOrderId, Date date, String alias, int origOrderId) {
+ this.orderId = orderId;
+ this.rootOrderId = rootOrderId;
+ this.origOrderId = origOrderId;
+ this.date = date;
+ this.alias = alias;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof CustOrder && orderId == ((CustOrder)o).orderId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return orderId;
+ }
+ }
+
+ /**
+ * Replace Order.
+ */
+ static class ReplaceOrder implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Order id. */
+ @QuerySqlField(index = true)
+ private int orderId;
+
+ /** Root order ID*/
+ @QuerySqlField
+ private int rootOrderId;
+
+ /** Ref order ID*/
+ @QuerySqlField
+ private int refOrderId;
+
+ /** Date */
+ @QuerySqlField
+ private Date date ;
+
+ /** */
+ @QuerySqlField
+ private String alias = "CUSTOM";
+
+ /** */
+ @QuerySqlField
+ private int archSeq = 111; // TODO: use it.
+
+ /**
+ * @param id Id.
+ * @param orderId Order id.
+ * @param rootOrderId Root order id.
+ * @param alias Alias.
+ * @param date Date.
+ * @param refOrderId Reference order id.
+ */
+ ReplaceOrder(int id, int orderId, int rootOrderId, String alias, Date date, int refOrderId) {
+ this.id = id;
+ this.orderId = orderId;
+ this.rootOrderId = rootOrderId;
+ this.refOrderId = refOrderId;
+ this.date = date;
+ this.alias = alias;
+ }
+
+ /**
+ * @return Afinity key.
+ */
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, orderId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof ReplaceOrder && id == ((ReplaceOrder)o).id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+ }
+
+ /**
+ * Order params.
+ */
+ static class OrderParams implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Order id. */
+ @QuerySqlField(index = true)
+ private int orderId;
+
+ /** Date */
+ @QuerySqlField
+ private Date date ;
+
+ /** */
+ @QuerySqlField
+ private String parentAlgo = "CUSTOM_ALGO";
+
+ /**
+ * @param id Id.
+ * @param orderId Order id.
+ * @param date Date.
+ * @param parentAlgo Parent algo.
+ */
+ OrderParams(int id, int orderId, Date date, String parentAlgo) {
+ this.id = id;
+ this.orderId = orderId;
+ this.date = date;
+ this.parentAlgo = parentAlgo;
+ }
+
+ /**
+ * @return Afinity key.
+ */
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, orderId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof OrderParams && id == ((OrderParams)o).id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+ }
+
+ /**
+ * Cancel Order.
+ */
+ static class Cancel implements Serializable {
+ /** Primary key. */
+ @QuerySqlField(index = true)
+ private int id;
+
+ /** Order id. */
+ @QuerySqlField(index = true)
+ private int refOrderId;
+
+ /** Date */
+ @QuerySqlField
+ private Date date;
+
+ /**
+ * @param id
+ * @param refOrderId Reference order id.
+ * @param date Date.
+ */
+ Cancel(int id, int refOrderId, Date date) {
+ this.id = id;
+ this.refOrderId = refOrderId;
+ this.date = date;
+ }
+
+ /**
+ * @return Afinity key.
+ */
+ public AffinityKey<Integer> key() {
+ return new AffinityKey<>(id, refOrderId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Cancel && id == ((Cancel)o).id;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id;
+ }
+ }
+
+ /**
+ * Execute information about root query.
+ */
+ static class Exec implements Serializable {
+ /** Primary key. */
+ @QuerySqlField
+ private int rootOrderId;
+
+ /** Date */
+ @QuerySqlField
+ private Date date ;
+
+ /** */
+ @QuerySqlField
+ private int execShares;
+
+ /** */
+ @QuerySqlField
+ private int price;
+
+ /** */
+ @QuerySqlField
+ private int lastMkt;
+
+ /**
+ * @param rootOrderId Root order id.
+ * @param date Date.
+ * @param execShares Execute shares.
+ * @param price Price.
+ * @param lastMkt Last mkt.
+ */
+ Exec(int rootOrderId, Date date, int execShares, int price, int lastMkt) {
+ this.rootOrderId = rootOrderId;
+ this.date = date;
+ this.execShares = execShares;
+ this.price = price;
+ this.lastMkt = lastMkt;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ return this == o || o instanceof Exec && rootOrderId == ((Exec)o).rootOrderId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return rootOrderId;
+ }
+ }
+}
[13/28] incubator-ignite git commit: ignite-624 - disabled failing
tests because of wrong colocation
Posted by sb...@apache.org.
ignite-624 - disabled failing tests because of wrong colocation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bef34cd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bef34cd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bef34cd8
Branch: refs/heads/ignite-694
Commit: bef34cd8e3fac1fe3b30301869a2ad42d5c7ea6e
Parents: 58f4913
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 01:54:34 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 01:54:34 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/IgniteVsH2QueryTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bef34cd8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
index 5da72b4..5845a2e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
@@ -615,16 +615,16 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
*
* @throws Exception If failed.
*/
- public void testSimpleJoin() throws Exception {
+ public void _testSimpleJoin() throws Exception {
// Have expected results.
compareQueryRes0("select id, firstName, lastName" +
" from \"part\".Person" +
" where Person.id = ?", 3);
// Ignite cache return 0 results...
- compareQueryRes0("select Person.firstName" +
- " from \"part\".Person, \"part\".Purchase" +
- " where Person.id = ?", 3);
+ compareQueryRes0("select pe.firstName" +
+ " from \"part\".Person pe join \"part\".Purchase pu on pe.id = pu.personId " +
+ " where pe.id = ?", 3);
}
/**
@@ -637,7 +637,7 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testCrossCache() throws Exception {
+ public void _testCrossCache() throws Exception {
//TODO Investigate (should be 20 results instead of 0).
compareQueryRes0("select firstName, lastName" +
" from \"part\".Person, \"part\".Purchase" +
[05/28] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71fa3a22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71fa3a22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71fa3a22
Branch: refs/heads/ignite-694
Commit: 71fa3a224a9adf0bad255b2d36fef3124e948b80
Parents: 9e7f8a4 5a2b46c
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 22:55:19 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 22:55:19 2015 +0300
----------------------------------------------------------------------
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../ignite/internal/util/IgniteUtils.java | 46 ++-
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
modules/schedule/pom.xml | 20 +
pom.xml | 61 ++-
8 files changed, 571 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[02/28] incubator-ignite git commit: # IGNITE-624 Make
GridSqlQueryParser able to parse SQL query with UNION expression. Created
class GridSqlUnion.
Posted by sb...@apache.org.
# IGNITE-624 Make GridSqlQueryParser able to parse SQL query with UNION expression. Created class GridSqlUnion.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98de490f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98de490f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98de490f
Branch: refs/heads/ignite-694
Commit: 98de490fbb4bb671ee28da5f9ad7d0911cf9b190
Parents: b297a4c
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Mar 31 23:26:34 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Mar 31 23:26:34 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridSqlQuery.java | 221 +----------------
.../query/h2/sql/GridSqlQueryParser.java | 62 ++++-
.../query/h2/sql/GridSqlQuerySplitter.java | 53 ++--
.../processors/query/h2/sql/GridSqlSelect.java | 243 +++++++++++++++++++
.../processors/query/h2/sql/GridSqlUnion.java | 162 +++++++++++++
.../query/h2/sql/GridQueryParsingTest.java | 18 +-
6 files changed, 515 insertions(+), 244 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98de490f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index da71bcb..db1dcbf 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -17,49 +17,29 @@
package org.apache.ignite.internal.processors.query.h2.sql;
-import org.h2.util.*;
-
import java.util.*;
/**
* Select query.
*/
-public class GridSqlQuery implements Cloneable {
- /** */
- private boolean distinct;
-
- /** */
- private List<GridSqlElement> allExprs;
-
- /** */
- private List<GridSqlElement> select = new ArrayList<>();
-
+public abstract class GridSqlQuery implements Cloneable {
/** */
- private List<GridSqlElement> groups = new ArrayList<>();
+ protected boolean distinct;
/** */
- private int[] grpCols;
+ protected List<GridSqlElement> allExprs;
/** */
- private GridSqlElement from;
+ protected List<GridSqlElement> select = new ArrayList<>();
/** */
- private GridSqlElement where;
+ protected Map<GridSqlElement,GridSqlSortColumn> sort = new LinkedHashMap<>();
/** */
- private GridSqlElement having;
+ protected GridSqlElement offset;
/** */
- private int havingCol = -1;
-
- /** */
- private Map<GridSqlElement,GridSqlSortColumn> sort = new LinkedHashMap<>();
-
- /** */
- private GridSqlElement offset;
-
- /** */
- private GridSqlElement limit;
+ protected GridSqlElement limit;
/**
* @return Offset.
@@ -106,78 +86,7 @@ public class GridSqlQuery implements Cloneable {
/**
* @return Generate sql.
*/
- public String getSQL() {
- StatementBuilder buff = new StatementBuilder("SELECT");
-
- if (distinct)
- buff.append(" DISTINCT");
-
- for (GridSqlElement expression : select) {
- buff.appendExceptFirst(",");
- buff.append('\n');
- buff.append(StringUtils.indent(expression.getSQL(), 4, false));
- }
-
- buff.append("\nFROM ").append(from.getSQL());
-
- if (where != null)
- buff.append("\nWHERE ").append(StringUtils.unEnclose(where.getSQL()));
-
- if (!groups.isEmpty()) {
- buff.append("\nGROUP BY ");
-
- buff.resetCount();
-
- for (GridSqlElement expression : groups) {
- buff.appendExceptFirst(", ");
-
- if (expression instanceof GridSqlAlias)
- buff.append(StringUtils.unEnclose((expression.child().getSQL())));
- else
- buff.append(StringUtils.unEnclose(expression.getSQL()));
- }
- }
-
- if (having != null)
- buff.append("\nHAVING ").append(StringUtils.unEnclose(having.getSQL()));
-
- if (!sort.isEmpty()) {
- buff.append("\nORDER BY ");
-
- buff.resetCount();
-
- for (Map.Entry<GridSqlElement,GridSqlSortColumn> entry : sort.entrySet()) {
- buff.appendExceptFirst(", ");
-
- GridSqlElement expression = entry.getKey();
-
- int idx = select.indexOf(expression);
-
- if (idx >= 0)
- buff.append(idx + 1);
- else
- buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
-
- GridSqlSortColumn type = entry.getValue();
-
- if (!type.asc())
- buff.append(" DESC");
-
- if (type.nullsFirst())
- buff.append(" NULLS FIRST");
- else if (type.nullsLast())
- buff.append(" NULLS LAST");
- }
- }
-
- if (limit != null)
- buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
-
- if (offset != null)
- buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
-
- return buff.toString();
- }
+ public abstract String getSQL();
/**
* @param expression Expression.
@@ -221,119 +130,6 @@ public class GridSqlQuery implements Cloneable {
}
/**
- * @return Expressions.
- */
- public List<GridSqlElement> groups() {
- return groups;
- }
-
- /**
- *
- */
- public void clearGroups() {
- groups = new ArrayList<>();
- grpCols = null;
- }
-
- /**
- * @param expression Expression.
- */
- public void addGroupExpression(GridSqlElement expression) {
- if (expression == null)
- throw new NullPointerException();
-
- groups.add(expression);
- }
-
- /**
- * @return Group columns.
- */
- public int[] groupColumns() {
- return grpCols;
- }
-
- /**
- * @param grpCols Group columns.
- */
- public void groupColumns(int[] grpCols) {
- this.grpCols = grpCols;
- }
-
- /**
- * @return Tables.
- */
- public GridSqlElement from() {
- return from;
- }
-
- /**
- * @param from From element.
- * @return {@code this}.
- */
- public GridSqlQuery from(GridSqlElement from) {
- this.from = from;
-
- return this;
- }
-
- /**
- * @return Where.
- */
- public GridSqlElement where() {
- return where;
- }
-
- /**
- * @param where New where.
- */
- public void where(GridSqlElement where) {
- this.where = where;
- }
-
- /**
- * @param condition Adds new WHERE condition using AND operator.
- * @return {@code this}.
- */
- public GridSqlQuery whereAnd(GridSqlElement condition) {
- if (condition == null)
- throw new NullPointerException();
-
- GridSqlElement old = where();
-
- where(old == null ? condition : new GridSqlOperation(GridSqlOperationType.AND, old, condition));
-
- return this;
- }
-
- /**
- * @return Having.
- */
- public GridSqlElement having() {
- return having;
- }
-
- /**
- * @param having New having.
- */
- public void having(GridSqlElement having) {
- this.having = having;
- }
-
- /**
- * @param col Index of HAVING column.
- */
- public void havingColumn(int col) {
- this.havingCol = col;
- }
-
- /**
- * @return Index of HAVING column.
- */
- public int havingColumn() {
- return havingCol;
- }
-
- /**
* @return Sort.
*/
public Map<GridSqlElement,GridSqlSortColumn> sort() {
@@ -362,7 +158,6 @@ public class GridSqlQuery implements Cloneable {
GridSqlQuery res = (GridSqlQuery)super.clone();
res.select = new ArrayList<>(select);
- res.groups = new ArrayList<>(groups);
res.sort = new LinkedHashMap<>(sort);
res.allExprs = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98de490f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index d3cd038..fb341c1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -22,6 +22,7 @@ import org.h2.command.*;
import org.h2.command.dml.*;
import org.h2.engine.*;
import org.h2.expression.*;
+import org.h2.expression.Parameter;
import org.h2.jdbc.*;
import org.h2.result.*;
import org.h2.table.*;
@@ -154,6 +155,9 @@ public class GridSqlQueryParser {
private static final Getter<JdbcPreparedStatement,Command> COMMAND = getter(JdbcPreparedStatement.class, "command");
/** */
+ private static final Getter<SelectUnion, SortOrder> UNION_SORT = getter(SelectUnion.class, "sort");
+
+ /** */
private static volatile Getter<Command,Prepared> prepared;
/** */
@@ -171,14 +175,14 @@ public class GridSqlQueryParser {
if (p == null) {
Class<? extends Command> cls = cmd.getClass();
- assert cls.getSimpleName().equals("CommandContainer");
+ assert "CommandContainer".equals(cls.getSimpleName());
prepared = p = getter(cls, "prepared");
}
- Prepared select = p.get(cmd);
+ Prepared statement = p.get(cmd);
- return new GridSqlQueryParser().parse((Select)select);
+ return new GridSqlQueryParser().parse((Query)statement);
}
/**
@@ -199,9 +203,8 @@ public class GridSqlQueryParser {
res = new GridSqlSubquery(parse((Select)qry));
}
- else if (tbl instanceof FunctionTable) {
+ else if (tbl instanceof FunctionTable)
res = parseExpression(FUNC_EXPR.get((FunctionTable)tbl));
- }
else if (tbl instanceof RangeTable) {
res = new GridSqlFunction(GridSqlFunctionType.SYSTEM_RANGE);
@@ -225,13 +228,13 @@ public class GridSqlQueryParser {
/**
* @param select Select.
*/
- public GridSqlQuery parse(Select select) {
- GridSqlQuery res = (GridSqlQuery)h2ObjToGridObj.get(select);
+ public GridSqlSelect parse(Select select) {
+ GridSqlSelect res = (GridSqlSelect)h2ObjToGridObj.get(select);
if (res != null)
return res;
- res = new GridSqlQuery();
+ res = new GridSqlSelect();
h2ObjToGridObj.put(select, res);
@@ -314,6 +317,45 @@ public class GridSqlQueryParser {
}
/**
+ * @param qry Select.
+ */
+ public GridSqlQuery parse(Query qry) {
+ if (qry instanceof Select)
+ return parse((Select)qry);
+
+ if (qry instanceof SelectUnion)
+ return parse((SelectUnion)qry);
+
+ throw new UnsupportedOperationException("Unknown query type: " + qry);
+ }
+
+ /**
+ * @param union Select.
+ */
+ public GridSqlUnion parse(SelectUnion union) {
+ GridSqlUnion res = (GridSqlUnion)h2ObjToGridObj.get(union);
+
+ if (res != null)
+ return res;
+
+ res = new GridSqlUnion();
+
+ res.right(parse(union.getRight()));
+ res.left(parse(union.getLeft()));
+
+ res.unionType(union.getUnionType());
+
+ res.limit(parseExpression(union.getLimit()));
+ res.offset(parseExpression(union.getOffset()));
+
+ assert UNION_SORT.get(union) == null; // todo IGNITE-624
+
+ h2ObjToGridObj.put(union, res);
+
+ return res;
+ }
+
+ /**
* @param expression Expression.
*/
private GridSqlElement parseExpression(@Nullable Expression expression) {
@@ -495,8 +537,8 @@ public class GridSqlQueryParser {
return res;
}
- if (expression instanceof org.h2.expression.Parameter)
- return new GridSqlParameter(((org.h2.expression.Parameter)expression).getIndex());
+ if (expression instanceof Parameter)
+ return new GridSqlParameter(((Parameter)expression).getIndex());
if (expression instanceof Aggregate) {
GridSqlAggregateFunction res = new GridSqlAggregateFunction(DISTINCT.get((Aggregate)expression),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98de490f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 6c32e13..e98169c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.h2.jdbc.*;
import org.h2.value.*;
+import org.jetbrains.annotations.*;
import java.util.*;
@@ -66,14 +67,19 @@ public class GridSqlQuerySplitter {
GridSqlQuery srcQry = GridSqlQueryParser.parse(stmt);
+ if (!(srcQry instanceof GridSqlSelect))
+ throw new UnsupportedOperationException(); // todo IGNITE-624 Support UNION,
+
+ GridSqlSelect srcSelect = (GridSqlSelect)srcQry;
+
final String mergeTable = TABLE_FUNC_NAME + "()"; // table(0); TODO
- GridSqlQuery mapQry = srcQry.clone();
- GridSqlQuery rdcQry = new GridSqlQuery().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
+ GridSqlSelect mapQry = srcSelect.clone();
+ GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = new ArrayList<>(srcQry.allExpressions());
- GridSqlElement[] rdcExps = new GridSqlElement[srcQry.select().size()];
+ List<GridSqlElement> mapExps = new ArrayList<>(srcSelect.allExpressions());
+ GridSqlElement[] rdcExps = new GridSqlElement[srcSelect.select().size()];
Set<String> colNames = new HashSet<>();
@@ -90,43 +96,43 @@ public class GridSqlQuerySplitter {
rdcQry.addSelectExpression(rdcExp);
// -- GROUP BY
- if (!srcQry.groups().isEmpty()) {
+ if (!srcSelect.groups().isEmpty()) {
mapQry.clearGroups();
- for (int col : srcQry.groupColumns())
+ for (int col : srcSelect.groupColumns())
mapQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
- for (int col : srcQry.groupColumns())
+ for (int col : srcSelect.groupColumns())
rdcQry.addGroupExpression(column(((GridSqlAlias)mapExps.get(col)).alias()));
}
// -- HAVING
- if (srcQry.having() != null) {
+ if (srcSelect.having() != null) {
// TODO Find aggregate functions in HAVING clause.
- rdcQry.whereAnd(column(columnName(srcQry.havingColumn())));
+ rdcQry.whereAnd(column(columnName(srcSelect.havingColumn())));
mapQry.having(null);
}
// -- ORDER BY
- if (!srcQry.sort().isEmpty()) {
- for (GridSqlSortColumn sortCol : srcQry.sort().values())
+ if (!srcSelect.sort().isEmpty()) {
+ for (GridSqlSortColumn sortCol : srcSelect.sort().values())
rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol);
}
// -- LIMIT
- if (srcQry.limit() != null)
- rdcQry.limit(srcQry.limit());
+ if (srcSelect.limit() != null)
+ rdcQry.limit(srcSelect.limit());
// -- OFFSET
- if (srcQry.offset() != null) {
+ if (srcSelect.offset() != null) {
mapQry.offset(null);
- rdcQry.offset(srcQry.offset());
+ rdcQry.offset(srcSelect.offset());
}
// -- DISTINCT
- if (srcQry.distinct()) {
+ if (srcSelect.distinct()) {
mapQry.distinct(false);
rdcQry.distinct(true);
}
@@ -148,6 +154,19 @@ public class GridSqlQuerySplitter {
* @return Extracted parameters list.
*/
private static List<Object> findParams(GridSqlQuery qry, Object[] params, ArrayList<Object> target) {
+ if (qry instanceof GridSqlSelect)
+ return findParams((GridSqlSelect)qry, params, target);
+
+ throw new UnsupportedOperationException(); // todo IGNITE-624
+ }
+
+ /**
+ * @param qry Select.
+ * @param params Parameters.
+ * @param target Extracted parameters.
+ * @return Extracted parameters list.
+ */
+ private static List<Object> findParams(GridSqlSelect qry, Object[] params, ArrayList<Object> target) {
if (params.length == 0)
return target;
@@ -176,7 +195,7 @@ public class GridSqlQuerySplitter {
* @param params Parameters.
* @param target Extracted parameters.
*/
- private static void findParams(GridSqlElement el, Object[] params, ArrayList<Object> target) {
+ private static void findParams(@Nullable GridSqlElement el, Object[] params, ArrayList<Object> target) {
if (el == null)
return;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98de490f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
new file mode 100644
index 0000000..272f8b4
--- /dev/null
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -0,0 +1,243 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.h2.sql;
+
+import org.h2.util.*;
+
+import java.util.*;
+
+/**
+ *
+ */
+public class GridSqlSelect extends GridSqlQuery {
+ /** */
+ private List<GridSqlElement> groups = new ArrayList<>();
+
+ /** */
+ private int[] grpCols;
+
+ /** */
+ private GridSqlElement from;
+
+ /** */
+ private GridSqlElement where;
+
+ /** */
+ private GridSqlElement having;
+
+ /** */
+ private int havingCol = -1;
+
+ /** {@inheritDoc} */
+ @Override public String getSQL() {
+ StatementBuilder buff = new StatementBuilder("SELECT");
+
+ if (distinct)
+ buff.append(" DISTINCT");
+
+ for (GridSqlElement expression : select) {
+ buff.appendExceptFirst(",");
+ buff.append('\n');
+ buff.append(StringUtils.indent(expression.getSQL(), 4, false));
+ }
+
+ buff.append("\nFROM ").append(from.getSQL());
+
+ if (where != null)
+ buff.append("\nWHERE ").append(StringUtils.unEnclose(where.getSQL()));
+
+ if (!groups.isEmpty()) {
+ buff.append("\nGROUP BY ");
+
+ buff.resetCount();
+
+ for (GridSqlElement expression : groups) {
+ buff.appendExceptFirst(", ");
+
+ if (expression instanceof GridSqlAlias)
+ buff.append(StringUtils.unEnclose((expression.child().getSQL())));
+ else
+ buff.append(StringUtils.unEnclose(expression.getSQL()));
+ }
+ }
+
+ if (having != null)
+ buff.append("\nHAVING ").append(StringUtils.unEnclose(having.getSQL()));
+
+ if (!sort.isEmpty()) {
+ buff.append("\nORDER BY ");
+
+ buff.resetCount();
+
+ for (Map.Entry<GridSqlElement,GridSqlSortColumn> entry : sort.entrySet()) {
+ buff.appendExceptFirst(", ");
+
+ GridSqlElement expression = entry.getKey();
+
+ int idx = select.indexOf(expression);
+
+ if (idx >= 0)
+ buff.append(idx + 1);
+ else
+ buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
+
+ GridSqlSortColumn type = entry.getValue();
+
+ if (!type.asc())
+ buff.append(" DESC");
+
+ if (type.nullsFirst())
+ buff.append(" NULLS FIRST");
+ else if (type.nullsLast())
+ buff.append(" NULLS LAST");
+ }
+ }
+
+ if (limit != null)
+ buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
+
+ if (offset != null)
+ buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
+
+ return buff.toString();
+ }
+
+ /**
+ * @return Expressions.
+ */
+ public List<GridSqlElement> groups() {
+ return groups;
+ }
+
+ /**
+ *
+ */
+ public void clearGroups() {
+ groups = new ArrayList<>();
+ grpCols = null;
+ }
+
+ /**
+ * @param expression Expression.
+ */
+ public void addGroupExpression(GridSqlElement expression) {
+ if (expression == null)
+ throw new NullPointerException();
+
+ groups.add(expression);
+ }
+
+ /**
+ * @return Group columns.
+ */
+ public int[] groupColumns() {
+ return grpCols;
+ }
+
+ /**
+ * @param grpCols Group columns.
+ */
+ public void groupColumns(int[] grpCols) {
+ this.grpCols = grpCols;
+ }
+
+ /**
+ * @return Tables.
+ */
+ public GridSqlElement from() {
+ return from;
+ }
+
+ /**
+ * @param from From element.
+ * @return {@code this}.
+ */
+ public GridSqlSelect from(GridSqlElement from) {
+ this.from = from;
+
+ return this;
+ }
+
+ /**
+ * @return Where.
+ */
+ public GridSqlElement where() {
+ return where;
+ }
+
+ /**
+ * @param where New where.
+ */
+ public void where(GridSqlElement where) {
+ this.where = where;
+ }
+
+ /**
+ * @param cond Adds new WHERE condition using AND operator.
+ * @return {@code this}.
+ */
+ public GridSqlSelect whereAnd(GridSqlElement cond) {
+ if (cond == null)
+ throw new NullPointerException();
+
+ GridSqlElement old = where();
+
+ where(old == null ? cond : new GridSqlOperation(GridSqlOperationType.AND, old, cond));
+
+ return this;
+ }
+
+ /**
+ * @return Having.
+ */
+ public GridSqlElement having() {
+ return having;
+ }
+
+ /**
+ * @param having New having.
+ */
+ public void having(GridSqlElement having) {
+ this.having = having;
+ }
+
+ /**
+ * @param col Index of HAVING column.
+ */
+ public void havingColumn(int col) {
+ havingCol = col;
+ }
+
+ /**
+ * @return Index of HAVING column.
+ */
+ public int havingColumn() {
+ return havingCol;
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"CloneCallsConstructors", "CloneDoesntDeclareCloneNotSupportedException"})
+ @Override public GridSqlSelect clone() {
+ GridSqlSelect res = (GridSqlSelect)super.clone();
+
+ res.groups = new ArrayList<>(groups);
+ res.grpCols = grpCols == null ? null : grpCols.clone();
+
+ return res;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98de490f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
new file mode 100644
index 0000000..1eae1ef
--- /dev/null
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.h2.sql;
+
+import org.h2.command.dml.*;
+import org.h2.message.*;
+import org.h2.util.*;
+
+import javax.cache.*;
+import java.util.*;
+
+/**
+ *
+ */
+public class GridSqlUnion extends GridSqlQuery {
+ /** */
+ private int unionType;
+
+ /** */
+ private GridSqlQuery right;
+
+ /** */
+ private GridSqlQuery left;
+
+ /** {@inheritDoc} */
+ @Override public String getSQL() {
+ StringBuilder buff = new StringBuilder();
+
+ buff.append('(').append(left.getSQL()).append(')');
+
+ switch (unionType) {
+ case SelectUnion.UNION_ALL:
+ buff.append("\nUNION ALL\n");
+ break;
+
+ case SelectUnion.UNION:
+ buff.append("\nUNION\n");
+ break;
+
+ case SelectUnion.INTERSECT:
+ buff.append("\nINTERSECT\n");
+ break;
+
+ case SelectUnion.EXCEPT:
+ buff.append("\nEXCEPT\n");
+ break;
+
+ default:
+ throw new CacheException("type=" + unionType);
+ }
+
+ buff.append('(').append(right.getSQL()).append(')');
+
+ if (!sort.isEmpty()) {
+ buff.append("\nORDER BY ");
+
+ boolean first = true;
+
+ for (Map.Entry<GridSqlElement, GridSqlSortColumn> entry : sort.entrySet()) {
+ if (first)
+ first = false;
+ else
+ buff.append(", ");
+
+ GridSqlElement expression = entry.getKey();
+
+ int idx = select.indexOf(expression);
+
+ if (idx >= 0)
+ buff.append(idx + 1);
+ else
+ buff.append('=').append(StringUtils.unEnclose(expression.getSQL()));
+
+ GridSqlSortColumn type = entry.getValue();
+
+ if (!type.asc())
+ buff.append(" DESC");
+
+ if (type.nullsFirst())
+ buff.append(" NULLS FIRST");
+ else if (type.nullsLast())
+ buff.append(" NULLS LAST");
+ }
+ }
+
+ if (limit != null)
+ buff.append(" LIMIT ").append(StringUtils.unEnclose(limit.getSQL()));
+
+ if (offset != null)
+ buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL()));
+
+ return buff.toString();
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"CloneCallsConstructors", "CloneDoesntDeclareCloneNotSupportedException"})
+ @Override public GridSqlUnion clone() {
+ GridSqlUnion res = (GridSqlUnion)super.clone();
+
+ res.right = right.clone();
+ res.left = left.clone();
+
+ return res;
+ }
+
+ /**
+ * @return Union type.
+ */
+ public int unionType() {
+ return unionType;
+ }
+
+ /**
+ * @param unionType New union type.
+ */
+ public void unionType(int unionType) {
+ this.unionType = unionType;
+ }
+
+ /**
+ * @return Right.
+ */
+ public GridSqlQuery right() {
+ return right;
+ }
+
+ /**
+ * @param right New right.
+ */
+ public void right(GridSqlQuery right) {
+ this.right = right;
+ }
+
+ /**
+ * @return Left.
+ */
+ public GridSqlQuery left() {
+ return left;
+ }
+
+ /**
+ * @param left New left.
+ */
+ public void left(GridSqlQuery left) {
+ this.left = left;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98de490f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index db8e8bd..3eead22 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -197,13 +197,23 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select addr.street from Person p, (select a.street from Address a where a.street is not null) addr");
checkQuery("select p.name n from \"\".Person p order by p.old + 10");
+
+ checkQuery("select count(*) as a from Person union select count(*) as a from Address");
+ checkQuery("select old, count(*) as a from Person group by old union select 1, count(*) as a from Address");
+ checkQuery("select name from Person MINUS select street from Address");
+ checkQuery("select name from Person EXCEPT select street from Address");
+ checkQuery("select name from Person INTERSECT select street from Address");
+ checkQuery("select name from Person UNION select street from Address limit 5");
+ checkQuery("select name from Person UNION select street from Address limit ?");
+ checkQuery("select name from Person UNION select street from Address limit ? offset ?");
+ checkQuery("(select name from Person limit 4) UNION (select street from Address limit 1) limit ? offset ?");
}
/**
*
*/
public void testExample1() throws Exception {
- Select select = parse("select p.name n, max(p.old) maxOld, min(p.old) minOld from Person p group by p.name having maxOld > 10 and min(p.old) < 1");
+ Query select = parse("select p.name n, max(p.old) maxOld, min(p.old) minOld from Person p group by p.name having maxOld > 10 and min(p.old) < 1");
GridSqlQueryParser ses = new GridSqlQueryParser();
@@ -217,7 +227,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
*
*/
private JdbcConnection connection() throws Exception {
- GridKernalContext ctx = ((IgniteKernal)ignite).context();
+ GridKernalContext ctx = ((IgniteEx)ignite).context();
GridQueryProcessor qryProcessor = ctx.query();
@@ -266,8 +276,8 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
String res;
- if (prepared instanceof Select)
- res = ses.parse((Select) prepared).getSQL();
+ if (prepared instanceof Query)
+ res = ses.parse((Query) prepared).getSQL();
else
throw new UnsupportedOperationException();
[07/28] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5edf4d98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5edf4d98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5edf4d98
Branch: refs/heads/ignite-694
Commit: 5edf4d9849ad5ba21a35fa10e309d3b1dbae899e
Parents: 25f900e 5f2d8c2
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Apr 7 13:47:28 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Apr 7 13:47:28 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
.../streaming/StreamTransformerExample.java | 101 +
.../streaming/StreamVisitorExample.java | 171 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 48 +
.../streaming/wordcount/QueryWords.java | 77 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../ignite/cache/affinity/AffinityUuid.java | 50 +
.../store/jdbc/CacheAbstractJdbcStore.java | 104 +-
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +-
.../ignite/internal/visor/cache/VisorCache.java | 19 +-
.../VisorCacheConfigurationCollectorJob.java | 76 +
.../VisorCacheConfigurationCollectorTask.java | 39 +
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../internal/visor/log/VisorLogSearchTask.java | 3 +-
.../visor/node/VisorGridConfiguration.java | 38 -
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 1 +
.../visor/query/VisorQueryNextPageTask.java | 5 +-
.../internal/visor/util/VisorTaskUtils.java | 3 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -
.../ignite/IgniteCacheAffinitySelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +-
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../commands/cache/VisorCacheCommand.scala | 26 +-
.../config/VisorConfigurationCommand.scala | 15 +-
.../visor/commands/gc/VisorGcCommand.scala | 15 +-
.../scala/org/apache/ignite/visor/visor.scala | 34 +-
.../yardstick/config/benchmark-store.properties | 5 +-
parent/pom.xml | 1 +
pom.xml | 12 +-
56 files changed, 5039 insertions(+), 1371 deletions(-)
----------------------------------------------------------------------
[21/28] incubator-ignite git commit: ignite-635: IgniteCluster #
startNodes return ClusterStartNodeResult-s instead of Tuple3-s
Posted by sb...@apache.org.
ignite-635: IgniteCluster # startNodes return ClusterStartNodeResult-s instead of Tuple3-s
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7f4c5eed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f4c5eed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f4c5eed
Branch: refs/heads/ignite-694
Commit: 7f4c5eed0af2b56b1dd671cbe76a4224b72f5045
Parents: 71439bc
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 18:27:23 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 18:27:23 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCluster.java | 9 +-
.../ignite/cluster/ClusterStartNodeResult.java | 46 +++
.../cluster/ClusterStartNodeResultImpl.java | 87 ++++++
.../cluster/IgniteClusterAsyncImpl.java | 5 +-
.../internal/cluster/IgniteClusterImpl.java | 37 +--
.../util/nodestart/IgniteNodeCallable.java | 30 --
.../util/nodestart/IgniteSshHelper.java | 2 +-
.../util/nodestart/StartNodeCallable.java | 30 ++
.../util/nodestart/IgniteNodeCallableImpl.java | 308 ------------------
.../util/nodestart/IgniteSshHelperImpl.java | 4 +-
.../util/nodestart/StartNodeCallableImpl.java | 309 +++++++++++++++++++
...gniteProjectionStartStopRestartSelfTest.java | 261 ++++++++--------
.../IgniteStartStopRestartTestSuite.java | 1 +
.../commands/start/VisorStartCommand.scala | 4 +-
14 files changed, 631 insertions(+), 502 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index 7d7d2fb..02fea14 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -19,7 +19,6 @@ package org.apache.ignite;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
@@ -170,12 +169,12 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
* nodes on the host than expected.
* @param timeout Connection timeout.
* @param maxConn Number of parallel SSH connections to one host.
- * @return Collection of tuples, each containing host name, result (success of failure)
+ * @return Collection of start node results, each containing host name, result (success or failure)
* and error message (if any).
* @throws IgniteException In case of error.
*/
@IgniteAsyncSupported
- public Collection<GridTuple3<String, Boolean, String>> startNodes(File file, boolean restart, int timeout,
+ public Collection<ClusterStartNodeResult> startNodes(File file, boolean restart, int timeout,
int maxConn) throws IgniteException;
/**
@@ -272,12 +271,12 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
* nodes on the host than expected.
* @param timeout Connection timeout in milliseconds.
* @param maxConn Number of parallel SSH connections to one host.
- * @return Collection of tuples, each containing host name, result (success of failure)
+ * @return Collection of start node results, each containing host name, result (success or failure)
* and error message (if any).
* @throws IgniteException In case of error.
*/
@IgniteAsyncSupported
- public Collection<GridTuple3<String, Boolean, String>> startNodes(Collection<Map<String, Object>> hosts,
+ public Collection<ClusterStartNodeResult> startNodes(Collection<Map<String, Object>> hosts,
@Nullable Map<String, Object> dflts, boolean restart, int timeout, int maxConn) throws IgniteException;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
new file mode 100644
index 0000000..b6c3619
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cluster;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Cluster start node result information.
+ */
+public interface ClusterStartNodeResult {
+ /**
+ * Gets host name.
+ *
+ * @return Host name.
+ */
+ public String getHostName();
+
+ /**
+ * Gets result of success or failure.
+ *
+ * @return Success or failure. <code>True</code> if success.
+ */
+ public boolean isSuccess();
+
+ /**
+ * Gets error message if any.
+ *
+ * @return Error massage.
+ */
+ @Nullable public String getError();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
new file mode 100644
index 0000000..39301b3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.cluster;
+
+import org.apache.ignite.cluster.*;
+
+/**
+ * Implementation for cluster start node result.
+ */
+public class ClusterStartNodeResultImpl implements ClusterStartNodeResult {
+ /** Host name. */
+ private String hostName;
+
+ /** Result (success or failure). */
+ private boolean success;
+
+ /** Error message (if any) */
+ private String error;
+
+ /**
+ * @param hostName Host name.
+ * @param success Success or not.
+ * @param error Error message.
+ */
+ public ClusterStartNodeResultImpl(String hostName, boolean success, String error) {
+ this.hostName = hostName;
+ this.success = success;
+ this.error = error;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String getHostName() {
+ return hostName;
+ }
+
+ /**
+ * Sets host name.
+ *
+ * @param hostName Host name.
+ */
+ public void setHostName(String hostName) {
+ this.hostName = hostName;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isSuccess() {
+ return success;
+ }
+
+ /**
+ * Sets success result.
+ *
+ * @param success Success result.
+ */
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String getError() {
+ return error;
+ }
+
+ /**
+ * Sets error message.
+ *
+ * @param error Error message.
+ */
+ public void setError(String error) {
+ this.error = error;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
index 5a5daab..7f67b4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.cluster;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
@@ -98,7 +97,7 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
}
/** {@inheritDoc} */
- @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(File file,
+ @Override public Collection<ClusterStartNodeResult> startNodes(File file,
boolean restart,
int timeout,
int maxConn)
@@ -112,7 +111,7 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
}
/** {@inheritDoc} */
- @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(
+ @Override public Collection<ClusterStartNodeResult> startNodes(
Collection<Map<String, Object>> hosts,
@Nullable Map<String, Object> dflts,
boolean restart,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index 76a49dd..3c937b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.nodestart.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -189,7 +188,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
}
/** {@inheritDoc} */
- @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(File file,
+ @Override public Collection<ClusterStartNodeResult> startNodes(File file,
boolean restart,
int timeout,
int maxConn)
@@ -204,7 +203,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
}
/** {@inheritDoc} */
- @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(Collection<Map<String, Object>> hosts,
+ @Override public Collection<ClusterStartNodeResult> startNodes(Collection<Map<String, Object>> hosts,
@Nullable Map<String, Object> dflts,
boolean restart,
int timeout,
@@ -304,7 +303,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
* @return Future with results.
* @see IgniteCluster#startNodes(java.io.File, boolean, int, int)
*/
- IgniteInternalFuture<Collection<GridTuple3<String, Boolean, String>>> startNodesAsync(File file,
+ IgniteInternalFuture<Collection<ClusterStartNodeResult>> startNodesAsync(File file,
boolean restart,
int timeout,
int maxConn)
@@ -332,7 +331,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
* @return Future with results.
* @see IgniteCluster#startNodes(java.util.Collection, java.util.Map, boolean, int, int)
*/
- IgniteInternalFuture<Collection<GridTuple3<String, Boolean, String>>> startNodesAsync(
+ IgniteInternalFuture<Collection<ClusterStartNodeResult>> startNodesAsync(
Collection<Map<String, Object>> hosts,
@Nullable Map<String, Object> dflts,
boolean restart,
@@ -348,7 +347,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
Map<String, Collection<IgniteRemoteStartSpecification>> specsMap = specifications(hosts, dflts);
- Map<String, ConcurrentLinkedQueue<IgniteNodeCallable>> runMap = new HashMap<>();
+ Map<String, ConcurrentLinkedQueue<StartNodeCallable>> runMap = new HashMap<>();
int nodeCallCnt = 0;
@@ -393,7 +392,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
startIdx = neighbors.size() + 1;
}
- ConcurrentLinkedQueue<IgniteNodeCallable> nodeRuns = new ConcurrentLinkedQueue<>();
+ ConcurrentLinkedQueue<StartNodeCallable> nodeRuns = new ConcurrentLinkedQueue<>();
runMap.put(host, nodeRuns);
@@ -410,19 +409,17 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
// If there is nothing to start, return finished future with empty result.
if (nodeCallCnt == 0)
- return new GridFinishedFuture<Collection<GridTuple3<String, Boolean, String>>>(
- Collections.<GridTuple3<String, Boolean, String>>emptyList());
+ return new GridFinishedFuture<Collection<ClusterStartNodeResult>>(
+ Collections.<ClusterStartNodeResult>emptyList());
// Exceeding max line width for readability.
- GridCompoundFuture<GridTuple3<String, Boolean, String>, Collection<GridTuple3<String, Boolean, String>>>
- fut = new GridCompoundFuture<>(
- CU.<GridTuple3<String, Boolean, String>>objectsReducer()
- );
+ GridCompoundFuture<ClusterStartNodeResult, Collection<ClusterStartNodeResult>> fut =
+ new GridCompoundFuture<>(CU.<ClusterStartNodeResult>objectsReducer());
AtomicInteger cnt = new AtomicInteger(nodeCallCnt);
// Limit maximum simultaneous connection number per host.
- for (ConcurrentLinkedQueue<IgniteNodeCallable> queue : runMap.values()) {
+ for (ConcurrentLinkedQueue<StartNodeCallable> queue : runMap.values()) {
for (int i = 0; i < maxConn; i++) {
if (!runNextNodeCallable(queue, fut, cnt))
break;
@@ -471,25 +468,25 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
* @param cnt Atomic counter to check if all futures are added to compound future.
* @return {@code True} if task was started, {@code false} if queue was empty.
*/
- private boolean runNextNodeCallable(final ConcurrentLinkedQueue<IgniteNodeCallable> queue,
- final GridCompoundFuture<GridTuple3<String, Boolean, String>, Collection<GridTuple3<String, Boolean, String>>>
+ private boolean runNextNodeCallable(final ConcurrentLinkedQueue<StartNodeCallable> queue,
+ final GridCompoundFuture<ClusterStartNodeResult, Collection<ClusterStartNodeResult>>
comp,
final AtomicInteger cnt)
{
- IgniteNodeCallable call = queue.poll();
+ StartNodeCallable call = queue.poll();
if (call == null)
return false;
- IgniteInternalFuture<GridTuple3<String, Boolean, String>> fut = ctx.closure().callLocalSafe(call, true);
+ IgniteInternalFuture<ClusterStartNodeResult> fut = ctx.closure().callLocalSafe(call, true);
comp.add(fut);
if (cnt.decrementAndGet() == 0)
comp.markInitialized();
- fut.listen(new CI1<IgniteInternalFuture<GridTuple3<String, Boolean, String>>>() {
- @Override public void apply(IgniteInternalFuture<GridTuple3<String, Boolean, String>> f) {
+ fut.listen(new CI1<IgniteInternalFuture<ClusterStartNodeResult>>() {
+ @Override public void apply(IgniteInternalFuture<ClusterStartNodeResult> f) {
runNextNodeCallable(queue, comp, cnt);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java
deleted file mode 100644
index 6c34efb..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.nodestart;
-
-import org.apache.ignite.internal.util.lang.*;
-
-import java.util.concurrent.*;
-
-/**
- * SSH-based node starter, returns tuple which contains hostname, success flag and error message
- * if attempt was not successful.
- */
-public interface IgniteNodeCallable extends Callable<GridTuple3<String, Boolean, String>> {
- // No-op.
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
index 2cb620f..14a35b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
@@ -30,5 +30,5 @@ public interface IgniteSshHelper {
* @param timeout Connection timeout.
* @return {@link Callable} starting node using SSH.
*/
- public IgniteNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout);
+ public StartNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
new file mode 100644
index 0000000..a1a2046
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.util.nodestart;
+
+import org.apache.ignite.cluster.*;
+
+import java.util.concurrent.*;
+
+/**
+ * SSH-based node starter, returns tuple which contains hostname, success flag and error message
+ * if attempt was not successful.
+ */
+public interface StartNodeCallable extends Callable<ClusterStartNodeResult> {
+ // No-op.
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
deleted file mode 100644
index 9b873bf..0000000
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.nodestart;
-
-import com.jcraft.jsch.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-
-/**
- * SSH-based node starter.
- */
-public class IgniteNodeCallableImpl implements IgniteNodeCallable {
- /** Default Ignite home path for Windows (taken from environment variable). */
- private static final String DFLT_IGNITE_HOME_WIN = "%IGNITE_HOME%";
-
- /** Default Ignite home path for Linux (taken from environment variable). */
- private static final String DFLT_IGNITE_HOME_LINUX = "$IGNITE_HOME";
-
- /** Default start script path for Linux. */
- private static final String DFLT_SCRIPT_LINUX = "bin/ignite.sh -v";
-
- /** Date format for log file name. */
- private static final SimpleDateFormat FILE_NAME_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy--HH-mm-ss");
-
- /** Specification. */
- private final IgniteRemoteStartSpecification spec;
-
- /** Connection timeout. */
- private final int timeout;
-
- /** Logger. */
- @LoggerResource
- private IgniteLogger log;
-
- /**
- * Required by Externalizable.
- */
- public IgniteNodeCallableImpl() {
- spec = null;
- timeout = 0;
-
- assert false;
- }
-
- /**
- * Constructor.
- *
- * @param spec Specification.
- * @param timeout Connection timeout.
- */
- public IgniteNodeCallableImpl(IgniteRemoteStartSpecification spec, int timeout) {
- assert spec != null;
-
- this.spec = spec;
- this.timeout = timeout;
- }
-
- /** {@inheritDoc} */
- @Override public GridTuple3<String, Boolean, String> call() {
- JSch ssh = new JSch();
-
- Session ses = null;
-
- try {
- if (spec.key() != null)
- ssh.addIdentity(spec.key().getAbsolutePath());
-
- ses = ssh.getSession(spec.username(), spec.host(), spec.port());
-
- if (spec.password() != null)
- ses.setPassword(spec.password());
-
- ses.setConfig("StrictHostKeyChecking", "no");
-
- ses.connect(timeout);
-
- boolean win = isWindows(ses);
-
- char separator = win ? '\\' : '/';
-
- spec.fixPaths(separator);
-
- String igniteHome = spec.igniteHome();
-
- if (igniteHome == null)
- igniteHome = win ? DFLT_IGNITE_HOME_WIN : DFLT_IGNITE_HOME_LINUX;
-
- String script = spec.script();
-
- if (script == null)
- script = DFLT_SCRIPT_LINUX;
-
- String cfg = spec.configuration();
-
- if (cfg == null)
- cfg = "";
-
- String startNodeCmd;
- String scriptOutputFileName = FILE_NAME_DATE_FORMAT.format(new Date()) + '-'
- + UUID.randomUUID().toString().substring(0, 8) + ".log";
-
- if (win)
- throw new UnsupportedOperationException("Apache Ignite cannot be auto-started on Windows from IgniteCluster.startNodes(…) API.");
- else { // Assume Unix.
- int spaceIdx = script.indexOf(' ');
-
- String scriptPath = spaceIdx > -1 ? script.substring(0, spaceIdx) : script;
- String scriptArgs = spaceIdx > -1 ? script.substring(spaceIdx + 1) : "";
- String rmtLogArgs = buildRemoteLogArguments(spec.username(), spec.host());
- String tmpDir = env(ses, "$TMPDIR", "/tmp/");
- String scriptOutputDir = tmpDir + "ignite-startNodes";
-
- shell(ses, "mkdir " + scriptOutputDir);
-
- // Mac os don't support ~ in double quotes. Trying get home path from remote system.
- if (igniteHome.startsWith("~")) {
- String homeDir = env(ses, "$HOME", "~");
-
- igniteHome = igniteHome.replaceFirst("~", homeDir);
- }
-
- startNodeCmd = new SB().
- // Console output is consumed, started nodes must use Ignite file appenders for log.
- a("nohup ").
- a("\"").a(igniteHome).a('/').a(scriptPath).a("\"").
- a(" ").a(scriptArgs).
- a(!cfg.isEmpty() ? " \"" : "").a(cfg).a(!cfg.isEmpty() ? "\"" : "").
- a(rmtLogArgs).
- a(" > ").a(scriptOutputDir).a("/").a(scriptOutputFileName).a(" 2>& 1 &").
- toString();
- }
-
- info("Starting remote node with SSH command: " + startNodeCmd, spec.logger(), log);
-
- shell(ses, startNodeCmd);
-
- return new GridTuple3<>(spec.host(), true, null);
- }
- catch (IgniteInterruptedCheckedException e) {
- return new GridTuple3<>(spec.host(), false, e.getMessage());
- }
- catch (Exception e) {
- return new GridTuple3<>(spec.host(), false, X.getFullStackTrace(e));
- }
- finally {
- if (ses != null && ses.isConnected())
- ses.disconnect();
- }
- }
-
- /**
- * Executes command using {@code shell} channel.
- *
- * @param ses SSH session.
- * @param cmd Command.
- * @throws JSchException In case of SSH error.
- * @throws IOException If IO error occurs.
- * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread was interrupted while waiting.
- */
- private void shell(Session ses, String cmd) throws JSchException, IOException, IgniteInterruptedCheckedException {
- ChannelShell ch = null;
-
- try {
- ch = (ChannelShell)ses.openChannel("shell");
-
- ch.connect();
-
- try (PrintStream out = new PrintStream(ch.getOutputStream(), true)) {
- out.println(cmd);
-
- U.sleep(1000);
- }
- }
- finally {
- if (ch != null && ch.isConnected())
- ch.disconnect();
- }
- }
-
- /**
- * Checks whether host is running Windows OS.
- *
- * @param ses SSH session.
- * @return Whether host is running Windows OS.
- * @throws JSchException In case of SSH error.
- */
- private boolean isWindows(Session ses) throws JSchException {
- try {
- return exec(ses, "cmd.exe") != null;
- }
- catch (IOException ignored) {
- return false;
- }
- }
-
- /**
- * Gets the value of the specified environment variable.
- *
- * @param ses SSH session.
- * @param name environment variable name.
- * @param dflt default value.
- * @return environment variable value.
- * @throws JSchException In case of SSH error.
- */
- private String env(Session ses, String name, String dflt) throws JSchException {
- try {
- return exec(ses, "echo " + name);
- }
- catch (IOException ignored) {
- return dflt;
- }
- }
-
- /**
- * Gets the value of the specified environment variable.
- *
- * @param ses SSH session.
- * @param cmd environment variable name.
- * @return environment variable value.
- * @throws JSchException In case of SSH error.
- * @throws IOException If failed.
- */
- private String exec(Session ses, String cmd) throws JSchException, IOException {
- ChannelExec ch = null;
-
- try {
- ch = (ChannelExec)ses.openChannel("exec");
-
- ch.setCommand(cmd);
-
- ch.connect();
-
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(ch.getInputStream()))) {
- return reader.readLine();
- }
- }
- finally {
- if (ch != null && ch.isConnected())
- ch.disconnect();
- }
- }
-
- /**
- * Builds ignite.sh attributes to set up SSH username and password and log directory for started node.
- *
- * @param username SSH user name.
- * @param host Host.
- * @return {@code ignite.sh} script arguments.
- */
- private String buildRemoteLogArguments(String username, String host) {
- assert username != null;
- assert host != null;
-
- SB sb = new SB();
-
- sb.a(" -J-D").a(IGNITE_SSH_HOST).a("=\"").a(host).a("\"").
- a(" -J-D").a(IGNITE_SSH_USER_NAME).a("=\"").a(username).a("\"");
-
- return sb.toString();
- }
-
- /**
- * @param log Logger.
- * @return This callable for chaining method calls.
- */
- public IgniteNodeCallable setLogger(IgniteLogger log) {
- this.log = log;
-
- return this;
- }
-
- /**
- * Log info message to loggers.
- *
- * @param msg Message text.
- * @param loggers Loggers.
- */
- private void info(String msg, IgniteLogger... loggers) {
- for (IgniteLogger logger : loggers)
- if (logger != null && logger.isInfoEnabled())
- logger.info(msg);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
index cccf678..c2370b6 100644
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
@@ -22,7 +22,7 @@ package org.apache.ignite.internal.util.nodestart;
*/
public class IgniteSshHelperImpl implements IgniteSshHelper {
/** {@inheritDoc} */
- @Override public IgniteNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout) {
- return new IgniteNodeCallableImpl(spec, timeout);
+ @Override public StartNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout) {
+ return new StartNodeCallableImpl(spec, timeout);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
new file mode 100644
index 0000000..7c6010f
--- /dev/null
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
@@ -0,0 +1,309 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.util.nodestart;
+
+import com.jcraft.jsch.*;
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.cluster.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.resources.*;
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
+
+/**
+ * SSH-based node starter.
+ */
+public class StartNodeCallableImpl implements StartNodeCallable {
+ /** Default Ignite home path for Windows (taken from environment variable). */
+ private static final String DFLT_IGNITE_HOME_WIN = "%IGNITE_HOME%";
+
+ /** Default Ignite home path for Linux (taken from environment variable). */
+ private static final String DFLT_IGNITE_HOME_LINUX = "$IGNITE_HOME";
+
+ /** Default start script path for Linux. */
+ private static final String DFLT_SCRIPT_LINUX = "bin/ignite.sh -v";
+
+ /** Date format for log file name. */
+ private static final SimpleDateFormat FILE_NAME_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy--HH-mm-ss");
+
+ /** Specification. */
+ private final IgniteRemoteStartSpecification spec;
+
+ /** Connection timeout. */
+ private final int timeout;
+
+ /** Logger. */
+ @LoggerResource
+ private IgniteLogger log;
+
+ /**
+ * Required by Externalizable.
+ */
+ public StartNodeCallableImpl() {
+ spec = null;
+ timeout = 0;
+
+ assert false;
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param spec Specification.
+ * @param timeout Connection timeout.
+ */
+ public StartNodeCallableImpl(IgniteRemoteStartSpecification spec, int timeout) {
+ assert spec != null;
+
+ this.spec = spec;
+ this.timeout = timeout;
+ }
+
+ /** {@inheritDoc} */
+ @Override public ClusterStartNodeResult call() {
+ JSch ssh = new JSch();
+
+ Session ses = null;
+
+ try {
+ if (spec.key() != null)
+ ssh.addIdentity(spec.key().getAbsolutePath());
+
+ ses = ssh.getSession(spec.username(), spec.host(), spec.port());
+
+ if (spec.password() != null)
+ ses.setPassword(spec.password());
+
+ ses.setConfig("StrictHostKeyChecking", "no");
+
+ ses.connect(timeout);
+
+ boolean win = isWindows(ses);
+
+ char separator = win ? '\\' : '/';
+
+ spec.fixPaths(separator);
+
+ String igniteHome = spec.igniteHome();
+
+ if (igniteHome == null)
+ igniteHome = win ? DFLT_IGNITE_HOME_WIN : DFLT_IGNITE_HOME_LINUX;
+
+ String script = spec.script();
+
+ if (script == null)
+ script = DFLT_SCRIPT_LINUX;
+
+ String cfg = spec.configuration();
+
+ if (cfg == null)
+ cfg = "";
+
+ String startNodeCmd;
+ String scriptOutputFileName = FILE_NAME_DATE_FORMAT.format(new Date()) + '-'
+ + UUID.randomUUID().toString().substring(0, 8) + ".log";
+
+ if (win)
+ throw new UnsupportedOperationException("Apache Ignite cannot be auto-started on Windows from IgniteCluster.startNodes(…) API.");
+ else { // Assume Unix.
+ int spaceIdx = script.indexOf(' ');
+
+ String scriptPath = spaceIdx > -1 ? script.substring(0, spaceIdx) : script;
+ String scriptArgs = spaceIdx > -1 ? script.substring(spaceIdx + 1) : "";
+ String rmtLogArgs = buildRemoteLogArguments(spec.username(), spec.host());
+ String tmpDir = env(ses, "$TMPDIR", "/tmp/");
+ String scriptOutputDir = tmpDir + "ignite-startNodes";
+
+ shell(ses, "mkdir " + scriptOutputDir);
+
+ // Mac os don't support ~ in double quotes. Trying get home path from remote system.
+ if (igniteHome.startsWith("~")) {
+ String homeDir = env(ses, "$HOME", "~");
+
+ igniteHome = igniteHome.replaceFirst("~", homeDir);
+ }
+
+ startNodeCmd = new SB().
+ // Console output is consumed, started nodes must use Ignite file appenders for log.
+ a("nohup ").
+ a("\"").a(igniteHome).a('/').a(scriptPath).a("\"").
+ a(" ").a(scriptArgs).
+ a(!cfg.isEmpty() ? " \"" : "").a(cfg).a(!cfg.isEmpty() ? "\"" : "").
+ a(rmtLogArgs).
+ a(" > ").a(scriptOutputDir).a("/").a(scriptOutputFileName).a(" 2>& 1 &").
+ toString();
+ }
+
+ info("Starting remote node with SSH command: " + startNodeCmd, spec.logger(), log);
+
+ shell(ses, startNodeCmd);
+
+ return new ClusterStartNodeResultImpl(spec.host(), true, null);
+ }
+ catch (IgniteInterruptedCheckedException e) {
+ return new ClusterStartNodeResultImpl(spec.host(), false, e.getMessage());
+ }
+ catch (Exception e) {
+ return new ClusterStartNodeResultImpl(spec.host(), false, X.getFullStackTrace(e));
+ }
+ finally {
+ if (ses != null && ses.isConnected())
+ ses.disconnect();
+ }
+ }
+
+ /**
+ * Executes command using {@code shell} channel.
+ *
+ * @param ses SSH session.
+ * @param cmd Command.
+ * @throws JSchException In case of SSH error.
+ * @throws IOException If IO error occurs.
+ * @throws IgniteInterruptedCheckedException If thread was interrupted while waiting.
+ */
+ private void shell(Session ses, String cmd) throws JSchException, IOException, IgniteInterruptedCheckedException {
+ ChannelShell ch = null;
+
+ try {
+ ch = (ChannelShell)ses.openChannel("shell");
+
+ ch.connect();
+
+ try (PrintStream out = new PrintStream(ch.getOutputStream(), true)) {
+ out.println(cmd);
+
+ U.sleep(1000);
+ }
+ }
+ finally {
+ if (ch != null && ch.isConnected())
+ ch.disconnect();
+ }
+ }
+
+ /**
+ * Checks whether host is running Windows OS.
+ *
+ * @param ses SSH session.
+ * @return Whether host is running Windows OS.
+ * @throws JSchException In case of SSH error.
+ */
+ private boolean isWindows(Session ses) throws JSchException {
+ try {
+ return exec(ses, "cmd.exe") != null;
+ }
+ catch (IOException ignored) {
+ return false;
+ }
+ }
+
+ /**
+ * Gets the value of the specified environment variable.
+ *
+ * @param ses SSH session.
+ * @param name environment variable name.
+ * @param dflt default value.
+ * @return environment variable value.
+ * @throws JSchException In case of SSH error.
+ */
+ private String env(Session ses, String name, String dflt) throws JSchException {
+ try {
+ return exec(ses, "echo " + name);
+ }
+ catch (IOException ignored) {
+ return dflt;
+ }
+ }
+
+ /**
+ * Gets the value of the specified environment variable.
+ *
+ * @param ses SSH session.
+ * @param cmd environment variable name.
+ * @return environment variable value.
+ * @throws JSchException In case of SSH error.
+ * @throws IOException If failed.
+ */
+ private String exec(Session ses, String cmd) throws JSchException, IOException {
+ ChannelExec ch = null;
+
+ try {
+ ch = (ChannelExec)ses.openChannel("exec");
+
+ ch.setCommand(cmd);
+
+ ch.connect();
+
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(ch.getInputStream()))) {
+ return reader.readLine();
+ }
+ }
+ finally {
+ if (ch != null && ch.isConnected())
+ ch.disconnect();
+ }
+ }
+
+ /**
+ * Builds ignite.sh attributes to set up SSH username and password and log directory for started node.
+ *
+ * @param username SSH user name.
+ * @param host Host.
+ * @return {@code ignite.sh} script arguments.
+ */
+ private String buildRemoteLogArguments(String username, String host) {
+ assert username != null;
+ assert host != null;
+
+ SB sb = new SB();
+
+ sb.a(" -J-D").a(IGNITE_SSH_HOST).a("=\"").a(host).a("\"").
+ a(" -J-D").a(IGNITE_SSH_USER_NAME).a("=\"").a(username).a("\"");
+
+ return sb.toString();
+ }
+
+ /**
+ * @param log Logger.
+ * @return This callable for chaining method calls.
+ */
+ public StartNodeCallable setLogger(IgniteLogger log) {
+ this.log = log;
+
+ return this;
+ }
+
+ /**
+ * Log info message to loggers.
+ *
+ * @param msg Message text.
+ * @param loggers Loggers.
+ */
+ private void info(String msg, IgniteLogger... loggers) {
+ for (IgniteLogger logger : loggers)
+ if (logger != null && logger.isInfoEnabled())
+ logger.info(msg);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
index d4c5fc5..7fa5b4b 100644
--- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
+++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.nodestart.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -178,19 +177,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStartOneNode() throws Exception {
joinedLatch = new CountDownLatch(1);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 1;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -208,19 +207,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStartThreeNodes() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, DFLT_TIMEOUT, 1);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -238,19 +237,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStartThreeNodesAndDoEmptyCall() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -279,19 +278,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStartThreeNodesAndTryToStartOneNode() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -320,19 +319,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStartFiveNodesInTwoCalls() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -351,12 +350,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
assert res.size() == 2;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -374,7 +373,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStartFiveWithTwoSpecs() throws Exception {
joinedLatch = new CountDownLatch(5);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
F.asList(map(HOST, SSH_UNAME, pwd, key, 2, U.getIgniteHome(), CFG_NO_ATTR, null),
map(HOST, SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null)),
@@ -382,12 +381,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
assert res.size() == 5;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -405,19 +404,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStartThreeNodesAndRestart() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -437,12 +436,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -465,19 +464,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
script = Paths.get(U.getIgniteHome()).relativize(U.resolveIgnitePath(script).toPath()).toString();
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1, U.getIgniteHome(), null, script),
null, false, 0, 16);
assert res.size() == 1;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -497,19 +496,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStopNodes() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, null, 3, U.getIgniteHome(), CFG_NO_ATTR,
null), null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -532,19 +531,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStopNodesFiltered() throws Exception {
joinedLatch = new CountDownLatch(2);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2, U.getIgniteHome(), CFG_ATTR, null),
null, false, 0, 16);
assert res.size() == 2;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -558,12 +557,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
assert res.size() == 1;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -595,19 +594,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStopNodeById() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -630,19 +629,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStopNodesByIds() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -672,19 +671,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testStopNodesByIdsC() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -709,19 +708,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testRestartNodes() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -746,19 +745,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testRestartNodesFiltered() throws Exception {
joinedLatch = new CountDownLatch(2);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2, U.getIgniteHome(), CFG_ATTR, null),
null, false, 0, 16);
assert res.size() == 2;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -772,12 +771,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
assert res.size() == 1;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -812,19 +811,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testRestartNodeById() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -849,19 +848,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testRestartNodesByIds() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -888,19 +887,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
public void testRestartNodesByIdsC() throws Exception {
joinedLatch = new CountDownLatch(3);
- Collection<GridTuple3<String, Boolean, String>> res =
+ Collection<ClusterStartNodeResult> res =
startNodes(ignite.cluster(),
maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
- F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
- @Override public void apply(GridTuple3<String, Boolean, String> t) {
- assert t.get1().equals(HOST);
+ F.forEach(res, new CI1<ClusterStartNodeResult>() {
+ @Override public void apply(ClusterStartNodeResult t) {
+ assert t.getHostName().equals(HOST);
- if (!t.get2())
- throw new IgniteException(t.get3());
+ if (!t.isSuccess())
+ throw new IgniteException(t.getError());
}
});
@@ -1016,7 +1015,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
* @param maxConn Maximum connections.
* @return Results collection.
*/
- private Collection<GridTuple3<String, Boolean, String>> startNodes(IgniteCluster cluster,
+ private Collection<ClusterStartNodeResult> startNodes(IgniteCluster cluster,
Collection<Map<String, Object>> hosts,
@Nullable Map<String, Object> dflts,
boolean restart,
@@ -1026,6 +1025,6 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
assertNull(cluster.startNodes(hosts, dflts, restart, timeout, maxConn));
- return cluster.<Collection<GridTuple3<String, Boolean, String>>>future().get(WAIT_TIMEOUT);
+ return cluster.<Collection<ClusterStartNodeResult>>future().get(WAIT_TIMEOUT);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
index 65fcb44..6d09eb2 100644
--- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
+++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
@@ -37,3 +37,4 @@ public class IgniteStartStopRestartTestSuite {
return suite;
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
index 5342fc1..a6de108 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
@@ -228,7 +228,7 @@ class VisorStartCommand {
try
res = ignite.cluster.startNodes(file, restart, timeout, maxConn).map(t => {
- Result(t.get1, t.get2, t.get3)
+ Result(t.getHostName, t.isSuccess, t.getError)
}).toSeq
catch {
case e: IgniteException => scold(e.getMessage).^^
@@ -284,7 +284,7 @@ class VisorStartCommand {
try
res = ignite.cluster.startNodes(asJavaCollection(Seq(params)), null, restart, timeout, maxConn).
- map(t => Result(t.get1, t.get2, t.get3)).toSeq
+ map(t => Result(t.getHostName, t.isSuccess, t.getError)).toSeq
catch {
case e: IgniteException => scold(e.getMessage).^^
case _: RejectedExecutionException => scold("Failed due to system error.").^^
[28/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-694
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9eb3fceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9eb3fceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9eb3fceb
Branch: refs/heads/ignite-694
Commit: 9eb3fceb17d7ef0e11370f0de65ad641860a8b53
Parents: 32aa57c 3e6da9c
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 10:13:17 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 10:13:17 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 11 +
.../java/org/apache/ignite/IgniteCluster.java | 9 +-
.../ignite/cluster/ClusterStartNodeResult.java | 46 +
.../ignite/internal/ClusterMetricsSnapshot.java | 384 +++------
.../apache/ignite/internal/IgniteKernal.java | 30 +-
.../cluster/ClusterStartNodeResultImpl.java | 87 ++
.../cluster/IgniteClusterAsyncImpl.java | 5 +-
.../internal/cluster/IgniteClusterImpl.java | 37 +-
.../cache/DynamicCacheChangeRequest.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 130 +--
.../ignite/internal/util/lang/GridFunc.java | 33 +
.../util/nodestart/IgniteNodeCallable.java | 30 -
.../util/nodestart/IgniteSshHelper.java | 2 +-
.../util/nodestart/StartNodeCallable.java | 30 +
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 +-
.../TcpDiscoveryCheckFailedMessage.java | 24 +-
.../TcpDiscoveryClientReconnectMessage.java | 30 +-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-
.../messages/TcpDiscoveryHandshakeRequest.java | 8 -
.../messages/TcpDiscoveryHandshakeResponse.java | 22 -
.../messages/TcpDiscoveryHeartbeatMessage.java | 44 +-
.../TcpDiscoveryJoinRequestMessage.java | 28 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 60 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +-
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -
.../TcpDiscoveryStatusCheckMessage.java | 30 +-
...teCacheConfigurationDefaultTemplateTest.java | 111 +++
...eCacheConfigurationTemplateNotFoundTest.java | 114 ---
.../IgniteCacheConfigurationTemplateTest.java | 86 +-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +-
.../processors/query/h2/sql/GridSqlElement.java | 8 -
.../processors/query/h2/sql/GridSqlQuery.java | 183 ++++
.../query/h2/sql/GridSqlQueryParser.java | 97 ++-
.../query/h2/sql/GridSqlQuerySplitter.java | 111 ++-
.../processors/query/h2/sql/GridSqlSelect.java | 209 ++---
.../query/h2/sql/GridSqlSubquery.java | 8 +-
.../processors/query/h2/sql/GridSqlUnion.java | 134 +++
.../h2/sql/AbstractH2CompareQueryTest.java | 341 ++++++++
.../query/h2/sql/BaseH2CompareQueryTest.java | 823 ++++++++++++++++++
.../query/h2/sql/GridQueryParsingTest.java | 26 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 707 +++++++++++++++
.../query/h2/sql/IgniteVsH2QueryTest.java | 860 -------------------
.../IgniteCacheQuerySelfTestSuite.java | 5 +-
.../processors/query/h2/sql/bigQuery.sql | 55 ++
.../org/apache/ignite/IgniteSpringBean.java | 7 +
.../util/nodestart/IgniteNodeCallableImpl.java | 308 -------
.../util/nodestart/IgniteSshHelperImpl.java | 4 +-
.../util/nodestart/StartNodeCallableImpl.java | 309 +++++++
...gniteProjectionStartStopRestartSelfTest.java | 261 +++---
.../IgniteStartStopRestartTestSuite.java | 1 +
.../commands/start/VisorStartCommand.scala | 4 +-
59 files changed, 3636 insertions(+), 2472 deletions(-)
----------------------------------------------------------------------
[08/28] incubator-ignite git commit: # IGNITE-30 Make
TcpDiscoveryAbstractMessage Serializable instead of Externalizable.
Posted by sb...@apache.org.
# IGNITE-30 Make TcpDiscoveryAbstractMessage Serializable instead of Externalizable.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e55e2dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e55e2dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e55e2dc
Branch: refs/heads/ignite-694
Commit: 1e55e2dc1a7e5be44697f9c4c78d32e25de6928f
Parents: 5f2d8c2
Author: sevdokimov <se...@gridgain.com>
Authored: Tue Apr 7 14:41:49 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue Apr 7 14:41:49 2015 +0300
----------------------------------------------------------------------
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-------
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 ++++----
.../TcpDiscoveryCheckFailedMessage.java | 24 +-------
.../TcpDiscoveryClientReconnectMessage.java | 30 +---------
.../TcpDiscoveryCustomEventMessage.java | 23 +-------
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-------
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-------
.../messages/TcpDiscoveryHandshakeRequest.java | 8 ---
.../messages/TcpDiscoveryHandshakeResponse.java | 22 -------
.../messages/TcpDiscoveryHeartbeatMessage.java | 44 +-------------
.../TcpDiscoveryJoinRequestMessage.java | 28 +--------
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +--------
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-------
.../messages/TcpDiscoveryNodeAddedMessage.java | 60 +-------------------
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +--------
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 ---
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-------
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -----
.../TcpDiscoveryStatusCheckMessage.java | 30 +---------
19 files changed, 33 insertions(+), 460 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
index 09c7522..1a00359 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
@@ -27,7 +27,7 @@ import java.util.*;
/**
* Base class to implement discovery messages.
*/
-public abstract class TcpDiscoveryAbstractMessage implements Externalizable {
+public abstract class TcpDiscoveryAbstractMessage implements Serializable {
/** */
private static final long serialVersionUID = 0L;
@@ -41,7 +41,7 @@ public abstract class TcpDiscoveryAbstractMessage implements Externalizable {
protected static final int CLIENT_RECON_SUCCESS_FLAG_POS = 2;
/** Sender of the message (transient). */
- private UUID senderNodeId;
+ private transient UUID senderNodeId;
/** Message ID. */
private IgniteUuid id;
@@ -233,26 +233,6 @@ public abstract class TcpDiscoveryAbstractMessage implements Externalizable {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, id);
- U.writeUuid(out, verifierNodeId);
- out.writeLong(topVer);
- U.writeUuid(out, destClientNodeId);
- out.writeInt(flags);
- out.writeShort(pendingIdx);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- id = U.readGridUuid(in);
- verifierNodeId = U.readUuid(in);
- topVer = in.readLong();
- destClientNodeId = U.readUuid(in);
- flags = in.readInt();
- pendingIdx = in.readShort();
- }
-
- /** {@inheritDoc} */
@Override public final boolean equals(Object obj) {
if (this == obj)
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
index 2d20be9..0eb3df0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
@@ -31,14 +31,7 @@ public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/** Coordinator address. */
- private InetAddress addr;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryAuthFailedMessage() {
- // No-op.
- }
+ private transient InetAddress addr;
/**
* Constructor.
@@ -59,16 +52,20 @@ public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage {
return addr;
}
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
+ /**
+ * Serialize this message.
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ out.defaultWriteObject();
U.writeByteArray(out, addr.getAddress());
}
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
+ /**
+ * Deserialize this message.
+ */
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ in.defaultReadObject();
addr = InetAddress.getByAddress(U.readByteArray(in));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
index d35bffb..0905c58 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -30,14 +29,7 @@ public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** Coordinator version. */
- private String err;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryCheckFailedMessage() {
- // No-op.
- }
+ private final String err;
/**
* Constructor.
@@ -59,20 +51,6 @@ public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- U.writeString(out, err);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- err = U.readString(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryCheckFailedMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
index db68ae3..86aee1a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
@@ -21,7 +21,6 @@ import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import java.io.*;
import java.util.*;
/**
@@ -32,23 +31,16 @@ public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMess
private static final long serialVersionUID = 0L;
/** New router nodeID. */
- private UUID routerNodeId;
+ private final UUID routerNodeId;
/** Last message ID. */
- private IgniteUuid lastMsgId;
+ private final IgniteUuid lastMsgId;
/** Pending messages. */
@GridToStringExclude
private Collection<TcpDiscoveryAbstractMessage> msgs;
/**
- * For {@link Externalizable}.
- */
- public TcpDiscoveryClientReconnectMessage() {
- // No-op.
- }
-
- /**
* @param creatorNodeId Creator node ID.
* @param routerNodeId New router node ID.
* @param lastMsgId Last message ID.
@@ -103,24 +95,6 @@ public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMess
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- U.writeUuid(out, routerNodeId);
- U.writeGridUuid(out, lastMsgId);
- U.writeCollection(out, msgs);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- routerNodeId = U.readUuid(in);
- lastMsgId = U.readGridUuid(in);
- msgs = U.readCollection(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryClientReconnectMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index b0c7400..234efaa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -29,14 +29,7 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** */
- private Serializable msg;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryCustomEventMessage() {
- // No-op.
- }
+ private final Serializable msg;
/**
* @param creatorNodeId Creator node id.
@@ -53,18 +46,4 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
public Serializable message() {
return msg;
}
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeObject(msg);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- msg = (Serializable)in.readObject();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
index 1989038..9510b9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import java.io.*;
import java.util.*;
/**
@@ -32,14 +31,7 @@ public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/** ID of the message to discard (this and all preceding). */
- private IgniteUuid msgId;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryDiscardMessage() {
- // No-op.
- }
+ private final IgniteUuid msgId;
/**
* Constructor.
@@ -63,20 +55,6 @@ public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- U.writeGridUuid(out, msgId);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- msgId = U.readGridUuid(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryDiscardMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
index fcf9f00..978acb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.discovery.tcp.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -32,14 +31,7 @@ public class TcpDiscoveryDuplicateIdMessage extends TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** Node with duplicate ID. */
- private TcpDiscoveryNode node;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryDuplicateIdMessage() {
- // No-op.
- }
+ private final TcpDiscoveryNode node;
/**
* Constructor.
@@ -63,20 +55,6 @@ public class TcpDiscoveryDuplicateIdMessage extends TcpDiscoveryAbstractMessage
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeObject(node);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- node = (TcpDiscoveryNode)in.readObject();
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryDuplicateIdMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
index 6debe77..99f919b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -30,13 +29,6 @@ public class TcpDiscoveryHandshakeRequest extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryHandshakeRequest() {
- // No-op.
- }
-
- /**
* Constructor.
*
* @param creatorNodeId Creator node ID.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
index f110d06..5c2f798 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -33,13 +32,6 @@ public class TcpDiscoveryHandshakeResponse extends TcpDiscoveryAbstractMessage {
private long order;
/**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryHandshakeResponse() {
- // No-op.
- }
-
- /**
* Constructor.
*
* @param creatorNodeId Creator node ID.
@@ -70,20 +62,6 @@ public class TcpDiscoveryHandshakeResponse extends TcpDiscoveryAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeLong(order);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- order = in.readLong();
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryHandshakeResponse.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
index 65eea9f..8b07ba4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
@@ -47,17 +47,10 @@ public class TcpDiscoveryHeartbeatMessage extends TcpDiscoveryAbstractMessage {
/** Map to store nodes metrics. */
@GridToStringExclude
- private Map<UUID, MetricsSet> metrics;
+ private final Map<UUID, MetricsSet> metrics = new HashMap<>();
/** Client node IDs. */
- private Collection<UUID> clientNodeIds;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryHeartbeatMessage() {
- // No-op.
- }
+ private final Collection<UUID> clientNodeIds = new HashSet<>();
/**
* Constructor.
@@ -66,9 +59,6 @@ public class TcpDiscoveryHeartbeatMessage extends TcpDiscoveryAbstractMessage {
*/
public TcpDiscoveryHeartbeatMessage(UUID creatorNodeId) {
super(creatorNodeId);
-
- metrics = U.newHashMap(1);
- clientNodeIds = new HashSet<>();
}
/**
@@ -156,36 +146,6 @@ public class TcpDiscoveryHeartbeatMessage extends TcpDiscoveryAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeInt(metrics.size());
-
- if (!metrics.isEmpty()) {
- for (Map.Entry<UUID, MetricsSet> e : metrics.entrySet()) {
- U.writeUuid(out, e.getKey());
- out.writeObject(e.getValue());
- }
- }
-
- U.writeCollection(out, clientNodeIds);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- int metricsSize = in.readInt();
-
- metrics = U.newHashMap(metricsSize);
-
- for (int i = 0; i < metricsSize; i++)
- metrics.put(U.readUuid(in), (MetricsSet)in.readObject());
-
- clientNodeIds = U.readCollection(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryHeartbeatMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
index e267a29..5e6b892 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.discovery.tcp.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -32,17 +31,10 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** New node that wants to join the topology. */
- private TcpDiscoveryNode node;
+ private final TcpDiscoveryNode node;
/** Discovery data. */
- private Map<Integer, Object> discoData;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryJoinRequestMessage() {
- // No-op.
- }
+ private final Map<Integer, Object> discoData;
/**
* Constructor.
@@ -88,22 +80,6 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeObject(node);
- U.writeMap(out, discoData);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- node = (TcpDiscoveryNode)in.readObject();
- discoData = U.readMap(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryJoinRequestMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
index fb2c2f3..c8bed37 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -31,17 +30,10 @@ public class TcpDiscoveryLoopbackProblemMessage extends TcpDiscoveryAbstractMess
private static final long serialVersionUID = 0L;
/** Remote node addresses. */
- private Collection<String> addrs;
+ private final Collection<String> addrs;
/** Remote node host names. */
- private Collection<String> hostNames;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryLoopbackProblemMessage() {
- // No-op.
- }
+ private final Collection<String> hostNames;
/**
* Constructor.
@@ -73,22 +65,6 @@ public class TcpDiscoveryLoopbackProblemMessage extends TcpDiscoveryAbstractMess
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- U.writeCollection(out, addrs);
- U.writeCollection(out, hostNames);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- addrs = U.readCollection(in);
- hostNames = U.readCollection(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
index f536b9e..5a71eb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -32,14 +31,7 @@ public class TcpDiscoveryNodeAddFinishedMessage extends TcpDiscoveryAbstractMess
private static final long serialVersionUID = 0L;
/** Added node ID. */
- private UUID nodeId;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryNodeAddFinishedMessage() {
- // No-op.
- }
+ private final UUID nodeId;
/**
* Constructor.
@@ -63,20 +55,6 @@ public class TcpDiscoveryNodeAddFinishedMessage extends TcpDiscoveryAbstractMess
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- U.writeUuid(out, nodeId);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- nodeId = U.readUuid(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryNodeAddFinishedMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
index b870495..7b1704e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
@@ -24,7 +24,6 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.tcp.internal.*;
import org.jetbrains.annotations.*;
-import java.io.*;
import java.util.*;
/**
@@ -39,7 +38,7 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/** Added node. */
- private TcpDiscoveryNode node;
+ private final TcpDiscoveryNode node;
/** Pending messages from previous node. */
private Collection<TcpDiscoveryAbstractMessage> msgs;
@@ -61,14 +60,7 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage {
private Map<UUID, Map<Integer, Object>> oldNodesDiscoData;
/** Start time of the first grid node. */
- private long gridStartTime;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryNodeAddedMessage() {
- // No-op.
- }
+ private final long gridStartTime;
/**
* Constructor.
@@ -208,54 +200,6 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeObject(node);
- U.writeCollection(out, msgs);
- U.writeGridUuid(out, discardMsgId);
- U.writeCollection(out, top);
- U.writeMap(out, topHist);
- out.writeLong(gridStartTime);
- U.writeMap(out, newNodeDiscoData);
-
- out.writeInt(oldNodesDiscoData != null ? oldNodesDiscoData.size() : -1);
-
- if (oldNodesDiscoData != null) {
- for (Map.Entry<UUID, Map<Integer, Object>> entry : oldNodesDiscoData.entrySet()) {
- U.writeUuid(out, entry.getKey());
-
- U.writeMap(out, entry.getValue());
- }
- }
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- node = (TcpDiscoveryNode)in.readObject();
- msgs = U.readCollection(in);
- discardMsgId = U.readGridUuid(in);
- top = U.readCollection(in);
- topHist = U.readTreeMap(in);
- gridStartTime = in.readLong();
- newNodeDiscoData = U.readMap(in);
-
- int oldNodesDiscoDataSize = in.readInt();
-
- if (oldNodesDiscoDataSize >= 0) {
- oldNodesDiscoData = new LinkedHashMap<>(oldNodesDiscoDataSize);
-
- for (int i = 0; i < oldNodesDiscoDataSize; i++) {
- UUID nodeId = U.readUuid(in);
-
- oldNodesDiscoData.put(nodeId, U.<Integer, Object>readMap(in));
- }
- }
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryNodeAddedMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
index 8fe7fbe..8cb8414 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -33,17 +32,10 @@ public class TcpDiscoveryNodeFailedMessage extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/** ID of the failed node. */
- private UUID failedNodeId;
+ private final UUID failedNodeId;
/** Internal order of the failed node. */
- private long order;
-
- /**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryNodeFailedMessage() {
- // No-op.
- }
+ private final long order;
/**
* Constructor.
@@ -79,22 +71,6 @@ public class TcpDiscoveryNodeFailedMessage extends TcpDiscoveryAbstractMessage {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- U.writeUuid(out, failedNodeId);
- out.writeLong(order);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- failedNodeId = U.readUuid(in);
- order = in.readLong();
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryNodeFailedMessage.class, this, "super", super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
index 0217385..3c2a7ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -33,13 +32,6 @@ public class TcpDiscoveryNodeLeftMessage extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryNodeLeftMessage() {
- // No-op.
- }
-
- /**
* Constructor.
*
* @param creatorNodeId ID of the node that is about to leave the topology.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
index c42a2ee..de5b0a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
@@ -17,10 +17,8 @@
package org.apache.ignite.spi.discovery.tcp.messages;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
-import java.io.*;
import java.util.*;
/**
@@ -31,14 +29,7 @@ public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/** Pinged client node ID. */
- private UUID clientNodeId;
-
- /**
- * For {@link Externalizable}.
- */
- public TcpDiscoveryPingRequest() {
- // No-op.
- }
+ private final UUID clientNodeId;
/**
* @param creatorNodeId Creator node ID.
@@ -56,18 +47,4 @@ public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage {
@Nullable public UUID clientNodeId() {
return clientNodeId;
}
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- U.writeUuid(out, clientNodeId);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- clientNodeId = U.readUuid(in);
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
index 0f7713f..6396764 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
@@ -57,18 +57,4 @@ public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage {
public boolean clientExists() {
return clientExists;
}
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeBoolean(clientExists);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- clientExists = in.readBoolean();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e55e2dc/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
index 4c0db2f..bec7093 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.discovery.tcp.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -42,22 +41,15 @@ public class TcpDiscoveryStatusCheckMessage extends TcpDiscoveryAbstractMessage
public static final int STATUS_RECON = 2;
/** Creator node. */
- private TcpDiscoveryNode creatorNode;
+ private final TcpDiscoveryNode creatorNode;
/** Failed node id. */
- private UUID failedNodeId;
+ private final UUID failedNodeId;
/** Creator node status (initialized by coordinator). */
private int status;
/**
- * Public default no-arg constructor for {@link Externalizable} interface.
- */
- public TcpDiscoveryStatusCheckMessage() {
- // No-op.
- }
-
- /**
* Constructor.
*
* @param creatorNode Creator node.
@@ -107,24 +99,6 @@ public class TcpDiscoveryStatusCheckMessage extends TcpDiscoveryAbstractMessage
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
-
- out.writeObject(creatorNode);
- U.writeUuid(out, failedNodeId);
- out.writeInt(status);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
-
- creatorNode = (TcpDiscoveryNode)in.readObject();
- failedNodeId = U.readUuid(in);
- status = in.readInt();
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryStatusCheckMessage.class, this, "super", super.toString());
}
[18/28] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71439bc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71439bc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71439bc0
Branch: refs/heads/ignite-694
Commit: 71439bc0e5040b9df0b3e27e5632133049bc4432
Parents: c2c4da4 5e9addb
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:37:41 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:37:41 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 7 +-
.../org/apache/ignite/internal/IgnitionEx.java | 171 +++-----
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../cache/VisorCacheAggregatedMetrics.java | 38 +-
.../visor/cache/VisorCacheConfiguration.java | 17 +-
.../internal/visor/cache/VisorCacheMetrics.java | 53 ++-
.../cache/VisorCacheMetricsCollectorTask.java | 59 ++-
.../visor/cache/VisorCacheStopTask.java | 69 +++
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../commands/cache/VisorCacheCommand.scala | 423 +++++++++++--------
.../commands/cache/VisorCacheStopCommand.scala | 145 +++++++
11 files changed, 653 insertions(+), 333 deletions(-)
----------------------------------------------------------------------
[17/28] incubator-ignite git commit: ignite-624 - minor2
Posted by sb...@apache.org.
ignite-624 - minor2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2c4da48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2c4da48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2c4da48
Branch: refs/heads/ignite-694
Commit: c2c4da48a9ebaf5d41e61bb006e9d590edcd5f8b
Parents: ab2fe77
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:33:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:33:23 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/h2/sql/GridSqlSelect.java | 3 +++
.../ignite/internal/processors/query/h2/sql/GridSqlUnion.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index dadba7c..0786eac 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -148,6 +148,9 @@ public class GridSqlSelect extends GridSqlQuery {
* @param expression Expression.
*/
public void setSelectExpression(int colIdx, GridSqlElement expression) {
+ if (expression == null)
+ throw new NullPointerException();
+
if (colIdx < select.size()) // Assuming that all the needed expressions were already added.
select.set(colIdx, expression);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index dcc2c84..23c18ed 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -42,7 +42,7 @@ public class GridSqlUnion extends GridSqlQuery {
/** {@inheritDoc} */
@Override protected GridSqlElement expression(int col) {
- return null;
+ throw new IllegalStateException();
}
/** {@inheritDoc} */
[11/28] incubator-ignite git commit: ignite-624 - fix
Posted by sb...@apache.org.
ignite-624 - fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf1cf9d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf1cf9d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf1cf9d0
Branch: refs/heads/ignite-694
Commit: cf1cf9d00788482abe89feeb39746f24035fc53b
Parents: 3daa0b6
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 01:20:07 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 01:20:07 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/lang/GridFunc.java | 14 ++++
.../processors/query/h2/sql/GridSqlElement.java | 8 ---
.../processors/query/h2/sql/GridSqlQuery.java | 26 +++++--
.../query/h2/sql/GridSqlQueryParser.java | 7 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 25 ++++---
.../processors/query/h2/sql/GridSqlSelect.java | 73 +++++++++++++-------
.../processors/query/h2/sql/GridSqlUnion.java | 10 +++
.../query/h2/sql/GridQueryParsingTest.java | 6 +-
.../query/h2/sql/IgniteVsH2QueryTest.java | 17 ++++-
9 files changed, 131 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index edd66d7..773b9ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5429,6 +5429,20 @@ public class GridFunc {
}
/**
+ * @param c Target collection.
+ * @param it Iterator to fetch.
+ * @return Modified target collection.
+ */
+ public static <T, C extends Collection<T>> C addAll(C c, Iterator<? extends T> it) {
+ if (it != null) {
+ while (it.hasNext())
+ c.add(it.next());
+ }
+
+ return c;
+ }
+
+ /**
* Gets the value with given key. If that value does not exist, calls given
* closure to get the default value, puts it into the map and returns it. If
* closure is {@code null} return {@code null}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
index 7ebdba1..a1c91ff 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java
@@ -51,14 +51,6 @@ public abstract class GridSqlElement implements Cloneable, Iterable<GridSqlEleme
public abstract String getSQL();
/**
- * Clears all children.
- */
- public void clearChildren() {
- if (size() != 0)
- children = new ArrayList<>();
- }
-
- /**
* @param expr Expr.
* @return {@code this}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
index 5953d5e..c40632f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.query.h2.sql;
-import org.apache.ignite.*;
import org.h2.util.*;
import java.util.*;
@@ -107,12 +106,25 @@ public abstract class GridSqlQuery implements Cloneable {
}
/**
+ * @return Number of visible columns.
+ */
+ protected abstract int visibleColumns();
+
+ /**
+ * @param col Column index.
+ * @return Expression for column index.
+ */
+ protected abstract GridSqlElement expression(int col);
+
+ /**
* @param buff Statement builder.
*/
protected void getSortLimitSQL(StatementBuilder buff) {
if (!sort.isEmpty()) {
buff.append("\nORDER BY ");
+ int visibleCols = visibleColumns();
+
boolean first = true;
for (GridSqlSortColumn col : sort) {
@@ -123,11 +135,17 @@ public abstract class GridSqlQuery implements Cloneable {
int idx = col.column();
- if (idx >= 0)
+ assert idx >= 0 : idx;
+
+ if (idx < visibleCols)
buff.append(idx + 1);
else {
- throw new IgniteException("Failed to generate query: " + buff);
-// buff.append('=').append(StringUtils.unEnclose(entry.getKey().getSQL()));
+ GridSqlElement expr = expression(idx);
+
+ if (expr == null) // For plain select should never be null, for union H2 itself can't parse query.
+ throw new IllegalStateException("Failed to build query: " + buff.toString());
+
+ buff.append('=').append(StringUtils.unEnclose(expr.getSQL()));
}
if (!col.asc())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index ea3628f..b174d71 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -270,8 +270,8 @@ public class GridSqlQueryParser {
ArrayList<Expression> expressions = select.getExpressions();
- for (Expression exp : expressions)
- res.addExpression(parseExpression(exp));
+ for (int i = 0; i < expressions.size(); i++)
+ res.addSelectExpression(parseExpression(expressions.get(i)), i < select.getColumnCount());
int[] grpIdx = GROUP_INDEXES.get(select);
@@ -290,9 +290,6 @@ public class GridSqlQueryParser {
res.having(parseExpression(expressions.get(havingIdx)));
}
- for (int i = 0; i < select.getColumnCount(); i++)
- res.addSelectExpression(parseExpression(expressions.get(i)));
-
processSortOrder(select.getSortOrder(), res);
res.limit(parseExpression(select.getLimit()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 05928c2..b84084b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.query.h2.sql;
import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.h2.jdbc.*;
import org.h2.value.*;
import org.jetbrains.annotations.*;
@@ -89,7 +90,7 @@ public class GridSqlQuerySplitter {
int c = 0;
- for (GridSqlElement expr : left.select()) {
+ for (GridSqlElement expr : left.select(true)) {
String colName;
if (expr instanceof GridSqlAlias)
@@ -102,11 +103,12 @@ public class GridSqlQuerySplitter {
expr = alias(colName, expr);
// Set generated alias to the expression.
- left.select().set(c, expr);
- left.allExpressions().set(c, expr);
+ left.setSelectExpression(c, expr);
}
- srcQry.addSelectExpression(column(colName));
+ GridSqlColumn col = column(colName);
+
+ srcQry.addSelectExpression(col, true);
qry0.sort();
@@ -126,8 +128,8 @@ public class GridSqlQuerySplitter {
GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = new ArrayList<>(srcQry.allExpressions());
- GridSqlElement[] rdcExps = new GridSqlElement[srcQry.select().size()];
+ List<GridSqlElement> mapExps = F.addAll(new ArrayList<GridSqlElement>(), srcQry.select(false).iterator());
+ GridSqlElement[] rdcExps = new GridSqlElement[srcQry.visibleColumns()];
Set<String> colNames = new HashSet<>();
@@ -140,13 +142,13 @@ public class GridSqlQuerySplitter {
mapQry.clearSelect();
for (GridSqlElement exp : mapExps)
- mapQry.addSelectExpression(exp);
+ mapQry.addSelectExpression(exp, true);
for (GridSqlElement rdcExp : rdcExps)
- rdcQry.addSelectExpression(rdcExp);
+ rdcQry.addSelectExpression(rdcExp, true);
// -- GROUP BY
- if (!srcQry.groups().isEmpty()) {
+ if (srcQry.hasGroupBy()) {
mapQry.clearGroups();
for (int col : srcQry.groupColumns())
@@ -219,6 +221,9 @@ public class GridSqlQuerySplitter {
findParams(union.left(), params, target);
findParams(union.right(), params, target);
+ findParams(qry.limit(), params, target);
+ findParams(qry.offset(), params, target);
+
return target;
}
@@ -232,7 +237,7 @@ public class GridSqlQuerySplitter {
if (params.length == 0)
return target;
- for (GridSqlElement el : qry.allExpressions())
+ for (GridSqlElement el : qry.select(false))
findParams(el, params, target);
findParams(qry.from(), params, target);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index 154659b..398ae10 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -26,7 +26,7 @@ import java.util.*;
*/
public class GridSqlSelect extends GridSqlQuery {
/** */
- private List<GridSqlElement> allExprs;
+ private List<GridSqlElement> allExprs = new ArrayList<>();
/** */
private List<GridSqlElement> select = new ArrayList<>();
@@ -50,6 +50,16 @@ public class GridSqlSelect extends GridSqlQuery {
private int havingCol = -1;
/** {@inheritDoc} */
+ @Override public int visibleColumns() {
+ return select.size();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected GridSqlElement expression(int col) {
+ return allExprs.get(col);
+ }
+
+ /** {@inheritDoc} */
@Override public String getSQL() {
StatementBuilder buff = new StatementBuilder("SELECT");
@@ -91,27 +101,11 @@ public class GridSqlSelect extends GridSqlQuery {
}
/**
- * @param expression Expression.
- */
- public void addExpression(GridSqlElement expression) {
- if (allExprs == null)
- allExprs = new ArrayList<>();
-
- allExprs.add(expression);
- }
-
- /**
- * @return All expressions in select, group by, order by.
- */
- public List<GridSqlElement> allExpressions() {
- return allExprs;
- }
-
- /**
- * @return Expressions.
+ * @param visibleOnly If only visible expressions needed.
+ * @return Select phrase expressions.
*/
- public List<GridSqlElement> select() {
- return select;
+ public Iterable<GridSqlElement> select(boolean visibleOnly) {
+ return visibleOnly ? select : allExprs;
}
/**
@@ -119,26 +113,55 @@ public class GridSqlSelect extends GridSqlQuery {
*/
public void clearSelect() {
select = new ArrayList<>();
+ allExprs = new ArrayList<>();
}
/**
* @param expression Expression.
+ * @param visible Expression is visible in select phrase.
*/
- public void addSelectExpression(GridSqlElement expression) {
+ public void addSelectExpression(GridSqlElement expression, boolean visible) {
if (expression == null)
throw new NullPointerException();
- select.add(expression);
+ if (visible) {
+ if (select.size() != allExprs.size())
+ throw new IllegalStateException("Already started adding invisible columns.");
+
+ select.add(expression);
+ }
+ else if (select.isEmpty())
+ throw new IllegalStateException("No visible columns.");
+
+ allExprs.add(expression);
+ }
+
+ /**
+ * @param colIdx Column index.
+ * @param expression Expression.
+ */
+ public void setSelectExpression(int colIdx, GridSqlElement expression) {
+ if (colIdx < select.size()) // Assuming that all the needed expressions were already added.
+ select.set(colIdx, expression);
+
+ allExprs.set(colIdx, expression);
}
/**
* @return Expressions.
*/
- public List<GridSqlElement> groups() {
+ public Iterable<GridSqlElement> groups() {
return groups;
}
/**
+ * @return {@code true} If the select has group by expression.
+ */
+ public boolean hasGroupBy() {
+ return !groups.isEmpty();
+ }
+
+ /**
*
*/
public void clearGroups() {
@@ -252,7 +275,7 @@ public class GridSqlSelect extends GridSqlQuery {
res.groups = new ArrayList<>(groups);
res.grpCols = grpCols == null ? null : grpCols.clone();
res.select = new ArrayList<>(select);
- res.allExprs = null;
+ res.allExprs = new ArrayList<>(allExprs);
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index 6fe3f19..90d9e41 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -36,6 +36,16 @@ public class GridSqlUnion extends GridSqlQuery {
private GridSqlQuery left;
/** {@inheritDoc} */
+ @Override protected int visibleColumns() {
+ return left.visibleColumns();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected GridSqlElement expression(int col) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
@Override public String getSQL() {
StatementBuilder buff = new StatementBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 83162f0..66ba6ac 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -208,6 +208,8 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select name from Person UNION select street from Address limit ?");
checkQuery("select name from Person UNION select street from Address limit ? offset ?");
checkQuery("(select name from Person limit 4) UNION (select street from Address limit 1) limit ? offset ?");
+ checkQuery("(select 2 a) union all (select 1) order by 1");
+ checkQuery("(select 2 a) union all (select 1) order by a desc nulls first limit ? offset ?");
}
/**
@@ -282,9 +284,9 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
else
throw new UnsupportedOperationException();
- assertSqlEquals(prepared.getPlanSQL(), res);
-
System.out.println(normalizeSql(res));
+
+ assertSqlEquals(prepared.getPlanSQL(), res);
}
@QuerySqlFunction
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf1cf9d0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
index 1f4771a..5da72b4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
@@ -526,7 +526,7 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testSimpleReplSelect() throws Exception {
+ public void _testSimpleReplSelect() throws Exception {
compareQueryRes0("select id, name, price from \"repl\".Product");
}
@@ -555,6 +555,21 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
}
/**
+ *
+ */
+ public void testUnion() throws SQLException {
+ String base = "select _val v from \"part\".Person";
+
+ compareQueryRes0(base + " union all " + base);
+ compareQueryRes0(base + " union " + base);
+
+ base = "select firstName||lastName name, salary from \"part\".Person";
+
+ assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
+ assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
+ }
+
+ /**
* @throws Exception If failed.
*/
public void testEmptyResult() throws Exception {
[04/28] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Conflicts:
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e7f8a4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e7f8a4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e7f8a4b
Branch: refs/heads/ignite-694
Commit: 9e7f8a4b81174ed1f048d3f19be37d9b5e4f81c6
Parents: 0e89dde 7e6d193
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 17:52:26 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 17:52:26 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
assembly/release-fabric.xml | 5 -
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
modules/clients/readme.md | 2 -
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 -
.../apache/ignite/internal/IgniteKernal.java | 27 +--
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/CacheDistributionMode.java | 67 -------
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 195 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../DiscoveryNodeValidationProcessor.java | 27 +++
.../OsDiscoveryNodeValidationProcessor.java | 72 +++++++
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 12 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../internal/visor/util/VisorTaskUtils.java | 18 +-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../ignite/spi/IgniteNodeValidationResult.java | 66 +++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 -------
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 113 +----------
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 ++---
.../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++
.../IgniteCollectionAbstractTest.java | 23 ---
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 +++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../testframework/GridSpiTestContext.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
.../query/h2/sql/GridSqlQuerySplitter.java | 24 ++-
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 14 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 ++-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
parent/pom.xml | 50 ++---
pom.xml | 94 ++++++++-
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 ++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
90 files changed, 1613 insertions(+), 706 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e7f8a4b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index e98169c,b3deea3..f343b01
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@@ -115,20 -111,27 +117,27 @@@ public class GridSqlQuerySplitter
}
// -- ORDER BY
- if (!srcQry.sort().isEmpty()) {
+ if (!srcSelect.sort().isEmpty()) {
+ if (aggregateFound) // Ordering over aggregates does not make sense.
+ mapQry.clearSort(); // Otherwise map sort will be used by offset-limit.
+
- for (GridSqlSortColumn sortCol : srcQry.sort().values())
+ for (GridSqlSortColumn sortCol : srcSelect.sort().values())
rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol);
}
// -- LIMIT
- if (srcSelect.limit() != null)
- rdcQry.limit(srcSelect.limit());
+ if (srcQry.limit() != null) {
+ if (aggregateFound)
+ mapQry.limit(null);
+
+ rdcQry.limit(srcQry.limit());
+ }
// -- OFFSET
- if (srcQry.offset() != null) {
+ if (srcSelect.offset() != null) {
mapQry.offset(null);
- rdcQry.offset(srcQry.offset());
+ rdcQry.offset(srcSelect.offset());
}
// -- DISTINCT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e7f8a4b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
[16/28] incubator-ignite git commit: ignite-624 - minor
Posted by sb...@apache.org.
ignite-624 - minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab2fe776
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab2fe776
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab2fe776
Branch: refs/heads/ignite-694
Commit: ab2fe77642294b9cfb432ed43ad41bf320503839
Parents: e0d88d3
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:28:24 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:28:24 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/util/lang/GridFunc.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab2fe776/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index fee53ef..c7574f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5433,8 +5433,18 @@ public class GridFunc {
* @param it Iterable to fetch.
* @return Modified target collection.
*/
+ @SuppressWarnings("unchecked")
public static <T, C extends Collection<T>> C addAll(C c, Iterable<? extends T> it) {
- return it == null ? c : addAll(c, it.iterator());
+ if (it == null)
+ return c;
+
+ if (it instanceof Collection<?>) {
+ c.addAll((Collection<? extends T>)it);
+
+ return c;
+ }
+
+ return addAll(c, it.iterator());
}
/**