You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/10 13:01:30 UTC
ignite git commit: GridCacheEntryExtras: assert for expireTime
instead of ttl.
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 4fbc38893 -> 11a7e7d0b
GridCacheEntryExtras: assert for expireTime instead of ttl.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11a7e7d0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11a7e7d0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11a7e7d0
Branch: refs/heads/ignite-3477
Commit: 11a7e7d0bfd6ac0a4bd4b3cdda584bfa63d2d244
Parents: 4fbc388
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jan 10 16:01:34 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jan 10 16:01:34 2017 +0300
----------------------------------------------------------------------
.../processors/cache/extras/GridCacheAttributesEntryExtras.java | 4 ++--
.../cache/extras/GridCacheAttributesMvccEntryExtras.java | 2 +-
.../cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java | 2 +-
.../extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java | 4 ++--
.../cache/extras/GridCacheAttributesMvccTtlEntryExtras.java | 4 ++--
.../cache/extras/GridCacheAttributesObsoleteEntryExtras.java | 2 +-
.../cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java | 4 ++--
.../cache/extras/GridCacheAttributesTtlEntryExtras.java | 4 ++--
.../cache/extras/GridCacheMvccObsoleteEntryExtras.java | 2 +-
.../cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java | 4 ++--
.../processors/cache/extras/GridCacheMvccTtlEntryExtras.java | 3 ++-
.../processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java | 3 ++-
.../processors/cache/extras/GridCacheTtlEntryExtras.java | 2 +-
13 files changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
index b146bea..635fda8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
@@ -29,8 +29,8 @@ public class GridCacheAttributesEntryExtras extends GridCacheEntryExtrasAdapter
/**
* Constructor.
*/
- public GridCacheAttributesEntryExtras() {
-
+ GridCacheAttributesEntryExtras() {
+ // No-op.
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
index e0d82c8..517f838 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
@@ -35,7 +35,7 @@ public class GridCacheAttributesMvccEntryExtras extends GridCacheEntryExtrasAdap
*
* @param mvcc MVCC.
*/
- public GridCacheAttributesMvccEntryExtras(GridCacheMvcc mvcc) {
+ GridCacheAttributesMvccEntryExtras(GridCacheMvcc mvcc) {
assert mvcc != null;
this.mvcc = mvcc;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
index 6f11fc0..a5ef8f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
@@ -39,7 +39,7 @@ public class GridCacheAttributesMvccObsoleteEntryExtras extends GridCacheEntryEx
* @param mvcc MVCC.
* @param obsoleteVer Obsolete version.
*/
- public GridCacheAttributesMvccObsoleteEntryExtras(GridCacheMvcc mvcc,
+ GridCacheAttributesMvccObsoleteEntryExtras(GridCacheMvcc mvcc,
GridCacheVersion obsoleteVer) {
assert mvcc != null;
assert obsoleteVer != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
index 98a7c2e..e2ab53d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
@@ -47,11 +47,11 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntr
* @param ttl TTL.
* @param expireTime Expire time.
*/
- public GridCacheAttributesMvccObsoleteTtlEntryExtras(GridCacheMvcc mvcc,
+ GridCacheAttributesMvccObsoleteTtlEntryExtras(GridCacheMvcc mvcc,
GridCacheVersion obsoleteVer, long ttl, long expireTime) {
assert mvcc != null;
assert obsoleteVer != null;
- assert ttl != 0;
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.mvcc = mvcc;
this.obsoleteVer = obsoleteVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
index 205b345..7874ca2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
@@ -43,10 +43,10 @@ public class GridCacheAttributesMvccTtlEntryExtras extends GridCacheEntryExtrasA
* @param ttl TTL.
* @param expireTime Expire time.
*/
- public GridCacheAttributesMvccTtlEntryExtras(GridCacheMvcc mvcc, long ttl,
+ GridCacheAttributesMvccTtlEntryExtras(GridCacheMvcc mvcc, long ttl,
long expireTime) {
assert mvcc != null;
- assert ttl != 0;
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.mvcc = mvcc;
this.ttl = ttl;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
index b7ac8bf..7f3ac87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
@@ -34,7 +34,7 @@ public class GridCacheAttributesObsoleteEntryExtras extends GridCacheEntryExtras
*
* @param obsoleteVer Obsolete version.
*/
- public GridCacheAttributesObsoleteEntryExtras(GridCacheVersion obsoleteVer) {
+ GridCacheAttributesObsoleteEntryExtras(GridCacheVersion obsoleteVer) {
assert obsoleteVer != null;
this.obsoleteVer = obsoleteVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
index dacedf2..2294c0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
@@ -42,10 +42,10 @@ public class GridCacheAttributesObsoleteTtlEntryExtras extends GridCacheEntryExt
* @param ttl TTL.
* @param expireTime Expire time.
*/
- public GridCacheAttributesObsoleteTtlEntryExtras(GridCacheVersion obsoleteVer,
+ GridCacheAttributesObsoleteTtlEntryExtras(GridCacheVersion obsoleteVer,
long ttl, long expireTime) {
assert obsoleteVer != null;
- assert ttl != 0;
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.obsoleteVer = obsoleteVer;
this.ttl = ttl;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
index 9375679..4aa582c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
@@ -38,8 +38,8 @@ public class GridCacheAttributesTtlEntryExtras extends GridCacheEntryExtrasAdapt
* @param ttl TTL.
* @param expireTime Expire time.
*/
- public GridCacheAttributesTtlEntryExtras(long ttl, long expireTime) {
- assert ttl != 0;
+ GridCacheAttributesTtlEntryExtras(long ttl, long expireTime) {
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.ttl = ttl;
this.expireTime = expireTime;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
index 1f5218c..123d450 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
@@ -38,7 +38,7 @@ public class GridCacheMvccObsoleteEntryExtras extends GridCacheEntryExtrasAdapte
* @param mvcc MVCC.
* @param obsoleteVer Obsolete version.
*/
- public GridCacheMvccObsoleteEntryExtras(GridCacheMvcc mvcc, GridCacheVersion obsoleteVer) {
+ GridCacheMvccObsoleteEntryExtras(GridCacheMvcc mvcc, GridCacheVersion obsoleteVer) {
assert mvcc != null;
assert obsoleteVer != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
index 4f792a1..4f62c7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
@@ -46,11 +46,11 @@ public class GridCacheMvccObsoleteTtlEntryExtras extends GridCacheEntryExtrasAda
* @param ttl TTL.
* @param expireTime Expire time.
*/
- public GridCacheMvccObsoleteTtlEntryExtras(GridCacheMvcc mvcc, GridCacheVersion obsoleteVer, long ttl,
+ GridCacheMvccObsoleteTtlEntryExtras(GridCacheMvcc mvcc, GridCacheVersion obsoleteVer, long ttl,
long expireTime) {
assert mvcc != null;
assert obsoleteVer != null;
- assert ttl != 0;
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.mvcc = mvcc;
this.obsoleteVer = obsoleteVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
index 5a966cd..44131c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
@@ -42,8 +42,9 @@ public class GridCacheMvccTtlEntryExtras extends GridCacheEntryExtrasAdapter {
* @param ttl TTL.
* @param expireTime Expire time.
*/
- public GridCacheMvccTtlEntryExtras(GridCacheMvcc mvcc, long ttl, long expireTime) {
+ GridCacheMvccTtlEntryExtras(GridCacheMvcc mvcc, long ttl, long expireTime) {
assert mvcc != null;
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.mvcc = mvcc;
this.ttl = ttl;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
index 7de3aec..514bbfe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
@@ -42,8 +42,9 @@ public class GridCacheObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter
* @param ttl TTL.
* @param expireTime Expire time.
*/
- public GridCacheObsoleteTtlEntryExtras(GridCacheVersion obsoleteVer, long ttl, long expireTime) {
+ GridCacheObsoleteTtlEntryExtras(GridCacheVersion obsoleteVer, long ttl, long expireTime) {
assert obsoleteVer != null;
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.obsoleteVer = obsoleteVer;
this.ttl = ttl;
http://git-wip-us.apache.org/repos/asf/ignite/blob/11a7e7d0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
index d81a100..9872f1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
@@ -39,7 +39,7 @@ public class GridCacheTtlEntryExtras extends GridCacheEntryExtrasAdapter {
* @param expireTime Expire time.
*/
public GridCacheTtlEntryExtras(long ttl, long expireTime) {
- assert expireTime != 0;
+ assert expireTime != CU.EXPIRE_TIME_ETERNAL;
this.ttl = ttl;
this.expireTime = expireTime;