Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-432
Conflicts:
modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.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/7a274d38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a274d38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a274d38
Branch: refs/heads/ignite-488
Commit: 7a274d38c2c3e49b8408aaaaddbd544a0d5b7dcc
Parents: 4ce78a0
Author: avinogradov <[email protected]>
Authored: Wed Mar 18 16:36:00 2015 +0300
Committer: avinogradov <[email protected]>
Committed: Wed Mar 18 16:36:00 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/cache/query/Query.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a274d38/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
index 29c7bfb..227a755 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
@@ -36,6 +36,9 @@ public abstract class Query<T extends Query> implements
Serializable {
/** */
private static final long serialVersionUID = 0L;
+ /** Default query page size. */
+ public static final int DFLT_PAGE_SIZE = 1024;
+
/** Page size. */
private int pageSize;
