Merge branch 'ignite-1282' into ignite-1816
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMetadata.java
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMetadataCollector.java
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsAbstractSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsAbstractSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a024304
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a024304
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a024304
Branch: refs/heads/ignite-1816
Commit: 6a02430402b7c04ba83b7c933905eaec1ef75ec7
Parents: ff38ae9 66c84ea
Author: vozerov-gridgain <[email protected]>
Authored: Wed Nov 18 10:58:31 2015 +0300
Committer: vozerov-gridgain <[email protected]>
Committed: Wed Nov 18 10:58:31 2015 +0300
----------------------------------------------------------------------
.../rest/AbstractRestProcessorSelfTest.java | 5 +-
.../JettyRestProcessorAbstractSelfTest.java | 142 +-
.../java/org/apache/ignite/IgniteCache.java | 3 +-
.../org/apache/ignite/binary/BinaryObject.java | 9 -
.../eviction/random/RandomEvictionPolicy.java | 4 +
.../cache/store/CacheStoreSessionListener.java | 9 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 34 +-
.../jdbc/CacheJdbcStoreSessionListener.java | 8 +-
.../configuration/CacheConfiguration.java | 121 +-
.../configuration/ConnectorConfiguration.java | 61 +-
.../configuration/IgniteConfiguration.java | 32 +-
.../apache/ignite/internal/IgniteKernal.java | 21 +
.../org/apache/ignite/internal/IgnitionEx.java | 3 +
.../managers/communication/GridIoMessage.java | 4 +-
.../communication/GridIoMessageFactory.java | 10 +-
.../discovery/GridDiscoveryManager.java | 5 +-
.../internal/portable/BinaryObjectImpl.java | 7 -
.../portable/BinaryObjectOffheapImpl.java | 7 -
.../internal/portable/BinaryTypeImpl.java | 1 -
.../cache/CacheStoreBalancingWrapper.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 22 +-
.../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 | 184 +-
.../processors/cache/GridCachePreloader.java | 55 +-
.../cache/GridCachePreloaderAdapter.java | 40 +-
.../processors/cache/GridCacheProcessor.java | 59 +-
.../processors/cache/IgniteCacheProxy.java | 6 +
.../distributed/GridDistributedCacheEntry.java | 2 +-
.../distributed/GridDistributedTxMapping.java | 8 +-
.../GridDistributedTxRemoteAdapter.java | 5 +-
.../distributed/dht/GridDhtCacheEntry.java | 11 +-
.../distributed/dht/GridDhtLocalPartition.java | 63 +-
.../distributed/dht/GridDhtLockFuture.java | 7 +-
.../dht/GridDhtPartitionsReservation.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 12 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 39 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 78 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 33 +-
.../dht/colocated/GridDhtColocatedCache.java | 7 +-
.../GridDhtPartitionDemandMessage.java | 14 +-
.../preloader/GridDhtPartitionDemandPool.java | 1192 ----------
.../dht/preloader/GridDhtPartitionDemander.java | 1408 ++++++++++++
.../dht/preloader/GridDhtPartitionSupplier.java | 1037 +++++++++
.../GridDhtPartitionSupplyMessageV2.java | 380 +++
.../preloader/GridDhtPartitionSupplyPool.java | 555 -----
.../GridDhtPartitionsExchangeFuture.java | 2 +
.../dht/preloader/GridDhtPreloader.java | 282 ++-
.../near/GridNearOptimisticTxPrepareFuture.java | 11 +-
.../near/GridNearTransactionalCache.java | 7 +-
.../near/GridNearTxFinishFuture.java | 157 +-
.../cache/distributed/near/GridNearTxLocal.java | 21 +-
.../CacheObjectBinaryProcessorImpl.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 289 +--
.../cache/store/CacheOsStoreManager.java | 2 +-
.../store/GridCacheStoreManagerAdapter.java | 29 +-
.../cache/transactions/IgniteInternalTx.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 251 +-
.../cache/transactions/IgniteTxHandler.java | 37 +-
.../transactions/IgniteTxLocalAdapter.java | 22 +-
.../cache/transactions/IgniteTxManager.java | 171 +-
.../datastructures/DataStructuresProcessor.java | 3 +
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../platform/PlatformContextImpl.java | 1 +
.../handlers/cache/GridCacheCommandHandler.java | 128 +-
.../handlers/query/QueryCommandHandler.java | 254 ++-
.../top/GridTopologyCommandHandler.java | 4 -
.../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 +-
.../dotnet/PlatformDotNetConfiguration.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 360 ++-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 95 +-
.../messages/TcpDiscoveryAbstractMessage.java | 37 +
.../TcpDiscoveryStatusCheckMessage.java | 11 +
.../java/org/jsr166/ConcurrentHashMap8.java | 2 +-
.../java/org/jsr166/ConcurrentLinkedDeque8.java | 2 +-
.../org/jsr166/ConcurrentLinkedHashMap.java | 195 +-
.../resources/META-INF/classnames.properties | 196 +-
.../GridCacheAffinityBackupsSelfTest.java | 8 +
.../store/GridCacheBalancingStoreSelfTest.java | 220 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 145 +-
.../portable/TestCachingMetadataHandler.java | 45 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
.../GridCacheMissingCommitVersionSelfTest.java | 40 +-
.../processors/cache/GridCacheTestEntryEx.java | 3 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 2 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 30 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 21 +-
...gniteCachePutRetryTransactionalSelfTest.java | 10 +
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +-
.../GridCacheRebalancingAsyncSelfTest.java | 68 +
.../GridCacheRebalancingSyncSelfTest.java | 506 ++++
...eRebalancingUnmarshallingFailedSelfTest.java | 147 ++
.../GridCacheReplicatedPreloadSelfTest.java | 22 +-
.../GridCachePortableStoreAbstractSelfTest.java | 2 +-
.../continuous/GridEventConsumeSelfTest.java | 2 +-
...dBoundedConcurrentLinkedHashMapSelfTest.java | 2 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 62 +-
.../platform/PlatformComputeBinarizable.java | 42 +
.../PlatformComputeBinarizableArgTask.java | 119 +
.../platform/PlatformComputeEchoTask.java | 12 +-
.../PlatformComputeJavaBinarizable.java | 39 +
.../platform/PlatformComputeJavaPortable.java | 39 -
.../platform/PlatformComputePortable.java | 42 -
.../PlatformComputePortableArgTask.java | 119 -
.../tcp/TcpDiscoveryMultiThreadedTest.java | 158 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 476 +++-
.../spi/discovery/tcp/TestTcpDiscoverySpi.java | 46 +
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 28 +-
.../testframework/junits/GridAbstractTest.java | 32 +-
.../junits/common/GridCommonAbstractTest.java | 25 +-
.../testsuites/IgniteCacheTestSuite3.java | 4 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 104 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 18 +-
.../Apache.Ignite.Benchmarks.csproj | 4 +-
.../Apache.Ignite.Benchmarks/BenchmarkRunner.cs | 4 +-
.../Binary/BinarizableReadBenchmark.cs | 125 +
.../Binary/BinarizableWriteBenchmark.cs | 135 ++
.../Interop/PlatformBenchmarkBase.cs | 8 +-
.../Portable/PortableReadBenchmark.cs | 126 -
.../Portable/PortableWriteBenchmark.cs | 135 --
.../Apache.Ignite.Core.Tests.csproj | 27 +-
.../Apache.Ignite.Core.Tests.nunit | 7 +
.../Binary/BinaryBuilderSelfTest.cs | 1721 ++++++++++++++
.../Binary/BinarySelfTest.cs | 2157 ++++++++++++++++++
.../Binary/BinaryStructureTest.cs | 250 ++
.../BinaryConfigurationTest.cs | 173 ++
.../Cache/CacheAbstractTest.cs | 94 +-
.../Cache/CacheAffinityTest.cs | 4 +-
.../Cache/CacheDynamicStartTest.cs | 6 +-
.../Cache/Query/CacheQueriesTest.cs | 95 +-
.../Continuous/ContinuousQueryAbstractTest.cs | 287 ++-
.../ContinuousQueryNoBackupAbstractTest.cs | 4 +-
.../Cache/Store/CacheStoreTest.cs | 101 +-
.../Compute/AbstractTaskTest.cs | 8 +-
.../Compute/BinarizableClosureTaskTest.cs | 185 ++
.../Compute/BinarizableTaskTest.cs | 269 +++
.../Compute/ComputeApiTest.cs | 84 +-
.../Compute/FailoverTaskSelfTest.cs | 18 +-
.../Forked/ForkedBinarizableClosureTaskTest.cs | 30 +
.../Forked/ForkedPortableClosureTaskTest.cs | 30 -
.../Compute/Forked/ForkedResourceTaskTest.cs | 3 -
.../Forked/ForkedSerializableClosureTaskTest.cs | 3 -
.../Compute/PortableClosureTaskTest.cs | 217 --
.../Compute/PortableTaskTest.cs | 269 ---
.../Compute/TaskAdapterTest.cs | 14 +-
.../Compute/TaskResultTest.cs | 46 +-
.../Config/Compute/compute-grid1.xml | 6 +-
.../Config/Compute/compute-standalone.xml | 14 +-
.../Apache.Ignite.Core.Tests/Config/binary.xml | 56 +
.../Config/cache-binarizables.xml | 78 +
.../Config/cache-portables.xml | 78 -
.../Config/cache-query-continuous.xml | 8 +-
.../Config/marshaller-explicit.xml | 47 +
.../Config/marshaller-portable.xml | 43 -
.../native-client-test-cache-parallel-store.xml | 2 +-
.../Config/native-client-test-cache-store.xml | 6 +-
.../Config/native-client-test-cache.xml | 51 -
.../Config/portable.xml | 56 -
.../Dataload/DataStreamerTest.cs | 42 +-
.../Apache.Ignite.Core.Tests/EventsTest.cs | 16 +-
.../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 28 +-
.../Apache.Ignite.Core.Tests/FutureTest.cs | 10 +-
.../Apache.Ignite.Core.Tests/MarshallerTest.cs | 10 +-
.../Portable/PortableApiSelfTest.cs | 1777 ---------------
.../Portable/PortableSelfTest.cs | 2157 ------------------
.../Portable/PortableStructureTest.cs | 250 --
.../PortableConfigurationTest.cs | 173 --
.../Query/BinarizablePerson.cs | 69 +
.../Query/ImplicitBinarizablePerson.cs | 46 +
.../Query/ImplicitPortablePerson.cs | 46 -
.../Query/NoDefBinarizablePerson.cs | 35 +
.../Query/NoDefPortablePerson.cs | 35 -
.../Query/PortablePerson.cs | 69 -
.../Services/ServiceProxyTest.cs | 130 +-
.../Services/ServicesTest.cs | 88 +-
.../TypeResolverTest.cs | 20 +-
.../Cache/Event/ICacheEntryEvent.cs | 7 +-
.../Apache.Ignite.Core/Cache/Query/ScanQuery.cs | 15 +-
.../Impl/Binary/BinaryReader.cs | 43 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 13 +-
.../Impl/Cache/Event/CacheEntryCreateEvent.cs | 6 +
.../Impl/Cache/Event/CacheEntryRemoveEvent.cs | 6 +
.../Impl/Cache/Event/CacheEntryUpdateEvent.cs | 6 +
.../Query/Continuous/ContinuousQueryUtils.cs | 37 +-
.../Impl/Compute/ComputeImpl.cs | 12 +-
.../Impl/Compute/ComputeTaskHolder.cs | 79 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 20 +-
.../examples/Config/example-cache-query.xml | 12 +-
.../dotnet/examples/Config/example-cache.xml | 12 +-
modules/rest-http/pom.xml | 11 +
.../visor/commands/open/VisorOpenCommand.scala | 14 +-
.../scala/org/apache/ignite/visor/visor.scala | 3 +-
modules/yardstick/README.txt | 16 +-
.../config/benchmark-multicast.properties | 9 +-
.../yardstick/config/benchmark-store.properties | 86 +-
.../yardstick/config/ignite-store-config.xml | 31 +-
.../yardstick/IgniteBenchmarkArguments.java | 2 +-
.../ignite/yardstick/IgniteBenchmarkUtils.java | 75 +
.../org/apache/ignite/yardstick/IgniteNode.java | 23 +-
.../IgniteAccountSerializableTxBenchmark.java | 11 +-
.../cache/IgniteAccountTxBenchmark.java | 11 +-
.../cache/IgniteGetAllPutAllTxBenchmark.java | 73 +
.../cache/IgnitePutGetTxBenchmark.java | 41 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 10 +
.../cache/IgnitePutTxPrimaryOnlyBenchmark.java | 65 +
.../IgnitePutTxSkipLocalBackupBenchmark.java | 65 +
.../cache/WaitMapExchangeFinishCallable.java | 95 +
...IgniteTransactionalWriteInvokeBenchmark.java | 41 +-
.../IgniteTransactionalWriteReadBenchmark.java | 41 +-
modules/zookeeper/pom.xml | 2 +-
parent/pom.xml | 1 +
226 files changed, 14554 insertions(+), 10001 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a024304/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a024304/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a024304/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
index 2630a40,40b6252..60c135d
---
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
@@@ -67,11 -66,6 +67,10 @@@ public class BinaryTypeImpl implements
return meta.affinityKeyFieldName();
}
+ /** {@inheritDoc} */
+ public PortableContext context() {
+ return ctx;
+ }
-
/**
* @return Metadata.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a024304/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a024304/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
index 93e9a8a,05d3515..a5c3ad2
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
@@@ -33,8 -33,8 +33,9 @@@ import org.apache.ignite.events.JobEven
import org.apache.ignite.events.SwapSpaceEvent;
import org.apache.ignite.events.TaskEvent;
import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.portable.BinaryTypeImpl;
import org.apache.ignite.internal.portable.GridPortableMarshaller;
-import org.apache.ignite.internal.portable.BinaryMetadata;
++import org.apache.ignite.internal.portable.BinaryMetaDataImpl;
import org.apache.ignite.internal.portable.BinaryRawReaderEx;
import org.apache.ignite.internal.portable.BinaryRawWriterEx;
import
org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a024304/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
----------------------------------------------------------------------
diff --cc
modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
index 6cb87ad,e373b89..9755033
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
@@@ -67,10 -67,9 +67,10 @@@
</bean>
</property>
- <!-- Portable marshaller configuration -->
+ <!-- Binary marshaller configuration -->
<property name="marshaller">
<bean
class="org.apache.ignite.marshaller.portable.PortableMarshaller">
+ <property name="compactFooter" value="false" />
<property name="typeConfigurations">
<list>
<bean
class="org.apache.ignite.binary.BinaryTypeConfiguration">
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a024304/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
----------------------------------------------------------------------
