[33/50] [abbrv] ignite git commit: IGNITE-10130 Added an option to disable cache interceptor trigger in case of conflicts - Fixes #5251.

2018-12-25 Thread sboikov 
IGNITE-10130 Added an option to disable cache interceptor trigger in case of 
conflicts - Fixes #5251.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/ignite-601
Commit: 7414c9956d9f00e6514a508035156f2605df286a
Parents: 7868e66
Author: Sergey Antonov 
Authored: Mon Dec 24 14:33:06 2018 +0300
Committer: Alexey Goncharuk 
Committed: Mon Dec 24 14:47:53 2018 +0300

--
 .../apache/ignite/IgniteSystemProperties.java   |   7 +
 .../processors/cache/GridCacheContext.java  |  12 ++
 .../processors/cache/GridCacheMapEntry.java | 168 +++
 3 files changed, 120 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7414c995/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 9979ee1..4cfb361 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -1042,6 +1042,13 @@ public final class IgniteSystemProperties {
 public static final String IGNITE_RECOVERY_VERBOSE_LOGGING = 
"IGNITE_RECOVERY_VERBOSE_LOGGING";
 
 /**
+ * Disables cache interceptor triggering in case of conflicts.
+ *
+ * Default is {@code false}.
+ */
+public static final String 
IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT = 
"IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT";
+
+/**
  * Sets default {@link CacheConfiguration#setDiskPageCompression disk page 
compression}.
  */
 public static final String IGNITE_DEFAULT_DISK_PAGE_COMPRESSION = 
"IGNITE_DEFAULT_DISK_PAGE_COMPRESSION";

http://git-wip-us.apache.org/repos/asf/ignite/blob/7414c995/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 19c01b2..2f73218 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -109,6 +109,7 @@ import org.apache.ignite.plugin.security.SecurityException;
 import org.apache.ignite.plugin.security.SecurityPermission;
 import org.jetbrains.annotations.Nullable;
 
+import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT;
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_READ_LOAD_BALANCING;
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -276,6 +277,10 @@ public class GridCacheContext implements 
Externalizable {
 /** Recovery mode flag. */
 private volatile boolean recoveryMode;
 
+/** */
+private final boolean disableTriggeringCacheInterceptorOnConflict =
+
Boolean.parseBoolean(System.getProperty(IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT,
 "false"));
+
 /**
  * Empty constructor required for {@link Externalizable}.
  */
@@ -861,6 +866,13 @@ public class GridCacheContext implements 
Externalizable {
 }
 
 /**
+ * @return {@code True} if cache interceptor should be skipped in case of 
conflicts.
+ */
+public boolean disableTriggeringCacheInterceptorOnConflict() {
+return disableTriggeringCacheInterceptorOnConflict;
+}
+
+/**
  * @return Local node.
  */
 public ClusterNode localNode() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/7414c995/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 881e868..899417d 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
@@ -34,6 +34,7 @@ import

ignite git commit: IGNITE-10130 Added an option to disable cache interceptor trigger in case of conflicts - Fixes #5251.

2018-12-24 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/master 7868e6679 -> 7414c9956


IGNITE-10130 Added an option to disable cache interceptor trigger in case of 
conflicts - Fixes #5251.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/master
Commit: 7414c9956d9f00e6514a508035156f2605df286a
Parents: 7868e66
Author: Sergey Antonov 
Authored: Mon Dec 24 14:33:06 2018 +0300
Committer: Alexey Goncharuk 
Committed: Mon Dec 24 14:47:53 2018 +0300

--
 .../apache/ignite/IgniteSystemProperties.java   |   7 +
 .../processors/cache/GridCacheContext.java  |  12 ++
 .../processors/cache/GridCacheMapEntry.java | 168 +++
 3 files changed, 120 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7414c995/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 9979ee1..4cfb361 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -1042,6 +1042,13 @@ public final class IgniteSystemProperties {
 public static final String IGNITE_RECOVERY_VERBOSE_LOGGING = 
"IGNITE_RECOVERY_VERBOSE_LOGGING";
 
 /**
+ * Disables cache interceptor triggering in case of conflicts.
+ *
+ * Default is {@code false}.
+ */
+public static final String 
IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT = 
"IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT";
+
+/**
  * Sets default {@link CacheConfiguration#setDiskPageCompression disk page 
compression}.
  */
 public static final String IGNITE_DEFAULT_DISK_PAGE_COMPRESSION = 
"IGNITE_DEFAULT_DISK_PAGE_COMPRESSION";

http://git-wip-us.apache.org/repos/asf/ignite/blob/7414c995/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 19c01b2..2f73218 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -109,6 +109,7 @@ import org.apache.ignite.plugin.security.SecurityException;
 import org.apache.ignite.plugin.security.SecurityPermission;
 import org.jetbrains.annotations.Nullable;
 
+import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT;
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_READ_LOAD_BALANCING;
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -276,6 +277,10 @@ public class GridCacheContext implements 
Externalizable {
 /** Recovery mode flag. */
 private volatile boolean recoveryMode;
 
+/** */
+private final boolean disableTriggeringCacheInterceptorOnConflict =
+
Boolean.parseBoolean(System.getProperty(IGNITE_DISABLE_TRIGGERING_CACHE_INTERCEPTOR_ON_CONFLICT,
 "false"));
+
 /**
  * Empty constructor required for {@link Externalizable}.
  */
@@ -861,6 +866,13 @@ public class GridCacheContext implements 
Externalizable {
 }
 
 /**
+ * @return {@code True} if cache interceptor should be skipped in case of 
conflicts.
+ */
+public boolean disableTriggeringCacheInterceptorOnConflict() {
+return disableTriggeringCacheInterceptorOnConflict;
+}
+
+/**
  * @return Local node.
  */
 public ClusterNode localNode() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/7414c995/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 881e868..899417d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++