[49/49] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
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 Authored: Mon Nov 30 12:25:28 2015 +0300 Committer: sboikov 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/G
[49/49] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
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/2bd58780 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2bd58780 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2bd58780 Branch: refs/heads/ignite-1537 Commit: 2bd587805dbaa5f8484d215856af33a44a50552c Parents: d215017 a4848a7 Author: sboikov Authored: Mon Nov 9 12:48:10 2015 +0300 Committer: sboikov Committed: Mon Nov 9 12:48:10 2015 +0300 -- .../java8/messaging/MessagingExample.java |7 +- .../rest/AbstractRestProcessorSelfTest.java |5 +- .../JettyRestProcessorAbstractSelfTest.java | 142 +- .../src/main/java/org/apache/ignite/Ignite.java | 12 +- .../apache/ignite/IgniteSystemProperties.java |3 + .../configuration/CacheConfiguration.java | 54 +- .../configuration/ConnectorConfiguration.java | 61 +- .../configuration/IgniteConfiguration.java | 32 +- .../apache/ignite/internal/IgniteKernal.java| 68 +- .../org/apache/ignite/internal/IgnitionEx.java |3 + .../managers/communication/GridIoMessage.java |4 +- .../communication/GridIoMessageFactory.java | 10 +- .../discovery/GridDiscoveryManager.java |5 +- .../affinity/GridAffinityAssignmentCache.java | 13 + .../cache/GridCacheAffinityManager.java | 28 +- .../processors/cache/GridCacheContext.java | 29 +- .../processors/cache/GridCacheEntryEx.java |4 +- .../processors/cache/GridCacheIoManager.java| 19 +- .../processors/cache/GridCacheMapEntry.java | 91 +- .../processors/cache/GridCacheMvccManager.java | 145 +- .../GridCachePartitionExchangeManager.java | 188 ++- .../processors/cache/GridCachePreloader.java| 60 +- .../cache/GridCachePreloaderAdapter.java| 45 +- .../processors/cache/GridCacheProcessor.java| 151 +- .../distributed/GridCacheTxRecoveryFuture.java | 13 +- .../distributed/GridDistributedCacheEntry.java |2 +- .../distributed/GridDistributedTxMapping.java |8 +- .../GridDistributedTxRemoteAdapter.java |5 +- .../distributed/dht/GridDhtCacheEntry.java | 11 +- .../distributed/dht/GridDhtLocalPartition.java | 71 +- .../distributed/dht/GridDhtLockFuture.java |7 +- .../dht/GridDhtPartitionsReservation.java |2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 13 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 43 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 122 +- .../cache/distributed/dht/GridDhtTxRemote.java | 45 +- .../dht/atomic/GridDhtAtomicCache.java |1 - .../dht/colocated/GridDhtColocatedCache.java|7 +- .../dht/preloader/GridDhtForceKeysFuture.java | 14 + .../GridDhtPartitionDemandMessage.java | 14 +- .../preloader/GridDhtPartitionDemandPool.java | 1192 --- .../dht/preloader/GridDhtPartitionDemander.java | 1389 ++ .../dht/preloader/GridDhtPartitionSupplier.java | 1034 + .../GridDhtPartitionSupplyMessageV2.java| 380 + .../preloader/GridDhtPartitionSupplyPool.java | 555 --- .../GridDhtPartitionsExchangeFuture.java|8 + .../dht/preloader/GridDhtPreloader.java | 303 +++- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../near/GridNearOptimisticTxPrepareFuture.java | 11 +- .../near/GridNearTransactionalCache.java|7 +- .../near/GridNearTxFinishFuture.java| 157 +- .../cache/distributed/near/GridNearTxLocal.java | 21 +- .../CacheObjectPortableProcessorImpl.java |9 + .../cache/transactions/IgniteInternalTx.java|3 +- .../cache/transactions/IgniteTxAdapter.java | 251 ++-- .../cache/transactions/IgniteTxHandler.java | 37 +- .../transactions/IgniteTxLocalAdapter.java | 26 +- .../cache/transactions/IgniteTxManager.java | 175 ++- .../datastructures/DataStructuresProcessor.java |3 + .../processors/job/GridJobProcessor.java| 96 +- .../handlers/cache/GridCacheCommandHandler.java | 128 +- .../handlers/query/QueryCommandHandler.java | 258 +++- .../top/GridTopologyCommandHandler.java |4 - .../service/GridServiceProcessor.java | 31 +- .../processors/task/GridTaskWorker.java |4 +- .../GridBoundedConcurrentLinkedHashMap.java |7 +- .../GridBoundedConcurrentLinkedHashSet.java |7 +- .../util/GridBoundedConcurrentOrderedMap.java | 39 +- .../internal/util/GridConcurrentFactory.java| 11 +- .../util/GridConcurrentLinkedHashSet.java |9 +- .../ignite/internal/util/IgniteUuidCache.java |6 +- .../util/future/GridCompoundFuture.java | 155 +- .../ignite/internal/util/lang/GridTuple4.java |2 +- .../util/n