Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Conflicts:
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fce714c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fce714c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fce714c0
Branch: refs/heads/ignite-1232
Commit: fce714c0651b4d39671dda91bf7114d57120d35d
Parents: 97cd783
Author: sboikov <[email protected]>
Authored: Thu Feb 18 09:04:03 2016 +0300
Committer: sboikov <[email protected]>
Committed: Thu Feb 18 09:04:03 2016 +0300
----------------------------------------------------------------------
.../query/h2/twostep/msg/GridH2IndexRangeRequest.java | 5 +++++
.../query/h2/twostep/msg/GridH2IndexRangeResponse.java | 5 +++++
.../processors/query/h2/twostep/msg/GridH2QueryRequest.java | 5 +++++
.../processors/query/h2/twostep/msg/GridH2RowMessage.java | 5 +++++
.../processors/query/h2/twostep/msg/GridH2RowRange.java | 5 +++++
.../query/h2/twostep/msg/GridH2RowRangeBounds.java | 5 +++++
.../processors/query/h2/GridIndexingSpiAbstractSelfTest.java | 8 ++++----
7 files changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fce714c0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
index 2257c4c..075f50d28 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
@@ -197,6 +197,11 @@ public class GridH2IndexRangeRequest implements Message {
}
/** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridH2IndexRangeRequest.class, this, "boundsSize",
bounds == null ? null : bounds.size());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fce714c0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
index f75707f..f557a35 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
@@ -268,6 +268,11 @@ public class GridH2IndexRangeResponse implements Message {
}
/** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridH2IndexRangeResponse.class, this, "rangesSize",
ranges == null ? null : ranges.size());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fce714c0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index bd932f9..921d101 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -389,6 +389,11 @@ public class GridH2QueryRequest implements Message,
GridCacheQueryMarshallable {
}
/** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridH2QueryRequest.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fce714c0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
index ca2c3bb..2100847 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
@@ -105,6 +105,11 @@ public class GridH2RowMessage implements Message {
}
/** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridH2RowMessage.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fce714c0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
index 55ee5e3..b38a44d 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
@@ -165,4 +165,9 @@ public class GridH2RowRange implements Message {
@Override public byte fieldsCount() {
return 3;
}
+
+ /** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fce714c0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
index f5f70a3..2dd1e34 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
@@ -177,6 +177,11 @@ public class GridH2RowRangeBounds implements Message {
}
/** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridH2RowRangeBounds.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fce714c0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index bb96cd8..fae3188 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -226,11 +226,11 @@ public abstract class GridIndexingSpiAbstractSelfTest
extends GridCommonAbstract
assertFalse(spi.queryLocalSql(typeAB.space(), "select * from A.B",
Collections.emptySet(), typeAB, null).hasNext());
assertFalse(spi.queryLocalSql(typeBA.space(), "select * from B.A",
Collections.emptySet(), typeBA, null).hasNext());
- assertFalse(spi.query(typeBA.space(), "select * from B.A, A.B, A.A",
+ assertFalse(spi.queryLocalSql(typeBA.space(), "select * from B.A, A.B,
A.A",
Collections.emptySet(), typeBA, null).hasNext());
try {
- spi.query(typeBA.space(), "select aa.*, ab.*, ba.* from A.A aa,
A.B ab, B.A ba",
+ spi.queryLocalSql(typeBA.space(), "select aa.*, ab.*, ba.* from
A.A aa, A.B ab, B.A ba",
Collections.emptySet(), typeBA, null).hasNext();
fail("Enumerations of aliases in select block must be prohibited");
@@ -239,10 +239,10 @@ public abstract class GridIndexingSpiAbstractSelfTest
extends GridCommonAbstract
// all fine
}
- assertFalse(spi.query(typeAB.space(), "select ab.* from A.B ab",
+ assertFalse(spi.queryLocalSql(typeAB.space(), "select ab.* from A.B
ab",
Collections.emptySet(), typeAB, null).hasNext());
- assertFalse(spi.query(typeBA.space(), "select ba.* from B.A as
ba",
+ assertFalse(spi.queryLocalSql(typeBA.space(), "select ba.* from
B.A as ba",
Collections.emptySet(), typeBA, null).hasNext());
// Nothing to remove.
