incubator-ignite git commit: #ignite-51: add javadoc for IgniteImmutable.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-51 c454acf31 -> 9251494e2 #ignite-51: add javadoc for IgniteImmutable. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9251494e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9251494e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9251494e Branch: refs/heads/ignite-51 Commit: 9251494e2891cd37fa253209fd76fb668cfbcd79 Parents: c454acf Author: ivasilinets Authored: Fri Mar 6 13:24:47 2015 +0300 Committer: ivasilinets Committed: Fri Mar 6 13:24:47 2015 +0300 -- .../src/main/java/org/apache/ignite/cache/IgniteImmutable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9251494e/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java b/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java index 8a750c8..46a9a10 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java @@ -20,7 +20,7 @@ package org.apache.ignite.cache; import java.lang.annotation.*; /** - * + * Annotation for ignite immutable objects. */ @Documented @Retention(RetentionPolicy.RUNTIME)
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-51' into ignite-51
Merge remote-tracking branch 'origin/ignite-51' into ignite-51 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2168c942 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2168c942 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2168c942 Branch: refs/heads/ignite-51 Commit: 2168c942440cbf576dac3def9b8c40df48fbc659 Parents: cbfc327 9251494 Author: sboikov Authored: Fri Mar 6 13:28:22 2015 +0300 Committer: sboikov Committed: Fri Mar 6 13:28:22 2015 +0300 -- .../main/java/org/apache/ignite/cache/IgniteImmutable.java | 2 +- .../ignite/internal/processors/cache/GridCacheMessage.java | 9 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) --
[1/2] incubator-ignite git commit: # ignite-51
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 9251494e2 -> 2168c9424
# ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cbfc3276
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cbfc3276
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cbfc3276
Branch: refs/heads/ignite-51
Commit: cbfc3276f4193c4e7a912813cdd8ba7932920604
Parents: ed11001
Author: sboikov
Authored: Fri Mar 6 12:57:40 2015 +0300
Committer: sboikov
Committed: Fri Mar 6 13:27:38 2015 +0300
--
.../processors/cache/CacheEntryPredicate.java | 5 +++
.../cache/CacheEntryPredicateAdapter.java | 22 +
.../cache/CacheEntryPredicateContainsValue.java | 4 +--
.../cache/CacheEntryPredicateHasValue.java | 2 +-
.../cache/CacheEntryPredicateNoValue.java | 2 +-
.../cache/CacheEntrySerializablePredicate.java | 11 +--
.../processors/cache/GridCacheContext.java | 33
.../processors/cache/GridCacheMapEntry.java | 4 +--
.../processors/cache/GridCacheUtils.java| 13 +++-
.../dht/atomic/GridDhtAtomicCache.java | 2 +-
.../local/atomic/GridLocalAtomicCache.java | 2 +-
.../cache/GridCacheMemoryModeSelfTest.java | 8 ++---
12 files changed, 85 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbfc3276/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
index d1cf231..53e5ce3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
@@ -37,4 +37,9 @@ public interface CacheEntryPredicate extends
IgnitePredicate,
* @throws IgniteCheckedException If failed.
*/
public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws
IgniteCheckedException;
+
+/**
+ * @param locked Entry locked
+ */
+public void entryLocked(boolean locked);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbfc3276/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
index ef4cd3b..dad6d6b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.plugin.extensions.communication.*;
+import org.jetbrains.annotations.*;
import java.nio.*;
@@ -26,6 +27,9 @@ import java.nio.*;
*
*/
public abstract class CacheEntryPredicateAdapter implements
CacheEntryPredicate {
+/** */
+protected transient boolean locked;
+
/** {@inheritDoc} */
@Override public void finishUnmarshal(GridCacheContext ctx, ClassLoader
ldr) throws IgniteCheckedException {
// No-op.
@@ -37,6 +41,11 @@ public abstract class CacheEntryPredicateAdapter implements
CacheEntryPredicate
}
/** {@inheritDoc} */
+@Override public void entryLocked(boolean locked) {
+this.locked = locked;
+}
+
+/** {@inheritDoc} */
@Override public byte directType() {
assert false : this;
@@ -63,4 +72,17 @@ public abstract class CacheEntryPredicateAdapter implements
CacheEntryPredicate
return false;
}
+
+/**
+ * @param entry Entry.
+ * @return Value.
+ */
+@Nullable protected CacheObject peekVisibleValue(GridCacheEntryEx entry) {
+try {
+return locked ? entry.rawGetOrUnmarshal(true) :
entry.peekVisibleValue();
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException(e);
+}
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbfc3276/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
--
diff --git
a/modules/core/src/main/jav
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-51-client-test [created] 2fdb49fc1
incubator-ignite git commit: ignite-release-test fixed plugin url
Repository: incubator-ignite
Updated Branches:
refs/heads/to-be-removed [created] 8285e90ee
ignite-release-test fixed plugin url
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8285e90e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8285e90e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8285e90e
Branch: refs/heads/to-be-removed
Commit: 8285e90ee2f8f813fa587aace25943c56fca3fde
Parents: 8759f8b
Author: avinogradov
Authored: Fri Mar 6 13:15:30 2015 +0300
Committer: avinogradov
Committed: Fri Mar 6 13:15:30 2015 +0300
--
.../org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8285e90e/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
--
diff --git
a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
index ea1cca8..70e123d 100644
---
a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
+++
b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
@@ -30,7 +30,7 @@ import java.util.*;
*/
public class GridJavadocAntTask extends MatchingTask {
/** */
-private static final String SH_URL =
"http://gridgain.com/wp-content/plugins/syntaxhighlighter/syntaxhighlighter3";;
+private static final String SH_URL =
"http://agorbatchev.typepad.com/pub/sh/3_0_83";;
/** Directory. */
private File dir;
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/to-be-removed [deleted] 8285e90ee
incubator-ignite git commit: # IGNITE-143: Reverting fix to ensure that this is really it.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-143 7fe6c27b4 -> 18a3ddba4
# IGNITE-143: Reverting fix to ensure that this is really it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18a3ddba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18a3ddba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18a3ddba
Branch: refs/heads/ignite-143
Commit: 18a3ddba42b2c2b2848ebe226ba398e312884ca2
Parents: 7fe6c27
Author: vozerov-gridgain
Authored: Fri Mar 6 13:37:49 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 13:37:49 2015 +0300
--
.../ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18a3ddba/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
index 2357d1a..0b1f22d 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
@@ -465,7 +465,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
return (T)res.response();
}
-catch (IgfsException | IgniteCheckedException e) {
+catch (IgniteCheckedException e) {
throw new GridClosureException(e);
}
}
incubator-ignite git commit: # ignite-51
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 2168c9424 -> af7cc24b7
# ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af7cc24b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af7cc24b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af7cc24b
Branch: refs/heads/ignite-51
Commit: af7cc24b7829e8b13337f69f342b2d2a76e8c6c1
Parents: 2168c94
Author: sboikov
Authored: Fri Mar 6 13:40:44 2015 +0300
Committer: sboikov
Committed: Fri Mar 6 13:40:44 2015 +0300
--
.../org/apache/ignite/internal/util/F0.java | 31 +++-
1 file changed, 30 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af7cc24b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
index a7faa0a..859077b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
@@ -157,6 +157,22 @@ public class F0 {
return true;
}
+
+@Override public void entryLocked(boolean locked) {
+if (p1 != null) {
+for (CacheEntryPredicate p : p1) {
+if (p != null)
+p.entryLocked(locked);
+}
+}
+
+if (p2 != null) {
+for (CacheEntryPredicate p : p2) {
+if (p != null)
+p.entryLocked(locked);
+}
+}
+}
});
}
@@ -184,12 +200,25 @@ public class F0 {
if (p != null && !p.apply(e))
return false;
-for (CacheEntryPredicate p : ps)
+for (CacheEntryPredicate p : ps) {
if (p != null && !p.apply(e))
return false;
+}
return true;
}
+
+@Override public void entryLocked(boolean locked) {
+assert ps != null;
+
+if (p != null)
+p.entryLocked(locked);
+
+for (CacheEntryPredicate p : ps) {
+if (p != null)
+p.entryLocked(locked);
+}
+}
});
}
incubator-ignite git commit: # IGNITE-143: Hadoop/IGFS fix.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-143 18a3ddba4 -> 6a96fd406
# IGNITE-143: Hadoop/IGFS fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a96fd40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a96fd40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a96fd40
Branch: refs/heads/ignite-143
Commit: 6a96fd40656d56140a4859164dc1c843b40ea00d
Parents: 18a3ddb
Author: vozerov-gridgain
Authored: Fri Mar 6 13:46:48 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 13:46:48 2015 +0300
--
.../ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a96fd40/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
index 0b1f22d..2357d1a 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
@@ -465,7 +465,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
return (T)res.response();
}
-catch (IgniteCheckedException e) {
+catch (IgfsException | IgniteCheckedException e) {
throw new GridClosureException(e);
}
}
[2/2] incubator-ignite git commit: Merge branch 'ignite-51-client-test' into ignite-51
Merge branch 'ignite-51-client-test' into ignite-51
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9123d479
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9123d479
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9123d479
Branch: refs/heads/ignite-51
Commit: 9123d47940cefe6fbaae0b385ecc57a5d83a80c0
Parents: af7cc24 2fdb49f
Author: nikolay_tikhonov
Authored: Fri Mar 6 13:59:16 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Mar 6 13:59:16 2015 +0300
--
.../processors/cache/GridCacheContext.java | 8 ++
.../cache/GridCacheProjectionImpl.java | 2 +-
.../org/apache/ignite/internal/util/F0.java | 28
3 files changed, 37 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9123d479/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9123d479/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
--
diff --cc modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
index 859077b,cc8e967..14509e8
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
@@@ -158,21 -159,21 +159,37 @@@ public class F0
return true;
}
+@Override public void entryLocked(boolean locked) {
+if (p1 != null) {
+for (CacheEntryPredicate p : p1) {
+if (p != null)
+p.entryLocked(locked);
+}
+}
+
+if (p2 != null) {
+for (CacheEntryPredicate p : p2) {
+if (p != null)
+p.entryLocked(locked);
+}
+}
+}
++
+ @Override public void prepareMarshal(GridCacheContext ctx) throws
IgniteCheckedException {
+ if (!e1) {
+ assert p1 != null;
+
+ for (CacheEntryPredicate p : p1)
+ p.prepareMarshal(ctx);
+ }
+
+ if (!e2) {
+ assert p2 != null;
+
+ for (CacheEntryPredicate p : p2)
+ p.prepareMarshal(ctx);
+ }
+ }
});
}
@@@ -208,17 -208,16 +225,28 @@@
return true;
}
+@Override public void entryLocked(boolean locked) {
+assert ps != null;
+
+if (p != null)
+p.entryLocked(locked);
+
+for (CacheEntryPredicate p : ps) {
+if (p != null)
+p.entryLocked(locked);
+}
+}
++
+ @Override public void prepareMarshal(GridCacheContext ctx) throws
IgniteCheckedException {
+ assert ps != null;
+
+ if (p != null)
+ p.prepareMarshal(ctx);
+
+ for (CacheEntryPredicate p : ps)
+ if (p != null)
+ p.prepareMarshal(ctx);
+ }
});
}
[1/2] incubator-ignite git commit: IGNITE-51 Fixed JettyRestProcessorSelfTest
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 af7cc24b7 -> 9123d4794
IGNITE-51 Fixed JettyRestProcessorSelfTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2fdb49fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2fdb49fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2fdb49fc
Branch: refs/heads/ignite-51
Commit: 2fdb49fc16621997ef139c68b69e4f9e7845c25d
Parents: 31f2c0d
Author: nikolay_tikhonov
Authored: Fri Mar 6 12:41:24 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Mar 6 12:41:24 2015 +0300
--
.../processors/cache/GridCacheContext.java | 8 ++
.../cache/GridCacheProjectionImpl.java | 2 +-
.../org/apache/ignite/internal/util/F0.java | 28
3 files changed, 37 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fdb49fc/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 05ae513..37f3af7 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
@@ -988,6 +988,14 @@ public class GridCacheContext implements
Externalizable {
}
/**
+ * @param val Value to check.
+ * @return Predicate that checks for value.
+ */
+public CacheEntryPredicate equalsValue(V val) {
+return new CacheEntryPredicateContainsValue(toCacheObject(val));
+}
+
+/**
* @return Empty cache version array.
*/
public GridCacheVersion[] emptyVersion() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fdb49fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 19aa08e..a91488f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -736,7 +736,7 @@ public class GridCacheProjectionImpl implements
GridCacheProjectionEx replaceAsync(K key, V
oldVal, V newVal) {
-CacheEntryPredicate fltr = and(cctx.equalsValArray(oldVal));
+CacheEntryPredicate fltr = this.filter != null ?
and(cctx.equalsValArray(oldVal)) : cctx.equalsValue(oldVal);
return cache.putxAsync(key, newVal, fltr);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fdb49fc/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
index a7faa0a..cc8e967 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.util;
+import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -157,6 +158,22 @@ public class F0 {
return true;
}
+
+@Override public void prepareMarshal(GridCacheContext ctx) throws
IgniteCheckedException {
+if (!e1) {
+assert p1 != null;
+
+for (CacheEntryPredicate p : p1)
+p.prepareMarshal(ctx);
+}
+
+if (!e2) {
+assert p2 != null;
+
+for (CacheEntryPredicate p : p2)
+p.prepareMarshal(ctx);
+}
+}
});
}
@@ -190,6 +207,17 @@ public class F0 {
return true;
}
+
+@Override public void prepareMarshal(GridCacheContext ctx) throws
IgniteCheckedException {
+assert ps != null;
+
+if (p != null)
+p.prepareMarshal(ctx);
+
+for (CacheEntryPredica
incubator-ignite git commit: futures: api cleanup - fixing tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-143 6a96fd406 -> a14d0f363
futures: api cleanup - fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a14d0f36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a14d0f36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a14d0f36
Branch: refs/heads/ignite-143
Commit: a14d0f36319eae0183ddc36cbf375e9c73ccf13f
Parents: 6a96fd4
Author: Yakov Zhdanov
Authored: Fri Mar 6 14:04:22 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Mar 6 14:04:22 2015 +0300
--
.../internal/processors/cache/GridCacheAdapter.java | 8
.../internal/processors/cache/GridCacheGateway.java | 6 ++
.../internal/processors/cache/GridCacheIoManager.java | 2 +-
.../ignite/internal/processors/cache/GridCacheUtils.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxLocalAdapter.java | 4 ++--
.../processors/cache/transactions/IgniteTxManager.java| 10 +-
.../cache/GridCacheReferenceCleanupSelfTest.java | 2 +-
8 files changed, 21 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a14d0f36/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 c2f67b1..fe95935 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
@@ -4467,7 +4467,7 @@ public abstract class GridCacheAdapter implements
GridCache,
saveFuture(holder, f);
-ctx.tm().txContextReset();
+ctx.tm().resetContext();
return f;
}
@@ -4602,10 +4602,10 @@ public abstract class GridCacheAdapter implements
GridCache,
throw e;
}
finally {
-ctx.tm().txContextReset();
+ctx.tm().resetContext();
if (ctx.isNear())
-ctx.near().dht().context().tm().txContextReset();
+ctx.near().dht().context().tm().resetContext();
}
}
else
@@ -4714,7 +4714,7 @@ public abstract class GridCacheAdapter implements
GridCache,
saveFuture(holder, f);
if (tx.implicit())
-ctx.tm().txContextReset();
+ctx.tm().resetContext();
return f;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a14d0f36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 2de235a..ce603fd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -73,6 +73,9 @@ public class GridCacheGateway {
*/
public void leave() {
try {
+ctx.tm().resetContext();
+ctx.mvcc().contextReset();
+
// Unwind eviction notifications.
CU.unwindEvicts(ctx);
}
@@ -142,6 +145,9 @@ public class GridCacheGateway {
*/
public void leave(GridCacheProjectionImpl prev) {
try {
+ctx.tm().resetContext();
+ctx.mvcc().contextReset();
+
// Unwind eviction notifications.
CU.unwindEvicts(ctx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a14d0f36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index de82f35..0a9344e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -306,7 +306,7 @@ public clas
[3/3] incubator-ignite git commit: # IGNITE-379 Remove Transaction.*meta*() methods.
# IGNITE-379 Remove Transaction.*meta*() methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ec04dfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ec04dfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ec04dfb
Branch: refs/heads/ignite-379-1
Commit: 1ec04dfb17a158a5c13c193dd2dea1022fbe94f5
Parents: 34800f6
Author: sevdokimov
Authored: Thu Mar 5 14:19:57 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 5 14:19:57 2015 +0300
--
.../cache/transactions/TransactionEx.java | 54
.../transactions/TransactionProxyImpl.java | 2 +-
.../apache/ignite/transactions/Transaction.java | 29 ---
.../GridCacheAbstractLocalStoreSelfTest.java| 2 +-
4 files changed, 56 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec04dfb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
new file mode 100644
index 000..7c21575
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
@@ -0,0 +1,54 @@
+/*
+ * 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.transactions;
+
+import org.apache.ignite.transactions.*;
+
+/**
+ *
+ */
+public interface TransactionEx extends Transaction {
+/**
+ * Removes metadata by name.
+ *
+ * @param name Name of the metadata to remove.
+ * @param Type of the value.
+ * @return Value of removed metadata or {@code null}.
+ */
+public V removeMeta(String name);
+
+/**
+ * Gets metadata by name.
+ *
+ * @param name Metadata name.
+ * @param Type of the value.
+ * @return Metadata value or {@code null}.
+ */
+public V meta(String name);
+
+/**
+ * Adds a new metadata.
+ *
+ * @param name Metadata name.
+ * @param val Metadata value.
+ * @param Type of the value.
+ * @return Metadata previously associated with given name, or
+ * {@code null} if there was none.
+ */
+public V addMeta(String name, V val);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec04dfb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
index 95f54a1..32bf346 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
@@ -33,7 +33,7 @@ import java.util.*;
/**
* Cache transaction proxy.
*/
-public class TransactionProxyImpl implements TransactionProxy,
Externalizable {
+public class TransactionProxyImpl implements TransactionProxy,
TransactionEx, Externalizable {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec04dfb/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
b/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
index e2fc42d..cbb17e4 100644
--- a/modules/core/src/main/java/org/apache
[2/3] incubator-ignite git commit: # IGNITE-379 Added the test that checks injection @CacheStoreSessionResource to parent class.
# IGNITE-379 Added the test that checks injection @CacheStoreSessionResource to
parent 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/34800f63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/34800f63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/34800f63
Branch: refs/heads/ignite-379-1
Commit: 34800f636a46a2eb0145cfda45279f66f09ad9c4
Parents: e19e002
Author: sevdokimov
Authored: Thu Mar 5 13:28:45 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 5 13:28:45 2015 +0300
--
.../IgniteCacheStoreSessionAbstractTest.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34800f63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
index ae00ba4..d261a44 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
@@ -216,7 +216,7 @@ public abstract class IgniteCacheStoreSessionAbstractTest
extends IgniteCacheAbs
* @param expProps Expected properties.
* @param expCacheName Expected cache name.
*/
-public ExpectedData(boolean tx, String expMtd, Map
expProps, String expCacheName) {
+ExpectedData(boolean tx, String expMtd, Map expProps,
String expCacheName) {
this.tx = tx;
this.expMtd = expMtd;
this.expProps = expProps;
@@ -227,7 +227,16 @@ public abstract class IgniteCacheStoreSessionAbstractTest
extends IgniteCacheAbs
/**
*
*/
-private class TestStore implements CacheStore {
+private static class AbstractStore {
+/** */
+@CacheStoreSessionResource
+protected CacheStoreSession sesInParent;
+}
+
+/**
+ *
+ */
+private class TestStore extends AbstractStore implements
CacheStore {
/** Auto-injected store session. */
@CacheStoreSessionResource
private CacheStoreSession ses;
@@ -324,6 +333,8 @@ public abstract class IgniteCacheStoreSessionAbstractTest
extends IgniteCacheAbs
assertNotNull(ses);
+assertSame(ses, sesInParent);
+
if (exp.tx)
assertNotNull(ses.transaction());
else
[1/3] incubator-ignite git commit: # ignite-379 rename CacheStore.txEnd() -> CacheStore.sessionEnd(). (cherry picked from commit b477999)
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-379-1 [created] 1ec04dfb1
# ignite-379 rename CacheStore.txEnd() -> CacheStore.sessionEnd().
(cherry picked from commit b477999)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e19e002e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e19e002e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e19e002e
Branch: refs/heads/ignite-379-1
Commit: e19e002e95257fb16165bf5c6b136e0495e5c073
Parents: 27d7d67
Author: sevdokimov
Authored: Mon Mar 2 15:11:39 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 5 13:27:39 2015 +0300
--
.../hibernate/CacheHibernatePersonStore.java| 2 +-
.../store/jdbc/CacheJdbcPersonStore.java| 2 +-
.../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +-
.../apache/ignite/cache/store/CacheStore.java | 2 +-
.../ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../ignite/cache/store/CacheStoreSession.java | 2 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java| 2 +-
.../cache/CacheStoreBalancingWrapper.java | 4 +--
.../cache/GridCacheLoaderWriterStore.java | 2 +-
.../processors/cache/GridCacheStoreManager.java | 2 +-
.../cache/GridCacheWriteBehindStore.java| 2 +-
.../store/GridCacheBalancingStoreSelfTest.java | 2 +-
.../cache/store/GridGeneratingTestStore.java| 2 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 2 +-
.../store/jdbc/CacheJdbcPojoStoreTest.java | 35 ++--
...idCacheConfigurationConsistencySelfTest.java | 2 +-
.../cache/GridCacheGenericTestStore.java| 2 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 2 +-
.../cache/GridCacheStorePutxSelfTest.java | 2 +-
.../processors/cache/GridCacheTestStore.java| 2 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +-
.../IgniteCrossCacheTxStoreSelfTest.java| 6 ++--
.../IgniteCacheStoreSessionAbstractTest.java| 6 ++--
.../IgniteCacheTxStoreSessionTest.java | 14
.../cache/GridAbstractCacheStoreSelfTest.java | 34 +--
.../hibernate/CacheHibernateBlobStore.java | 2 +-
27 files changed, 70 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e19e002e/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index 9549598..98c6b8a 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -202,7 +202,7 @@ public class CacheHibernatePersonStore extends
CacheStoreAdapter {
}
/** {@inheritDoc} */
-@Override public void txEnd(boolean commit) {
+@Override public void sessionEnd(boolean commit) {
CacheStoreSession storeSes = session();
Transaction tx = storeSes.transaction();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e19e002e/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index 55ba1a7..0c920f4 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -70,7 +70,7 @@ public class CacheJdbcPersonStore extends
CacheStoreAdapter {
}
/** {@inheritDoc} */
-@Override public void txEnd(boolean commit) {
+@Override public void sessionEnd(boolean commit) {
Map props = ses.properties();
try (Connection conn = props.remove(ATTR_NAME)) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e19e002e/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.j
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-51-client-test [deleted] 2fdb49fc1
[2/3] incubator-ignite git commit: #ignite-51: Fix class GridCacheEntryInfo.
#ignite-51: Fix class GridCacheEntryInfo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f3c2404
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f3c2404
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f3c2404
Branch: refs/heads/ignite-51
Commit: 9f3c240422e63a91bbe01e10024ef3ef3da257e5
Parents: 1f62056
Author: ivasilinets
Authored: Fri Mar 6 14:17:10 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 6 14:17:10 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheEntryInfo.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f3c2404/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index c3a5530..012b9b4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -63,6 +63,9 @@ public class GridCacheEntryInfo implements Message {
@GridDirectTransient
private boolean deleted;
+/** */
+private static final int SIZE_OVERHEAD = 3 * 8 /* reference */ + 4 /* int
*/ + 2 * 8 /* long */ + 32 /* version */;
+
/**
* @return Cache ID.
*/
@@ -333,7 +336,8 @@ public class GridCacheEntryInfo implements Message {
* @throws IgniteCheckedException If failed.
*/
public void unmarshalValue(GridCacheContext ctx, ClassLoader ldr)
throws IgniteCheckedException {
-val.finishUnmarshal(ctx.cacheObjectContext(), ldr);
+if (val != null)
+val.finishUnmarshal(ctx.cacheObjectContext(), ldr);
}
/**
@@ -355,7 +359,7 @@ public class GridCacheEntryInfo implements Message {
else
size += key.valueBytes(cacheObjCtx).length;
-return size;
+return SIZE_OVERHEAD + size;
}
/**
[1/3] incubator-ignite git commit: #ignite-51: Fix class GridCacheEntryInfo.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 9123d4794 -> 7c2cde3b7
#ignite-51: Fix class GridCacheEntryInfo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1f620567
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f620567
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f620567
Branch: refs/heads/ignite-51
Commit: 1f62056779c9138fccd0ff7e1fa79067f2d711db
Parents: 9251494
Author: ivasilinets
Authored: Fri Mar 6 13:59:34 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 6 13:59:34 2015 +0300
--
.../processors/cache/GridCacheEntryInfo.java| 104 +++
1 file changed, 17 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f620567/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index a1b1a2e..c3a5530 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -24,13 +24,12 @@ import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.plugin.extensions.communication.*;
-import java.io.*;
import java.nio.*;
/**
* Entry information that gets passed over wire.
*/
-public class GridCacheEntryInfo implements Externalizable, Message {
+public class GridCacheEntryInfo implements Message {
/** */
private static final long serialVersionUID = 0L;
@@ -334,16 +333,13 @@ public class GridCacheEntryInfo implements
Externalizable, Message {
* @throws IgniteCheckedException If failed.
*/
public void unmarshalValue(GridCacheContext ctx, ClassLoader ldr)
throws IgniteCheckedException {
-// TODO IGNITE-51
-//if (val == null && valBytes != null)
-//val = ctx.marshaller().unmarshal(valBytes, ldr);
+val.finishUnmarshal(ctx.cacheObjectContext(), ldr);
}
/**
* @return Marshalled size.
*/
public int marshalledSize(GridCacheContext ctx) throws
IgniteCheckedException {
-// TODO IGNITE-51.
int size = 0;
CacheObjectContext cacheObjCtx = ctx.cacheObjectContext();
@@ -367,7 +363,6 @@ public class GridCacheEntryInfo implements Externalizable,
Message {
* @throws IgniteCheckedException In case of error.
*/
public void marshal(GridCacheContext ctx) throws IgniteCheckedException {
-// TODO IGNITE-51: field 'remaining'.
assert key != null ^ keyBytes != null;
if (key != null)
@@ -375,6 +370,15 @@ public class GridCacheEntryInfo implements Externalizable,
Message {
if (val != null)
val.prepareMarshal(ctx.cacheObjectContext());
+
+if (expireTime == 0)
+expireTime = -1;
+else {
+expireTime = expireTime - U.currentTimeMillis();
+
+if (expireTime < 0)
+expireTime = 0;
+}
}
/**
@@ -399,92 +403,18 @@ public class GridCacheEntryInfo implements
Externalizable, Message {
if (val != null)
val.finishUnmarshal(ctx.cacheObjectContext(), clsLdr);
-}
-/** {@inheritDoc} */
-@Override public void writeExternal(ObjectOutput out) throws IOException {
-// TODO IGNITE-51.
-//out.writeInt(cacheId);
-//out.writeBoolean(keyBytesSent);
-//out.writeBoolean(valBytesSent);
-//
-//if (keyBytesSent)
-//IgniteByteUtils.writeByteArray(out, keyBytes);
-//else
-//out.writeObject(key);
-//
-//if (valBytesSent)
-//IgniteByteUtils.writeByteArray(out, valBytes);
-//else {
-//if (val != null && val instanceof byte[]) {
-//out.writeBoolean(true);
-//
-//IgniteByteUtils.writeByteArray(out, (byte[]) val);
-//}
-//else {
-//out.writeBoolean(false);
-//
-//out.writeObject(val);
-//}
-//}
-//
-//out.writeLong(ttl);
-//
-//long remaining;
-//
-//// 0 means never expires.
-//if (expireTime == 0)
-//remaining = -1;
-//else {
-//remaining = expireTime - U.currentTimeMillis();
-//
-//if (remaining < 0)
-//remaining = 0;
-//}
-//
-//// Write remaining time.
[3/3] incubator-ignite git commit: Merge branch 'ignite-51' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51
Merge branch 'ignite-51' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c2cde3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c2cde3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c2cde3b Branch: refs/heads/ignite-51 Commit: 7c2cde3b7f151e43278a7b96660d19acb7cf7760 Parents: 9f3c240 9123d47 Author: ivasilinets Authored: Fri Mar 6 14:17:48 2015 +0300 Committer: ivasilinets Committed: Fri Mar 6 14:17:48 2015 +0300 -- .../processors/cache/CacheEntryPredicate.java | 5 ++ .../cache/CacheEntryPredicateAdapter.java | 22 .../cache/CacheEntryPredicateContainsValue.java | 4 +- .../cache/CacheEntryPredicateHasValue.java | 2 +- .../cache/CacheEntryPredicateNoValue.java | 2 +- .../cache/CacheEntrySerializablePredicate.java | 11 +++- .../processors/cache/GridCacheContext.java | 41 ++ .../processors/cache/GridCacheMapEntry.java | 4 +- .../cache/GridCacheProjectionImpl.java | 2 +- .../processors/cache/GridCacheUtils.java| 13 ++--- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 2 +- .../org/apache/ignite/internal/util/F0.java | 59 +++- .../cache/GridCacheMemoryModeSelfTest.java | 8 +-- 14 files changed, 152 insertions(+), 25 deletions(-) --
[1/3] incubator-ignite git commit: ignite-release-test fixed plugin url
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-release-test-no-mod 8759f8b65 -> 868ac4460
ignite-release-test fixed plugin url
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8285e90e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8285e90e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8285e90e
Branch: refs/heads/ignite-release-test-no-mod
Commit: 8285e90ee2f8f813fa587aace25943c56fca3fde
Parents: 8759f8b
Author: avinogradov
Authored: Fri Mar 6 13:15:30 2015 +0300
Committer: avinogradov
Committed: Fri Mar 6 13:15:30 2015 +0300
--
.../org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8285e90e/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
--
diff --git
a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
index ea1cca8..70e123d 100644
---
a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
+++
b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
@@ -30,7 +30,7 @@ import java.util.*;
*/
public class GridJavadocAntTask extends MatchingTask {
/** */
-private static final String SH_URL =
"http://gridgain.com/wp-content/plugins/syntaxhighlighter/syntaxhighlighter3";;
+private static final String SH_URL =
"http://agorbatchev.typepad.com/pub/sh/3_0_83";;
/** Directory. */
private File dir;
[3/3] incubator-ignite git commit: ignite-release-test javadoc fix
ignite-release-test javadoc fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/868ac446
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/868ac446
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/868ac446
Branch: refs/heads/ignite-release-test-no-mod
Commit: 868ac446086fe038efd190ce33b99dfdf9ed2221
Parents: 33413ab
Author: avinogradov
Authored: Fri Mar 6 14:20:54 2015 +0300
Committer: avinogradov
Committed: Fri Mar 6 14:20:54 2015 +0300
--
parent/pom.xml | 390 +++-
pom.xml| 190 -
2 files changed, 200 insertions(+), 380 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/868ac446/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c7a83c0..01b2fe4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -268,6 +268,206 @@
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+2.9.1
+
+
+
+
org.apache.ignite.tools.javadoc.IgniteLinkTaglet
+
+org.apache.ignite
+ignite-tools
+RELEASE
+
+
+
+Ignite ${project.version}
+Ignite ${project.version}
+true
+true
+protected
+true
+false
+false
+1.7
+
+
http://docs.oracle.com/javase/7/docs/api/
+
http://hadoop.apache.org/docs/current/api/
+
+
+
+Common Grid APIs
+
+
org.apache.ignite:org.apache.ignite.cluster:org.apache.ignite.lifecycle:org.apache.ignite.configuration:org.apache.ignite.spi:org.apache.ignite.lang:org.apache.ignite.resources:org.apache.ignite.thread:org.apache.ignite.scheduler
+
+
+
+Messaging APIs
+
org.apache.ignite.messaging
+
+
+Event Notification APIs
+org.apache.ignite.events
+
+
+Compute Grid APIs
+org.apache.ignite.compute*
+
+
+Data Grid APIs
+
+
org.apache.ignite.cache*:org.apache.ignite.transactions:org.apache.ignite.datastructures:org.apache.ignite.dataload
+
+
+
+Service Grid APIs
+org.apache.ignite.services
+
+
+File System APIs
+org.apache.ignite.igfs*
+
+
+Hadoop Accelerator APIs
+org.apache.ignite.hadoop*
+
+
+Streaming APIs
+
org.apache.ignite.streamer*
+
+
+Security APIs
+
org.apache.ignite.plugin.security
+
+
+MXBeans classes
+
org.apache.ignite.mbean:org.apache.ignite.mxbean
+
+
+SPI: CheckPoint
+
org.apache.ignite.spi.checkpoint*
+
+
+SPI: Collision
+
[2/3] incubator-ignite git commit: ignite-release-test javadoc fix
ignite-release-test javadoc fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/33413abb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/33413abb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/33413abb Branch: refs/heads/ignite-release-test-no-mod Commit: 33413abb9cfca7639a2886a0bfe3ff0bb61eadd0 Parents: 8285e90 Author: avinogradov Authored: Fri Mar 6 13:58:17 2015 +0300 Committer: avinogradov Committed: Fri Mar 6 13:58:17 2015 +0300 -- parent/pom.xml | 88 ++--- 1 file changed, 29 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33413abb/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index a7704e0..c7a83c0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -531,9 +531,7 @@ Common Grid APIs - - org.apache.ignite:org.apache.ignite.cluster:org.apache.ignite.lifecycle:org.apache.ignite.configuration:org.apache.ignite.spi:org.apache.ignite.lang:org.apache.ignite.resources:org.apache.ignite.thread:org.apache.ignite.scheduler - + org.apache.ignite:org.apache.ignite.cluster:org.apache.ignite.lifecycle:org.apache.ignite.configuration:org.apache.ignite.spi:org.apache.ignite.lang:org.apache.ignite.resources:org.apache.ignite.thread:org.apache.ignite.scheduler Messaging APIs @@ -545,35 +543,27 @@ Compute Grid APIs - - org.apache.ignite.compute:org.apache.ignite.compute.gridify:org.apache.ignite.compute.gridify.aop:org.apache.ignite.compute.gridify.aop.aspectj:org.apache.ignite.compute.gridify.aop.spring - + org.apache.ignite.compute* Data Grid APIs - - org.apache.ignite.cache:org.apache.ignite.transactions:org.apache.ignite.datastructures:org.apache.ignite.cache.store:org.apache.ignite.cache.store.hibernate:org.apache.ignite.cache.store.jdbc:org.apache.ignite.cache.query:org.apache.ignite.cache.query.annotations:org.apache.ignite.cache.affinity:org.apache.ignite.cache.affinity.consistenthash:org.apache.ignite.cache.affinity.rendezvous:org.apache.ignite.cache.affinity.fair:org.apache.ignite.cache.eviction:org.apache.ignite.cache.eviction.fifo:org.apache.ignite.cache.eviction.igfs:org.apache.ignite.cache.eviction.lru:org.apache.ignite.cache.eviction.random:org.apache.ignite.cache.jta:org.apache.ignite.cache.jta.jndi:org.apache.ignite.cache.jta.reflect:org.apache.ignite.cache.websession:org.apache.ignite.cache.hibernate:org.apache.ignite.dataload - + org.apache.ignite.cache*:org.apache.ignite.transactions:org.apache.ignite.datastructures:org.apache.ignite.dataload Service Grid APIs org.apache.ignite.services -Ignite File System - org.apache.ignite.igfs +File System APIs + org.apache.ignite.igfs* Hadoop Accelerator APIs - - org.apache.ignite.igfs.hadoop:org.apache.ignite.igfs.hadoop.v1:org.apache.ignite.igfs.hadoop.v2:org.apache.ignite.igfs.mapreduce:org.apache.ignite.igfs.mapreduce.records:org.apache.ignite.hadoop - +
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-no-mod-1 [created] 868ac4460
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-branch-3 [created] 481c6a409
incubator-ignite git commit: [maven-release-plugin] prepare branch ignite-release-test-branch-3
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-no-mod-1 868ac4460 -> 481c6a409 [maven-release-plugin] prepare branch ignite-release-test-branch-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/481c6a40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/481c6a40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/481c6a40 Branch: refs/heads/ignite-release-test-no-mod-1 Commit: 481c6a40955569b3067220fd4523580c2abe0c62 Parents: 868ac44 Author: avinogradov Authored: Fri Mar 6 14:42:10 2015 +0300 Committer: avinogradov Committed: Fri Mar 6 14:42:10 2015 +0300 -- examples/pom.xml | 4 modules/aop/pom.xml | 4 modules/aws/pom.xml | 4 modules/clients/pom.xml | 4 modules/codegen/pom.xml | 4 modules/core/pom.xml | 4 modules/extdata/p2p/pom.xml | 4 modules/extdata/uri/pom.xml | 4 modules/geospatial/pom.xml| 4 modules/hadoop/pom.xml| 4 modules/hibernate/pom.xml | 4 modules/indexing/pom.xml | 4 modules/jcl/pom.xml | 4 modules/jta/pom.xml | 4 modules/log4j/pom.xml | 4 modules/rest-http/pom.xml | 4 modules/scalar/pom.xml| 4 modules/schedule/pom.xml | 4 modules/schema-load/pom.xml | 4 modules/slf4j/pom.xml | 4 modules/spring/pom.xml| 4 modules/ssh/pom.xml | 4 modules/tools/pom.xml | 4 modules/urideploy/pom.xml | 4 modules/visor-console/pom.xml | 4 modules/visor-plugins/pom.xml | 4 modules/web/pom.xml | 4 pom.xml | 2 +- 28 files changed, 109 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index ce5cd29..5214923 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -216,4 +216,8 @@ + + +ignite-release-test-branch-3 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0128500..0a52a68 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -100,4 +100,8 @@ + + +ignite-release-test-branch-3 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 2e73b5a..1c13426 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -72,4 +72,8 @@ test + + +ignite-release-test-branch-3 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index cfdac0d..0cf1d4d 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -107,4 +107,8 @@ + + +ignite-release-test-branch-3 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 55bc49a..279a776 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -46,4 +46,8 @@ 1.0.0-RELEASE-TEST-SNAPSHOT + + +ignite-release-test-branch-3 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index de26b60..f6f9d39 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -241,4 +241,8 @@ + + +ignite-release-test-branch-3 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/modules/extdata/p2p/pom.xml -- diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml index b1fd26a..c1368f6 100644 --- a/modules/extdata/p2p/pom.xml +++ b/modules/extdata/p2p/pom.xml @@ -93,4 +93,8 @@ + + +ignite-release-test-branch-3 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481c6a40/modules/extdata/uri/pom.xml
incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-no-mod-1 481c6a409 -> 7637a7837 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7637a783 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7637a783 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7637a783 Branch: refs/heads/ignite-release-test-no-mod-1 Commit: 7637a783748384b17b33b07e1b3b54be70d999e9 Parents: 481c6a4 Author: avinogradov Authored: Fri Mar 6 14:42:20 2015 +0300 Committer: avinogradov Committed: Fri Mar 6 14:42:20 2015 +0300 -- examples/pom.xml | 22 +- modules/aop/pom.xml | 12 modules/aws/pom.xml | 10 +++--- modules/clients/pom.xml | 16 ++-- modules/codegen/pom.xml | 8 ++-- modules/core/pom.xml | 8 ++-- modules/extdata/p2p/pom.xml | 10 +++--- modules/extdata/uri/pom.xml | 10 +++--- modules/geospatial/pom.xml| 10 +++--- modules/hadoop/pom.xml| 14 +- modules/hibernate/pom.xml | 12 modules/indexing/pom.xml | 10 +++--- modules/jcl/pom.xml | 10 +++--- modules/jta/pom.xml | 10 +++--- modules/log4j/pom.xml | 10 +++--- modules/rest-http/pom.xml | 8 ++-- modules/scalar/pom.xml| 14 +- modules/schedule/pom.xml | 10 +++--- modules/schema-load/pom.xml | 8 ++-- modules/slf4j/pom.xml | 8 ++-- modules/spring/pom.xml| 14 +- modules/ssh/pom.xml | 14 +- modules/tools/pom.xml | 6 +- modules/urideploy/pom.xml | 12 modules/visor-console/pom.xml | 14 +- modules/visor-plugins/pom.xml | 8 ++-- modules/web/pom.xml | 14 +- pom.xml | 4 ++-- 28 files changed, 99 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7637a783/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 5214923..085c6ec 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -40,31 +40,31 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-hibernate -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-spring -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-indexing -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -154,7 +154,7 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test-jar test @@ -162,7 +162,7 @@ org.apache.ignite ignite-schedule -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test @@ -189,7 +189,7 @@ org.apache.ignite ignite-scalar -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -216,8 +216,4 @@ - - -ignite-release-test-branch-3 - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7637a783/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0a52a68..ffdcbab 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,13 +31,13 @@ ignite-aop -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -73,14 +73,14 @@ org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test org.apache.ignite ignite-core -1.0.
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-no-mod-1 [deleted] 7637a7837
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-branch-3 [deleted] 481c6a409
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1-branch [created] 2448e41c8
incubator-ignite git commit: [maven-release-plugin] prepare branch ignite-release-test-1-branch
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1 [created] 2448e41c8 [maven-release-plugin] prepare branch ignite-release-test-1-branch Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2448e41c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2448e41c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2448e41c Branch: refs/heads/ignite-release-test-1 Commit: 2448e41c8b0c9f44c18cb2e6265eeeb783a9e15f Parents: 868ac44 Author: avinogradov Authored: Fri Mar 6 14:47:48 2015 +0300 Committer: avinogradov Committed: Fri Mar 6 14:47:48 2015 +0300 -- examples/pom.xml | 4 modules/aop/pom.xml | 4 modules/aws/pom.xml | 4 modules/clients/pom.xml | 4 modules/codegen/pom.xml | 4 modules/core/pom.xml | 4 modules/extdata/p2p/pom.xml | 4 modules/extdata/uri/pom.xml | 4 modules/geospatial/pom.xml| 4 modules/hadoop/pom.xml| 4 modules/hibernate/pom.xml | 4 modules/indexing/pom.xml | 4 modules/jcl/pom.xml | 4 modules/jta/pom.xml | 4 modules/log4j/pom.xml | 4 modules/rest-http/pom.xml | 4 modules/scalar/pom.xml| 4 modules/schedule/pom.xml | 4 modules/schema-load/pom.xml | 4 modules/slf4j/pom.xml | 4 modules/spring/pom.xml| 4 modules/ssh/pom.xml | 4 modules/tools/pom.xml | 4 modules/urideploy/pom.xml | 4 modules/visor-console/pom.xml | 4 modules/visor-plugins/pom.xml | 4 modules/web/pom.xml | 4 pom.xml | 2 +- 28 files changed, 109 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index ce5cd29..9fb94f1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -216,4 +216,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0128500..9f91745 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -100,4 +100,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 2e73b5a..643c729 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -72,4 +72,8 @@ test + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index cfdac0d..f8dafb9 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -107,4 +107,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 55bc49a..b219873 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -46,4 +46,8 @@ 1.0.0-RELEASE-TEST-SNAPSHOT + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index de26b60..d61066c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -241,4 +241,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/modules/extdata/p2p/pom.xml -- diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml index b1fd26a..4e39d6d 100644 --- a/modules/extdata/p2p/pom.xml +++ b/modules/extdata/p2p/pom.xml @@ -93,4 +93,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2448e41c/modules/extdata/uri/pom.xml -
incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1 2448e41c8 -> 1c56e1cf8 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c56e1cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c56e1cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c56e1cf Branch: refs/heads/ignite-release-test-1 Commit: 1c56e1cf8b1ecc62c8a260a1a1a98556a8646731 Parents: 2448e41 Author: avinogradov Authored: Fri Mar 6 14:47:58 2015 +0300 Committer: avinogradov Committed: Fri Mar 6 14:47:58 2015 +0300 -- examples/pom.xml | 22 +- modules/aop/pom.xml | 12 modules/aws/pom.xml | 10 +++--- modules/clients/pom.xml | 16 ++-- modules/codegen/pom.xml | 8 ++-- modules/core/pom.xml | 8 ++-- modules/extdata/p2p/pom.xml | 10 +++--- modules/extdata/uri/pom.xml | 10 +++--- modules/geospatial/pom.xml| 10 +++--- modules/hadoop/pom.xml| 14 +- modules/hibernate/pom.xml | 12 modules/indexing/pom.xml | 10 +++--- modules/jcl/pom.xml | 10 +++--- modules/jta/pom.xml | 10 +++--- modules/log4j/pom.xml | 10 +++--- modules/rest-http/pom.xml | 8 ++-- modules/scalar/pom.xml| 14 +- modules/schedule/pom.xml | 10 +++--- modules/schema-load/pom.xml | 8 ++-- modules/slf4j/pom.xml | 8 ++-- modules/spring/pom.xml| 14 +- modules/ssh/pom.xml | 14 +- modules/tools/pom.xml | 6 +- modules/urideploy/pom.xml | 12 modules/visor-console/pom.xml | 14 +- modules/visor-plugins/pom.xml | 8 ++-- modules/web/pom.xml | 14 +- pom.xml | 4 ++-- 28 files changed, 99 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c56e1cf/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 9fb94f1..d5a02db 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -40,31 +40,31 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-hibernate -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-spring -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-indexing -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -154,7 +154,7 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT test-jar test @@ -162,7 +162,7 @@ org.apache.ignite ignite-schedule -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT test @@ -189,7 +189,7 @@ org.apache.ignite ignite-scalar -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -216,8 +216,4 @@ - - -ignite-release-test-1-branch - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c56e1cf/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 9f91745..81b6923 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,13 +31,13 @@ ignite-aop -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -73,14 +73,14 @@ org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1-branch [deleted] 2448e41c8
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1 [deleted] 1c56e1cf8
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1 [created] 868ac4460
[1/2] incubator-ignite git commit: # ignite-51
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 7c2cde3b7 -> 8a5bc2803
# ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/efd4d5ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/efd4d5ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/efd4d5ae
Branch: refs/heads/ignite-51
Commit: efd4d5aee7dd11adf0d2405247e524d0065e4051
Parents: 7c2cde3
Author: sboikov
Authored: Fri Mar 6 14:32:36 2015 +0300
Committer: sboikov
Committed: Fri Mar 6 14:32:36 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheEntryInfo.java | 6 +++---
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../cache/distributed/near/GridNearTxPrepareResponse.java | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efd4d5ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index 012b9b4..8f47e0f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -31,6 +31,9 @@ import java.nio.*;
*/
public class GridCacheEntryInfo implements Message {
/** */
+private static final int SIZE_OVERHEAD = 3 * 8 /* reference */ + 4 /* int
*/ + 2 * 8 /* long */ + 32 /* version */;
+
+/** */
private static final long serialVersionUID = 0L;
/** Cache key. */
@@ -63,9 +66,6 @@ public class GridCacheEntryInfo implements Message {
@GridDirectTransient
private boolean deleted;
-/** */
-private static final int SIZE_OVERHEAD = 3 * 8 /* reference */ + 4 /* int
*/ + 2 * 8 /* long */ + 32 /* version */;
-
/**
* @return Cache ID.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efd4d5ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index cb4c777..3d29e21 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -500,7 +500,7 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundIdentityFutu
this.err.get() == null ? tx.commitAsync() :
tx.rollbackAsync();
fut.listenAsync(new
CIX1>() {
-@Override public void
applyx(IgniteInternalFuture gridCacheTxGridFuture) {
+@Override public void
applyx(IgniteInternalFuture fut) {
try {
if (replied.compareAndSet(false, true))
sendPrepareResponse(res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efd4d5ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 711c01f..c7460d9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -97,6 +97,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
* @param miniId Mini future ID.
* @param dhtVer DHT version.
* @param invalidParts Invalid partitions.
+ * @param retVal Return value.
* @param err Error.
*/
public GridNearTxPrepareResponse(
[2/2] incubator-ignite git commit: # ignite-51
# ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8a5bc280
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8a5bc280
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8a5bc280
Branch: refs/heads/ignite-51
Commit: 8a5bc28035f36634aec5d1c73c1adfcd214bcc4f
Parents: efd4d5a
Author: sboikov
Authored: Fri Mar 6 14:55:06 2015 +0300
Committer: sboikov
Committed: Fri Mar 6 14:55:06 2015 +0300
--
.../org/apache/ignite/testsuites/IgniteCacheTestSuite.java| 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5bc280/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 9988e6e..fd5965c 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
@@ -277,8 +277,11 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedPreloadLifecycleSelfTest.class);
suite.addTestSuite(GridCacheSyncReplicatedPreloadSelfTest.class);
// suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class);
TODO: uncomment when fix GG-2239
-suite.addTestSuite(GridCacheDeploymentSelfTest.class);
-suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class);
+
+// TODO IGNITE-51
+//suite.addTestSuite(GridCacheDeploymentSelfTest.class);
+//suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class);
+
suite.addTestSuite(GridCachePutArrayValueSelfTest.class);
suite.addTestSuite(GridCacheReplicatedUnswapAdvancedSelfTest.class);
suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class);
incubator-ignite git commit: # FIxed NPE in IgniteUtils.resolveIgniteUrl() (2).
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 e986b62f2 -> 623709395
# FIxed NPE in IgniteUtils.resolveIgniteUrl() (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/62370939
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62370939
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62370939
Branch: refs/heads/sprint-2
Commit: 623709395072a61a3ed4164e1895a845c52dff02
Parents: e986b62
Author: vozerov-gridgain
Authored: Fri Mar 6 15:13:15 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 15:13:15 2015 +0300
--
.../java/org/apache/ignite/internal/util/IgniteUtils.java | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62370939/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 7f366aa..24d2f8a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3208,11 +3208,15 @@ public abstract class IgniteUtils {
}
}
-String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
-
ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
-return clsLdr != null ? clsLdr.getResource(locPath) : null;
+if (clsLdr != null) {
+String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
+
+return clsLdr.getResource(locPath);
+}
+else
+return null;
}
/**
incubator-ignite git commit: # FIxed NPE in IgniteUtils.resolveIgniteUrl().
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 13bd63186 -> e986b62f2
# FIxed NPE in IgniteUtils.resolveIgniteUrl().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e986b62f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e986b62f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e986b62f
Branch: refs/heads/sprint-2
Commit: e986b62f2e5a29210fcf9f4b57e5fddc9559bfd8
Parents: 13bd631
Author: vozerov-gridgain
Authored: Fri Mar 6 15:12:07 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 15:12:07 2015 +0300
--
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e986b62f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 79b2171..7f366aa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3210,7 +3210,9 @@ public abstract class IgniteUtils {
String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
-return
Thread.currentThread().getContextClassLoader().getResource(locPath);
+ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
+
+return clsLdr != null ? clsLdr.getResource(locPath) : null;
}
/**
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-321 [deleted] 4f0eb9b19
incubator-ignite git commit: # IGNITE-321 fix tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-321 [created] 99a22e203
# IGNITE-321 fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99a22e20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99a22e20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99a22e20
Branch: refs/heads/ignite-321
Commit: 99a22e2038e5160d75507843e2c689739103853c
Parents: 13bd631
Author: sevdokimov
Authored: Fri Mar 6 15:18:35 2015 +0300
Committer: sevdokimov
Committed: Fri Mar 6 15:18:35 2015 +0300
--
.../processors/cache/GridCacheUtils.java| 2 +-
.../cache/GridCacheWriteBehindStore.java| 4 ++--
.../ignite/internal/util/IgniteUtils.java | 20 ++--
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8
.../ignite/testframework/GridTestUtils.java | 2 +-
5 files changed, 26 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index b07c14e..dcdf13e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1785,7 +1785,7 @@ public class GridCacheUtils {
*/
@NotNull public static CacheException
convertToCacheException(IgniteCheckedException e) {
if (e.hasCause(CacheWriterException.class))
-return new CacheWriterException(e);
+return new CacheWriterException(U.convertExceptionLight(e));
if (e instanceof CachePartialUpdateCheckedException)
return new
CachePartialUpdateException((CachePartialUpdateCheckedException)e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
index eb6120a..63a72e3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
@@ -433,7 +433,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache(entry.getKey(), entry, StoreOperation.PUT);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(e);
+throw new CacheWriterException(U.convertExceptionLight(e));
}
}
@@ -453,7 +453,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache((K)key, null, StoreOperation.RMV);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(e);
+throw new CacheWriterException(U.convertExceptionLight(e));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 79b2171..a4b6617 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -299,7 +299,7 @@ public abstract class IgniteUtils {
exceptionConverters;
/** */
-private volatile static IgniteBiTuple,
Collection> cachedLocalAddr;
+private static volatile IgniteBiTuple,
Collection> cachedLocalAddr;
/**
* Initializes enterprise check.
@@ -616,6 +616,22 @@ public abstract class IgniteUtils {
* @param e Ignite checked exception.
* @return Ignite runtime exception.
*/
+public static Exception convertExceptionLight(IgniteCheckedException e) {
+C1 converter =
exceptionConverters.get(e.getClass());
+
+if (converter != null)
+return converter.apply(e);
+
+if (e
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1-branch [created] 309b4acd9
incubator-ignite git commit: [maven-release-plugin] prepare branch ignite-release-test-1-branch
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1 868ac4460 -> 309b4acd9 [maven-release-plugin] prepare branch ignite-release-test-1-branch Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/309b4acd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/309b4acd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/309b4acd Branch: refs/heads/ignite-release-test-1 Commit: 309b4acd9e02e130009c413aea23cfa7c1746a88 Parents: 868ac44 Author: Gridgain Teamcity Authored: Fri Mar 6 15:21:00 2015 +0300 Committer: Gridgain Teamcity Committed: Fri Mar 6 15:21:00 2015 +0300 -- examples/pom.xml | 4 modules/aop/pom.xml | 4 modules/aws/pom.xml | 4 modules/clients/pom.xml | 4 modules/codegen/pom.xml | 4 modules/core/pom.xml | 4 modules/extdata/p2p/pom.xml | 4 modules/extdata/uri/pom.xml | 4 modules/geospatial/pom.xml| 4 modules/hadoop/pom.xml| 4 modules/hibernate/pom.xml | 4 modules/indexing/pom.xml | 4 modules/jcl/pom.xml | 4 modules/jta/pom.xml | 4 modules/log4j/pom.xml | 4 modules/rest-http/pom.xml | 4 modules/scalar/pom.xml| 4 modules/schedule/pom.xml | 4 modules/schema-load/pom.xml | 4 modules/slf4j/pom.xml | 4 modules/spring/pom.xml| 4 modules/ssh/pom.xml | 4 modules/tools/pom.xml | 4 modules/urideploy/pom.xml | 4 modules/visor-console/pom.xml | 4 modules/visor-plugins/pom.xml | 4 modules/web/pom.xml | 4 pom.xml | 2 +- 28 files changed, 109 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index ce5cd29..9fb94f1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -216,4 +216,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0128500..9f91745 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -100,4 +100,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 2e73b5a..643c729 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -72,4 +72,8 @@ test + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index cfdac0d..f8dafb9 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -107,4 +107,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 55bc49a..b219873 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -46,4 +46,8 @@ 1.0.0-RELEASE-TEST-SNAPSHOT + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index de26b60..d61066c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -241,4 +241,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/modules/extdata/p2p/pom.xml -- diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml index b1fd26a..4e39d6d 100644 --- a/modules/extdata/p2p/pom.xml +++ b/modules/extdata/p2p/pom.xml @@ -93,4 +93,8 @@ + + +ignite-release-test-1-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/309b4acd/modules/extdata/uri/pom.xml --
incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1 309b4acd9 -> 943daaf09 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/943daaf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/943daaf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/943daaf0 Branch: refs/heads/ignite-release-test-1 Commit: 943daaf091fdd816d78cd45a00c26f2c663c7f1e Parents: 309b4ac Author: Gridgain Teamcity Authored: Fri Mar 6 15:21:08 2015 +0300 Committer: Gridgain Teamcity Committed: Fri Mar 6 15:21:08 2015 +0300 -- examples/pom.xml | 22 +- modules/aop/pom.xml | 12 modules/aws/pom.xml | 10 +++--- modules/clients/pom.xml | 16 ++-- modules/codegen/pom.xml | 8 ++-- modules/core/pom.xml | 8 ++-- modules/extdata/p2p/pom.xml | 10 +++--- modules/extdata/uri/pom.xml | 10 +++--- modules/geospatial/pom.xml| 10 +++--- modules/hadoop/pom.xml| 14 +- modules/hibernate/pom.xml | 12 modules/indexing/pom.xml | 10 +++--- modules/jcl/pom.xml | 10 +++--- modules/jta/pom.xml | 10 +++--- modules/log4j/pom.xml | 10 +++--- modules/rest-http/pom.xml | 8 ++-- modules/scalar/pom.xml| 14 +- modules/schedule/pom.xml | 10 +++--- modules/schema-load/pom.xml | 8 ++-- modules/slf4j/pom.xml | 8 ++-- modules/spring/pom.xml| 14 +- modules/ssh/pom.xml | 14 +- modules/tools/pom.xml | 6 +- modules/urideploy/pom.xml | 12 modules/visor-console/pom.xml | 14 +- modules/visor-plugins/pom.xml | 8 ++-- modules/web/pom.xml | 14 +- pom.xml | 4 ++-- 28 files changed, 99 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/943daaf0/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 9fb94f1..085c6ec 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -40,31 +40,31 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-hibernate -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-spring -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-indexing -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -154,7 +154,7 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test-jar test @@ -162,7 +162,7 @@ org.apache.ignite ignite-schedule -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test @@ -189,7 +189,7 @@ org.apache.ignite ignite-scalar -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -216,8 +216,4 @@ - - -ignite-release-test-1-branch - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/943daaf0/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 9f91745..ffdcbab 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,13 +31,13 @@ ignite-aop -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -73,14 +73,14 @@ org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test org.apache.ignite ignite-core -1.0.0-
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1 [deleted] 943daaf09
[1/2] incubator-ignite git commit: sp-2 fixing tests
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 623709395 -> c5687d92f
sp-2 fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4eb97ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4eb97ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4eb97ce
Branch: refs/heads/sprint-2
Commit: d4eb97ce43e0d99ed272b838ca1bcfd55708e1f1
Parents: d47470c
Author: Yakov Zhdanov
Authored: Fri Mar 6 15:23:38 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Mar 6 15:23:38 2015 +0300
--
.../processors/cache/GridCacheProcessor.java| 10 +++--
...gniteProjectionStartStopRestartSelfTest.java | 42
2 files changed, 32 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4eb97ce/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 e76c922..20ad5e1 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
@@ -1727,9 +1727,13 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
* @param ldr Class loader.
*/
public void onUndeployed(ClassLoader ldr) {
-if (!ctx.isStopping())
-for (GridCacheAdapter cache : caches.values())
-cache.onUndeploy(ldr);
+if (!ctx.isStopping()) {
+for (GridCacheAdapter cache : caches.values()) {
+// Do not notify system caches.
+if (!cache.context().system() &&
!CU.isAtomicsCache(cache.context().name()))
+cache.onUndeploy(ldr);
+}
+}
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4eb97ce/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
index d4c5fc5..d6d87f9 100644
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
+++
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
@@ -119,9 +119,12 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
G.setDaemon(true);
-ignite = G.start(CFG_NO_ATTR);
-
-G.setDaemon(false);
+try {
+ignite = G.start(CFG_NO_ATTR);
+}
+finally {
+G.setDaemon(false);
+}
ignite.events().localListen(new IgnitePredicate() {
@Override public boolean apply(Event evt) {
@@ -132,7 +135,8 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
if (joinedLatch != null)
joinedLatch.countDown();
-} else if (evt.type() == EVT_NODE_LEFT) {
+}
+else if (evt.type() == EVT_NODE_LEFT) {
leftCnt.incrementAndGet();
if (leftLatch != null)
@@ -146,25 +150,29 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
-if (!ignite.cluster().nodes().isEmpty()) {
-leftLatch = new CountDownLatch(ignite.cluster().nodes().size());
+try {
+if (!ignite.cluster().nodes().isEmpty()) {
+leftLatch = new
CountDownLatch(ignite.cluster().nodes().size());
-ignite.cluster().stopNodes();
+ignite.cluster().stopNodes();
-assert leftLatch.await(WAIT_TIMEOUT, MILLISECONDS);
-}
-
-boolean wasEmpty = ignite.cluster().nodes().isEmpty();
+assert leftLatch.await(WAIT_TIMEOUT, MILLISECONDS);
+}
-G.stop(true);
+boolean wasEmpty = ignite.cluster().nodes().isEmpty();
-joinedCnt.set(0);
-leftCnt.set(0);
+joinedCnt.set(0);
+leftCnt.set(0);
-joinedLatch = null;
-leftLatch = null;
+joinedLatch = null;
+leftLatch = nul
[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/c5687d92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5687d92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5687d92 Branch: refs/heads/sprint-2 Commit: c5687d92f58bbdc6b0c330d20ae1bbebe8cf208f Parents: d4eb97c 6237093 Author: Yakov Zhdanov Authored: Fri Mar 6 15:23:50 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Mar 6 15:23:50 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 ++- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 10 -- 2 files changed, 10 insertions(+), 3 deletions(-) --
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-1-branch [deleted] 309b4acd9
[5/5] incubator-ignite git commit: Merge branches 'ignite-143' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-futures-cleanup-1
Merge branches 'ignite-143' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-futures-cleanup-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/07abc0a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07abc0a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07abc0a0 Branch: refs/heads/ignite-143 Commit: 07abc0a0dec2f6ff96803c9e0986990cffbb187f Parents: a14d0f3 c5687d9 Author: Yakov Zhdanov Authored: Fri Mar 6 15:25:15 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Mar 6 15:25:15 2015 +0300 -- .../processors/cache/GridCacheProcessor.java| 10 +++-- .../ignite/internal/util/IgniteUtils.java | 10 - ...gniteProjectionStartStopRestartSelfTest.java | 42 3 files changed, 40 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07abc0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07abc0a0/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java --
[4/5] 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/c5687d92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5687d92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5687d92 Branch: refs/heads/ignite-143 Commit: c5687d92f58bbdc6b0c330d20ae1bbebe8cf208f Parents: d4eb97c 6237093 Author: Yakov Zhdanov Authored: Fri Mar 6 15:23:50 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Mar 6 15:23:50 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 ++- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 10 -- 2 files changed, 10 insertions(+), 3 deletions(-) --
[2/5] incubator-ignite git commit: # FIxed NPE in IgniteUtils.resolveIgniteUrl() (2).
# FIxed NPE in IgniteUtils.resolveIgniteUrl() (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/62370939
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62370939
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62370939
Branch: refs/heads/ignite-143
Commit: 623709395072a61a3ed4164e1895a845c52dff02
Parents: e986b62
Author: vozerov-gridgain
Authored: Fri Mar 6 15:13:15 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 15:13:15 2015 +0300
--
.../java/org/apache/ignite/internal/util/IgniteUtils.java | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62370939/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 7f366aa..24d2f8a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3208,11 +3208,15 @@ public abstract class IgniteUtils {
}
}
-String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
-
ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
-return clsLdr != null ? clsLdr.getResource(locPath) : null;
+if (clsLdr != null) {
+String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
+
+return clsLdr.getResource(locPath);
+}
+else
+return null;
}
/**
[1/5] incubator-ignite git commit: # FIxed NPE in IgniteUtils.resolveIgniteUrl().
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-143 a14d0f363 -> 07abc0a0d
# FIxed NPE in IgniteUtils.resolveIgniteUrl().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e986b62f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e986b62f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e986b62f
Branch: refs/heads/ignite-143
Commit: e986b62f2e5a29210fcf9f4b57e5fddc9559bfd8
Parents: 13bd631
Author: vozerov-gridgain
Authored: Fri Mar 6 15:12:07 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 15:12:07 2015 +0300
--
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e986b62f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 79b2171..7f366aa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3210,7 +3210,9 @@ public abstract class IgniteUtils {
String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
-return
Thread.currentThread().getContextClassLoader().getResource(locPath);
+ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
+
+return clsLdr != null ? clsLdr.getResource(locPath) : null;
}
/**
[3/5] incubator-ignite git commit: sp-2 fixing tests
sp-2 fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4eb97ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4eb97ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4eb97ce
Branch: refs/heads/ignite-143
Commit: d4eb97ce43e0d99ed272b838ca1bcfd55708e1f1
Parents: d47470c
Author: Yakov Zhdanov
Authored: Fri Mar 6 15:23:38 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Mar 6 15:23:38 2015 +0300
--
.../processors/cache/GridCacheProcessor.java| 10 +++--
...gniteProjectionStartStopRestartSelfTest.java | 42
2 files changed, 32 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4eb97ce/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 e76c922..20ad5e1 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
@@ -1727,9 +1727,13 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
* @param ldr Class loader.
*/
public void onUndeployed(ClassLoader ldr) {
-if (!ctx.isStopping())
-for (GridCacheAdapter cache : caches.values())
-cache.onUndeploy(ldr);
+if (!ctx.isStopping()) {
+for (GridCacheAdapter cache : caches.values()) {
+// Do not notify system caches.
+if (!cache.context().system() &&
!CU.isAtomicsCache(cache.context().name()))
+cache.onUndeploy(ldr);
+}
+}
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4eb97ce/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
index d4c5fc5..d6d87f9 100644
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
+++
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
@@ -119,9 +119,12 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
G.setDaemon(true);
-ignite = G.start(CFG_NO_ATTR);
-
-G.setDaemon(false);
+try {
+ignite = G.start(CFG_NO_ATTR);
+}
+finally {
+G.setDaemon(false);
+}
ignite.events().localListen(new IgnitePredicate() {
@Override public boolean apply(Event evt) {
@@ -132,7 +135,8 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
if (joinedLatch != null)
joinedLatch.countDown();
-} else if (evt.type() == EVT_NODE_LEFT) {
+}
+else if (evt.type() == EVT_NODE_LEFT) {
leftCnt.incrementAndGet();
if (leftLatch != null)
@@ -146,25 +150,29 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
-if (!ignite.cluster().nodes().isEmpty()) {
-leftLatch = new CountDownLatch(ignite.cluster().nodes().size());
+try {
+if (!ignite.cluster().nodes().isEmpty()) {
+leftLatch = new
CountDownLatch(ignite.cluster().nodes().size());
-ignite.cluster().stopNodes();
+ignite.cluster().stopNodes();
-assert leftLatch.await(WAIT_TIMEOUT, MILLISECONDS);
-}
-
-boolean wasEmpty = ignite.cluster().nodes().isEmpty();
+assert leftLatch.await(WAIT_TIMEOUT, MILLISECONDS);
+}
-G.stop(true);
+boolean wasEmpty = ignite.cluster().nodes().isEmpty();
-joinedCnt.set(0);
-leftCnt.set(0);
+joinedCnt.set(0);
+leftCnt.set(0);
-joinedLatch = null;
-leftLatch = null;
+joinedLatch = null;
+leftLatch = null;
-assert wasEmpty : "grid.isEmpty() returned false after all nodes were
stopped
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-7 [created] 868ac4460
incubator-ignite git commit: # ignite-416: rat plugin - turn on full license text matching
Repository: incubator-ignite Updated Branches: refs/heads/ignite-416-rat [created] 5ffeeb16b # ignite-416: rat plugin - turn on full license text matching Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ffeeb16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ffeeb16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ffeeb16 Branch: refs/heads/ignite-416-rat Commit: 5ffeeb16b83d4a11a908c6c68a48ea94fcb34879 Parents: 13bd631 Author: Artem Shutak Authored: Fri Mar 6 15:37:50 2015 +0300 Committer: Artem Shutak Committed: Fri Mar 6 15:37:50 2015 +0300 -- modules/clients/src/test/keystore/generate.sh | 26 + pom.xml | 34 +- 2 files changed, 47 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ffeeb16/modules/clients/src/test/keystore/generate.sh -- diff --git a/modules/clients/src/test/keystore/generate.sh b/modules/clients/src/test/keystore/generate.sh index 5f9ca98..9b1d6fa 100644 --- a/modules/clients/src/test/keystore/generate.sh +++ b/modules/clients/src/test/keystore/generate.sh @@ -1,17 +1,19 @@ #!/bin/sh # -# Licensed 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. +# 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. # # Initialize openssl & CA. # http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ffeeb16/pom.xml -- diff --git a/pom.xml b/pom.xml index 9c6ef75..b0747be 100644 --- a/pom.xml +++ b/pom.xml @@ -506,9 +506,39 @@ org.apache.rat apache-rat-plugin 0.11 + + false + + + IAL20 +Ignite Apache License 2.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. + + + + + +Ignite Apache Li
incubator-ignite git commit: [maven-release-plugin] prepare branch ignite-release-test-7-branch
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-7 868ac4460 -> 9e16fa177 [maven-release-plugin] prepare branch ignite-release-test-7-branch Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e16fa17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e16fa17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e16fa17 Branch: refs/heads/ignite-release-test-7 Commit: 9e16fa17704cd44ac1c9fa431530740abe719759 Parents: 868ac44 Author: Gridgain Teamcity Authored: Fri Mar 6 16:39:10 2015 +0400 Committer: Gridgain Teamcity Committed: Fri Mar 6 16:39:10 2015 +0400 -- examples/pom.xml | 4 modules/aop/pom.xml | 4 modules/aws/pom.xml | 4 modules/clients/pom.xml | 4 modules/codegen/pom.xml | 4 modules/core/pom.xml | 4 modules/extdata/p2p/pom.xml | 4 modules/extdata/uri/pom.xml | 4 modules/geospatial/pom.xml| 4 modules/hadoop/pom.xml| 4 modules/hibernate/pom.xml | 4 modules/indexing/pom.xml | 4 modules/jcl/pom.xml | 4 modules/jta/pom.xml | 4 modules/log4j/pom.xml | 4 modules/rest-http/pom.xml | 4 modules/scalar/pom.xml| 4 modules/schedule/pom.xml | 4 modules/schema-load/pom.xml | 4 modules/slf4j/pom.xml | 4 modules/spring/pom.xml| 4 modules/ssh/pom.xml | 4 modules/tools/pom.xml | 4 modules/urideploy/pom.xml | 4 modules/visor-console/pom.xml | 4 modules/visor-plugins/pom.xml | 4 modules/web/pom.xml | 4 pom.xml | 2 +- 28 files changed, 109 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index ce5cd29..ea0dff2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -216,4 +216,8 @@ + + +ignite-release-test-7-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0128500..9704403 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -100,4 +100,8 @@ + + +ignite-release-test-7-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 2e73b5a..9cc8d84 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -72,4 +72,8 @@ test + + +ignite-release-test-7-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index cfdac0d..d235858 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -107,4 +107,8 @@ + + +ignite-release-test-7-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 55bc49a..a2538a9 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -46,4 +46,8 @@ 1.0.0-RELEASE-TEST-SNAPSHOT + + +ignite-release-test-7-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index de26b60..f3831f5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -241,4 +241,8 @@ + + +ignite-release-test-7-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/modules/extdata/p2p/pom.xml -- diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml index b1fd26a..8960863 100644 --- a/modules/extdata/p2p/pom.xml +++ b/modules/extdata/p2p/pom.xml @@ -93,4 +93,8 @@ + + +ignite-release-test-7-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e16fa17/modules/extdata/uri/pom.xml --
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-7-branch [created] 9e16fa177
incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-7 9e16fa177 -> e47b3fe9d [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e47b3fe9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e47b3fe9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e47b3fe9 Branch: refs/heads/ignite-release-test-7 Commit: e47b3fe9ddd642bfa33d54ad32ef7bbb409cadc5 Parents: 9e16fa1 Author: Gridgain Teamcity Authored: Fri Mar 6 16:39:17 2015 +0400 Committer: Gridgain Teamcity Committed: Fri Mar 6 16:39:17 2015 +0400 -- examples/pom.xml | 22 +- modules/aop/pom.xml | 12 modules/aws/pom.xml | 10 +++--- modules/clients/pom.xml | 16 ++-- modules/codegen/pom.xml | 8 ++-- modules/core/pom.xml | 8 ++-- modules/extdata/p2p/pom.xml | 10 +++--- modules/extdata/uri/pom.xml | 10 +++--- modules/geospatial/pom.xml| 10 +++--- modules/hadoop/pom.xml| 14 +- modules/hibernate/pom.xml | 12 modules/indexing/pom.xml | 10 +++--- modules/jcl/pom.xml | 10 +++--- modules/jta/pom.xml | 10 +++--- modules/log4j/pom.xml | 10 +++--- modules/rest-http/pom.xml | 8 ++-- modules/scalar/pom.xml| 14 +- modules/schedule/pom.xml | 10 +++--- modules/schema-load/pom.xml | 8 ++-- modules/slf4j/pom.xml | 8 ++-- modules/spring/pom.xml| 14 +- modules/ssh/pom.xml | 14 +- modules/tools/pom.xml | 6 +- modules/urideploy/pom.xml | 12 modules/visor-console/pom.xml | 14 +- modules/visor-plugins/pom.xml | 8 ++-- modules/web/pom.xml | 14 +- pom.xml | 4 ++-- 28 files changed, 99 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e47b3fe9/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index ea0dff2..085c6ec 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -40,31 +40,31 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-hibernate -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-spring -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-indexing -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -154,7 +154,7 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test-jar test @@ -162,7 +162,7 @@ org.apache.ignite ignite-schedule -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test @@ -189,7 +189,7 @@ org.apache.ignite ignite-scalar -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -216,8 +216,4 @@ - - -ignite-release-test-7-branch - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e47b3fe9/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 9704403..ffdcbab 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,13 +31,13 @@ ignite-aop -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT @@ -73,14 +73,14 @@ org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.1.0-SNAPSHOT test org.apache.ignite ignite-core -1.0.0-
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-7 [deleted] e47b3fe9d
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-7-branch [deleted] 9e16fa177
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-8 [created] 868ac4460
incubator-ignite git commit: [maven-release-plugin] prepare branch ignite-release-test-8-branch
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-8 868ac4460 -> 0e9810d19 [maven-release-plugin] prepare branch ignite-release-test-8-branch Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e9810d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e9810d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e9810d1 Branch: refs/heads/ignite-release-test-8 Commit: 0e9810d19ef49d6bff011cf815b9db2330856b67 Parents: 868ac44 Author: Gridgain Teamcity Authored: Fri Mar 6 15:44:14 2015 +0300 Committer: Gridgain Teamcity Committed: Fri Mar 6 15:44:14 2015 +0300 -- examples/pom.xml | 4 modules/aop/pom.xml | 4 modules/aws/pom.xml | 4 modules/clients/pom.xml | 4 modules/codegen/pom.xml | 4 modules/core/pom.xml | 4 modules/extdata/p2p/pom.xml | 4 modules/extdata/uri/pom.xml | 4 modules/geospatial/pom.xml| 4 modules/hadoop/pom.xml| 4 modules/hibernate/pom.xml | 4 modules/indexing/pom.xml | 4 modules/jcl/pom.xml | 4 modules/jta/pom.xml | 4 modules/log4j/pom.xml | 4 modules/rest-http/pom.xml | 4 modules/scalar/pom.xml| 4 modules/schedule/pom.xml | 4 modules/schema-load/pom.xml | 4 modules/slf4j/pom.xml | 4 modules/spring/pom.xml| 4 modules/ssh/pom.xml | 4 modules/tools/pom.xml | 4 modules/urideploy/pom.xml | 4 modules/visor-console/pom.xml | 4 modules/visor-plugins/pom.xml | 4 modules/web/pom.xml | 4 pom.xml | 2 +- 28 files changed, 109 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index ce5cd29..f535f38 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -216,4 +216,8 @@ + + +ignite-release-test-8-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0128500..c8a157a 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -100,4 +100,8 @@ + + +ignite-release-test-8-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 2e73b5a..f9495d2 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -72,4 +72,8 @@ test + + +ignite-release-test-8-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index cfdac0d..a41a8d8 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -107,4 +107,8 @@ + + +ignite-release-test-8-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 55bc49a..ea46afa 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -46,4 +46,8 @@ 1.0.0-RELEASE-TEST-SNAPSHOT + + +ignite-release-test-8-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index de26b60..f1ccb1a 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -241,4 +241,8 @@ + + +ignite-release-test-8-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/modules/extdata/p2p/pom.xml -- diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml index b1fd26a..904fbbb 100644 --- a/modules/extdata/p2p/pom.xml +++ b/modules/extdata/p2p/pom.xml @@ -93,4 +93,8 @@ + + +ignite-release-test-8-branch + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e9810d1/modules/extdata/uri/pom.xml --
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-8-branch [created] 0e9810d19
incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-8 0e9810d19 -> 325007bad [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/325007ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/325007ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/325007ba Branch: refs/heads/ignite-release-test-8 Commit: 325007badb3f551385c777e6927f44a31ddd554e Parents: 0e9810d Author: Gridgain Teamcity Authored: Fri Mar 6 15:44:21 2015 +0300 Committer: Gridgain Teamcity Committed: Fri Mar 6 15:44:21 2015 +0300 -- examples/pom.xml | 22 +- modules/aop/pom.xml | 12 modules/aws/pom.xml | 10 +++--- modules/clients/pom.xml | 16 ++-- modules/codegen/pom.xml | 8 ++-- modules/core/pom.xml | 8 ++-- modules/extdata/p2p/pom.xml | 10 +++--- modules/extdata/uri/pom.xml | 10 +++--- modules/geospatial/pom.xml| 10 +++--- modules/hadoop/pom.xml| 14 +- modules/hibernate/pom.xml | 12 modules/indexing/pom.xml | 10 +++--- modules/jcl/pom.xml | 10 +++--- modules/jta/pom.xml | 10 +++--- modules/log4j/pom.xml | 10 +++--- modules/rest-http/pom.xml | 8 ++-- modules/scalar/pom.xml| 14 +- modules/schedule/pom.xml | 10 +++--- modules/schema-load/pom.xml | 8 ++-- modules/slf4j/pom.xml | 8 ++-- modules/spring/pom.xml| 14 +- modules/ssh/pom.xml | 14 +- modules/tools/pom.xml | 6 +- modules/urideploy/pom.xml | 12 modules/visor-console/pom.xml | 14 +- modules/visor-plugins/pom.xml | 8 ++-- modules/web/pom.xml | 14 +- pom.xml | 4 ++-- 28 files changed, 99 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/325007ba/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index f535f38..d5a02db 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -40,31 +40,31 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-hibernate -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-spring -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-indexing -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -154,7 +154,7 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT test-jar test @@ -162,7 +162,7 @@ org.apache.ignite ignite-schedule -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT test @@ -189,7 +189,7 @@ org.apache.ignite ignite-scalar -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -216,8 +216,4 @@ - - -ignite-release-test-8-branch - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/325007ba/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index c8a157a..81b6923 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,13 +31,13 @@ ignite-aop -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-SNAPSHOT @@ -73,14 +73,14 @@ org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT
incubator-ignite git commit: # ignite-416: remove unused header-license files
Repository: incubator-ignite Updated Branches: refs/heads/ignite-416-rat 5ffeeb16b -> 95a69d01d # ignite-416: remove unused header-license files Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/95a69d01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/95a69d01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/95a69d01 Branch: refs/heads/ignite-416-rat Commit: 95a69d01d7bae2234d8fd999ecfbac78925d4fb8 Parents: 5ffeeb1 Author: Artem Shutak Authored: Fri Mar 6 15:48:21 2015 +0300 Committer: Artem Shutak Committed: Fri Mar 6 15:48:21 2015 +0300 -- license/header-customisation.xml | 51 --- license/header.txt | 14 -- 2 files changed, 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/95a69d01/license/header-customisation.xml -- diff --git a/license/header-customisation.xml b/license/header-customisation.xml deleted file mode 100644 index 44283b1..000 --- a/license/header-customisation.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -/* - * - */EOL -(\s|\t)*/\*.*$ -.*\*/(\s|\t)*$ -false -true -false - - -:: -:: -::EOL -[:][:].*$ -"[:][:].*$" -false -true -false - - - - - - - -false -true -false - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/95a69d01/license/header.txt -- diff --git a/license/header.txt b/license/header.txt deleted file mode 100644 index a9ac967..000 --- a/license/header.txt +++ /dev/null @@ -1,14 +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. \ No newline at end of file
[3/3] incubator-ignite git commit: sp-2 store fixes
sp-2 store fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4b234cfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4b234cfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4b234cfa
Branch: refs/heads/sprint-2
Commit: 4b234cfae1f29a6fd20828ab40f7b52919bb9a16
Parents: 94b8adb
Author: Yakov Zhdanov
Authored: Fri Mar 6 15:49:08 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Mar 6 15:49:08 2015 +0300
--
.../apache/ignite/internal/processors/cache/GridCacheUtils.java | 2 +-
.../internal/processors/cache/GridCacheWriteBehindStore.java| 4 ++--
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 5 -
3 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b234cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index dcdf13e..a2c8af0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1785,7 +1785,7 @@ public class GridCacheUtils {
*/
@NotNull public static CacheException
convertToCacheException(IgniteCheckedException e) {
if (e.hasCause(CacheWriterException.class))
-return new CacheWriterException(U.convertExceptionLight(e));
+return new CacheWriterException(U.convertExceptionNoWrap(e));
if (e instanceof CachePartialUpdateCheckedException)
return new
CachePartialUpdateException((CachePartialUpdateCheckedException)e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b234cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
index 63a72e3..e621ec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
@@ -433,7 +433,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache(entry.getKey(), entry, StoreOperation.PUT);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(U.convertExceptionLight(e));
+throw new CacheWriterException(U.convertExceptionNoWrap(e));
}
}
@@ -453,7 +453,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache((K)key, null, StoreOperation.RMV);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(U.convertExceptionLight(e));
+throw new CacheWriterException(U.convertExceptionNoWrap(e));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b234cfa/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index b5bd40f..f58a24d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -613,10 +613,13 @@ public abstract class IgniteUtils {
}
/**
+ * Converts exception, but unlike {@link
#convertException(IgniteCheckedException)}
+ * does not wrap passed in exception if none suitable converter found.
+ *
* @param e Ignite checked exception.
* @return Ignite runtime exception.
*/
-public static Exception convertExceptionLight(IgniteCheckedException e) {
+public static Exception convertExceptionNoWrap(IgniteCheckedException e) {
C1 converter =
exceptionConverters.get(e.getClass());
if (converter != null)
[2/3] incubator-ignite git commit: sp-2 store fixes
sp-2 store fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/94b8adb8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/94b8adb8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/94b8adb8 Branch: refs/heads/sprint-2 Commit: 94b8adb8261521ba19969311d4826abb21960064 Parents: c5687d9 99a22e2 Author: Yakov Zhdanov Authored: Fri Mar 6 15:48:12 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Mar 6 15:48:12 2015 +0300 -- .../processors/cache/GridCacheUtils.java| 2 +- .../cache/GridCacheWriteBehindStore.java| 4 ++-- .../ignite/internal/util/IgniteUtils.java | 20 ++-- .../IgniteTxStoreExceptionAbstractSelfTest.java | 8 .../ignite/testframework/GridTestUtils.java | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94b8adb8/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java --
[1/3] incubator-ignite git commit: # IGNITE-321 fix tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 c5687d92f -> 4b234cfae
# IGNITE-321 fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99a22e20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99a22e20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99a22e20
Branch: refs/heads/sprint-2
Commit: 99a22e2038e5160d75507843e2c689739103853c
Parents: 13bd631
Author: sevdokimov
Authored: Fri Mar 6 15:18:35 2015 +0300
Committer: sevdokimov
Committed: Fri Mar 6 15:18:35 2015 +0300
--
.../processors/cache/GridCacheUtils.java| 2 +-
.../cache/GridCacheWriteBehindStore.java| 4 ++--
.../ignite/internal/util/IgniteUtils.java | 20 ++--
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8
.../ignite/testframework/GridTestUtils.java | 2 +-
5 files changed, 26 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index b07c14e..dcdf13e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1785,7 +1785,7 @@ public class GridCacheUtils {
*/
@NotNull public static CacheException
convertToCacheException(IgniteCheckedException e) {
if (e.hasCause(CacheWriterException.class))
-return new CacheWriterException(e);
+return new CacheWriterException(U.convertExceptionLight(e));
if (e instanceof CachePartialUpdateCheckedException)
return new
CachePartialUpdateException((CachePartialUpdateCheckedException)e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
index eb6120a..63a72e3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
@@ -433,7 +433,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache(entry.getKey(), entry, StoreOperation.PUT);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(e);
+throw new CacheWriterException(U.convertExceptionLight(e));
}
}
@@ -453,7 +453,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache((K)key, null, StoreOperation.RMV);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(e);
+throw new CacheWriterException(U.convertExceptionLight(e));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 79b2171..a4b6617 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -299,7 +299,7 @@ public abstract class IgniteUtils {
exceptionConverters;
/** */
-private volatile static IgniteBiTuple,
Collection> cachedLocalAddr;
+private static volatile IgniteBiTuple,
Collection> cachedLocalAddr;
/**
* Initializes enterprise check.
@@ -616,6 +616,22 @@ public abstract class IgniteUtils {
* @param e Ignite checked exception.
* @return Ignite runtime exception.
*/
+public static Exception convertExceptionLight(IgniteCheckedException e) {
+C1 converter =
exceptionConverters.get(e.getClass());
+
+if (converter != null)
+return converter.apply(e);
+
+if (e.
incubator-ignite git commit: Fixed metrics test for tx. Added latency.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-test-fix [created] ccd956e11 Fixed metrics test for tx. Added latency. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccd956e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccd956e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccd956e1 Branch: refs/heads/ignite-sprint-test-fix Commit: ccd956e11c6014d3bd2a4ebdb12384890a945c30 Parents: c5687d9 Author: nikolay_tikhonov Authored: Fri Mar 6 16:04:19 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Mar 6 16:04:19 2015 +0300 -- .../cache/GridCacheTransactionalAbstractMetricsSelfTest.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd956e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index 11fbbd0..a2ae57e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -19,6 +19,7 @@ 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.apache.ignite.transactions.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; @@ -216,6 +217,9 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int j = 0; j < keyCount(); j++) cache.put(j, j); +// Waiting 30 ms for metrics. U.currentTimeMillis() method has 10 ms discretization. +U.sleep(30); + tx.commit(); } @@ -258,6 +262,9 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int j = 0; j < keyCount(); j++) cache.put(j, j); +// Waiting 30 ms for metrics. U.currentTimeMillis() method has 10 ms discretization. +U.sleep(30); + tx.rollback(); }
incubator-ignite git commit: #Fixed GridCachePartitionedLockSelfTest
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-test-fix ccd956e11 -> 0fbd3906c
#Fixed GridCachePartitionedLockSelfTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0fbd3906
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0fbd3906
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0fbd3906
Branch: refs/heads/ignite-sprint-test-fix
Commit: 0fbd3906cc074b853e5ddc64a3bae3e2f6db342f
Parents: ccd956e
Author: nikolay_tikhonov
Authored: Fri Mar 6 16:32:57 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Mar 6 16:33:41 2015 +0300
--
.../processors/cache/distributed/GridCacheLockAbstractTest.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0fbd3906/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index e4d4e5c..8c1fd41 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -122,6 +122,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Before 1st removeAll().");
+cache1.clear();
cache1.removeAll();
// Fix for tests where mapping was removed at primary node
@@ -136,6 +137,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Before 2nd removeAll().");
+cache2.clear();
cache2.removeAll();
// Fix for tests where mapping was removed at primary node
incubator-ignite git commit: [maven-release-plugin] prepare release 1.0.1-RELEASE-TEST-RC1
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-9 [created] f10d425b5 [maven-release-plugin] prepare release 1.0.1-RELEASE-TEST-RC1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f10d425b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f10d425b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f10d425b Branch: refs/heads/ignite-release-test-9 Commit: f10d425b5e9d8903d8dd7e29b089fe4a88add6b5 Parents: 868ac44 Author: avinogradov Authored: Fri Mar 6 16:47:06 2015 +0300 Committer: avinogradov Committed: Fri Mar 6 16:47:06 2015 +0300 -- examples/pom.xml | 22 +- modules/aop/pom.xml | 12 modules/aws/pom.xml | 10 +++--- modules/clients/pom.xml | 16 ++-- modules/codegen/pom.xml | 8 ++-- modules/core/pom.xml | 8 ++-- modules/extdata/p2p/pom.xml | 10 +++--- modules/extdata/uri/pom.xml | 10 +++--- modules/geospatial/pom.xml| 10 +++--- modules/hadoop/pom.xml| 14 +- modules/hibernate/pom.xml | 12 modules/indexing/pom.xml | 10 +++--- modules/jcl/pom.xml | 10 +++--- modules/jta/pom.xml | 10 +++--- modules/log4j/pom.xml | 10 +++--- modules/rest-http/pom.xml | 8 ++-- modules/scalar/pom.xml| 14 +- modules/schedule/pom.xml | 10 +++--- modules/schema-load/pom.xml | 8 ++-- modules/slf4j/pom.xml | 8 ++-- modules/spring/pom.xml| 14 +- modules/ssh/pom.xml | 14 +- modules/tools/pom.xml | 6 +- modules/urideploy/pom.xml | 12 modules/visor-console/pom.xml | 14 +- modules/visor-plugins/pom.xml | 8 ++-- modules/web/pom.xml | 14 +- pom.xml | 4 ++-- 28 files changed, 207 insertions(+), 99 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f10d425b/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index ce5cd29..d357cfc 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 @@ -40,31 +40,31 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 org.apache.ignite ignite-hibernate -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 org.apache.ignite ignite-spring -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 org.apache.ignite ignite-indexing -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 @@ -154,7 +154,7 @@ org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 test-jar test @@ -162,7 +162,7 @@ org.apache.ignite ignite-schedule -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 test @@ -189,7 +189,7 @@ org.apache.ignite ignite-scalar -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 @@ -216,4 +216,8 @@ + + +1.0.1-RELEASE-TEST-RC1 + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f10d425b/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0128500..c19dfce 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,13 +31,13 @@ ignite-aop -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 org.apache.ignite ignite-core -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 @@ -73,14 +73,14 @@ org.apache.ignite ignite-log4j -1.0.0-RELEASE-TEST-SNAPSHOT +1.0.1-RELEASE-TEST-RC1 test
Git Push Summary
Repository: incubator-ignite Updated Tags: refs/tags/1.0.1-RELEASE-TEST-RC1 [created] f794ab1b2
incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-9 f10d425b5 -> 2116c654c [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2116c654 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2116c654 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2116c654 Branch: refs/heads/ignite-release-test-9 Commit: 2116c654c87a4edca81a32269472ffdadf2eefe0 Parents: f10d425 Author: avinogradov Authored: Fri Mar 6 16:47:23 2015 +0300 Committer: avinogradov Committed: Fri Mar 6 16:47:23 2015 +0300 -- examples/pom.xml | 22 +- modules/aop/pom.xml | 12 modules/aws/pom.xml | 10 +++--- modules/clients/pom.xml | 16 ++-- modules/codegen/pom.xml | 8 ++-- modules/core/pom.xml | 8 ++-- modules/extdata/p2p/pom.xml | 10 +++--- modules/extdata/uri/pom.xml | 10 +++--- modules/geospatial/pom.xml| 10 +++--- modules/hadoop/pom.xml| 14 +- modules/hibernate/pom.xml | 12 modules/indexing/pom.xml | 10 +++--- modules/jcl/pom.xml | 10 +++--- modules/jta/pom.xml | 10 +++--- modules/log4j/pom.xml | 10 +++--- modules/rest-http/pom.xml | 8 ++-- modules/scalar/pom.xml| 14 +- modules/schedule/pom.xml | 10 +++--- modules/schema-load/pom.xml | 8 ++-- modules/slf4j/pom.xml | 8 ++-- modules/spring/pom.xml| 14 +- modules/ssh/pom.xml | 14 +- modules/tools/pom.xml | 6 +- modules/urideploy/pom.xml | 12 modules/visor-console/pom.xml | 14 +- modules/visor-plugins/pom.xml | 8 ++-- modules/web/pom.xml | 14 +- pom.xml | 4 ++-- 28 files changed, 99 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2116c654/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index d357cfc..2329a49 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT @@ -40,31 +40,31 @@ org.apache.ignite ignite-core -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT org.apache.ignite ignite-hibernate -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT org.apache.ignite ignite-spring -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT org.apache.ignite ignite-log4j -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT org.apache.ignite ignite-indexing -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT @@ -154,7 +154,7 @@ org.apache.ignite ignite-core -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT test-jar test @@ -162,7 +162,7 @@ org.apache.ignite ignite-schedule -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT test @@ -189,7 +189,7 @@ org.apache.ignite ignite-scalar -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT @@ -216,8 +216,4 @@ - - -1.0.1-RELEASE-TEST-RC1 - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2116c654/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index c19dfce..94b9fbb 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,13 +31,13 @@ ignite-aop -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT org.apache.ignite ignite-core -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC2-SNAPSHOT @@ -73,14 +73,14 @@ org.apache.ignite ignite-log4j -1.0.1-RELEASE-TEST-RC1 +1.0.1-RELEASE-TEST-RC
Git Push Summary
Repository: incubator-ignite Updated Tags: refs/tags/1.0.1-RELEASE-TEST-RC1 [deleted] f794ab1b2
[2/3] incubator-ignite git commit: #Fixed GridCachePartitionedLockSelfTest
#Fixed GridCachePartitionedLockSelfTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0fbd3906
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0fbd3906
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0fbd3906
Branch: refs/heads/sprint-2
Commit: 0fbd3906cc074b853e5ddc64a3bae3e2f6db342f
Parents: ccd956e
Author: nikolay_tikhonov
Authored: Fri Mar 6 16:32:57 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Mar 6 16:33:41 2015 +0300
--
.../processors/cache/distributed/GridCacheLockAbstractTest.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0fbd3906/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index e4d4e5c..8c1fd41 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -122,6 +122,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Before 1st removeAll().");
+cache1.clear();
cache1.removeAll();
// Fix for tests where mapping was removed at primary node
@@ -136,6 +137,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Before 2nd removeAll().");
+cache2.clear();
cache2.removeAll();
// Fix for tests where mapping was removed at primary node
[1/3] incubator-ignite git commit: Fixed metrics test for tx. Added latency.
Repository: incubator-ignite Updated Branches: refs/heads/sprint-2 4b234cfae -> 9b0ba865d Fixed metrics test for tx. Added latency. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccd956e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccd956e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccd956e1 Branch: refs/heads/sprint-2 Commit: ccd956e11c6014d3bd2a4ebdb12384890a945c30 Parents: c5687d9 Author: nikolay_tikhonov Authored: Fri Mar 6 16:04:19 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Mar 6 16:04:19 2015 +0300 -- .../cache/GridCacheTransactionalAbstractMetricsSelfTest.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd956e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index 11fbbd0..a2ae57e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -19,6 +19,7 @@ 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.apache.ignite.transactions.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; @@ -216,6 +217,9 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int j = 0; j < keyCount(); j++) cache.put(j, j); +// Waiting 30 ms for metrics. U.currentTimeMillis() method has 10 ms discretization. +U.sleep(30); + tx.commit(); } @@ -258,6 +262,9 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int j = 0; j < keyCount(); j++) cache.put(j, j); +// Waiting 30 ms for metrics. U.currentTimeMillis() method has 10 ms discretization. +U.sleep(30); + tx.rollback(); }
[3/3] incubator-ignite git commit: Merge branch 'ignite-sprint-test-fix' into sprint-2
Merge branch 'ignite-sprint-test-fix' 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/9b0ba865 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b0ba865 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b0ba865 Branch: refs/heads/sprint-2 Commit: 9b0ba865d6903d6f48b5010f44e16fb1c0b8385b Parents: 4b234cf 0fbd390 Author: nikolay_tikhonov Authored: Fri Mar 6 17:49:23 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Mar 6 17:49:23 2015 +0300 -- .../cache/GridCacheTransactionalAbstractMetricsSelfTest.java | 7 +++ .../cache/distributed/GridCacheLockAbstractTest.java | 2 ++ 2 files changed, 9 insertions(+) --
[2/2] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-414
Merge branch 'sprint-2' into ignite-414 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e7178723 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e7178723 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e7178723 Branch: refs/heads/ignite-414 Commit: e717872346fbc443bf9424d6e91de0ca76188a49 Parents: c841b89 4b234cf Author: vozerov-gridgain Authored: Fri Mar 6 17:47:25 2015 +0300 Committer: vozerov-gridgain Committed: Fri Mar 6 17:47:25 2015 +0300 -- bin/igniterouter.sh |7 +- bin/setup-hadoop.sh |7 +- docs/wiki/basic-concepts/async-support.md | 75 + docs/wiki/basic-concepts/getting-started.md | 218 +++ docs/wiki/basic-concepts/ignite-life-cycel.md | 105 ++ docs/wiki/basic-concepts/maven-setup.md | 68 + docs/wiki/basic-concepts/what-is-ignite.md | 31 + docs/wiki/basic-concepts/zero-deployment.md | 56 + docs/wiki/clustering/aws-config.md | 42 + docs/wiki/clustering/cluster-config.md | 176 ++ docs/wiki/clustering/cluster-groups.md | 210 +++ docs/wiki/clustering/cluster.md | 128 ++ docs/wiki/clustering/leader-election.md | 59 + docs/wiki/clustering/network-config.md | 101 ++ docs/wiki/clustering/node-local-map.md | 35 + docs/wiki/compute-grid/checkpointing.md | 238 +++ .../compute-grid/collocate-compute-and-data.md | 29 + docs/wiki/compute-grid/compute-grid.md | 56 + docs/wiki/compute-grid/compute-tasks.md | 105 ++ docs/wiki/compute-grid/distributed-closures.md | 107 ++ docs/wiki/compute-grid/executor-service.md | 23 + docs/wiki/compute-grid/fault-tolerance.md | 79 + docs/wiki/compute-grid/job-scheduling.md| 69 + docs/wiki/compute-grid/load-balancing.md| 59 + docs/wiki/data-grid/affinity-collocation.md | 78 + docs/wiki/data-grid/automatic-db-integration.md | 102 ++ docs/wiki/data-grid/cache-modes.md | 237 +++ docs/wiki/data-grid/cache-queries.md| 164 ++ docs/wiki/data-grid/data-grid.md| 68 + docs/wiki/data-grid/data-loading.md | 77 + docs/wiki/data-grid/evictions.md| 86 + docs/wiki/data-grid/hibernate-l2-cache.md | 173 ++ docs/wiki/data-grid/jcache.md | 99 ++ docs/wiki/data-grid/off-heap-memory.md | 180 ++ docs/wiki/data-grid/persistent-store.md | 111 ++ docs/wiki/data-grid/rebalancing.md | 105 ++ docs/wiki/data-grid/transactions.md | 127 ++ docs/wiki/data-grid/web-session-clustering.md | 236 +++ .../distributed-data-structures/atomic-types.md | 97 ++ .../countdownlatch.md | 24 + .../distributed-data-structures/id-generator.md | 40 + .../queue-and-set.md| 116 ++ .../distributed-events/automatic-batching.md| 16 + docs/wiki/distributed-events/events.md | 101 ++ docs/wiki/distributed-file-system/igfs.md |1 + docs/wiki/distributed-messaging/messaging.md| 73 + docs/wiki/http/configuration.md | 58 + docs/wiki/http/rest-api.md | 1646 ++ docs/wiki/release-notes/release-notes.md| 13 + docs/wiki/service-grid/cluster-singletons.md| 94 + docs/wiki/service-grid/service-configuration.md | 33 + docs/wiki/service-grid/service-example.md | 94 + docs/wiki/service-grid/service-grid.md | 62 + .../ignite/internal/GridKernalContext.java | 30 + .../ignite/internal/GridKernalContextImpl.java | 23 + .../ignite/internal/GridUpdateNotifier.java | 18 +- .../apache/ignite/internal/IgniteKernal.java| 275 ++- .../org/apache/ignite/internal/SkipDaemon.java | 29 + .../ignite/internal/managers/GridManager.java | 20 +- .../internal/managers/GridManagerAdapter.java | 73 +- .../checkpoint/GridCheckpointManager.java |4 +- .../collision/GridCollisionManager.java |4 +- .../discovery/GridDiscoveryManager.java | 38 +- .../managers/indexing/GridIndexingManager.java |4 +- .../swapspace/GridSwapSpaceManager.java |4 +- .../internal/processors/GridProcessor.java | 11 +- .../processors/GridProcessorAdapter.java|5 - .../processors/cache/GridCacheProcessor.java| 66 +- .../processors/cache/GridCacheUtils.java|2 +- .../cache/GridCacheWriteBehindStore.java|4 +- .../dht/atomic/GridDhtAtomicCache.java |3 +- .../clock/GridClockSyncProcessor.java |9 +- .../internal/processors/igfs/IgfsProcessor.java | 102 +- .../processors/job/GridJobProcessor.java
[1/2] incubator-ignite git commit: # IGNITE-414: WIP.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-414 [created] e71787234
# IGNITE-414: 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/c841b89d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c841b89d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c841b89d
Branch: refs/heads/ignite-414
Commit: c841b89db44b665a72fdb48394b5052c35b85715
Parents: 61828c1
Author: vozerov-gridgain
Authored: Thu Mar 5 16:05:25 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Mar 5 16:05:25 2015 +0300
--
.../processors/igfs/IgfsDeleteWorker.java | 3 +-
.../igfs/IgfsFragmentizerManager.java | 4 +-
.../internal/processors/igfs/IgfsImpl.java | 106 ++---
.../processors/igfs/IgfsInputStreamImpl.java| 2 +-
.../igfs/IgfsInvalidRangeException.java | 4 +-
.../processors/igfs/IgfsMetaManager.java| 432 ++-
.../processors/igfs/IgfsOutputStreamImpl.java | 6 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 25 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
9 files changed, 271 insertions(+), 313 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c841b89d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
index dbe63a5..c2dac04 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.igfs;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
+import org.apache.ignite.igfs.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.managers.eventstorage.*;
@@ -155,7 +156,7 @@ public class IgfsDeleteWorker extends IgfsThread {
try {
info = meta.info(TRASH_ID);
}
-catch (IgniteCheckedException e) {
+catch (IgfsException e) {
U.error(log, "Cannot obtain trash directory info.", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c841b89d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
index 61949d7..9e37e29 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
@@ -306,8 +306,8 @@ public class IgfsFragmentizerManager extends IgfsManager {
}
catch (IgfsInvalidRangeException e) {
if (log.isDebugEnabled())
-log.debug("Failed to update file range " +
-"[range=" + range + "fileId=" + fileId + ", err=" +
e.getMessage() + ']');
+log.debug("Failed to update file range [range=" + range +
"fileId=" + fileId +
+", err=" + e.getMessage() + ']');
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c841b89d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 614815f..d944b83 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -446,7 +446,7 @@ public final class IgfsImpl implements IgfsEx {
try {
return meta.sampling();
}
-catch (IgniteCheckedException e) {
+catch (IgfsException e) {
U.error(log, "Failed to get sampling state.", e);
return false;
@@ -472,43 +472,38 @@ public final class IgfsImpl implem
incubator-ignite git commit: # ignite-51
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 8a5bc2803 -> 3a4ede2f7
# ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a4ede2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a4ede2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a4ede2f
Branch: refs/heads/ignite-51
Commit: 3a4ede2f7f307aaf4eb83bb0afc1d7efa374b310
Parents: 8a5bc28
Author: sboikov
Authored: Fri Mar 6 18:31:58 2015 +0300
Committer: sboikov
Committed: Fri Mar 6 18:36:23 2015 +0300
--
.../communication/GridIoMessageFactory.java | 5 +
.../cache/CacheInvokeDirectResult.java | 11 +-
.../processors/cache/GridCacheAdapter.java | 95 ++
.../processors/cache/GridCacheMapEntry.java | 7 +-
.../cache/GridCacheProjectionImpl.java | 4 +-
.../processors/cache/GridCacheReturn.java | 313 ---
.../cache/GridCacheUpdateAtomicResult.java | 7 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 7 +-
.../dht/atomic/GridDhtAtomicCache.java | 59 ++--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 38 +--
.../atomic/GridNearAtomicUpdateResponse.java| 105 ++-
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../near/GridNearTxPrepareResponse.java | 26 +-
.../processors/cache/local/GridLocalTx.java | 2 +
.../local/atomic/GridLocalAtomicCache.java | 4 +-
.../cache/transactions/IgniteInternalTx.java| 6 +-
.../cache/transactions/IgniteTxAdapter.java | 13 +-
.../transactions/IgniteTxLocalAdapter.java | 54 ++--
.../cache/transactions/IgniteTxLocalEx.java | 2 +-
21 files changed, 458 insertions(+), 308 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a4ede2f/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index f7f0fc2..d702540 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -489,6 +489,11 @@ public class GridIoMessageFactory implements
MessageFactory {
break;
+case 88:
+msg = new GridCacheReturn();
+
+break;
+
case 89:
msg = new CacheObjectImpl();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a4ede2f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
index 3c5c5c7..03a2d96 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
@@ -92,7 +92,10 @@ public class CacheInvokeDirectResult implements Message {
return err;
}
-/** {@inheritDoc} */
+/**
+ * @param ctx Cache context.
+ * @throws IgniteCheckedException If failed.
+ */
public void prepareMarshal(GridCacheContext ctx) throws
IgniteCheckedException {
key.prepareMarshal(ctx.cacheObjectContext());
@@ -103,7 +106,11 @@ public class CacheInvokeDirectResult implements Message {
res.prepareMarshal(ctx.cacheObjectContext());
}
-/** {@inheritDoc} */
+/**
+ * @param ctx Cache context.
+ * @param ldr Class loader.
+ * @throws IgniteCheckedException If failed.
+ */
public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws
IgniteCheckedException {
key.finishUnmarshal(ctx.cacheObjectContext(), ldr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a4ede2f/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/
[06/18] incubator-ignite git commit: sprint-2 - Fixed assertion
sprint-2 - Fixed assertion
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/189366bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/189366bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/189366bf
Branch: refs/heads/ignite-51
Commit: 189366bf2db548ac3cdbf9bd4961c5670c70cb93
Parents: af603c0
Author: Valentin Kulichenko
Authored: Fri Mar 6 01:06:45 2015 -0800
Committer: Valentin Kulichenko
Committed: Fri Mar 6 01:06:45 2015 -0800
--
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/189366bf/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 add51bd..00861fb 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
@@ -1982,7 +1982,8 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
req.subjectId(),
taskName);
-assert updRes.newTtl() == CU.TTL_NOT_CHANGED || expiry !=
null;
+assert !updRes.success() || updRes.newTtl() ==
CU.TTL_NOT_CHANGED || expiry != null :
+"success=" + updRes.success() + ", newTtl=" +
updRes.newTtl() + ", expiry=" + expiry;
if (intercept) {
if (op == UPDATE)
[05/18] 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/d47470c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d47470c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d47470c4 Branch: refs/heads/ignite-51 Commit: d47470c45fd0b17c12f2b8a58a066df904716e0d Parents: a806cdd d154ea89 Author: Yakov Zhdanov Authored: Fri Mar 6 11:00:02 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Mar 6 11:00:02 2015 +0300 -- bin/igniterouter.sh |7 +- bin/setup-hadoop.sh |7 +- docs/wiki/basic-concepts/async-support.md | 75 + docs/wiki/basic-concepts/getting-started.md | 218 +++ docs/wiki/basic-concepts/ignite-life-cycel.md | 105 ++ docs/wiki/basic-concepts/maven-setup.md | 68 + docs/wiki/basic-concepts/what-is-ignite.md | 31 + docs/wiki/basic-concepts/zero-deployment.md | 56 + docs/wiki/clustering/aws-config.md | 42 + docs/wiki/clustering/cluster-config.md | 176 ++ docs/wiki/clustering/cluster-groups.md | 210 +++ docs/wiki/clustering/cluster.md | 128 ++ docs/wiki/clustering/leader-election.md | 59 + docs/wiki/clustering/network-config.md | 101 ++ docs/wiki/clustering/node-local-map.md | 35 + docs/wiki/compute-grid/checkpointing.md | 238 +++ .../compute-grid/collocate-compute-and-data.md | 29 + docs/wiki/compute-grid/compute-grid.md | 56 + docs/wiki/compute-grid/compute-tasks.md | 105 ++ docs/wiki/compute-grid/distributed-closures.md | 107 ++ docs/wiki/compute-grid/executor-service.md | 23 + docs/wiki/compute-grid/fault-tolerance.md | 79 + docs/wiki/compute-grid/job-scheduling.md| 69 + docs/wiki/compute-grid/load-balancing.md| 59 + docs/wiki/data-grid/affinity-collocation.md | 78 + docs/wiki/data-grid/automatic-db-integration.md | 102 ++ docs/wiki/data-grid/cache-modes.md | 237 +++ docs/wiki/data-grid/cache-queries.md| 164 ++ docs/wiki/data-grid/data-grid.md| 68 + docs/wiki/data-grid/data-loading.md | 77 + docs/wiki/data-grid/evictions.md| 86 + docs/wiki/data-grid/hibernate-l2-cache.md | 173 ++ docs/wiki/data-grid/jcache.md | 99 ++ docs/wiki/data-grid/off-heap-memory.md | 180 ++ docs/wiki/data-grid/persistent-store.md | 111 ++ docs/wiki/data-grid/rebalancing.md | 105 ++ docs/wiki/data-grid/transactions.md | 127 ++ docs/wiki/data-grid/web-session-clustering.md | 236 +++ .../distributed-data-structures/atomic-types.md | 97 ++ .../countdownlatch.md | 24 + .../distributed-data-structures/id-generator.md | 40 + .../queue-and-set.md| 116 ++ .../distributed-events/automatic-batching.md| 16 + docs/wiki/distributed-events/events.md | 101 ++ docs/wiki/distributed-file-system/igfs.md |1 + docs/wiki/distributed-messaging/messaging.md| 73 + docs/wiki/http/configuration.md | 58 + docs/wiki/http/rest-api.md | 1646 ++ docs/wiki/release-notes/release-notes.md| 13 + docs/wiki/service-grid/cluster-singletons.md| 94 + docs/wiki/service-grid/service-configuration.md | 33 + docs/wiki/service-grid/service-example.md | 94 + docs/wiki/service-grid/service-grid.md | 62 + .../ignite/internal/GridUpdateNotifier.java |2 +- .../ignite/internal/util/IgniteUtils.java | 34 +- .../ignite/testsuites/IgniteCacheTestSuite.java |4 - .../internal/processors/hadoop/HadoopSetup.java |6 +- .../apache/ignite/schema/ui/SchemaLoadApp.java |2 +- 58 files changed, 6424 insertions(+), 18 deletions(-) --
[17/18] incubator-ignite git commit: Merge branch 'ignite-sprint-test-fix' into sprint-2
Merge branch 'ignite-sprint-test-fix' 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/9b0ba865 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b0ba865 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b0ba865 Branch: refs/heads/ignite-51 Commit: 9b0ba865d6903d6f48b5010f44e16fb1c0b8385b Parents: 4b234cf 0fbd390 Author: nikolay_tikhonov Authored: Fri Mar 6 17:49:23 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Mar 6 17:49:23 2015 +0300 -- .../cache/GridCacheTransactionalAbstractMetricsSelfTest.java | 7 +++ .../cache/distributed/GridCacheLockAbstractTest.java | 2 ++ 2 files changed, 9 insertions(+) --
[04/18] incubator-ignite git commit: sp-2 minor
sp-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/a806cdd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a806cdd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a806cdd8
Branch: refs/heads/ignite-51
Commit: a806cdd8b1d119682b8d46a9fd9ce86c3a053059
Parents: 9bc57f0
Author: Yakov Zhdanov
Authored: Fri Mar 6 10:59:46 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Mar 6 10:59:46 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 26 ++--
1 file changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a806cdd8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 43dc0ce..1fc71fc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -2942,23 +2942,23 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
}
if (txEnabled()) {
-Transaction tx = cache.txStart();
+try (Transaction tx = cache.txStart()) {
+cache.replace(key, 2);
-cache.replace(key, 2);
-
-assert cache.peek(key, F.asList(GLOBAL)) == 1;
+assert cache.peek(key, F.asList(GLOBAL)) == 1;
-if (cacheMode() == LOCAL) {
-assert cache.peek(key, F.asList(NEAR_ONLY)) == 1;
-assert cache.peek(key, F.asList(PARTITIONED_ONLY)) == 1;
-}
+if (cacheMode() == LOCAL) {
+assert cache.peek(key, F.asList(NEAR_ONLY)) == 1;
+assert cache.peek(key, F.asList(PARTITIONED_ONLY)) == 1;
+}
-assert cache.peek(key, F.asList(TX)) == 2;
-assert cache.peek(key, F.asList(SMART)) == 2;
-assert cache.peek(key, F.asList(SWAP)) == null;
-assert cache.peek(key, F.asList(DB)) == 1;
+assert cache.peek(key, F.asList(TX)) == 2;
+assert cache.peek(key, F.asList(SMART)) == 2;
+assert cache.peek(key, F.asList(SWAP)) == null;
+assert cache.peek(key, F.asList(DB)) == 1;
-tx.commit();
+tx.commit();
+}
}
else
cache.replace(key, 2);
[01/18] incubator-ignite git commit: # Minor changes to read/writeStringMap() methods.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 3a4ede2f7 -> 20b901958
# Minor changes to read/writeStringMap() methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/684a8aed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/684a8aed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/684a8aed
Branch: refs/heads/ignite-51
Commit: 684a8aedbc7e728d7b4a0eebbddc43acbe6d3d71
Parents: 551b3d1
Author: vozerov-gridgain
Authored: Fri Mar 6 10:03:33 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 10:03:33 2015 +0300
--
.../ignite/internal/util/IgniteUtils.java | 34 ++--
1 file changed, 31 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/684a8aed/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 6b12554..79b2171 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -4544,8 +4544,8 @@ public abstract class IgniteUtils {
out.writeInt(map.size());
for (Map.Entry e : map.entrySet()) {
-out.writeUTF(e.getKey());
-out.writeUTF(e.getValue());
+writeUTFStringNullable(out, e.getKey());
+writeUTFStringNullable(out, e.getValue());
}
}
else
@@ -4568,13 +4568,41 @@ public abstract class IgniteUtils {
Map map = U.newHashMap(size);
for (int i = 0; i < size; i++)
-map.put(in.readUTF(), in.readUTF());
+map.put(readUTFStringNullable(in), readUTFStringNullable(in));
return map;
}
}
/**
+ * Write UTF string which can be {@code null}.
+ *
+ * @param out Output stream.
+ * @param val Value.
+ * @throws IOException If failed.
+ */
+public static void writeUTFStringNullable(DataOutput out, @Nullable String
val) throws IOException {
+if (val != null) {
+out.writeBoolean(true);
+
+out.writeUTF(val);
+}
+else
+out.writeBoolean(false);
+}
+
+/**
+ * Read UTF string which can be {@code null}.
+ *
+ * @param in Input stream.
+ * @return Value.
+ * @throws IOException If failed.
+ */
+public static String readUTFStringNullable(DataInput in) throws
IOException {
+return in.readBoolean() ? in.readUTF() : null;
+}
+
+/**
*
* @param in Input.
* @return Read map.
[10/18] incubator-ignite git commit: # IGNITE-321 fix tests.
# IGNITE-321 fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99a22e20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99a22e20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99a22e20
Branch: refs/heads/ignite-51
Commit: 99a22e2038e5160d75507843e2c689739103853c
Parents: 13bd631
Author: sevdokimov
Authored: Fri Mar 6 15:18:35 2015 +0300
Committer: sevdokimov
Committed: Fri Mar 6 15:18:35 2015 +0300
--
.../processors/cache/GridCacheUtils.java| 2 +-
.../cache/GridCacheWriteBehindStore.java| 4 ++--
.../ignite/internal/util/IgniteUtils.java | 20 ++--
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8
.../ignite/testframework/GridTestUtils.java | 2 +-
5 files changed, 26 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index b07c14e..dcdf13e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1785,7 +1785,7 @@ public class GridCacheUtils {
*/
@NotNull public static CacheException
convertToCacheException(IgniteCheckedException e) {
if (e.hasCause(CacheWriterException.class))
-return new CacheWriterException(e);
+return new CacheWriterException(U.convertExceptionLight(e));
if (e instanceof CachePartialUpdateCheckedException)
return new
CachePartialUpdateException((CachePartialUpdateCheckedException)e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
index eb6120a..63a72e3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
@@ -433,7 +433,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache(entry.getKey(), entry, StoreOperation.PUT);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(e);
+throw new CacheWriterException(U.convertExceptionLight(e));
}
}
@@ -453,7 +453,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache((K)key, null, StoreOperation.RMV);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(e);
+throw new CacheWriterException(U.convertExceptionLight(e));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99a22e20/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 79b2171..a4b6617 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -299,7 +299,7 @@ public abstract class IgniteUtils {
exceptionConverters;
/** */
-private volatile static IgniteBiTuple,
Collection> cachedLocalAddr;
+private static volatile IgniteBiTuple,
Collection> cachedLocalAddr;
/**
* Initializes enterprise check.
@@ -616,6 +616,22 @@ public abstract class IgniteUtils {
* @param e Ignite checked exception.
* @return Ignite runtime exception.
*/
+public static Exception convertExceptionLight(IgniteCheckedException e) {
+C1 converter =
exceptionConverters.get(e.getClass());
+
+if (converter != null)
+return converter.apply(e);
+
+if (e.getCause() instanceof IgniteException)
+return (Exception)e.getCause();
+
+
[15/18] incubator-ignite git commit: Fixed metrics test for tx. Added latency.
Fixed metrics test for tx. Added latency. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccd956e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccd956e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccd956e1 Branch: refs/heads/ignite-51 Commit: ccd956e11c6014d3bd2a4ebdb12384890a945c30 Parents: c5687d9 Author: nikolay_tikhonov Authored: Fri Mar 6 16:04:19 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Mar 6 16:04:19 2015 +0300 -- .../cache/GridCacheTransactionalAbstractMetricsSelfTest.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd956e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index 11fbbd0..a2ae57e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -19,6 +19,7 @@ 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.apache.ignite.transactions.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; @@ -216,6 +217,9 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int j = 0; j < keyCount(); j++) cache.put(j, j); +// Waiting 30 ms for metrics. U.currentTimeMillis() method has 10 ms discretization. +U.sleep(30); + tx.commit(); } @@ -258,6 +262,9 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int j = 0; j < keyCount(); j++) cache.put(j, j); +// Waiting 30 ms for metrics. U.currentTimeMillis() method has 10 ms discretization. +U.sleep(30); + tx.rollback(); }
[13/18] incubator-ignite git commit: sp-2 store fixes
sp-2 store fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/94b8adb8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/94b8adb8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/94b8adb8 Branch: refs/heads/ignite-51 Commit: 94b8adb8261521ba19969311d4826abb21960064 Parents: c5687d9 99a22e2 Author: Yakov Zhdanov Authored: Fri Mar 6 15:48:12 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Mar 6 15:48:12 2015 +0300 -- .../processors/cache/GridCacheUtils.java| 2 +- .../cache/GridCacheWriteBehindStore.java| 4 ++-- .../ignite/internal/util/IgniteUtils.java | 20 ++-- .../IgniteTxStoreExceptionAbstractSelfTest.java | 8 .../ignite/testframework/GridTestUtils.java | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94b8adb8/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java --
[03/18] incubator-ignite git commit: # IGNITE-413: Applied patch from Ivan V..
# IGNITE-413: Applied patch from Ivan V..
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d154ea89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d154ea89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d154ea89
Branch: refs/heads/ignite-51
Commit: d154ea89a362b266dfd3287557143e3bc8d95a52
Parents: 7bc901f
Author: vozerov-gridgain
Authored: Fri Mar 6 10:17:57 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 10:17:57 2015 +0300
--
bin/igniterouter.sh | 7 ---
bin/setup-hadoop.sh | 7 ---
2 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d154ea89/bin/igniterouter.sh
--
diff --git a/bin/igniterouter.sh b/bin/igniterouter.sh
index 60e52d6..9ab848e 100755
--- a/bin/igniterouter.sh
+++ b/bin/igniterouter.sh
@@ -23,9 +23,10 @@
#
# Import common functions.
#
-if [ "${IGNITE_HOME}" = "" ];
-then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")";
"pwd")")";IGNITE_HOME_TMP="$(dirname "${IGNITE_HOME_TMP}")" # Will be removed
in release.
-else IGNITE_HOME_TMP=${IGNITE_HOME};
+if [ "${IGNITE_HOME}" = "" ]; then
+IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")"
+else
+IGNITE_HOME_TMP=${IGNITE_HOME}
fi
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d154ea89/bin/setup-hadoop.sh
--
diff --git a/bin/setup-hadoop.sh b/bin/setup-hadoop.sh
index d66353f..8870c75 100755
--- a/bin/setup-hadoop.sh
+++ b/bin/setup-hadoop.sh
@@ -34,9 +34,10 @@ fi
#
# Import common functions.
#
-if [ "${IGNITE_HOME}" = "" ];
-then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")";
"pwd")")";IGNITE_HOME_TMP="$(dirname "${IGNITE_HOME_TMP}")" # Will be removed
in release.
-else IGNITE_HOME_TMP=${IGNITE_HOME};
+if [ "${IGNITE_HOME}" = "" ]; then
+IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")"
+else
+IGNITE_HOME_TMP=${IGNITE_HOME}
fi
#
[08/18] incubator-ignite git commit: # FIxed NPE in IgniteUtils.resolveIgniteUrl().
# FIxed NPE in IgniteUtils.resolveIgniteUrl().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e986b62f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e986b62f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e986b62f
Branch: refs/heads/ignite-51
Commit: e986b62f2e5a29210fcf9f4b57e5fddc9559bfd8
Parents: 13bd631
Author: vozerov-gridgain
Authored: Fri Mar 6 15:12:07 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 15:12:07 2015 +0300
--
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e986b62f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 79b2171..7f366aa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3210,7 +3210,9 @@ public abstract class IgniteUtils {
String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
-return
Thread.currentThread().getContextClassLoader().getResource(locPath);
+ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
+
+return clsLdr != null ? clsLdr.getResource(locPath) : null;
}
/**
[07/18] 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/13bd6318 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13bd6318 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13bd6318 Branch: refs/heads/ignite-51 Commit: 13bd63186931e1e4a8f692ce078e7930a063bcfe Parents: 189366b d47470c Author: Valentin Kulichenko Authored: Fri Mar 6 01:06:53 2015 -0800 Committer: Valentin Kulichenko Committed: Fri Mar 6 01:06:53 2015 -0800 -- bin/igniterouter.sh | 7 ++-- bin/setup-hadoop.sh | 7 ++-- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 34 ++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 26 +++ .../internal/processors/hadoop/HadoopSetup.java | 6 ++-- .../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +- 7 files changed, 57 insertions(+), 27 deletions(-) --
[18/18] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20b90195
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20b90195
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20b90195
Branch: refs/heads/ignite-51
Commit: 20b9019580d0366dade90091f56e1cc52f153f7f
Parents: 3a4ede2 9b0ba86
Author: sboikov
Authored: Fri Mar 6 18:43:15 2015 +0300
Committer: sboikov
Committed: Fri Mar 6 18:43:15 2015 +0300
--
bin/igniterouter.sh | 7 +-
bin/setup-hadoop.sh | 7 +-
.../processors/cache/GridCacheProcessor.java| 10 ++-
.../processors/cache/GridCacheUtils.java| 2 +-
.../cache/GridCacheWriteBehindStore.java| 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../ignite/internal/util/IgniteUtils.java | 67 ++--
.../cache/GridCacheAbstractFullApiSelfTest.java | 26
...cheTransactionalAbstractMetricsSelfTest.java | 7 ++
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +--
.../distributed/GridCacheLockAbstractTest.java | 2 +
.../ignite/testframework/GridTestUtils.java | 2 +-
.../internal/processors/hadoop/HadoopSetup.java | 6 +-
...gniteProjectionStartStopRestartSelfTest.java | 42 +++-
14 files changed, 135 insertions(+), 58 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index a53638e,00861fb..a502a87
---
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
@@@ -1982,15 -1982,12 +1982,16 @@@ public class GridDhtAtomicCache e
req.subjectId(),
taskName);
- assert updRes.newTtl() == CU.TTL_NOT_CHANGED || expiry !=
null;
+ assert !updRes.success() || updRes.newTtl() ==
CU.TTL_NOT_CHANGED || expiry != null :
+ "success=" + updRes.success() + ", newTtl=" +
updRes.newTtl() + ", expiry=" + expiry;
if (intercept) {
-if (op == UPDATE)
-
ctx.config().getInterceptor().onAfterPut(entry.key(), updRes.newValue());
+if (op == UPDATE) {
+ctx.config().getInterceptor().onAfterPut(new
CacheLazyEntry(
+ctx,
+entry.key(),
+updRes.newValue()));
+}
else {
assert op == DELETE : op;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
[11/18] incubator-ignite git commit: sp-2 fixing tests
sp-2 fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4eb97ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4eb97ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4eb97ce
Branch: refs/heads/ignite-51
Commit: d4eb97ce43e0d99ed272b838ca1bcfd55708e1f1
Parents: d47470c
Author: Yakov Zhdanov
Authored: Fri Mar 6 15:23:38 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Mar 6 15:23:38 2015 +0300
--
.../processors/cache/GridCacheProcessor.java| 10 +++--
...gniteProjectionStartStopRestartSelfTest.java | 42
2 files changed, 32 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4eb97ce/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 e76c922..20ad5e1 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
@@ -1727,9 +1727,13 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
* @param ldr Class loader.
*/
public void onUndeployed(ClassLoader ldr) {
-if (!ctx.isStopping())
-for (GridCacheAdapter cache : caches.values())
-cache.onUndeploy(ldr);
+if (!ctx.isStopping()) {
+for (GridCacheAdapter cache : caches.values()) {
+// Do not notify system caches.
+if (!cache.context().system() &&
!CU.isAtomicsCache(cache.context().name()))
+cache.onUndeploy(ldr);
+}
+}
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4eb97ce/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
index d4c5fc5..d6d87f9 100644
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
+++
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
@@ -119,9 +119,12 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
G.setDaemon(true);
-ignite = G.start(CFG_NO_ATTR);
-
-G.setDaemon(false);
+try {
+ignite = G.start(CFG_NO_ATTR);
+}
+finally {
+G.setDaemon(false);
+}
ignite.events().localListen(new IgnitePredicate() {
@Override public boolean apply(Event evt) {
@@ -132,7 +135,8 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
if (joinedLatch != null)
joinedLatch.countDown();
-} else if (evt.type() == EVT_NODE_LEFT) {
+}
+else if (evt.type() == EVT_NODE_LEFT) {
leftCnt.incrementAndGet();
if (leftLatch != null)
@@ -146,25 +150,29 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
-if (!ignite.cluster().nodes().isEmpty()) {
-leftLatch = new CountDownLatch(ignite.cluster().nodes().size());
+try {
+if (!ignite.cluster().nodes().isEmpty()) {
+leftLatch = new
CountDownLatch(ignite.cluster().nodes().size());
-ignite.cluster().stopNodes();
+ignite.cluster().stopNodes();
-assert leftLatch.await(WAIT_TIMEOUT, MILLISECONDS);
-}
-
-boolean wasEmpty = ignite.cluster().nodes().isEmpty();
+assert leftLatch.await(WAIT_TIMEOUT, MILLISECONDS);
+}
-G.stop(true);
+boolean wasEmpty = ignite.cluster().nodes().isEmpty();
-joinedCnt.set(0);
-leftCnt.set(0);
+joinedCnt.set(0);
+leftCnt.set(0);
-joinedLatch = null;
-leftLatch = null;
+joinedLatch = null;
+leftLatch = null;
-assert wasEmpty : "grid.isEmpty() returned false after all nodes were
stopped
[02/18] incubator-ignite git commit: # Minor changes to Hadoop logo printout.
# Minor changes to Hadoop logo printout.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7bc901f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7bc901f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7bc901f2
Branch: refs/heads/ignite-51
Commit: 7bc901f23e174965a3653f7df066de8f3ad9a758
Parents: 684a8ae
Author: vozerov-gridgain
Authored: Fri Mar 6 10:14:46 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 10:14:46 2015 +0300
--
.../apache/ignite/internal/processors/hadoop/HadoopSetup.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7bc901f2/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSetup.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSetup.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSetup.java
index 35df5da..69a2d69 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSetup.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSetup.java
@@ -53,9 +53,9 @@ public class HadoopSetup {
" _/ // (_ /// / / / / _/ ",
"/___/\\___/_/|_/___/ /_/ /___/ ",
"for Apache Hadoop",
-" ");
-
-println("Version " + ACK_VER_STR);
+" ",
+"ver. " + ACK_VER_STR,
+COPYRIGHT);
configureHadoop();
}
[09/18] incubator-ignite git commit: # FIxed NPE in IgniteUtils.resolveIgniteUrl() (2).
# FIxed NPE in IgniteUtils.resolveIgniteUrl() (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/62370939
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62370939
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62370939
Branch: refs/heads/ignite-51
Commit: 623709395072a61a3ed4164e1895a845c52dff02
Parents: e986b62
Author: vozerov-gridgain
Authored: Fri Mar 6 15:13:15 2015 +0300
Committer: vozerov-gridgain
Committed: Fri Mar 6 15:13:15 2015 +0300
--
.../java/org/apache/ignite/internal/util/IgniteUtils.java | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62370939/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 7f366aa..24d2f8a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3208,11 +3208,15 @@ public abstract class IgniteUtils {
}
}
-String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
-
ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
-return clsLdr != null ? clsLdr.getResource(locPath) : null;
+if (clsLdr != null) {
+String locPath = (metaInf ? "META-INF/" : "") +
path.replaceAll("", "/");
+
+return clsLdr.getResource(locPath);
+}
+else
+return null;
}
/**
incubator-ignite git commit: # IGNITE-417 removeAll() throws IllegalStateException if remote node stops during removeAll() execution
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-417 [created] 314cc899a
# IGNITE-417 removeAll() throws IllegalStateException if remote node stops
during removeAll() execution
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/314cc899
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/314cc899
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/314cc899
Branch: refs/heads/ignite-417
Commit: 314cc899aa377eea47e65acf8262db2379331bc5
Parents: 9b0ba86
Author: sevdokimov
Authored: Fri Mar 6 18:50:37 2015 +0300
Committer: sevdokimov
Committed: Fri Mar 6 18:50:37 2015 +0300
--
.../GridDistributedCacheAdapter.java| 174 ++-
.../GridCacheRemoveAllMultithreadedTest.java| 118 +
2 files changed, 246 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/314cc899/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 00190d9..f8f8b92 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -19,6 +19,7 @@ package
org.apache.ignite.internal.processors.cache.distributed;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.cluster.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -49,6 +50,9 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
/** */
private static final long serialVersionUID = 0L;
+/** */
+private static final int MAX_REMOVE_ALL_ATTEMPTS = 50;
+
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -136,25 +140,58 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
/** {@inheritDoc} */
@Override public void removeAll() throws IgniteCheckedException {
-try {
-long topVer;
+int attemptCnt = 0;
+
+while (true) {
+long topVer = ctx.discovery().topologyVersion();
+
+IgniteInternalFuture fut =
ctx.affinity().affinityReadyFuturex(topVer);
+if (fut != null)
+fut.get();
+
+// Send job to all data nodes.
+ClusterGroup cluster = ctx.grid().cluster().forDataNodes(name());
+
+if (cluster.nodes().isEmpty())
+break;
+
+try {
+Collection res =
ctx.grid().compute(cluster).withNoFailover().broadcast(
+new GlobalRemoveAllCallable<>(name(), topVer));
+
+Long max = Collections.max(res);
+
+if (max > 0) {
+assert max > topVer;
+
+ctx.affinity().affinityReadyFuture(max).get();
+
+continue;
+}
-do {
-topVer = ctx.affinity().affinityTopologyVersion();
+if (res.contains(-1L)) {
+if (++attemptCnt > MAX_REMOVE_ALL_ATTEMPTS)
+throw new IgniteCheckedException("Failed to remove all
entries.");
-// Send job to all data nodes.
-Collection nodes =
ctx.grid().cluster().forDataNodes(name()).nodes();
+continue;
+}
+}
+catch (ClusterGroupEmptyException ignore) {
+if (log.isDebugEnabled())
+log.debug("All remote nodes left while cache remove
[cacheName=" + name() + "]");
-if (!nodes.isEmpty()) {
-ctx.closures().callAsyncNoFailover(BROADCAST,
-new GlobalRemoveAllCallable<>(name(), topVer), nodes,
true).get();
+break;
+}
+catch (ClusterTopologyException e) {
+// GlobalRemoveAllCallable was sent to node that has left.
+if (topVer == ctx.discovery().topologyVersion()) {
+// Node was not left, some other error has occurs.
+throw e;
}
}
-while (ctx.affinity().affinityTopologyVersion() > topVer);
-}
-catch (ClusterGroupEm
[12/18] 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/c5687d92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5687d92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5687d92 Branch: refs/heads/ignite-51 Commit: c5687d92f58bbdc6b0c330d20ae1bbebe8cf208f Parents: d4eb97c 6237093 Author: Yakov Zhdanov Authored: Fri Mar 6 15:23:50 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Mar 6 15:23:50 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 ++- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 10 -- 2 files changed, 10 insertions(+), 3 deletions(-) --
[16/18] incubator-ignite git commit: #Fixed GridCachePartitionedLockSelfTest
#Fixed GridCachePartitionedLockSelfTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0fbd3906
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0fbd3906
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0fbd3906
Branch: refs/heads/ignite-51
Commit: 0fbd3906cc074b853e5ddc64a3bae3e2f6db342f
Parents: ccd956e
Author: nikolay_tikhonov
Authored: Fri Mar 6 16:32:57 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Mar 6 16:33:41 2015 +0300
--
.../processors/cache/distributed/GridCacheLockAbstractTest.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0fbd3906/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index e4d4e5c..8c1fd41 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -122,6 +122,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Before 1st removeAll().");
+cache1.clear();
cache1.removeAll();
// Fix for tests where mapping was removed at primary node
@@ -136,6 +137,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Before 2nd removeAll().");
+cache2.clear();
cache2.removeAll();
// Fix for tests where mapping was removed at primary node
[14/18] incubator-ignite git commit: sp-2 store fixes
sp-2 store fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4b234cfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4b234cfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4b234cfa
Branch: refs/heads/ignite-51
Commit: 4b234cfae1f29a6fd20828ab40f7b52919bb9a16
Parents: 94b8adb
Author: Yakov Zhdanov
Authored: Fri Mar 6 15:49:08 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Mar 6 15:49:08 2015 +0300
--
.../apache/ignite/internal/processors/cache/GridCacheUtils.java | 2 +-
.../internal/processors/cache/GridCacheWriteBehindStore.java| 4 ++--
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 5 -
3 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b234cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index dcdf13e..a2c8af0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1785,7 +1785,7 @@ public class GridCacheUtils {
*/
@NotNull public static CacheException
convertToCacheException(IgniteCheckedException e) {
if (e.hasCause(CacheWriterException.class))
-return new CacheWriterException(U.convertExceptionLight(e));
+return new CacheWriterException(U.convertExceptionNoWrap(e));
if (e instanceof CachePartialUpdateCheckedException)
return new
CachePartialUpdateException((CachePartialUpdateCheckedException)e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b234cfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
index 63a72e3..e621ec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
@@ -433,7 +433,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache(entry.getKey(), entry, StoreOperation.PUT);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(U.convertExceptionLight(e));
+throw new CacheWriterException(U.convertExceptionNoWrap(e));
}
}
@@ -453,7 +453,7 @@ public class GridCacheWriteBehindStore implements
CacheStore, Lifecy
updateCache((K)key, null, StoreOperation.RMV);
}
catch (IgniteInterruptedCheckedException e) {
-throw new CacheWriterException(U.convertExceptionLight(e));
+throw new CacheWriterException(U.convertExceptionNoWrap(e));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b234cfa/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index b5bd40f..f58a24d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -613,10 +613,13 @@ public abstract class IgniteUtils {
}
/**
+ * Converts exception, but unlike {@link
#convertException(IgniteCheckedException)}
+ * does not wrap passed in exception if none suitable converter found.
+ *
* @param e Ignite checked exception.
* @return Ignite runtime exception.
*/
-public static Exception convertExceptionLight(IgniteCheckedException e) {
+public static Exception convertExceptionNoWrap(IgniteCheckedException e) {
C1 converter =
exceptionConverters.get(e.getClass());
if (converter != null)
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-8 [deleted] 325007bad
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-9 [deleted] 2116c654c
