ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [34/35] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884
Date Thu, 28 Apr 2016 13:02:18 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d69d41e6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d69d41e6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d69d41e6

Branch: refs/heads/ignite-db-x-10884
Commit: d69d41e6f27f1a1290500145efbe03a0402c471a
Parents: aea1c17 c457370
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Apr 28 16:01:23 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Apr 28 16:01:23 2016 +0300

----------------------------------------------------------------------
 examples/config/filesystem/example-igfs.xml     |    3 -
 .../CacheContinuousAsyncQueryExample.java       |  138 ++
 .../datagrid/CacheContinuousQueryExample.java   |   13 +-
 .../datastructures/IgniteLockExample.java       |  293 +++
 .../ignite/examples/CacheExamplesSelfTest.java  |    8 +
 .../internal/benchmarks/model/IntValue.java     |   19 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   17 +
 .../java/org/apache/ignite/IgniteCondition.java |  338 +++
 .../main/java/org/apache/ignite/IgniteLock.java |  489 +++++
 .../apache/ignite/IgniteSystemProperties.java   |   16 +-
 .../ignite/cache/query/ContinuousQuery.java     |   27 +
 .../org/apache/ignite/compute/ComputeJob.java   |    2 +-
 .../ignite/compute/ComputeJobAfterSend.java     |    2 +-
 .../compute/ComputeJobBeforeFailover.java       |    2 +-
 .../ignite/compute/ComputeJobContext.java       |    2 +-
 .../compute/ComputeJobContinuationAdapter.java  |   12 +-
 .../ignite/compute/ComputeLoadBalancer.java     |   12 +-
 .../org/apache/ignite/compute/ComputeTask.java  |   26 +-
 .../ignite/compute/ComputeTaskAdapter.java      |    8 +-
 .../compute/ComputeTaskNoResultCache.java       |    6 +-
 .../ignite/compute/ComputeTaskSession.java      |    4 +-
 .../ignite/compute/ComputeTaskSplitAdapter.java |    8 +-
 .../apache/ignite/compute/gridify/Gridify.java  |    2 +-
 .../configuration/CacheConfiguration.java       |    2 +
 .../configuration/IgniteConfiguration.java      |   32 +
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |    6 +-
 .../ignite/internal/GridKernalContext.java      |    8 +
 .../ignite/internal/GridKernalContextImpl.java  |   16 +-
 .../ignite/internal/GridTaskSessionImpl.java    |    2 +-
 .../ignite/internal/IgniteEventsImpl.java       |   11 +-
 .../apache/ignite/internal/IgniteKernal.java    |   55 +-
 .../ignite/internal/IgniteMessagingImpl.java    |    7 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   18 +-
 .../ignite/internal/binary/BinaryContext.java   |    4 +
 .../internal/binary/BinaryObjectImpl.java       |   14 +
 .../internal/binary/GridBinaryMarshaller.java   |    3 +
 .../internal/direct/DirectMessageReader.java    |    5 +
 .../processors/cache/GridCacheAdapter.java      |  444 ++--
 .../cache/GridCacheAffinityManager.java         |   10 +-
 .../cache/GridCacheClearAllRunnable.java        |    2 +-
 .../cache/GridCacheConcurrentMap.java           | 1996 +----------------
 .../cache/GridCacheConcurrentMapImpl.java       |  344 +++
 .../processors/cache/GridCacheContext.java      |   56 +-
 .../cache/GridCacheDeploymentManager.java       |    2 +-
 .../processors/cache/GridCacheEntryEx.java      |    5 +-
 .../processors/cache/GridCacheEntrySet.java     |  113 -
 .../cache/GridCacheEvictionManager.java         |    2 +-
 .../processors/cache/GridCacheKeySet.java       |  104 -
 .../processors/cache/GridCacheMapEntry.java     |   71 +-
 .../processors/cache/GridCacheProcessor.java    |    1 -
 .../processors/cache/GridCacheProxyImpl.java    |    2 +-
 .../processors/cache/GridCacheUtils.java        |    1 -
 .../processors/cache/GridNoStorageCacheMap.java |  107 +
 .../processors/cache/IgniteInternalCache.java   |    2 +-
 .../processors/cache/KeyCacheObject.java        |   11 +
 .../processors/cache/KeyCacheObjectImpl.java    |   32 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |   24 +-
 .../GridDistributedCacheAdapter.java            |    4 +-
 .../distributed/GridDistributedLockRequest.java |   19 +-
 .../GridDistributedTxRemoteAdapter.java         |    1 -
 .../GridDistributedUnlockRequest.java           |   16 +-
 .../dht/GridCachePartitionedConcurrentMap.java  |  191 ++
 .../dht/GridClientPartitionTopology.java        |    7 -
 .../distributed/dht/GridDhtCacheAdapter.java    |   76 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   25 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  152 +-
 .../distributed/dht/GridDhtLockRequest.java     |   16 +-
 .../dht/GridDhtPartitionTopology.java           |    7 -
 .../dht/GridDhtPartitionTopologyImpl.java       |  303 ++-
 .../distributed/dht/GridDhtUnlockRequest.java   |   15 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |  120 --
 .../dht/GridPartitionedGetFuture.java           |    2 +-
 .../dht/GridPartitionedSingleGetFuture.java     |    2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  173 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  121 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   55 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |    6 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   31 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   13 +-
 .../dht/preloader/GridDhtPartitionDemander.java |    2 +-
 .../dht/preloader/GridDhtPartitionSupplier.java |    8 +-
 .../distributed/near/GridNearAtomicCache.java   |    3 +-
 .../distributed/near/GridNearCacheAdapter.java  |   94 +-
 .../distributed/near/GridNearGetFuture.java     |    2 +-
 .../distributed/near/GridNearGetRequest.java    |   45 +-
 .../distributed/near/GridNearLockRequest.java   |   16 +-
 .../near/GridNearSingleGetRequest.java          |   24 +-
 .../distributed/near/GridNearUnlockRequest.java |   21 +-
 .../processors/cache/local/GridLocalCache.java  |    7 +-
 .../local/atomic/GridLocalAtomicCache.java      |   24 +-
 .../continuous/CacheContinuousQueryEvent.java   |    7 +
 .../continuous/CacheContinuousQueryHandler.java |  446 +++-
 .../CacheContinuousQueryListener.java           |    6 +-
 .../continuous/CacheContinuousQueryManager.java |   63 +-
 .../cache/transactions/IgniteInternalTx.java    |    1 -
 .../cache/transactions/IgniteTxAdapter.java     |    1 -
 .../cache/transactions/IgniteTxEntry.java       |   35 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   10 +
 .../IgniteCacheObjectProcessorImpl.java         |   58 +-
 .../processors/cluster/GridUpdateNotifier.java  |    3 +-
 .../continuous/GridContinuousProcessor.java     |   29 +-
 .../datastructures/DataStructuresProcessor.java |  158 +-
 .../GridCacheAtomicReferenceImpl.java           |    2 +-
 .../datastructures/GridCacheLockEx.java         |   52 +
 .../datastructures/GridCacheLockImpl.java       | 1538 ++++++++++++++
 .../datastructures/GridCacheLockState.java      |  353 +++
 .../datastructures/GridCacheSemaphoreImpl.java  |   33 +
 .../internal/processors/job/GridJobWorker.java  |    4 +-
 .../platform/PlatformAbstractBootstrap.java     |   17 +-
 .../processors/platform/PlatformBootstrap.java  |    6 +-
 .../platform/PlatformContextImpl.java           |    1 -
 .../PlatformDefaultJavaObjectFactory.java       |   62 +
 .../processors/platform/PlatformIgnition.java   |   18 +-
 .../platform/PlatformJavaObjectFactoryEx.java   |   36 +
 .../PlatformJavaObjectFactoryProxy.java         |  192 ++
 .../PlatformJavaObjectSingletonFactory.java     |   48 +
 .../platform/PlatformNoopProcessor.java         |   10 +
 .../processors/platform/PlatformProcessor.java  |   19 +
 .../platform/PlatformProcessorImpl.java         |   41 +-
 .../query/PlatformContinuousQueryImpl.java      |   50 +-
 .../utils/PlatformConfigurationUtils.java       |   98 +-
 .../platform/utils/PlatformUtils.java           |   69 +
 .../GridResourceJobContextInjector.java         |    4 +-
 .../handlers/query/QueryCommandHandler.java     |    8 +-
 .../processors/task/GridTaskProcessor.java      |    6 +-
 .../processors/task/GridTaskWorker.java         |   10 +-
 .../org/apache/ignite/internal/util/F0.java     |    4 +-
 .../ignite/internal/util/IgniteUtils.java       |    7 +-
 .../internal/util/PartitionedReadOnlySet.java   |   71 +
 .../util/StripedCompositeReadWriteLock.java     |   10 +
 .../ignite/internal/util/lang/GridFunc.java     |    7 +-
 .../apache/ignite/internal/util/typedef/PN.java |    2 +-
 .../ignite/internal/visor/cache/VisorCache.java |    6 +-
 .../apache/ignite/lang/IgniteAsyncCallback.java |  111 +
 .../platform/PlatformJavaObjectFactory.java     |   36 +
 .../extensions/communication/MessageReader.java |    9 +
 .../ignite/spi/IgniteNodeValidationResult.java  |    8 +-
 .../jobstealing/JobStealingDisabled.java        |    2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |    6 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  255 ++-
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |   10 +
 .../tcp/internal/TcpDiscoveryNode.java          |    2 +-
 .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java |   13 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |    4 +-
 .../TcpDiscoveryCustomEventMessage.java         |   13 +-
 .../TcpDiscoveryJoinRequestMessage.java         |   16 +-
 .../TcpDiscoveryStatusCheckMessage.java         |   18 +-
 .../spi/loadbalancing/LoadBalancingSpi.java     |    8 +-
 .../adaptive/AdaptiveLoadBalancingSpi.java      |   20 +-
 .../adaptive/AdaptiveLoadProbe.java             |    2 +-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |    6 +-
 .../WeightedRandomLoadBalancingSpi.java         |   14 +-
 .../thread/IgniteStripedThreadPoolExecutor.java |  164 +-
 .../resources/META-INF/classnames.properties    |    2 +
 modules/core/src/test/config/igfs-loopback.xml  |    7 -
 modules/core/src/test/config/igfs-shmem.xml     |    7 -
 .../GridEventStorageCheckAllEventsSelfTest.java |    2 +-
 .../IgniteClientReconnectAtomicsTest.java       |   58 +
 .../GridCachePreloadingEvictionsSelfTest.java   |    4 +-
 .../processors/cache/GridCacheTestEntryEx.java  |    4 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |    2 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |    3 +-
 .../IgniteDynamicClientCacheStartSelfTest.java  |   10 -
 .../IgniteTxStoreExceptionAbstractSelfTest.java |    8 +-
 .../GridCacheBinaryObjectsAbstractSelfTest.java |    2 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  208 +-
 ...actQueueFailoverDataConsistencySelfTest.java |    2 +-
 .../GridCacheQueueCleanupSelfTest.java          |    4 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |   37 -
 .../GridCacheSetAbstractSelfTest.java           |    5 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    8 +-
 .../IgniteClientDataStructuresAbstractTest.java |   70 +
 .../IgniteDataStructureUniqueNameTest.java      |   16 +-
 .../IgniteLockAbstractSelfTest.java             | 1629 ++++++++++++++
 .../IgniteSemaphoreAbstractSelfTest.java        |   31 +
 .../local/IgniteLocalLockSelfTest.java          |  110 +
 .../IgnitePartitionedLockSelfTest.java          |   33 +
 .../IgnitePartitionedQueueNoBackupsTest.java    |    6 +-
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |    6 +-
 .../IgniteReplicatedLockSelfTest.java           |   33 +
 .../distributed/GridCacheLockAbstractTest.java  |    2 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |    9 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |    4 +-
 ...FailoverAtomicPrimaryWriteOrderSelfTest.java |   50 +
 ...sQueryAsyncFailoverTxReplicatedSelfTest.java |   37 +
 ...eContinuousQueryAsyncFailoverTxSelfTest.java |   44 +
 ...eContinuousQueryAsyncFilterListenerTest.java |  986 +++++++++
 ...ryFactoryAsyncFilterRandomOperationTest.java |  131 ++
 ...usQueryFactoryFilterRandomOperationTest.java |  725 +++++++
 .../CacheContinuousQueryFactoryFilterTest.java  |  714 -------
 ...ContinuousQueryFailoverAbstractSelfTest.java |   63 +-
 .../CacheContinuousQueryLostPartitionTest.java  |   14 +
 ...ontinuousQueryOperationFromCallbackTest.java |  627 ++++++
 .../CacheContinuousQueryOrderingEventTest.java  |  722 +++++++
 ...acheContinuousQueryRandomOperationsTest.java |   23 +
 ...gniteComputeConfigVariationsFullApiTest.java | 2009 ++++++++++++++++++
 .../processors/igfs/IgfsAbstractSelfTest.java   |   10 +-
 ...GridServiceProxyClientReconnectSelfTest.java |    2 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |   53 +
 .../GridTcpCommunicationBenchmark.java          |   26 +-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |    6 +-
 .../platform/PlatformCacheEntryEventFilter.java |  193 ++
 .../PlatformCacheEntryEventFilterFactory.java   |   59 +
 ...latformDefaultJavaObjectFactorySelfTest.java |  185 ++
 .../PlatformJavaObjectFactoryProxySelfTest.java |  220 ++
 .../platform/PlatformStartIgniteTask.java       |    1 +
 .../ignite/platform/PlatformStopIgniteTask.java |    1 +
 .../platform/javaobject/TestJavaObject.java     |  271 +++
 .../javaobject/TestJavaObjectNoDefaultCtor.java |   49 +
 .../TestJavaObjectNoDefaultCtorFactory.java     |   68 +
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   34 +
 .../properties/NotStringSystemPropertyTest.java |  124 ++
 .../configvariations/ConfigVariations.java      |    2 +-
 .../junits/GridTestKernalContext.java           |    1 +
 .../IgniteConfigVariationsAbstractTest.java     |   43 +-
 .../ignite/testframework/junits/IgniteMock.java |   10 +
 .../junits/multijvm/IgniteProcessProxy.java     |    7 +
 .../ignite/testsuites/IgniteBasicTestSuite.java |    4 +
 .../IgniteCacheDataStructuresSelfTestSuite.java |    6 +
 ...teBasicConfigVariationsFullApiTestSuite.java |   72 +
 .../testsuites/IgnitePlatformsTestSuite.java    |   41 +
 .../IgniteBinaryCacheQueryTestSuite.java        |    1 -
 .../IgniteCacheQuerySelfTestSuite3.java         |   14 +-
 .../IgniteCacheQuerySelfTestSuite4.java         |    7 +
 .../common/include/ignite/common/concurrent.h   |  176 +-
 .../cpp/common/include/ignite/common/exports.h  |    2 +
 .../cpp/common/include/ignite/common/java.h     |    5 +
 .../platforms/cpp/common/project/vs/module.def  |    2 +
 modules/platforms/cpp/common/src/concurrent.cpp |   13 +-
 modules/platforms/cpp/common/src/exports.cpp    |    8 +
 modules/platforms/cpp/common/src/java.cpp       |   30 +
 .../cpp/core-test/src/concurrent_test.cpp       |   93 +
 .../Apache.Ignite.Core.Tests.csproj             |    2 +
 .../Cache/CacheConfigurationTest.cs             |   49 +
 .../Cache/CacheNearTest.cs                      |  188 ++
 .../Cache/Query/CacheLinqTest.cs                |    2 -
 .../Continuous/ContinuousQueryJavaFilterTest.cs |  323 +++
 .../Apache.Ignite.Core.Tests/EventsTest.cs      |    4 +-
 .../IgniteConfigurationSerializerTest.cs        |    3 +-
 .../IgniteConfigurationTest.cs                  |    2 +
 .../dotnet/Apache.Ignite.Core.Tests/app.config  |    4 +
 .../Apache.Ignite.Core.csproj                   |   16 +-
 .../Cache/Configuration/CacheConfiguration.cs   |   15 +
 .../Configuration/NearCacheConfiguration.cs     |   75 +
 .../Cache/Eviction/EvictionPolicyBase.cs        |  126 ++
 .../Cache/Eviction/FifoEvictionPolicy.cs        |   39 +
 .../Cache/Eviction/IEvictionPolicy.cs           |   32 +
 .../Cache/Eviction/LruEvictionPolicy.cs         |   39 +
 .../Continuous/ContinuousQueryExtensions.cs     |   42 +
 .../Apache.Ignite.Core/Events/CacheEvent.cs     |    9 +-
 .../dotnet/Apache.Ignite.Core/IIgnite.cs        |   42 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   34 +
 .../Impl/Binary/BinaryUtils.cs                  |    3 +
 .../Impl/Binary/Marshaller.cs                   |    2 +
 .../Cache/Event/JavaCacheEntryEventFilter.cs    |   49 +
 .../Continuous/ContinuousQueryHandleImpl.cs     |   17 +-
 .../Common/PlatformJavaObjectFactoryProxy.cs    |  106 +
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |   62 +
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      |   25 +
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |    6 +
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   32 +
 .../Apache.Ignite.Core/Interop/JavaObject.cs    |   80 +
 .../Apache.Ignite.Linq.nuspec                   |    5 +-
 .../scalar/pimps/ScalarProjectionPimp.scala     |    4 +-
 .../scalar/pimps/ScalarTaskThreadContext.scala  |    4 +-
 .../ignite/schema/generator/CodeGenerator.java  |   52 +-
 .../ignite/schema/generator/XmlGenerator.java   |   45 +-
 .../schema/parser/DatabaseMetadataParser.java   |    6 +-
 .../ignite/schema/ui/SchemaImportApp.java       |   30 +-
 .../schema/test/AbstractSchemaImportTest.java   |   10 +-
 .../schema/test/generator/XmlGeneratorTest.java |    4 +-
 .../apache/ignite/schema/test/model/Objects.txt |   31 +-
 .../ignite/schema/test/model/Primitives.txt     |   31 +-
 .../org/apache/ignite/schema/test/model/Tst.txt |   31 +-
 .../schema/test/model/ignite-type-metadata.xml  |   42 +
 .../test/parser/DbMetadataParserTest.java       |    2 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   11 +
 .../uri/GridUriDeploymentFileProcessor.java     |    2 +-
 .../commands/top/VisorTopologyCommand.scala     |    2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |    2 +-
 .../cache/CacheEntryEventAsyncProbe.java        |   61 +
 .../yardstick/cache/CacheEntryEventProbe.java   |   33 +-
 282 files changed, 18443 insertions(+), 4577 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index a3798d3,8c1a750..9916f5c
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@@ -107,9 -105,7 +106,8 @@@ import org.apache.ignite.internal.util.
  import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
  import org.apache.ignite.internal.util.future.GridFinishedFuture;
  import org.apache.ignite.internal.util.future.GridFutureAdapter;
 +import org.apache.ignite.internal.util.lang.GridCloseableIterator;
  import org.apache.ignite.internal.util.lang.GridClosureException;
