Merge branch 'ignite-sprint-4' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-471
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44299b7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44299b7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44299b7f
Branch: refs/heads/ignite-471
Commit: 44299b7f68b14e880597654e7d17996831ad2e54
Parents: 787dd96 2dfc187
Author: Valentin Kulichenko <[email protected]>
Authored: Fri Apr 24 11:56:32 2015 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Fri Apr 24 11:56:32 2015 -0700
----------------------------------------------------------------------
.../examples/ScalarContinuationExample.scala | 10 +-
.../aop/aspectj/GridifyAspectJAspect.java | 2 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 2 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 2 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 2 +-
.../spring/GridifySetToValueSpringAspect.java | 2 +-
.../gridify/aop/spring/GridifySpringAspect.java | 2 +-
.../apache/ignite/cache/CacheInterceptor.java | 9 +-
.../cache/CacheServerNotFoundException.java | 12 +-
.../apache/ignite/cache/CachingProvider.java | 3 +
.../ignite/compute/ComputeJobContinuation.java | 2 +
.../configuration/CacheConfiguration.java | 30 +-
.../configuration/IgniteConfiguration.java | 107 ++
.../ignite/configuration/TopologyValidator.java | 35 +
.../ignite/events/CacheQueryExecutedEvent.java | 3 +-
.../ignite/events/CacheQueryReadEvent.java | 3 +-
.../ignite/internal/GridJobContextImpl.java | 100 +-
.../apache/ignite/internal/IgniteKernal.java | 15 +-
.../org/apache/ignite/internal/IgnitionEx.java | 14 +-
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../connection/GridClientNioTcpConnection.java | 9 +-
.../ClusterTopologyServerNotFoundException.java | 12 +-
.../managers/communication/GridIoManager.java | 33 +-
.../GridLifecycleAwareMessageFilter.java | 35 +
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../discovery/GridDiscoveryManager.java | 21 +-
.../eventstorage/GridEventStorageManager.java | 6 +
.../affinity/GridAffinityAssignmentCache.java | 11 +-
.../cache/CacheStoreBalancingWrapper.java | 6 +
.../processors/cache/GridCacheAdapter.java | 9 +-
.../cache/GridCacheAffinityManager.java | 12 -
.../processors/cache/GridCacheEntryEx.java | 4 +
.../cache/GridCacheEvictionManager.java | 11 +-
.../processors/cache/GridCacheIoManager.java | 6 +
.../processors/cache/GridCacheMapEntry.java | 20 +-
.../GridCachePartitionExchangeManager.java | 7 +-
.../processors/cache/GridCacheUtils.java | 53 +-
.../processors/cache/IgniteCacheProxy.java | 15 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../GridDistributedCacheAdapter.java | 20 +-
.../distributed/GridDistributedLockRequest.java | 99 +-
.../GridDistributedTxRemoteAdapter.java | 3 +
.../dht/GridDhtAffinityAssignmentResponse.java | 21 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 9 +-
.../distributed/dht/GridDhtLockFuture.java | 20 +-
.../distributed/dht/GridDhtLockRequest.java | 7 +-
.../distributed/dht/GridDhtTopologyFuture.java | 8 +
.../dht/GridDhtTransactionalCacheAdapter.java | 21 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 3 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 26 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 8 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 7 +-
.../dht/GridPartitionedGetFuture.java | 7 +
.../dht/atomic/GridDhtAtomicCache.java | 41 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 45 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +-
.../dht/colocated/GridDhtColocatedCache.java | 56 +-
.../colocated/GridDhtColocatedLockFuture.java | 42 +-
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 20 +
.../distributed/near/GridNearAtomicCache.java | 7 +-
.../distributed/near/GridNearCacheAdapter.java | 10 +-
.../distributed/near/GridNearCacheEntry.java | 10 +-
.../distributed/near/GridNearGetFuture.java | 17 +-
.../distributed/near/GridNearLockFuture.java | 41 +-
.../distributed/near/GridNearLockRequest.java | 7 +-
.../near/GridNearTransactionalCache.java | 45 +-
.../near/GridNearTxFinishFuture.java | 3 +
.../cache/distributed/near/GridNearTxLocal.java | 7 +-
.../near/GridNearTxPrepareFuture.java | 20 +
.../distributed/near/GridNearTxRemote.java | 7 +-
.../local/atomic/GridLocalAtomicCache.java | 59 +-
.../query/GridCacheDistributedQueryManager.java | 3 +
.../cache/query/GridCacheLocalQueryFuture.java | 3 +
.../query/GridCacheQueryFutureAdapter.java | 3 +
.../cache/query/GridCacheQueryManager.java | 20 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 3 +
.../cache/transactions/IgniteTxAdapter.java | 7 +-
.../cache/transactions/IgniteTxEntry.java | 72 +-
.../cache/transactions/IgniteTxHandler.java | 27 +-
.../transactions/IgniteTxLocalAdapter.java | 108 +-
.../cache/transactions/IgniteTxLocalEx.java | 4 +-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../closure/GridClosureProcessor.java | 16 +-
.../datastreamer/DataStreamProcessor.java | 28 +-
.../datastreamer/DataStreamerImpl.java | 3 +-
.../datastreamer/DataStreamerRequest.java | 38 +-
.../processors/igfs/IgfsFileWorkerBatch.java | 3 +
.../internal/processors/igfs/IgfsThread.java | 8 +-
.../processors/job/GridJobHoldListener.java | 6 +-
.../processors/job/GridJobProcessor.java | 28 +-
.../internal/processors/job/GridJobWorker.java | 32 +-
.../portable/GridPortableInputStream.java | 26 -
.../processors/query/GridQueryIndexing.java | 4 +-
.../processors/query/GridQueryProcessor.java | 5 +-
.../processors/rest/GridRestProcessor.java | 3 +
.../service/GridServiceProcessor.java | 9 +
.../processors/task/GridTaskWorker.java | 12 +
.../timeout/GridTimeoutProcessor.java | 3 +
.../ignite/internal/util/IgniteUtils.java | 22 +-
.../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 12 +-
.../ignite/internal/util/nio/GridNioServer.java | 6 +
.../apache/ignite/internal/util/typedef/X.java | 2 +-
.../ignite/internal/util/worker/GridWorker.java | 3 +
.../visor/misc/VisorResolveHostNameTask.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 6 +-
.../ignite/messaging/MessagingListenActor.java | 3 +
.../org/apache/ignite/spi/IgniteSpiThread.java | 3 +
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +
.../startup/cmdline/CommandLineStartup.java | 5 +-
.../startup/cmdline/CommandLineTransformer.java | 3 +
.../resources/META-INF/classnames.properties | 41 +-
.../internal/GridContinuousTaskSelfTest.java | 114 ++
.../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 518 ++++++-
.../processors/cache/GridCacheTestEntryEx.java | 2 +
.../cache/IgniteExchangeFutureHistoryTest.java | 77 ++
...gniteTopologyValidatorAbstractCacheTest.java | 183 +++
...iteTopologyValidatorAbstractTxCacheTest.java | 125 ++
...ValidatorNearPartitionedAtomicCacheTest.java | 30 +
...logyValidatorNearPartitionedTxCacheTest.java | 30 +
...logyValidatorPartitionedAtomicCacheTest.java | 49 +
...TopologyValidatorPartitionedTxCacheTest.java | 30 +
...ologyValidatorReplicatedAtomicCacheTest.java | 49 +
...eTopologyValidatorReplicatedTxCacheTest.java | 30 +
.../CacheNoValueClassOnServerNodeTest.java | 129 ++
...ridCachePartitionNotLoadedEventSelfTest.java | 22 +-
.../IgniteCachePutGetRestartAbstractTest.java | 234 ++++
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 +
...arDisabledFairAffinityPutGetRestartTest.java | 35 +
...iteCacheTxNearDisabledPutGetRestartTest.java | 30 +
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...micFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 1 +
...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 +
...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 -
...acheSortedEvictionPolicyPerformanceTest.java | 135 ++
.../GridCacheLocalIsolatedNodesSelfTest.java | 102 ++
.../DataStreamerMultiThreadedSelfTest.java | 101 ++
.../testframework/junits/GridAbstractTest.java | 15 +
.../IgniteCacheFailoverTestSuite.java | 4 +
.../IgniteCacheFullApiSelfTestSuite.java | 9 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 11 +-
.../IgniteTopologyValidatorTestSuit.java | 43 +
.../ignite/util/TestTcpCommunicationSpi.java | 54 +
.../CacheNoValueClassOnServerTestClient.java | 88 ++
.../apache/ignite/tests/p2p/cache/Person.java | 42 +
.../CacheConfigurationP2PTestClient.java | 1 -
.../processors/hadoop/HadoopDefaultJobInfo.java | 3 +
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 +
.../hadoop/jobtracker/HadoopJobTracker.java | 5 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 3 +
.../external/HadoopExternalTaskExecutor.java | 3 +
.../processors/hadoop/v2/HadoopV2Job.java | 11 +-
.../hadoop/v2/HadoopV2TaskContext.java | 9 +
.../processors/query/h2/IgniteH2Indexing.java | 6 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 37 +-
.../h2/twostep/GridReduceQueryExecutor.java | 34 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 1282 ------------------
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 237 +++-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 1 +
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 -
...GridCachePartitionedFieldsQuerySelfTest.java | 115 --
...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 -
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 +
...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 -
.../GridCacheReplicatedFieldsQuerySelfTest.java | 157 ---
...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 -
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 +
.../h2/GridIndexingSpiAbstractSelfTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
.../http/jetty/GridJettyRestHandler.java | 3 +
.../ignite/schema/generator/CodeGenerator.java | 60 +-
.../ignite/schema/ui/SchemaImportApp.java | 8 +-
.../ignite/internal/GridFactorySelfTest.java | 3 +-
.../uri/GridUriDeploymentClassLoader.java | 4 +-
pom.xml | 14 +-
186 files changed, 4539 insertions(+), 2268 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 37b683f,0d7aeaf..6d4fed6
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@@ -148,9 -149,15 +149,15 @@@ public class IgniteTxEntry implements G
private boolean transferExpiryPlc;
/** Expiry policy bytes. */
- private byte[] expiryPlcBytes;
+ private ByteBuffer expiryPlcBytes;
/**
+ * Additional flags.
+ * GridCacheUtils.SKIP_STORE_FLAG_MASK - for skipStore flag value.
+ */
+ private byte flags;
+
+ /**
* Required by {@link Externalizable}
*/
public IgniteTxEntry() {
@@@ -831,7 -863,7 +863,7 @@@
writer.incrementState();
case 9:
- if (!writer.writeLong("ttl", ttl))
- if (!writer.writeByteArray("transformClosBytes",
transformClosBytes))
++ if (!writer.writeByteBuffer("transformClosBytes",
transformClosBytes))
return false;
writer.incrementState();
@@@ -902,9 -940,9 +940,9 @@@
return false;
reader.incrementState();
-
+
case 6:
- grpLock = reader.readBoolean("grpLock");
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
@@@ -928,7 -966,7 +966,7 @@@
reader.incrementState();
case 9:
- ttl = reader.readLong("ttl");
- transformClosBytes =
reader.readByteArray("transformClosBytes");
++ transformClosBytes =
reader.readByteBuffer("transformClosBytes");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/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 03a04d1,fe5a356..f4b0ba4
---
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
@@@ -290,12 -274,12 +290,12 @@@ public class IgniteCacheObjectProcessor
try {
if (!ctx.processor().immutable(val)) {
if (valBytes == null)
- valBytes = ctx.processor().marshal(ctx, val);
+ valBytes = ctx.marshal(val);
ClassLoader ldr = ctx.p2pEnabled() ?
- IgniteUtils.detectClass(this.val).getClassLoader() :
val.getClass().getClassLoader();
+
IgniteUtils.detectClassLoader(IgniteUtils.detectClass(this.val)) :
U.gridClassLoader();
- Object val = ctx.processor().unmarshal(ctx, valBytes,
ldr);
+ Object val = ctx.unmarshal(valBytes, ldr);
return new KeyCacheObjectImpl(val, valBytes);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
index c3e94b1,0d24ee0..a164f22
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
@@@ -98,11 -102,12 +102,12 @@@ public class DataStreamerRequest implem
* @param ldrParticipants Loader participants.
* @param clsLdrId Class loader ID.
* @param forceLocDep Force local deployment.
+ * @param topVer Topology version.
*/
public DataStreamerRequest(long reqId,
- byte[] resTopicBytes,
+ ByteBuffer resTopicBytes,
@Nullable String cacheName,
- byte[] updaterBytes,
+ ByteBuffer updaterBytes,
Collection<DataStreamerEntry> entries,
boolean ignoreDepOwnership,
boolean skipStore,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --cc
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index 6b331bc,c2722fa..6fb2bb5
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@@ -67,7 -71,11 +71,9 @@@ public abstract class IgniteCacheAbstra
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- if (hasCache)
+ cfg.setPeerClassLoadingEnabled(false);
+
- cfg.setMarshaller(new OptimizedMarshaller(false));
-
- if (hasCache)
++Ã if (hasCache)
cfg.setCacheConfiguration(cache(null, true), cache(CACHE, true),
cache(EMPTY_CACHE, true),
cache(CACHE_NO_PRIMITIVES, false), cache(CACHE_COMPLEX_KEYS,
false));
else
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44299b7f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
