Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-454
Conflicts:
examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.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/591b3656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/591b3656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/591b3656
Branch: refs/heads/ignite-454
Commit: 591b365638309a57e52a06a67328c7d4f6c5b3b8
Parents: 503faef
Author: avinogradov <avinogra...@gridgain.com>
Authored: Wed Mar 18 19:29:05 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Wed Mar 18 19:29:05 2015 +0300
----------------------------------------------------------------------
.../internal/processors/query/h2/sql/GridSqlQueryParser.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/591b3656/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 2e2f9c3..a72ddf4 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
@@ -495,8 +495,8 @@ public class GridSqlQueryParser {
return res;
}
- if (expression instanceof Parameter)
- return new GridSqlParameter(((Parameter)expression).getIndex());
+ if (expression instanceof org.h2.expression.Parameter)
+ return new
GridSqlParameter(((org.h2.expression.Parameter)expression).getIndex());
if (expression instanceof Aggregate) {
GridSqlAggregateFunction res = new
GridSqlAggregateFunction(DISTINCT.get((Aggregate)expression),