- import org.apache.ignite.internal.util.lang.GridTriple;
  import org.apache.ignite.internal.util.tostring.GridToStringExclude;
  import org.apache.ignite.internal.util.typedef.C1;
  import org.apache.ignite.internal.util.typedef.C2;

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index bbc1283,3d5052b..a4b0c83
mode 100644,100755..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 4a41d71,3ac4a41..6b5eac3
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@@ -671,26 -658,24 +674,26 @@@ public class GridDhtLocalPartition impl
  
          boolean rec = cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_UNLOADED);
  
-         Iterator<GridDhtCacheEntry> it = map.values().iterator();
+         Iterator<GridDhtCacheEntry> it = (Iterator)map.allEntries().iterator();
  
 +        // TODO GG-10884: need pass old value to indexing?
          GridCloseableIterator<Map.Entry<byte[], GridCacheSwapEntry>> swapIt
= null;
 -
 -        if (swap && GridQueryProcessor.isEnabled(cctx.config())) { // Indexing needs
to unswap cache values.
 -            Iterator<GridDhtCacheEntry> unswapIt = null;
 -
 -            try {
 -                swapIt = cctx.swap().iterator(id);
 -                unswapIt = unswapIterator(swapIt);
 -            }
 -            catch (Exception e) {
 -                U.error(log, "Failed to clear swap for evicted partition: " + this, e);
 -            }
 -
 -            if (unswapIt != null)
 -                it = F.concat(it, unswapIt);
 -        }
 +//        GridCloseableIterator<Map.Entry<byte[], GridCacheSwapEntry>> swapIt
