3be3d16b0899be7440a60d3eb5c476b789b34bfb
Files Diff
- Added: 4
- Removed: 3
- Renamed: 0
- Modified: 72
Refactorings reported:
| Refactoring Name | Occurences | ||
|---|---|---|---|
| Move And Inline Method | 1 | ||
| Move And Inline Method public isEmpty() : boolean moved from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition & inlined to public isEmpty() : boolean | From | To | |
| Extract Subclass | 1 | ||
| Extract Subclass org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap | From | To | |
| Change Parameter Type | 2 | ||
| Change Parameter Type partIt : Iterator<GridDhtCacheEntry> to partIt : Iterator<GridCacheMapEntry> in method private PartitionEntryIterator(partIt Iterator<GridCacheMapEntry>) in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter.PartitionEntryIterator | From | To | |
| Change Parameter Type it : Iterator<GridCacheEntryEx> to it : Iterator<? extends GridCacheEntryEx> in method protected iterator(it Iterator<? extends GridCacheEntryEx>, deserializeBinary boolean) : Iterator<Cache.Entry<K,V>> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter | From | To | |
| Move Method | 1 | ||
| Move Method public size() : int from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to public size() : int from class org.apache.ignite.internal.processors.cache.GridCacheAdapter.KeySet | From | To | |
| Push Down Attribute | 4 | ||
| Push Down Attribute protected ctx : GridCacheContext from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to private ctx : GridCacheContext from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Push Down Attribute private DFLT_CONCUR_LEVEL : int from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to private DFLT_CONCUR_LEVEL : int from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Push Down Attribute private DFLT_LOAD_FACTOR : float from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to private DFLT_LOAD_FACTOR : float from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Push Down Attribute private factory : GridCacheMapEntryFactory from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to private factory : GridCacheMapEntryFactory from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Extract Class | 1 | ||
| Extract Class org.apache.ignite.internal.processors.cache.GridCacheAdapter.KeySet from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap | From | To | |
| Change Variable Type | 12 | ||
| Change Variable Type next : GridDhtCacheEntry to next : GridCacheEntryEx in method private advance() : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter.PartitionEntryIterator | From | To | |
| Change Variable Type set : Set<GridCacheEntryEx> to entries : Iterable<? extends GridCacheEntryEx> in method private dumpCache(cacheName String, cache GridCacheAdapter<?,?>) : void in class org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest | From | To | |
| Change Variable Type partIt : Iterator<GridDhtCacheEntry> to partIt : Iterator<GridCacheMapEntry> in method public iterator() : Iterator<Cache.Entry<K,V>> in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter.PartitionEntrySet | From | To | |
| Change Variable Type entry : GridCacheEntryEx to entry : GridCacheMapEntry in method public removeIfObsolete(key KeyCacheObject) : void in class org.apache.ignite.internal.processors.cache.GridCacheAdapter | From | To | |
| Change Variable Type entries : Iterator<GridCacheEntryEx> to entries : Iterator<GridCacheMapEntry> in method private testCleanup(collocated boolean) : void in class org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetAbstractSelfTest | From | To | |
| Change Variable Type set : Set<GridCacheEntryEx> to set : Iterable<GridCacheEntryEx> in method protected estimateMemorySize(ignite IgniteEx, ca GridCacheAdapter, sample int) : void in class org.apache.ignite.internal.visor.cache.VisorCache | From | To | |
| Change Variable Type entries : Iterator<GridCacheEntryEx> to entries : Iterator<GridCacheMapEntry> in method public testNodeRestart() : void in class org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetFailoverAbstractSelfTest | From | To | |
| Change Variable Type set : Set<GridCacheEntryEx> to entries : Iterable<? extends GridCacheEntryEx> in method public testFormat() : void in class org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest | From | To | |
| Change Variable Type entries : Iterator<GridCacheEntryEx> to entries : Iterator<GridCacheMapEntry> in method public testCollocation() : void in class org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest | From | To | |
| Change Variable Type entIt : Iterator<GridDhtCacheEntry> to entIt : Iterator<GridCacheMapEntry> in method public handleDemandMessage(idx int, id UUID, d GridDhtPartitionDemandMessage) : void in class org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplier | From | To | |
| Change Variable Type o : GridDhtCacheEntry to o : GridCacheEntryEx in method public localExecute(cache0 IgniteInternalCache) : Object in class org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheAdapter.GlobalRemoveAllJob | From | To | |
| Change Variable Type entries : Iterator<GridCacheEntryEx> to entries : Iterator<GridCacheMapEntry> in method public testCollocation() : void in class org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest | From | To | |
| Extract Method | 7 | ||
| Extract Method public cacheKeysView(keys Collection<?>, includePartition boolean) : Collection<KeyCacheObject> extracted from public cacheKeysView(keys Collection<?>) : Collection<KeyCacheObject> in class org.apache.ignite.internal.processors.cache.GridCacheContext | From | To | |
| Extract Method public toCacheKeyObject(ctx CacheObjectContext, obj Object, userObj boolean, partition int) : KeyCacheObject extracted from public toCacheKeyObject(ctx CacheObjectContext, obj Object, userObj boolean) : KeyCacheObject in class org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl | From | To | |
| Extract Method protected incrementMapPublicSize() : void extracted from protected deletedUnlocked(deleted boolean) : void in class org.apache.ignite.internal.processors.cache.GridCacheMapEntry | From | To | |
| Extract Method protected entryFactory() : GridCacheMapEntryFactory extracted from protected init() : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter | From | To | |
| Extract Method protected decrementMapPublicSize() : void extracted from protected deletedUnlocked(deleted boolean) : void in class org.apache.ignite.internal.processors.cache.GridCacheMapEntry | From | To | |
| Extract Method public toCacheKeyObject(ctx CacheObjectContext, obj Object, userObj boolean, partition int) : KeyCacheObject extracted from public toCacheKeyObject(ctx CacheObjectContext, obj Object, userObj boolean) : KeyCacheObject in class org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl | From | To | |
| Extract Method public toCacheKeyObject(obj Object, includePartition boolean) : KeyCacheObject extracted from public toCacheKeyObject(obj Object) : KeyCacheObject in class org.apache.ignite.internal.processors.cache.GridCacheContext | From | To | |
| Push Down Method | 4 | ||
| Push Down Method public removeEntry(e GridCacheEntryEx) : boolean from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to public removeEntry(entry GridCacheEntryEx) : boolean from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Push Down Method public randomEntry() : GridCacheMapEntry from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to public randomEntry() : GridCacheMapEntry from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Push Down Method public toString() : String from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to public toString() : String from class org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedConcurrentMap | From | To | |
| Push Down Method public publicSize() : int from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap to public publicSize() : int from class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Rename Variable | 3 | ||
| Rename Variable p : GridDhtLocalPartition to part : GridDhtLocalPartition in method private waitForRent() : boolean in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopologyImpl | From | To | |
| Rename Variable set : Set<GridCacheEntryEx> to entries : Iterable<? extends GridCacheEntryEx> in method private dumpCache(cacheName String, cache GridCacheAdapter<?,?>) : void in class org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest | From | To | |
| Rename Variable set : Set<GridCacheEntryEx> to entries : Iterable<? extends GridCacheEntryEx> in method public testFormat() : void in class org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest | From | To | |
| Change Return Type | 7 | ||
| Change Return Type Collection<V> to Iterable<V> in method public values() : Iterable<V> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter | From | To | |
| Change Return Type GridCacheEntryEx to GridCacheMapEntry in method public entryEx(key KeyCacheObject, touch boolean) : GridCacheMapEntry in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter | From | To | |
| Change Return Type Collection<V> to Iterable<V> in method public values() : Iterable<V> in class org.apache.ignite.internal.processors.cache.GridCacheProxyImpl | From | To | |
| Change Return Type GridCacheEntryEx to GridCacheMapEntry in method public entryEx(key KeyCacheObject, topVer AffinityTopologyVersion) : GridCacheMapEntry in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter | From | To | |
| Change Return Type Set<GridCacheEntryEx> to Iterable<? extends GridCacheEntryEx> in method public allEntries() : Iterable<? extends GridCacheEntryEx> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter | From | To | |
| Change Return Type Collection<V> to Iterable<V> in method public values() : Iterable<V> in class org.apache.ignite.internal.processors.cache.IgniteInternalCache | From | To | |
| Change Return Type Set<GridCacheEntryEx> to Iterable<? extends GridCacheEntryEx> in method public entries() : Iterable<? extends GridCacheEntryEx> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter | From | To | |
| Change Attribute Type | 4 | ||
| Change Attribute Type partIt : Iterator<GridDhtCacheEntry> to partIt : Iterator<GridCacheMapEntry> in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter.PartitionEntryIterator | From | To | |
| Change Attribute Type map : ConcurrentMap<KeyCacheObject,GridDhtCacheEntry> to map : GridCacheConcurrentMap in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Change Attribute Type locParts : ConcurrentMap<Integer,GridDhtLocalPartition> to locParts : GridDhtLocalPartition[] in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopologyImpl | From | To | |
| Change Attribute Type keys : Collection<KeyCacheObject> to keys : List<KeyCacheObject> in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest | From | To | |
| Extract And Move Method | 8 | ||
| Extract And Move Method public putEntryIfObsoleteOrAbsent(topVer AffinityTopologyVersion, key KeyCacheObject, val CacheObject, create boolean, touch boolean) : GridCacheMapEntry extracted from private entry0(key KeyCacheObject, topVer AffinityTopologyVersion, create boolean, touch boolean) : GridCacheEntryEx in class org.apache.ignite.internal.processors.cache.GridCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Extract And Move Method public allEntries(filter CacheEntryPredicate...) : Iterable<GridCacheMapEntry> extracted from public entries() : Set<GridCacheEntryEx> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Extract And Move Method public entrySet(filter CacheEntryPredicate...) : Set<GridCacheMapEntry> extracted from public entrySetx(filter CacheEntryPredicate...) : Set<Cache.Entry<K,V>> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Extract And Move Method public getEntry(key KeyCacheObject) : GridCacheMapEntry extracted from public removeIfObsolete(key KeyCacheObject) : void in class org.apache.ignite.internal.processors.cache.GridCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Extract And Move Method public entries(filter CacheEntryPredicate...) : Iterable<GridCacheMapEntry> extracted from public allEntries() : Set<GridCacheEntryEx> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Extract And Move Method public entries(filter CacheEntryPredicate...) : Iterable<GridCacheMapEntry> extracted from public localEntries(peekModes CachePeekMode[]) : Iterable<Cache.Entry<K,V>> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Extract And Move Method public entries(filter CacheEntryPredicate...) : Iterable<GridCacheMapEntry> extracted from public localEntriesIterator(primary boolean, backup boolean) : Iterator<Cache.Entry<K,V>> in class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Extract And Move Method public keySet(filter CacheEntryPredicate...) : Set<KeyCacheObject> extracted from public keySetx() : Set<K> in class org.apache.ignite.internal.processors.cache.GridCacheAdapter & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition | From | To | |
| Rename Parameter | 2 | ||
| Rename Parameter e : GridCacheEntryEx to entry : GridCacheEntryEx in method public removeEntry(entry GridCacheEntryEx) : boolean in class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl | From | To | |
| Rename Parameter e : GridCacheEntryEx to entry : GridCacheEntryEx in method public removeEntry(entry GridCacheEntryEx) : boolean in class org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap | From | To |