ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/13] incubator-ignite git commit: Merge branch 'ignite-51' into ignite-51-intercept
Date Thu, 05 Mar 2015 13:54:55 GMT
Merge branch 'ignite-51' into ignite-51-intercept

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.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/ce37315f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce37315f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce37315f

Branch: refs/heads/ignite-51
Commit: ce37315f5701f193b90644e952eb20f8880398d1
Parents: 5ed9eb8 b93f7a3
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Mar 5 09:24:18 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Mar 5 09:24:18 2015 +0300

----------------------------------------------------------------------
 .../misc/lifecycle/LifecycleExample.java        |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    |   8 +-
 .../internal/direct/DirectByteBufferStream.java |  12 +
 .../internal/direct/DirectMessageWriter.java    |   7 +
 .../communication/GridIoMessageFactory.java     |   2 +-
 .../affinity/GridAffinityAssignmentCache.java   |  11 +-
 .../affinity/GridAffinityProcessor.java         |  35 +-
 .../cache/CacheEntryPredicateContainsValue.java |   5 +-
 .../processors/cache/CacheEvictionEntry.java    |   2 +-
 .../cache/CacheInvokeDirectResult.java          |   4 +-
 .../internal/processors/cache/CacheObject.java  |   8 +-
 .../processors/cache/CacheObjectAdapter.java    |   4 +-
 .../processors/cache/CacheObjectContext.java    |  42 +-
 .../processors/cache/CacheObjectImpl.java       |  18 +-
 .../processors/cache/EvictableEntryImpl.java    |  10 +-
 .../processors/cache/GridCacheAdapter.java      |  59 +-
 .../cache/GridCacheConcurrentMap.java           |   2 +-
 .../processors/cache/GridCacheContext.java      |  32 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |  44 +-
 .../cache/GridCacheDeploymentManager.java       |   2 +-
 .../processors/cache/GridCacheEntryInfo.java    |   4 +-
 .../processors/cache/GridCacheEventManager.java |   6 +-
 .../cache/GridCacheEvictionRequest.java         |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |  91 ++--
 .../processors/cache/GridCacheMessage.java      |  10 +-
 .../processors/cache/GridCacheProcessor.java    |  29 +-
 .../processors/cache/GridCacheStoreManager.java |  20 +-
 .../processors/cache/GridCacheSwapManager.java  |  65 ++-
 .../processors/cache/GridCacheUtils.java        |   7 +-
 .../processors/cache/KeyCacheObjectImpl.java    |  16 +-
 .../cache/KeyCacheObjectTransferImpl.java       |   8 +-
 .../processors/cache/UserCacheObjectImpl.java   |   4 +-
 .../cache/UserKeyCacheObjectImpl.java           |  12 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |  10 +-
 .../CacheDataStructuresManager.java             |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  10 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   7 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   2 +-
 .../distributed/near/CacheVersionedValue.java   | 157 ++++++
 .../distributed/near/GridNearCacheEntry.java    |   2 +-
 .../distributed/near/GridNearGetFuture.java     |   4 +-
 .../cache/distributed/near/GridNearTxLocal.java |   4 +-
 .../near/GridNearTxPrepareFuture.java           |   6 +-
 .../near/GridNearTxPrepareResponse.java         |  18 +-
 .../near/NearTxPrepareResponseOwnedValue.java   | 157 ------
 .../local/atomic/GridLocalAtomicCache.java      |  15 +-
 .../cache/query/GridCacheQueryManager.java      |   2 +-
 .../continuous/CacheContinuousQueryEntry.java   |   6 +-
 .../continuous/CacheContinuousQueryEvent.java   |   2 +-
 .../continuous/CacheContinuousQueryManager.java |   6 +-
 .../cache/transactions/IgniteTxEntry.java       |   2 +-
 .../cache/transactions/IgniteTxKey.java         |   2 +-
 .../transactions/IgniteTxLocalAdapter.java      |  28 +-
 .../cache/transactions/TxEntryValueHolder.java  |   2 +-
 .../dataload/GridDataLoadUpdateJob.java         |   4 +-
 .../dataload/IgniteDataLoaderEntry.java         |   4 +-
 .../dataload/IgniteDataLoaderImpl.java          |  17 +-
 .../datastructures/DataStructuresProcessor.java |   4 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |   6 +
 .../portable/GridPortableProcessor.java         |   5 +-
 .../IgniteCacheObjectProcessorAdapter.java      |  19 +-
 .../portable/os/GridOsPortableProcessor.java    |   4 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |   3 +-
 .../visor/cache/VisorCacheClearTask.java        |   3 +-
 .../visor/cache/VisorCacheLoadTask.java         |   3 +-
 .../visor/node/VisorIgfsConfiguration.java      |   7 +-
 .../apache/ignite/lifecycle/LifecycleBean.java  |  36 +-
 .../ignite/lifecycle/LifecycleEventType.java    |  20 +-
 .../extensions/communication/MessageWriter.java |  11 +
 .../communication/tcp/TcpCommunicationSpi.java  |   2 +-
 .../internal/GridLifecycleBeanSelfTest.java     |  76 +--
 .../cache/GridCacheAbstractFullApiSelfTest.java |   3 +-
 .../cache/GridCacheOffHeapSelfTest.java         |   2 +-
 ...actQueueFailoverDataConsistencySelfTest.java |   2 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   2 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   2 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |   4 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |   8 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   8 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |   2 +-
 .../colocation/GridTestLifecycleBean.java       |   2 +-
 .../loadtests/dsi/GridDsiLifecycleBean.java     |   8 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  44 +-
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |  48 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |  54 +-
 .../hadoop/SecondaryFileSystemProvider.java     | 111 ++++
 .../GridHadoopExternalCommunication.java        |   2 +-
 ...oopSecondaryFileSystemConfigurationTest.java | 541 +++++++++++++++++++
 .../testsuites/IgniteHadoopTestSuite.java       |   2 +
 .../processors/query/h2/IgniteH2Indexing.java   |   3 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |   4 +-
 .../schema/generator/SnippetGenerator.java      |   2 +-
 .../schema/parser/DatabaseMetadataParser.java   |   7 +-
 .../cache/spring/SpringDynamicCacheManager.java |   2 +-
 .../ignite/internal/GridFactorySelfTest.java    |  10 +-
 .../scala/org/apache/ignite/visor/Packet.scala  |  38 --
 .../ignite/visor/commands/VisorConsole.scala    |   2 -
 .../ignite/visor/commands/ack/Packet.scala      |  55 --
 .../visor/commands/ack/VisorAckCommand.scala    |   2 +-
 .../ignite/visor/commands/alert/Packet.scala    | 108 ----
 .../ignite/visor/commands/cache/Packet.scala    | 127 -----
 .../commands/cache/VisorCacheCommand.scala      |  12 +-
 .../ignite/visor/commands/config/Packet.scala   |  55 --
 .../ignite/visor/commands/deploy/Packet.scala   |  76 ---
 .../ignite/visor/commands/disco/Packet.scala    |  72 ---
 .../ignite/visor/commands/events/Packet.scala   |  97 ----
 .../ignite/visor/commands/gc/Packet.scala       |  61 ---
 .../ignite/visor/commands/kill/Packet.scala     |  78 ---
 .../visor/commands/kill/VisorKillCommand.scala  |   2 +-
 .../ignite/visor/commands/node/Packet.scala     |  60 --
 .../ignite/visor/commands/ping/Packet.scala     |  50 --
 .../visor/commands/ping/VisorPingCommand.scala  |   2 +-
 .../ignite/visor/commands/start/Packet.scala    |  90 ---
 .../ignite/visor/commands/tasks/Packet.scala    | 116 ----
 .../commands/tasks/VisorTasksCommand.scala      |  26 +-
 .../ignite/visor/commands/top/Packet.scala      |  87 ---
 .../ignite/visor/commands/vvm/Packet.scala      |  61 ---
 119 files changed, 1421 insertions(+), 1988 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce37315f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 11e1fc4,4740e10..cb4c777
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@@ -318,10 -318,13 +318,10 @@@ public final class GridDhtTxPrepareFutu
                              Object procRes = null;
                              Exception err = null;
  
 -                            Object keyVal = key.value(cacheCtx.cacheObjectContext(), false);
 -                            Object val0 = CU.value(val, cacheCtx, false);
 -
