Repository: ignite Updated Branches: refs/heads/ignite-1282 7eea46d3e -> 6ef7fb604
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1eaa8c92 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1eaa8c92 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1eaa8c92 Branch: refs/heads/ignite-1282 Commit: 1eaa8c92d2db395279fb33cdd8e914bd2f2f9f3d Parents: 54ae690 c584cca Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Nov 26 15:12:49 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Nov 26 15:12:49 2015 +0300 ---------------------------------------------------------------------- .../config/binary/example-ignite-binary.xml | 44 ---- examples/config/example-ignite.xml | 10 +- .../ignite/examples/binary/EmployeeKey.java | 3 + .../binary/ExampleBinaryNodeStartup.java | 36 --- ...ComputeClientBinaryTaskExecutionExample.java | 6 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 6 +- .../scalar/examples/ScalarCacheExample.scala | 19 +- .../ignite/codegen/MessageCodeGenerator.java | 1 + .../java/org/apache/ignite/IgniteBinary.java | 15 +- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../apache/ignite/binary/BinaryIdMapper.java | 3 +- .../org/apache/ignite/binary/BinaryObject.java | 9 +- .../org/apache/ignite/binary/BinaryType.java | 9 +- .../apache/ignite/cache/CacheTypeMetadata.java | 2 + .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 3 +- .../configuration/CacheConfiguration.java | 36 ++- .../internal/GridEventConsumeHandler.java | 5 + .../internal/GridMessageListenHandler.java | 5 + .../apache/ignite/internal/IgniteKernal.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 6 +- .../ignite/internal/NodeStoppingException.java | 35 +++ .../discovery/GridDiscoveryManager.java | 19 +- .../internal/portable/BinaryFieldImpl.java | 6 +- .../internal/portable/BinaryMarshaller.java | 144 +++++++++++ .../internal/portable/BinaryObjectEx.java | 225 +---------------- .../internal/portable/BinaryObjectExImpl.java | 245 +++++++++++++++++++ .../internal/portable/BinaryObjectImpl.java | 2 +- .../portable/BinaryObjectOffheapImpl.java | 2 +- .../internal/portable/BinaryTypeImpl.java | 5 + .../portable/PortableClassDescriptor.java | 2 +- .../internal/portable/PortableContext.java | 35 ++- .../ignite/internal/portable/PortableUtils.java | 2 +- .../builder/BinaryObjectBuilderImpl.java | 9 +- .../builder/PortableBuilderSerializer.java | 4 +- .../processors/cache/CacheObjectContext.java | 2 +- .../cache/GridCacheDeploymentManager.java | 6 +- .../processors/cache/GridCacheEventManager.java | 38 ++- .../processors/cache/GridCacheIoManager.java | 4 + .../processors/cache/GridCacheMessage.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 3 +- .../processors/cache/GridCacheProcessor.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 14 +- .../cache/affinity/GridCacheAffinityImpl.java | 3 +- .../distributed/dht/GridDhtLockFuture.java | 19 +- .../distributed/dht/GridDhtTxFinishFuture.java | 1 + .../dht/GridPartitionedSingleGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 +- .../CacheObjectBinaryProcessorImpl.java | 33 ++- .../cache/portable/IgniteBinaryImpl.java | 9 +- .../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 +- .../transactions/IgniteTxLocalAdapter.java | 29 ++- .../processors/cacheobject/NoOpBinary.java | 8 +- .../continuous/GridContinuousHandler.java | 5 + .../continuous/GridContinuousProcessor.java | 10 +- .../StartRoutineDiscoveryMessage.java | 13 +- .../cpp/PlatformCppConfigurationClosure.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 2 +- .../processors/query/GridQueryProcessor.java | 68 +++-- .../processors/query/GridQueryProperty.java | 45 ++++ .../query/GridQueryTypeDescriptor.java | 6 + .../visor/cache/VisorCacheConfiguration.java | 4 +- .../cache/VisorCacheTypeFieldMetadata.java | 30 ++- .../visor/cache/VisorCacheTypeMetadata.java | 133 +++++++++- .../marshaller/portable/BinaryMarshaller.java | 146 ----------- .../META-INF/classnames-jdk.properties | 2 + ...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 85 +++++++ ...JdbcPojoStorePortableMarshallerSelfTest.java | 85 ------- .../IgniteClientReconnectCacheTest.java | 7 + .../portable/BinaryFieldsAbstractSelfTest.java | 13 +- .../portable/BinaryFieldsHeapSelfTest.java | 4 +- .../portable/BinaryFieldsOffheapSelfTest.java | 3 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 5 +- .../BinaryFooterOffsetsHeapSelfTest.java | 4 +- .../BinaryFooterOffsetsOffheapSelfTest.java | 3 +- .../portable/BinaryMarshallerSelfTest.java | 17 +- .../BinaryObjectBuilderAdditionalSelfTest.java | 7 +- .../portable/BinaryObjectBuilderSelfTest.java | 102 +++++--- .../GridPortableAffinityKeySelfTest.java | 13 +- ...idPortableMarshallerCtxDisabledSelfTest.java | 1 - .../portable/GridPortableMetaDataSelfTest.java | 11 +- .../portable/GridPortableWildcardsSelfTest.java | 1 - .../cache/GridCacheAbstractFullApiSelfTest.java | 97 ++++++++ ...IgniteCacheAbstractExecutionContextTest.java | 2 +- ...eAbstractDataStructuresFailoverSelfTest.java | 3 + .../IgniteCollectionAbstractTest.java | 3 + .../IgniteCacheSizeFailoverTest.java | 7 + .../IgniteCachePutRetryAbstractSelfTest.java | 4 + ...naryObjectsAbstractDataStreamerSelfTest.java | 2 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 2 +- .../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 +- .../ignite/testframework/junits/IgniteMock.java | 39 ++- .../IgniteBinaryObjectsCacheTestSuite2.java | 33 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../IgnitePortableCacheFullApiTestSuite.java | 2 +- .../IgnitePortableCacheTestSuite.java | 2 +- .../query/h2/GridH2ResultSetIterator.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 227 ++++++++++++++--- .../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 | 23 ++ .../cache/IgniteCacheAbstractQuerySelfTest.java | 71 +++--- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 2 - ...PartitionedSnapshotEnabledQuerySelfTest.java | 28 +++ .../h2/GridIndexingSpiAbstractSelfTest.java | 19 ++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../IgnitePortableCacheQueryTestSuite.java | 2 +- .../Config/Compute/compute-grid1.xml | 5 - .../Config/marshaller-explicit.xml | 2 +- .../Examples/ExamplesTest.cs | 5 +- .../Messaging/MessagingExample.cs | 9 +- .../test/resources/spring-ping-pong-partner.xml | 18 -- 144 files changed, 2234 insertions(+), 1082 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1eaa8c92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1eaa8c92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ----------------------------------------------------------------------