= null;
 +//
 +//        if (swap && GridQueryProcessor.isEnabled(cctx.config())) { // Indexing
needs to unswap cache values.
 +//            Iterator<GridDhtCacheEntry> unswapIt = null;
 +//
 +//            try {
 +//                swapIt = cctx.swap().iterator(id);
 +//                unswapIt = unswapIterator(swapIt);
 +//            }
 +//            catch (Exception e) {
 +//                U.error(log, "Failed to clear swap for evicted partition: " + this, e);
 +//            }
 +//
 +//            if (unswapIt != null)
 +//                it = F.concat(it, unswapIt);
 +//        }
  
          GridCacheObsoleteEntryExtras extras = new GridCacheObsoleteEntryExtras(clearVer);
  
@@@ -727,7 -710,8 +728,7 @@@
                      }
                  }
                  catch (GridDhtInvalidPartitionException e) {
-                     assert map.isEmpty() && state() == EVICTED: "Invalid error [e="
+ e + ", part=" + this + ']';
+                     assert isEmpty() && state() == EVICTED : "Invalid error [e="
+ e + ", part=" + this + ']';
 -                    assert swapEmpty() : "Invalid error when swap is not cleared [e=" +
e + ", part=" + this + ']';
  
                      break; // Partition is already concurrently cleared and evicted.
                  }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 7087ec6,9f5fbfb..b427f81
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@@ -28,9 -28,7 +28,8 @@@ import java.util.List
  import java.util.Map;
  import java.util.Set;
  import java.util.UUID;
