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/97cd7830
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97cd7830
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97cd7830
Branch: refs/heads/ignite-1232
Commit: 97cd7830820bc29ef61dff2e2751ae84199a65e9
Parents: 86bddb9 21f22d3
Author: sboikov <[email protected]>
Authored: Thu Feb 18 09:03:51 2016 +0300
Committer: sboikov <[email protected]>
Committed: Thu Feb 18 09:03:51 2016 +0300
----------------------------------------------------------------------
.../cache/query/CacheQueryEntryEvent.java | 48 +
.../ignite/internal/GridJobCancelRequest.java | 5 +
.../ignite/internal/GridJobExecuteRequest.java | 5 +
.../ignite/internal/GridJobExecuteResponse.java | 5 +
.../ignite/internal/GridJobSiblingsRequest.java | 5 +
.../internal/GridJobSiblingsResponse.java | 5 +
.../ignite/internal/GridTaskCancelRequest.java | 5 +
.../ignite/internal/GridTaskSessionRequest.java | 5 +
.../ignite/internal/MarshallerContextImpl.java | 3 +-
.../ignite/internal/binary/BinaryContext.java | 1 +
.../internal/binary/BinaryEnumObjectImpl.java | 5 +
.../internal/binary/BinaryObjectImpl.java | 5 +
.../binary/BinaryObjectOffheapImpl.java | 5 +
.../ignite/internal/binary/BinaryUtils.java | 5 +-
.../checkpoint/GridCheckpointRequest.java | 5 +
.../managers/communication/GridIoMessage.java | 5 +
.../communication/GridIoUserMessage.java | 5 +
.../deployment/GridDeploymentInfoBean.java | 5 +
.../deployment/GridDeploymentRequest.java | 5 +
.../deployment/GridDeploymentResponse.java | 5 +
.../eventstorage/GridEventStorageMessage.java | 5 +
.../affinity/AffinityTopologyVersion.java | 5 +
.../cache/CacheEntryInfoCollection.java | 5 +
.../cache/CacheEntryPredicateAdapter.java | 5 +
.../cache/CacheEntryPredicateContainsValue.java | 8 +-
.../cache/CacheEntrySerializablePredicate.java | 5 +
.../cache/CacheEvictableEntryImpl.java | 2 +-
.../processors/cache/CacheEvictionEntry.java | 5 +
.../cache/CacheInvokeDirectResult.java | 5 +
.../cache/CacheObjectByteArrayImpl.java | 5 +
.../processors/cache/CacheObjectImpl.java | 5 +
.../processors/cache/GridCacheEntryInfo.java | 5 +
.../processors/cache/GridCacheMessage.java | 5 +
.../processors/cache/GridCacheReturn.java | 5 +
.../processors/cache/KeyCacheObjectImpl.java | 5 +
.../binary/CacheObjectBinaryProcessorImpl.java | 13 +-
.../CacheDataStructuresManager.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 5 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 14 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 16 +
.../dht/preloader/GridDhtPartitionDemander.java | 3 +-
.../preloader/GridDhtPartitionExchangeId.java | 5 +
.../distributed/near/CacheVersionedValue.java | 5 +
.../cache/query/GridCacheSqlQuery.java | 5 +
.../continuous/CacheContinuousQueryEntry.java | 5 +
.../continuous/CacheContinuousQueryEvent.java | 17 +-
.../continuous/CacheContinuousQueryHandler.java | 120 +--
.../CacheContinuousQueryListener.java | 3 +-
.../continuous/CacheContinuousQueryManager.java | 65 +-
.../cache/transactions/IgniteTxEntry.java | 5 +
.../cache/transactions/IgniteTxKey.java | 5 +
.../cache/transactions/TxEntryValueHolder.java | 5 +
.../cache/version/GridCacheVersion.java | 5 +
.../clock/GridClockDeltaSnapshotMessage.java | 5 +
.../processors/clock/GridClockDeltaVersion.java | 5 +
.../continuous/GridContinuousMessage.java | 5 +
.../datastreamer/DataStreamerEntry.java | 5 +
.../datastreamer/DataStreamerRequest.java | 5 +
.../datastreamer/DataStreamerResponse.java | 5 +
.../datastructures/DataStructuresProcessor.java | 1 +
.../processors/igfs/IgfsAckMessage.java | 5 +
.../internal/processors/igfs/IgfsBlockKey.java | 5 +
.../processors/igfs/IgfsBlocksMessage.java | 5 +
.../processors/igfs/IgfsDeleteMessage.java | 5 +
.../processors/igfs/IgfsFileAffinityRange.java | 5 +
.../igfs/IgfsFragmentizerRequest.java | 5 +
.../igfs/IgfsFragmentizerResponse.java | 5 +
.../processors/igfs/IgfsSyncMessage.java | 5 +
.../platform/PlatformProcessorImpl.java | 17 +-
.../callback/PlatformCallbackGateway.java | 30 +
.../callback/PlatformCallbackUtils.java | 15 +
.../messages/GridQueryCancelRequest.java | 5 +
.../twostep/messages/GridQueryFailResponse.java | 5 +
.../messages/GridQueryNextPageRequest.java | 5 +
.../messages/GridQueryNextPageResponse.java | 5 +
.../h2/twostep/messages/GridQueryRequest.java | 5 +
.../handlers/task/GridTaskResultRequest.java | 5 +
.../handlers/task/GridTaskResultResponse.java | 5 +
.../service/GridServiceProcessor.java | 101 ++-
.../processors/service/GridServiceProxy.java | 22 +-
.../ignite/internal/util/GridByteArrayList.java | 5 +
.../ignite/internal/util/GridLongList.java | 5 +
.../internal/util/GridMessageCollection.java | 5 +
.../internal/util/UUIDCollectionMessage.java | 5 +
.../util/nio/GridNioFinishedFuture.java | 5 +
.../ignite/internal/util/nio/GridNioFuture.java | 7 +-
.../internal/util/nio/GridNioFutureImpl.java | 5 +
.../util/nio/GridNioRecoveryDescriptor.java | 2 +
.../ignite/internal/util/nio/GridNioServer.java | 7 +
.../extensions/communication/Message.java | 5 +
.../jobstealing/JobStealingRequest.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java | 15 +
.../internal/GridAffinityNoCacheSelfTest.java | 5 +
.../GridCommunicationSendMessageSelfTest.java | 5 +
.../communication/GridIoManagerSelfTest.java | 5 +
.../cache/CacheEnumOperationsAbstractTest.java | 307 +++++++
.../CacheEnumOperationsSingleNodeTest.java | 28 +
.../cache/CacheEnumOperationsTest.java | 28 +
.../IgniteCacheNearRestartRollbackSelfTest.java | 36 +-
.../GridCacheEvictableEntryEqualsSelfTest.java | 85 ++
.../continuous/CacheContinuousBatchAckTest.java | 355 ++++++++
...heContinuousBatchForceServerModeAckTest.java | 80 ++
...CacheContinuousQueryCounterAbstractTest.java | 612 +++++++++++++
...inuousQueryCounterPartitionedAtomicTest.java | 41 +
...ContinuousQueryCounterPartitionedTxTest.java | 41 +
...tinuousQueryCounterReplicatedAtomicTest.java | 41 +
...eContinuousQueryCounterReplicatedTxTest.java | 41 +
.../CacheContinuousQueryLostPartitionTest.java | 4 +-
...acheContinuousQueryRandomOperationsTest.java | 896 ++++++++++++++++---
.../GridServiceSerializationSelfTest.java | 149 +++
.../communication/GridTestMessage.java | 5 +
.../spi/communication/GridTestMessage.java | 5 +
.../IgniteCacheEvictionSelfTestSuite.java | 4 +-
.../testsuites/IgniteCacheTestSuite2.java | 4 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../hadoop/jobtracker/HadoopJobTracker.java | 5 +-
.../processors/query/h2/IgniteH2Indexing.java | 96 +-
.../h2/twostep/msg/GridH2ValueMessage.java | 5 +
.../h2/GridIndexingSpiAbstractSelfTest.java | 43 +
.../IgniteCacheQuerySelfTestSuite.java | 12 +
.../cpp/common/include/ignite/common/exports.h | 6 +-
.../cpp/common/include/ignite/common/java.h | 21 +-
modules/platforms/cpp/common/src/exports.cpp | 6 +-
modules/platforms/cpp/common/src/java.cpp | 28 +-
.../cpp/core-test/src/cache_query_test.cpp | 45 +
.../ignite/cache/query/query_fields_row.h | 2 +-
.../Apache.Ignite.Core.Tests.csproj | 2 +
.../Process/IgniteProcess.cs | 16 +
.../ProcessExtensions.cs | 78 ++
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 96 ++
.../Apache.Ignite.Core.csproj | 1 +
.../Apache.Ignite.Core/Cluster/ICluster.cs | 14 +
.../Common/ClientDisconnectedException.cs | 97 ++
.../Impl/Binary/BinaryUtils.cs | 2 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 2 +-
.../Impl/Compute/ComputeTaskHolder.cs | 2 +-
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 110 ++-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 32 +-
.../Apache.Ignite.Core/Impl/IgniteProxy.cs | 7 +
.../Impl/Unmanaged/UnmanagedCallbackHandlers.cs | 3 +
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 32 +-
pom.xml | 2 +-
142 files changed, 3989 insertions(+), 429 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --cc
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 2d437ed,288c2b3..cb41250
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@@ -1749,12 -1576,13 +1763,12 @@@ public class IgniteH2Indexing implement
}
/** {@inheritDoc} */
- @Override public void registerCache(GridCacheContext<?,?> cctx,
CacheConfiguration<?,?> ccfg)
- @Override public void registerCache(CacheConfiguration<?,?> ccfg) throws
IgniteCheckedException {
++ @Override public void registerCache(GridCacheContext<?,?> cctx,
CacheConfiguration<?,?> ccfg)
+ throws IgniteCheckedException {
String schema = schemaNameFromCacheConf(ccfg);
- if (schemas.putIfAbsent(schema, new Schema(ccfg.getName(), schema,
- ccfg.getOffHeapMaxMemory() >= 0 || ccfg.getMemoryMode() ==
CacheMemoryMode.OFFHEAP_TIERED ?
- new GridUnsafeMemory(0) : null, ccfg)) != null)
- throw new IgniteCheckedException("Schema for cache already
registered: " + U.maskName(ccfg.getName()));
+ if (schemas.putIfAbsent(schema, new Schema(ccfg.getName(), schema,
cctx, ccfg)) != null)
+ throw new IgniteCheckedException("Cache already registered: " +
U.maskName(ccfg.getName()));
space2schema.put(emptyIfNull(ccfg.getName()), schema);
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index fd53e40,0da71c8..bb96cd8
---
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
@@@ -218,14 -218,33 +218,33 @@@ public abstract class GridIndexingSpiAb
spi.registerType(typeBA.space(), typeBA);
// Initially all is empty.
- assertEquals(0, spi.size(typeAA.space(), typeAA, null));
- assertEquals(0, spi.size(typeAB.space(), typeAB, null));
- assertEquals(0, spi.size(typeBA.space(), typeBA, null));
+ assertEquals(0, spi.size(typeAA.space(), typeAA));
+ assertEquals(0, spi.size(typeAB.space(), typeAB));
+ assertEquals(0, spi.size(typeBA.space(), typeBA));
- assertFalse(spi.query(typeAA.space(), "select * from A.A",
Collections.emptySet(), typeAA, null).hasNext());
- assertFalse(spi.query(typeAB.space(), "select * from A.B",
Collections.emptySet(), typeAB, null).hasNext());
- assertFalse(spi.query(typeBA.space(), "select * from B.A",
Collections.emptySet(), typeBA, null).hasNext());
+ assertFalse(spi.queryLocalSql(typeAA.space(), "select * from A.A",
Collections.emptySet(), typeAA, null).hasNext());
+ 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",
+ Collections.emptySet(), typeBA, null).hasNext());
+
+ try {
+ spi.query(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");
+ }
+ catch (IgniteCheckedException e) {
+ // all fine
+ }
+
+ assertFalse(spi.query(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",
+ Collections.emptySet(), typeBA, null).hasNext());
+
// Nothing to remove.
spi.remove("A", key(1), aa(1, "", 10));
spi.remove("B", key(1), ba(1, "", 10, true));
@@@ -286,7 -305,16 +305,16 @@@
assertEquals(aa(2, "Valera", 19).value(null, false),
value(res.next()));
assertFalse(res.hasNext());
- res = spi.query(typeAA.space(), "select aa.* from a aa order by
aa.age",
++ res = spi.queryLocalSql(typeAA.space(), "select aa.* from a aa order
by aa.age",
+ Collections.emptySet(), typeAA, null);
+
+ assertTrue(res.hasNext());
+ assertEquals(aa(3, "Borya", 18).value(null, false),
value(res.next()));
+ assertTrue(res.hasNext());
+ assertEquals(aa(2, "Valera", 19).value(null, false),
value(res.next()));
+ assertFalse(res.hasNext());
+
- res = spi.query(typeAB.space(), "from b order by name",
Collections.emptySet(), typeAB, null);
+ res = spi.queryLocalSql(typeAB.space(), "from b order by name",
Collections.emptySet(), typeAB, null);
assertTrue(res.hasNext());
assertEquals(ab(1, "Vasya", 20, "Some text about Vasya goes
here.").value(null, false), value(res.next()));
@@@ -294,7 -322,16 +322,17 @@@
assertEquals(ab(4, "Vitalya", 20, "Very Good guy").value(null,
false), value(res.next()));
assertFalse(res.hasNext());
- res = spi.query(typeAB.space(), "select bb.* from b as bb order by
bb.name",
++ res = spi.queryLocalSql(typeAB.space(), "select bb.* from b as bb
order by bb.name",
+ Collections.emptySet(), typeAB, null);
+
+ assertTrue(res.hasNext());
+ assertEquals(ab(1, "Vasya", 20, "Some text about Vasya goes
here.").value(null, false), value(res.next()));
+ assertTrue(res.hasNext());
+ assertEquals(ab(4, "Vitalya", 20, "Very Good guy").value(null,
false), value(res.next()));
+ assertFalse(res.hasNext());
+
- res = spi.query(typeBA.space(), "from a", Collections.emptySet(),
typeBA, null);
++
+ res = spi.queryLocalSql(typeBA.space(), "from a",
Collections.emptySet(), typeBA, null);
assertTrue(res.hasNext());
assertEquals(ba(2, "Kolya", 25, true).value(null, false),
value(res.next()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cd7830/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --cc
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index b2b1c61,457ab9b..6ed4004
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -210,7 -224,15 +220,9 @@@ public class IgniteCacheQuerySelfTestSu
suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.class);
suite.addTestSuite(CacheContinuousQueryFailoverTxOffheapTieredTest.class);
suite.addTestSuite(CacheContinuousQueryRandomOperationsTest.class);
+ suite.addTestSuite(CacheContinuousBatchAckTest.class);
+ suite.addTestSuite(CacheContinuousBatchForceServerModeAckTest.class);
- // Reduce fields queries.
- suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class);
-
suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class);
- suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class);
-
suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class);
-
suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class);
