ignite-gg-11276 - produce less garbage

apache · Aug 5, 2016 · 8994e8d · 8994e8d
1 parent 6257bce
commit 8994e8d
Show file tree

Hide file tree

Showing 7 changed files with 190 additions and 151 deletions.
diff --git a/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -39,6 +39,7 @@
 import org.apache.ignite.internal.pagemem.wal.record.DataEntry;
 import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
 import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture;
@@ -399,14 +400,14 @@ protected GridDhtLocalPartition localPartition() {
             checkObsolete();
 
             if (isStartVersion() && ((flags & IS_UNSWAPPED_MASK) == 0)) {
-                IgniteBiTuple<CacheObject, GridCacheVersion> read = cctx.offheap().read(this);
+                CacheDataRow read = cctx.offheap().read(this);
 
                 flags |= IS_UNSWAPPED_MASK;
 
                 if (read != null) {
-                    CacheObject val = read.get1();
+                    CacheObject val = read.value();
 
-                    update(val, 0, 0, read.get2(), false);
+                    update(val, 0, 0, read.version(), false);
 
                     return val;
                 }
@@ -3572,10 +3573,10 @@ private CacheObject saveOldValueUnlocked(boolean qryOnly) throws IgniteCheckedEx
         CacheObject val = this.val;
 
         if (val == null && isStartVersion()) {
-            IgniteBiTuple<CacheObject, GridCacheVersion> t = detached() || isNear() ? null : cctx.offheap().read(this);
+            CacheDataRow row = detached() || isNear() ? null : cctx.offheap().read(this);
 
-            if (t != null)
+            if (row != null)
-                val = t.get1();
+                val = row.value();
         }
 
         return val;

diff --git a/.../src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/.../src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -29,7 +29,6 @@
 import org.apache.ignite.internal.util.lang.GridCloseableIterator;
 import org.apache.ignite.internal.util.lang.GridCursor;
 import org.apache.ignite.internal.util.lang.GridIterator;
-import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  *
@@ -72,7 +71,7 @@ public interface IgniteCacheOffheapManager extends GridCacheManager {
      * @return Value tuple, if available.
      * @throws IgniteCheckedException If failed.
      */
-    public IgniteBiTuple<CacheObject, GridCacheVersion> read(GridCacheMapEntry entry) throws IgniteCheckedException;
+    public CacheDataRow read(GridCacheMapEntry entry) throws IgniteCheckedException;
 
     /**
      * @param p Partition.
@@ -225,7 +224,7 @@ public void remove(KeyCacheObject key,
          * @return Value/version tuple.
          * @throws IgniteCheckedException If failed.
          */
-        public IgniteBiTuple<CacheObject, GridCacheVersion> find(KeyCacheObject key) throws IgniteCheckedException;
+        public CacheDataRow find(KeyCacheObject key) throws IgniteCheckedException;
 
         /**
          * @return Data cursor.

diff --git a/.../main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/.../main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -56,9 +56,7 @@
 import org.apache.ignite.internal.util.lang.GridCursor;
 import org.apache.ignite.internal.util.lang.GridIterator;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteBiTuple;
 import org.apache.ignite.lang.IgniteClosure;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.jetbrains.annotations.Nullable;
@@ -327,21 +325,13 @@ private Iterator<CacheDataStore> cacheData(boolean primary, boolean backup, Affi
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override @Nullable public IgniteBiTuple<CacheObject, GridCacheVersion> read(GridCacheMapEntry entry)
+    @Override @Nullable public CacheDataRow read(GridCacheMapEntry entry)
         throws IgniteCheckedException {
-        try {
+        KeyCacheObject key = entry.key();
-            KeyCacheObject key = entry.key();
 
-            assert cctx.isLocal() || entry.localPartition() != null : entry;
+        assert cctx.isLocal() || entry.localPartition() != null : entry;
 
-            return dataStore(entry.localPartition()).find(key);
+        return dataStore(entry.localPartition()).find(key);
-        }
-        catch (IgniteCheckedException e) {
-            throw e;
-        }
-        catch (Exception e) {
-            throw new IgniteCheckedException("Failed to read entry: " + entry.key(), e);
-        }
     }
 
     /** {@inheritDoc} */
@@ -718,11 +708,9 @@ private CacheDataStoreImpl(
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteBiTuple<CacheObject, GridCacheVersion> find(KeyCacheObject key)
+        @Override public CacheDataRow find(KeyCacheObject key)
             throws IgniteCheckedException {
-            DataRow dataRow = dataTree.findOne(new KeySearchRow(key.hashCode(), key, 0));
+            return dataTree.findOne(new KeySearchRow(key.hashCode(), key, 0));
-
-            return dataRow != null ? F.t(dataRow.value(), dataRow.version()) : null;
         }
 
         /** {@inheritDoc} */
@@ -769,7 +757,7 @@ protected final void initData(boolean keyOnly) {
             assert link() != 0;
 
             try {
-                assemble(cctx, keyOnly);
+                initFromLink(cctx, keyOnly);
             }
             catch (IgniteCheckedException e) {
                 throw new IgniteException(e.getMessage(), e);
@@ -784,11 +772,6 @@ public KeyCacheObject key() {
 
             return key;
         }
-
-        /** {@inheritDoc} */
-        public String toString() {
-            return S.toString(KeySearchRow.class, this);
-        }
     }
 
     /**
@@ -835,11 +818,6 @@ private class DataRow extends KeySearchRow {
         @Override public void link(long link) {
             this.link = link;
         }
-
-        /** {@inheritDoc} */
-        public String toString() {
-            return S.toString(DataRow.class, this);
-        }
     }
 
     /**