- import java.util.concurrent.ConcurrentMap;
  import org.apache.ignite.IgniteCheckedException;
 +import org.apache.ignite.IgniteException;
  import org.apache.ignite.IgniteLogger;
  import org.apache.ignite.cluster.ClusterNode;
  import org.apache.ignite.events.DiscoveryEvent;
@@@ -654,43 -694,20 +696,30 @@@ class GridDhtPartitionTopologyImpl impl
                          "local node (often may be caused by inconsistent 'key.hashCode()'
implementation) " +
                          "[part=" + p + ", topVer=" + topVer + ", this.topVer=" + this.topVer
+ ']');
  
-                 boolean created = false;
- 
-                 lock.writeLock().lock();
+                 locParts[p] = loc = new GridDhtLocalPartition(cctx, p, entryFactory);
  
-                 try {
-                     GridDhtLocalPartition old = locParts.putIfAbsent(p,
-                         loc = new GridDhtLocalPartition(cctx, p));
- 
-                     if (old != null)
-                         loc = old;
-                     else {
-                         if (updateSeq)
-                             this.updateSeq.incrementAndGet();
+                 if (updateSeq)
+                     this.updateSeq.incrementAndGet();
  
-                         created = true;
- 
-                         if (log.isDebugEnabled())
-                             log.debug("Created local partition: " + loc);
-                     }
-                 }
-                 finally {
-                     lock.writeLock().unlock();
-                 }
- 
-                 if (created && cctx.shared().pageStore() != null) {
-                     try {
-                         cctx.shared().pageStore().onPartitionCreated(cctx.cacheId(), p);
-                     }
-                     catch (IgniteCheckedException e) {
-                         // TODO ignite-db
-                         throw new IgniteException(e);
-                     }
-                 }
+                 if (log.isDebugEnabled())
+                     log.debug("Created local partition: " + loc);
              }
