This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-11704
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-11704 by this push:
new 901661a ignite-11704
901661a is described below
commit 901661ad40815aaeaf25470c67e575fade0c9ade
Author: sboikov <[email protected]>
AuthorDate: Tue Jul 30 10:57:47 2019 +0300
ignite-11704
---
.../internal/processors/cache/IgniteCacheOffheapManager.java | 11 ++++++-----
.../processors/cache/IgniteCacheOffheapManagerImpl.java | 10 +++++-----
.../processors/cache/persistence/GridCacheOffheapManager.java | 8 ++++----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index aca75b6..8b6b623 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -28,6 +28,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.dht.topology.Grid
import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot;
import org.apache.ignite.internal.processors.cache.mvcc.MvccVersion;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
+import
org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
import org.apache.ignite.internal.processors.cache.persistence.RootPage;
import org.apache.ignite.internal.processors.cache.persistence.RowStore;
@@ -215,7 +216,7 @@ public interface IgniteCacheOffheapManager {
* @return Iterator over all versions.
* @throws IgniteCheckedException If failed.
*/
- GridCursor<CacheDataRow> mvccAllVersionsCursor(GridCacheContext cctx,
KeyCacheObject key, Object x)
+ GridCursor<CacheDataRow> mvccAllVersionsCursor(GridCacheContext cctx,
KeyCacheObject key, CacheDataRowAdapter.RowData x)
throws IgniteCheckedException;
/**
@@ -945,7 +946,7 @@ public interface IgniteCacheOffheapManager {
* @return Iterator over all versions.
* @throws IgniteCheckedException If failed.
*/
- GridCursor<CacheDataRow> mvccAllVersionsCursor(GridCacheContext cctx,
KeyCacheObject key, Object x)
+ GridCursor<CacheDataRow> mvccAllVersionsCursor(GridCacheContext cctx,
KeyCacheObject key, CacheDataRowAdapter.RowData x)
throws IgniteCheckedException;
/**
@@ -980,7 +981,7 @@ public interface IgniteCacheOffheapManager {
* @return Data cursor.
* @throws IgniteCheckedException If failed.
*/
- public GridCursor<? extends CacheDataRow> cursor(Object x) throws
IgniteCheckedException;
+ public GridCursor<? extends CacheDataRow>
cursor(CacheDataRowAdapter.RowData x) throws IgniteCheckedException;
/**
* @param mvccSnapshot MVCC snapshot.
@@ -1025,7 +1026,7 @@ public interface IgniteCacheOffheapManager {
* @throws IgniteCheckedException If failed.
*/
public GridCursor<? extends CacheDataRow> cursor(int cacheId,
KeyCacheObject lower,
- KeyCacheObject upper, Object x) throws IgniteCheckedException;
+ KeyCacheObject upper, CacheDataRowAdapter.RowData x) throws
IgniteCheckedException;
/**
* @param cacheId Cache ID.
@@ -1040,7 +1041,7 @@ public interface IgniteCacheOffheapManager {
public GridCursor<? extends CacheDataRow> cursor(int cacheId,
KeyCacheObject lower,
KeyCacheObject upper,
- Object x,
+ CacheDataRowAdapter.RowData x,
MvccSnapshot snapshot,
boolean withTombstones) throws IgniteCheckedException;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 8aa5514..1f3a22d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -687,7 +687,7 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
/** {@inheritDoc} */
@Override public GridCursor<CacheDataRow>
mvccAllVersionsCursor(GridCacheContext cctx,
- KeyCacheObject key, Object x) throws IgniteCheckedException {
+ KeyCacheObject key, CacheDataRowAdapter.RowData x) throws
IgniteCheckedException {
CacheDataStore dataStore = dataStore(cctx, key);
return dataStore != null ? dataStore.mvccAllVersionsCursor(cctx, key,
x) : EMPTY_CURSOR;
@@ -2889,7 +2889,7 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
}
/** {@inheritDoc} */
- @Override public GridCursor<CacheDataRow>
mvccAllVersionsCursor(GridCacheContext cctx, KeyCacheObject key, Object x)
+ @Override public GridCursor<CacheDataRow>
mvccAllVersionsCursor(GridCacheContext cctx, KeyCacheObject key,
CacheDataRowAdapter.RowData x)
throws IgniteCheckedException {
int cacheId = cctx.cacheId();
@@ -3014,7 +3014,7 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
}
/** {@inheritDoc} */
- @Override public GridCursor<? extends CacheDataRow> cursor(Object x)
throws IgniteCheckedException {
+ @Override public GridCursor<? extends CacheDataRow>
cursor(CacheDataRowAdapter.RowData x) throws IgniteCheckedException {
GridCursor<? extends CacheDataRow> cur = dataTree.find(null, null,
x);
return x == CacheDataRowAdapter.RowData.TOMBSTONES ?
cursorSkipEmpty(cur) : cursorSkipTombstone(cur);
@@ -3055,7 +3055,7 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
/** {@inheritDoc} */
@Override public GridCursor<? extends CacheDataRow> cursor(int
cacheId, KeyCacheObject lower,
- KeyCacheObject upper, Object x) throws IgniteCheckedException {
+ KeyCacheObject upper, CacheDataRowAdapter.RowData x) throws
IgniteCheckedException {
return cursor(cacheId, lower, upper, null, null, false);
}
@@ -3063,7 +3063,7 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
@Override public GridCursor<? extends CacheDataRow> cursor(int cacheId,
KeyCacheObject lower,
KeyCacheObject upper,
- Object x,
+ CacheDataRowAdapter.RowData x,
MvccSnapshot snapshot,
boolean withTombstones) throws IgniteCheckedException {
SearchRow lowerRow;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 427c0b9..8470e49 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -2469,7 +2469,7 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
/** {@inheritDoc} */
@Override public GridCursor<CacheDataRow>
mvccAllVersionsCursor(GridCacheContext cctx,
- KeyCacheObject key, Object x) throws IgniteCheckedException {
+ KeyCacheObject key, CacheDataRowAdapter.RowData x) throws
IgniteCheckedException {
CacheDataStore delegate = init0(true);
if (delegate != null)
@@ -2490,7 +2490,7 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
}
/** {@inheritDoc} */
- @Override public GridCursor<? extends CacheDataRow> cursor(Object x)
throws IgniteCheckedException {
+ @Override public GridCursor<? extends CacheDataRow>
cursor(CacheDataRowAdapter.RowData x) throws IgniteCheckedException {
CacheDataStore delegate = init0(true);
if (delegate != null)
@@ -2527,7 +2527,7 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
@Override public GridCursor<? extends CacheDataRow> cursor(int cacheId,
KeyCacheObject lower,
KeyCacheObject upper,
- Object x)
+ CacheDataRowAdapter.RowData x)
throws IgniteCheckedException {
CacheDataStore delegate = init0(true);
@@ -2541,7 +2541,7 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
@Override public GridCursor<? extends CacheDataRow> cursor(int cacheId,
KeyCacheObject lower,
KeyCacheObject upper,
- Object x,
+ CacheDataRowAdapter.RowData x,
MvccSnapshot mvccSnapshot,
boolean withTombstones)
throws IgniteCheckedException {
