Merge branch 'ignite-sprint-3' 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/KeyCacheObjectImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.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/1b4e5ce1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b4e5ce1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b4e5ce1
Branch: refs/heads/ignite-471
Commit: 1b4e5ce18a001520c1ed81b17bc8a5afdd1786f5
Parents: 5b00cdb f11e357
Author: Valentin Kulichenko <[email protected]>
Authored: Tue Apr 7 10:19:27 2015 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Tue Apr 7 10:19:27 2015 -0700
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/include/service.sh | 8 +-
config/hadoop/default-config.xml | 15 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
.../streaming/StreamTransformerExample.java | 100 +
.../streaming/StreamVisitorExample.java | 171 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 48 +
.../streaming/wordcount/QueryWords.java | 77 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../ignite/cache/affinity/AffinityUuid.java | 50 +
.../store/jdbc/CacheAbstractJdbcStore.java | 104 +-
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 11 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +-
.../ignite/internal/visor/cache/VisorCache.java | 19 +-
.../VisorCacheConfigurationCollectorJob.java | 76 +
.../VisorCacheConfigurationCollectorTask.java | 39 +
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../internal/visor/log/VisorLogSearchTask.java | 3 +-
.../visor/node/VisorGridConfiguration.java | 38 -
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 1 +
.../visor/query/VisorQueryNextPageTask.java | 5 +-
.../internal/visor/util/VisorTaskUtils.java | 3 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +-
.../communication/tcp/TcpCommunicationSpi.java | 14 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 47 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 78 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +-
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +-
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../IgniteCacheEvictionSelfTestSuite.java | 1 +
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../commands/cache/VisorCacheCommand.scala | 26 +-
.../config/VisorConfigurationCommand.scala | 15 +-
.../visor/commands/gc/VisorGcCommand.scala | 15 +-
.../scala/org/apache/ignite/visor/visor.scala | 34 +-
.../yardstick/config/benchmark-store.properties | 5 +-
parent/pom.xml | 3 +-
pom.xml | 14 +-
75 files changed, 5202 insertions(+), 1482 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b4e5ce1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b4e5ce1/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b4e5ce1/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 170c1a7,95fb9f7..30e1197
---
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
@@@ -48,13 -45,6 +48,9 @@@ public class IgniteCacheObjectProcessor
/** Immutable classes. */
private static final Collection<Class<?>> IMMUTABLE_CLS = new HashSet<>();
+ /** */
- private final GridBoundedConcurrentLinkedHashMap<Class<?>, Boolean>
reflectionCache =
- new GridBoundedConcurrentLinkedHashMap<>(1024, 1024);
-
- /** */
+ private final ConcurrentMap<String, CacheObjectContext> contexts = new
ConcurrentHashMap8<>();
+
/**
*
*/
@@@ -374,7 -337,8 +351,8 @@@
ClassLoader ldr = ctx.p2pEnabled() ?
IgniteUtils.detectClass(this.val).getClassLoader() :
val.getClass().getClassLoader();
- Object val = ctx.unmarshal(valBytes, ldr);
+ Object val = this.val != null &&
ctx.processor().immutable(this.val) ? this.val :
- ctx.processor().unmarshal(ctx, valBytes, ldr);
++ ctx.unmarshal(valBytes, ldr);
return new CacheObjectImpl(val, valBytes);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b4e5ce1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b4e5ce1/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
----------------------------------------------------------------------