--                            for (T2<EntryProcessor<Object, Object, Object>, Object[]>
t : txEntry.entryProcessors()) {
++                             for (T2<EntryProcessor<Object, Object, Object>, Object[]>
t : txEntry.entryProcessors()) {
                                  try {
                                      CacheInvokeEntry<Object, Object> invokeEntry =
 -                                        new CacheInvokeEntry<>(txEntry.context(),
keyVal, val0);
 +                                        new CacheInvokeEntry<>(txEntry.context(),
key, val);
  
                                      EntryProcessor<Object, Object, Object> processor
= t.get1();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce37315f/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 f226fca,ef5e7cc..4fd583a
--- 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
@@@ -1468,9 -1464,10 +1468,9 @@@ public class GridDhtAtomicCache<K, V> e
                              taskName,
                              null);
  
 -                        Object val = ctx.config().getInterceptor().onBeforePut(
 -                            entry.key().value(ctx.cacheObjectContext(), false),
 -                            CU.value(old, ctx, false),
 +                        Object val = ctx.config().getInterceptor().onBeforePut(new CacheLazyEntry(ctx,
entry.key(),
 +                            old),
-                             updated.value(ctx, false));
+                             updated.value(ctx.cacheObjectContext(), false));
  
                          if (val == null)
                              continue;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce37315f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 31bae13,130fbe4..bb498e0
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@@ -1138,10 -1135,10 +1135,10 @@@ public class GridLocalAtomicCache<K, V
                              taskName,
                              null);
  
-                         Object keyVal = entry.key().value(ctx, false);
+                         Object keyVal = entry.key().value(ctx.cacheObjectContext(), false);
                          Object oldVal = CU.value(old, ctx, false);
  
 -                        CacheInvokeEntry<Object, Object> invokeEntry = new CacheInvokeEntry<>(ctx,
keyVal, oldVal);
 +                        CacheInvokeEntry<Object, Object> invokeEntry = new CacheInvokeEntry<>(ctx,
entry.key(), old);
  
                          CacheObject updated;
                          Object updatedVal = null;

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce37315f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 13abeb7,342ebd0..34e4943
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@@ -536,10 -536,12 +536,10 @@@ public abstract class IgniteTxLocalAdap
                              }
  
                              if (intercept) {
 -                                Object oldVal = CU.value(e.cached().rawGetOrUnmarshal(true),
cacheCtx, false);
 -
 -                                Object interceptorVal = cacheCtx.config().getInterceptor().onBeforePut(
 -                                    key.value(cacheCtx.cacheObjectContext(), false),
 -                                    oldVal,
 -                                    CU.value(val, cacheCtx, false));
 +                                Object interceptorVal = cacheCtx.config().getInterceptor()
 +                                    .onBeforePut(new CacheLazyEntry(
-                                         cacheCtx, key, e.cached().rawGetOrUnmarshal(true)),
-                                         CU.value(val, cacheCtx, false));
++                                                    cacheCtx, key, e.cached().rawGetOrUnmarshal(true)),
++                                            CU.value(val, cacheCtx, false));
  
                                  if (interceptorVal == null)
                                      continue;
@@@ -2461,7 -2465,8 +2463,7 @@@
      private void addInvokeResult(IgniteTxEntry txEntry, CacheObject cacheVal, GridCacheReturn<?>
ret) {
          GridCacheContext ctx = txEntry.context();
  
-         Object keyVal = txEntry.key().value(ctx, false);
+         Object keyVal = txEntry.key().value(ctx.cacheObjectContext(), false);
 -        Object val = CU.value(cacheVal, ctx, false);
  
          try {
              Object res = null;


Mime
View raw message