ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [45/50] [abbrv] ignite git commit: WIP
Date Thu, 04 Feb 2016 14:45:54 GMT
WIP


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

Branch: refs/heads/sql-store-cmp
Commit: fd9432e3b7951607080c3452ed6277eb4375b07e
Parents: ec348ed
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Wed Feb 3 14:53:25 2016 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Wed Feb 3 17:13:44 2016 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheEvictionManager.java      | 4 ++--
 .../ignite/internal/processors/cache/GridCacheMapEntry.java      | 2 +-
 .../processors/cache/transactions/IgniteTxLocalAdapter.java      | 3 ++-
 .../internal/processors/cache/transactions/IgniteTxManager.java  | 3 ++-
 .../ignite/internal/processors/query/h2/IgniteH2Indexing.java    | 2 +-
 .../ignite/internal/processors/query/h2/opt/GridH2Row.java       | 2 +-
 .../internal/processors/query/h2/opt/GridH2RowDescriptor.java    | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fd9432e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 0072966..c774821 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -735,7 +735,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter
{
      * @param txEntry Transactional entry.
      */
     public void touch(IgniteTxEntry txEntry, boolean loc) {
-        if (!plcEnabled && memoryMode != OFFHEAP_TIERED)
+        if (!plcEnabled && memoryMode != OFFHEAP_TIERED && !cctx.isDatabaseEnabled())
             return;
 
         if (!loc) {
@@ -759,7 +759,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter
{
             U.error(log, "Failed to evict entry from cache: " + e, ex);
         }
 
-        if (memoryMode == OFFHEAP_TIERED) {
+        if (memoryMode == OFFHEAP_TIERED || cctx.isDatabaseEnabled()) {
             try {
                 evict0(cctx.cache(), e, cctx.versions().next(), null, false);
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd9432e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 5bb15c1..0afa0fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1130,7 +1130,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
             // Load and remove from swap if it is new.
             boolean startVer = isStartVersion();
 
-            if (startVer)
+            if (startVer && (!cctx.isDatabaseEnabled() || retval || intercept))
                 unswap(retval);
 
             newVer = explicitVer != null ? explicitVer : tx == null ?

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd9432e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git 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
index 902b321..c8435c3 100644
--- 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
@@ -2520,7 +2520,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements
Ig
                 GridCacheEntryEx entry = entryEx(cacheCtx, txKey, topologyVersion());
 
                 try {
-                    entry.unswap(false);
+                    if (retval || transform || hasFilters || (optimistic() && serializable()))
+                        entry.unswap(false);
 
                     // Check if lock is being explicitly acquired by the same thread.
                     if (!implicit && cctx.kernalContext().config().isCacheSanityCheckEnabled()
&&

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd9432e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 28a7cc0..fed07c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1435,7 +1435,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
                         return false;
                     }
 
-                    entry1.unswap();
+                    if (!cacheCtx.isDatabaseEnabled())
+                        entry1.unswap();
 
                     break;
                 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd9432e3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 93f6a41..c2aee58 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2472,7 +2472,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
         }
 
         /** {@inheritDoc} */
-        @Override public GridH2Row createRow(KeyCacheObject key, @Nullable CacheObject val,
GridCacheVersion ver,
+        @Override public GridH2Row createRow(CacheObject key, @Nullable CacheObject val,
GridCacheVersion ver,
             long expirationTime) throws IgniteCheckedException {
             GridH2Row row;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd9432e3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
index 38753e4..98c1a98 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
@@ -31,7 +31,7 @@ public class GridH2Row extends Row implements GridSearchRowPointer {
     public long link; // TODO remove
 
     /** */
-    public KeyCacheObject key; // TODO remove
+    public CacheObject key; // TODO remove
 
     /** */
     public CacheObject val; // TODO remove

http://git-wip-us.apache.org/repos/asf/ignite/blob/fd9432e3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java
index 3a2ff8b..de9368a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java
@@ -47,7 +47,7 @@ public interface GridH2RowDescriptor extends GridOffHeapSmartPointerFactory<Grid
      * @return Row.
      * @throws IgniteCheckedException If failed.
      */
-    public GridH2Row createRow(KeyCacheObject key, @Nullable CacheObject val, GridCacheVersion
ver, long expirationTime)
+    public GridH2Row createRow(CacheObject key, @Nullable CacheObject val, GridCacheVersion
ver, long expirationTime)
         throws IgniteCheckedException;
 
     /**


Mime
View raw message