You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/07 12:30:29 UTC
[01/14] incubator-ignite git commit: # ignite-684
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-680 3cdf666f5 -> 68a99f116
# ignite-684
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/360a41f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/360a41f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/360a41f2
Branch: refs/heads/ignite-680
Commit: 360a41f258fa405d33045d3dc90fb78767b75677
Parents: 60aaaaa
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 17:05:20 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 17:21:28 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 3 -
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 20 +--
.../org/apache/ignite/lang/IgniteImmutable.java | 49 ------
.../GridCacheOnCopyFlagAbstractSelfTest.java | 85 ----------
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 168 ++++++++++++++++++-
7 files changed, 169 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/360a41f2/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index f7f8e26..c90de92 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1415,11 +1415,8 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* Gets flag indicating whether copy of of the value stored in cache should be created
* for cache operation implying return value. Also if this flag is set copies are created for values
* passed to {@link CacheInterceptor} and to {@link CacheEntryProcessor}.
- * <p>
- * Copies are not created for immutable types, see {@link IgniteImmutable}.
*
* @return Copy on get flag.
- * @see IgniteImmutable
*/
public boolean isCopyOnRead() {
return cpOnRead;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/360a41f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
index fff6dd1..358ef1a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
@@ -160,8 +160,7 @@ public interface IgniteCacheObjectProcessor extends GridProcessor {
/**
* @param obj Value.
- * @return {@code True} if object is of known immutable type of it is marked
- * with {@link IgniteImmutable} annotation.
+ * @return {@code True} if object is of known immutable type.
*/
public boolean immutable(Object obj);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/360a41f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 7b3f270..bd79d0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -45,10 +45,6 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
/** Immutable classes. */
private static final Collection<Class<?>> IMMUTABLE_CLS = new HashSet<>();
- /** */
- private final GridBoundedConcurrentLinkedHashMap<Class<?>, Boolean> reflectionCache =
- new GridBoundedConcurrentLinkedHashMap<>(1024, 1024);
-
/**
*
*/
@@ -216,21 +212,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
@Override public boolean immutable(Object obj) {
assert obj != null;
- Class<?> cls = obj.getClass();
-
- if (IMMUTABLE_CLS.contains(cls))
- return true;
-
- Boolean immutable = reflectionCache.get(cls);
-
- if (immutable != null)
- return immutable;
-
- immutable = IgniteUtils.hasAnnotation(cls, IgniteImmutable.class);
-
- reflectionCache.putIfAbsent(cls, immutable);
-
- return immutable;
+ return IMMUTABLE_CLS.contains(obj.getClass());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/360a41f2/modules/core/src/main/java/org/apache/ignite/lang/IgniteImmutable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteImmutable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteImmutable.java
deleted file mode 100644
index bcecd7d..0000000
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteImmutable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.lang;
-
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-
-import java.lang.annotation.*;
-
-/**
- * Immutable types should be annotated with this annotation to avoid unnecessary
- * copying (e.g. in case of stateless compute closures or cache values).
- * <p>
- * If cache configuration flag {@link CacheConfiguration#isCopyOnRead()} is set
- * then for each operation implying return value copy of the value stored in cache is created.
- * Also if this flag is set copies are created for values passed to {@link CacheInterceptor} and
- * to {@link CacheEntryProcessor}.
- * <p>
- * Copies are not created for types marked with {@link IgniteImmutable} annotation and for known
- * immutable types:
- * <ul>
- * <li>Boxed primitives ({@link Integer}, {@link Long}, ...)</li>
- * <li>{@link String}</li>
- * <li>{@link java.util.UUID}</li>
- * <li>{@link java.math.BigDecimal}</li>
- * <li>{@link org.apache.ignite.lang.IgniteUuid}</li>
- * </ul>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface IgniteImmutable {
- // No-op.
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/360a41f2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
index 538567c..c1ad283 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
@@ -355,54 +355,6 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
/**
* @throws Exception If failed.
*/
- public void testPutGetImmutable() throws Exception {
- noInterceptor = true;
-
- IgniteCache<TestImmutableKey, TestImmutableValue> cache = grid(0).cache(null);
-
- Map<TestImmutableKey, TestImmutableValue> map = new HashMap<>();
-
- for (int i = 0; i < ITER_CNT; i++) {
- TestImmutableKey key = new TestImmutableKey(i, i);
- TestImmutableValue val = new TestImmutableValue(i);
-
- cache.put(key, val);
-
- map.put(key, val);
- }
-
- GridCacheAdapter cache0 = internalCache(cache);
-
- GridCacheContext cctx = cache0.context();
-
- for (Map.Entry<TestImmutableKey, TestImmutableValue> e : map.entrySet()) {
- GridCacheEntryEx entry = cache0.peekEx(e.getKey());
-
- assertNotNull("No entry for key: " + e.getKey(), entry);
-
- TestKey key0 = entry.key().value(cctx.cacheObjectContext(), false);
-
- assertSame(key0, e.getKey());
-
- TestKey key1 = entry.key().value(cctx.cacheObjectContext(), true);
-
- assertSame(key0, key1);
-
- TestImmutableValue val0 = entry.rawGet().value(cctx.cacheObjectContext(), false);
-
- assertNotSame(val0, e.getValue());
-
- TestImmutableValue val1 = entry.rawGet().value(cctx.cacheObjectContext(), true);
-
- assertNotSame(val0, val1);
-
- assertNotSame(e.getValue(), cache.get(e.getKey()));
- }
- }
-
- /**
- * @throws Exception If failed.
- */
public void testPutGetKnownImmutable() throws Exception {
noInterceptor = true;
@@ -648,41 +600,4 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
this.delegate = delegate;
}
}
-
- /**
- *
- */
- @IgniteImmutable
- public static class TestImmutableKey extends TestKey {
- /**
- *
- */
- public TestImmutableKey() {
- // No-op.
- }
-
- /**
- * @param key Key.
- * @param field Field.
- */
- public TestImmutableKey(int key, int field) {
- super(key, field);
- }
- }
-
- /**
- *
- */
- @IgniteImmutable
- public static class TestImmutableValue {
- /** */
- public int val;
-
- /**
- * @param val Value.
- */
- public TestImmutableValue(int val) {
- this.val = val;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/360a41f2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 0dd23a7..9446486 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -155,7 +155,6 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
/**
*
*/
- @IgniteImmutable
private static class TestObject implements Externalizable {
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/360a41f2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
index 9552258..3835c8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
@@ -40,6 +40,9 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
*
*/
public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstractTest {
+ /** */
+ private boolean cpyOnRead;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -58,6 +61,8 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
assertTrue(ccfg.isCopyOnRead());
+ ccfg.setCopyOnRead(cpyOnRead);
+
assertEquals(FULL_SYNC, ccfg.getWriteSynchronizationMode());
ccfg.setCacheStoreFactory(singletonFactory(new CacheStoreAdapter() {
@@ -93,10 +98,26 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
return 2 * 60_000;
}
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
/**
* @throws Exception If failed.
*/
public void testValueNotStored() throws Exception {
+ cpyOnRead = true;
+
+ startGrids();
+
IgniteCache<TestKey, TestValue> cache = grid(0).cache(null);
Affinity<Object> aff = grid(0).affinity(null);
@@ -221,10 +242,18 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
e = ((GridNearCacheAdapter)cache0).dht().peekEx(key);
if (e != null) {
+ KeyCacheObject keyObj = e.key();
+
+ assertNotNull(keyObj);
+
+ assertEquals(KeyCacheObjectImpl.class, keyObj.getClass());
+
+ assertNotNull("Unexpected value, node: " + g,
+ GridTestUtils.getFieldValue(keyObj, CacheObjectAdapter.class, "val"));
+
CacheObject obj = e.rawGet();
if (obj != null) {
- assertNotNull(obj);
assertEquals(CacheObjectImpl.class, obj.getClass());
assertNull("Unexpected value, node: " + g,
@@ -249,6 +278,143 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
}
/**
+ * @throws Exception If failed.
+ */
+ public void testValueStored() throws Exception {
+ cpyOnRead = false;
+
+ startGrids();
+
+ IgniteCache<TestKey, TestValue> cache = grid(0).cache(null);
+
+ Affinity<Object> aff = grid(0).affinity(null);
+
+ for (int i = 0; i < 100; i++) {
+ TestKey key = new TestKey(i);
+ TestValue val = new TestValue(i);
+
+ cache.put(key, val);
+
+ checkHasValue(aff, key);
+
+ for (int g = 0; g < gridCount(); g++)
+ assertNotNull(grid(g).cache(null).get(key));
+
+ checkHasValue(aff, key);
+
+ cache.invoke(key, new CacheEntryProcessor<TestKey, TestValue, Object>() {
+ @Override public Object process(MutableEntry<TestKey, TestValue> entry, Object... args) {
+ assertNotNull(entry.getValue());
+
+ entry.setValue(new TestValue(10_000));
+
+ return new TestValue(20_000);
+ }
+ });
+
+ checkHasValue(aff, key);
+
+ for (int g = 0; g < gridCount(); g++)
+ assertNotNull(grid(g).cache(null).get(key));
+
+ checkHasValue(aff, key);
+
+ cache.remove(key);
+
+ for (int g = 0; g < gridCount(); g++)
+ assertNull(grid(g).cache(null).get(key));
+
+ try (IgniteDataStreamer<TestKey, TestValue> streamer = grid(0).dataStreamer(null)) {
+ streamer.addData(key, val);
+ }
+
+ checkHasValue(aff, key);
+
+ cache.remove(key);
+
+ atomicClockModeDelay(cache);
+
+ try (IgniteDataStreamer<TestKey, TestValue> streamer = grid(0).dataStreamer(null)) {
+ streamer.allowOverwrite(true);
+
+ streamer.addData(key, val);
+ }
+
+ checkHasValue(aff, key);
+
+ if (aff.isPrimaryOrBackup(grid(0).localNode(), key)) {
+ cache.localEvict(Collections.singleton(key));
+
+ assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
+
+ cache.localPromote(Collections.singleton(key));
+
+ assertNotNull(cache.localPeek(key, CachePeekMode.ONHEAP));
+
+ checkHasValue(aff, key);
+ }
+ }
+ }
+
+ /**
+ * @param aff Affinity.
+ * @param key Key.
+ */
+ private void checkHasValue(Affinity<Object> aff, Object key) {
+ for (int g = 0; g < gridCount(); g++) {
+ GridCacheAdapter cache0 = internalCache(grid(g), null);
+
+ GridCacheEntryEx e = cache0.peekEx(key);
+
+ if (e == null && cache0.isNear())
+ e = ((GridNearCacheAdapter)cache0).dht().peekEx(key);
+
+ if (e != null) {
+ KeyCacheObject keyObj = e.key();
+
+ assertNotNull(keyObj);
+
+ assertEquals(KeyCacheObjectImpl.class, keyObj.getClass());
+
+ assertNotNull("Unexpected value, node: " + g,
+ GridTestUtils.getFieldValue(keyObj, CacheObjectAdapter.class, "val"));
+
+ CacheObject obj = e.rawGet();
+
+ if (obj != null) {
+ assertEquals(CacheObjectImpl.class, obj.getClass());
+
+ assertNotNull("Unexpected value, node: " + g,
+ GridTestUtils.getFieldValue(obj, CacheObjectAdapter.class, "val"));
+
+ Object val0 = obj.value(cache0.context().cacheObjectContext(), true);
+
+ assertNotNull("Unexpected value after value() requested1: " + g,
+ GridTestUtils.getFieldValue(obj, CacheObjectAdapter.class, "val"));
+
+ Object val1 = obj.value(cache0.context().cacheObjectContext(), true);
+
+ assertNotNull("Unexpected value after value() requested2: " + g,
+ GridTestUtils.getFieldValue(obj, CacheObjectAdapter.class, "val"));
+
+ assertSame(val0, val1);
+
+ Object val2 = obj.value(cache0.context().cacheObjectContext(), false);
+
+ assertNotNull("Unexpected value after value() requested3: " + g,
+ GridTestUtils.getFieldValue(obj, CacheObjectAdapter.class, "val"));
+
+ assertSame(val1, val2);
+ }
+ else
+ assertFalse(aff.isPrimaryOrBackup(grid(g).localNode(), key));
+ }
+ else
+ assertFalse("Entry not found, node: " + g, aff.isPrimaryOrBackup(grid(g).localNode(), key));
+ }
+ }
+
+ /**
*
*/
static class TestKey implements Serializable {
[03/14] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-684
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-684
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72c6dd19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72c6dd19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72c6dd19
Branch: refs/heads/ignite-680
Commit: 72c6dd1933985a443ca6f5781871f05182c9072a
Parents: ed0b864 d20d29b
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 12:05:49 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 12:05:49 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
.../streaming/StreamTransformerExample.java | 101 +
.../streaming/StreamVisitorExample.java | 171 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 48 +
.../streaming/wordcount/QueryWords.java | 77 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../ignite/cache/affinity/AffinityUuid.java | 50 +
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 +-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../store/jdbc/CacheAbstractJdbcStore.java | 104 +-
.../processors/query/GridQueryProcessor.java | 8 +-
.../ignite/internal/util/IgniteUtils.java | 46 +-
.../ignite/internal/visor/cache/VisorCache.java | 19 +-
.../VisorCacheConfigurationCollectorJob.java | 76 +
.../VisorCacheConfigurationCollectorTask.java | 39 +
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../visor/node/VisorGridConfiguration.java | 38 -
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 1 +
.../internal/visor/util/VisorTaskUtils.java | 3 +-
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 ++
.../query/h2/sql/GridSqlQuerySplitter.java | 22 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
modules/schedule/pom.xml | 20 +
.../commands/cache/VisorCacheCommand.scala | 26 +-
.../config/VisorConfigurationCommand.scala | 15 +-
.../visor/commands/gc/VisorGcCommand.scala | 15 +-
.../scala/org/apache/ignite/visor/visor.scala | 34 +-
.../yardstick/config/benchmark-store.properties | 5 +-
parent/pom.xml | 1 +
pom.xml | 63 +-
55 files changed, 5429 insertions(+), 1184 deletions(-)
----------------------------------------------------------------------
[06/14] incubator-ignite git commit: [maven-release-plugin] prepare
for next development iteration
Posted by sb...@apache.org.
[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/238cbb1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/238cbb1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/238cbb1e
Branch: refs/heads/ignite-680
Commit: 238cbb1eff6169d47536f5fd21eef6eb228d7558
Parents: 1bebf7e
Author: Ignite Teamcity <ig...@apache.org>
Authored: Tue Apr 7 12:39:07 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Tue Apr 7 12:39:07 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 6 +-----
modules/aop/pom.xml | 6 +-----
modules/aws/pom.xml | 6 +-----
modules/clients/pom.xml | 6 +-----
modules/codegen/pom.xml | 6 +-----
modules/core/pom.xml | 6 +-----
modules/extdata/p2p/pom.xml | 6 +-----
modules/extdata/uri/pom.xml | 6 +-----
modules/geospatial/pom.xml | 6 +-----
modules/hadoop/pom.xml | 6 +-----
modules/hibernate/pom.xml | 6 +-----
modules/indexing/pom.xml | 6 +-----
modules/jcl/pom.xml | 6 +-----
modules/jta/pom.xml | 6 +-----
modules/log4j/pom.xml | 6 +-----
modules/rest-http/pom.xml | 6 +-----
modules/scalar/pom.xml | 6 +-----
modules/schedule/pom.xml | 6 +-----
modules/schema-import/pom.xml | 6 +-----
modules/slf4j/pom.xml | 6 +-----
modules/spring/pom.xml | 6 +-----
modules/ssh/pom.xml | 6 +-----
modules/tools/pom.xml | 6 +-----
modules/urideploy/pom.xml | 6 +-----
modules/visor-console/pom.xml | 6 +-----
modules/visor-plugins/pom.xml | 6 +-----
modules/web/pom.xml | 6 +-----
modules/yardstick/pom.xml | 6 +-----
pom.xml | 4 ++--
29 files changed, 30 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 7ba2fb7..55e3e84 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -225,8 +225,4 @@
</build>
</profile>
</profiles>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 2986cef..4a4acb8 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -107,8 +107,4 @@
</testResource>
</testResources>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 71e9b70..0691192 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -99,8 +99,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index e6c1a01..5be6a28 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -128,8 +128,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index c63ddd4..0b0234e 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -52,8 +52,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 0268b9d..9882e20 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -424,8 +424,4 @@
</build>
</profile>
</profiles>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index ec911a8..c4ab1ca 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -93,8 +93,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index c4a6ffc..01ec830 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -122,8 +122,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 67e0947..ce1882c 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -81,8 +81,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index d005574..bacb214 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -224,8 +224,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index b962be7..4f4e6fb 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -120,8 +120,4 @@
</testResource>
</testResources>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index ac3b791..5fe9017 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -93,8 +93,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 4f2dfbc..acf5b50 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -54,8 +54,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 7002753..8051a04 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -82,8 +82,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index c722a35..bb5f222 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -53,8 +53,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index e0bcf09..752b90d 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -113,8 +113,4 @@
<version>1.8.3</version>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 8964300..5e5bd45 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -185,8 +185,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index b616aa4..a8e6596 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -74,8 +74,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 61b8b4f..b7bd056 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -99,8 +99,4 @@
</dependencies>
</profile>
</profiles>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 3153d11..336167f 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -46,8 +46,4 @@
<version>1.6.4</version>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 4a87152..2694a83 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -115,8 +115,4 @@
</testResource>
</testResources>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index aee3750..37bbe08 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -68,8 +68,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 545e0a2..38e322d 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,8 +74,4 @@
</dependencies>
</profile>
</profiles>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 86610da..cb2d924 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -150,8 +150,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 0403e02..8067a9c 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -153,8 +153,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 69416c3..417c205 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<!-- Ignite dependencies -->
@@ -73,8 +73,4 @@
</resource>
</resources>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 97195f4..7ef4f17 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -88,8 +88,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 5ec1481..ce22309 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
@@ -194,8 +194,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>ignite-sprint-3-release-test-branch</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/238cbb1e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index edca980..62e0466 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>incubator-ignite</artifactId>
- <version>1.0.1-RC1-SNAPSHOT</version>
+ <version>1.0.2-RC1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -43,7 +43,7 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-ignite</url>
<connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-ignite</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ignite</developerConnection>
- <tag>ignite-sprint-3-release-test-branch</tag>
+ <tag>HEAD</tag>
</scm>
<distributionManagement>
[11/14] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-sprint-3
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-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/cd65c177
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd65c177
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd65c177
Branch: refs/heads/ignite-680
Commit: cd65c17763eef3924230bec4808c1df85b245072
Parents: 404da5f 1a8bd5b
Author: Andrey Novikov <an...@gridgain.com>
Authored: Tue Apr 7 17:08:40 2015 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Tue Apr 7 17:08:40 2015 +0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +--
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -----
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +----------
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 ++++++++++++++++++-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
38 files changed, 230 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
[08/14] incubator-ignite git commit: sprint-3 version rollback
Posted by sb...@apache.org.
sprint-3 version rollback
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a9d51775
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9d51775
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9d51775
Branch: refs/heads/ignite-680
Commit: a9d51775b0ab3cd31ac59146ca28ce0cf8d1ce99
Parents: 238cbb1
Author: avinogradov <av...@gridgain.com>
Authored: Tue Apr 7 13:00:07 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Apr 7 13:00:07 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 55e3e84..08f44eb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 4a4acb8..917ccc6 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 0691192..b738450 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 5be6a28..29250f4 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 0b0234e..2990330 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 9882e20..466ccb9 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index c4ab1ca..c8f0d63 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 01ec830..ed7bff5 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index ce1882c..d0ae253 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index bacb214..69d5294 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 4f4e6fb..eba98b5 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 5fe9017..5851e66 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index acf5b50..c2d1851 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 8051a04..dbf4eac 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index bb5f222..6f88587 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 752b90d..cbade02 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 5e5bd45..83de256 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index a8e6596..fe11f3f 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index b7bd056..9eb95c1 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 336167f..9feba39 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 2694a83..533c1f2 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 37bbe08..1f70406 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 38e322d..68b1fb9 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index cb2d924..d8a9aa1 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 8067a9c..bd1d20c 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 417c205..a63289d 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 7ef4f17..eeeec39 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index ce22309..0d2e81a 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9d51775/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 62e0466..6dcf63d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>incubator-ignite</artifactId>
- <version>1.0.2-RC1-SNAPSHOT</version>
+ <version>1.0.1-RC1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
[13/14] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-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/5f2d8c29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f2d8c29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f2d8c29
Branch: refs/heads/ignite-680
Commit: 5f2d8c29a0d13704810d6b4befcdea9538c2eec3
Parents: 74f6b68 cd65c17
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 13:29:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 13:29:10 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../apache/ignite/internal/visor/log/VisorLogSearchTask.java | 3 +--
.../ignite/internal/visor/query/VisorQueryNextPageTask.java | 5 ++---
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
31 files changed, 32 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
[09/14] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-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/1a8bd5b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a8bd5b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a8bd5b7
Branch: refs/heads/ignite-680
Commit: 1a8bd5b78b5ac848c2aa8c4f20bcd23b9711814b
Parents: a9d5177 25af55a
Author: avinogradov <av...@gridgain.com>
Authored: Tue Apr 7 13:01:41 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Apr 7 13:01:41 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +--
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -----
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +----------
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 ++++++++++++++++++-
9 files changed, 201 insertions(+), 204 deletions(-)
----------------------------------------------------------------------
[05/14] incubator-ignite git commit: [maven-release-plugin] prepare
branch ignite-sprint-3-release-test-branch
Posted by sb...@apache.org.
[maven-release-plugin] prepare branch ignite-sprint-3-release-test-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/1bebf7ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1bebf7ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1bebf7ef
Branch: refs/heads/ignite-680
Commit: 1bebf7ef4ed2593e2179437e0871c3e642337315
Parents: d20d29b
Author: Ignite Teamcity <ig...@apache.org>
Authored: Tue Apr 7 12:39:00 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Tue Apr 7 12:39: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-import/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 ++++
modules/yardstick/pom.xml | 4 ++++
pom.xml | 14 +++++++-------
29 files changed, 119 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 08f44eb..7ba2fb7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -225,4 +225,8 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 917ccc6..2986cef 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -107,4 +107,8 @@
</testResource>
</testResources>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index b738450..71e9b70 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -99,4 +99,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 29250f4..e6c1a01 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -128,4 +128,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 2990330..c63ddd4 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -52,4 +52,8 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 466ccb9..0268b9d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -424,4 +424,8 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index c8f0d63..ec911a8 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -93,4 +93,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index ed7bff5..c4a6ffc 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -122,4 +122,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index d0ae253..67e0947 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -81,4 +81,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 69d5294..d005574 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -224,4 +224,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index eba98b5..b962be7 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -120,4 +120,8 @@
</testResource>
</testResources>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 5851e66..ac3b791 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -93,4 +93,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index c2d1851..4f2dfbc 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -54,4 +54,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index dbf4eac..7002753 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -82,4 +82,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 6f88587..c722a35 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -53,4 +53,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index cbade02..e0bcf09 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -113,4 +113,8 @@
<version>1.8.3</version>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 83de256..8964300 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -185,4 +185,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index fe11f3f..b616aa4 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -74,4 +74,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 9eb95c1..61b8b4f 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -99,4 +99,8 @@
</dependencies>
</profile>
</profiles>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 9feba39..3153d11 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -46,4 +46,8 @@
<version>1.6.4</version>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 533c1f2..4a87152 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -115,4 +115,8 @@
</testResource>
</testResources>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 1f70406..aee3750 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -68,4 +68,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 68b1fb9..545e0a2 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -74,4 +74,8 @@
</dependencies>
</profile>
</profiles>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index d8a9aa1..86610da 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -150,4 +150,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index bd1d20c..0403e02 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -153,4 +153,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index a63289d..69416c3 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -73,4 +73,8 @@
</resource>
</resources>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index eeeec39..97195f4 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -88,4 +88,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 0d2e81a..5ec1481 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -194,4 +194,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>ignite-sprint-3-release-test-branch</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1bebf7ef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e1e292c..edca980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-ignite</url>
<connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-ignite</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ignite</developerConnection>
- <tag>HEAD</tag>
+ <tag>ignite-sprint-3-release-test-branch</tag>
</scm>
<distributionManagement>
@@ -155,7 +155,7 @@
<configuration>
<target>
<copy todir="${basedir}/libs">
- <fileset dir="${basedir}/target/release-package/libs"/>
+ <fileset dir="${basedir}/target/release-package/libs" />
</copy>
</target>
</configuration>
@@ -544,11 +544,11 @@
<include name="${project.artifactId}-${project.version}-source-release.zip.sha1" />
</zipfileset>
</zip>
- <mkdir dir="${basedir}/target/site"/>
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip" todir="${basedir}/target/site"/>
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.asc" todir="${basedir}/target/site"/>
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.md5" todir="${basedir}/target/site"/>
- <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.sha1" todir="${basedir}/target/site"/>
+ <mkdir dir="${basedir}/target/site" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip" todir="${basedir}/target/site" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.asc" todir="${basedir}/target/site" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.md5" todir="${basedir}/target/site" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.sha1" todir="${basedir}/target/site" />
</target>
</configuration>
</execution>
[07/14] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-684' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-684' into ignite-sprint-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/25af55a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25af55a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25af55a1
Branch: refs/heads/ignite-680
Commit: 25af55a10e692d61adf05d15b4f17c113dacbcdb
Parents: 238cbb1 6be884e
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 12:57:02 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 12:57:02 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +--
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -----
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +----------
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 ++++++++++++++++++-
9 files changed, 201 insertions(+), 204 deletions(-)
----------------------------------------------------------------------
[12/14] incubator-ignite git commit: # ignite-sprint-3 disable
hanging test
Posted by sb...@apache.org.
# ignite-sprint-3 disable hanging test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74f6b680
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74f6b680
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74f6b680
Branch: refs/heads/ignite-680
Commit: 74f6b680994e31127410383cb719e53d44e42fa0
Parents: 25af55a
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 13:28:47 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 13:28:47 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74f6b680/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index e5b7d68..3679cdd 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -86,6 +86,11 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest {
return new NearCacheConfiguration();
}
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ fail("Enable when https://issues.apache.org/jira/browse/IGNITE-647 is fixed.");
+ }
+
/**
* @throws Exception if failed.
*/
[02/14] incubator-ignite git commit: # ignite-684
Posted by sb...@apache.org.
# ignite-684
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed0b8646
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed0b8646
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed0b8646
Branch: refs/heads/ignite-680
Commit: ed0b8646deadb20ab0cd86e987c2a326d380ed78
Parents: 360a41f
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 09:31:43 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 09:31:43 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheLazyEntry.java | 10 ++++----
.../processors/cache/KeyCacheObjectImpl.java | 13 +---------
.../IgniteCacheObjectProcessorImpl.java | 5 ----
.../GridCacheOnCopyFlagAbstractSelfTest.java | 27 +++++---------------
.../IgniteCacheStoreValueAbstractTest.java | 18 +++++++++++++
5 files changed, 30 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed0b8646/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
index a2b0bff..d0f0d4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
@@ -68,18 +68,18 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
/**
* @param ctx Cache context.
- * @param keyObject Key cache object.
+ * @param keyObj Key cache object.
* @param key Key value.
* @param valObj Cache object
* @param val Cache value.
*/
public CacheLazyEntry(GridCacheContext<K, V> ctx,
- KeyCacheObject keyObject,
- K key,
- CacheObject valObj,
+ KeyCacheObject keyObj,
+ K key,
+ CacheObject valObj,
V val) {
this.cctx = ctx;
- this.keyObj = keyObject;
+ this.keyObj = keyObj;
this.key = key;
this.valObj = valObj;
this.val = val;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed0b8646/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
index 429b30c..61ca882 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
@@ -72,18 +72,7 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Nullable @Override public <T> T value(CacheObjectContext ctx, boolean cpy) {
- cpy = cpy && needCopy(ctx);
-
- if (cpy) {
- try {
- return (T)ctx.processor().unmarshal(ctx,
- valBytes,
- val.getClass().getClassLoader());
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException("Failed to unmarshal object.", e);
- }
- }
+ assert val != null;
return (T)val;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed0b8646/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index bd79d0c..7815e91 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -278,11 +278,6 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
}
/** {@inheritDoc} */
- @Nullable @Override public <T> T value(CacheObjectContext ctx, boolean cpy) {
- return super.value(ctx, false); // Do not need copy since user value is not in cache.
- }
-
- /** {@inheritDoc} */
@Override public CacheObject prepareForCache(CacheObjectContext ctx) {
try {
if (!ctx.processor().immutable(val)) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed0b8646/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
index c1ad283..cea6ca1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
@@ -138,8 +138,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
assertSame(entry.getValue(), entry.getValue());
assertSame(entry.getKey(), entry.getKey());
- // Try change key and value.
- entry.getKey().field(WRONG_VALUE);
+ // Try change value.
entry.getValue().val(WRONG_VALUE);
}
});
@@ -161,8 +160,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
assertEquals(newTestVal, newVal);
- // Try change key and value.
- entry.getKey().field(WRONG_VALUE);
+ // Try change value.
entry.getValue().val(WRONG_VALUE);
return newVal;
@@ -174,8 +172,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
assertSame(entry.getValue(), entry.getValue());
assertSame(entry.getKey(), entry.getKey());
- // Try change key and value.
- entry.getKey().field(WRONG_VALUE);
+ // Try change value.
entry.getValue().val(WRONG_VALUE);
}
});
@@ -221,7 +218,6 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
assertEquals(entry.getKey().key(), entry.getKey().field());
// Try changed entry.
- entry.getKey().field(WRONG_VALUE);
entry.getValue().val(WRONG_VALUE);
return super.onBeforePut(entry, newVal);
@@ -231,7 +227,6 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
assertEquals(entry.getKey().key(), entry.getKey().field());
entry.getValue().val(WRONG_VALUE);
- entry.getKey().field(WRONG_VALUE);
super.onAfterPut(entry);
}
@@ -241,12 +236,10 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
cache.invoke(new TestKey(i, i), new EntryProcessor<TestKey, TestValue, Object>() {
@Override public Object process(MutableEntry<TestKey, TestValue> entry, Object... arguments)
throws EntryProcessorException {
- // Check that we have correct value and key.
- assertEquals(entry.getKey().key(), entry.getKey().field());
+ // Check that we have correct value.
assertEquals(entry.getKey().key(), entry.getValue().val());
// Try changed entry.
- entry.getKey().field(WRONG_VALUE);
entry.getValue().val(WRONG_VALUE);
return -1;
@@ -294,7 +287,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
TestKey key1 = entry.key().value(cctx.cacheObjectContext(), true);
- assertNotSame(key0, key1);
+ assertSame(key0, key1);
TestValue val0 = entry.rawGet().value(cctx.cacheObjectContext(), false);
@@ -340,7 +333,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
TestKey key1 = entry.key().value(cctx.cacheObjectContext(), true);
- assertNotSame(key0, key1);
+ assertSame(key0, key1);
byte[] val0 = entry.rawGet().value(cctx.cacheObjectContext(), false);
@@ -442,14 +435,6 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
return field;
}
- /**
- * *
- * @param field Test field.
- */
- public void field(int field) {
- this.field = field;
- }
-
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
if (this == o) return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed0b8646/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
index 3835c8e..6c7c38d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
@@ -251,6 +251,15 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
assertNotNull("Unexpected value, node: " + g,
GridTestUtils.getFieldValue(keyObj, CacheObjectAdapter.class, "val"));
+ Object key0 = keyObj.value(cache0.context().cacheObjectContext(), true);
+ Object key1 = keyObj.value(cache0.context().cacheObjectContext(), false);
+ Object key2 = keyObj.value(cache0.context().cacheObjectContext(), true);
+ Object key3 = keyObj.value(cache0.context().cacheObjectContext(), false);
+
+ assertSame(key0, key1);
+ assertSame(key1, key2);
+ assertSame(key2, key3);
+
CacheObject obj = e.rawGet();
if (obj != null) {
@@ -379,6 +388,15 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
assertNotNull("Unexpected value, node: " + g,
GridTestUtils.getFieldValue(keyObj, CacheObjectAdapter.class, "val"));
+ Object key0 = keyObj.value(cache0.context().cacheObjectContext(), true);
+ Object key1 = keyObj.value(cache0.context().cacheObjectContext(), false);
+ Object key2 = keyObj.value(cache0.context().cacheObjectContext(), true);
+ Object key3 = keyObj.value(cache0.context().cacheObjectContext(), false);
+
+ assertSame(key0, key1);
+ assertSame(key1, key2);
+ assertSame(key2, key3);
+
CacheObject obj = e.rawGet();
if (obj != null) {
[14/14] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-680
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68a99f11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68a99f11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68a99f11
Branch: refs/heads/ignite-680
Commit: 68a99f116dfc760a51016cc30390a363077fd8b0
Parents: 3cdf666 5f2d8c2
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 13:30:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 13:30:10 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 3 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 3 +-
.../IgniteCacheObjectProcessorImpl.java | 28 +--
.../internal/visor/log/VisorLogSearchTask.java | 3 +-
.../visor/query/VisorQueryNextPageTask.java | 5 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -----
.../ignite/IgniteCacheAffinitySelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +----------
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../IgniteCacheStoreValueAbstractTest.java | 186 ++++++++++++++++++-
pom.xml | 12 +-
13 files changed, 215 insertions(+), 215 deletions(-)
----------------------------------------------------------------------
[10/14] incubator-ignite git commit: # ignite-sprint-3 Fixed
exception handling in Visor tasks.
Posted by sb...@apache.org.
# ignite-sprint-3 Fixed exception handling in Visor tasks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/404da5f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/404da5f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/404da5f2
Branch: refs/heads/ignite-680
Commit: 404da5f2368f48f9c99c467c98a2af53481962bd
Parents: 238cbb1
Author: Andrey Novikov <an...@gridgain.com>
Authored: Tue Apr 7 17:08:19 2015 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Tue Apr 7 17:08:19 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/internal/visor/log/VisorLogSearchTask.java | 3 +--
.../ignite/internal/visor/query/VisorQueryNextPageTask.java | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/404da5f2/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
index 470a739..476d58c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.log;
import org.apache.ignite.*;
import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.util.io.*;
import org.apache.ignite.internal.util.lang.*;
@@ -213,7 +212,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi
URL url = U.resolveIgniteUrl(arg.folder);
if (url == null)
- throw U.convertException(new GridInternalException(new FileNotFoundException("Log folder not found: " + arg.folder)));
+ throw new IgniteException(new FileNotFoundException("Log folder not found: " + arg.folder));
UUID uuid = ignite.localNode().id();
String nid = uuid.toString().toLowerCase();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/404da5f2/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index d922ad1..3f13d5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.visor.query;
import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.*;
@@ -77,7 +76,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
VisorQueryTask.VisorFutureResultSetHolder<List<?>> t = storage.get(arg.get1());
if (t == null)
- throw new GridInternalException("SQL query results are expired.");
+ throw new IgniteException("SQL query results are expired.");
IgniteBiTuple<List<Object[]>, List<?>> nextRows = VisorQueryUtils.fetchSqlQueryRows(t.future(), t.next(), arg.get2());
@@ -101,7 +100,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>> t = storage.get(arg.get1());
if (t == null)
- throw new GridInternalException("Scan query results are expired.");
+ throw new IgniteException("Scan query results are expired.");
IgniteBiTuple<List<Object[]>, Map.Entry<Object, Object>> rows =
VisorQueryUtils.fetchScanQueryRows(t.future(), t.next(), arg.get2());
[04/14] incubator-ignite git commit: # ignite-684
Posted by sb...@apache.org.
# ignite-684
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6be884ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6be884ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6be884ee
Branch: refs/heads/ignite-680
Commit: 6be884eec804c5ef1f060a7b0364f5ab52caf23a
Parents: 72c6dd1
Author: sboikov <sb...@gridgain.com>
Authored: Tue Apr 7 12:17:31 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Apr 7 12:17:31 2015 +0300
----------------------------------------------------------------------
.../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6be884ee/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 7815e91..95fb9f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -337,7 +337,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
ClassLoader ldr = ctx.p2pEnabled() ?
IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader();
- Object val = ctx.processor().unmarshal(ctx, valBytes, ldr);
+ Object val = this.val != null && ctx.processor().immutable(this.val) ? this.val :
+ ctx.processor().unmarshal(ctx, valBytes, ldr);
return new CacheObjectImpl(val, valBytes);
}