Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c014199c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c014199c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c014199c Branch: refs/heads/ignite-843-rc1 Commit: c014199cd7103d1c8f4821b59312069c8f348b47 Parents: 25ef0f6 0b61333 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Nov 30 18:11:55 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Nov 30 18:11:55 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- RELEASE_NOTES.txt | 17 + assembly/release-fabric-base.xml | 9 + .../config/binary/example-ignite-binary.xml | 44 -- examples/config/example-ignite.xml | 10 +- examples/pom.xml | 2 +- .../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 | 90 ---- .../binary/ExampleBinaryNodeStartup.java | 36 -- .../ignite/examples/binary/Organization.java | 93 ---- .../examples/binary/OrganizationType.java | 32 -- ...ComputeClientBinaryTaskExecutionExample.java | 10 +- .../CacheClientBinaryPutGetExample.java | 12 +- .../datagrid/CacheClientBinaryQueryExample.java | 28 +- .../ComputeFibonacciContinuationExample.java | 15 +- .../computegrid/ComputeTaskMapExample.java | 6 +- .../computegrid/ComputeTaskSplitExample.java | 4 +- .../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 +- .../examples/messaging/MessagingExample.java | 18 +- .../examples/misc/springbean/spring-bean.xml | 7 - .../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 ++ .../scalar/examples/ScalarCacheExample.scala | 19 +- .../examples/ScalarCacheQueryExample.scala | 66 +-- .../testsuites/IgniteExamplesSelfTestSuite.java | 4 +- .../client/router/RouterFactorySelfTest.java | 2 + .../ignite/codegen/MessageCodeGenerator.java | 1 + .../java/org/apache/ignite/IgniteBinary.java | 30 +- .../java/org/apache/ignite/IgniteCache.java | 26 +- .../apache/ignite/binary/BinaryIdMapper.java | 3 +- .../org/apache/ignite/binary/BinaryObject.java | 17 +- .../apache/ignite/binary/BinarySerializer.java | 2 +- .../org/apache/ignite/binary/BinaryType.java | 16 +- .../ignite/binary/BinaryTypeConfiguration.java | 21 + .../apache/ignite/cache/CacheInterceptor.java | 2 +- .../ignite/cache/CacheKeyConfiguration.java | 19 + .../apache/ignite/cache/CacheTypeMetadata.java | 2 + .../rendezvous/RendezvousAffinityFunction.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 191 +++++--- .../configuration/CacheConfiguration.java | 36 +- .../internal/GridEventConsumeHandler.java | 5 + .../internal/GridMessageListenHandler.java | 5 + .../apache/ignite/internal/IgniteKernal.java | 13 +- .../org/apache/ignite/internal/IgnitionEx.java | 15 +- .../ignite/internal/NodeStoppingException.java | 35 ++ .../managers/communication/GridIoManager.java | 88 +--- .../communication/GridIoMessageFactory.java | 8 +- .../discovery/GridDiscoveryManager.java | 19 +- .../internal/portable/BinaryEnumObjectImpl.java | 311 +++++++++++++ .../internal/portable/BinaryFieldImpl.java | 6 +- .../internal/portable/BinaryMarshaller.java | 142 ++++++ .../internal/portable/BinaryMetadata.java | 16 +- .../internal/portable/BinaryObjectEx.java | 225 +--------- .../internal/portable/BinaryObjectExImpl.java | 251 +++++++++++ .../internal/portable/BinaryObjectImpl.java | 15 +- .../portable/BinaryObjectOffheapImpl.java | 2 +- .../internal/portable/BinaryReaderExImpl.java | 26 +- .../internal/portable/BinaryTypeImpl.java | 12 + .../internal/portable/BinaryWriteMode.java | 3 + .../internal/portable/BinaryWriterExImpl.java | 29 +- .../portable/GridPortableMarshaller.java | 3 + .../portable/PortableClassDescriptor.java | 28 +- .../internal/portable/PortableContext.java | 107 ++++- .../ignite/internal/portable/PortableUtils.java | 166 ++++++- .../builder/BinaryObjectBuilderImpl.java | 25 +- .../portable/builder/PortableBuilderEnum.java | 2 +- .../builder/PortableBuilderSerializer.java | 14 +- .../builder/PortableEnumArrayLazyValue.java | 2 +- .../builder/PortableObjectArrayLazyValue.java | 2 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 51 +++ .../processors/cache/CacheInvokeResult.java | 14 + .../processors/cache/CacheLazyEntry.java | 2 +- .../processors/cache/CacheLockImpl.java | 18 +- .../internal/processors/cache/CacheObject.java | 3 + .../processors/cache/CacheObjectContext.java | 49 +- .../processors/cache/GridCacheAdapter.java | 160 ++++++- .../cache/GridCacheConcurrentMap.java | 68 +-- .../processors/cache/GridCacheContext.java | 12 +- .../cache/GridCacheDeploymentManager.java | 6 +- .../processors/cache/GridCacheEventManager.java | 42 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheMessage.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 3 +- .../processors/cache/GridCacheProcessor.java | 4 +- .../processors/cache/GridCacheProxyImpl.java | 61 +++ .../processors/cache/IgniteCacheProxy.java | 56 ++- .../processors/cache/IgniteInternalCache.java | 47 +- .../cache/affinity/GridCacheAffinityImpl.java | 3 +- .../CacheDataStructuresManager.java | 45 +- .../distributed/dht/GridDhtCacheAdapter.java | 22 +- .../cache/distributed/dht/GridDhtGetFuture.java | 28 +- .../distributed/dht/GridDhtLockFuture.java | 20 +- .../distributed/dht/GridDhtTxFinishFuture.java | 13 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 43 +- .../cache/distributed/dht/GridDhtTxRemote.java | 15 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/GridPartitionedSingleGetFuture.java | 18 +- .../dht/atomic/GridDhtAtomicCache.java | 55 ++- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 +- .../colocated/GridDhtColocatedLockFuture.java | 25 +- .../distributed/near/GridNearCacheAdapter.java | 14 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../distributed/near/GridNearGetRequest.java | 3 +- .../distributed/near/GridNearLockFuture.java | 24 +- ...arOptimisticSerializableTxPrepareFuture.java | 104 ++--- .../near/GridNearOptimisticTxPrepareFuture.java | 191 ++++---- ...ridNearOptimisticTxPrepareFutureAdapter.java | 70 +++ .../near/GridNearSingleGetRequest.java | 12 +- .../near/GridNearSingleGetResponse.java | 13 +- .../near/GridNearTxFinishFuture.java | 14 +- .../cache/local/GridLocalCacheEntry.java | 6 + .../portable/CacheObjectBinaryProcessor.java | 11 +- .../CacheObjectBinaryProcessorImpl.java | 51 ++- .../portable/CacheObjectPortableContext.java | 3 +- .../cache/portable/IgniteBinaryImpl.java | 21 +- .../cache/query/GridCacheSqlQuery.java | 42 ++ .../cache/query/GridCacheTwoStepQuery.java | 35 +- .../continuous/CacheContinuousQueryEntry.java | 50 ++- .../continuous/CacheContinuousQueryEvent.java | 6 +- .../continuous/CacheContinuousQueryHandler.java | 32 +- .../CacheContinuousQueryListener.java | 5 + .../continuous/CacheContinuousQueryManager.java | 57 ++- .../cache/store/CacheOsStoreManager.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 10 +- .../transactions/IgniteTxLocalAdapter.java | 31 +- .../cache/transactions/IgniteTxManager.java | 22 +- .../IgniteTxRemoteSingleStateImpl.java | 16 +- .../cache/transactions/IgniteTxRemoteState.java | 5 + .../transactions/IgniteTxRemoteStateImpl.java | 24 + .../processors/cacheobject/NoOpBinary.java | 13 +- .../continuous/GridContinuousHandler.java | 5 + .../continuous/GridContinuousProcessor.java | 10 +- .../StartRoutineDiscoveryMessage.java | 13 +- .../datastructures/DataStructuresProcessor.java | 20 +- .../datastructures/GridCacheAtomicLongImpl.java | 6 +- .../GridCacheInternalKeyImpl.java | 2 +- .../platform/PlatformContextImpl.java | 55 ++- .../cpp/PlatformCppConfigurationClosure.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 2 +- .../transactions/PlatformTransactions.java | 4 +- .../platform/utils/PlatformUtils.java | 1 + .../processors/query/GridQueryProcessor.java | 76 ++-- .../processors/query/GridQueryProperty.java | 45 ++ .../query/GridQueryTypeDescriptor.java | 6 + .../util/future/GridCompoundFuture.java | 9 +- .../internal/util/future/GridFutureAdapter.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 4 +- .../cache/VisorCacheTypeFieldMetadata.java | 30 +- .../visor/cache/VisorCacheTypeMetadata.java | 133 +++++- .../marshaller/portable/BinaryMarshaller.java | 146 ------ .../PlatformDotNetBinaryTypeConfiguration.java | 23 + .../ignite/resources/MBeanServerResource.java | 69 --- .../sharedfs/SharedFsCheckpointSpi.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 17 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../META-INF/classnames-jdk.properties | 2 + ...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 85 ++++ ...JdbcPojoStorePortableMarshallerSelfTest.java | 85 ---- .../internal/GridMultipleJobsSelfTest.java | 7 + ...ectionLocalJobMultipleArgumentsSelfTest.java | 11 +- .../IgniteClientReconnectCacheTest.java | 33 +- .../internal/portable/BinaryEnumsSelfTest.java | 446 +++++++++++++++++++ .../portable/BinaryFieldsAbstractSelfTest.java | 13 +- .../portable/BinaryFieldsHeapSelfTest.java | 4 +- .../portable/BinaryFieldsOffheapSelfTest.java | 3 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 5 +- .../BinaryFooterOffsetsHeapSelfTest.java | 4 +- .../BinaryFooterOffsetsOffheapSelfTest.java | 3 +- .../portable/BinaryMarshallerSelfTest.java | 126 ++++-- .../BinaryObjectBuilderAdditionalSelfTest.java | 7 +- .../portable/BinaryObjectBuilderSelfTest.java | 102 +++-- .../GridPortableAffinityKeySelfTest.java | 13 +- ...idPortableMarshallerCtxDisabledSelfTest.java | 1 - .../portable/GridPortableMetaDataSelfTest.java | 11 +- .../portable/GridPortableWildcardsSelfTest.java | 1 - .../CachePutEventListenerErrorSelfTest.java | 180 ++++++++ .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 139 +++++- .../cache/GridCacheConcurrentMapSelfTest.java | 2 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 14 +- .../processors/cache/GridCacheStopSelfTest.java | 143 +++++- ...niteCacheCopyOnReadDisabledAbstractTest.java | 2 + ...IgniteCacheAbstractExecutionContextTest.java | 2 +- ...eAbstractDataStructuresFailoverSelfTest.java | 3 + .../IgniteCollectionAbstractTest.java | 3 + ...yMetadataUpdateChangingTopologySelfTest.java | 245 ++++++++++ .../IgniteCacheSizeFailoverTest.java | 7 + .../dht/GridCacheDhtInternalEntrySelfTest.java | 203 --------- ...gniteAtomicLongChangingTopologySelfTest.java | 40 +- .../IgniteCacheCrossCacheTxFailoverTest.java | 6 + .../IgniteCachePutRetryAbstractSelfTest.java | 4 + .../near/GridCacheNearTxForceKeyTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 71 +-- .../replicated/GridReplicatedTxPreloadTest.java | 6 + ...CacheReplicatedPreloadLifecycleSelfTest.java | 100 +++-- .../GridCacheEvictionLockUnlockSelfTest.java | 2 +- .../random/RandomEvictionPolicySelfTest.java | 8 +- ...naryObjectsAbstractDataStreamerSelfTest.java | 2 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 2 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 10 +- ...CacheClientNodeBinaryObjectMetadataTest.java | 6 +- .../GridCachePortableStoreAbstractSelfTest.java | 2 +- ...ridPortableCacheEntryMemorySizeSelfTest.java | 2 +- ...leDuplicateIndexObjectsAbstractSelfTest.java | 2 +- .../DataStreamProcessorPortableSelfTest.java | 2 +- .../GridDataStreamerImplSelfTest.java | 2 +- ...ridCacheAffinityRoutingPortableSelfTest.java | 2 +- .../GridCacheMemoryModePortableSelfTest.java | 2 +- ...acheOffHeapTieredAtomicPortableSelfTest.java | 2 +- ...eapTieredEvictionAtomicPortableSelfTest.java | 2 +- ...heOffHeapTieredEvictionPortableSelfTest.java | 2 +- .../GridCacheOffHeapTieredPortableSelfTest.java | 2 +- ...sNearPartitionedByteArrayValuesSelfTest.java | 2 +- ...sPartitionedOnlyByteArrayValuesSelfTest.java | 2 +- .../PlatformComputeBinarizableArgTask.java | 8 +- .../platform/PlatformComputeEchoTask.java | 4 +- .../session/GridSessionCheckpointSelfTest.java | 16 + .../tcp/IgniteCacheSslStartStopSelfTest.java | 1 + .../ignite/testframework/GridTestUtils.java | 61 ++- .../ignite/testframework/junits/IgniteMock.java | 39 +- .../junits/IgniteTestResources.java | 11 + .../multijvm/IgniteCacheProcessProxy.java | 38 ++ ...ObjectsCacheDataStructuresSelfTestSuite.java | 33 ++ ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 34 ++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 33 ++ .../IgniteBinaryObjectsCacheTestSuite2.java | 33 ++ .../IgniteBinaryObjectsCacheTestSuite3.java | 33 ++ .../IgniteBinaryObjectsCacheTestSuite4.java | 33 ++ ...IgniteBinaryObjectsComputeGridTestSuite.java | 33 ++ .../IgniteCacheFailoverTestSuite3.java | 6 - .../IgniteCacheFailoverTestSuiteSsl.java | 41 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 7 +- .../testsuites/IgniteCacheTestSuite2.java | 2 - .../IgnitePortableCacheFullApiTestSuite.java | 2 +- .../IgnitePortableCacheTestSuite.java | 2 +- .../IgnitePortableObjectsTestSuite.java | 4 + modules/flume/README.txt | 44 +- .../query/h2/GridH2ResultSetIterator.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 235 ++++++++-- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java | 69 ++- .../query/h2/opt/GridH2TreeIndex.java | 98 ++-- .../query/h2/sql/GridSqlQuerySplitter.java | 73 ++- .../processors/query/h2/sql/GridSqlSelect.java | 27 ++ .../query/h2/twostep/GridMapQueryExecutor.java | 17 +- .../query/h2/twostep/GridMergeIndex.java | 7 + .../h2/twostep/GridMergeIndexUnsorted.java | 14 + .../h2/twostep/GridReduceQueryExecutor.java | 117 +++-- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 29 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 71 +-- .../cache/IgniteCacheNoClassQuerySelfTest.java | 122 +++++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 2 - ...PartitionedSnapshotEnabledQuerySelfTest.java | 28 ++ .../h2/GridIndexingSpiAbstractSelfTest.java | 19 + .../IgniteCacheQuerySelfTestSuite.java | 4 + .../IgnitePortableCacheQueryTestSuite.java | 2 +- 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 +- .../examples/project/vs/ignite-examples.vcxproj | 6 +- .../Binary/BinaryBuilderSelfTest.cs | 97 ++-- .../Binary/BinarySelfTest.cs | 48 +- .../Cache/CacheAbstractTest.cs | 17 +- .../Compute/ComputeApiTest.cs | 6 + .../Config/Compute/compute-grid1.xml | 8 +- .../Config/marshaller-explicit.xml | 2 +- .../Config/native-client-test-cache-store.xml | 1 + .../Examples/ExamplesTest.cs | 5 +- .../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 +- .../Messaging/MessagingExample.cs | 9 +- .../Services/ServicesExample.cs | 4 + .../examples/Config/example-cache-query.xml | 9 +- .../dotnet/examples/Config/example-cache.xml | 9 +- modules/scalar/pom.xml | 4 +- .../test/resources/spring-ping-pong-partner.xml | 18 - modules/spark/pom.xml | 4 +- modules/visor-console/pom.xml | 2 +- .../ignite-int-max-values-offheap-config.xml | 89 ++++ .../ignite-int-max-values-onheap-config.xml | 84 ++++ .../ignite-int-max-values-swap-config.xml | 93 ++++ .../test-max-int-values-offheap.properties | 70 +++ .../test-max-int-values-onheap.properties | 70 +++ .../config/test-max-int-values-swap.properties | 69 +++ .../yardstick/cache/IntMaxValueEntriesTest.java | 135 ++++++ modules/yarn/pom.xml | 6 +- .../yarn/IgniteApplicationMasterSelfTest.java | 11 +- modules/zookeeper/README.txt | 29 ++ modules/zookeeper/licenses/apache-2.0.txt | 202 +++++++++ parent/pom.xml | 2 +- 344 files changed, 9330 insertions(+), 3707 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c014199c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c014199c/parent/pom.xml ----------------------------------------------------------------------