+         }
+         finally {
+             lock.writeLock().unlock();
+         }
  
-             return loc;
++        if (created && cctx.shared().pageStore() != null) {
++            try {
++                cctx.shared().pageStore().onPartitionCreated(cctx.cacheId(), p);
++            }
++            catch (IgniteCheckedException e) {
++                // TODO ignite-db
++                throw new IgniteException(e);
++            }
 +        }
++
+         return loc;
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 4885180,ee909e6..5ad5750
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@@ -186,9 -184,17 +184,14 @@@ public class GridDhtAtomicCache<K, V> e
                  int hash,
                  CacheObject val
              ) {
 -                if (ctx.useOffheapEntry())
 -                    return new GridDhtAtomicOffHeapCacheEntry(ctx, topVer, key, hash, val);
 -
                  return new GridDhtAtomicCacheEntry(ctx, topVer, key, hash, val);
              }
-         });
+         };
+     }
+ 
+     /** {@inheritDoc} */
+     @Override protected void init() {
+         super.init();
  
          updateReplyClos = new CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse>()
{
              @SuppressWarnings("ThrowableResultOfMethodCallIgnored")

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index da5677a,0ae434a..7670b48
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@@ -126,9 -125,12 +125,9 @@@ public class GridDhtColocatedCache<K, V
                  int hash,
                  CacheObject val
              ) {
 -                if (ctx.useOffheapEntry())
 -                    return new GridDhtColocatedOffHeapCacheEntry(ctx, topVer, key, hash,
val);
 -
                  return new GridDhtColocatedCacheEntry(ctx, topVer, key, hash, val);
              }
-         });
+         };
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 285a335,7971173..cc87270
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@@ -104,9 -99,14 +99,9 @@@ public abstract class GridNearCacheAdap
                  int hash,
                  CacheObject val
              ) {
 -                // Can't hold any locks here - this method is invoked when
 -                // holding write-lock on the whole cache map.
 -                if (ctx.useOffheapEntry())
 -                    return new GridNearOffHeapCacheEntry(ctx, key, hash, val);
 -
                  return new GridNearCacheEntry(ctx, key, hash, val);
              }
