Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d2cb908 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d2cb908 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d2cb908 Branch: refs/heads/ignite-1537 Commit: 0d2cb9089bc92a8ad426ce13f9f189bd13f4377e Parents: 2e988f4 0b61333 Author: sboikov <sboi...@gridgain.com> Authored: Mon Nov 30 12:25:28 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Nov 30 12:25:28 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 +- assembly/release-fabric-base.xml | 9 + .../hibernate/CacheHibernatePersonStore.java | 4 +- .../hibernate/CacheHibernateStoreExample.java | 2 +- .../datagrid/store/hibernate/Person.hbm.xml | 2 +- .../apache/ignite/examples/binary/Address.java | 72 --- .../apache/ignite/examples/binary/Employee.java | 93 ---- .../ignite/examples/binary/EmployeeKey.java | 93 ---- .../ignite/examples/binary/Organization.java | 93 ---- .../examples/binary/OrganizationType.java | 32 -- ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 22 +- .../examples/datagrid/CacheQueryExample.java | 161 ++----- .../ignite/examples/datagrid/store/Person.java | 154 ------- .../store/auto/CacheAutoStoreExample.java | 4 +- .../auto/CacheAutoStoreLoadDataExample.java | 4 +- .../datagrid/store/auto/CacheConfig.java | 6 +- .../store/dummy/CacheDummyPersonStore.java | 12 +- .../store/dummy/CacheDummyStoreExample.java | 4 +- .../store/jdbc/CacheJdbcPersonStore.java | 18 +- .../store/jdbc/CacheJdbcStoreExample.java | 4 +- .../store/spring/CacheSpringPersonStore.java | 10 +- .../store/spring/CacheSpringStoreExample.java | 4 +- .../ignite/examples/model/Organization.java | 62 +++ .../apache/ignite/examples/model/Person.java | 127 ++++++ .../ignite/examples/model/binary/Address.java | 72 +++ .../ignite/examples/model/binary/Employee.java | 93 ++++ .../examples/model/binary/EmployeeKey.java | 93 ++++ .../examples/model/binary/Organization.java | 93 ++++ .../examples/model/binary/OrganizationType.java | 32 ++ .../examples/ScalarCacheQueryExample.scala | 66 +-- .../java/org/apache/ignite/IgniteBinary.java | 9 + .../org/apache/ignite/binary/BinaryObject.java | 8 + .../org/apache/ignite/binary/BinaryType.java | 7 + .../ignite/binary/BinaryTypeConfiguration.java | 21 + .../ignite/cache/CacheKeyConfiguration.java | 19 + .../cache/store/jdbc/CacheJdbcPojoStore.java | 188 +++++--- .../apache/ignite/internal/IgniteKernal.java | 13 +- .../managers/communication/GridIoManager.java | 88 +--- .../communication/GridIoMessageFactory.java | 8 +- .../internal/portable/BinaryEnumObjectImpl.java | 311 +++++++++++++ .../internal/portable/BinaryMarshaller.java | 2 - .../internal/portable/BinaryMetadata.java | 16 +- .../internal/portable/BinaryObjectExImpl.java | 10 +- .../internal/portable/BinaryObjectImpl.java | 13 +- .../internal/portable/BinaryReaderExImpl.java | 8 +- .../internal/portable/BinaryTypeImpl.java | 7 +- .../internal/portable/BinaryWriteMode.java | 3 + .../internal/portable/BinaryWriterExImpl.java | 29 +- .../portable/PortableClassDescriptor.java | 26 +- .../internal/portable/PortableContext.java | 66 ++- .../ignite/internal/portable/PortableUtils.java | 157 ++++++- .../builder/BinaryObjectBuilderImpl.java | 16 +- .../portable/builder/PortableBuilderEnum.java | 2 +- .../builder/PortableBuilderSerializer.java | 10 +- .../builder/PortableEnumArrayLazyValue.java | 2 +- .../builder/PortableObjectArrayLazyValue.java | 2 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 51 +++ .../processors/cache/CacheInvokeResult.java | 14 + .../processors/cache/CacheLazyEntry.java | 2 +- .../internal/processors/cache/CacheObject.java | 3 + .../processors/cache/CacheObjectContext.java | 21 + .../processors/cache/GridCacheAdapter.java | 69 +-- .../cache/GridCacheConcurrentMap.java | 52 +-- .../processors/cache/GridCacheContext.java | 12 +- .../CacheDataStructuresManager.java | 45 +- .../distributed/dht/GridDhtTxFinishFuture.java | 12 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 41 +- .../cache/distributed/dht/GridDhtTxRemote.java | 15 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 55 ++- .../colocated/GridDhtColocatedLockFuture.java | 17 +- .../distributed/near/GridNearCacheAdapter.java | 4 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../distributed/near/GridNearLockFuture.java | 24 +- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../near/GridNearOptimisticTxPrepareFuture.java | 138 +++--- .../portable/CacheObjectBinaryProcessor.java | 11 +- .../CacheObjectBinaryProcessorImpl.java | 18 +- .../portable/CacheObjectPortableContext.java | 3 +- .../cache/portable/IgniteBinaryImpl.java | 12 + .../cache/transactions/IgniteTxHandler.java | 10 +- .../cache/transactions/IgniteTxManager.java | 22 +- .../IgniteTxRemoteSingleStateImpl.java | 16 +- .../cache/transactions/IgniteTxRemoteState.java | 5 + .../transactions/IgniteTxRemoteStateImpl.java | 24 + .../processors/cacheobject/NoOpBinary.java | 5 + .../datastructures/DataStructuresProcessor.java | 20 +- .../GridCacheInternalKeyImpl.java | 2 +- .../platform/PlatformContextImpl.java | 53 ++- .../transactions/PlatformTransactions.java | 4 +- .../platform/utils/PlatformUtils.java | 1 + .../PlatformDotNetBinaryTypeConfiguration.java | 23 + .../communication/tcp/TcpCommunicationSpi.java | 17 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../internal/GridMultipleJobsSelfTest.java | 7 + ...ectionLocalJobMultipleArgumentsSelfTest.java | 11 +- .../IgniteClientReconnectCacheTest.java | 26 +- .../internal/portable/BinaryEnumsSelfTest.java | 446 +++++++++++++++++++ .../portable/BinaryMarshallerSelfTest.java | 103 ++++- .../CachePutEventListenerErrorSelfTest.java | 180 ++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheConcurrentMapSelfTest.java | 2 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 14 +- ...niteCacheCopyOnReadDisabledAbstractTest.java | 2 + ...yMetadataUpdateChangingTopologySelfTest.java | 245 ++++++++++ .../dht/GridCacheDhtInternalEntrySelfTest.java | 203 --------- ...gniteAtomicLongChangingTopologySelfTest.java | 40 +- .../IgniteCacheCrossCacheTxFailoverTest.java | 6 + .../near/GridCacheNearTxForceKeyTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 71 +-- .../replicated/GridReplicatedTxPreloadTest.java | 6 + ...CacheReplicatedPreloadLifecycleSelfTest.java | 100 +++-- .../GridCacheEvictionLockUnlockSelfTest.java | 2 +- .../random/RandomEvictionPolicySelfTest.java | 8 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 8 + .../platform/PlatformComputeEchoTask.java | 4 +- .../ignite/testframework/GridTestUtils.java | 61 ++- .../junits/IgniteTestResources.java | 11 + .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + .../testsuites/IgniteCacheTestSuite2.java | 2 - .../IgnitePortableObjectsTestSuite.java | 4 + modules/flume/README.txt | 44 +- .../processors/query/h2/IgniteH2Indexing.java | 24 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 6 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 5 - modules/jms11/README.txt | 29 ++ modules/jms11/licenses/apache-2.0.txt | 202 +++++++++ modules/kafka/README.txt | 32 ++ modules/mqtt/README.txt | 29 ++ modules/mqtt/licenses/apache-2.0.txt | 202 +++++++++ modules/platforms/README.txt | 6 + .../impl/binary/binary_type_updater_impl.cpp | 4 +- .../Binary/BinaryBuilderSelfTest.cs | 97 ++-- .../Binary/BinarySelfTest.cs | 48 +- .../Cache/CacheAbstractTest.cs | 17 +- .../Compute/ComputeApiTest.cs | 6 + .../Config/Compute/compute-grid1.xml | 3 +- .../Config/native-client-test-cache-store.xml | 1 + .../Services/ServiceProxyTest.cs | 22 +- .../Apache.Ignite.Core.csproj | 5 +- .../Binary/BinaryTypeConfiguration.cs | 16 +- .../dotnet/Apache.Ignite.Core/Binary/IBinary.cs | 136 ++++++ .../Apache.Ignite.Core/Binary/IBinaryObject.cs | 23 +- .../Apache.Ignite.Core/Binary/IBinaryType.cs | 13 + .../Apache.Ignite.Core/Binary/IIgniteBinary.cs | 120 ----- .../dotnet/Apache.Ignite.Core/IIgnite.cs | 6 +- .../Apache.Ignite.Core/Impl/Binary/Binary.cs | 216 +++++++++ .../Impl/Binary/BinaryEnum.cs | 134 ++++++ .../Impl/Binary/BinaryFullTypeDescriptor.cs | 14 +- .../Impl/Binary/BinaryObject.cs | 29 ++ .../Impl/Binary/BinaryObjectBuilder.cs | 44 +- .../Impl/Binary/BinaryReader.cs | 51 ++- .../Binary/BinarySurrogateTypeDescriptor.cs | 6 + .../Impl/Binary/BinarySystemHandlers.cs | 34 +- .../Impl/Binary/BinaryUtils.cs | 96 ++-- .../Impl/Binary/BinaryWriter.cs | 104 +++-- .../Impl/Binary/IBinaryTypeDescriptor.cs | 50 +-- .../Impl/Binary/IgniteBinary.cs | 192 -------- .../Impl/Binary/Marshaller.cs | 88 ++-- .../Impl/Binary/Metadata/BinaryType.cs | 184 ++++---- .../Impl/Binary/Metadata/BinaryTypeHolder.cs | 34 +- .../Binary/Structure/BinaryStructureTracker.cs | 2 +- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 11 +- .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 2 +- .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 11 +- .../Impl/Transactions/TransactionsImpl.cs | 4 +- .../examples/Config/example-cache-query.xml | 9 +- .../dotnet/examples/Config/example-cache.xml | 9 +- modules/yarn/pom.xml | 6 +- .../yarn/IgniteApplicationMasterSelfTest.java | 11 +- modules/zookeeper/README.txt | 29 ++ modules/zookeeper/licenses/apache-2.0.txt | 202 +++++++++ 175 files changed, 5224 insertions(+), 2352 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2cb908/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 28ff27c,2ce14af..77667b28 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@@ -582,13 -590,13 +590,17 @@@ public class GridNearOptimisticTxPrepar @Override public String toString() { Collection<String> futs = F.viewReadOnly(futures(), new C1<IgniteInternalFuture<?>, String>() { @Override public String apply(IgniteInternalFuture<?> f) { - return "[node=" + ((MiniFuture)f).node().id() + - ", loc=" + ((MiniFuture)f).node().isLocal() + - ", done=" + f.isDone() + "]"; + return "[node=" + ((MiniFuture) f).node().id() + + ", loc=" + ((MiniFuture) f).node().isLocal() + + ", done=" + f.isDone() + "]"; + } + }, new P1<IgniteInternalFuture<GridNearTxPrepareResponse>>() { + @Override public boolean apply(IgniteInternalFuture<GridNearTxPrepareResponse> fut) { + return isMini(fut); + } + }, new P1<IgniteInternalFuture<GridNearTxPrepareResponse>>() { + @Override public boolean apply(IgniteInternalFuture<GridNearTxPrepareResponse> fut) { + return isMini(fut); } });
