svn commit: r1660570 - /incubator/ignite/site/trunk/index.html
Author: dsetrakyan Date: Wed Feb 18 08:19:56 2015 New Revision: 1660570 URL: http://svn.apache.org/r1660570 Log: added source code link Modified: incubator/ignite/site/trunk/index.html Modified: incubator/ignite/site/trunk/index.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/index.html?rev=1660570&r1=1660569&r2=1660570&view=diff == --- incubator/ignite/site/trunk/index.html (original) +++ incubator/ignite/site/trunk/index.html Wed Feb 18 08:19:56 2015 @@ -179,6 +179,11 @@ under the License. http://mail-archives.apache.org/mod_mbox/incubator-ignite-commits/";>commits@archive + + +See Apache Ignite source code in https://git-wip-us.apache.org/repos/asf/incubator-ignite";>Apache Git Repository + +
incubator-ignite git commit: # ignite-281 Fixed npe CacheJdbcPojoStore.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-281 [created] 7ada6a5f5
# ignite-281 Fixed npe CacheJdbcPojoStore.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ada6a5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ada6a5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ada6a5f
Branch: refs/heads/ignite-281
Commit: 7ada6a5f5a339b1282bd554c068b380254f78065
Parents: dd6c24f
Author: anovikov
Authored: Wed Feb 18 15:03:07 2015 +0700
Committer: anovikov
Committed: Wed Feb 18 15:28:42 2015 +0700
--
.../cache/store/jdbc/CacheJdbcPojoStore.java| 28 +++-
1 file changed, 22 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ada6a5f/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
index 8687d90..0c6292d 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
@@ -69,7 +69,7 @@ public class CacheJdbcPojoStore extends
CacheAbstractJdbcStore {
throw new CacheException("Failed to find class: " + clsName,
e);
}
catch (NoSuchMethodException e) {
-throw new CacheException("Failed to find empty constructor for
class: " + clsName, e);
+throw new CacheException("Failed to find default constructor
for class: " + clsName, e);
}
setters = U.newHashMap(fields.size());
@@ -87,8 +87,8 @@ public class CacheJdbcPojoStore extends
CacheAbstractJdbcStore {
getters.put(field.getJavaName(), cls.getMethod("is" +
prop));
}
catch (NoSuchMethodException e) {
-throw new CacheException("Failed to find getter for
property " + field.getJavaName() +
-" of class: " + cls.getName(), e);
+throw new CacheException("Failed to find getter in
pojo class [class name: " + clsName +
+", property: " + field.getJavaName() + "]", e);
}
}
@@ -96,8 +96,8 @@ public class CacheJdbcPojoStore extends
CacheAbstractJdbcStore {
setters.put(field.getJavaName(), cls.getMethod("set" +
prop, field.getJavaType()));
}
catch (NoSuchMethodException e) {
-throw new CacheException("Failed to find setter for
property " + field.getJavaName() +
-" of class: " + clsName, e);
+throw new CacheException("Failed to find setter in pojo
class [class name: " + clsName +
+", property: " + field.getJavaName() + "]", e);
}
}
}
@@ -157,12 +157,19 @@ public class CacheJdbcPojoStore extends
CacheAbstractJdbcStore {
Map loadColIdxs, ResultSet rs) throws
CacheLoaderException {
PojoMethodsCache mc = mtdsCache.get(cacheName).get(typeName);
+if (mc == null)
+throw new CacheLoaderException("Failed to find cache type metadata
for type: " + typeName);
+
Object obj = mc.newInstance();
try {
for (CacheTypeFieldMetadata field : fields) {
Method setter = mc.setters.get(field.getJavaName());
+if (setter == null)
+throw new CacheLoaderException("Failed to find setter in
pojo class [class name:" + typeName +
+", property: " + field.getJavaName() + "]");
+
Integer colIdx = loadColIdxs.get(field.getDatabaseName());
setter.invoke(obj, getColumnValue(rs, colIdx,
field.getJavaType()));
@@ -181,7 +188,16 @@ public class CacheJdbcPojoStore extends
CacheAbstractJdbcStore {
try {
PojoMethodsCache mc = mtdsCache.get(cacheName).get(typeName);
-return mc.getters.get(fieldName).invoke(obj);
+if (mc == null)
+throw new CacheException("Failed to find cache type metadata
for type: " + typeName);
+
+Method getter = mc.getters.get(fieldName);
+
+if (getter == null)
+throw new CacheLoaderException("Failed to find getter in pojo
class [class name:" + typeName +
+", property: " + fieldName + "]");
+
+return getter.invoke
incubator-ignite git commit: sprint-2: minor
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 dd6c24f4e -> 7d1eb8ed3
sprint-2: minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d1eb8ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d1eb8ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d1eb8ed
Branch: refs/heads/sprint-2
Commit: 7d1eb8ed32e54d0ffecdb976fcbcebbd09ab302f
Parents: dd6c24f
Author: Yakov Zhdanov
Authored: Wed Feb 18 11:32:06 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Feb 18 11:32:06 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1eb8ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 79f3994..9489e36 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -77,10 +77,12 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter ctx,
+public IgniteCacheProxy(
+GridCacheContext ctx,
GridCacheProjectionEx delegate,
@Nullable GridCacheProjectionImpl prj,
-boolean async) {
+boolean async
+) {
super(async);
assert ctx != null;
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5a15a16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5a15a16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5a15a16 Branch: refs/heads/sprint-2 Commit: c5a15a16d80401fb688b6ffb8d3a0aa66fe8291a Parents: bbe5a5e 7d1eb8e Author: AKuznetsov Authored: Wed Feb 18 15:42:42 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 15:42:42 2015 +0700 -- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[1/2] incubator-ignite git commit: # sprint-2 Cleanup of removed SPIs.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 7d1eb8ed3 -> c5a15a16d
# sprint-2 Cleanup of removed SPIs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bbe5a5eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbe5a5eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbe5a5eb
Branch: refs/heads/sprint-2
Commit: bbe5a5ebda1aa1db3401b908e0c910ff13ce9d56
Parents: dd6c24f
Author: AKuznetsov
Authored: Wed Feb 18 15:42:11 2015 +0700
Committer: AKuznetsov
Committed: Wed Feb 18 15:42:11 2015 +0700
--
.../visor/node/VisorSpisConfiguration.java | 34
.../config/VisorConfigurationCommand.scala | 2 --
2 files changed, 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
index 4cd62e8..9e95647 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
@@ -47,12 +47,6 @@ public class VisorSpisConfiguration implements Serializable {
/** Collision SPI. */
private IgniteBiTuple> colSpi;
-/** Authentication SPI. */
-private IgniteBiTuple> authSpi;
-
-/** Secure Session SPI. */
-private IgniteBiTuple> sesSpi;
-
/** Deployment SPI. */
private IgniteBiTuple> deploySpi;
@@ -218,34 +212,6 @@ public class VisorSpisConfiguration implements
Serializable {
}
/**
- * @return Authentication SPI.
- */
-public IgniteBiTuple> authenticationSpi() {
-return authSpi;
-}
-
-/**
- * @param authSpi New authentication SPI.
- */
-public void authenticationSpi(IgniteBiTuple>
authSpi) {
-this.authSpi = authSpi;
-}
-
-/**
- * @return Secure Session SPI.
- */
-public IgniteBiTuple> secureSessionSpi() {
-return sesSpi;
-}
-
-/**
- * @param sesSpi New secure Session SPI.
- */
-public void secureSessionSpi(IgniteBiTuple>
sesSpi) {
-this.sesSpi = sesSpi;
-}
-
-/**
* @return Deployment SPI.
*/
public IgniteBiTuple> deploymentSpi() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index bbc2050..f54d1fc 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -274,8 +274,6 @@ class VisorConfigurationCommand {
spisT += ("Communication", spiClass(cfg.spis().communicationSpi()))
spisT += ("Event storage", spiClass(cfg.spis().eventStorageSpi()))
spisT += ("Collision", spiClass(cfg.spis().collisionSpi()))
-spisT += ("Authentication",
spiClass(cfg.spis().authenticationSpi()))
-spisT += ("Secure session",
spiClass(cfg.spis().secureSessionSpi()))
spisT += ("Deployment", spiClass(cfg.spis().deploymentSpi()))
spisT += ("Checkpoints", spisClass(cfg.spis().checkpointSpis()))
spisT += ("Failovers", spisClass(cfg.spis().failoverSpis()))
[3/4] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5a15a16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5a15a16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5a15a16 Branch: refs/heads/ignite-281 Commit: c5a15a16d80401fb688b6ffb8d3a0aa66fe8291a Parents: bbe5a5e 7d1eb8e Author: AKuznetsov Authored: Wed Feb 18 15:42:42 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 15:42:42 2015 +0700 -- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[4/4] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/958282b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/958282b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/958282b9 Branch: refs/heads/ignite-281 Commit: 958282b9d5588ed1939e63b13ded57c4e1c0f49c Parents: 7ada6a5 c5a15a1 Author: anovikov Authored: Wed Feb 18 16:06:01 2015 +0700 Committer: anovikov Committed: Wed Feb 18 16:06:01 2015 +0700 -- .../processors/cache/IgniteCacheProxy.java | 6 ++-- .../visor/node/VisorSpisConfiguration.java | 34 .../config/VisorConfigurationCommand.scala | 2 -- 3 files changed, 4 insertions(+), 38 deletions(-) --
[1/4] incubator-ignite git commit: sprint-2: minor
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-281 7ada6a5f5 -> 958282b9d
sprint-2: minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d1eb8ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d1eb8ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d1eb8ed
Branch: refs/heads/ignite-281
Commit: 7d1eb8ed32e54d0ffecdb976fcbcebbd09ab302f
Parents: dd6c24f
Author: Yakov Zhdanov
Authored: Wed Feb 18 11:32:06 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Feb 18 11:32:06 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1eb8ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 79f3994..9489e36 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -77,10 +77,12 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter ctx,
+public IgniteCacheProxy(
+GridCacheContext ctx,
GridCacheProjectionEx delegate,
@Nullable GridCacheProjectionImpl prj,
-boolean async) {
+boolean async
+) {
super(async);
assert ctx != null;
[2/4] incubator-ignite git commit: # sprint-2 Cleanup of removed SPIs.
# sprint-2 Cleanup of removed SPIs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bbe5a5eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbe5a5eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbe5a5eb
Branch: refs/heads/ignite-281
Commit: bbe5a5ebda1aa1db3401b908e0c910ff13ce9d56
Parents: dd6c24f
Author: AKuznetsov
Authored: Wed Feb 18 15:42:11 2015 +0700
Committer: AKuznetsov
Committed: Wed Feb 18 15:42:11 2015 +0700
--
.../visor/node/VisorSpisConfiguration.java | 34
.../config/VisorConfigurationCommand.scala | 2 --
2 files changed, 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
index 4cd62e8..9e95647 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
@@ -47,12 +47,6 @@ public class VisorSpisConfiguration implements Serializable {
/** Collision SPI. */
private IgniteBiTuple> colSpi;
-/** Authentication SPI. */
-private IgniteBiTuple> authSpi;
-
-/** Secure Session SPI. */
-private IgniteBiTuple> sesSpi;
-
/** Deployment SPI. */
private IgniteBiTuple> deploySpi;
@@ -218,34 +212,6 @@ public class VisorSpisConfiguration implements
Serializable {
}
/**
- * @return Authentication SPI.
- */
-public IgniteBiTuple> authenticationSpi() {
-return authSpi;
-}
-
-/**
- * @param authSpi New authentication SPI.
- */
-public void authenticationSpi(IgniteBiTuple>
authSpi) {
-this.authSpi = authSpi;
-}
-
-/**
- * @return Secure Session SPI.
- */
-public IgniteBiTuple> secureSessionSpi() {
-return sesSpi;
-}
-
-/**
- * @param sesSpi New secure Session SPI.
- */
-public void secureSessionSpi(IgniteBiTuple>
sesSpi) {
-this.sesSpi = sesSpi;
-}
-
-/**
* @return Deployment SPI.
*/
public IgniteBiTuple> deploymentSpi() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index bbc2050..f54d1fc 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -274,8 +274,6 @@ class VisorConfigurationCommand {
spisT += ("Communication", spiClass(cfg.spis().communicationSpi()))
spisT += ("Event storage", spiClass(cfg.spis().eventStorageSpi()))
spisT += ("Collision", spiClass(cfg.spis().collisionSpi()))
-spisT += ("Authentication",
spiClass(cfg.spis().authenticationSpi()))
-spisT += ("Secure session",
spiClass(cfg.spis().secureSessionSpi()))
spisT += ("Deployment", spiClass(cfg.spis().deploymentSpi()))
spisT += ("Checkpoints", spisClass(cfg.spis().checkpointSpis()))
spisT += ("Failovers", spisClass(cfg.spis().failoverSpis()))
incubator-ignite git commit: # ignite-297
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-297 [created] e855d9a7c
# ignite-297
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e855d9a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e855d9a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e855d9a7
Branch: refs/heads/ignite-297
Commit: e855d9a7c92bad81fb1494963bbf1fd1dffbfb1c
Parents: f139706
Author: sboikov
Authored: Wed Feb 18 11:00:51 2015 +0300
Committer: sboikov
Committed: Wed Feb 18 12:28:48 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 102 +++
.../cache/GridCacheEvictionManager.java | 21 ++--
.../processors/cache/GridCacheMapEntry.java | 6 ++
.../processors/cache/GridCacheUtils.java| 8 +-
.../dht/GridPartitionedGetFuture.java | 8 +-
.../dht/atomic/GridDhtAtomicCache.java | 15 +++
.../distributed/near/GridNearGetFuture.java | 15 ++-
.../local/atomic/GridLocalAtomicCache.java | 9 +-
.../cache/transactions/IgniteTxAdapter.java | 11 +-
.../cache/transactions/IgniteTxEntry.java | 3 +
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 2 +
12 files changed, 159 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e855d9a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 9d8f243..46e15f4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -647,9 +647,12 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture containsKeyAsync(final K
key) {
+@Override public IgniteInternalFuture containsKeyAsync(K key) {
A.notNull(key, "key");
+if (ctx.portableEnabled())
+key = (K)ctx.marshalToPortable(key);
+
return getAllAsync(
Collections.singletonList(key),
/*force primary*/false,
@@ -660,10 +663,14 @@ public abstract class GridCacheAdapter implements
GridCache,
/*deserialize portable*/false,
/*skip values*/true
).chain(new CX1>, Boolean>() {
-@Override public Boolean applyx(IgniteInternalFuture> fut) throws IgniteCheckedException {
-return fut.get().get(key) != null;
-}
-});
+@Override public Boolean applyx(IgniteInternalFuture>
fut) throws IgniteCheckedException {
+Map map = fut.get();
+
+assert map.isEmpty() || map.size() == 1 : map.size();
+
+return map.isEmpty() ? false : map.values().iterator().next()
!= null;
+}
+});
}
/** {@inheritDoc} */
@@ -680,6 +687,14 @@ public abstract class GridCacheAdapter implements
GridCache,
@Override public IgniteInternalFuture
containsKeysAsync(Collection keys) {
A.notNull(keys, "keys");
+if (ctx.portableEnabled() && !F.isEmpty(keys)) {
+keys = F.viewReadOnly(keys, new C1() {
+@Override public K apply(K k) {
+return (K)ctx.marshalToPortable(k);
+}
+});
+}
+
return getAllAsync(
keys,
/*force primary*/false,
@@ -693,9 +708,10 @@ public abstract class GridCacheAdapter implements
GridCache,
@Override public Boolean applyx(IgniteInternalFuture>
fut) throws IgniteCheckedException {
Map kvMap = fut.get();
-for (Map.Entry entry : kvMap.entrySet())
+for (Map.Entry entry : kvMap.entrySet()) {
if (entry.getValue() == null)
return false;
+}
return true;
}
@@ -2157,10 +2173,14 @@ public abstract class GridCacheAdapter implements
GridCache,
else {
val = ctx.cloneOnFlag(val);
-if (ctx.portableEnabled() &&
deserializePortable)
+K key0 = key;
+
+if (ctx.portableEnabled() &&
deserializePortable) {
val = (V)ctx.unwrapPortableI
[35/36] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-283
Merge branch 'sprint-2' into ignite-283 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/099ecbf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/099ecbf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/099ecbf9 Branch: refs/heads/ignite-283 Commit: 099ecbf97cf97ffbf27b202909afcc3adb481318 Parents: 3beb04b c5a15a1 Author: vozerov-gridgain Authored: Wed Feb 18 12:30:14 2015 +0300 Committer: vozerov-gridgain Committed: Wed Feb 18 12:30:14 2015 +0300 -- bin/include/target-classpath.bat| 4 +- bin/include/target-classpath.sh | 10 ++- .../IgniteAtomicSequenceExample.java| 35 -- .../internal/client/impl/GridClientImpl.java| 2 +- .../processors/cache/GridCacheAdapter.java | 4 ++ .../processors/cache/IgniteCacheProxy.java | 6 +- .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../security/GridSecurityContext.java | 9 ++- .../cache/VisorCacheDefaultConfiguration.java | 57 --- .../visor/cache/VisorCacheLoadTask.java | 35 -- .../visor/node/VisorNodeDataCollectorJob.java | 50 +++--- .../visor/node/VisorSpisConfiguration.java | 34 - .../internal/visor/util/VisorEventMapper.java | 73 .../internal/visor/util/VisorTaskUtils.java | 60 .../near/IgniteCacheNearReadCommittedTest.java | 68 ++ .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 6 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + .../commands/cache/VisorCacheCommand.scala | 3 - .../config/VisorConfigurationCommand.scala | 2 - .../commands/events/VisorEventsCommand.scala| 14 ++-- 21 files changed, 275 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/099ecbf9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java --
[15/36] incubator-ignite git commit: sprint-2: minor
sprint-2: minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0dda33a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0dda33a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0dda33a3
Branch: refs/heads/ignite-283
Commit: 0dda33a309e5928362a4a165d39cb51979b06a0e
Parents: b3a5384
Author: Yakov Zhdanov
Authored: Tue Feb 17 15:14:56 2015 +0300
Committer: Yakov Zhdanov
Committed: Tue Feb 17 15:14:56 2015 +0300
--
.../datastructures/IgniteAtomicSequenceExample.java| 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dda33a3/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
index c65e2cd..f83a819 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
@@ -21,8 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.examples.datagrid.*;
import org.apache.ignite.lang.*;
-import java.util.*;
-
/**
* Demonstrates a simple usage of distributed atomic sequence.
*
@@ -47,18 +45,13 @@ public final class IgniteAtomicSequenceExample {
System.out.println();
System.out.println(">>> Cache atomic sequence example started.");
-// Make name of sequence.
-final String seqName = UUID.randomUUID().toString();
-
-// Initialize atomic sequence.
-IgniteAtomicSequence seq = ignite.atomicSequence(seqName, 0, true);
-
// Try increment atomic sequence on all cluster nodes. Note that
this node is also part of the cluster.
-ignite.compute().broadcast(new SequenceClosure(seqName));
+ignite.compute().broadcast(new
SequenceClosure("example-sequence"));
System.out.println();
System.out.println("Finished atomic sequence example...");
System.out.println("Check all nodes for output (this node is also
part of the cluster).");
+System.out.println();
}
}
@@ -78,6 +71,8 @@ public final class IgniteAtomicSequenceExample {
/** {@inheritDoc} */
@Override public void run() {
+// Create sequence. Only one concurrent call will succeed in
creation.
+// Rest of the callers will get already created instance.
IgniteAtomicSequence seq =
Ignition.ignite().atomicSequence(seqName, 0, true);
// First value of atomic sequence on this node.
[17/36] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e54ccde Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e54ccde Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e54ccde Branch: refs/heads/ignite-283 Commit: 8e54ccdeeec1d622465bdb98e9f4e5d06c66d6e1 Parents: 0865ad4 0dda33a Author: sboikov Authored: Tue Feb 17 15:25:14 2015 +0300 Committer: sboikov Committed: Tue Feb 17 15:25:14 2015 +0300 -- .../IgniteAtomicSequenceExample.java| 35 +--- 1 file changed, 15 insertions(+), 20 deletions(-) --
[23/36] incubator-ignite git commit: # sprint-2 Fixed os path.
# sprint-2 Fixed os path.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3021ef8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3021ef8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3021ef8d
Branch: refs/heads/ignite-283
Commit: 3021ef8d041932ce393fd7f581197ad85e06c795
Parents: fd06847
Author: anovikov
Authored: Tue Feb 17 21:47:48 2015 +0700
Committer: anovikov
Committed: Tue Feb 17 21:47:48 2015 +0700
--
bin/include/target-classpath.bat | 4 +++-
bin/include/target-classpath.sh | 10 +++---
2 files changed, 10 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3021ef8d/bin/include/target-classpath.bat
--
diff --git a/bin/include/target-classpath.bat b/bin/include/target-classpath.bat
index 423f984..bd304c1 100644
--- a/bin/include/target-classpath.bat
+++ b/bin/include/target-classpath.bat
@@ -25,7 +25,7 @@
@echo off
-for /D %%F in (%IGNITE_HOME%\os\modules\*) do if not %%F ==
"%IGNITE_HOME%\os\modules" call :includeToClassPath %%F
+for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath
%%F
for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F ==
"%IGNITE_HOME%\modules" call :includeToClassPath %%F
@@ -35,6 +35,8 @@ goto :eof
if exist "%1\target\" (
if exist "%1\target\classes\" call :concat %1\target\classes
+if exist "%1\target\test-classes\" call :concat %1\target\test-classes
+
if exist "%1\target\libs\" call :concat %1\target\libs\*
)
goto :eof
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3021ef8d/bin/include/target-classpath.sh
--
diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh
index 03aa951..62c9ffa 100644
--- a/bin/include/target-classpath.sh
+++ b/bin/include/target-classpath.sh
@@ -49,6 +49,10 @@ includeToClassPath() {
IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes
fi
+if [ -d "${file}/target/test-classes" ]; then
+IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/test-classes
+fi
+
if [ -d "${file}/target/libs" ]; then
IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/*
fi
@@ -57,11 +61,11 @@ includeToClassPath() {
}
#
-# Include target libraries for opensourse modules to classpath.
+# Include target libraries for enterprise modules to classpath.
#
-includeToClassPath ${IGNITE_HOME}/os/modules
+includeToClassPath modules
#
-# Include target libraries for enterprise modules to classpath.
+# Include target libraries for opensourse modules to classpath.
#
includeToClassPath ${IGNITE_HOME}/modules
[12/36] incubator-ignite git commit: sprint-2: minor
sprint-2: minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/69e2a7d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/69e2a7d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/69e2a7d9
Branch: refs/heads/ignite-283
Commit: 69e2a7d97d6c04a1244cdbfbd0b3855ee6216759
Parents: a4101a5
Author: Yakov Zhdanov
Authored: Tue Feb 17 15:09:29 2015 +0300
Committer: Yakov Zhdanov
Committed: Tue Feb 17 15:09:29 2015 +0300
--
.../IgniteAtomicSequenceExample.java| 23 ++--
1 file changed, 12 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69e2a7d9/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
index ac2aec5..ad6ecdd 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
@@ -53,21 +53,13 @@ public final class IgniteAtomicSequenceExample {
// Initialize atomic sequence.
IgniteAtomicSequence seq = ignite.atomicSequence(seqName, 0, true);
-// First value of atomic sequence on this node.
-long firstVal = seq.get();
-
-System.out.println("Sequence initial value: " + firstVal);
-
// Try increment atomic sequence on all cluster nodes. Note that
this node is also part of the cluster.
ignite.compute().broadcast(new SequenceClosure(seqName));
-System.out.println("Sequence after incrementing [expected=" +
(firstVal + RETRIES) + ", actual=" +
-seq.get() + ']');
+System.out.println();
+System.out.println("Finished atomic sequence example...");
+System.out.println("Check all nodes for output (this node is also
part of the cluster).");
}
-
-System.out.println();
-System.out.println("Finished atomic sequence example...");
-System.out.println("Check all nodes for output (this node is also part
of the cluster).");
}
/**
@@ -88,9 +80,18 @@ public final class IgniteAtomicSequenceExample {
@Override public void run() {
IgniteAtomicSequence seq =
Ignition.ignite().atomicSequence(seqName, 0, true);
+// First value of atomic sequence on this node.
+long firstVal = seq.get();
+
+System.out.println("Sequence initial value on local node: " +
firstVal);
+
for (int i = 0; i < RETRIES; i++)
System.out.println("Sequence [currentValue=" + seq.get() + ",
afterIncrement=" +
seq.incrementAndGet() + ']');
+
+
+System.out.println("Sequence after incrementing [expected=" +
(firstVal + RETRIES) + ", actual=" +
+seq.get() + ']');
}
}
}
[28/36] incubator-ignite git commit: sprint-2: minor
sprint-2: minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d1eb8ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d1eb8ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d1eb8ed
Branch: refs/heads/ignite-283
Commit: 7d1eb8ed32e54d0ffecdb976fcbcebbd09ab302f
Parents: dd6c24f
Author: Yakov Zhdanov
Authored: Wed Feb 18 11:32:06 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Feb 18 11:32:06 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1eb8ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 79f3994..9489e36 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -77,10 +77,12 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter ctx,
+public IgniteCacheProxy(
+GridCacheContext ctx,
GridCacheProjectionEx delegate,
@Nullable GridCacheProjectionImpl prj,
-boolean async) {
+boolean async
+) {
super(async);
assert ctx != null;
[22/36] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fd06847c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd06847c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd06847c Branch: refs/heads/ignite-283 Commit: fd06847cc2d552134d4db11c49c327509ae4ecaf Parents: 04b0880 e3a6c22 Author: Yakov Zhdanov Authored: Tue Feb 17 16:54:24 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Feb 17 16:54:24 2015 +0300 -- .../internal/client/impl/GridClientImpl.java| 2 +- .../processors/cache/GridCacheAdapter.java | 4 ++ .../near/IgniteCacheNearReadCommittedTest.java | 68 .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 4 files changed, 76 insertions(+), 1 deletion(-) --
[24/36] incubator-ignite git commit: # sprint-2 Fixed Visor task prefix.
# sprint-2 Fixed Visor task prefix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7dad84f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7dad84f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7dad84f
Branch: refs/heads/ignite-283
Commit: c7dad84fb3b8ee6d2199e23644f2335837781b70
Parents: 3021ef8
Author: anovikov
Authored: Wed Feb 18 10:02:56 2015 +0700
Committer: anovikov
Committed: Wed Feb 18 10:02:56 2015 +0700
--
.../internal/processors/security/GridSecurityContext.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7dad84f/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
index e112c62..b8057c6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
@@ -30,8 +30,11 @@ public class GridSecurityContext implements Externalizable {
/** */
private static final long serialVersionUID = 0L;
-/** Visor tasks prefix. */
-private static final String VISOR_TASK_PREFIX =
"org.apache.ignite.internal.visor.";
+/** Visor ignite tasks prefix. */
+private static final String VISOR_IGNITE_TASK_PREFIX =
"org.apache.ignite.internal.visor.";
+
+/** Visor gridgain tasks prefix. */
+private static final String VISOR_GRIDGAIN_TASK_PREFIX =
"org.gridgain.grid.internal.visor.";
/** Cache query task name. */
public static final String VISOR_CACHE_QUERY_TASK_NAME =
@@ -168,7 +171,7 @@ public class GridSecurityContext implements Externalizable {
* @return {@code True} if task is Visor task.
*/
private boolean visorTask(String taskCls) {
-return taskCls.startsWith(VISOR_TASK_PREFIX);
+return taskCls.startsWith(VISOR_IGNITE_TASK_PREFIX) ||
taskCls.startsWith(VISOR_GRIDGAIN_TASK_PREFIX);
}
/**
[16/36] incubator-ignite git commit: # sprint-2 fixed closure serialization
# sprint-2 fixed closure serialization
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0865ad4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0865ad4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0865ad4d
Branch: refs/heads/ignite-283
Commit: 0865ad4d95cccb05286077ce1d649f590500e79e
Parents: 7e19e2e
Author: sboikov
Authored: Tue Feb 17 15:24:41 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 15:24:41 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheAdapter.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0865ad4d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 229cecf..9d8f243 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -6185,6 +6185,8 @@ public abstract class GridCacheAdapter implements
GridCache,
out.writeObject(p);
out.writeObject(args);
+
+U.writeString(out, cacheName);
}
/** {@inheritDoc} */
@@ -6193,6 +6195,8 @@ public abstract class GridCacheAdapter implements
GridCache,
p = (IgniteBiPredicate)in.readObject();
args = (Object[])in.readObject();
+
+cacheName = U.readString(in);
}
/** {@inheritDoc} */
[19/36] incubator-ignite git commit: # sprint-2 minor
# sprint-2 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3a6c22f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3a6c22f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3a6c22f
Branch: refs/heads/ignite-283
Commit: e3a6c22f7e41b0b4171f12e3708eaf69a735cebc
Parents: 90e0560
Author: sboikov
Authored: Tue Feb 17 16:10:01 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 16:10:01 2015 +0300
--
.../org/apache/ignite/internal/client/impl/GridClientImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3a6c22f/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
index 9b9f22a..43dd479 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
@@ -409,7 +409,7 @@ public class GridClientImpl implements GridClient {
Class cls = Class.forName(ENT_CONN_MGR_CLS);
Constructor cons = cls.getConstructor(UUID.class,
SSLContext.class, GridClientConfiguration.class,
-Collection.class, GridClientTopology.class, Byte.class);
+Collection.class, GridClientTopology.class, Byte.class,
boolean.class);
mgr = (GridClientConnectionManager)cons.newInstance(clientId,
sslCtx, cfg, routers, top, marshId,
routerClient);
[18/36] incubator-ignite git commit: # sprint-2 added test for IGNITE-285
# sprint-2 added test for IGNITE-285
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/90e0560f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90e0560f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90e0560f
Branch: refs/heads/ignite-283
Commit: 90e0560f2da7efe2c13168bd9474c18278fd57bc
Parents: 8e54ccd
Author: sboikov
Authored: Tue Feb 17 15:43:42 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 15:43:42 2015 +0300
--
.../near/IgniteCacheNearReadCommittedTest.java | 68
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +
2 files changed, 71 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90e0560f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
new file mode 100644
index 000..8de0509
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.transactions.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
+
+/**
+ *
+ */
+public class IgniteCacheNearReadCommittedTest extends
GridCacheAbstractSelfTest {
+/** {@inheritDoc} */
+@Override protected int gridCount() {
+return 2;
+}
+
+/** {@inheritDoc} */
+@Override protected CacheDistributionMode distributionMode() {
+return CacheDistributionMode.NEAR_PARTITIONED;
+}
+
+/** {@inheritDoc} */
+@Override protected CacheMode cacheMode() {
+return PARTITIONED;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testReadCommittedCacheCleanup() throws Exception {
+IgniteCache cache = ignite(0).jcache(null);
+
+Integer key = backupKey(cache);
+
+cache.put(key, key);
+
+try (Transaction tx = ignite(0).transactions().txStart(PESSIMISTIC,
READ_COMMITTED)) {
+assertEquals(key, cache.get(key));
+
+tx.commit();
+}
+
+ignite(1).jcache(null).remove(key); // Remove from primary node.
+
+assertEquals(0, cache.localSize());
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90e0560f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index d081eaf..df9ffab 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -393,6 +393,9 @@ public class IgniteCacheTestSuite extends TestSuite {
// suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class);
// suite.addTestSuite(GridCacheVersionMultinodeTest.class);
+// TODO IGNITE-285.
+// suite.addTestSuite(IgniteCacheNearReadCommittedTest.class);
+
return suite;
}
}
[26/36] incubator-ignite git commit: # IGNITE-249 Cleanup VisorEventsCommand class.
# IGNITE-249 Cleanup VisorEventsCommand class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1397067
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1397067
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1397067
Branch: refs/heads/ignite-283
Commit: f13970678a99adb3280f43d0da01c7e276ed219d
Parents: 60fa4a8
Author: AKuznetsov
Authored: Wed Feb 18 10:24:52 2015 +0700
Committer: AKuznetsov
Committed: Wed Feb 18 10:24:52 2015 +0700
--
.../visor/commands/events/VisorEventsCommand.scala| 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1397067/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index a928160..a5b0a73 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -72,7 +72,7 @@ import scala.language.implicitConversions
* Node ID8.
* Either '-id' or '-id8' can be specified.
* If called without the arguments - starts in interactive mode.
- * -e=
+ * -e=
* Comma separated list of event types that should be queried:
*ch Checkpoint events.
*de Deployment events.
@@ -83,9 +83,6 @@ import scala.language.implicitConversions
*ca Cache events.
*cp Cache pre-loader events.
*sw Swapspace events.
- *au Authentication events.
- az Authorization events.
- se Security session events.
* -t=s|m|h|d
* Defines time frame for querying events:
*=s Queries events fired during last seconds.
@@ -440,7 +437,7 @@ object VisorEventsCommand {
),
spec = List(
"events",
-"events {-id=|-id8=}
{-e=}",
+"events {-id=|-id8=}
{-e=}",
"{-t=s|m|h|d} {-s=e|t} {-r} {-c=}"
),
args = List(
@@ -455,7 +452,7 @@ object VisorEventsCommand {
"you can also use '@n0' ... '@nn' variables as shortcut to
.",
"If called without the arguments - starts in interactive mode."
),
-"-e=" -> List(
+"-e=" -> List(
"Comma separated list of event types that should be queried:",
" ch Checkpoint events.",
" de Deployment events.",
@@ -464,10 +461,7 @@ object VisorEventsCommand {
" ta Task execution events.",
" ca Cache events.",
" cp Cache pre-loader events.",
-" sw Swapspace events.",
-" au Authentication events.",
-" az Authorization events.",
-" se Security session events."
+" sw Swapspace events."
),
"-t=s|m|h|d" -> List(
"Defines time frame for quering events:",
[09/36] incubator-ignite git commit: # sprint-2 Minor.
# sprint-2 Minor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7c57824
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7c57824
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7c57824
Branch: refs/heads/ignite-283
Commit: f7c5782473ead17a1fc460b637ba0b4b143552d9
Parents: 38e1389
Author: AKuznetsov
Authored: Tue Feb 17 17:21:17 2015 +0700
Committer: AKuznetsov
Committed: Tue Feb 17 17:21:17 2015 +0700
--
.../apache/ignite/internal/visor/cache/VisorCacheLoadTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7c57824/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
index 55e3f5e..5ec5b0e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
@@ -63,10 +63,10 @@ public class VisorCacheLoadTask extends
Map res = new HashMap<>();
-ExpiryPolicy policy = new CreatedExpiryPolicy(new
Duration(TimeUnit.MILLISECONDS, ttl));
+ExpiryPolicy plc = new CreatedExpiryPolicy(new
Duration(TimeUnit.MILLISECONDS, ttl));
for (String cacheName: cacheNames) {
-IgniteCache cache =
ignite.jcache(cacheName).withExpiryPolicy(policy);
+IgniteCache cache =
ignite.jcache(cacheName).withExpiryPolicy(plc);
cache.loadCache(null, ldrArgs);
[27/36] incubator-ignite git commit: Merge branch 'ignite-274' into sprint-2
Merge branch 'ignite-274' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd6c24f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd6c24f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd6c24f4 Branch: refs/heads/ignite-283 Commit: dd6c24f4e45cf136aa1d496028c20ce5f0d1a35d Parents: f139706 27f7c6d Author: AKuznetsov Authored: Wed Feb 18 14:16:05 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 14:16:05 2015 +0700 -- .../cache/VisorCacheDefaultConfiguration.java | 57 .../commands/cache/VisorCacheCommand.scala | 3 -- 2 files changed, 60 deletions(-) --
[04/36] incubator-ignite git commit: Merge branches 'ignite-275' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275
Merge branches 'ignite-275' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d3409589 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3409589 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3409589 Branch: refs/heads/ignite-283 Commit: d340958984321f2d9b8b548ea2323466fe80fcc8 Parents: 677e643 a4101a5 Author: AKuznetsov Authored: Tue Feb 17 14:46:06 2015 +0700 Committer: AKuznetsov Committed: Tue Feb 17 14:46:06 2015 +0700 -- .../internal/visor/node/VisorExecutorServiceConfiguration.java | 1 + 1 file changed, 1 insertion(+) --
[20/36] incubator-ignite git commit: # ignite-283: WIP.
# ignite-283: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/362bf16a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/362bf16a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/362bf16a
Branch: refs/heads/ignite-283
Commit: 362bf16a0d9038cab1503fb89944ae38f208fd28
Parents: eee156a
Author: vozerov-gridgain
Authored: Tue Feb 17 16:23:44 2015 +0300
Committer: vozerov-gridgain
Committed: Tue Feb 17 16:23:44 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 27 +--
.../processors/cache/GridCacheMapEntry.java | 187 +--
.../processors/cache/GridCacheUtils.java| 46 -
.../distributed/dht/GridDhtCacheAdapter.java| 15 +-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 25 +--
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../dataload/IgniteDataLoaderImpl.java | 3 +-
8 files changed, 158 insertions(+), 151 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/362bf16a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 229cecf..fa3cb17 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3850,16 +3850,10 @@ public abstract class GridCacheAdapter implements
GridCache,
throws IgniteException {
assert ver == null;
-long ttl = 0;
+Long ttl = CU.ttlForLoad(plc);
-if (plc != null) {
-ttl = CU.toTtl(plc.getExpiryForCreation());
-
-if (ttl == CU.TTL_ZERO)
-return;
-else if (ttl == CU.TTL_NOT_CHANGED)
-ttl = 0;
-}
+if (ttl == null)
+return;
loadEntry(key, val, ver0, p, topVer, replicate, ttl);
}
@@ -3894,7 +3888,8 @@ public abstract class GridCacheAdapter implements
GridCache,
GridCacheEntryEx entry = entryEx(key, false);
try {
-entry.initialValue(val, null, ver, ttl, -1, false, topVer,
replicate ? DR_LOAD : DR_NONE);
+entry.initialValue(val, null, ver, ttl, CU.EXPIRE_TIME_CALCULATE,
false, topVer,
+replicate ? DR_LOAD : DR_NONE);
}
catch (IgniteCheckedException e) {
throw new IgniteException("Failed to put cache value: " + entry,
e);
@@ -4050,16 +4045,10 @@ public abstract class GridCacheAdapter implements
GridCache,
ctx.store().loadAllFromStore(null, keys, new CI2() {
@Override public void apply(K key, V val) {
-long ttl = 0;
+Long ttl = CU.ttlForLoad(plc0);
-if (plc0 != null) {
-ttl = CU.toTtl(plc0.getExpiryForCreation());
-
-if (ttl == CU.TTL_ZERO)
-return;
-else if (ttl == CU.TTL_NOT_CHANGED)
-ttl = 0;
-}
+if (ttl == null)
+return;
loadEntry(key, val, ver0, null, topVer, replicate, ttl);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/362bf16a/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 dc0fa59..cc879cb 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
@@ -802,18 +802,8 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
evt = false;
}
-if (ret != null && expiryPlc != null) {
-long ttl = expiryPlc.forAccess();
-
-if (ttl != CU.TTL_NOT_CHANGED) {
-updateTtl(t
[01/36] incubator-ignite git commit: # IGNITE-274 Cleanup of removed functionality.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-283 eee156a0f -> 707a24b6f
# IGNITE-274 Cleanup of removed functionality.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce9fd4e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce9fd4e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce9fd4e3
Branch: refs/heads/ignite-283
Commit: ce9fd4e32b64448762f9980a53c77aa02626ea61
Parents: 659b432
Author: AKuznetsov
Authored: Tue Feb 17 10:22:19 2015 +0700
Committer: AKuznetsov
Committed: Tue Feb 17 10:22:19 2015 +0700
--
.../cache/VisorCacheDefaultConfiguration.java | 57
.../commands/cache/VisorCacheCommand.scala | 3 --
2 files changed, 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce9fd4e3/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
index ae8aa11..97f8f30 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
import java.io.*;
@@ -30,18 +29,9 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
/** */
private static final long serialVersionUID = 0L;
-/** Default transaction isolation. */
-private TransactionIsolation txIsolation;
-
-/** Default transaction concurrency. */
-private TransactionConcurrency txConcurrency;
-
/** TTL value. */
private long ttl;
-/** Default transaction concurrency. */
-private long txTimeout;
-
/** Default transaction timeout. */
private long txLockTimeout;
@@ -53,14 +43,9 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
* @return Data transfer object for default cache configuration properties.
*/
public static VisorCacheDefaultConfiguration from(CacheConfiguration ccfg)
{
-// TODO GG-9141 Update Visor.
-
VisorCacheDefaultConfiguration cfg = new
VisorCacheDefaultConfiguration();
-//cfg.txIsolation(ccfg.getDefaultTxIsolation());
-//cfg.txConcurrency(ccfg.getDefaultTxConcurrency());
cfg.timeToLive(ccfg.getDefaultTimeToLive());
-//cfg.txTimeout(ccfg.getDefaultTxTimeout());
cfg.txLockTimeout(ccfg.getDefaultLockTimeout());
cfg.queryTimeout(ccfg.getDefaultQueryTimeout());
@@ -68,34 +53,6 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
}
/**
- * @return Default transaction isolation.
- */
-public TransactionIsolation txIsolation() {
-return txIsolation;
-}
-
-/**
- * @param txIsolation New default transaction isolation.
- */
-public void txIsolation(TransactionIsolation txIsolation) {
-this.txIsolation = txIsolation;
-}
-
-/**
- * @return Default transaction concurrency.
- */
-public TransactionConcurrency txConcurrency() {
-return txConcurrency;
-}
-
-/**
- * @param txConcurrency New default transaction concurrency.
- */
-public void txConcurrency(TransactionConcurrency txConcurrency) {
-this.txConcurrency = txConcurrency;
-}
-
-/**
* @return TTL value.
*/
public long timeToLive() {
@@ -110,20 +67,6 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
}
/**
- * @return Default transaction concurrency.
- */
-public long txTimeout() {
-return txTimeout;
-}
-
-/**
- * @param txTimeout New default transaction concurrency.
- */
-public void txTimeout(long txTimeout) {
-this.txTimeout = txTimeout;
-}
-
-/**
* @return Default transaction timeout.
*/
public long txLockTimeout() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce9fd4e3/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/mai
[36/36] incubator-ignite git commit: # ignite-283-1: WIP.
# ignite-283-1: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/707a24b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/707a24b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/707a24b6
Branch: refs/heads/ignite-283
Commit: 707a24b6f1a782556aaed78fb0d09d889f52be79
Parents: 099ecbf
Author: vozerov-gridgain
Authored: Wed Feb 18 13:05:16 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:05:16 2015 +0300
--
.../processors/cache/GridCacheEntryEx.java | 8 +-
.../processors/cache/GridCacheMapEntry.java | 44 ++--
.../cache/conflict/GridCacheConflictInfo.java | 30 ---
.../conflict/GridCacheConflictInnerUpdate.java | 88
.../conflict/GridCacheNoTtlConflictInfo.java| 99 -
.../conflict/GridCacheTtlConflictInfo.java | 138
.../dht/atomic/GridDhtAtomicCache.java | 94 -
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 64 +++---
.../dht/atomic/GridNearAtomicUpdateRequest.java | 208 ++-
.../distributed/near/GridNearAtomicCache.java | 11 +-
.../processors/cache/GridCacheTestEntryEx.java | 6 +-
12 files changed, 266 insertions(+), 528 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/707a24b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index 0502e2a..1ffed64 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.processors.cache.conflict.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
@@ -427,7 +426,7 @@ public interface GridCacheEntryEx {
* @param conflictTtl Conflict TTL (if any).
* @param conflictExpireTime Conflict expire time (if any).
* @param conflictVer DR version (if any).
- * @param drResolve If {@code true} then performs DR conflicts resolution.
+ * @param conflictResolve If {@code true} then performs conflicts
resolution.
* @param intercept If {@code true} then calls cache interceptor.
* @param subjId Subject ID initiated this update.
* @param taskName Task name.
@@ -456,7 +455,10 @@ public interface GridCacheEntryEx {
boolean checkVer,
@Nullable IgnitePredicate>[] filter,
GridDrType drType,
-GridCacheConflictInnerUpdate conflict,
+long conflictTtl,
+long conflictExpireTime,
+@Nullable GridCacheVersion conflictVer,
+boolean conflictResolve,
boolean intercept,
@Nullable UUID subjId,
String taskName
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/707a24b6/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 d8a42cc..68782ff 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
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.cache.conflict.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.extras.*;
import org.apache.ignite.internal.processors.cache.query.*;
@@ -1553,7 +1552,10 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
boolean verCheck,
@Nullable IgnitePredicate>[] filter,
GridDrType drType,
-GridCacheConflictInnerUpdate conflict,
+long conflictTtl,
+long conflictExpireTime,
+@Nullab
[06/36] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41ffb819 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41ffb819 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41ffb819 Branch: refs/heads/ignite-283 Commit: 41ffb8191a3797f0f00cfd9404cac2e0706518b3 Parents: 570bbfd 862fac9 Author: ivasilinets Authored: Tue Feb 17 12:32:38 2015 +0300 Committer: ivasilinets Committed: Tue Feb 17 12:32:38 2015 +0300 -- .../processors/dataload/IgniteDataLoaderImpl.java | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) --
[11/36] incubator-ignite git commit: # sprint-2 minor
# sprint-2 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e19e2e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e19e2e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e19e2e8
Branch: refs/heads/ignite-283
Commit: 7e19e2e82cb5b361c38d5a8a9f32ce43cc738a8a
Parents: 81a688d
Author: sboikov
Authored: Tue Feb 17 14:49:23 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 14:49:23 2015 +0300
--
.../testframework/junits/common/GridCommonAbstractTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e19e2e8/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 61cb3d7..5472aa9 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -451,7 +451,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
}
}
-throw new IgniteException("Unable to find " + cnt + " keys as backup
for cache.");
+throw new IgniteException("Unable to find " + cnt + " keys as primary
for cache.");
}
/**
@@ -533,7 +533,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
}
}
-throw new IgniteCheckedException("Unable to find " + cnt + " keys as
backup for cache.");
+throw new IgniteCheckedException("Unable to find " + cnt + " keys as
near for cache.");
}
/**
[13/36] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3bf90ab1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3bf90ab1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3bf90ab1 Branch: refs/heads/ignite-283 Commit: 3bf90ab18495d25dc380251a6bf8390b3696f004 Parents: 69e2a7d 7e19e2e Author: Yakov Zhdanov Authored: Tue Feb 17 15:09:46 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Feb 17 15:09:46 2015 +0300 -- .../apache/ignite/internal/IgniteKernal.java| 22 +--- .../continuous/CacheContinuousQueryManager.java | 16 ++- .../dataload/IgniteDataLoaderImpl.java | 14 ++- .../visor/cache/VisorCacheLoadTask.java | 35 +++--- .../IgniteCacheEntryListenerAbstractTest.java | 106 +++ .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 9 +- 7 files changed, 154 insertions(+), 54 deletions(-) --
[03/36] incubator-ignite git commit: Merge branches 'ignite-274' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-274
Merge branches 'ignite-274' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-274 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27f7c6d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27f7c6d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27f7c6d6 Branch: refs/heads/ignite-283 Commit: 27f7c6d6520b7ae61e2e3ecdb4f418f6c7e60b7b Parents: ce9fd4e a4101a5 Author: AKuznetsov Authored: Tue Feb 17 14:26:22 2015 +0700 Committer: AKuznetsov Committed: Tue Feb 17 14:26:22 2015 +0700 -- .../internal/visor/node/VisorExecutorServiceConfiguration.java | 1 + 1 file changed, 1 insertion(+) --
[25/36] incubator-ignite git commit: Merge branches 'ignite-275' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275
Merge branches 'ignite-275' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60fa4a86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60fa4a86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60fa4a86 Branch: refs/heads/ignite-283 Commit: 60fa4a869ff61dacfaababefcfffde8d0b18f577 Parents: df008b2 c7dad84 Author: AKuznetsov Authored: Wed Feb 18 10:12:50 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 10:12:50 2015 +0700 -- bin/include/target-classpath.bat| 4 +- bin/include/target-classpath.sh | 10 ++- .../IgniteAtomicSequenceExample.java| 35 +- .../internal/client/impl/GridClientImpl.java| 2 +- .../processors/cache/GridCacheAdapter.java | 4 ++ .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../security/GridSecurityContext.java | 9 ++- .../visor/cache/VisorCacheLoadTask.java | 35 -- .../near/IgniteCacheNearReadCommittedTest.java | 68 .../junits/common/GridCommonAbstractTest.java | 6 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 11 files changed, 123 insertions(+), 54 deletions(-) --
[14/36] incubator-ignite git commit: sprint-2: minor
sprint-2: minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b3a53842
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b3a53842
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b3a53842
Branch: refs/heads/ignite-283
Commit: b3a53842b79428ebe73df6f98dde17d1d3f5a519
Parents: 3bf90ab
Author: Yakov Zhdanov
Authored: Tue Feb 17 15:11:06 2015 +0300
Committer: Yakov Zhdanov
Committed: Tue Feb 17 15:11:06 2015 +0300
--
.../ignite/examples/datastructures/IgniteAtomicSequenceExample.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3a53842/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
index ad6ecdd..c65e2cd 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
@@ -89,7 +89,6 @@ public final class IgniteAtomicSequenceExample {
System.out.println("Sequence [currentValue=" + seq.get() + ",
afterIncrement=" +
seq.incrementAndGet() + ']');
-
System.out.println("Sequence after incrementing [expected=" +
(firstVal + RETRIES) + ", actual=" +
seq.get() + ']');
}
[07/36] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df008b23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df008b23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df008b23 Branch: refs/heads/ignite-283 Commit: df008b23e58b78778af9a9552887cfa53c9b01bb Parents: d340958 41ffb81 Author: AKuznetsov Authored: Tue Feb 17 17:14:09 2015 +0700 Committer: AKuznetsov Committed: Tue Feb 17 17:14:09 2015 +0700 -- .../apache/ignite/internal/IgniteKernal.java| 22 +--- .../continuous/CacheContinuousQueryManager.java | 16 ++- .../dataload/IgniteDataLoaderImpl.java | 14 ++- .../IgniteCacheEntryListenerAbstractTest.java | 106 +++ .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 3 +- 6 files changed, 138 insertions(+), 29 deletions(-) --
[29/36] incubator-ignite git commit: # sprint-2 Cleanup of removed SPIs.
# sprint-2 Cleanup of removed SPIs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bbe5a5eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbe5a5eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbe5a5eb
Branch: refs/heads/ignite-283
Commit: bbe5a5ebda1aa1db3401b908e0c910ff13ce9d56
Parents: dd6c24f
Author: AKuznetsov
Authored: Wed Feb 18 15:42:11 2015 +0700
Committer: AKuznetsov
Committed: Wed Feb 18 15:42:11 2015 +0700
--
.../visor/node/VisorSpisConfiguration.java | 34
.../config/VisorConfigurationCommand.scala | 2 --
2 files changed, 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
index 4cd62e8..9e95647 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
@@ -47,12 +47,6 @@ public class VisorSpisConfiguration implements Serializable {
/** Collision SPI. */
private IgniteBiTuple> colSpi;
-/** Authentication SPI. */
-private IgniteBiTuple> authSpi;
-
-/** Secure Session SPI. */
-private IgniteBiTuple> sesSpi;
-
/** Deployment SPI. */
private IgniteBiTuple> deploySpi;
@@ -218,34 +212,6 @@ public class VisorSpisConfiguration implements
Serializable {
}
/**
- * @return Authentication SPI.
- */
-public IgniteBiTuple> authenticationSpi() {
-return authSpi;
-}
-
-/**
- * @param authSpi New authentication SPI.
- */
-public void authenticationSpi(IgniteBiTuple>
authSpi) {
-this.authSpi = authSpi;
-}
-
-/**
- * @return Secure Session SPI.
- */
-public IgniteBiTuple> secureSessionSpi() {
-return sesSpi;
-}
-
-/**
- * @param sesSpi New secure Session SPI.
- */
-public void secureSessionSpi(IgniteBiTuple>
sesSpi) {
-this.sesSpi = sesSpi;
-}
-
-/**
* @return Deployment SPI.
*/
public IgniteBiTuple> deploymentSpi() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index bbc2050..f54d1fc 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -274,8 +274,6 @@ class VisorConfigurationCommand {
spisT += ("Communication", spiClass(cfg.spis().communicationSpi()))
spisT += ("Event storage", spiClass(cfg.spis().eventStorageSpi()))
spisT += ("Collision", spiClass(cfg.spis().collisionSpi()))
-spisT += ("Authentication",
spiClass(cfg.spis().authenticationSpi()))
-spisT += ("Secure session",
spiClass(cfg.spis().secureSessionSpi()))
spisT += ("Deployment", spiClass(cfg.spis().deploymentSpi()))
spisT += ("Checkpoints", spisClass(cfg.spis().checkpointSpis()))
spisT += ("Failovers", spisClass(cfg.spis().failoverSpis()))
[32/36] incubator-ignite git commit: # ignite-283: Reworked innerUpdate.
# ignite-283: Reworked innerUpdate.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b4045ce1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b4045ce1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b4045ce1
Branch: refs/heads/ignite-283
Commit: b4045ce14d28b6e72bdda057ac4953cf29280309
Parents: 362bf16
Author: vozerov-gridgain
Authored: Wed Feb 18 11:48:28 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 11:48:28 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 14 +-
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 12 +-
.../processors/cache/GridCacheMapEntry.java | 357 +--
.../processors/cache/GridCacheProjectionEx.java | 8 +-
.../cache/GridCacheProjectionImpl.java | 16 +-
.../processors/cache/GridCacheProxyImpl.java| 16 +-
.../cache/GridCacheUpdateAtomicResult.java | 42 ++-
.../processors/cache/GridCacheUtils.java| 14 +-
.../cache/conflict/GridCacheConflictInfo.java | 53 +++
.../conflict/GridCacheConflictInnerUpdate.java | 88 +
.../conflict/GridCacheNoTtlConflictInfo.java| 60
.../conflict/GridCacheTtlConflictInfo.java | 78
.../GridDistributedTxRemoteAdapter.java | 3 +-
.../dht/atomic/GridDhtAtomicCache.java | 195 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 12 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 105 +++---
.../dht/atomic/GridNearAtomicUpdateRequest.java | 144 ++--
.../distributed/near/GridNearAtomicCache.java | 34 +-
.../processors/cache/dr/GridCacheDrInfo.java| 5 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/version/GridCacheVersion.java | 4 +-
.../GridCacheVersionConflictContext.java| 23 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../dr/GridDrDataLoadCacheUpdater.java | 10 +-
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../processors/cache/GridCacheTestEntryEx.java | 7 +-
28 files changed, 739 insertions(+), 575 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4045ce1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index fa3cb17..1daec2d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2472,7 +2472,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void putAllDr(final Map>
drMap) throws IgniteCheckedException {
+@Override public void putAllConflict(final Map> drMap) throws IgniteCheckedException {
if (F.isEmpty(drMap))
return;
@@ -2486,13 +2486,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDr [drMap=" + drMap + ']';
+return "putAllConflict [drMap=" + drMap + ']';
}
});
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture putAllDrAsync(final Map> drMap)
+@Override public IgniteInternalFuture putAllConflictAsync(final Map> drMap)
throws IgniteCheckedException {
if (F.isEmpty(drMap))
return new GridFinishedFuture(ctx.kernalContext());
@@ -2507,7 +2507,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDrAsync [drMap=" + drMap + ']';
+return "putAllConflictAsync [drMap=" + drMap + ']';
}
});
}
@@ -3379,7 +3379,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void removeAllDr(final Map
drMap) throws IgniteCheckedException {
+@Override public void removeAllConflict(final Map drMap) throws IgniteCheckedException {
ctx.denyOnLocalRead();
if (F.isEmpty(drMap))
@@ -3393,13 +3393,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "removeAllDr [drMap=" + drMap + ']';
+
[21/36] incubator-ignite git commit: sprint-2: minor
sprint-2: minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04b0880c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04b0880c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04b0880c Branch: refs/heads/ignite-283 Commit: 04b0880c06c7d9b297a8b73aead50bb430dfccc0 Parents: 0dda33a Author: Yakov Zhdanov Authored: Tue Feb 17 16:54:13 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Feb 17 16:54:13 2015 +0300 -- .../internal/processors/cache/distributed/dht/GridDhtGetFuture.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04b0880c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java index 989cc5e..0be5b97 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java @@ -30,7 +30,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; -import javax.cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*;
[30/36] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5a15a16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5a15a16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5a15a16 Branch: refs/heads/ignite-283 Commit: c5a15a16d80401fb688b6ffb8d3a0aa66fe8291a Parents: bbe5a5e 7d1eb8e Author: AKuznetsov Authored: Wed Feb 18 15:42:42 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 15:42:42 2015 +0700 -- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[31/36] incubator-ignite git commit: # ignite-283: Reworked innerUpdate.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4045ce1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 84c9287..a12de1b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.cluster.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.conflict.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
@@ -62,6 +63,7 @@ import static
org.apache.ignite.internal.processors.dr.GridDrType.*;
/**
* Non-transactional partitioned cache.
*/
+@SuppressWarnings("unchecked")
@GridToStringExclude
public class GridDhtAtomicCache extends GridDhtCacheAdapter {
/** */
@@ -125,6 +127,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
});
updateReplyClos = new CI2,
GridNearAtomicUpdateResponse>() {
+@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Override public void apply(GridNearAtomicUpdateRequest req,
GridNearAtomicUpdateResponse res) {
if (ctx.config().getAtomicWriteOrderMode() == CLOCK) {
// Always send reply in CLOCK ordering mode.
@@ -237,6 +240,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
/** {@inheritDoc} */
+@SuppressWarnings("ConstantConditions")
@Override public V peek(K key, @Nullable Collection
modes) throws IgniteCheckedException {
GridTuple val = null;
@@ -453,18 +457,20 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
/** {@inheritDoc} */
-@Override public void putAllDr(Map> drMap)
throws IgniteCheckedException {
-putAllDrAsync(drMap).get();
+@Override public void putAllConflict(Map>
conflictMap)
+throws IgniteCheckedException {
+putAllConflictAsync(conflictMap).get();
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture putAllDrAsync(Map> drMap) {
-ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
+@Override public IgniteInternalFuture putAllConflictAsync(Map> conflictMap) {
+// TODO IGNITE-283: Invalid metrics update in case of local store.
+ctx.dr().onReceiveCacheEntriesReceived(conflictMap.size());
return updateAllAsync0(null,
null,
null,
-drMap,
+conflictMap,
null,
false,
false,
@@ -534,15 +540,17 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
/** {@inheritDoc} */
-@Override public void removeAllDr(Map
drMap) throws IgniteCheckedException {
-removeAllDrAsync(drMap).get();
+@Override public void removeAllConflict(Map
conflictMap)
+throws IgniteCheckedException {
+removeAllConflictAsync(conflictMap).get();
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture removeAllDrAsync(Map drMap) {
-ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
+@Override public IgniteInternalFuture removeAllConflictAsync(Map conflictMap) {
+// TODO: IGNITE-283: Invalid metrics update in case of local store.
+ctx.dr().onReceiveCacheEntriesReceived(conflictMap.size());
-return removeAllAsync0(null, drMap, null, false, false, null);
+return removeAllAsync0(null, conflictMap, null, false, false, null);
}
/**
@@ -727,23 +735,24 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
/**
* Entry point for all public API put/transform methods.
*
- * @param map Put map. Either {@code map}, {@code invokeMap} or {@code
drMap} should be passed.
- * @param invokeMap Invoke map. Either {@code map}, {@code invokeMap} or
{@code drMap} should be passed.
+ * @param map Put map. Either {@code map}, {@code invokeMap} or {@code
conflictPutMap} should be passed.
+ * @param invokeMap Invoke map. Either {@code map}, {@code invokeMap} or
{@code conflictPutMap} should be passed.
* @param invokeArgs Optional arguments for EntryProcessor.
- * @param drPutMap DR put map.
-
[34/36] incubator-ignite git commit: # ignite-283: WIP.
# ignite-283: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3beb04b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3beb04b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3beb04b2
Branch: refs/heads/ignite-283
Commit: 3beb04b202bae3e7d54fc3d423690218b390af86
Parents: f3b5731
Author: vozerov-gridgain
Authored: Wed Feb 18 12:24:17 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 12:24:18 2015 +0300
--
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../cache/conflict/GridCacheConflictInfo.java | 33 ++--
.../conflict/GridCacheNoTtlConflictInfo.java| 53 +++--
.../conflict/GridCacheTtlConflictInfo.java | 82 +---
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 23 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 72 -
7 files changed, 181 insertions(+), 89 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3beb04b2/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 e1a0189..d8a42cc 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
@@ -1562,7 +1562,7 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
boolean res = true;
-V oldVal = null;
+V oldVal;
V updated;
GridCacheVersion enqueueVer = null;
@@ -1789,7 +1789,7 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
// Calculate new value in case we met transform.
if (op == GridCacheOperation.TRANSFORM) {
-assert conflictCtx == null : "Cannot be TRANSFORM here is
conflict resolution was performed earlier.";
+assert conflictCtx == null : "Cannot be TRANSFORM here if
conflict resolution was performed earlier.";
transformClo = writeObj;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3beb04b2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/conflict/GridCacheConflictInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/conflict/GridCacheConflictInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/conflict/GridCacheConflictInfo.java
index 8f210cf..bc1621d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/conflict/GridCacheConflictInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/conflict/GridCacheConflictInfo.java
@@ -1,53 +1,30 @@
package org.apache.ignite.internal.processors.cache.conflict;
import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
/**
* Cache conflict info which is passed over the wire.
*/
-public abstract class GridCacheConflictInfo implements Externalizable {
-/**
- * Create conflict info.
- *
- * @param ver Version.
- * @param ttl TTL.
- * @param expireTime Expire time.
- * @return Conflict info.
- */
-public static GridCacheConflictInfo create(GridCacheVersion ver, long ttl,
long expireTime) {
-if (ttl == CU.TTL_NOT_CHANGED) {
-assert expireTime == CU.EXPIRE_TIME_CALCULATE;
-
-return new GridCacheNoTtlConflictInfo(ver);
-}
-else {
-assert ttl != CU.TTL_ZERO && ttl >= 0;
-assert expireTime != CU.EXPIRE_TIME_CALCULATE && expireTime >= 0;
-
-return new GridCacheTtlConflictInfo(ver, ttl, expireTime);
-}
-}
-
+public interface GridCacheConflictInfo {
/**
* @return Version.
*/
-public abstract GridCacheVersion version();
+public GridCacheVersion version();
/**
* @return TTL.
*/
-public abstract long ttl();
+public long ttl();
/**
* @return Expire time.
*/
-public abstract long expireTime();
+public long expireTime();
/**
* @return {@code True} if has expiration info.
*/
-public abstract boolean hasExpirationInfo();
+public boolean hasExpirationInfo();
}
http://git-wip-us.apache.o
[10/36] incubator-ignite git commit: # sprint-2 minor
# sprint-2 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/81a688d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81a688d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81a688d5
Branch: refs/heads/ignite-283
Commit: 81a688d563414638e3d35e804fe517f48d11b318
Parents: f7c5782
Author: sboikov
Authored: Tue Feb 17 13:58:54 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 13:58:54 2015 +0300
--
.../ignite/testframework/junits/common/GridCommonAbstractTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81a688d5/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 4e03324..61cb3d7 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -422,7 +422,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
* @return Local node.
*/
public static ClusterNode localNode(IgniteCache cache) {
-return cache.unwrap(Ignite.class).cluster().node();
+return cache.unwrap(Ignite.class).cluster().localNode();
}
/**
[05/36] incubator-ignite git commit: #sprint-2: GridAbstractTest should not check that class name starts from "org.apache.ignite".
#sprint-2: GridAbstractTest should not check that class name starts from
"org.apache.ignite".
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/570bbfd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/570bbfd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/570bbfd9
Branch: refs/heads/ignite-283
Commit: 570bbfd975e8996f4f1aca1236e0c90688a56175
Parents: 684ed83
Author: ivasilinets
Authored: Tue Feb 17 12:31:37 2015 +0300
Committer: ivasilinets
Committed: Tue Feb 17 12:31:37 2015 +0300
--
.../apache/ignite/testframework/junits/GridAbstractTest.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/570bbfd9/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 8e48b53..bebf860 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1412,10 +1412,8 @@ public abstract class GridAbstractTest extends TestCase {
int cnt = 0;
for (Method m : GridAbstractTest.this.getClass().getMethods())
-if
(m.getDeclaringClass().getName().startsWith("org.apache.ignite")) {
-if (m.getName().startsWith("test") &&
Modifier.isPublic(m.getModifiers()))
-cnt++;
-}
+if (m.getName().startsWith("test") &&
Modifier.isPublic(m.getModifiers()))
+cnt++;
numOfTests = cnt;
}
[02/36] incubator-ignite git commit: # IGNITE-274 Reworked events collecting.
# IGNITE-274 Reworked events collecting.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/677e643b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/677e643b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/677e643b
Branch: refs/heads/ignite-283
Commit: 677e643b217ecbc92c081711a688fde087e42949
Parents: 659b432
Author: AKuznetsov
Authored: Tue Feb 17 14:24:28 2015 +0700
Committer: AKuznetsov
Committed: Tue Feb 17 14:24:28 2015 +0700
--
.../visor/node/VisorNodeDataCollectorJob.java | 50 +++---
.../internal/visor/util/VisorEventMapper.java | 73
.../internal/visor/util/VisorTaskUtils.java | 60
3 files changed, 142 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677e643b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 2bedf10..5cb9039 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -55,8 +55,26 @@ public class VisorNodeDataCollectorJob extends
VisorJobhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677e643b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
new file mode 100644
index 000..574d4ff
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.util;
+
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.visor.event.*;
+import org.apache.ignite.lang.*;
+
+import java.util.*;
+
+/**
+ * Mapper from grid event to Visor data transfer object.
+ */
+public class VisorEventMapper implements IgniteClosure {
+/**
+ * Map grid event to Visor data transfer object.
+ *
+ * @param evt Grid event.
+ * @param type Event's type.
+ * @param id Event id.
+ * @param name Event name.
+ * @param nid Event node ID.
+ * @param ts Event timestamp.
+ * @param msg Event message.
+ * @param shortDisplay Shortened version of {@code toString()} result.
+ * @return Visor data transfer object for event.
+ */
+protected VisorGridEvent map(Event evt, int type, IgniteUuid id, String
name, UUID nid, long ts, String msg,
+String shortDisplay) {
+if (evt instanceof TaskEvent) {
+TaskEvent te = (TaskEvent)evt;
+
+return new VisorGridTaskEvent(type, id, name, nid, ts, msg,
shortDisplay,
+te.taskName(), te.taskClassName(), te.taskSessionId(),
te.internal());
+}
+
+if (evt instanceof JobEvent) {
+JobEvent je = (JobEvent)evt;
+
+return new VisorGridJobEvent(type, id, name, nid, ts, msg,
shortDisplay,
+je.taskName(), je.taskClassName(), je.taskSessionId(),
je.jobId());
+}
+
+if (evt instanceof DeploymentEvent) {
+DeploymentEvent de = (DeploymentEvent)evt;
+
+return new VisorGridDeploymentEvent(type, id, name, nid, ts, msg,
shortDisplay, de.alias());
+}
+
+return null;
+}
+
+/** {@inheritDoc} */
+@Override public VisorGridEvent apply(Event evt) {
+return map(evt, evt.type(), evt.id(), evt.name(),
[33/36] incubator-ignite git commit: # ignite-283: WIP.
# ignite-283: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f3b57316
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f3b57316
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f3b57316
Branch: refs/heads/ignite-283
Commit: f3b5731621c1eabc55e199af8a9711ab542cf198
Parents: b4045ce
Author: vozerov-gridgain
Authored: Wed Feb 18 11:53:34 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 11:53:34 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheContext.java | 5 +
.../ignite/internal/processors/cache/GridCacheProcessor.java| 4
2 files changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3b57316/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 060a825..3ec013c 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
@@ -320,7 +320,12 @@ public class GridCacheContext implements
Externalizable {
expiryPlc = null;
itHolder = new CacheWeakQueryIteratorsHolder(log);
+}
+/**
+ * Initialize conflict resolver after all managers are started.
+ */
+void initConflictResolver() {
// Conflict resolver is determined in two stages:
// 1. If DR receiver hub is enabled, then pick it from DR manager.
// 2. Otherwise instantiate default resolver in case local store is
configured.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3b57316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index d038e91..e99c706 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -854,6 +854,8 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
for (GridCacheManager mgr : F.view(cacheCtx.managers(),
F.notContains(dhtExcludes(cacheCtx
mgr.start(cacheCtx);
+cacheCtx.initConflictResolver();
+
if (cfg.getCacheMode() != LOCAL &&
GridCacheUtils.isNearEnabled(cfg)) {
GridCacheContext dhtCtx =
cacheCtx.near().dht().context();
@@ -861,6 +863,8 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
for (GridCacheManager mgr : dhtManagers(dhtCtx))
mgr.start(dhtCtx);
+dhtCtx.initConflictResolver();
+
// Start DHT cache.
dhtCtx.cache().start();
[08/36] incubator-ignite git commit: # sprint-2 Use new API for cache load.
# sprint-2 Use new API for cache load.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38e1389a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38e1389a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38e1389a
Branch: refs/heads/ignite-283
Commit: 38e1389ac57a9737680b63d446e26f1666c45e5c
Parents: 41ffb81
Author: AKuznetsov
Authored: Tue Feb 17 17:20:51 2015 +0700
Committer: AKuznetsov
Committed: Tue Feb 17 17:20:51 2015 +0700
--
.../visor/cache/VisorCacheLoadTask.java | 35
1 file changed, 13 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38e1389a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
index 8643fd2..55e3f5e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
@@ -18,14 +18,14 @@
package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.*;
+import javax.cache.expiry.*;
import java.util.*;
+import java.util.concurrent.*;
/**
* Task to loads caches.
@@ -57,32 +57,23 @@ public class VisorCacheLoadTask extends
/** {@inheritDoc} */
@Override protected Map run(GridTuple3,
Long, Object[]> arg) {
-try {
-Set cacheNames = arg.get1();
-Long ttl = arg.get2();
-Object[] ldrArgs = arg.get3();
+Set cacheNames = arg.get1();
+Long ttl = arg.get2();
+Object[] ldrArgs = arg.get3();
-Map res = new HashMap<>();
+Map res = new HashMap<>();
-for (GridCache c: ignite.cachesx()) {
-String cacheName = c.name();
+ExpiryPolicy policy = new CreatedExpiryPolicy(new
Duration(TimeUnit.MILLISECONDS, ttl));
-if (cacheNames.contains(cacheName)) {
-c.loadCache(new P2() {
-@Override public boolean apply(Object o, Object
o2) {
-return true;
-}
-}, ttl, ldrArgs);
+for (String cacheName: cacheNames) {
+IgniteCache cache =
ignite.jcache(cacheName).withExpiryPolicy(policy);
-res.put(cacheName, c.size()); // Put new key size for
successfully loaded cache.
-}
-}
+cache.loadCache(null, ldrArgs);
-return res;
-}
-catch (IgniteCheckedException e) {
-throw U.convertException(e);
+res.put(cacheName, cache.size());
}
+
+return res;
}
/** {@inheritDoc} */
[4/7] incubator-ignite git commit: sprint-2: minor
sprint-2: minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d1eb8ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d1eb8ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d1eb8ed
Branch: refs/heads/ignite-297
Commit: 7d1eb8ed32e54d0ffecdb976fcbcebbd09ab302f
Parents: dd6c24f
Author: Yakov Zhdanov
Authored: Wed Feb 18 11:32:06 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Feb 18 11:32:06 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1eb8ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 79f3994..9489e36 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -77,10 +77,12 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter ctx,
+public IgniteCacheProxy(
+GridCacheContext ctx,
GridCacheProjectionEx delegate,
@Nullable GridCacheProjectionImpl prj,
-boolean async) {
+boolean async
+) {
super(async);
assert ctx != null;
[5/7] incubator-ignite git commit: # sprint-2 Cleanup of removed SPIs.
# sprint-2 Cleanup of removed SPIs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bbe5a5eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbe5a5eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbe5a5eb
Branch: refs/heads/ignite-297
Commit: bbe5a5ebda1aa1db3401b908e0c910ff13ce9d56
Parents: dd6c24f
Author: AKuznetsov
Authored: Wed Feb 18 15:42:11 2015 +0700
Committer: AKuznetsov
Committed: Wed Feb 18 15:42:11 2015 +0700
--
.../visor/node/VisorSpisConfiguration.java | 34
.../config/VisorConfigurationCommand.scala | 2 --
2 files changed, 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
index 4cd62e8..9e95647 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
@@ -47,12 +47,6 @@ public class VisorSpisConfiguration implements Serializable {
/** Collision SPI. */
private IgniteBiTuple> colSpi;
-/** Authentication SPI. */
-private IgniteBiTuple> authSpi;
-
-/** Secure Session SPI. */
-private IgniteBiTuple> sesSpi;
-
/** Deployment SPI. */
private IgniteBiTuple> deploySpi;
@@ -218,34 +212,6 @@ public class VisorSpisConfiguration implements
Serializable {
}
/**
- * @return Authentication SPI.
- */
-public IgniteBiTuple> authenticationSpi() {
-return authSpi;
-}
-
-/**
- * @param authSpi New authentication SPI.
- */
-public void authenticationSpi(IgniteBiTuple>
authSpi) {
-this.authSpi = authSpi;
-}
-
-/**
- * @return Secure Session SPI.
- */
-public IgniteBiTuple> secureSessionSpi() {
-return sesSpi;
-}
-
-/**
- * @param sesSpi New secure Session SPI.
- */
-public void secureSessionSpi(IgniteBiTuple>
sesSpi) {
-this.sesSpi = sesSpi;
-}
-
-/**
* @return Deployment SPI.
*/
public IgniteBiTuple> deploymentSpi() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbe5a5eb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index bbc2050..f54d1fc 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -274,8 +274,6 @@ class VisorConfigurationCommand {
spisT += ("Communication", spiClass(cfg.spis().communicationSpi()))
spisT += ("Event storage", spiClass(cfg.spis().eventStorageSpi()))
spisT += ("Collision", spiClass(cfg.spis().collisionSpi()))
-spisT += ("Authentication",
spiClass(cfg.spis().authenticationSpi()))
-spisT += ("Secure session",
spiClass(cfg.spis().secureSessionSpi()))
spisT += ("Deployment", spiClass(cfg.spis().deploymentSpi()))
spisT += ("Checkpoints", spisClass(cfg.spis().checkpointSpis()))
spisT += ("Failovers", spisClass(cfg.spis().failoverSpis()))
[7/7] incubator-ignite git commit: Merge branches 'ignite-297' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-297
Merge branches 'ignite-297' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-297 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/78b8df50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78b8df50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78b8df50 Branch: refs/heads/ignite-297 Commit: 78b8df50e8407d2302e68b3e078952ac51d07204 Parents: e855d9a c5a15a1 Author: sboikov Authored: Wed Feb 18 13:07:12 2015 +0300 Committer: sboikov Committed: Wed Feb 18 13:07:12 2015 +0300 -- .../processors/cache/IgniteCacheProxy.java | 6 ++- .../cache/VisorCacheDefaultConfiguration.java | 57 .../visor/node/VisorSpisConfiguration.java | 34 .../commands/cache/VisorCacheCommand.scala | 3 -- .../config/VisorConfigurationCommand.scala | 2 - 5 files changed, 4 insertions(+), 98 deletions(-) --
[1/7] incubator-ignite git commit: # IGNITE-274 Cleanup of removed functionality.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-297 e855d9a7c -> 78b8df50e
# IGNITE-274 Cleanup of removed functionality.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce9fd4e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce9fd4e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce9fd4e3
Branch: refs/heads/ignite-297
Commit: ce9fd4e32b64448762f9980a53c77aa02626ea61
Parents: 659b432
Author: AKuznetsov
Authored: Tue Feb 17 10:22:19 2015 +0700
Committer: AKuznetsov
Committed: Tue Feb 17 10:22:19 2015 +0700
--
.../cache/VisorCacheDefaultConfiguration.java | 57
.../commands/cache/VisorCacheCommand.scala | 3 --
2 files changed, 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce9fd4e3/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
index ae8aa11..97f8f30 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
import java.io.*;
@@ -30,18 +29,9 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
/** */
private static final long serialVersionUID = 0L;
-/** Default transaction isolation. */
-private TransactionIsolation txIsolation;
-
-/** Default transaction concurrency. */
-private TransactionConcurrency txConcurrency;
-
/** TTL value. */
private long ttl;
-/** Default transaction concurrency. */
-private long txTimeout;
-
/** Default transaction timeout. */
private long txLockTimeout;
@@ -53,14 +43,9 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
* @return Data transfer object for default cache configuration properties.
*/
public static VisorCacheDefaultConfiguration from(CacheConfiguration ccfg)
{
-// TODO GG-9141 Update Visor.
-
VisorCacheDefaultConfiguration cfg = new
VisorCacheDefaultConfiguration();
-//cfg.txIsolation(ccfg.getDefaultTxIsolation());
-//cfg.txConcurrency(ccfg.getDefaultTxConcurrency());
cfg.timeToLive(ccfg.getDefaultTimeToLive());
-//cfg.txTimeout(ccfg.getDefaultTxTimeout());
cfg.txLockTimeout(ccfg.getDefaultLockTimeout());
cfg.queryTimeout(ccfg.getDefaultQueryTimeout());
@@ -68,34 +53,6 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
}
/**
- * @return Default transaction isolation.
- */
-public TransactionIsolation txIsolation() {
-return txIsolation;
-}
-
-/**
- * @param txIsolation New default transaction isolation.
- */
-public void txIsolation(TransactionIsolation txIsolation) {
-this.txIsolation = txIsolation;
-}
-
-/**
- * @return Default transaction concurrency.
- */
-public TransactionConcurrency txConcurrency() {
-return txConcurrency;
-}
-
-/**
- * @param txConcurrency New default transaction concurrency.
- */
-public void txConcurrency(TransactionConcurrency txConcurrency) {
-this.txConcurrency = txConcurrency;
-}
-
-/**
* @return TTL value.
*/
public long timeToLive() {
@@ -110,20 +67,6 @@ public class VisorCacheDefaultConfiguration implements
Serializable {
}
/**
- * @return Default transaction concurrency.
- */
-public long txTimeout() {
-return txTimeout;
-}
-
-/**
- * @param txTimeout New default transaction concurrency.
- */
-public void txTimeout(long txTimeout) {
-this.txTimeout = txTimeout;
-}
-
-/**
* @return Default transaction timeout.
*/
public long txLockTimeout() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce9fd4e3/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/mai
[6/7] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5a15a16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5a15a16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5a15a16 Branch: refs/heads/ignite-297 Commit: c5a15a16d80401fb688b6ffb8d3a0aa66fe8291a Parents: bbe5a5e 7d1eb8e Author: AKuznetsov Authored: Wed Feb 18 15:42:42 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 15:42:42 2015 +0700 -- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[3/7] incubator-ignite git commit: Merge branch 'ignite-274' into sprint-2
Merge branch 'ignite-274' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd6c24f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd6c24f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd6c24f4 Branch: refs/heads/ignite-297 Commit: dd6c24f4e45cf136aa1d496028c20ce5f0d1a35d Parents: f139706 27f7c6d Author: AKuznetsov Authored: Wed Feb 18 14:16:05 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 14:16:05 2015 +0700 -- .../cache/VisorCacheDefaultConfiguration.java | 57 .../commands/cache/VisorCacheCommand.scala | 3 -- 2 files changed, 60 deletions(-) --
[2/7] incubator-ignite git commit: Merge branches 'ignite-274' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-274
Merge branches 'ignite-274' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-274 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27f7c6d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27f7c6d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27f7c6d6 Branch: refs/heads/ignite-297 Commit: 27f7c6d6520b7ae61e2e3ecdb4f418f6c7e60b7b Parents: ce9fd4e a4101a5 Author: AKuznetsov Authored: Tue Feb 17 14:26:22 2015 +0700 Committer: AKuznetsov Committed: Tue Feb 17 14:26:22 2015 +0700 -- .../internal/visor/node/VisorExecutorServiceConfiguration.java | 1 + 1 file changed, 1 insertion(+) --
incubator-ignite git commit: # ignite-283: Method renamings.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 c5a15a16d -> eb2b1786e
# ignite-283: Method renamings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb2b1786
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb2b1786
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb2b1786
Branch: refs/heads/sprint-2
Commit: eb2b1786efa6f261f70ec7aa610d8368b5b62f96
Parents: c5a15a1
Author: vozerov-gridgain
Authored: Wed Feb 18 13:09:33 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:09:33 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 16 ++-
.../processors/cache/GridCacheMapEntry.java | 6 ++--
.../processors/cache/GridCacheProjectionEx.java | 8 +++---
.../cache/GridCacheProjectionImpl.java | 16 +--
.../processors/cache/GridCacheProxyImpl.java| 16 +--
.../processors/cache/GridCacheUtils.java| 30 ++--
.../dht/atomic/GridDhtAtomicCache.java | 12
.../distributed/near/GridNearAtomicCache.java | 16 +--
.../cache/version/GridCacheVersion.java | 4 +--
.../cache/version/GridCacheVersionEx.java | 2 +-
.../dr/GridDrDataLoadCacheUpdater.java | 4 +--
.../ignite/internal/util/IgniteUtils.java | 2 +-
12 files changed, 73 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb2b1786/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 9d8f243..cba8b1c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2472,7 +2472,8 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void putAllDr(final Map>
drMap) throws IgniteCheckedException {
+@Override public void putAllConflict(final Map> drMap)
+throws IgniteCheckedException {
if (F.isEmpty(drMap))
return;
@@ -2486,13 +2487,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDr [drMap=" + drMap + ']';
+return "putAllConflict [drMap=" + drMap + ']';
}
});
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture putAllDrAsync(final Map> drMap)
+@Override public IgniteInternalFuture putAllConflictAsync(final Map> drMap)
throws IgniteCheckedException {
if (F.isEmpty(drMap))
return new GridFinishedFuture(ctx.kernalContext());
@@ -2507,7 +2508,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDrAsync [drMap=" + drMap + ']';
+return "putAllConflictAsync [drMap=" + drMap + ']';
}
});
}
@@ -3379,7 +3380,8 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void removeAllDr(final Map
drMap) throws IgniteCheckedException {
+@Override public void removeAllConflict(final Map drMap)
+throws IgniteCheckedException {
ctx.denyOnLocalRead();
if (F.isEmpty(drMap))
@@ -3393,13 +3395,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "removeAllDr [drMap=" + drMap + ']';
+return "removeAllConflict [drMap=" + drMap + ']';
}
});
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture removeAllDrAsync(final Map drMap)
+@Override public IgniteInternalFuture removeAllConflictAsync(final
Map drMap)
throws IgniteCheckedException {
ctx.denyOnLocalRead();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb2b1786/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 dc0f
[4/5] incubator-ignite git commit: # ignite-292 : rename classes under ignite-hibernate project
# ignite-292 : rename classes under ignite-hibernate project Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d694881 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d694881 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d694881 Branch: refs/heads/ignite-292 Commit: 5d6948812630ff3847688d6e816a52ea6a13b25d Parents: c5a15a1 Author: Artem Shutak Authored: Wed Feb 18 12:31:11 2015 +0300 Committer: Artem Shutak Committed: Wed Feb 18 13:10:14 2015 +0300 -- .../hibernate/example-hibernate-L2-cache.xml|2 +- .../optimized/optimized-classnames.properties |2 +- ...idHibernateAbstractRegionAccessStrategy.java | 97 - .../GridHibernateAccessStrategyAdapter.java | 369 .../GridHibernateCollectionRegion.java | 99 - .../hibernate/GridHibernateEntityRegion.java| 110 - .../GridHibernateGeneralDataRegion.java | 69 - .../hibernate/GridHibernateNaturalIdRegion.java | 98 - .../GridHibernateNonStrictAccessStrategy.java | 220 -- .../GridHibernateQueryResultsRegion.java| 71 - .../GridHibernateReadOnlyAccessStrategy.java| 106 - .../GridHibernateReadWriteAccessStrategy.java | 282 --- .../cache/hibernate/GridHibernateRegion.java| 101 - .../hibernate/GridHibernateRegionFactory.java | 231 --- .../GridHibernateTimestampsRegion.java | 40 - ...ridHibernateTransactionalAccessStrategy.java | 139 -- .../GridHibernateTransactionalDataRegion.java | 96 - .../HibernateAbstractRegionAccessStrategy.java | 97 + .../HibernateAccessStrategyAdapter.java | 369 .../hibernate/HibernateCollectionRegion.java| 99 + .../cache/hibernate/HibernateEntityRegion.java | 110 + .../hibernate/HibernateGeneralDataRegion.java | 69 + .../hibernate/HibernateNaturalIdRegion.java | 98 + .../HibernateNonStrictAccessStrategy.java | 220 ++ .../hibernate/HibernateQueryResultsRegion.java | 71 + .../HibernateReadOnlyAccessStrategy.java| 106 + .../HibernateReadWriteAccessStrategy.java | 282 +++ .../ignite/cache/hibernate/HibernateRegion.java | 101 + .../cache/hibernate/HibernateRegionFactory.java | 231 +++ .../hibernate/HibernateTimestampsRegion.java| 40 + .../HibernateTransactionalAccessStrategy.java | 139 ++ .../HibernateTransactionalDataRegion.java | 96 + ...idHibernateL2CacheConfigurationSelfTest.java | 393 .../hibernate/GridHibernateL2CacheSelfTest.java | 1923 - ...idHibernateL2CacheTransactionalSelfTest.java | 135 -- .../HibernateL2CacheConfigurationSelfTest.java | 393 .../hibernate/HibernateL2CacheSelfTest.java | 1925 ++ .../HibernateL2CacheTransactionalSelfTest.java | 135 ++ .../testsuites/IgniteHibernateTestSuite.java|6 +- 39 files changed, 4586 insertions(+), 4584 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d694881/examples/config/hibernate/example-hibernate-L2-cache.xml -- diff --git a/examples/config/hibernate/example-hibernate-L2-cache.xml b/examples/config/hibernate/example-hibernate-L2-cache.xml index ea97c9c..324c040 100644 --- a/examples/config/hibernate/example-hibernate-L2-cache.xml +++ b/examples/config/hibernate/example-hibernate-L2-cache.xml @@ -44,7 +44,7 @@ true -org.apache.ignite.cache.hibernate.GridHibernateRegionFactory +org.apache.ignite.cache.hibernate.HibernateRegionFactory hibernate-grid http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d694881/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties -- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties index 5fa1c2c..a92c447 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties @@ -89,7 +89,7 @@ org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity$PartitionSetComparator org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction$HashComparator -org.apache.ignite.cache.hibernate.GridHibernateAccessStrategyAdapter$ClearKeyCallable +org.apache.ignite.cache.hibernate.HibernateAccessStrate
[5/5] incubator-ignite git commit: # ignite-292 : fix thrown exception type by HibernateReadWriteAccessStrategy#unlock(...)
# ignite-292 : fix thrown exception type by
HibernateReadWriteAccessStrategy#unlock(...)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b9615dc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b9615dc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b9615dc5
Branch: refs/heads/ignite-292
Commit: b9615dc57dfe779946ef5a60578c216c0228846e
Parents: 5d69488
Author: Artem Shutak
Authored: Wed Feb 18 12:46:08 2015 +0300
Committer: Artem Shutak
Committed: Wed Feb 18 13:10:32 2015 +0300
--
.../cache/hibernate/HibernateReadWriteAccessStrategy.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9615dc5/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
--
diff --git
a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
index 3ca466d..1b083a1 100644
---
a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
+++
b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
@@ -125,7 +125,7 @@ public class HibernateReadWriteAccessStrategy extends
HibernateAccessStrategyAda
if (ctx != null)
unlock(ctx, key);
}
-catch (IgniteCheckedException e) {
+catch (Exception e) {
rollbackCurrentTx();
throw new CacheException(e);
@@ -152,7 +152,7 @@ public class HibernateReadWriteAccessStrategy extends
HibernateAccessStrategyAda
return false;
}
-catch (IgniteCheckedException e) {
+catch (Exception e) {
rollbackCurrentTx();
throw new CacheException(e);
@@ -197,9 +197,9 @@ public class HibernateReadWriteAccessStrategy extends
HibernateAccessStrategyAda
*
* @param ctx Transaction context.
* @param key Key.
- * @throws IgniteCheckedException If failed.
+ * @throws CacheException If failed.
*/
-private void unlock(TxContext ctx, Object key) throws
IgniteCheckedException {
+private void unlock(TxContext ctx, Object key) throws CacheException {
if (ctx.unlocked(key)) { // Finish transaction if last key is unlocked.
txCtx.remove();
[3/5] incubator-ignite git commit: # ignite-292 : rename classes under ignite-hibernate project
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d694881/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
--
diff --git
a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
deleted file mode 100644
index cca42de..000
---
a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.hibernate.cache.*;
-import org.hibernate.cache.spi.*;
-import org.hibernate.cache.spi.access.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-
-/**
- * Implementation of {@link TransactionalDataRegion} (transactional means that
- * data in the region is updated in connection with database transaction).
- * This interface defines base contract for {@link EntityRegion}, {@link
CollectionRegion}
- * and {@link NaturalIdRegion}.
- */
-public class GridHibernateTransactionalDataRegion extends GridHibernateRegion
implements TransactionalDataRegion {
-/** */
-private final CacheDataDescription dataDesc;
-
-/**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- * @param dataDesc Region data description.
- */
-public GridHibernateTransactionalDataRegion(GridHibernateRegionFactory
factory, String name,
-Ignite ignite, GridCache cache, CacheDataDescription
dataDesc) {
-super(factory, name, ignite, cache);
-
-this.dataDesc = dataDesc;
-}
-
-/** {@inheritDoc} */
-@Override public boolean isTransactionAware() {
-return false; // This method is not used by Hibernate.
-}
-
-/** {@inheritDoc} */
-@Override public CacheDataDescription getCacheDataDescription() {
-return dataDesc;
-}
-
-/**
- * @param accessType Hibernate L2 cache access type.
- * @return Access strategy for given access type.
- */
-protected GridHibernateAccessStrategyAdapter
createAccessStrategy(AccessType accessType) {
-switch (accessType) {
-case READ_ONLY:
-return new GridHibernateReadOnlyAccessStrategy(ignite, cache);
-
-case NONSTRICT_READ_WRITE:
-return new GridHibernateNonStrictAccessStrategy(ignite, cache,
factory.threadLocalForCache(cache.name()));
-
-case READ_WRITE:
-if (cache.configuration().getAtomicityMode() != TRANSACTIONAL)
-throw new CacheException("Hibernate READ-WRITE access
strategy must have Ignite cache with " +
-"'TRANSACTIONAL' atomicity mode: " + cache.name());
-
-return new GridHibernateReadWriteAccessStrategy(ignite, cache,
factory.threadLocalForCache(cache.name()));
-
-case TRANSACTIONAL:
-if (cache.configuration().getAtomicityMode() != TRANSACTIONAL)
-throw new CacheException("Hibernate TRANSACTIONAL access
strategy must have Ignite cache with " +
-"'TRANSACTIONAL' atomicity mode: " + cache.name());
-
-if
(cache.configuration().getTransactionManagerLookupClassName() == null)
-throw new CacheException("Hibernate TRANSACTIONAL access
strategy must have Ignite cache with " +
-"TransactionManagerLookup configured: " +
cache.name());
-
-return new GridHibernateTransactionalAccessStrategy(ignite,
cache);
-
-default:
-throw new IllegalArgumentException("Unknown Hibernate access
type: " + accessType);
-}
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d694881/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAbstractRegionAccessStrategy.java
-
[2/5] incubator-ignite git commit: # ignite-292 : rename classes under ignite-hibernate project
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d694881/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
--
diff --git
a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
new file mode 100644
index 000..cdb91d5
--- /dev/null
+++
b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache.hibernate;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.hibernate.cache.*;
+import org.hibernate.cache.spi.*;
+import org.hibernate.cache.spi.access.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+
+/**
+ * Implementation of {@link TransactionalDataRegion} (transactional means that
+ * data in the region is updated in connection with database transaction).
+ * This interface defines base contract for {@link EntityRegion}, {@link
CollectionRegion}
+ * and {@link NaturalIdRegion}.
+ */
+public class HibernateTransactionalDataRegion extends HibernateRegion
implements TransactionalDataRegion {
+/** */
+private final CacheDataDescription dataDesc;
+
+/**
+ * @param factory Region factory.
+ * @param name Region name.
+ * @param ignite Grid.
+ * @param cache Region cache.
+ * @param dataDesc Region data description.
+ */
+public HibernateTransactionalDataRegion(HibernateRegionFactory factory,
String name,
+Ignite ignite, GridCache cache, CacheDataDescription
dataDesc) {
+super(factory, name, ignite, cache);
+
+this.dataDesc = dataDesc;
+}
+
+/** {@inheritDoc} */
+@Override public boolean isTransactionAware() {
+return false; // This method is not used by Hibernate.
+}
+
+/** {@inheritDoc} */
+@Override public CacheDataDescription getCacheDataDescription() {
+return dataDesc;
+}
+
+/**
+ * @param accessType Hibernate L2 cache access type.
+ * @return Access strategy for given access type.
+ */
+protected HibernateAccessStrategyAdapter createAccessStrategy(AccessType
accessType) {
+switch (accessType) {
+case READ_ONLY:
+return new HibernateReadOnlyAccessStrategy(ignite, cache);
+
+case NONSTRICT_READ_WRITE:
+return new HibernateNonStrictAccessStrategy(ignite, cache,
factory.threadLocalForCache(cache.name()));
+
+case READ_WRITE:
+if (cache.configuration().getAtomicityMode() != TRANSACTIONAL)
+throw new CacheException("Hibernate READ-WRITE access
strategy must have Ignite cache with " +
+"'TRANSACTIONAL' atomicity mode: " + cache.name());
+
+return new HibernateReadWriteAccessStrategy(ignite, cache,
factory.threadLocalForCache(cache.name()));
+
+case TRANSACTIONAL:
+if (cache.configuration().getAtomicityMode() != TRANSACTIONAL)
+throw new CacheException("Hibernate TRANSACTIONAL access
strategy must have Ignite cache with " +
+"'TRANSACTIONAL' atomicity mode: " + cache.name());
+
+if
(cache.configuration().getTransactionManagerLookupClassName() == null)
+throw new CacheException("Hibernate TRANSACTIONAL access
strategy must have Ignite cache with " +
+"TransactionManagerLookup configured: " +
cache.name());
+
+return new HibernateTransactionalAccessStrategy(ignite, cache);
+
+default:
+throw new IllegalArgumentException("Unknown Hibernate access
type: " + accessType);
+}
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d694881/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
--
[1/5] incubator-ignite git commit: # ignite-292 : rename classes under ignite-hibernate project
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-292 [created] b9615dc57
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d694881/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
--
diff --git
a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
new file mode 100644
index 000..db8adad
--- /dev/null
+++
b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
@@ -0,0 +1,393 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache.hibernate;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.hibernate.*;
+import org.hibernate.annotations.*;
+import org.hibernate.cache.spi.access.AccessType;
+import org.hibernate.cfg.*;
+import org.hibernate.service.*;
+
+import javax.cache.Cache;
+import javax.persistence.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.*;
+import static org.hibernate.cfg.AvailableSettings.*;
+
+/**
+ * Tests Hibernate L2 cache configuration.
+ */
+public class HibernateL2CacheConfigurationSelfTest extends
GridCommonAbstractTest {
+/** */
+public static final String ENTITY1_NAME = Entity1.class.getName();
+
+/** */
+public static final String ENTITY2_NAME = Entity2.class.getName();
+
+/** */
+public static final String ENTITY3_NAME = Entity3.class.getName();
+
+/** */
+public static final String ENTITY4_NAME = Entity4.class.getName();
+
+/** */
+public static final String TIMESTAMP_CACHE =
"org.hibernate.cache.spi.UpdateTimestampsCache";
+
+/** */
+public static final String QUERY_CACHE =
"org.hibernate.cache.internal.StandardQueryCache";
+
+/** */
+public static final String CONNECTION_URL =
"jdbc:h2:mem:example;DB_CLOSE_DELAY=-1";
+
+/** If {@code true} then sets default cache in configuration. */
+private boolean dfltCache;
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+startGrid(0);
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+for (GridCache cache : ((IgniteKernal)grid(0)).caches())
+cache.clear();
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+
+discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
+
+cfg.setDiscoverySpi(discoSpi);
+
+cfg.setCacheConfiguration(cacheConfiguration(ENTITY3_NAME),
cacheConfiguration(ENTITY4_NAME),
+cacheConfiguration("cache1"), cacheConfiguration("cache2"),
cacheConfiguration("cache3"),
+cacheConfiguration(TIMESTAMP_CACHE),
cacheConfiguration(QUERY_CACHE));
+
+return cfg;
+}
+
+/**
+ * @param cacheName Cache name.
+ * @return Cache configuration.
+ */
+private CacheConfiguration cacheConfiguration(String cacheName) {
+CacheConfiguration cfg = new CacheConfiguration();
+
+cfg.setName(cacheName);
+
+cfg.setCacheMode(PARTITIONED);
+
+cfg.setAtomicityMode(ATOMIC);
+
+return cfg;
+}
+/**
+ * @param gridName Grid name.
+ * @return Hibernate configuration.
+ */
+protected Configuration hi
[1/3] incubator-ignite git commit: ignite-290 Removed unused API
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-290 [created] beb3e47c4
ignite-290 Removed unused API
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ee6c19d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ee6c19d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ee6c19d8
Branch: refs/heads/ignite-290
Commit: ee6c19d8345cc5d1f743aa772b2e7846a8992e20
Parents: e3a6c22
Author: avinogradov
Authored: Tue Feb 17 18:18:36 2015 +0300
Committer: avinogradov
Committed: Tue Feb 17 18:18:36 2015 +0300
--
.../processors/cache/GridCacheEntryEx.java | 13
.../processors/cache/GridCacheMapEntry.java | 20
.../util/lang/GridMetadataAwareAdapter.java | 33 +---
3 files changed, 1 insertion(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee6c19d8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index f044347..68e4f97 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -985,19 +985,6 @@ public interface GridCacheEntryEx {
@Nullable public V putMetaIfAbsent(String name, V val);
/**
- * Adds given metadata value only if it was absent.
- *
- * @param name Metadata name.
- * @param c Factory closure to produce value to add if it's not attached
already.
- * Not that unlike {@link #addMeta(String, Object)} method the
factory closure will
- * not be called unless the value is required and therefore value
will only be created
- * when it is actually needed.
- * @param Type of the value.
- * @return {@code null} if new value was put, or current value if put
didn't happen.
- */
-@Nullable public V putMetaIfAbsent(String name, Callable c);
-
-/**
* Replaces given metadata with new {@code newVal} value only if its
current value
* is equal to {@code curVal}. Otherwise, it is no-op.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee6c19d8/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 dc0fa59..a1cc776 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
@@ -4025,26 +4025,6 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
}
/** {@inheritDoc} */
-@SuppressWarnings({"unchecked", "ClassReferencesSubclass"})
-@Nullable @Override public V1 putMetaIfAbsent(String name,
Callable c) {
-A.notNull(name, "name", c, "c");
-
-synchronized (this) {
-V1 v = meta(name);
-
-if (v == null)
-try {
-return addMeta(name, c.call());
-}
-catch (Exception e) {
-throw F.wrap(e);
-}
-
-return v;
-}
-}
-
-/** {@inheritDoc} */
@SuppressWarnings({"RedundantTypeArguments"})
@Override public boolean replaceMeta(String name, V1 curVal, V1
newVal) {
A.notNull(name, "name", newVal, "newVal", curVal, "curVal");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee6c19d8/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
index 5dadc48..9af450e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
@@ -265,38 +265,7 @@ public class GridMetadataAwareAdapter {
}
/**
- * Adds given metadata value only if it was absent.
[3/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-290
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-290 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/beb3e47c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/beb3e47c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/beb3e47c Branch: refs/heads/ignite-290 Commit: beb3e47c476064df4f4f9d1b3bb80649d53c3016 Parents: 1209175 c5a15a1 Author: avinogradov Authored: Wed Feb 18 12:42:58 2015 +0300 Committer: avinogradov Committed: Wed Feb 18 12:42:58 2015 +0300 -- bin/include/target-classpath.bat| 4 +- bin/include/target-classpath.sh | 10 ++- .../processors/cache/IgniteCacheProxy.java | 6 +- .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../security/GridSecurityContext.java | 9 ++- .../cache/VisorCacheDefaultConfiguration.java | 57 --- .../visor/node/VisorNodeDataCollectorJob.java | 50 +++--- .../visor/node/VisorSpisConfiguration.java | 34 - .../internal/visor/util/VisorEventMapper.java | 73 .../internal/visor/util/VisorTaskUtils.java | 60 .../commands/cache/VisorCacheCommand.scala | 3 - .../config/VisorConfigurationCommand.scala | 2 - .../commands/events/VisorEventsCommand.scala| 14 ++-- 13 files changed, 166 insertions(+), 157 deletions(-) --
[2/3] incubator-ignite git commit: ignite-290 Meta key type changed from String to UUID
ignite-290 Meta key type changed from String to UUID
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1209175d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1209175d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1209175d
Branch: refs/heads/ignite-290
Commit: 1209175d7d1abbc518fc7a86a4574e74313fcff6
Parents: ee6c19d
Author: avinogradov
Authored: Wed Feb 18 12:40:39 2015 +0300
Committer: avinogradov
Committed: Wed Feb 18 12:40:39 2015 +0300
--
.../rest/protocols/tcp/MockNioSession.java | 7 +-
.../processors/cache/EvictableEntryImpl.java| 4 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheEntryEx.java | 15 ++--
.../cache/GridCacheEvictionManager.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 30
.../processors/cache/GridCacheStoreManager.java | 2 +-
.../processors/cache/GridCacheUtils.java| 10 +--
.../extras/GridCacheAttributesEntryExtras.java | 10 ++-
.../GridCacheAttributesMvccEntryExtras.java | 10 ++-
...dCacheAttributesMvccObsoleteEntryExtras.java | 10 ++-
...cheAttributesMvccObsoleteTtlEntryExtras.java | 10 ++-
.../GridCacheAttributesMvccTtlEntryExtras.java | 10 ++-
.../GridCacheAttributesObsoleteEntryExtras.java | 10 ++-
...idCacheAttributesObsoleteTtlEntryExtras.java | 10 ++-
.../GridCacheAttributesTtlEntryExtras.java | 10 ++-
.../cache/extras/GridCacheEntryExtras.java | 6 +-
.../extras/GridCacheEntryExtrasAdapter.java | 4 +-
.../cache/extras/GridCacheMvccEntryExtras.java | 4 +-
.../GridCacheMvccObsoleteEntryExtras.java | 4 +-
.../GridCacheMvccObsoleteTtlEntryExtras.java| 4 +-
.../extras/GridCacheMvccTtlEntryExtras.java | 4 +-
.../extras/GridCacheObsoleteEntryExtras.java| 4 +-
.../extras/GridCacheObsoleteTtlEntryExtras.java | 4 +-
.../cache/extras/GridCacheTtlEntryExtras.java | 4 +-
.../cache/transactions/IgniteInternalTx.java| 6 +-
.../cache/transactions/IgniteTxAdapter.java | 6 +-
.../transactions/TransactionProxyImpl.java | 6 +-
.../util/lang/GridMetadataAwareAdapter.java | 38 +-
.../apache/ignite/transactions/Transaction.java | 6 +-
.../cache/eviction/GridCacheMockEntry.java | 5 +-
.../nio/impl/GridNioFilterChainSelfTest.java| 7 +-
.../lang/GridMetadataAwareAdapterSelfTest.java | 80 +++-
33 files changed, 197 insertions(+), 147 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1209175d/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
index 48c4a02..c9d13bb 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
@@ -22,6 +22,7 @@ import org.apache.ignite.internal.util.nio.*;
import org.jetbrains.annotations.*;
import java.net.*;
+import java.util.*;
/**
* Mock nio session with disabled functionality for testing parser.
@@ -110,17 +111,17 @@ public class MockNioSession extends
GridMetadataAwareAdapter implements GridNioS
/** {@inheritDoc} */
@Override public T meta(int key) {
-return meta(String.valueOf(key));
+return meta(new UUID(key, key));
}
/** {@inheritDoc} */
@Override public T addMeta(int key, T val) {
-return addMeta(String.valueOf(key), val);
+return addMeta(new UUID(key, key), val);
}
/** {@inheritDoc} */
@Override public T removeMeta(int key) {
-return removeMeta(String.valueOf(key));
+return removeMeta(new UUID(key, key));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1209175d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java
index 9ca6c33..fcde3ad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EvictableEntryImpl.ja
incubator-ignite git commit: # ignite-283: Minor refactorings.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 eb2b1786e -> e3d563ba2
# ignite-283: Minor refactorings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3d563ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3d563ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3d563ba
Branch: refs/heads/sprint-2
Commit: e3d563ba201d8d05fe760d31c1b92173a53d80a0
Parents: eb2b178
Author: vozerov-gridgain
Authored: Wed Feb 18 13:15:09 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:15:09 2015 +0300
--
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 16 +++---
.../processors/cache/GridCacheMapEntry.java | 52 ++--
.../GridDistributedTxRemoteAdapter.java | 3 +-
.../processors/cache/dr/GridCacheDrInfo.java| 5 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../dataload/IgniteDataLoaderImpl.java | 3 +-
.../processors/cache/GridCacheTestEntryEx.java | 8 +--
8 files changed, 46 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3d563ba/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 e5cc9c3..f80e3a5 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
@@ -1572,11 +1572,9 @@ public class GridCacheContext implements
Externalizable {
/**
* Check whether conflict resolution is required.
*
- * @param oldVer Old version.
- * @param newVer New version.
* @return {@code True} in case DR is required.
*/
-public boolean conflictNeedResolve(GridCacheVersion oldVer,
GridCacheVersion newVer) {
+public boolean conflictNeedResolve() {
return conflictRslvr != null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3d563ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index f044347..1ffed64 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -423,10 +423,10 @@ public interface GridCacheEntryEx {
* greater than passed in.
* @param filter Optional filter to check.
* @param drType DR type.
- * @param drTtl DR TTL (if any).
- * @param drExpireTime DR expire time (if any).
- * @param drVer DR version (if any).
- * @param drResolve If {@code true} then performs DR conflicts resolution.
+ * @param conflictTtl Conflict TTL (if any).
+ * @param conflictExpireTime Conflict expire time (if any).
+ * @param conflictVer DR version (if any).
+ * @param conflictResolve If {@code true} then performs conflicts
resolution.
* @param intercept If {@code true} then calls cache interceptor.
* @param subjId Subject ID initiated this update.
* @param taskName Task name.
@@ -455,10 +455,10 @@ public interface GridCacheEntryEx {
boolean checkVer,
@Nullable IgnitePredicate>[] filter,
GridDrType drType,
-long drTtl,
-long drExpireTime,
-@Nullable GridCacheVersion drVer,
-boolean drResolve,
+long conflictTtl,
+long conflictExpireTime,
+@Nullable GridCacheVersion conflictVer,
+boolean conflictResolve,
boolean intercept,
@Nullable UUID subjId,
String taskName
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3d563ba/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 dcdc0d9..60a80fd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/ca
incubator-ignite git commit: # ignite-283: Minor refactorings.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 e3d563ba2 -> 81cce4c6d
# ignite-283: Minor refactorings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/81cce4c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81cce4c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81cce4c6
Branch: refs/heads/sprint-2
Commit: 81cce4c6d869404f9a461090b679af664af86f35
Parents: e3d563b
Author: vozerov-gridgain
Authored: Wed Feb 18 13:25:21 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:25:21 2015 +0300
--
.../cache/GridCacheUpdateAtomicResult.java | 29 +++
.../processors/cache/GridCacheUtils.java| 2 +-
.../GridDistributedTxRemoteAdapter.java | 16 ++--
.../distributed/dht/GridDhtTxLocalAdapter.java | 4 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 88 +++-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 12 +--
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 56 ++---
.../transactions/IgniteTxLocalAdapter.java | 28 +++
10 files changed, 123 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81cce4c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
index cabfaa5..b5596d1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
@@ -43,7 +43,7 @@ public class GridCacheUpdateAtomicResult {
private final long newTtl;
/** Explicit DR expire time (if any). */
-private final long drExpireTime;
+private final long conflictExpireTime;
/** Version for deferred delete. */
@GridToStringInclude
@@ -51,7 +51,7 @@ public class GridCacheUpdateAtomicResult {
/** DR resolution result. */
@GridToStringInclude
-private final GridCacheVersionConflictContext drRes;
+private final GridCacheVersionConflictContext conflictRes;
/** Whether update should be propagated to DHT node. */
private final boolean sndToDht;
@@ -67,9 +67,9 @@ public class GridCacheUpdateAtomicResult {
* @param newVal New value.
* @param res Value computed by the {@link EntryProcessor}.
* @param newTtl New TTL.
- * @param drExpireTime Explicit DR expire time (if any).
+ * @param conflictExpireTime Explicit DR expire time (if any).
* @param rmvVer Version for deferred delete.
- * @param drRes DR resolution result.
+ * @param conflictRes DR resolution result.
* @param sndToDht Whether update should be propagated to DHT node.
*/
public GridCacheUpdateAtomicResult(boolean success,
@@ -77,18 +77,18 @@ public class GridCacheUpdateAtomicResult {
@Nullable V newVal,
@Nullable EntryProcessorResult res,
long newTtl,
-long drExpireTime,
+long conflictExpireTime,
@Nullable GridCacheVersion rmvVer,
-@Nullable GridCacheVersionConflictContext drRes,
+@Nullable GridCacheVersionConflictContext conflictRes,
boolean sndToDht) {
this.success = success;
this.oldVal = oldVal;
this.newVal = newVal;
this.res = res;
this.newTtl = newTtl;
-this.drExpireTime = drExpireTime;
+this.conflictExpireTime = conflictExpireTime;
this.rmvVer = rmvVer;
-this.drRes = drRes;
+this.conflictRes = conflictRes;
this.sndToDht = sndToDht;
}
@@ -121,17 +121,18 @@ public class GridCacheUpdateAtomicResult {
}
/**
- * @return {@code -1} if TTL did not change, otherwise new TTL.
+ * @return {@link GridCacheUtils#TTL_NOT_CHANGED} if TTL did not change,
otherwise new TTL.
*/
public long newTtl() {
return newTtl;
}
/**
- * @return Explicit DR expire time (if any).
+ * @return Explicit conflict expire time (if any). Set only if it is
necessary to propagate concrete expire time
+ * value to DHT node. Otherwise set to {@link
GridCacheUtils#EXPIRE_TIME_CALCULATE}.
*/
-public long drExpireTime() {
-return drExpireTime;
+public long conflictExpireTime() {
+return conflictExpireTime;
}
[08/11] incubator-ignite git commit: #gg-9809: RemoveGridSecureSession.
#gg-9809: RemoveGridSecureSession.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec166d7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec166d7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec166d7a
Branch: refs/heads/ignite-gg-9809
Commit: ec166d7a36fdd8a1a2ea77fa0ab5a196de0b3523
Parents: 928318c
Author: ivasilinets
Authored: Wed Feb 18 12:18:06 2015 +0300
Committer: ivasilinets
Committed: Wed Feb 18 12:18:06 2015 +0300
--
.../securesession/GridSecureSession.java| 60
1 file changed, 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec166d7a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSession.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSession.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSession.java
deleted file mode 100644
index 4727c54..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSession.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.securesession;
-
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-/**
- * Secure session object.
- */
-public class GridSecureSession {
-/** Authentication subject context returned by authentication SPI. */
-private GridSecurityContext authSubjCtx;
-
-/** Session creation time. */
-private byte[] sesTok;
-
-/**
- * @param authSubjCtx Authentication subject context.
- * @param sesTok Session token.
- */
-public GridSecureSession(GridSecurityContext authSubjCtx, byte[] sesTok) {
-this.authSubjCtx = authSubjCtx;
-this.sesTok = sesTok;
-}
-
-/**
- * @return Authentication subject context returned by authentication SPI.
- */
-public GridSecurityContext authenticationSubjectContext() {
-return authSubjCtx;
-}
-
-/**
- * @return Session creation time.
- */
-public byte[] sessionToken() {
-return sesTok;
-}
-
-/** {@inheritDoc} */
-@Override public String toString() {
-return S.toString(GridSecureSession.class, this);
-}
-}
[07/11] incubator-ignite git commit: #gg-9809: Remove GridSecureSessionProcessor.
#gg-9809: Remove GridSecureSessionProcessor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/928318ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/928318ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/928318ce
Branch: refs/heads/ignite-gg-9809
Commit: 928318cee789c4bffd35b4ed84da6d7eb04fbf13
Parents: 364c293
Author: ivasilinets
Authored: Wed Feb 18 12:16:19 2015 +0300
Committer: ivasilinets
Committed: Wed Feb 18 12:16:19 2015 +0300
--
.../GridSecureSessionProcessor.java | 59
1 file changed, 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/928318ce/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSessionProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSessionProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSessionProcessor.java
deleted file mode 100644
index 550a238..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/GridSecureSessionProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.securesession;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * This interface defines a grid secure session processor.
- */
-public interface GridSecureSessionProcessor extends GridProcessor {
-/**
- * @param subjType Subject type.
- * @param subjId Subject ID.
- * @param tok Token.
- * @param params Parameters.
- * @return Validated secure session or {@code null} if session is not
valid.
- * @throws IgniteCheckedException If error occurred.
- */
-public GridSecureSession validateSession(GridSecuritySubjectType subjType,
UUID subjId, @Nullable byte[] tok,
-@Nullable Object params) throws IgniteCheckedException;
-
-/**
- * Generates secure session token.
- *
- * @param subjType Subject type.
- * @param subjId Subject ID.
- * @param subjCtx Authentication subject context.
- * @param params Params.
- * @return Generated session token.
- */
-public byte[] updateSession(GridSecuritySubjectType subjType, UUID subjId,
GridSecurityContext subjCtx,
-@Nullable Object params) throws IgniteCheckedException;
-
-/**
- * @return GridSecureSessionProcessor is enable.
- */
-public boolean enabled();
-}
[06/11] incubator-ignite git commit: #gg-9809: Remove GridOsSecureSessionProcessor.
#gg-9809: Remove GridOsSecureSessionProcessor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/364c293a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/364c293a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/364c293a
Branch: refs/heads/ignite-gg-9809
Commit: 364c293aa548f3a54842b0c54d032219320c6d62
Parents: b70a4d9
Author: ivasilinets
Authored: Wed Feb 18 12:14:14 2015 +0300
Committer: ivasilinets
Committed: Wed Feb 18 12:14:14 2015 +0300
--
.../os/GridOsSecureSessionProcessor.java| 61
1 file changed, 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/364c293a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/os/GridOsSecureSessionProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/os/GridOsSecureSessionProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/os/GridOsSecureSessionProcessor.java
deleted file mode 100644
index 6f4f6b2..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/securesession/os/GridOsSecureSessionProcessor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.securesession.os;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.securesession.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * No-op implementation for {@link GridSecureSessionProcessor}.
- */
-public class GridOsSecureSessionProcessor extends GridProcessorAdapter
implements GridSecureSessionProcessor {
-/** Empty bytes. */
-private static final byte[] EMPTY_BYTES = new byte[0];
-
-/**
- * @param ctx Kernal context.
- */
-public GridOsSecureSessionProcessor(GridKernalContext ctx) {
-super(ctx);
-}
-
-/** {@inheritDoc} */
-@Override public GridSecureSession validateSession(GridSecuritySubjectType
subjType, UUID subjId,
-@Nullable byte[] tok,
-@Nullable Object params) throws IgniteCheckedException {
-return null;
-}
-
-/** {@inheritDoc} */
-@Override public byte[] updateSession(GridSecuritySubjectType subjType,
UUID subjId, GridSecurityContext subjCtx,
-@Nullable Object params) {
-return EMPTY_BYTES;
-}
-
-/** {@inheritDoc} */
-@Override public boolean enabled() {
-return false;
-}
-}
[02/11] incubator-ignite git commit: #gg-9809: Remove secureSession from debug in IgniteKernal.
#gg-9809: Remove secureSession from debug in IgniteKernal.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6289eae3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6289eae3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6289eae3
Branch: refs/heads/ignite-gg-9809
Commit: 6289eae3de1147cb6cc9ead50a2a15e2df2183f9
Parents: ca2f668
Author: ivasilinets
Authored: Wed Feb 18 12:07:06 2015 +0300
Committer: ivasilinets
Committed: Wed Feb 18 12:07:06 2015 +0300
--
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6289eae3/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 9cc7b5f..37a02be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -51,7 +51,6 @@ import org.apache.ignite.internal.processors.portable.*;
import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.processors.resource.*;
import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.securesession.*;
import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.internal.processors.segmentation.*;
import org.apache.ignite.internal.processors.service.*;
@@ -2046,8 +2045,7 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
assert log != null;
if (log.isInfoEnabled())
-log.info("Security status [authentication=" +
onOff(ctx.security().enabled()) + ", " +
-"secure-session=" + onOff(ctx.secureSession().enabled()) +
']');
+log.info("Security status [authentication=" +
onOff(ctx.security().enabled()) + ']');
}
/**
[11/11] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into gg-9809
Merge remote-tracking branch 'remotes/origin/sprint-2' into gg-9809 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bedb39ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bedb39ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bedb39ce Branch: refs/heads/ignite-gg-9809 Commit: bedb39cef506c6be08db792c69d000c51089848f Parents: c59f283 eb2b178 Author: ivasilinets Authored: Wed Feb 18 13:14:47 2015 +0300 Committer: ivasilinets Committed: Wed Feb 18 13:14:47 2015 +0300 -- .../processors/cache/GridCacheAdapter.java | 16 ++- .../processors/cache/GridCacheMapEntry.java | 6 ++-- .../processors/cache/GridCacheProjectionEx.java | 8 +++--- .../cache/GridCacheProjectionImpl.java | 16 +-- .../processors/cache/GridCacheProxyImpl.java| 16 +-- .../processors/cache/GridCacheUtils.java| 30 ++-- .../dht/atomic/GridDhtAtomicCache.java | 12 .../distributed/near/GridNearAtomicCache.java | 16 +-- .../cache/version/GridCacheVersion.java | 4 +-- .../cache/version/GridCacheVersionEx.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 4 +-- .../ignite/internal/util/IgniteUtils.java | 2 +- 12 files changed, 73 insertions(+), 59 deletions(-) --
[05/11] incubator-ignite git commit: #gg-9809: Remove GridSecureSessionProcessor from GridKernalContextImpl.
#gg-9809: Remove GridSecureSessionProcessor from GridKernalContextImpl. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b70a4d98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b70a4d98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b70a4d98 Branch: refs/heads/ignite-gg-9809 Commit: b70a4d983adeec7893d4e9f30972542232a12ace Parents: ba21e68 Author: ivasilinets Authored: Wed Feb 18 12:13:28 2015 +0300 Committer: ivasilinets Committed: Wed Feb 18 12:13:28 2015 +0300 -- .../org/apache/ignite/internal/GridKernalContextImpl.java | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b70a4d98/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index db8855a..6f31bf7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -52,7 +52,6 @@ import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.processors.resource.*; import org.apache.ignite.internal.processors.rest.*; import org.apache.ignite.internal.processors.schedule.*; -import org.apache.ignite.internal.processors.securesession.*; import org.apache.ignite.internal.processors.security.*; import org.apache.ignite.internal.processors.segmentation.*; import org.apache.ignite.internal.processors.service.*; @@ -128,10 +127,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** */ @GridToStringExclude -private GridSecureSessionProcessor secProc; - -/** */ -@GridToStringExclude private GridSwapSpaceManager swapspaceMgr; /** */ @@ -398,8 +393,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable colMgr = (GridCollisionManager)comp; else if (comp instanceof GridSecurityProcessor) authProc = (GridSecurityProcessor)comp; -else if (comp instanceof GridSecureSessionProcessor) -secProc = (GridSecureSessionProcessor)comp; else if (comp instanceof GridLoadBalancerManager) loadMgr = (GridLoadBalancerManager)comp; else if (comp instanceof GridSwapSpaceManager)
[04/11] incubator-ignite git commit: #gg-9809: Remove secureSession() method from GridKernalContext.
#gg-9809: Remove secureSession() method from GridKernalContext.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba21e685
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba21e685
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba21e685
Branch: refs/heads/ignite-gg-9809
Commit: ba21e685b35e554b8facb1cf832825a594a5d83a
Parents: 2131929
Author: ivasilinets
Authored: Wed Feb 18 12:12:21 2015 +0300
Committer: ivasilinets
Committed: Wed Feb 18 12:12:21 2015 +0300
--
.../java/org/apache/ignite/internal/GridKernalContext.java | 8
.../org/apache/ignite/internal/GridKernalContextImpl.java| 5 -
2 files changed, 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba21e685/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 56f145a..40421d1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -48,7 +48,6 @@ import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.processors.resource.*;
import org.apache.ignite.internal.processors.rest.*;
import org.apache.ignite.internal.processors.schedule.*;
-import org.apache.ignite.internal.processors.securesession.*;
import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.internal.processors.segmentation.*;
import org.apache.ignite.internal.processors.service.*;
@@ -366,13 +365,6 @@ public interface GridKernalContext extends
Iterable {
public GridSecurityProcessor security();
/**
- * Gets secure session processor.
- *
- * @return Secure session processor.
- */
-public GridSecureSessionProcessor secureSession();
-
-/**
* Gets load balancing manager.
*
* @return Load balancing manager.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba21e685/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 32dc14e..db8855a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -623,11 +623,6 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
}
/** {@inheritDoc} */
-@Override public GridSecureSessionProcessor secureSession() {
-return secProc;
-}
-
-/** {@inheritDoc} */
@Override public GridLoadBalancerManager loadBalancing() {
return loadMgr;
}
[03/11] incubator-ignite git commit: #gg-9809: Remove secureSession from GridRestProcessor.
#gg-9809: Remove secureSession from GridRestProcessor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2131929e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2131929e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2131929e
Branch: refs/heads/ignite-gg-9809
Commit: 2131929e314985c95aaadc4ac92feb2688b81e61
Parents: 6289eae
Author: ivasilinets
Authored: Wed Feb 18 12:11:42 2015 +0300
Committer: ivasilinets
Committed: Wed Feb 18 12:11:42 2015 +0300
--
.../processors/rest/GridRestProcessor.java | 53
1 file changed, 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2131929e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index fe7a760..47a3ecb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -174,15 +174,6 @@ public class GridRestProcessor extends
GridProcessorAdapter {
GridRestResponse res = new
GridRestResponse(STATUS_SECURITY_CHECK_FAILED, e.getMessage());
-if (ctx.secureSession().enabled()) {
-try {
-res.sessionTokenBytes(updateSessionToken(req, subjCtx));
-}
-catch (IgniteCheckedException e1) {
-U.warn(log, "Cannot update response session token: " +
e1.getMessage());
-}
-}
-
return new GridFinishedFuture<>(ctx, res);
}
catch (IgniteCheckedException e) {
@@ -199,8 +190,6 @@ public class GridRestProcessor extends GridProcessorAdapter
{
return new GridFinishedFuture<>(ctx,
new IgniteCheckedException("Failed to find registered handler
for command: " + req.command()));
-final GridSecurityContext subjCtx0 = subjCtx;
-
return res.chain(new C1,
GridRestResponse>() {
@Override public GridRestResponse
apply(IgniteInternalFuture f) {
GridRestResponse res;
@@ -219,15 +208,6 @@ public class GridRestProcessor extends
GridProcessorAdapter {
assert res != null;
-if (ctx.secureSession().enabled()) {
-try {
-res.sessionTokenBytes(updateSessionToken(req,
subjCtx0));
-}
-catch (IgniteCheckedException e) {
-U.warn(log, "Cannot update response session token: " +
e.getMessage());
-}
-}
-
interceptResponse(res, req);
return res;
@@ -458,20 +438,6 @@ public class GridRestProcessor extends
GridProcessorAdapter {
* @throws IgniteCheckedException If authentication failed.
*/
private GridSecurityContext authenticate(GridRestRequest req) throws
IgniteCheckedException {
-UUID clientId = req.clientId();
-
-byte[] sesTok = req.sessionToken();
-
-// Validate session.
-if (sesTok != null) {
-// Session is still valid.
-GridSecureSession ses =
ctx.secureSession().validateSession(REMOTE_CLIENT, clientId, sesTok, null);
-
-if (ses != null)
-// Session is still valid.
-return ses.authenticationSubjectContext();
-}
-
// Authenticate client if invalid session.
AuthenticationContext authCtx = new AuthenticationContext();
@@ -514,25 +480,6 @@ public class GridRestProcessor extends
GridProcessorAdapter {
}
/**
- * Update session token to actual state.
- *
- * @param req Grid est request.
- * @param subjCtx Authentication subject context.
- * @return Valid session token.
- * @throws IgniteCheckedException If session token update process failed.
- */
-private byte[] updateSessionToken(GridRestRequest req, GridSecurityContext
subjCtx) throws IgniteCheckedException {
-// Update token from request to actual state.
-byte[] sesTok = ctx.secureSession().updateSession(REMOTE_CLIENT,
req.clientId(), subjCtx, null);
-
-// Validate token has been created.
-if (sesTok == null)
-throw new IgniteCheckedException("Cannot create session token (is
secure session SPI set?).");
-
-return sesTok;
-}
-
-/**
* @param req REST request.
*
[01/11] incubator-ignite git commit: #gg-9809: Do not start GridSecureSessionProcessor in IgniteKernal.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-9809 [created] bedb39cef #gg-9809: Do not start GridSecureSessionProcessor in IgniteKernal. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca2f6683 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca2f6683 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca2f6683 Branch: refs/heads/ignite-gg-9809 Commit: ca2f6683b88803597644ad862df67ac5aeeafb42 Parents: c5a15a1 Author: ivasilinets Authored: Wed Feb 18 12:05:46 2015 +0300 Committer: ivasilinets Committed: Wed Feb 18 12:05:46 2015 +0300 -- .../core/src/main/java/org/apache/ignite/internal/IgniteKernal.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca2f6683/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 44e92d8..9cc7b5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -677,7 +677,6 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit // Start security processors. startProcessor(ctx, createComponent(GridSecurityProcessor.class, ctx), attrs); -startProcessor(ctx, createComponent(GridSecureSessionProcessor.class, ctx), attrs); // Start SPI managers. // NOTE: that order matters as there are dependencies between managers.
[10/11] incubator-ignite git commit: #gg-9809: Remove secureSession from pom.xml.
#gg-9809: Remove secureSession from pom.xml.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c59f283a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c59f283a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c59f283a
Branch: refs/heads/ignite-gg-9809
Commit: c59f283a2f48a9ba0bf2037149684d6b0969c575
Parents: 3929b7a
Author: ivasilinets
Authored: Wed Feb 18 12:48:41 2015 +0300
Committer: ivasilinets
Committed: Wed Feb 18 12:48:41 2015 +0300
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f283a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 033f9dc..9801ac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -896,7 +896,7 @@
http://hadoop.apache.org/docs/current/api/
${basedir}/assembly/docfiles/javadoc.css
-
com.*:org.jetbrains.*:org.pcollections:*.jdk8:*.tests:*.tools:*.typedef:*.examples:*.client:*.kernal:*.internal:*.util:*.dr:*.spi.authentication:*.spi.securesession:*.spi.discovery.tcp.messages:*.spi.discovery.tcp.internal:*.spi.deployment.uri.scanners:*.spi.deployment.uri.tasks:*.spi.indexing.h2.opt:org.apache.ignite.portables:org.apache.ignite.yardstick:org.apache.ignite.schema.*:org.apache.ignite.codegen
+
com.*:org.jetbrains.*:org.pcollections:*.jdk8:*.tests:*.tools:*.typedef:*.examples:*.client:*.kernal:*.internal:*.util:*.dr:*.spi.discovery.tcp.messages:*.spi.discovery.tcp.internal:*.spi.deployment.uri.scanners:*.spi.deployment.uri.tasks:*.spi.indexing.h2.opt:org.apache.ignite.portables:org.apache.ignite.yardstick:org.apache.ignite.schema.*:org.apache.ignite.codegen
Common Grid APIs
[09/11] incubator-ignite git commit: #gg-9809: Remove package org.gridgain.grid.securesession.rememberme.
#gg-9809: Remove package org.gridgain.grid.securesession.rememberme. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3929b7ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3929b7ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3929b7ae Branch: refs/heads/ignite-gg-9809 Commit: 3929b7ae5a74cac49e4b75c768280b81f8f51b4c Parents: ec166d7 Author: ivasilinets Authored: Wed Feb 18 12:27:19 2015 +0300 Committer: ivasilinets Committed: Wed Feb 18 12:27:19 2015 +0300 -- .../apache/ignite/internal/processors/rest/GridRestProcessor.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3929b7ae/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index 47a3ecb..6d9ee37 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -30,7 +30,6 @@ import org.apache.ignite.internal.processors.rest.handlers.top.*; import org.apache.ignite.internal.processors.rest.handlers.version.*; import org.apache.ignite.internal.processors.rest.protocols.tcp.*; import org.apache.ignite.internal.processors.rest.request.*; -import org.apache.ignite.internal.processors.securesession.*; import org.apache.ignite.internal.processors.security.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*;
[4/4] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-283.
Merge branch 'sprint-2' into ignite-283. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c296cd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c296cd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c296cd8 Branch: refs/heads/ignite-283 Commit: 9c296cd80c62aee225998ae7552acb42aca71d2b Parents: 707a24b 81cce4c Author: vozerov-gridgain Authored: Wed Feb 18 13:31:51 2015 +0300 Committer: vozerov-gridgain Committed: Wed Feb 18 13:31:51 2015 +0300 -- .../ignite/internal/processors/cache/GridCacheAdapter.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c296cd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java --
[3/4] incubator-ignite git commit: # ignite-283: Minor refactorings.
# ignite-283: Minor refactorings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/81cce4c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81cce4c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81cce4c6
Branch: refs/heads/ignite-283
Commit: 81cce4c6d869404f9a461090b679af664af86f35
Parents: e3d563b
Author: vozerov-gridgain
Authored: Wed Feb 18 13:25:21 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:25:21 2015 +0300
--
.../cache/GridCacheUpdateAtomicResult.java | 29 +++
.../processors/cache/GridCacheUtils.java| 2 +-
.../GridDistributedTxRemoteAdapter.java | 16 ++--
.../distributed/dht/GridDhtTxLocalAdapter.java | 4 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 88 +++-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 12 +--
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 56 ++---
.../transactions/IgniteTxLocalAdapter.java | 28 +++
10 files changed, 123 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81cce4c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
index cabfaa5..b5596d1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
@@ -43,7 +43,7 @@ public class GridCacheUpdateAtomicResult {
private final long newTtl;
/** Explicit DR expire time (if any). */
-private final long drExpireTime;
+private final long conflictExpireTime;
/** Version for deferred delete. */
@GridToStringInclude
@@ -51,7 +51,7 @@ public class GridCacheUpdateAtomicResult {
/** DR resolution result. */
@GridToStringInclude
-private final GridCacheVersionConflictContext drRes;
+private final GridCacheVersionConflictContext conflictRes;
/** Whether update should be propagated to DHT node. */
private final boolean sndToDht;
@@ -67,9 +67,9 @@ public class GridCacheUpdateAtomicResult {
* @param newVal New value.
* @param res Value computed by the {@link EntryProcessor}.
* @param newTtl New TTL.
- * @param drExpireTime Explicit DR expire time (if any).
+ * @param conflictExpireTime Explicit DR expire time (if any).
* @param rmvVer Version for deferred delete.
- * @param drRes DR resolution result.
+ * @param conflictRes DR resolution result.
* @param sndToDht Whether update should be propagated to DHT node.
*/
public GridCacheUpdateAtomicResult(boolean success,
@@ -77,18 +77,18 @@ public class GridCacheUpdateAtomicResult {
@Nullable V newVal,
@Nullable EntryProcessorResult res,
long newTtl,
-long drExpireTime,
+long conflictExpireTime,
@Nullable GridCacheVersion rmvVer,
-@Nullable GridCacheVersionConflictContext drRes,
+@Nullable GridCacheVersionConflictContext conflictRes,
boolean sndToDht) {
this.success = success;
this.oldVal = oldVal;
this.newVal = newVal;
this.res = res;
this.newTtl = newTtl;
-this.drExpireTime = drExpireTime;
+this.conflictExpireTime = conflictExpireTime;
this.rmvVer = rmvVer;
-this.drRes = drRes;
+this.conflictRes = conflictRes;
this.sndToDht = sndToDht;
}
@@ -121,17 +121,18 @@ public class GridCacheUpdateAtomicResult {
}
/**
- * @return {@code -1} if TTL did not change, otherwise new TTL.
+ * @return {@link GridCacheUtils#TTL_NOT_CHANGED} if TTL did not change,
otherwise new TTL.
*/
public long newTtl() {
return newTtl;
}
/**
- * @return Explicit DR expire time (if any).
+ * @return Explicit conflict expire time (if any). Set only if it is
necessary to propagate concrete expire time
+ * value to DHT node. Otherwise set to {@link
GridCacheUtils#EXPIRE_TIME_CALCULATE}.
*/
-public long drExpireTime() {
-return drExpireTime;
+public long conflictExpireTime() {
+return conflictExpireTime;
}
/**
@@ -144,8 +145,8 @@ public class GridCacheUpdateAtomicResult {
/**
* @retur
[2/4] incubator-ignite git commit: # ignite-283: Minor refactorings.
# ignite-283: Minor refactorings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3d563ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3d563ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3d563ba
Branch: refs/heads/ignite-283
Commit: e3d563ba201d8d05fe760d31c1b92173a53d80a0
Parents: eb2b178
Author: vozerov-gridgain
Authored: Wed Feb 18 13:15:09 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:15:09 2015 +0300
--
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 16 +++---
.../processors/cache/GridCacheMapEntry.java | 52 ++--
.../GridDistributedTxRemoteAdapter.java | 3 +-
.../processors/cache/dr/GridCacheDrInfo.java| 5 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../dataload/IgniteDataLoaderImpl.java | 3 +-
.../processors/cache/GridCacheTestEntryEx.java | 8 +--
8 files changed, 46 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3d563ba/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 e5cc9c3..f80e3a5 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
@@ -1572,11 +1572,9 @@ public class GridCacheContext implements
Externalizable {
/**
* Check whether conflict resolution is required.
*
- * @param oldVer Old version.
- * @param newVer New version.
* @return {@code True} in case DR is required.
*/
-public boolean conflictNeedResolve(GridCacheVersion oldVer,
GridCacheVersion newVer) {
+public boolean conflictNeedResolve() {
return conflictRslvr != null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3d563ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index f044347..1ffed64 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -423,10 +423,10 @@ public interface GridCacheEntryEx {
* greater than passed in.
* @param filter Optional filter to check.
* @param drType DR type.
- * @param drTtl DR TTL (if any).
- * @param drExpireTime DR expire time (if any).
- * @param drVer DR version (if any).
- * @param drResolve If {@code true} then performs DR conflicts resolution.
+ * @param conflictTtl Conflict TTL (if any).
+ * @param conflictExpireTime Conflict expire time (if any).
+ * @param conflictVer DR version (if any).
+ * @param conflictResolve If {@code true} then performs conflicts
resolution.
* @param intercept If {@code true} then calls cache interceptor.
* @param subjId Subject ID initiated this update.
* @param taskName Task name.
@@ -455,10 +455,10 @@ public interface GridCacheEntryEx {
boolean checkVer,
@Nullable IgnitePredicate>[] filter,
GridDrType drType,
-long drTtl,
-long drExpireTime,
-@Nullable GridCacheVersion drVer,
-boolean drResolve,
+long conflictTtl,
+long conflictExpireTime,
+@Nullable GridCacheVersion conflictVer,
+boolean conflictResolve,
boolean intercept,
@Nullable UUID subjId,
String taskName
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3d563ba/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 dcdc0d9..60a80fd 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/proc
[1/4] incubator-ignite git commit: # ignite-283: Method renamings.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-283 707a24b6f -> 9c296cd80
# ignite-283: Method renamings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb2b1786
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb2b1786
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb2b1786
Branch: refs/heads/ignite-283
Commit: eb2b1786efa6f261f70ec7aa610d8368b5b62f96
Parents: c5a15a1
Author: vozerov-gridgain
Authored: Wed Feb 18 13:09:33 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:09:33 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 16 ++-
.../processors/cache/GridCacheMapEntry.java | 6 ++--
.../processors/cache/GridCacheProjectionEx.java | 8 +++---
.../cache/GridCacheProjectionImpl.java | 16 +--
.../processors/cache/GridCacheProxyImpl.java| 16 +--
.../processors/cache/GridCacheUtils.java| 30 ++--
.../dht/atomic/GridDhtAtomicCache.java | 12
.../distributed/near/GridNearAtomicCache.java | 16 +--
.../cache/version/GridCacheVersion.java | 4 +--
.../cache/version/GridCacheVersionEx.java | 2 +-
.../dr/GridDrDataLoadCacheUpdater.java | 4 +--
.../ignite/internal/util/IgniteUtils.java | 2 +-
12 files changed, 73 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb2b1786/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 9d8f243..cba8b1c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2472,7 +2472,8 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void putAllDr(final Map>
drMap) throws IgniteCheckedException {
+@Override public void putAllConflict(final Map> drMap)
+throws IgniteCheckedException {
if (F.isEmpty(drMap))
return;
@@ -2486,13 +2487,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDr [drMap=" + drMap + ']';
+return "putAllConflict [drMap=" + drMap + ']';
}
});
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture putAllDrAsync(final Map> drMap)
+@Override public IgniteInternalFuture putAllConflictAsync(final Map> drMap)
throws IgniteCheckedException {
if (F.isEmpty(drMap))
return new GridFinishedFuture(ctx.kernalContext());
@@ -2507,7 +2508,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDrAsync [drMap=" + drMap + ']';
+return "putAllConflictAsync [drMap=" + drMap + ']';
}
});
}
@@ -3379,7 +3380,8 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void removeAllDr(final Map
drMap) throws IgniteCheckedException {
+@Override public void removeAllConflict(final Map drMap)
+throws IgniteCheckedException {
ctx.denyOnLocalRead();
if (F.isEmpty(drMap))
@@ -3393,13 +3395,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "removeAllDr [drMap=" + drMap + ']';
+return "removeAllConflict [drMap=" + drMap + ']';
}
});
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture removeAllDrAsync(final Map drMap)
+@Override public IgniteInternalFuture removeAllConflictAsync(final
Map drMap)
throws IgniteCheckedException {
ctx.denyOnLocalRead();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb2b1786/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
[10/50] [abbrv] incubator-ignite git commit: # sprint-1 -release notes.
# sprint-1 -release notes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b5e89710 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b5e89710 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b5e89710 Branch: refs/heads/ignite-223 Commit: b5e897101cedbfa899dd912fc1d5d57c6dd16b3c Parents: 66ca116 Author: Dmitiry Setrakyan Authored: Mon Feb 16 11:08:07 2015 -0800 Committer: Dmitiry Setrakyan Committed: Mon Feb 16 11:08:43 2015 -0800 -- docs/release_notes.pdf | Bin 59911 -> 19018 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5e89710/docs/release_notes.pdf -- diff --git a/docs/release_notes.pdf b/docs/release_notes.pdf index 5793b06..fe5e307 100644 Binary files a/docs/release_notes.pdf and b/docs/release_notes.pdf differ
[09/50] [abbrv] incubator-ignite git commit: # sprint-1 - Fixed build
# sprint-1 - Fixed build Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/66ca1161 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/66ca1161 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/66ca1161 Branch: refs/heads/ignite-223 Commit: 66ca11612077871bb05caf77aae8c5d5f5087d66 Parents: 82924b6 Author: Valentin Kulichenko Authored: Mon Feb 16 09:54:19 2015 -0800 Committer: Valentin Kulichenko Committed: Mon Feb 16 09:54:19 2015 -0800 -- pom.xml | 16 +--- 1 file changed, 1 insertion(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66ca1161/pom.xml -- diff --git a/pom.xml b/pom.xml index b6bee00..033f9dc 100644 --- a/pom.xml +++ b/pom.xml @@ -868,7 +868,7 @@ aggregate -prepare-package +process-test-classes @@ -1096,13 +1096,6 @@ - - - - - - - @@ -1112,13 +1105,6 @@ - - - - - - -
[11/50] [abbrv] incubator-ignite git commit: # sprint-1 -release notes and readme.
# sprint-1 -release notes and readme. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/659b4329 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/659b4329 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/659b4329 Branch: refs/heads/ignite-223 Commit: 659b4329fb8936d2955a441281359274b25ee8fb Parents: b5e8971 Author: Dmitiry Setrakyan Authored: Mon Feb 16 11:19:31 2015 -0800 Committer: Dmitiry Setrakyan Committed: Mon Feb 16 11:19:31 2015 -0800 -- docs/ignite_readme.md | 12 ++-- docs/ignite_readme.pdf | Bin 76810 -> 77136 bytes docs/release_notes.md | 16 docs/release_notes.pdf | Bin 19018 -> 33174 bytes 4 files changed, 22 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/659b4329/docs/ignite_readme.md -- diff --git a/docs/ignite_readme.md b/docs/ignite_readme.md index a238109..58de4fc 100644 --- a/docs/ignite_readme.md +++ b/docs/ignite_readme.md @@ -10,14 +10,14 @@ Ignite In-Memory Data Fabric is designed to deliver uncompromised performance fo Following main components are included in the fabric: * `Advanced Clustering` - support for auto-discovery of cluster nodes in any environment, including, public clouds (e.g. AWS), private clouds, or hybrid clouds. +* `Compute Grid` - includes distributed clustering, messaging, events, and computational features. +* `Data Grid` - partitioned in-memory key-value store with support for ACID transactions, off-heap memory, SQL, and more. +* `Service Grid` - support for managed user-defined services, like cluster singletons, node-singletons, and services with custom deployment topology. +* `Distributed Data Structures` - support for common distributed data structures, like maps, sets, queues, atomics, etc. +* `Streaming & CEP` - supports event workflow, rolling data windows and indexing, continuous querying, and more. +* `Distributed Filesystem` - distributed Hadoop-compliant in-memory file system. * `Distributed Messaging` - support for topic-based and point-to-point message exchange between cluster nodes. * `Distributed Events` - support for cluster-wide event notifications. -* `Managed Services` - support for managed user-defined services, like cluster singletons, node-singletons, and services with custom deployment topology. -* `Distributed Data Structures` - support for common distributed data structures, like maps, sets, queues, atomics, etc. -* `In-Memory Compute Grid` - includes distributed clustering, messaging, events, and computational features. -* `In-Memory Data Grid` - partitioned in-memory key-value store with support for ACID transactions, off-heap memory, SQL, and more. -* `In-Memory Streaming` - supports event workflow, rolling data windows and indexing, continuous querying, and more. -* `In-Memory Filesystem` - distributed Hadoop-compliant in-memory file system. ## 2. Apache Ignite Installation Ignite distribution comes in a ZIP file that simply needs to be unzipped, and `IGNITE_HOME` environment variable can optionally be set to point to it. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/659b4329/docs/ignite_readme.pdf -- diff --git a/docs/ignite_readme.pdf b/docs/ignite_readme.pdf index c270d15..175d59b 100644 Binary files a/docs/ignite_readme.pdf and b/docs/ignite_readme.pdf differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/659b4329/docs/release_notes.md -- diff --git a/docs/release_notes.md b/docs/release_notes.md new file mode 100755 index 000..592c7f3 --- /dev/null +++ b/docs/release_notes.md @@ -0,0 +1,16 @@ + + + +##Apache Ignite In-Memory Data Fabric 1.0 +This is the first release of Apache Ignite project. The source code is based on the 7 year old GridGain In-Memory Data Fabric, open source edition, v. 6.6.2, which was donated to Apache Software Foundation in September 2014. + +The main feature set of Ignite In-Memory Data Fabric includes: +* Advanced Clustering +* Compute Grid +* Data Grid +* Service Grid +* IGFS - Ignite File System +* Distributed Data Structures +* Distributed Messaging +* Distributed Events +* Streaming & CEP \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/659b4329/docs/release_notes.pdf -- diff --git a/docs/release_notes.pdf b/docs/release_notes.pdf index fe5e307..f08bba5 100644 Binary files a/docs/release_notes.pdf and b/do
[18/50] [abbrv] incubator-ignite git commit: # sprint-2 minor
# sprint-2 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f7d2ad9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f7d2ad9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f7d2ad9
Branch: refs/heads/ignite-223
Commit: 2f7d2ad9c55ad126d1e7a18457361f2be1fb1401
Parents: 68a3b77
Author: sboikov
Authored: Tue Feb 17 11:22:44 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 11:22:44 2015 +0300
--
.../apache/ignite/internal/IgniteKernal.java| 22 ++--
1 file changed, 2 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f7d2ad9/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 597322d..44e92d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -3003,25 +3003,15 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
if (comp != null)
return comp;
-// TODO 9341: get rid of ent/os after moving ent code to plugin.
Class implCls = null;
try {
-implCls = (Class)Class.forName(enterpriseClassName(cls));
+implCls = (Class)Class.forName(componentClassName(cls));
}
catch (ClassNotFoundException ignore) {
// No-op.
}
-if (implCls == null) {
-try {
-implCls = (Class)Class.forName(openSourceClassName(cls));
-}
-catch (ClassNotFoundException ignore) {
-// No-op.
-}
-}
-
if (implCls == null)
throw new IgniteCheckedException("Failed to find component
implementation: " + cls.getName());
@@ -3049,17 +3039,9 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
/**
* @param cls Component interface.
- * @return Name of component implementation class for enterprise edition.
- */
-private static String enterpriseClassName(Class cls) {
-return cls.getPackage().getName() + ".ent." +
cls.getSimpleName().replace("Grid", "GridEnt");
-}
-
-/**
- * @param cls Component interface.
* @return Name of component implementation class for open source edition.
*/
-private static String openSourceClassName(Class cls) {
+private static String componentClassName(Class cls) {
return cls.getPackage().getName() + ".os." +
cls.getSimpleName().replace("Grid", "GridOs");
}
[14/50] [abbrv] incubator-ignite git commit: # IGNITE-274 Reworked events collecting.
# IGNITE-274 Reworked events collecting.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/677e643b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/677e643b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/677e643b
Branch: refs/heads/ignite-223
Commit: 677e643b217ecbc92c081711a688fde087e42949
Parents: 659b432
Author: AKuznetsov
Authored: Tue Feb 17 14:24:28 2015 +0700
Committer: AKuznetsov
Committed: Tue Feb 17 14:24:28 2015 +0700
--
.../visor/node/VisorNodeDataCollectorJob.java | 50 +++---
.../internal/visor/util/VisorEventMapper.java | 73
.../internal/visor/util/VisorTaskUtils.java | 60
3 files changed, 142 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677e643b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 2bedf10..5cb9039 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -55,8 +55,26 @@ public class VisorNodeDataCollectorJob extends
VisorJobhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677e643b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
new file mode 100644
index 000..574d4ff
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.util;
+
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.visor.event.*;
+import org.apache.ignite.lang.*;
+
+import java.util.*;
+
+/**
+ * Mapper from grid event to Visor data transfer object.
+ */
+public class VisorEventMapper implements IgniteClosure {
+/**
+ * Map grid event to Visor data transfer object.
+ *
+ * @param evt Grid event.
+ * @param type Event's type.
+ * @param id Event id.
+ * @param name Event name.
+ * @param nid Event node ID.
+ * @param ts Event timestamp.
+ * @param msg Event message.
+ * @param shortDisplay Shortened version of {@code toString()} result.
+ * @return Visor data transfer object for event.
+ */
+protected VisorGridEvent map(Event evt, int type, IgniteUuid id, String
name, UUID nid, long ts, String msg,
+String shortDisplay) {
+if (evt instanceof TaskEvent) {
+TaskEvent te = (TaskEvent)evt;
+
+return new VisorGridTaskEvent(type, id, name, nid, ts, msg,
shortDisplay,
+te.taskName(), te.taskClassName(), te.taskSessionId(),
te.internal());
+}
+
+if (evt instanceof JobEvent) {
+JobEvent je = (JobEvent)evt;
+
+return new VisorGridJobEvent(type, id, name, nid, ts, msg,
shortDisplay,
+je.taskName(), je.taskClassName(), je.taskSessionId(),
je.jobId());
+}
+
+if (evt instanceof DeploymentEvent) {
+DeploymentEvent de = (DeploymentEvent)evt;
+
+return new VisorGridDeploymentEvent(type, id, name, nid, ts, msg,
shortDisplay, de.alias());
+}
+
+return null;
+}
+
+/** {@inheritDoc} */
+@Override public VisorGridEvent apply(Event evt) {
+return map(evt, evt.type(), evt.id(), evt.name(),
[02/50] [abbrv] incubator-ignite git commit: sprint-1: moved cache projection to internal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 0082375..229cecf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5603,7 +5603,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/**
- * Internal callable which performs {@link
org.apache.ignite.cache.CacheProjection#clearLocally()}
+ * Internal callable which performs {@link CacheProjection#clearLocally()}
* operation on a cache with the given name.
*/
@GridInternal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
index de43ca5..3d47852 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java
index a4aa453..ff5676d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java
@@ -24,7 +24,7 @@ import java.util.*;
/**
* Enumeration of all supported cache peek modes. Peek modes can be passed
into various
* {@code 'CacheProjection.peek(..)'} and {@code Entry.peek(..)} methods,
- * such as {@link org.apache.ignite.cache.CacheProjection#peek(Object,
Collection)},
+ * such as {@link CacheProjection#peek(Object, Collection)},
* {@link org.apache.ignite.cache.Entry#peek()}, and others.
*
* The following modes are supported:
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
index cf7dc99..4e93122 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.dr.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
index 79eb978..4e185c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache.query;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.inte
[27/50] [abbrv] incubator-ignite git commit: # sprint-2 minor
# sprint-2 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e19e2e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e19e2e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e19e2e8
Branch: refs/heads/ignite-223
Commit: 7e19e2e82cb5b361c38d5a8a9f32ce43cc738a8a
Parents: 81a688d
Author: sboikov
Authored: Tue Feb 17 14:49:23 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 14:49:23 2015 +0300
--
.../testframework/junits/common/GridCommonAbstractTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e19e2e8/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 61cb3d7..5472aa9 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -451,7 +451,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
}
}
-throw new IgniteException("Unable to find " + cnt + " keys as backup
for cache.");
+throw new IgniteException("Unable to find " + cnt + " keys as primary
for cache.");
}
/**
@@ -533,7 +533,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
}
}
-throw new IgniteCheckedException("Unable to find " + cnt + " keys as
backup for cache.");
+throw new IgniteCheckedException("Unable to find " + cnt + " keys as
near for cache.");
}
/**
[05/50] [abbrv] incubator-ignite git commit: sprint-1: moved cache projection to internal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
deleted file mode 100644
index e26add4..000
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
+++ /dev/null
@@ -1,1925 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-import java.util.concurrent.*;
-
-/**
- * This interface provides a rich API for working with distributed caches. It
includes the following
- * main functionality:
- *
- *
- * Various {@code 'get(..)'} methods to synchronously or asynchronously get
values from cache.
- * All {@code 'get(..)'} methods are transactional and will participate in an
ongoing transaction
- * if there is one.
- *
- *
- * Various {@code 'put(..)'}, {@code 'putIfAbsent(..)'}, and {@code
'replace(..)'} methods to
- * synchronously or asynchronously put single or multiple entries into cache.
- * All these methods are transactional and will participate in an ongoing
transaction
- * if there is one.
- *
- *
- * Various {@code 'remove(..)'} methods to synchronously or asynchronously
remove single or multiple keys
- * from cache. All {@code 'remove(..)'} methods are transactional and will
participate in an ongoing transaction
- * if there is one.
- *
- *
- * Various {@code 'contains(..)'} method to check if cache contains certain
keys or values locally.
- *
- *
- * Various {@code 'forEach(..)'}, {@code 'forAny(..)'}, and {@code
'reduce(..)'} methods to visit
- * every local cache entry within this projection.
- *
- *
- * Various {@code flagsOn(..)'}, {@code 'flagsOff(..)'}, and {@code
'projection(..)'} methods to
- * set specific flags and filters on a cache projection.
- *
- *
- * Methods like {@code 'keySet(..)'}, {@code 'values(..)'}, and {@code
'entrySet(..)'} to provide
- * views on cache keys, values, and entries.
- *
- *
- * Various {@code 'peek(..)'} methods to peek at values in global or
transactional memory, swap
- * storage, or persistent storage.
- *
- *
- * Various {@code 'reload(..)'} methods to reload latest values from
persistent storage.
- *
- *
- * Various {@code 'promote(..)'} methods to load specified keys from swap
storage into
- * global cache memory.
- *
- *
- * Various {@code 'lock(..)'}, {@code 'unlock(..)'}, and {@code
'isLocked(..)'} methods to acquire, release,
- * and check on distributed locks on a single or multiple keys in cache. All
locking methods
- * are not transactional and will not enlist keys into ongoing transaction,
if any.
- *
- *
- * Various {@code 'clear(..)'} methods to clear elements from cache, and
optionally from
- * swap storage. All {@code 'clear(..)'} methods are not transactional and
will not enlist cleared
- * keys into ongoing transaction, if any.
- *
- *
- * Various {@code 'evict(..)'} methods to evict elements from cache, and
optionally store
- * them in underlying swap storage for later access. All {@code 'evict(..)'}
methods are not
- * transactional and will not enlist evicted keys into ongoing transaction,
if any.
- *
- *
- * Various {@code 'txStart(..)'} methods to perform various cache
- * operations within a transaction (see {@link Transaction} for more
information).
- *
- *
- * {@link #queries()} method to get an instance of {@link CacheQueries}
service for working
- * with distributed cache queries.
-
[07/50] [abbrv] incubator-ignite git commit: # sprint-1 restored check that queue can not be used with atomic cache in CLOCK mode
# sprint-1 restored check that queue can not be used with atomic cache in CLOCK
mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59264704
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59264704
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59264704
Branch: refs/heads/ignite-223
Commit: 5926470450dfe799849f722dadf7e0a100fc6be0
Parents: f27a989
Author: sboikov
Authored: Mon Feb 16 17:12:03 2015 +0300
Committer: sboikov
Committed: Mon Feb 16 17:12:03 2015 +0300
--
.../datastructures/IgniteQueueExample.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 15 ++-
.../IgniteDataStructureUniqueNameTest.java | 41
3 files changed, 56 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59264704/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
index 4219dd1..519d11a 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
@@ -36,7 +36,7 @@ import java.util.*;
*/
public class IgniteQueueExample {
/** Cache name. */
-private static final String CACHE_NAME = "partitioned";
+private static final String CACHE_NAME = "partitioned_tx";
/** Number of retries */
private static final int RETRIES = 20;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59264704/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 2b55ec5..a2d69fb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -38,6 +38,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.*;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.internal.processors.cache.CacheFlag.*;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
import static
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.*;
@@ -690,6 +691,8 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
if (ctx.cache().publicCache(cfg.getCacheName()) == null)
throw new IgniteCheckedException("Cache for collection is not
configured: " + cfg.getCacheName());
+
+
checkSupportsQueue(ctx.cache().internalCache(cfg.getCacheName()).context());
}
DataStructureInfo dsInfo = new DataStructureInfo(name,
@@ -1191,6 +1194,16 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
}
/**
+ * @param cctx Cache context.
+ * @throws IgniteCheckedException If {@link IgniteQueue} can with given
cache.
+ */
+private void checkSupportsQueue(GridCacheContext cctx) throws
IgniteCheckedException {
+if (cctx.atomic() && !cctx.isLocal() &&
cctx.config().getAtomicWriteOrderMode() == CLOCK)
+throw new IgniteCheckedException("IgniteQueue can not be used with
ATOMIC cache with CLOCK write order mode" +
+" (change write order mode to PRIMARY in configuration)");
+}
+
+/**
*
*/
static enum DataStructureType {
@@ -1261,7 +1274,7 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
// No-op.
}
-/*
+/**
* @param cacheName Collection cache name.
* @param collocated Collocated flag.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59264704/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
b/modules/core/src/test/java/org/
[25/50] [abbrv] incubator-ignite git commit: # sprint-2 Minor.
# sprint-2 Minor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7c57824
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7c57824
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7c57824
Branch: refs/heads/ignite-223
Commit: f7c5782473ead17a1fc460b637ba0b4b143552d9
Parents: 38e1389
Author: AKuznetsov
Authored: Tue Feb 17 17:21:17 2015 +0700
Committer: AKuznetsov
Committed: Tue Feb 17 17:21:17 2015 +0700
--
.../apache/ignite/internal/visor/cache/VisorCacheLoadTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7c57824/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
index 55e3f5e..5ec5b0e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
@@ -63,10 +63,10 @@ public class VisorCacheLoadTask extends
Map res = new HashMap<>();
-ExpiryPolicy policy = new CreatedExpiryPolicy(new
Duration(TimeUnit.MILLISECONDS, ttl));
+ExpiryPolicy plc = new CreatedExpiryPolicy(new
Duration(TimeUnit.MILLISECONDS, ttl));
for (String cacheName: cacheNames) {
-IgniteCache cache =
ignite.jcache(cacheName).withExpiryPolicy(policy);
+IgniteCache cache =
ignite.jcache(cacheName).withExpiryPolicy(plc);
cache.loadCache(null, ldrArgs);
[40/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-275' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275
Merge branches 'ignite-275' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-275 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60fa4a86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60fa4a86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60fa4a86 Branch: refs/heads/ignite-223 Commit: 60fa4a869ff61dacfaababefcfffde8d0b18f577 Parents: df008b2 c7dad84 Author: AKuznetsov Authored: Wed Feb 18 10:12:50 2015 +0700 Committer: AKuznetsov Committed: Wed Feb 18 10:12:50 2015 +0700 -- bin/include/target-classpath.bat| 4 +- bin/include/target-classpath.sh | 10 ++- .../IgniteAtomicSequenceExample.java| 35 +- .../internal/client/impl/GridClientImpl.java| 2 +- .../processors/cache/GridCacheAdapter.java | 4 ++ .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../security/GridSecurityContext.java | 9 ++- .../visor/cache/VisorCacheLoadTask.java | 35 -- .../near/IgniteCacheNearReadCommittedTest.java | 68 .../junits/common/GridCommonAbstractTest.java | 6 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 11 files changed, 123 insertions(+), 54 deletions(-) --
[35/50] [abbrv] incubator-ignite git commit: # sprint-2 minor
# sprint-2 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3a6c22f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3a6c22f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3a6c22f
Branch: refs/heads/ignite-223
Commit: e3a6c22f7e41b0b4171f12e3708eaf69a735cebc
Parents: 90e0560
Author: sboikov
Authored: Tue Feb 17 16:10:01 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 16:10:01 2015 +0300
--
.../org/apache/ignite/internal/client/impl/GridClientImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3a6c22f/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
index 9b9f22a..43dd479 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
@@ -409,7 +409,7 @@ public class GridClientImpl implements GridClient {
Class cls = Class.forName(ENT_CONN_MGR_CLS);
Constructor cons = cls.getConstructor(UUID.class,
SSLContext.class, GridClientConfiguration.class,
-Collection.class, GridClientTopology.class, Byte.class);
+Collection.class, GridClientTopology.class, Byte.class,
boolean.class);
mgr = (GridClientConnectionManager)cons.newInstance(clientId,
sslCtx, cfg, routers, top, marshId,
routerClient);
[01/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Repository: incubator-ignite Updated Branches: refs/heads/ignite-223 76b3c4705 -> 831f4efc0 Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56da893e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56da893e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56da893e Branch: refs/heads/ignite-223 Commit: 56da893e7d9470197d451bc51bacaf5bae672e03 Parents: 9b555ff a2b5123 Author: Artem Shutak Authored: Mon Feb 16 16:30:41 2015 +0300 Committer: Artem Shutak Committed: Mon Feb 16 16:30:41 2015 +0300 -- .../examples/datagrid/CacheQueryExample.java| 25 +- .../starschema/CacheStarSchemaExample.java | 11 +- .../datastructures/IgniteQueueExample.java |2 +- .../examples/ScalarCacheAffinityExample1.scala |6 +- .../examples/ScalarCacheAffinityExample2.scala |4 +- .../ScalarCacheAffinitySimpleExample.scala | 10 +- .../scalar/examples/ScalarCacheExample.scala| 49 +- .../ScalarCachePopularNumbersExample.scala | 13 +- .../examples/ScalarCacheQueryExample.scala | 48 +- .../examples/ScalarSnowflakeSchemaExample.scala | 37 +- .../src/main/java/org/apache/ignite/Ignite.java | 27 - .../apache/ignite/IgniteSystemProperties.java | 120 -- .../configuration/IgniteConfiguration.java | 353 --- .../ignite/internal/GridKernalContext.java |8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../ignite/internal/IgniteComponentType.java|7 - .../org/apache/ignite/internal/IgniteEx.java| 12 - .../apache/ignite/internal/IgniteKernal.java| 217 +- .../org/apache/ignite/internal/IgnitionEx.java | 49 - .../processors/cache/GridCacheAdapter.java |2 +- .../cache/GridCacheDeploymentManager.java | 33 +- .../continuous/CacheContinuousQueryManager.java | 49 +- .../processors/email/GridEmailHolder.java | 111 - .../email/IgniteEmailProcessorAdapter.java | 84 - .../email/IgniteNoopEmailProcessor.java | 55 - .../internal/processors/email/package.html | 24 - .../visor/node/VisorEmailConfiguration.java | 177 -- .../visor/node/VisorGridConfiguration.java | 18 - .../visor/node/VisorLifecycleConfiguration.java | 19 - .../ignite/startup/BasicWarmupClosure.java |6 +- .../GridCacheFieldsQueryNoDataSelfTest.java |4 +- .../cache/GridCacheOffHeapSelfTest.java |4 +- .../cache/GridCacheSwapPreloadSelfTest.java |3 +- .../IgniteClientAffinityAssignmentSelfTest.java |5 +- .../cache/IgnitePutAllLargeBatchSelfTest.java |8 +- ...tAllUpdateNonPreloadedPartitionSelfTest.java |4 +- .../cache/IgniteTxMultiNodeAbstractTest.java|3 +- ...dCacheMultithreadedFailoverAbstractTest.java |3 +- .../GridCacheNodeFailureAbstractTest.java |3 +- ...chePartitionedReloadAllAbstractSelfTest.java |8 +- ...ridCacheContinuousQueryAbstractSelfTest.java |4 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java |4 +- .../GridDataLoaderProcessorSelfTest.java|2 +- .../processors/igfs/IgfsCacheSelfTest.java |5 +- .../ignite/testframework/junits/IgniteMock.java | 10 - modules/email/licenses/apache-2.0.txt | 202 -- modules/email/pom.xml | 51 - modules/email/readme.txt| 34 - .../processors/email/IgniteEmailProcessor.java | 296 --- ...idHadoopDefaultMapReducePlannerSelfTest.java | 10 - ...idHibernateL2CacheConfigurationSelfTest.java |3 +- .../hibernate/GridHibernateL2CacheSelfTest.java |3 +- .../GridCacheAbstractFieldsQuerySelfTest.java |3 +- .../cache/GridCacheAbstractQuerySelfTest.java |5 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 12 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java |7 +- .../processors/cache/GridCacheSwapSelfTest.java |4 +- .../near/GridCachePartitionedQuerySelfTest.java |2 +- .../GridCacheReplicatedQuerySelfTest.java |6 +- .../ignite/scalar/ScalarConversions.scala | 47 +- .../ignite/scalar/pimps/ScalarCachePimp.scala | 662 +- .../pimps/ScalarCacheProjectionPimp.scala | 2004 -- .../scala/org/apache/ignite/scalar/scalar.scala | 25 +- .../tests/ScalarAffinityRoutingSpec.scala | 12 +- .../scalar/tests/ScalarCacheQueriesSpec.scala | 466 +--- .../ignite/scalar/tests/ScalarCacheSpec.scala | 10 +- .../org/apache/ignite/IgniteSpringBean.java | 20 +- .../ignite/cache/spring/SpringCacheManager.java |2 +- .../commands/alert/VisorAlertCommand.scala | 83 +- .../config/VisorConfigurationCommand.scala | 15 - .../commands/alert/VisorAlertCommandSpec.scala |1 - .../config/VisorConfigurationComman
[04/50] [abbrv] incubator-ignite git commit: sprint-1: moved cache projection to internal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
index d57e5e5..bb48ee4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.mxbean.*;
import org.apache.ignite.transactions.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 858dc3c..57583d4 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.cache.store.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.indexing.*;
import org.jetbrains.annotations.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f27a989c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
index 947d5df..50fb4d3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
@@ -25,10 +25,10 @@ import javax.cache.processor.*;
/**
* Cache projection flags that specify projection behaviour. This flags can be
explicitly passed into
- * the following methods on {@link org.apache.ignite.cache.CacheProjection}:
+ * the following methods on {@link CacheProjection}:
*
- * {@link
org.apache.ignite.cache.CacheProjection#flagsOn(CacheFlag...)}
- * {@link
org.apache.ignite.cache.CacheProjection#flagsOff(CacheFlag...)}
+ * {@link CacheProjection#flagsOn(CacheFlag...)}
+ * {@link CacheProjection#flagsOff(CacheFlag...)}
*
* Also, some flags, like {@link #LOCAL}, or {@link #READ} may be implicitly
set whenever
* creating new projections and passing entries to predicate filters.
[20/50] [abbrv] incubator-ignite git commit: # sprint-2 support portable in IsolatedUpdater
# sprint-2 support portable in IsolatedUpdater
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/862fac94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/862fac94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/862fac94
Branch: refs/heads/ignite-223
Commit: 862fac94ad9d7ca541d839e5f54dc051516cadcb
Parents: 684ed83
Author: sboikov
Authored: Tue Feb 17 11:52:05 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 11:52:05 2015 +0300
--
.../processors/dataload/IgniteDataLoaderImpl.java | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/862fac94/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index 5fcaac1..05799fe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -1403,13 +1403,23 @@ public class IgniteDataLoaderImpl implements
IgniteDataLoader, Delay
GridCacheVersion ver = cctx.versions().next(topVer);
+boolean portable = cctx.portableEnabled();
+
for (Map.Entry e : entries) {
try {
-GridCacheEntryEx entry =
internalCache.entryEx(e.getKey(), topVer);
+K key = e.getKey();
+V val = e.getValue();
+
+if (portable) {
+key = (K)cctx.marshalToPortable(key);
+val = (V)cctx.marshalToPortable(val);
+}
+
+GridCacheEntryEx entry = internalCache.entryEx(key,
topVer);
entry.unswap(true, false);
-entry.initialValue(e.getValue(), null, ver, 0, 0, false,
topVer, GridDrType.DR_LOAD);
+entry.initialValue(val, null, ver, 0, 0, false, topVer,
GridDrType.DR_LOAD);
cctx.evicts().touch(entry, topVer);
}
[41/50] [abbrv] incubator-ignite git commit: # IGNITE-249 Cleanup VisorEventsCommand class.
# IGNITE-249 Cleanup VisorEventsCommand class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1397067
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1397067
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1397067
Branch: refs/heads/ignite-223
Commit: f13970678a99adb3280f43d0da01c7e276ed219d
Parents: 60fa4a8
Author: AKuznetsov
Authored: Wed Feb 18 10:24:52 2015 +0700
Committer: AKuznetsov
Committed: Wed Feb 18 10:24:52 2015 +0700
--
.../visor/commands/events/VisorEventsCommand.scala| 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1397067/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index a928160..a5b0a73 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -72,7 +72,7 @@ import scala.language.implicitConversions
* Node ID8.
* Either '-id' or '-id8' can be specified.
* If called without the arguments - starts in interactive mode.
- * -e=
+ * -e=
* Comma separated list of event types that should be queried:
*ch Checkpoint events.
*de Deployment events.
@@ -83,9 +83,6 @@ import scala.language.implicitConversions
*ca Cache events.
*cp Cache pre-loader events.
*sw Swapspace events.
- *au Authentication events.
- az Authorization events.
- se Security session events.
* -t=s|m|h|d
* Defines time frame for querying events:
*=s Queries events fired during last seconds.
@@ -440,7 +437,7 @@ object VisorEventsCommand {
),
spec = List(
"events",
-"events {-id=|-id8=}
{-e=}",
+"events {-id=|-id8=}
{-e=}",
"{-t=s|m|h|d} {-s=e|t} {-r} {-c=}"
),
args = List(
@@ -455,7 +452,7 @@ object VisorEventsCommand {
"you can also use '@n0' ... '@nn' variables as shortcut to
.",
"If called without the arguments - starts in interactive mode."
),
-"-e=" -> List(
+"-e=" -> List(
"Comma separated list of event types that should be queried:",
" ch Checkpoint events.",
" de Deployment events.",
@@ -464,10 +461,7 @@ object VisorEventsCommand {
" ta Task execution events.",
" ca Cache events.",
" cp Cache pre-loader events.",
-" sw Swapspace events.",
-" au Authentication events.",
-" az Authorization events.",
-" se Security session events."
+" sw Swapspace events."
),
"-t=s|m|h|d" -> List(
"Defines time frame for quering events:",
[34/50] [abbrv] incubator-ignite git commit: # sprint-2 added test for IGNITE-285
# sprint-2 added test for IGNITE-285
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/90e0560f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90e0560f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90e0560f
Branch: refs/heads/ignite-223
Commit: 90e0560f2da7efe2c13168bd9474c18278fd57bc
Parents: 8e54ccd
Author: sboikov
Authored: Tue Feb 17 15:43:42 2015 +0300
Committer: sboikov
Committed: Tue Feb 17 15:43:42 2015 +0300
--
.../near/IgniteCacheNearReadCommittedTest.java | 68
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +
2 files changed, 71 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90e0560f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
new file mode 100644
index 000..8de0509
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.transactions.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
+
+/**
+ *
+ */
+public class IgniteCacheNearReadCommittedTest extends
GridCacheAbstractSelfTest {
+/** {@inheritDoc} */
+@Override protected int gridCount() {
+return 2;
+}
+
+/** {@inheritDoc} */
+@Override protected CacheDistributionMode distributionMode() {
+return CacheDistributionMode.NEAR_PARTITIONED;
+}
+
+/** {@inheritDoc} */
+@Override protected CacheMode cacheMode() {
+return PARTITIONED;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testReadCommittedCacheCleanup() throws Exception {
+IgniteCache cache = ignite(0).jcache(null);
+
+Integer key = backupKey(cache);
+
+cache.put(key, key);
+
+try (Transaction tx = ignite(0).transactions().txStart(PESSIMISTIC,
READ_COMMITTED)) {
+assertEquals(key, cache.get(key));
+
+tx.commit();
+}
+
+ignite(1).jcache(null).remove(key); // Remove from primary node.
+
+assertEquals(0, cache.localSize());
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90e0560f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index d081eaf..df9ffab 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -393,6 +393,9 @@ public class IgniteCacheTestSuite extends TestSuite {
// suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class);
// suite.addTestSuite(GridCacheVersionMultinodeTest.class);
+// TODO IGNITE-285.
+// suite.addTestSuite(IgniteCacheNearReadCommittedTest.class);
+
return suite;
}
}
[33/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e54ccde Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e54ccde Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e54ccde Branch: refs/heads/ignite-223 Commit: 8e54ccdeeec1d622465bdb98e9f4e5d06c66d6e1 Parents: 0865ad4 0dda33a Author: sboikov Authored: Tue Feb 17 15:25:14 2015 +0300 Committer: sboikov Committed: Tue Feb 17 15:25:14 2015 +0300 -- .../IgniteAtomicSequenceExample.java| 35 +--- 1 file changed, 15 insertions(+), 20 deletions(-) --
[39/50] [abbrv] incubator-ignite git commit: # sprint-2 Fixed Visor task prefix.
# sprint-2 Fixed Visor task prefix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7dad84f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7dad84f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7dad84f
Branch: refs/heads/ignite-223
Commit: c7dad84fb3b8ee6d2199e23644f2335837781b70
Parents: 3021ef8
Author: anovikov
Authored: Wed Feb 18 10:02:56 2015 +0700
Committer: anovikov
Committed: Wed Feb 18 10:02:56 2015 +0700
--
.../internal/processors/security/GridSecurityContext.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7dad84f/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
index e112c62..b8057c6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityContext.java
@@ -30,8 +30,11 @@ public class GridSecurityContext implements Externalizable {
/** */
private static final long serialVersionUID = 0L;
-/** Visor tasks prefix. */
-private static final String VISOR_TASK_PREFIX =
"org.apache.ignite.internal.visor.";
+/** Visor ignite tasks prefix. */
+private static final String VISOR_IGNITE_TASK_PREFIX =
"org.apache.ignite.internal.visor.";
+
+/** Visor gridgain tasks prefix. */
+private static final String VISOR_GRIDGAIN_TASK_PREFIX =
"org.gridgain.grid.internal.visor.";
/** Cache query task name. */
public static final String VISOR_CACHE_QUERY_TASK_NAME =
@@ -168,7 +171,7 @@ public class GridSecurityContext implements Externalizable {
* @return {@code True} if task is Visor task.
*/
private boolean visorTask(String taskCls) {
-return taskCls.startsWith(VISOR_TASK_PREFIX);
+return taskCls.startsWith(VISOR_IGNITE_TASK_PREFIX) ||
taskCls.startsWith(VISOR_GRIDGAIN_TASK_PREFIX);
}
/**
[46/50] [abbrv] incubator-ignite git commit: # ignite-283: Method renamings.
# ignite-283: Method renamings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb2b1786
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb2b1786
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb2b1786
Branch: refs/heads/ignite-223
Commit: eb2b1786efa6f261f70ec7aa610d8368b5b62f96
Parents: c5a15a1
Author: vozerov-gridgain
Authored: Wed Feb 18 13:09:33 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Feb 18 13:09:33 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 16 ++-
.../processors/cache/GridCacheMapEntry.java | 6 ++--
.../processors/cache/GridCacheProjectionEx.java | 8 +++---
.../cache/GridCacheProjectionImpl.java | 16 +--
.../processors/cache/GridCacheProxyImpl.java| 16 +--
.../processors/cache/GridCacheUtils.java| 30 ++--
.../dht/atomic/GridDhtAtomicCache.java | 12
.../distributed/near/GridNearAtomicCache.java | 16 +--
.../cache/version/GridCacheVersion.java | 4 +--
.../cache/version/GridCacheVersionEx.java | 2 +-
.../dr/GridDrDataLoadCacheUpdater.java | 4 +--
.../ignite/internal/util/IgniteUtils.java | 2 +-
12 files changed, 73 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb2b1786/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 9d8f243..cba8b1c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2472,7 +2472,8 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void putAllDr(final Map>
drMap) throws IgniteCheckedException {
+@Override public void putAllConflict(final Map> drMap)
+throws IgniteCheckedException {
if (F.isEmpty(drMap))
return;
@@ -2486,13 +2487,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDr [drMap=" + drMap + ']';
+return "putAllConflict [drMap=" + drMap + ']';
}
});
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture putAllDrAsync(final Map> drMap)
+@Override public IgniteInternalFuture putAllConflictAsync(final Map> drMap)
throws IgniteCheckedException {
if (F.isEmpty(drMap))
return new GridFinishedFuture(ctx.kernalContext());
@@ -2507,7 +2508,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "putAllDrAsync [drMap=" + drMap + ']';
+return "putAllConflictAsync [drMap=" + drMap + ']';
}
});
}
@@ -3379,7 +3380,8 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/** {@inheritDoc} */
-@Override public void removeAllDr(final Map
drMap) throws IgniteCheckedException {
+@Override public void removeAllConflict(final Map drMap)
+throws IgniteCheckedException {
ctx.denyOnLocalRead();
if (F.isEmpty(drMap))
@@ -3393,13 +3395,13 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override public String toString() {
-return "removeAllDr [drMap=" + drMap + ']';
+return "removeAllConflict [drMap=" + drMap + ']';
}
});
}
/** {@inheritDoc} */
-@Override public IgniteInternalFuture removeAllDrAsync(final Map drMap)
+@Override public IgniteInternalFuture removeAllConflictAsync(final
Map drMap)
throws IgniteCheckedException {
ctx.denyOnLocalRead();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb2b1786/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 dc0fa59..dcdc0d9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/
[36/50] [abbrv] incubator-ignite git commit: sprint-2: minor
sprint-2: minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04b0880c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04b0880c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04b0880c Branch: refs/heads/ignite-223 Commit: 04b0880c06c7d9b297a8b73aead50bb430dfccc0 Parents: 0dda33a Author: Yakov Zhdanov Authored: Tue Feb 17 16:54:13 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Feb 17 16:54:13 2015 +0300 -- .../internal/processors/cache/distributed/dht/GridDhtGetFuture.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04b0880c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java index 989cc5e..0be5b97 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java @@ -30,7 +30,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; -import javax.cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*;
