ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject incubator-ignite git commit: IGNITE-141 - Marshallers refactoring
Date Sun, 01 Mar 2015 08:18:13 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-141 e9d99de8a -> 3a5aa3871


IGNITE-141 - Marshallers refactoring


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

Branch: refs/heads/ignite-141
Commit: 3a5aa3871aff5d10c60b4ce16541e9e3160bfb43
Parents: e9d99de
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sun Mar 1 00:18:52 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sun Mar 1 00:18:52 2015 -0800

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/IgniteKernal.java   |  1 +
 .../marshaller/optimized/OptimizedMarshallerUtils.java  |  1 +
 .../ignite/marshaller/optimized/classnames.properties   | 12 ++++++++++--
 .../internal/processors/igfs/IgfsFileInfoSelfTest.java  |  2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a5aa387/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2e517e8..f1ec712 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2723,6 +2723,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
     /**
      */
     private static class MarshallerContextImpl implements MarshallerContext {
+        /** */
         private final GridKernalContext ctx;
 
         /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a5aa387/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index 01cc348..598b5fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -58,6 +58,7 @@ class OptimizedMarshallerUtils {
     private static final ConcurrentMap<Class, OptimizedClassDescriptor> DESC_BY_CLS
= new ConcurrentHashMap8<>(256);
 
     /** Classes by ID. */
+    // TODO: IGNITE-141 - Move to marshaller context implementation.
     private static final ConcurrentMap<Integer, IgniteBiTuple<Class, Boolean>>
CLS_BY_ID =
         new ConcurrentHashMap8<>(256);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a5aa387/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties
index 1a8f1c2..ff7ddb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties
@@ -206,6 +206,7 @@ org.apache.ignite.internal.managers.GridManagerAdapter$1$1
 org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager$CheckpointSet
 org.apache.ignite.internal.managers.communication.GridIoManager$ConcurrentHashMap0
 org.apache.ignite.internal.managers.communication.GridIoPolicy
+org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean
 org.apache.ignite.internal.managers.deployment.GridDeploymentPerVersionStore$2
 org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$1
 org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$4$1
@@ -465,7 +466,6 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomic
 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$8
 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$9
 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$DeferredResponseBuffer
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$FinishedLockFuture
 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$1
 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$2
 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$3
@@ -483,6 +483,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPar
 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$2$1
 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$DemandWorker$1
 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$DemandWorker$2
+org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId
 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap
 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap
 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyPool$1
@@ -652,6 +653,7 @@ org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$Po
 org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$2
 org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$AtomicInt
 org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$CommitListener
+org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$CommittedVersion
 org.apache.ignite.internal.processors.cache.transactions.IgniteTxMap
 org.apache.ignite.internal.processors.cache.transactions.IgniteTxMap$1
 org.apache.ignite.internal.processors.cache.transactions.IgniteTxMap$1$1
@@ -659,7 +661,10 @@ org.apache.ignite.internal.processors.cache.transactions.TransactionMetricsAdapt
 org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl
 org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl$1
 org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry
+org.apache.ignite.internal.processors.cache.version.GridCacheVersion
 org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext$State
+org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx
+org.apache.ignite.internal.processors.clock.GridClockDeltaVersion
 org.apache.ignite.internal.processors.closure.GridClosurePolicy
 org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
 org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA
@@ -761,12 +766,14 @@ org.apache.ignite.internal.processors.hadoop.GridHadoopJobStatus
 org.apache.ignite.internal.processors.hadoop.GridHadoopTaskInfo
 org.apache.ignite.internal.processors.hadoop.GridHadoopTaskType
 org.apache.ignite.internal.processors.igfs.IgfsAttributes
+org.apache.ignite.internal.processors.igfs.IgfsBlockKey
 org.apache.ignite.internal.processors.igfs.IgfsBlockLocationImpl
 org.apache.ignite.internal.processors.igfs.IgfsDataManager$3
 org.apache.ignite.internal.processors.igfs.IgfsDataManager$5$1
 org.apache.ignite.internal.processors.igfs.IgfsDataManager$7
 org.apache.ignite.internal.processors.igfs.IgfsDataManager$UpdateProcessor
 org.apache.ignite.internal.processors.igfs.IgfsDirectoryNotEmptyException
+org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange
 org.apache.ignite.internal.processors.igfs.IgfsFileImpl
 org.apache.ignite.internal.processors.igfs.IgfsFileInfo
 org.apache.ignite.internal.processors.igfs.IgfsFileMap
@@ -907,6 +914,7 @@ org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap
 org.apache.ignite.internal.util.GridBoundedConcurrentOrderedSet
 org.apache.ignite.internal.util.GridBoundedLinkedHashMap
 org.apache.ignite.internal.util.GridBoundedLinkedHashSet
+org.apache.ignite.internal.util.GridByteArrayList
 org.apache.ignite.internal.util.GridCloseableIteratorAdapter
 org.apache.ignite.internal.util.GridCloseableIteratorAdapterEx
 org.apache.ignite.internal.util.GridCollections$LockedCollection
@@ -937,6 +945,7 @@ org.apache.ignite.internal.util.GridLogThrottle$LogLevel
 org.apache.ignite.internal.util.GridLogThrottle$LogLevel$1
 org.apache.ignite.internal.util.GridLogThrottle$LogLevel$2
 org.apache.ignite.internal.util.GridLogThrottle$LogLevel$3
+org.apache.ignite.internal.util.GridLongList
 org.apache.ignite.internal.util.GridMutex
 org.apache.ignite.internal.util.GridRandom
 org.apache.ignite.internal.util.GridReflectionCache
@@ -980,7 +989,6 @@ org.apache.ignite.internal.util.future.GridEmbeddedFuture$AL1
 org.apache.ignite.internal.util.future.GridEmbeddedFuture$AL2
 org.apache.ignite.internal.util.future.GridEmbeddedFuture$AsyncListener1
 org.apache.ignite.internal.util.future.GridEmbeddedFuture$AsyncListener2
-org.apache.ignite.internal.util.future.GridFinishedFutureEx
 org.apache.ignite.internal.util.future.GridFutureAdapterEx$1
 org.apache.ignite.internal.util.future.GridFutureAdapterEx$3
 org.apache.ignite.internal.util.future.GridFutureChainListener

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a5aa387/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
index b461a93..a666a0a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
@@ -83,6 +83,8 @@ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest {
      * @throws IgniteCheckedException In case of any marshalling exception.
      */
     private <T> T mu(T obj) throws IgniteCheckedException {
+        marshaller.setContext(new MarshallerContextTestImpl());
+
         return marshaller.unmarshal(marshaller.marshal(obj), null);
     }
 }


Mime
View raw message