-         });
+         };
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 56702b6,9b47e59..ee7c157
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@@ -145,49 -175,9 +176,48 @@@ public class IgniteCacheObjectProcessor
      }
  
      /** {@inheritDoc} */
 +    @Override public KeyCacheObject toKeyCacheObject(CacheObjectContext ctx, byte type,
byte[] bytes) throws IgniteCheckedException {
 +        switch (type) {
 +            case CacheObject.TYPE_BYTE_ARR:
 +                throw new IllegalArgumentException("Byte arrays cannot be used as cache
keys.");
 +
 +            case CacheObject.TYPE_REGULAR:
 +                return new KeyCacheObjectImpl(ctx.processor().unmarshal(ctx, bytes, null),
bytes);
 +        }
 +
 +        throw new IllegalArgumentException("Invalid object type: " + type);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public CacheObject toCacheObject(CacheObjectContext ctx, ByteBuffer buf) {
 +        int len = buf.getInt();
 +
 +        byte type = buf.get();
 +
 +        byte[] data = new byte[len];
 +
 +        buf.get(data);
 +
 +        return toCacheObject(ctx, type, data);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public KeyCacheObject toKeyCacheObject(CacheObjectContext ctx, ByteBuffer
buf) throws IgniteCheckedException {
 +        int len = buf.getInt();
 +
 +        byte type = buf.get();
 +
 +        byte[] data = new byte[len];
 +
 +        buf.get(data);
 +
 +        return toKeyCacheObject(ctx, type, data);
 +    }
 +
 +    /** {@inheritDoc} */
      @Nullable @Override public CacheObject toCacheObject(CacheObjectContext ctx,
          @Nullable Object obj,
-         boolean userObj)
-     {
+         boolean userObj) {
          if (obj == null || obj instanceof CacheObject)
              return (CacheObject)obj;
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
index 464aab0,b65b441..1974a55
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
@@@ -378,7 -378,7 +378,7 @@@ public abstract class IgniteTxStoreExce
                  assertEquals("Unexpected entry for grid [idx=" + i + ", entry=" + entry
+ ']', putBefore,
                      entry.hasValue());
                  assertEquals("Unexpected entry for grid [idx=" + i + ", entry=" + entry
+ ']', putBefore ? 1 : null,
-                     entry.rawGet());
 -                    entry.rawGetOrUnmarshal(false).value(cache.ctx.cacheObjectContext(),
false));
++                    entry.rawGet().value(cache.ctx.cacheObjectContext(), false));
              }
  
              if (cache.isNear()) {
@@@ -391,7 -391,7 +391,7 @@@
                      assertEquals("Unexpected entry for grid [idx=" + i + ", entry=" + entry
+ ']', putBefore,
                          entry.hasValue());
                      assertEquals("Unexpected entry for grid [idx=" + i + ", entry=" + entry
+ ']', putBefore ? 1 : null,
-                         entry.rawGet());
 -                        entry.rawGetOrUnmarshal(false).value(cache.ctx.cacheObjectContext(),
false));
++                        entry.rawGet().value(cache.ctx.cacheObjectContext(), false));
                  }
              }
          }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d69d41e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------


Mime
View raw message