You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/26 11:51:27 UTC

[30/38] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

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/446a14bf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/446a14bf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/446a14bf

Branch: refs/heads/ignite-1537
Commit: 446a14bf67f81d01e439867e5a3783cab4d59275
Parents: 0a97c1c f2092e7
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Nov 26 12:42:33 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Nov 26 12:42:33 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    |   5 +-
 .../java/org/apache/ignite/IgniteCache.java     |   3 +-
 .../apache/ignite/binary/BinaryIdMapper.java    |   3 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |   2 +
 .../store/jdbc/CacheAbstractJdbcStore.java      |   2 +-
 .../configuration/CacheConfiguration.java       |   6 +-
 .../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 +++++
 .../internal/portable/BinaryMarshaller.java     | 144 ++++++++++++++++++
 .../portable/PortableClassDescriptor.java       |   2 +-
 .../internal/portable/PortableContext.java      |  35 ++++-
 .../builder/BinaryObjectBuilderImpl.java        |   9 +-
 .../processors/cache/CacheObjectContext.java    |   2 +-
 .../cache/GridCacheDeploymentManager.java       |   6 +-
 .../processors/cache/GridCacheEventManager.java |  38 ++++-
 .../processors/cache/GridCacheIoManager.java    |   6 +
 .../processors/cache/GridCacheMessage.java      |   3 +-
 .../processors/cache/GridCacheMvccManager.java  |   3 +-
 .../processors/cache/GridCacheProcessor.java    |  11 +-
 .../processors/cache/IgniteCacheProxy.java      |  14 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |   3 +-
 .../distributed/dht/GridDhtLockFuture.java      |  19 +--
 .../distributed/dht/GridDhtTxFinishFuture.java  |   1 +
 .../dht/GridPartitionedSingleGetFuture.java     |   3 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   3 +-
 .../CacheObjectBinaryProcessorImpl.java         |  30 +++-
 .../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 +++-
 .../continuous/GridContinuousHandler.java       |   5 +
 .../continuous/GridContinuousProcessor.java     |  10 +-
 .../StartRoutineDiscoveryMessage.java           |  13 +-
 .../cpp/PlatformCppConfigurationClosure.java    |   2 +-
 .../PlatformDotNetConfigurationClosure.java     |   2 +-
 .../processors/query/GridQueryProcessor.java    |  28 +++-
 .../marshaller/portable/BinaryMarshaller.java   | 146 -------------------
 ...heJdbcPojoStoreBinaryMarshallerSelfTest.java |  85 +++++++++++
 ...JdbcPojoStorePortableMarshallerSelfTest.java |  85 -----------
 .../portable/BinaryFieldsAbstractSelfTest.java  |   1 -
 .../portable/BinaryFieldsHeapSelfTest.java      |   2 -
 .../portable/BinaryFieldsOffheapSelfTest.java   |   1 -
 .../BinaryFooterOffsetsAbstractSelfTest.java    |   1 -
 .../BinaryFooterOffsetsHeapSelfTest.java        |   2 -
 .../BinaryFooterOffsetsOffheapSelfTest.java     |   1 -
 .../portable/BinaryMarshallerSelfTest.java      |   1 -
 .../BinaryObjectBuilderAdditionalSelfTest.java  |   1 -
 .../portable/BinaryObjectBuilderSelfTest.java   |  31 +++-
 .../GridPortableAffinityKeySelfTest.java        |  13 +-
 ...idPortableMarshallerCtxDisabledSelfTest.java |   1 -
 .../portable/GridPortableMetaDataSelfTest.java  |   1 -
 .../portable/GridPortableWildcardsSelfTest.java |   1 -
 .../cache/GridCacheAbstractFullApiSelfTest.java |  97 ++++++++++++
 ...IgniteCacheAbstractExecutionContextTest.java |   2 +-
 .../IgniteCachePutRetryAbstractSelfTest.java    |   2 +
 ...naryObjectsAbstractDataStreamerSelfTest.java |   2 +-
 ...aryObjectsAbstractMultiThreadedSelfTest.java |   2 +-
 .../GridCacheBinaryObjectsAbstractSelfTest.java |   2 +-
 ...ntNodeBinaryObjectMetadataMultinodeTest.java |   2 +-
 ...CacheClientNodeBinaryObjectMetadataTest.java |   2 +-
 .../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 +-
 .../ignite/testframework/junits/IgniteMock.java |  39 ++++-
 .../IgniteBinaryObjectsCacheTestSuite2.java     |  33 +++++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   4 +-
 .../IgnitePortableCacheFullApiTestSuite.java    |   2 +-
 .../IgnitePortableCacheTestSuite.java           |   2 +-
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  23 +++
 .../cache/IgniteCacheAbstractQuerySelfTest.java |   2 +-
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |   2 -
 .../IgnitePortableCacheQueryTestSuite.java      |   2 +-
 .../Config/Compute/compute-grid1.xml            |   5 -
 .../Config/marshaller-explicit.xml              |   2 +-
 .../test/resources/spring-ping-pong-partner.xml |  18 ---
 101 files changed, 910 insertions(+), 514 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/446a14bf/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/446a14bf/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/446a14bf/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/446a14bf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/446a14bf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java
----------------------------------------------------------------------