ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 1d17075f3 -> a8beeae10
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8beeae1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8beeae1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8beeae1
Branch: refs/heads/ignite-1537
Commit: a8beeae100c52b2bdf68322831289fd28fa36d35
Parents: 1d17075
Author: sboikov
Authored: Fri Dec 18 10:35:10 2015 +0300
Committer: sboikov
Committed: Fri Dec 18 10:35:10 2015 +0300
--
.../cache/eviction/random/RandomEvictionPolicySelfTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a8beeae1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
index af04cdc..a253a25 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
@@ -197,7 +197,9 @@ public class RandomEvictionPolicySelfTest extends
}
}, 10);
-assert g.cache(null).size() <= max;
+int size = g.cache(null).size();
+
+assertTrue("Unexpected cache size [size=" + size + ", max=" + max
+ ']', size <= max);
info(policy(0));
}
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 0de549342 -> 1d17075f3
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1d17075f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1d17075f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1d17075f
Branch: refs/heads/ignite-1537
Commit: 1d17075f32b1ed9957ff2e96a3d1041c8e678afc
Parents: 0de5493
Author: sboikov
Authored: Fri Dec 18 10:24:17 2015 +0300
Committer: sboikov
Committed: Fri Dec 18 10:24:17 2015 +0300
--
.../client/integration/ClientAbstractConnectivitySelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1d17075f/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
index ef18a29..8207ccf 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
@@ -134,7 +134,7 @@ public abstract class ClientAbstractConnectivitySelfTest
extends GridCommonAbstr
/**
* Simple test of address list filtering.
- * @throws Exception
+ * @throws Exception If failed.
*/
public void testResolveReachableOneAddress() throws Exception {
InetAddress addr = InetAddress.getByAddress(new byte[] {127, 0, 0, 1}
);
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 1995b97a1 -> 0de549342
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0de54934
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0de54934
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0de54934
Branch: refs/heads/ignite-1537
Commit: 0de5493422cbe2e3753015c78c2152507abe785f
Parents: 1995b97
Author: sboikov
Authored: Fri Dec 18 10:11:15 2015 +0300
Committer: sboikov
Committed: Fri Dec 18 10:11:15 2015 +0300
--
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../internal/util/lang/GridNodePredicate.java | 13 +---
.../ignite/internal/ClusterGroupSelfTest.java | 32 ++--
3 files changed, 48 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0de54934/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 9039ed8..75168a1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -626,7 +626,15 @@ public class ClusterGroupAdapter implements
ClusterGroupEx, Externalizable {
/** {@inheritDoc} */
@Override public final ClusterGroup forRandom() {
-return ids != null ? forNodeId(F.rand(ids)) : forNode(F.rand(nodes()));
+if (!F.isEmpty(ids))
+return forNodeId(F.rand(ids));
+
+Collection nodes = nodes();
+
+if (nodes.isEmpty())
+return new ClusterGroupAdapter(ctx, null,
Collections.emptySet());
+
+return forNode(F.rand(nodes));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/0de54934/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
index 4ce0b35..edec862 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
@@ -100,13 +100,18 @@ public class GridNodePredicate implements
IgnitePredicate, Iterable
public GridNodePredicate(@Nullable ClusterNode... nodes) {
if (F.isEmpty(nodes))
ids = Collections.emptySet();
-else if (nodes.length == 1)
-ids = Collections.singleton(nodes[0].id());
+else if (nodes.length == 1) {
+ClusterNode node = nodes[0];
+
+ids = node != null ? Collections.singleton(node.id()) :
Collections.emptySet();
+}
else {
ids = U.newHashSet(nodes.length);
-for (ClusterNode n : nodes)
-ids.add(n.id());
+for (ClusterNode n : nodes) {
+if (n != null)
+ids.add(n.id());
+}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0de54934/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
index d916d78..18eb3b7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
@@ -109,6 +109,10 @@ public class ClusterGroupSelfTest extends
ClusterGroupAbstractTest {
}
assertEquals(oldest.node(), ignite.cluster().forNode(node).node());
+
+ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent",
"val");
+
+assertEquals(0, emptyGrp.forOldest().nodes().size());
}
/**
@@ -130,6 +134,10 @@ public class ClusterGroupSelfTest extends
ClusterGroupAbstractTest {
}
assertEquals(youngest.node(), ignite.cluster().forNode(node).node());
+
+ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent",
"val");
+
+assertEquals(0, emptyGrp.forYoungest().nodes().size());
}
/**
@@ -187,8 +195,7 @@ public
[5/6] ignite git commit: Fixed CacheEntry toString()
Fixed CacheEntry toString()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4b547bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4b547bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4b547bd
Branch: refs/heads/ignite-843-rc2
Commit: a4b547bd11ca3bf4a5cdfaac3ad01936cf6e995e
Parents: e1b2cf2
Author: Valentin Kulichenko
Authored: Thu Dec 17 17:07:26 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 17:07:26 2015 -0800
--
.../internal/processors/cache/CacheEntryImpl.java | 6 +++---
.../processors/cache/CacheEntryImplEx.java | 17 ++---
2 files changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index 71c684a..48649d2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -81,10 +81,10 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public T unwrap(Class cls) {
-if(cls.isAssignableFrom(getClass()))
+if (cls.isAssignableFrom(getClass()))
return cls.cast(this);
-if (ver != null && cls.isAssignableFrom(CacheEntry.class))
+if (cls.isAssignableFrom(CacheEntry.class))
return (T)new CacheEntryImplEx<>(key, val, ver);
throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
@@ -106,4 +106,4 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index f3e6c18..1c7111a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -78,7 +78,18 @@ public class CacheEntryImplEx extends
CacheEntryImpl implements Cach
/** {@inheritDoc} */
public String toString() {
-return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
topVer=" + ver.topologyVersion() +
-", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ",
updateTime=" + ver.globalTime() + ']';
+String res = "CacheEntry [key=" + getKey() +
+", val=" + getValue();
+
+if (ver != null) {
+res += ", topVer=" + ver.topologyVersion() +
+", nodeOrder=" + ver.nodeOrder() +
+", order=" + ver.order() +
+", updateTime=" + ver.globalTime();
+}
+else
+res += ", ver=n/a";
+
+return res + ']';
}
-}
\ No newline at end of file
+}
[2/6] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all
modes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/057ad5bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/057ad5bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/057ad5bb
Branch: refs/heads/ignite-843-rc2
Commit: 057ad5bb4d054cba90932ff5614a928b623d44cc
Parents: 1f484ea
Author: vozerov-gridgain
Authored: Thu Dec 17 17:00:29 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:00:29 2015 +0300
--
.../binary/BinaryReflectiveSerializer.java | 33 ++
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../internal/binary/BinaryClassDescriptor.java | 124 ++
.../ignite/internal/binary/BinaryContext.java | 109 -
.../internal/binary/BinaryFieldAccessor.java| 3 -
.../ignite/internal/binary/BinaryUtils.java | 49 ++-
.../ignite/internal/binary/BinaryWriteMode.java | 3 -
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java| 204 ++---
.../binary/BinaryFieldsAbstractSelfTest.java| 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java| 3 +-
.../binary/BinaryMarshallerSelfTest.java| 34 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 +++
...onQueryWithReflectiveSerializerSelfTest.java | 28 ++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java| 119 +-
26 files changed, 995 insertions(+), 220 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
new file mode 100644
index 000..fd0f841
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+/**
+ * Binary serializer which writes object fields using reflection. Transient
fields are not written.
+ */
+public class BinaryReflectiveSerializer implements BinarySerializer {
+/** {@inheritDoc} */
+@Override public void writeBinary(Object obj, BinaryWriter writer) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+
+/** {@inheritDoc} */
+@Override public void readBinary(Object obj, BinaryReader reader) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
index a694eaf..a00c061 100644
---
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
@@ -17,9 +17,10 @@
package org.apache.ignite.binary;
[4/6] ignite git commit: Fixed cache store examples
Fixed cache store examples
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b2cf28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b2cf28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b2cf28
Branch: refs/heads/ignite-843-rc2
Commit: e1b2cf2840b1451dbfc0bbef4540e5a9edaf6c35
Parents: 889b268
Author: Valentin Kulichenko
Authored: Thu Dec 17 16:05:09 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 16:05:09 2015 -0800
--
.../hibernate/CacheHibernateStoreExample.java | 8 +
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 7 +-
.../store/spring/CacheSpringPersonStore.java| 118 ++
.../store/spring/CacheSpringStoreExample.java | 155 +++
.../datagrid/store/spring/package-info.java | 22 +++
6 files changed, 311 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index 71c4f68..db34eaf 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
import org.apache.ignite.transactions.Transaction;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -39,6 +40,13 @@ import static
org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
*
* This example uses {@link CacheHibernatePersonStore} as a persistent store.
*
+ * To start the example, you should:
+ *
+ * Start H2 database TCP server using {@link DbH2ServerStartup}.
+ * Start a few nodes using {@link ExampleNodeStartup}.
+ * Start example using {@link CacheHibernateStoreExample}.
+ *
+ *
* Remote nodes can be started with {@link ExampleNodeStartup} in another JVM
which will
* start node with {@code examples/config/example-ignite.xml} configuration.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
index 1314b71..0728a03 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
@@ -23,12 +23,12 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
+
-
-
+
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
index 80a43e7..7bf70af 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
@@ -26,8 +26,11 @@
-->
-
-jdbc:h2:mem:example;DB_CLOSE_DELAY=-1
+
+jdbc:h2:tcp://localhost/mem:ExampleDb
+
+
+sa
update
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
b/examples/src/main/java/org/apach
[3/6] ignite git commit: IGNITE-2193: .NET: Fixed SerivceTest.cs.
IGNITE-2193: .NET: Fixed SerivceTest.cs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/889b2689
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/889b2689
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/889b2689
Branch: refs/heads/ignite-843-rc2
Commit: 889b2689816a7185029eb7c992bf73f14600844c
Parents: 057ad5b
Author: Pavel Tupitsyn
Authored: Thu Dec 17 17:31:31 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:31:31 2015 +0300
--
.../Services/ServicesTest.cs| 23 +++-
1 file changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/889b2689/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
index 33f255e..ffcdea8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
@@ -218,10 +218,10 @@ namespace Apache.Ignite.Core.Tests.Services
}
Services.Cancel(SvcName + 0);
-Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 0);
-Assert.IsNull(Services.GetService(SvcName +
0));
-Assert.IsNull(Services.GetService(SvcName +
1));
+Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 1);
for (var i = 2; i < 10; i++)
Assert.IsNotNull(Services.GetService(SvcName + i));
@@ -229,7 +229,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
for (var i = 0; i < 10; i++)
-Assert.IsNull(Services.GetService(SvcName
+ i));
+AssertNoService(SvcName + i);
}
///
@@ -477,8 +477,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
// Cancellation failed, but service is removed.
-foreach (var grid in Grids)
-
Assert.IsNull(grid.GetServices().GetService(SvcName));
+AssertNoService();
}
[Test]
@@ -579,6 +578,18 @@ namespace Apache.Ignite.Core.Tests.Services
}
///
+/// Asserts that there is no service on any grid with given name.
+///
+/// The name.
+private void AssertNoService(string name = SvcName)
+{
+foreach (var grid in Grids)
+Assert.IsTrue(
+TestUtils.WaitForCondition(() => grid.GetServices()
+.GetService(name) == null, 5000));
+}
+
+///
/// Gets the services.
///
protected virtual IServices Services
[1/6] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 23c3e5441 -> f888e54fc
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
new file mode 100644
index 000..b905646
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+/**
+ * Test for query with BinaryMarshaller and different serialization modes and
with reflective serializer.
+ */
+public class BinarySerializationQueryWithReflectiveSerializerSelfTest extends
BinarySerializationQuerySelfTest {
+/** {@inheritDoc} */
+@Override protected boolean useReflectiveSerializer() {
+return true;
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 64a1115..cae7f0c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest
extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery(String.class, "field
like '" + key + "'")).getAll();
-assertTrue("p2p marshalling failed, but error response was not
sent", binaryMarshaller());
+fail("p2p marshalling failed, but error response was not sent");
}
catch (CacheException e) {
-assertFalse("Unexpected exception: " + e, binaryMarshaller());
+// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 786b5b8..6abc2d4 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -18,31 +18,85 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest;
+import
org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallb
[6/6] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f888e54f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f888e54f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f888e54f Branch: refs/heads/ignite-843-rc2 Commit: f888e54fcbb30088f1256da81bd0a19e4a0d78ef Parents: 23c3e54 a4b547b Author: Alexey Kuznetsov Authored: Fri Dec 18 10:14:11 2015 +0700 Committer: Alexey Kuznetsov Committed: Fri Dec 18 10:14:11 2015 +0700 -- .../hibernate/CacheHibernateStoreExample.java | 8 + .../datagrid/store/hibernate/Person.hbm.xml | 6 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 7 +- .../store/spring/CacheSpringPersonStore.java| 118 ++ .../store/spring/CacheSpringStoreExample.java | 155 +++ .../datagrid/store/spring/package-info.java | 22 + .../binary/BinaryReflectiveSerializer.java | 33 ++ .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 124 ++ .../ignite/internal/binary/BinaryContext.java | 109 - .../internal/binary/BinaryFieldAccessor.java| 3 - .../ignite/internal/binary/BinaryUtils.java | 49 ++- .../ignite/internal/binary/BinaryWriteMode.java | 3 - .../processors/cache/CacheEntryImpl.java| 6 +- .../processors/cache/CacheEntryImplEx.java | 17 +- .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java| 204 ++--- .../binary/BinaryFieldsAbstractSelfTest.java| 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java| 3 +- .../binary/BinaryMarshallerSelfTest.java| 34 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +- .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../session/GridSessionCheckpointSelfTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- .../cache/BinarySerializationQuerySelfTest.java | 416 +++ ...onQueryWithReflectiveSerializerSelfTest.java | 28 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java| 119 +- .../Services/ServicesTest.cs| 23 +- 35 files changed, 1340 insertions(+), 237 deletions(-) --
ignite git commit: ignite-2204 Disabled hanging test.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 a4b547bd1 -> d5a56da6b
ignite-2204 Disabled hanging test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5a56da6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5a56da6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5a56da6
Branch: refs/heads/ignite-1.5
Commit: d5a56da6b2503ef06cd3620a24f487988c2be5e2
Parents: a4b547b
Author: sboikov
Authored: Fri Dec 18 09:40:35 2015 +0300
Committer: sboikov
Committed: Fri Dec 18 09:40:35 2015 +0300
--
.../cache/distributed/CacheGetInsideLockChangingTopologyTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5a56da6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
index 7073a94..03502d3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
@@ -357,6 +357,8 @@ public class CacheGetInsideLockChangingTopologyTest extends
GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testMultithreaded() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-2204";);
+
final AtomicBoolean finished = new AtomicBoolean();
final int NEW_NODE = SRVS + CLIENTS;
[11/15] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all
modes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/057ad5bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/057ad5bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/057ad5bb
Branch: refs/heads/ignite-1537
Commit: 057ad5bb4d054cba90932ff5614a928b623d44cc
Parents: 1f484ea
Author: vozerov-gridgain
Authored: Thu Dec 17 17:00:29 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:00:29 2015 +0300
--
.../binary/BinaryReflectiveSerializer.java | 33 ++
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../internal/binary/BinaryClassDescriptor.java | 124 ++
.../ignite/internal/binary/BinaryContext.java | 109 -
.../internal/binary/BinaryFieldAccessor.java| 3 -
.../ignite/internal/binary/BinaryUtils.java | 49 ++-
.../ignite/internal/binary/BinaryWriteMode.java | 3 -
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java| 204 ++---
.../binary/BinaryFieldsAbstractSelfTest.java| 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java| 3 +-
.../binary/BinaryMarshallerSelfTest.java| 34 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 +++
...onQueryWithReflectiveSerializerSelfTest.java | 28 ++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java| 119 +-
26 files changed, 995 insertions(+), 220 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
new file mode 100644
index 000..fd0f841
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+/**
+ * Binary serializer which writes object fields using reflection. Transient
fields are not written.
+ */
+public class BinaryReflectiveSerializer implements BinarySerializer {
+/** {@inheritDoc} */
+@Override public void writeBinary(Object obj, BinaryWriter writer) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+
+/** {@inheritDoc} */
+@Override public void readBinary(Object obj, BinaryReader reader) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
index a694eaf..a00c061 100644
---
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
@@ -17,9 +17,10 @@
package org.apache.ignite.binary;
[15/15] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1995b97a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1995b97a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1995b97a Branch: refs/heads/ignite-1537 Commit: 1995b97a1da053e87a8eeb63b892bd41c9b0f99c Parents: 99803f2 a4b547b Author: sboikov Authored: Fri Dec 18 09:10:36 2015 +0300 Committer: sboikov Committed: Fri Dec 18 09:10:36 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- .../hibernate/CacheHibernateStoreExample.java | 8 + .../datagrid/store/hibernate/Person.hbm.xml | 6 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 7 +- .../examples/datagrid/CacheQueryExample.java| 11 +- .../store/spring/CacheSpringPersonStore.java| 118 ++ .../store/spring/CacheSpringStoreExample.java | 155 +++ .../datagrid/store/spring/package-info.java | 22 + .../streaming/StreamVisitorExample.java | 40 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../binary/BinaryReflectiveSerializer.java | 33 ++ .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../org/apache/ignite/cache/CacheManager.java | 2 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 51 ++- .../internal/binary/BinaryClassDescriptor.java | 124 ++ .../ignite/internal/binary/BinaryContext.java | 109 - .../internal/binary/BinaryFieldAccessor.java| 3 - .../ignite/internal/binary/BinaryUtils.java | 49 ++- .../ignite/internal/binary/BinaryWriteMode.java | 3 - .../processors/cache/CacheEntryImpl.java| 6 +- .../processors/cache/CacheEntryImplEx.java | 17 +- .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java| 204 ++--- .../core/src/main/resources/ignite.properties | 2 +- .../binary/BinaryFieldsAbstractSelfTest.java| 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java| 3 +- .../binary/BinaryMarshallerSelfTest.java| 34 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../cache/CacheStopAndDestroySelfTest.java | 2 + .../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +- .../cache/IgniteCacheSerializationSelfTest.java | 112 + .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../session/GridSessionCheckpointSelfTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../cache/BinarySerializationQuerySelfTest.java | 416 +++ ...onQueryWithReflectiveSerializerSelfTest.java | 28 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java| 119 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml| 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core
[10/15] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
new file mode 100644
index 000..b905646
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+/**
+ * Test for query with BinaryMarshaller and different serialization modes and
with reflective serializer.
+ */
+public class BinarySerializationQueryWithReflectiveSerializerSelfTest extends
BinarySerializationQuerySelfTest {
+/** {@inheritDoc} */
+@Override protected boolean useReflectiveSerializer() {
+return true;
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 64a1115..cae7f0c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest
extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery(String.class, "field
like '" + key + "'")).getAll();
-assertTrue("p2p marshalling failed, but error response was not
sent", binaryMarshaller());
+fail("p2p marshalling failed, but error response was not sent");
}
catch (CacheException e) {
-assertFalse("Unexpected exception: " + e, binaryMarshaller());
+// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 786b5b8..6abc2d4 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -18,31 +18,85 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest;
+import
org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheCrossCacheQuery
[03/15] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/914b727b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/914b727b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/914b727b Branch: refs/heads/ignite-1537 Commit: 914b727b3ed2a8dbdbd98c442016c188f37ea057 Parents: dfa84c8 9087f01 Author: vozerov-gridgain Authored: Thu Dec 17 12:52:00 2015 +0300 Committer: vozerov-gridgain Committed: Thu Dec 17 12:52:00 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../apache/ignite/internal/IgniteKernal.java| 35 +++-- .../processors/cache/GridCacheUtils.java| 18 +-- .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++-- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml| 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/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 +- modules/yarn/pom.xml| 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 67 files changed, 142 insertions(+), 106 deletions(-) --
[02/15] ignite git commit: .NET MessagingExample: improved docs.
.NET MessagingExample: improved docs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfa84c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfa84c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfa84c82
Branch: refs/heads/ignite-1537
Commit: dfa84c821eaef8de1486c8074d959c5c3ae24ae7
Parents: 7f35bc6
Author: vozerov-gridgain
Authored: Thu Dec 17 12:51:27 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 12:51:27 2015 +0300
--
.../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfa84c82/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
--
diff --git
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
index 3c74a42..3fafd8f 100644
---
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
+++
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
@@ -26,10 +26,10 @@ namespace Apache.Ignite.Examples.Messaging
///
/// Example demonstrating Ignite messaging. Should be run with standalone
Apache Ignite.NET node.
///
-/// 1) Run
%IGNITE_HOME%/platforms/dotnet/Apache.Ignite/bin/${Platform]/${Configuration}/Apache.Ignite.exe:
+/// 1) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
+///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder;
+/// 2) Run %IGNITE_HOME%/platforms/dotnet/bin/Apache.Ignite.exe:
/// Apache.Ignite.exe -IgniteHome="%IGNITE_HOME%"
-springConfigUrl=platforms\dotnet\examples\config\example-compute.xml
-assembly=[path_to_Apache.Ignite.ExamplesDll.dll]
-/// 2) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
-///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder.
/// 3) Set this class as startup object (Apache.Ignite.Examples project ->
right-click -> Properties ->
/// Application -> Startup object);
/// 4) Start example (F5 or Ctrl+F5).
[07/15] ignite git commit: minor
minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e29266
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e29266
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e29266
Branch: refs/heads/ignite-1537
Commit: c1e292667154d99eaa7e2621fc811b3d916e09a6
Parents: bd1f506
Author: Yakov Zhdanov
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 14:47:05 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerUpdateJob.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e29266/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index c49087f..c2ab0c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -168,4 +168,4 @@ class DataStreamerUpdateJob implements
GridPlainCallable {
ctx.security().authorize(cacheName, perm, null);
}
-}
\ No newline at end of file
+}
[04/15] ignite git commit: #Muting hanging test, created ticket.
#Muting hanging test, created ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e599f44b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e599f44b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e599f44b
Branch: refs/heads/ignite-1537
Commit: e599f44b2f8b90b9dde0de8e374f42cec8b61358
Parents: 914b727
Author: Alexey Goncharuk
Authored: Thu Dec 17 13:28:38 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 13:28:38 2015 +0300
--
.../internal/processors/cache/CacheStopAndDestroySelfTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e599f44b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 061a374..515ae87 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -539,6 +539,8 @@ public class CacheStopAndDestroySelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearClose() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-2189";);
+
IgniteCache cache0 =
grid(0).getOrCreateCache(getNearConfig());
// GridDhtTxPrepareRequest requests to Client node will be counted.
[08/15] ignite git commit: fixed https://issues.apache.org/jira/browse/IGNITE-2175
fixed https://issues.apache.org/jira/browse/IGNITE-2175
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3223b05c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3223b05c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3223b05c
Branch: refs/heads/ignite-1537
Commit: 3223b05c082732ad77462f00cb09d24af2d768f7
Parents: c1e2926
Author: Yakov Zhdanov
Authored: Thu Dec 17 15:07:21 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 15:07:21 2015 +0300
--
.../examples/datagrid/CacheQueryExample.java| 11 +++---
.../streaming/StreamVisitorExample.java | 40 +++-
2 files changed, 36 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 2d86cde..ace7395 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -22,6 +22,7 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.query.QueryCursor;
@@ -126,12 +127,12 @@ public class CacheQueryExample {
* Example for scan query based on a predicate.
*/
private static void scanQuery() {
-IgniteCache, Person> cache =
Ignition.ignite().cache(PERSON_CACHE);
+IgniteCache cache =
Ignition.ignite().cache(PERSON_CACHE).withKeepBinary();
-ScanQuery, Person> scan = new ScanQuery<>(
-new IgniteBiPredicate, Person>() {
-@Override public boolean apply(AffinityKey key, Person
person) {
-return person.salary <= 1000;
+ScanQuery scan = new ScanQuery<>(
+new IgniteBiPredicate() {
+@Override public boolean apply(BinaryObject key, BinaryObject
person) {
+return person.field("salary") <= 1000;
}
}
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index f2e1e9f..819cfea 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -25,6 +25,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -75,21 +77,39 @@ public class StreamVisitorExample {
// Instead we update the instruments in the 'instCache'.
// Since both, 'instCache' and 'mktCache' use the same
key, updates are collocated.
mktStmr.receiver(new StreamVisitor() {
-@Override
-public void apply(IgniteCache cache,
Map.Entry e) {
+@Override public void apply(IgniteCache cache, Map.Entry e) {
String symbol = e.getKey();
Double tick = e.getValue();
-Instrument inst = instCache.get(symbol);
+IgniteCache binInstCache =
ignite.cache("instCache").withKeepBinary();
-if (inst == null)
-inst = new Instrument(symbol);
+BinaryObject inst = binInstCache.get(symbol);
-// Don't populate market cache, as we don't use it
for querying.
-// Update cached instrument based on the latest
market tick.
-inst.update(tick);
+BinaryObjectBui
[12/15] ignite git commit: IGNITE-2193: .NET: Fixed SerivceTest.cs.
IGNITE-2193: .NET: Fixed SerivceTest.cs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/889b2689
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/889b2689
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/889b2689
Branch: refs/heads/ignite-1537
Commit: 889b2689816a7185029eb7c992bf73f14600844c
Parents: 057ad5b
Author: Pavel Tupitsyn
Authored: Thu Dec 17 17:31:31 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:31:31 2015 +0300
--
.../Services/ServicesTest.cs| 23 +++-
1 file changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/889b2689/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
index 33f255e..ffcdea8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
@@ -218,10 +218,10 @@ namespace Apache.Ignite.Core.Tests.Services
}
Services.Cancel(SvcName + 0);
-Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 0);
-Assert.IsNull(Services.GetService(SvcName +
0));
-Assert.IsNull(Services.GetService(SvcName +
1));
+Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 1);
for (var i = 2; i < 10; i++)
Assert.IsNotNull(Services.GetService(SvcName + i));
@@ -229,7 +229,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
for (var i = 0; i < 10; i++)
-Assert.IsNull(Services.GetService(SvcName
+ i));
+AssertNoService(SvcName + i);
}
///
@@ -477,8 +477,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
// Cancellation failed, but service is removed.
-foreach (var grid in Grids)
-
Assert.IsNull(grid.GetServices().GetService(SvcName));
+AssertNoService();
}
[Test]
@@ -579,6 +578,18 @@ namespace Apache.Ignite.Core.Tests.Services
}
///
+/// Asserts that there is no service on any grid with given name.
+///
+/// The name.
+private void AssertNoService(string name = SvcName)
+{
+foreach (var grid in Grids)
+Assert.IsTrue(
+TestUtils.WaitForCondition(() => grid.GetServices()
+.GetService(name) == null, 5000));
+}
+
+///
/// Gets the services.
///
protected virtual IServices Services
[13/15] ignite git commit: Fixed cache store examples
Fixed cache store examples
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b2cf28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b2cf28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b2cf28
Branch: refs/heads/ignite-1537
Commit: e1b2cf2840b1451dbfc0bbef4540e5a9edaf6c35
Parents: 889b268
Author: Valentin Kulichenko
Authored: Thu Dec 17 16:05:09 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 16:05:09 2015 -0800
--
.../hibernate/CacheHibernateStoreExample.java | 8 +
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 7 +-
.../store/spring/CacheSpringPersonStore.java| 118 ++
.../store/spring/CacheSpringStoreExample.java | 155 +++
.../datagrid/store/spring/package-info.java | 22 +++
6 files changed, 311 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index 71c4f68..db34eaf 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
import org.apache.ignite.transactions.Transaction;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -39,6 +40,13 @@ import static
org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
*
* This example uses {@link CacheHibernatePersonStore} as a persistent store.
*
+ * To start the example, you should:
+ *
+ * Start H2 database TCP server using {@link DbH2ServerStartup}.
+ * Start a few nodes using {@link ExampleNodeStartup}.
+ * Start example using {@link CacheHibernateStoreExample}.
+ *
+ *
* Remote nodes can be started with {@link ExampleNodeStartup} in another JVM
which will
* start node with {@code examples/config/example-ignite.xml} configuration.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
index 1314b71..0728a03 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
@@ -23,12 +23,12 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
+
-
-
+
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
index 80a43e7..7bf70af 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
@@ -26,8 +26,11 @@
-->
-
-jdbc:h2:mem:example;DB_CLOSE_DELAY=-1
+
+jdbc:h2:tcp://localhost/mem:ExampleDb
+
+
+sa
update
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
b/examples/src/main/java/org/apache/i
[06/15] ignite git commit: Ignite-2087
Ignite-2087
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd1f506e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd1f506e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd1f506e
Branch: refs/heads/ignite-1537
Commit: bd1f506eaa618f803b39461f5198091d7cbea3a4
Parents: e7e4a48
Author: Anton Vinogradov
Authored: Thu Dec 17 14:27:16 2015 +0300
Committer: Anton Vinogradov
Committed: Thu Dec 17 14:27:16 2015 +0300
--
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +++-
.../java/org/apache/ignite/IgniteSpring.java| 4 +-
3 files changed, 43 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 84ed2cd..6e09d72 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -114,7 +114,7 @@ public class CacheManager implements
javax.cache.CacheManager {
ignite = (IgniteKernal)IgnitionEx.start(cfg);
}
else
-ignite = (IgniteKernal)IgnitionEx.start(uri.toURL());
+ignite = (IgniteKernal)IgnitionEx.start(uri.toURL(), clsLdr);
kernalGateway = ignite.context().gateway();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4f6c6d9..5153fb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -495,7 +495,7 @@ public class IgnitionEx {
URL url = U.resolveIgniteUrl(DFLT_CFG);
if (url != null)
-return start(DFLT_CFG, null, springCtx);
+return start(DFLT_CFG, null, springCtx, null);
U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?):
" + DFLT_CFG);
@@ -581,7 +581,7 @@ public class IgnitionEx {
return start(cfg);
}
else
-return start(springCfgPath, gridName, null);
+return start(springCfgPath, gridName, null, null);
}
/**
@@ -697,6 +697,7 @@ public class IgnitionEx {
* @param springCfgPath Spring XML configuration file path or URL. This
cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code
null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
* {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
@@ -707,10 +708,10 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(String springCfgPath, @Nullable String gridName,
-@Nullable GridSpringResourceContext springCtx) throws
IgniteCheckedException {
+@Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader
ldr) throws IgniteCheckedException {
URL url = U.resolveSpringUrl(springCfgPath);
-return start(url, gridName, springCtx);
+return start(url, gridName, springCtx, ldr);
}
/**
@@ -730,7 +731,28 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl) throws IgniteCheckedException
{
-return start(springCfgUrl, null, null);
+return start(springCfgUrl, null, null, null);
+}
+
+/**
+ * Starts all grids specified within given Spring XML configuration file
URL. If grid with given name
+ * is already started, then exception is thrown. In this case all
instances that may
+ * have been started so far will be stopped too.
+ *
+ * Usually Spring XML configuration file will contain only one Grid
definition. Note that
+ * Grid configuration bean(s) is retrieved form configuration file by
type, so the name of
+ * the Grid co
[05/15] ignite git commit: IGNITE-2188 Incorrect links in platform .Net documentation
IGNITE-2188 Incorrect links in platform .Net documentation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e4a486 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e4a486 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e4a486 Branch: refs/heads/ignite-1537 Commit: e7e4a48677832aba35bf2828d23d16e5ce7a0093 Parents: e599f44 Author: Pavel Tupitsyn Authored: Thu Dec 17 13:55:45 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Dec 17 13:55:45 2015 +0300 -- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7e4a486/modules/platforms/dotnet/Apache.Ignite.dxg -- diff --git a/modules/platforms/dotnet/Apache.Ignite.dxg b/modules/platforms/dotnet/Apache.Ignite.dxg index e33e7d6..6337d83 100644 --- a/modules/platforms/dotnet/Apache.Ignite.dxg +++ b/modules/platforms/dotnet/Apache.Ignite.dxg @@ -299,7 +299,7 @@ MARKDOWN_SUPPORT = YES # globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. -AUTOLINK_SUPPORT = YES +AUTOLINK_SUPPORT = NO # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should set this
[09/15] ignite git commit: #Added test.
#Added test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f484ea1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f484ea1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f484ea1
Branch: refs/heads/ignite-1537
Commit: 1f484ea17ced36b44c2b78201674c302a484db5e
Parents: 3223b05
Author: Alexey Goncharuk
Authored: Thu Dec 17 15:36:23 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 15:36:23 2015 +0300
--
.../cache/IgniteCacheSerializationSelfTest.java | 112 +++
1 file changed, 112 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f484ea1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
new file mode 100644
index 000..2c8c3bc
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+
+/**
+ *
+ */
+public class IgniteCacheSerializationSelfTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private static final int NODES = 3;
+
+/** */
+private static final int CLIENT = NODES - 1;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+if (getTestGridName(CLIENT).equals(gridName))
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+
+super.afterTestsStopped();
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGrids(NODES);
+}
+
+/**
+ * @param cacheMode Cache mode.
+ * @param atomicityMode Atomicity mode.
+ * @return Cache configuration.
+ */
+private CacheConfiguration cacheConfiguration(CacheMode
cacheMode, CacheAtomicityMode atomicityMode) {
+CacheConfiguration ccfg = new CacheConfiguration<>();
+
+ccfg.setCacheMode(cacheMode);
+ccfg.setAtomicityMode(atomicityMode);
+
+ccfg.setBackups(1);
+
+return ccfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testSerializeClosure() throws Exception {
+Ignite client = ignite(CLIENT);
+
+final IgniteCache clientCache =
client.createCache(cacheConfiguration(PARTITIONED, ATOMIC));
+
+try {
+client.compute(client.cluster().forRemotes().forRandom()).call(new
IgniteCallable() {
+@Override publ
[14/15] ignite git commit: Fixed CacheEntry toString()
Fixed CacheEntry toString()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4b547bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4b547bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4b547bd
Branch: refs/heads/ignite-1537
Commit: a4b547bd11ca3bf4a5cdfaac3ad01936cf6e995e
Parents: e1b2cf2
Author: Valentin Kulichenko
Authored: Thu Dec 17 17:07:26 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 17:07:26 2015 -0800
--
.../internal/processors/cache/CacheEntryImpl.java | 6 +++---
.../processors/cache/CacheEntryImplEx.java | 17 ++---
2 files changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index 71c684a..48649d2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -81,10 +81,10 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public T unwrap(Class cls) {
-if(cls.isAssignableFrom(getClass()))
+if (cls.isAssignableFrom(getClass()))
return cls.cast(this);
-if (ver != null && cls.isAssignableFrom(CacheEntry.class))
+if (cls.isAssignableFrom(CacheEntry.class))
return (T)new CacheEntryImplEx<>(key, val, ver);
throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
@@ -106,4 +106,4 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index f3e6c18..1c7111a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -78,7 +78,18 @@ public class CacheEntryImplEx extends
CacheEntryImpl implements Cach
/** {@inheritDoc} */
public String toString() {
-return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
topVer=" + ver.topologyVersion() +
-", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ",
updateTime=" + ver.globalTime() + ']';
+String res = "CacheEntry [key=" + getKey() +
+", val=" + getValue();
+
+if (ver != null) {
+res += ", topVer=" + ver.topologyVersion() +
+", nodeOrder=" + ver.nodeOrder() +
+", order=" + ver.order() +
+", updateTime=" + ver.globalTime();
+}
+else
+res += ", ver=n/a";
+
+return res + ']';
}
-}
\ No newline at end of file
+}
[01/15] ignite git commit: 1.5.0-final-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1537 99803f2f3 -> 1995b97a1 1.5.0-final-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9087f019 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9087f019 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9087f019 Branch: refs/heads/ignite-1537 Commit: 9087f019d06b3c7a35376590177868877311fec2 Parents: 916f59a Author: Ignite Teamcity Authored: Thu Dec 17 12:33:20 2015 +0300 Committer: Ignite Teamcity Committed: Thu Dec 17 12:33:20 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml| 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml| 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties| 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml| 2 +- modules/gce/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/jms11/pom.xml| 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml| 2 +- modules/log4j/pom.xml| 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml| 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac| 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac| 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml| 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml| 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml| 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml| 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml| 2 +- modules/visor-plugins/pom.xml| 2 +-
[21/22] ignite git commit: Added support for passing env. variables.
Added support for passing env. variables.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/131a6c98
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/131a6c98
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/131a6c98
Branch: refs/heads/ignite-gg-10889
Commit: 131a6c98c396484b516d26788802f4f652b4f2a5
Parents: 562c70a
Author: vsisko
Authored: Fri Dec 18 10:27:14 2015 +0700
Committer: Alexey Kuznetsov
Committed: Fri Dec 18 10:27:14 2015 +0700
--
.../internal/visor/util/VisorTaskUtils.java | 39 ++--
1 file changed, 35 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/131a6c98/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 536e368..15bde25 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -830,11 +830,12 @@ public class VisorTaskUtils {
* @param cfgPath Path to node configuration to start with.
* @param nodesToStart Number of nodes to start.
* @param quite If {@code true} then start node in quiet mode.
+ * @param envVars Optional map with environment variables.
* @return List of started processes.
* @throws IOException If failed to start.
*/
public static List startLocalNode(@Nullable IgniteLogger log,
String cfgPath, int nodesToStart,
-boolean quite) throws IOException {
+boolean quite, Map envVars) throws IOException {
String quitePar = quite ? "" : "-v";
String cmdFile = new File("bin", U.isWindows() ? "ignite.bat" :
"ignite.sh").getPath();
@@ -870,9 +871,9 @@ public class VisorTaskUtils {
entry.getKey(), value.replace('\n', '
').replace("'", "\'")));
}
-run.add(openInConsole(envs.toString(), ignite, quitePar,
nodeCfg));
+run.add(openInConsole(null, envVars, envs.toString(),
ignite, quitePar, nodeCfg));
} else
-run.add(openInConsole(ignite, quitePar, nodeCfg));
+run.add(openInConsole(null, envVars, ignite, quitePar,
nodeCfg));
}
return run;
@@ -902,9 +903,22 @@ public class VisorTaskUtils {
* @param workFolder Work folder for command.
* @param args A string array containing the program and its arguments.
* @return Started process.
+ * @throws IOException in case of error.
+ */
+public static Process openInConsole(@Nullable File workFolder, String...
args) throws IOException {
+return openInConsole(workFolder, null, args);
+}
+
+/**
+ * Run command in separated console.
+ *
+ * @param workFolder Work folder for command.
+ * @param envVars Optional map with environment variables.
+ * @param args A string array containing the program and its arguments.
+ * @return Started process.
* @throws IOException If failed to start process.
*/
-public static Process openInConsole(@Nullable File workFolder, String...
args)
+public static Process openInConsole(@Nullable File workFolder, Map envVars, String... args)
throws IOException {
String[] commands = args;
@@ -925,6 +939,23 @@ public class VisorTaskUtils {
if (workFolder != null)
pb.directory(workFolder);
+if (envVars != null) {
+String sep = U.isWindows() ? ";" : ":";
+
+Map goalVars = pb.environment();
+
+for (Map.Entry var: envVars.entrySet()) {
+String envVar = goalVars.get(var.getKey());
+
+if (envVar == null || envVar.isEmpty())
+envVar = var.getValue();
+else
+envVar += sep + var.getValue();
+
+goalVars.put(var.getKey(), envVar);
+}
+}
+
return pb.start();
}
[09/22] ignite git commit: #Muting hanging test, created ticket.
#Muting hanging test, created ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e599f44b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e599f44b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e599f44b
Branch: refs/heads/ignite-gg-10889
Commit: e599f44b2f8b90b9dde0de8e374f42cec8b61358
Parents: 914b727
Author: Alexey Goncharuk
Authored: Thu Dec 17 13:28:38 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 13:28:38 2015 +0300
--
.../internal/processors/cache/CacheStopAndDestroySelfTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e599f44b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 061a374..515ae87 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -539,6 +539,8 @@ public class CacheStopAndDestroySelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearClose() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-2189";);
+
IgniteCache cache0 =
grid(0).getOrCreateCache(getNearConfig());
// GridDhtTxPrepareRequest requests to Client node will be counted.
[05/22] ignite git commit: IGNITE-2178 - Fixed primary key set for scan query.
IGNITE-2178 - Fixed primary key set for scan query.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/916f59aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/916f59aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/916f59aa
Branch: refs/heads/ignite-gg-10889
Commit: 916f59aa1504a02288b965c50b9acffa29a2a464
Parents: 5f26538
Author: Alexey Goncharuk
Authored: Thu Dec 17 12:01:42 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 12:02:27 2015 +0300
--
.../processors/cache/GridCacheUtils.java| 18 +--
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++--
2 files changed, 50 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/916f59aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index f118003..51f6dcd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1578,23 +1578,7 @@ public class GridCacheUtils {
) {
return new CacheEntryPredicateAdapter() {
@Override public boolean apply(GridCacheEntryEx e) {
-return aff.isPrimary(n,
e.key().value(e.context().cacheObjectContext(), false));
-}
-};
-}
-
-/**
- * @param aff Affinity.
- * @param n Node.
- * @return Predicate that evaulates to {@code true} if entry is primary
for node.
- */
-public static IgnitePredicate> cachePrimary0(
-final Affinity aff,
-final ClusterNode n
-) {
-return new IgnitePredicate>() {
-@Override public boolean apply(Cache.Entry e) {
-return aff.isPrimary(n, e.getKey());
+return aff.isPrimary(n, e.key());
}
};
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/916f59aa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
index 091c633..5c1e578 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
@@ -19,16 +19,19 @@ package org.apache.ignite.internal.processors.cache;
import java.util.List;
import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -48,6 +51,9 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+/** Grid count. */
+public static final int GRID_CNT = 4;
+
/** */
private static ClassLoader extClassLoader;
@@ -94,8 +100,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
@Override protected void beforeTestsStarted() throws Exception {
extClassLoader = getExternalClassLoader();
-startGrids(4);
-
+startGrids(GRID_CNT);
}
/** {@inheritDoc} */
@@ -165,7 +170,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
*
[15/22] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
new file mode 100644
index 000..b905646
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+/**
+ * Test for query with BinaryMarshaller and different serialization modes and
with reflective serializer.
+ */
+public class BinarySerializationQueryWithReflectiveSerializerSelfTest extends
BinarySerializationQuerySelfTest {
+/** {@inheritDoc} */
+@Override protected boolean useReflectiveSerializer() {
+return true;
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 64a1115..cae7f0c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest
extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery(String.class, "field
like '" + key + "'")).getAll();
-assertTrue("p2p marshalling failed, but error response was not
sent", binaryMarshaller());
+fail("p2p marshalling failed, but error response was not sent");
}
catch (CacheException e) {
-assertFalse("Unexpected exception: " + e, binaryMarshaller());
+// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 786b5b8..6abc2d4 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -18,31 +18,85 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest;
+import
org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheCrossCacheQuery
[04/22] ignite git commit: ignite-1.5 Avoid NPE in dumpDebugInfo.
ignite-1.5 Avoid NPE in dumpDebugInfo.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f26538d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f26538d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f26538d
Branch: refs/heads/ignite-gg-10889
Commit: 5f26538d7ac7838500259e9213abf26db50da9d9
Parents: 7f35bc6
Author: sboikov
Authored: Thu Dec 17 11:58:32 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 11:58:32 2015 +0300
--
.../apache/ignite/internal/IgniteKernal.java| 35
1 file changed, 21 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f26538d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index e0503fa..6e0be10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -3245,26 +3245,33 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
/** {@inheritDoc} */
public void dumpDebugInfo() {
-GridKernalContextImpl ctx = this.ctx;
+try {
+GridKernalContextImpl ctx = this.ctx;
+
+GridDiscoveryManager discoMrg = ctx != null ? ctx.discovery() :
null;
-if (ctx != null) {
-boolean client = ctx.clientNode();
+ClusterNode locNode = discoMrg != null ? discoMrg.localNode() :
null;
-ClusterNode locNode = ctx.discovery().localNode();
+if (ctx != null && discoMrg != null && locNode != null) {
+boolean client = ctx.clientNode();
-UUID routerId = locNode instanceof TcpDiscoveryNode ?
((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
+UUID routerId = locNode instanceof TcpDiscoveryNode ?
((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
-U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
-", name=" + ctx.gridName() +
-", order=" + locNode.order() +
-", topVer=" + ctx.discovery().topologyVersion() +
-", client=" + client +
-(client && routerId != null ? ", routerId=" + routerId : "") +
']');
+U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
+", name=" + ctx.gridName() +
+", order=" + locNode.order() +
+", topVer=" + discoMrg.topologyVersion() +
+", client=" + client +
+(client && routerId != null ? ", routerId=" + routerId :
"") + ']');
-ctx.cache().context().exchange().dumpDebugInfo();
+ctx.cache().context().exchange().dumpDebugInfo();
+}
+else
+U.warn(log, "Dumping debug info for node, context is not
initialized [name=" + gridName + ']');
+}
+catch (Exception e) {
+U.error(log, "Failed to dump debug info for node: " + e, e);
}
-else
-U.warn(log, "Dumping debug info for node, context is not
initialized [name=" + gridName + ']');
}
/** {@inheritDoc} */
[14/22] ignite git commit: #Added test.
#Added test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f484ea1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f484ea1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f484ea1
Branch: refs/heads/ignite-gg-10889
Commit: 1f484ea17ced36b44c2b78201674c302a484db5e
Parents: 3223b05
Author: Alexey Goncharuk
Authored: Thu Dec 17 15:36:23 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 15:36:23 2015 +0300
--
.../cache/IgniteCacheSerializationSelfTest.java | 112 +++
1 file changed, 112 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f484ea1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
new file mode 100644
index 000..2c8c3bc
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+
+/**
+ *
+ */
+public class IgniteCacheSerializationSelfTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private static final int NODES = 3;
+
+/** */
+private static final int CLIENT = NODES - 1;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+if (getTestGridName(CLIENT).equals(gridName))
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+
+super.afterTestsStopped();
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGrids(NODES);
+}
+
+/**
+ * @param cacheMode Cache mode.
+ * @param atomicityMode Atomicity mode.
+ * @return Cache configuration.
+ */
+private CacheConfiguration cacheConfiguration(CacheMode
cacheMode, CacheAtomicityMode atomicityMode) {
+CacheConfiguration ccfg = new CacheConfiguration<>();
+
+ccfg.setCacheMode(cacheMode);
+ccfg.setAtomicityMode(atomicityMode);
+
+ccfg.setBackups(1);
+
+return ccfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testSerializeClosure() throws Exception {
+Ignite client = ignite(CLIENT);
+
+final IgniteCache clientCache =
client.createCache(cacheConfiguration(PARTITIONED, ATOMIC));
+
+try {
+client.compute(client.cluster().forRemotes().forRandom()).call(new
IgniteCallable() {
+@Override
[11/22] ignite git commit: Ignite-2087
Ignite-2087
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd1f506e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd1f506e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd1f506e
Branch: refs/heads/ignite-gg-10889
Commit: bd1f506eaa618f803b39461f5198091d7cbea3a4
Parents: e7e4a48
Author: Anton Vinogradov
Authored: Thu Dec 17 14:27:16 2015 +0300
Committer: Anton Vinogradov
Committed: Thu Dec 17 14:27:16 2015 +0300
--
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +++-
.../java/org/apache/ignite/IgniteSpring.java| 4 +-
3 files changed, 43 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 84ed2cd..6e09d72 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -114,7 +114,7 @@ public class CacheManager implements
javax.cache.CacheManager {
ignite = (IgniteKernal)IgnitionEx.start(cfg);
}
else
-ignite = (IgniteKernal)IgnitionEx.start(uri.toURL());
+ignite = (IgniteKernal)IgnitionEx.start(uri.toURL(), clsLdr);
kernalGateway = ignite.context().gateway();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4f6c6d9..5153fb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -495,7 +495,7 @@ public class IgnitionEx {
URL url = U.resolveIgniteUrl(DFLT_CFG);
if (url != null)
-return start(DFLT_CFG, null, springCtx);
+return start(DFLT_CFG, null, springCtx, null);
U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?):
" + DFLT_CFG);
@@ -581,7 +581,7 @@ public class IgnitionEx {
return start(cfg);
}
else
-return start(springCfgPath, gridName, null);
+return start(springCfgPath, gridName, null, null);
}
/**
@@ -697,6 +697,7 @@ public class IgnitionEx {
* @param springCfgPath Spring XML configuration file path or URL. This
cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code
null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
* {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
@@ -707,10 +708,10 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(String springCfgPath, @Nullable String gridName,
-@Nullable GridSpringResourceContext springCtx) throws
IgniteCheckedException {
+@Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader
ldr) throws IgniteCheckedException {
URL url = U.resolveSpringUrl(springCfgPath);
-return start(url, gridName, springCtx);
+return start(url, gridName, springCtx, ldr);
}
/**
@@ -730,7 +731,28 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl) throws IgniteCheckedException
{
-return start(springCfgUrl, null, null);
+return start(springCfgUrl, null, null, null);
+}
+
+/**
+ * Starts all grids specified within given Spring XML configuration file
URL. If grid with given name
+ * is already started, then exception is thrown. In this case all
instances that may
+ * have been started so far will be stopped too.
+ *
+ * Usually Spring XML configuration file will contain only one Grid
definition. Note that
+ * Grid configuration bean(s) is retrieved form configuration file by
type, so the name of
+ * the Gri
[16/22] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all
modes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/057ad5bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/057ad5bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/057ad5bb
Branch: refs/heads/ignite-gg-10889
Commit: 057ad5bb4d054cba90932ff5614a928b623d44cc
Parents: 1f484ea
Author: vozerov-gridgain
Authored: Thu Dec 17 17:00:29 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:00:29 2015 +0300
--
.../binary/BinaryReflectiveSerializer.java | 33 ++
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../internal/binary/BinaryClassDescriptor.java | 124 ++
.../ignite/internal/binary/BinaryContext.java | 109 -
.../internal/binary/BinaryFieldAccessor.java| 3 -
.../ignite/internal/binary/BinaryUtils.java | 49 ++-
.../ignite/internal/binary/BinaryWriteMode.java | 3 -
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java| 204 ++---
.../binary/BinaryFieldsAbstractSelfTest.java| 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java| 3 +-
.../binary/BinaryMarshallerSelfTest.java| 34 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 +++
...onQueryWithReflectiveSerializerSelfTest.java | 28 ++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java| 119 +-
26 files changed, 995 insertions(+), 220 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
new file mode 100644
index 000..fd0f841
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+/**
+ * Binary serializer which writes object fields using reflection. Transient
fields are not written.
+ */
+public class BinaryReflectiveSerializer implements BinarySerializer {
+/** {@inheritDoc} */
+@Override public void writeBinary(Object obj, BinaryWriter writer) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+
+/** {@inheritDoc} */
+@Override public void readBinary(Object obj, BinaryReader reader) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
index a694eaf..a00c061 100644
---
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
@@ -17,9 +17,10 @@
package org.apache.ignite.binary
[19/22] ignite git commit: Fixed CacheEntry toString()
Fixed CacheEntry toString()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4b547bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4b547bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4b547bd
Branch: refs/heads/ignite-gg-10889
Commit: a4b547bd11ca3bf4a5cdfaac3ad01936cf6e995e
Parents: e1b2cf2
Author: Valentin Kulichenko
Authored: Thu Dec 17 17:07:26 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 17:07:26 2015 -0800
--
.../internal/processors/cache/CacheEntryImpl.java | 6 +++---
.../processors/cache/CacheEntryImplEx.java | 17 ++---
2 files changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index 71c684a..48649d2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -81,10 +81,10 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public T unwrap(Class cls) {
-if(cls.isAssignableFrom(getClass()))
+if (cls.isAssignableFrom(getClass()))
return cls.cast(this);
-if (ver != null && cls.isAssignableFrom(CacheEntry.class))
+if (cls.isAssignableFrom(CacheEntry.class))
return (T)new CacheEntryImplEx<>(key, val, ver);
throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
@@ -106,4 +106,4 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index f3e6c18..1c7111a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -78,7 +78,18 @@ public class CacheEntryImplEx extends
CacheEntryImpl implements Cach
/** {@inheritDoc} */
public String toString() {
-return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
topVer=" + ver.topologyVersion() +
-", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ",
updateTime=" + ver.globalTime() + ']';
+String res = "CacheEntry [key=" + getKey() +
+", val=" + getValue();
+
+if (ver != null) {
+res += ", topVer=" + ver.topologyVersion() +
+", nodeOrder=" + ver.nodeOrder() +
+", order=" + ver.order() +
+", updateTime=" + ver.globalTime();
+}
+else
+res += ", ver=n/a";
+
+return res + ']';
}
-}
\ No newline at end of file
+}
[10/22] ignite git commit: IGNITE-2188 Incorrect links in platform .Net documentation
IGNITE-2188 Incorrect links in platform .Net documentation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e4a486 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e4a486 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e4a486 Branch: refs/heads/ignite-gg-10889 Commit: e7e4a48677832aba35bf2828d23d16e5ce7a0093 Parents: e599f44 Author: Pavel Tupitsyn Authored: Thu Dec 17 13:55:45 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Dec 17 13:55:45 2015 +0300 -- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7e4a486/modules/platforms/dotnet/Apache.Ignite.dxg -- diff --git a/modules/platforms/dotnet/Apache.Ignite.dxg b/modules/platforms/dotnet/Apache.Ignite.dxg index e33e7d6..6337d83 100644 --- a/modules/platforms/dotnet/Apache.Ignite.dxg +++ b/modules/platforms/dotnet/Apache.Ignite.dxg @@ -299,7 +299,7 @@ MARKDOWN_SUPPORT = YES # globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. -AUTOLINK_SUPPORT = YES +AUTOLINK_SUPPORT = NO # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should set this
[22/22] ignite git commit: Minor code style change.
Minor code style change.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f45c65f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f45c65f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f45c65f
Branch: refs/heads/ignite-gg-10889
Commit: 1f45c65f2da9651d2252067469cd6029a10a15be
Parents: 131a6c9
Author: Alexey Kuznetsov
Authored: Fri Dec 18 10:42:54 2015 +0700
Committer: Alexey Kuznetsov
Committed: Fri Dec 18 10:42:54 2015 +0700
--
.../org/apache/ignite/internal/visor/util/VisorTaskUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f45c65f/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 15bde25..016c200 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -864,11 +864,11 @@ public class VisorTaskUtils {
StringBuilder envs = new StringBuilder();
for (Map.Entry entry :
System.getenv().entrySet()) {
-String value = entry.getValue();
+String val = entry.getValue();
-if (value.indexOf(';') < 0 && value.indexOf('\'') < 0)
+if (val.indexOf(';') < 0 && val.indexOf('\'') < 0)
envs.append(String.format("export %s='%s'; ",
-entry.getKey(), value.replace('\n', '
').replace("'", "\'")));
+entry.getKey(), val.replace('\n', '
').replace("'", "\'")));
}
run.add(openInConsole(null, envVars, envs.toString(),
ignite, quitePar, nodeCfg));
[18/22] ignite git commit: Fixed cache store examples
Fixed cache store examples
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b2cf28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b2cf28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b2cf28
Branch: refs/heads/ignite-gg-10889
Commit: e1b2cf2840b1451dbfc0bbef4540e5a9edaf6c35
Parents: 889b268
Author: Valentin Kulichenko
Authored: Thu Dec 17 16:05:09 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 16:05:09 2015 -0800
--
.../hibernate/CacheHibernateStoreExample.java | 8 +
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 7 +-
.../store/spring/CacheSpringPersonStore.java| 118 ++
.../store/spring/CacheSpringStoreExample.java | 155 +++
.../datagrid/store/spring/package-info.java | 22 +++
6 files changed, 311 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index 71c4f68..db34eaf 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
import org.apache.ignite.transactions.Transaction;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -39,6 +40,13 @@ import static
org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
*
* This example uses {@link CacheHibernatePersonStore} as a persistent store.
*
+ * To start the example, you should:
+ *
+ * Start H2 database TCP server using {@link DbH2ServerStartup}.
+ * Start a few nodes using {@link ExampleNodeStartup}.
+ * Start example using {@link CacheHibernateStoreExample}.
+ *
+ *
* Remote nodes can be started with {@link ExampleNodeStartup} in another JVM
which will
* start node with {@code examples/config/example-ignite.xml} configuration.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
index 1314b71..0728a03 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
@@ -23,12 +23,12 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
+
-
-
+
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
index 80a43e7..7bf70af 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
@@ -26,8 +26,11 @@
-->
-
-jdbc:h2:mem:example;DB_CLOSE_DELAY=-1
+
+jdbc:h2:tcp://localhost/mem:ExampleDb
+
+
+sa
update
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
b/examples/src/main/java/org/apac
[13/22] ignite git commit: fixed https://issues.apache.org/jira/browse/IGNITE-2175
fixed https://issues.apache.org/jira/browse/IGNITE-2175
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3223b05c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3223b05c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3223b05c
Branch: refs/heads/ignite-gg-10889
Commit: 3223b05c082732ad77462f00cb09d24af2d768f7
Parents: c1e2926
Author: Yakov Zhdanov
Authored: Thu Dec 17 15:07:21 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 15:07:21 2015 +0300
--
.../examples/datagrid/CacheQueryExample.java| 11 +++---
.../streaming/StreamVisitorExample.java | 40 +++-
2 files changed, 36 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 2d86cde..ace7395 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -22,6 +22,7 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.query.QueryCursor;
@@ -126,12 +127,12 @@ public class CacheQueryExample {
* Example for scan query based on a predicate.
*/
private static void scanQuery() {
-IgniteCache, Person> cache =
Ignition.ignite().cache(PERSON_CACHE);
+IgniteCache cache =
Ignition.ignite().cache(PERSON_CACHE).withKeepBinary();
-ScanQuery, Person> scan = new ScanQuery<>(
-new IgniteBiPredicate, Person>() {
-@Override public boolean apply(AffinityKey key, Person
person) {
-return person.salary <= 1000;
+ScanQuery scan = new ScanQuery<>(
+new IgniteBiPredicate() {
+@Override public boolean apply(BinaryObject key, BinaryObject
person) {
+return person.field("salary") <= 1000;
}
}
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index f2e1e9f..819cfea 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -25,6 +25,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -75,21 +77,39 @@ public class StreamVisitorExample {
// Instead we update the instruments in the 'instCache'.
// Since both, 'instCache' and 'mktCache' use the same
key, updates are collocated.
mktStmr.receiver(new StreamVisitor() {
-@Override
-public void apply(IgniteCache cache,
Map.Entry e) {
+@Override public void apply(IgniteCache cache, Map.Entry e) {
String symbol = e.getKey();
Double tick = e.getValue();
-Instrument inst = instCache.get(symbol);
+IgniteCache binInstCache =
ignite.cache("instCache").withKeepBinary();
-if (inst == null)
-inst = new Instrument(symbol);
+BinaryObject inst = binInstCache.get(symbol);
-// Don't populate market cache, as we don't use it
for querying.
-// Update cached instrument based on the latest
market tick.
-inst.update(tick);
+BinaryObjec
[03/22] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_ Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f35bc6d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f35bc6d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f35bc6d Branch: refs/heads/ignite-gg-10889 Commit: 7f35bc6d13cd609e63b8e59b1a28d30f402bd44f Parents: d204b0e 96dc238 Author: Yakov Zhdanov Authored: Thu Dec 17 09:32:08 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Dec 17 09:32:08 2015 +0300 -- .../processors/cache/GridCacheProcessor.java| 8 +- .../cache/GridCacheSharedContext.java | 20 + .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../dht/GridPartitionedGetFuture.java | 15 +- .../dht/GridPartitionedSingleGetFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java| 30 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 11 +- .../IgniteCacheStoreValueAbstractTest.java | 2 +- .../IgniteStartCacheInTransactionSelfTest.java | 39 +- .../CacheGetInsideLockChangingTopologyTest.java | 475 +++ .../IgniteCacheFailoverTestSuite3.java | 2 + 16 files changed, 593 insertions(+), 60 deletions(-) --
[08/22] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/914b727b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/914b727b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/914b727b Branch: refs/heads/ignite-gg-10889 Commit: 914b727b3ed2a8dbdbd98c442016c188f37ea057 Parents: dfa84c8 9087f01 Author: vozerov-gridgain Authored: Thu Dec 17 12:52:00 2015 +0300 Committer: vozerov-gridgain Committed: Thu Dec 17 12:52:00 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../apache/ignite/internal/IgniteKernal.java| 35 +++-- .../processors/cache/GridCacheUtils.java| 18 +-- .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++-- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml| 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/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 +- modules/yarn/pom.xml| 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 67 files changed, 142 insertions(+), 106 deletions(-) --
[02/22] ignite git commit: fixed https://issues.apache.org/jira/browse/IGNITE-2168
fixed https://issues.apache.org/jira/browse/IGNITE-2168 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d204b0ed Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d204b0ed Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d204b0ed Branch: refs/heads/ignite-gg-10889 Commit: d204b0ed9b1a905ec05f0594c48504e691ce7df2 Parents: d8c8214 Author: Yakov Zhdanov Authored: Thu Dec 17 09:31:53 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Dec 17 09:31:53 2015 +0300 -- .../ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d204b0ed/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java index 0034410..e6584dd 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java @@ -31,7 +31,6 @@ import org.apache.ignite.examples.ExampleNodeStartup; import org.apache.ignite.examples.ExamplesUtils; import org.apache.ignite.examples.model.Person; import org.apache.ignite.examples.util.DbH2ServerStartup; -import org.apache.ignite.scalar.lang.ScalarOutClosure; import org.apache.ignite.transactions.Transaction; import org.h2.jdbcx.JdbcConnectionPool;
[20/22] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889
Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/562c70a3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/562c70a3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/562c70a3 Branch: refs/heads/ignite-gg-10889 Commit: 562c70a39ede2f2f41af841b1d9e0df40af70fda Parents: 3b23b71 a4b547b Author: Alexey Kuznetsov Authored: Fri Dec 18 10:16:30 2015 +0700 Committer: Alexey Kuznetsov Committed: Fri Dec 18 10:16:30 2015 +0700 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- .../hibernate/CacheHibernateStoreExample.java | 8 + .../datagrid/store/hibernate/Person.hbm.xml | 6 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 7 +- .../examples/datagrid/CacheQueryExample.java| 11 +- .../store/jdbc/CacheJdbcStoreExample.java | 1 - .../store/spring/CacheSpringPersonStore.java| 118 + .../store/spring/CacheSpringStoreExample.java | 155 ++ .../datagrid/store/spring/package-info.java | 22 + .../streaming/StreamVisitorExample.java | 40 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../binary/BinaryReflectiveSerializer.java | 33 ++ .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../org/apache/ignite/cache/CacheManager.java | 2 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../apache/ignite/internal/IgniteKernal.java| 35 +- .../org/apache/ignite/internal/IgnitionEx.java | 51 +- .../internal/binary/BinaryClassDescriptor.java | 124 ++--- .../ignite/internal/binary/BinaryContext.java | 109 - .../internal/binary/BinaryFieldAccessor.java| 3 - .../ignite/internal/binary/BinaryUtils.java | 49 +- .../ignite/internal/binary/BinaryWriteMode.java | 3 - .../processors/cache/CacheEntryImpl.java| 6 +- .../processors/cache/CacheEntryImplEx.java | 17 +- .../processors/cache/GridCacheProcessor.java| 8 +- .../cache/GridCacheSharedContext.java | 20 + .../processors/cache/GridCacheUtils.java| 18 +- .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../dht/GridPartitionedGetFuture.java | 15 +- .../dht/GridPartitionedSingleGetFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java| 30 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java| 204 ++-- .../core/src/main/resources/ignite.properties | 2 +- .../binary/BinaryFieldsAbstractSelfTest.java| 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java| 3 +- .../binary/BinaryMarshallerSelfTest.java| 34 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../cache/CacheStopAndDestroySelfTest.java | 2 + .../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 11 +- .../cache/IgniteCacheSerializationSelfTest.java | 112 + .../IgniteCacheStoreValueAbstractTest.java | 2 +- .../IgniteStartCacheInTransactionSelfTest.java | 39 +- .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../CacheGetInsideLockChangingTopologyTest.java | 475 +++ .../session/GridSessionCheckpointSelfTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- .../IgniteCacheFailoverTestSuite3.java | 2 + modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml
[17/22] ignite git commit: IGNITE-2193: .NET: Fixed SerivceTest.cs.
IGNITE-2193: .NET: Fixed SerivceTest.cs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/889b2689
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/889b2689
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/889b2689
Branch: refs/heads/ignite-gg-10889
Commit: 889b2689816a7185029eb7c992bf73f14600844c
Parents: 057ad5b
Author: Pavel Tupitsyn
Authored: Thu Dec 17 17:31:31 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:31:31 2015 +0300
--
.../Services/ServicesTest.cs| 23 +++-
1 file changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/889b2689/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
index 33f255e..ffcdea8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
@@ -218,10 +218,10 @@ namespace Apache.Ignite.Core.Tests.Services
}
Services.Cancel(SvcName + 0);
-Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 0);
-Assert.IsNull(Services.GetService(SvcName +
0));
-Assert.IsNull(Services.GetService(SvcName +
1));
+Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 1);
for (var i = 2; i < 10; i++)
Assert.IsNotNull(Services.GetService(SvcName + i));
@@ -229,7 +229,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
for (var i = 0; i < 10; i++)
-Assert.IsNull(Services.GetService(SvcName
+ i));
+AssertNoService(SvcName + i);
}
///
@@ -477,8 +477,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
// Cancellation failed, but service is removed.
-foreach (var grid in Grids)
-
Assert.IsNull(grid.GetServices().GetService(SvcName));
+AssertNoService();
}
[Test]
@@ -579,6 +578,18 @@ namespace Apache.Ignite.Core.Tests.Services
}
///
+/// Asserts that there is no service on any grid with given name.
+///
+/// The name.
+private void AssertNoService(string name = SvcName)
+{
+foreach (var grid in Grids)
+Assert.IsTrue(
+TestUtils.WaitForCondition(() => grid.GetServices()
+.GetService(name) == null, 5000));
+}
+
+///
/// Gets the services.
///
protected virtual IServices Services
[12/22] ignite git commit: minor
minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e29266
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e29266
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e29266
Branch: refs/heads/ignite-gg-10889
Commit: c1e292667154d99eaa7e2621fc811b3d916e09a6
Parents: bd1f506
Author: Yakov Zhdanov
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 14:47:05 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerUpdateJob.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e29266/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index c49087f..c2ab0c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -168,4 +168,4 @@ class DataStreamerUpdateJob implements
GridPlainCallable {
ctx.security().authorize(cacheName, perm, null);
}
-}
\ No newline at end of file
+}
[06/22] ignite git commit: 1.5.0-final-SNAPSHOT
1.5.0-final-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9087f019 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9087f019 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9087f019 Branch: refs/heads/ignite-gg-10889 Commit: 9087f019d06b3c7a35376590177868877311fec2 Parents: 916f59a Author: Ignite Teamcity Authored: Thu Dec 17 12:33:20 2015 +0300 Committer: Ignite Teamcity Committed: Thu Dec 17 12:33:20 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml| 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml| 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties| 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml| 2 +- modules/gce/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/jms11/pom.xml| 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml| 2 +- modules/log4j/pom.xml| 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml| 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac| 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac| 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml| 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml| 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml| 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml| 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml| 2 +- modules/visor-plugins/pom.xml| 2 +- modules/web/pom.xml | 2 +- modules/y
[07/22] ignite git commit: .NET MessagingExample: improved docs.
.NET MessagingExample: improved docs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfa84c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfa84c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfa84c82
Branch: refs/heads/ignite-gg-10889
Commit: dfa84c821eaef8de1486c8074d959c5c3ae24ae7
Parents: 7f35bc6
Author: vozerov-gridgain
Authored: Thu Dec 17 12:51:27 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 12:51:27 2015 +0300
--
.../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfa84c82/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
--
diff --git
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
index 3c74a42..3fafd8f 100644
---
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
+++
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
@@ -26,10 +26,10 @@ namespace Apache.Ignite.Examples.Messaging
///
/// Example demonstrating Ignite messaging. Should be run with standalone
Apache Ignite.NET node.
///
-/// 1) Run
%IGNITE_HOME%/platforms/dotnet/Apache.Ignite/bin/${Platform]/${Configuration}/Apache.Ignite.exe:
+/// 1) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
+///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder;
+/// 2) Run %IGNITE_HOME%/platforms/dotnet/bin/Apache.Ignite.exe:
/// Apache.Ignite.exe -IgniteHome="%IGNITE_HOME%"
-springConfigUrl=platforms\dotnet\examples\config\example-compute.xml
-assembly=[path_to_Apache.Ignite.ExamplesDll.dll]
-/// 2) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
-///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder.
/// 3) Set this class as startup object (Apache.Ignite.Examples project ->
right-click -> Properties ->
/// Application -> Startup object);
/// 4) Start example (F5 or Ctrl+F5).
[01/22] ignite git commit: ignite-2146 Avoid hang in 'cache.get' if topology locked.
Repository: ignite
Updated Branches:
refs/heads/ignite-gg-10889 3b23b71fb -> 1f45c65f2
ignite-2146 Avoid hang in 'cache.get' if topology locked.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96dc238f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96dc238f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96dc238f
Branch: refs/heads/ignite-gg-10889
Commit: 96dc238fd3e159c68ba54eef2fc6f3589aa6b2ca
Parents: d8c8214
Author: sboikov
Authored: Thu Dec 17 08:45:48 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 08:45:48 2015 +0300
--
.../processors/cache/GridCacheProcessor.java| 8 +-
.../cache/GridCacheSharedContext.java | 20 +
.../dht/CacheDistributedGetFutureAdapter.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 15 +-
.../dht/GridPartitionedSingleGetFuture.java | 8 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +-
.../colocated/GridDhtColocatedLockFuture.java | 2 +-
.../distributed/near/GridNearGetFuture.java | 17 +-
.../distributed/near/GridNearLockFuture.java| 30 +-
...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 11 +-
.../IgniteCacheStoreValueAbstractTest.java | 2 +-
.../IgniteStartCacheInTransactionSelfTest.java | 39 +-
.../CacheGetInsideLockChangingTopologyTest.java | 475 +++
.../IgniteCacheFailoverTestSuite3.java | 2 +
16 files changed, 593 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/96dc238f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index f0bed99..380c163 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -3343,16 +3343,14 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
* @throws IgniteException If transaction exist.
*/
private void checkEmptyTransactions() throws IgniteException {
-if (transactions().tx() != null)
-throw new IgniteException("Cannot start/stop cache within
transaction.");
-
-if
(sharedCtx.mvcc().lastExplicitLockTopologyVersion(Thread.currentThread().getId())
!= null)
-throw new IgniteException("Cannot start/stop cache within lock.");
+if (transactions().tx() != null ||
sharedCtx.lockedTopologyVersion(null) != null)
+throw new IgniteException("Cannot start/stop cache within lock or
transaction.");
}
/**
* @param val Object to check.
* @throws IgniteCheckedException If validation failed.
+ * @return Configuration copy.
*/
private CacheConfiguration cloneCheckSerializable(CacheConfiguration val)
throws IgniteCheckedException {
if (val == null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/96dc238f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 608829a..5ed1df9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -572,6 +572,26 @@ public class GridCacheSharedContext {
}
/**
+ * @param ignore Transaction to ignore.
+ * @return Not null topology version if current thread holds lock
preventing topology change.
+ */
+@Nullable public AffinityTopologyVersion
lockedTopologyVersion(IgniteInternalTx ignore) {
+long threadId = Thread.currentThread().getId();
+
+IgniteInternalTx tx = txMgr.anyActiveThreadTx(threadId, ignore);
+
+AffinityTopologyVersion topVer = null;
+
+if (tx != null && tx.topologyVersionSnapshot() != null)
+topVer = tx.topologyVersionSnapshot();
+
+if (topVer == null)
+topVer = mvccMgr.lastExplicitLockTopologyVersion(threadId);
+
+return topVer;
+}
+
+/**
* Nulling references to potentially leak-prone objects.
ignite git commit: Fixed CacheEntry toString()
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 e1b2cf284 -> a4b547bd1
Fixed CacheEntry toString()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4b547bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4b547bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4b547bd
Branch: refs/heads/ignite-1.5
Commit: a4b547bd11ca3bf4a5cdfaac3ad01936cf6e995e
Parents: e1b2cf2
Author: Valentin Kulichenko
Authored: Thu Dec 17 17:07:26 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 17:07:26 2015 -0800
--
.../internal/processors/cache/CacheEntryImpl.java | 6 +++---
.../processors/cache/CacheEntryImplEx.java | 17 ++---
2 files changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index 71c684a..48649d2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -81,10 +81,10 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public T unwrap(Class cls) {
-if(cls.isAssignableFrom(getClass()))
+if (cls.isAssignableFrom(getClass()))
return cls.cast(this);
-if (ver != null && cls.isAssignableFrom(CacheEntry.class))
+if (cls.isAssignableFrom(CacheEntry.class))
return (T)new CacheEntryImplEx<>(key, val, ver);
throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
@@ -106,4 +106,4 @@ public class CacheEntryImpl implements Cache.Entry, Externalizable {
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4b547bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index f3e6c18..1c7111a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -78,7 +78,18 @@ public class CacheEntryImplEx extends
CacheEntryImpl implements Cach
/** {@inheritDoc} */
public String toString() {
-return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
topVer=" + ver.topologyVersion() +
-", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ",
updateTime=" + ver.globalTime() + ']';
+String res = "CacheEntry [key=" + getKey() +
+", val=" + getValue();
+
+if (ver != null) {
+res += ", topVer=" + ver.topologyVersion() +
+", nodeOrder=" + ver.nodeOrder() +
+", order=" + ver.order() +
+", updateTime=" + ver.globalTime();
+}
+else
+res += ", ver=n/a";
+
+return res + ']';
}
-}
\ No newline at end of file
+}
ignite git commit: Fixed cache store examples
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 889b26898 -> e1b2cf284
Fixed cache store examples
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b2cf28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b2cf28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b2cf28
Branch: refs/heads/ignite-1.5
Commit: e1b2cf2840b1451dbfc0bbef4540e5a9edaf6c35
Parents: 889b268
Author: Valentin Kulichenko
Authored: Thu Dec 17 16:05:09 2015 -0800
Committer: Valentin Kulichenko
Committed: Thu Dec 17 16:05:09 2015 -0800
--
.../hibernate/CacheHibernateStoreExample.java | 8 +
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 7 +-
.../store/spring/CacheSpringPersonStore.java| 118 ++
.../store/spring/CacheSpringStoreExample.java | 155 +++
.../datagrid/store/spring/package-info.java | 22 +++
6 files changed, 311 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index 71c4f68..db34eaf 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
import org.apache.ignite.transactions.Transaction;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -39,6 +40,13 @@ import static
org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
*
* This example uses {@link CacheHibernatePersonStore} as a persistent store.
*
+ * To start the example, you should:
+ *
+ * Start H2 database TCP server using {@link DbH2ServerStartup}.
+ * Start a few nodes using {@link ExampleNodeStartup}.
+ * Start example using {@link CacheHibernateStoreExample}.
+ *
+ *
* Remote nodes can be started with {@link ExampleNodeStartup} in another JVM
which will
* start node with {@code examples/config/example-ignite.xml} configuration.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
index 1314b71..0728a03 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
@@ -23,12 +23,12 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
+
-
-
+
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
--
diff --git
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
index 80a43e7..7bf70af 100644
---
a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
+++
b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
@@ -26,8 +26,11 @@
-->
-
-jdbc:h2:mem:example;DB_CLOSE_DELAY=-1
+
+jdbc:h2:tcp://localhost/mem:ExampleDb
+
+
+sa
update
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b2cf28/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/data
ignite git commit: IGNITE-843 Tweak CSS, fixed minor UI bugs. Fix db schema.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 580d1a1d0 -> 23c3e5441
IGNITE-843 Tweak CSS, fixed minor UI bugs. Fix db schema.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/23c3e544
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/23c3e544
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/23c3e544
Branch: refs/heads/ignite-843-rc2
Commit: 23c3e54418c28d23221aedd5614a3f58b6d725e7
Parents: 580d1a1
Author: AKuznetsov
Authored: Fri Dec 18 01:07:32 2015 +0700
Committer: AKuznetsov
Committed: Fri Dec 18 01:07:32 2015 +0700
--
.../src/main/js/public/stylesheets/style.scss | 27 ++--
1 file changed, 19 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/23c3e544/modules/control-center-web/src/main/js/public/stylesheets/style.scss
--
diff --git
a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index c3c5fa3..d218f46 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -427,6 +427,14 @@ h1, h2, h3, h4, h5, h6 {
}
}
+.settings-row:first-child {
+margin-top: 0;
+}
+
+.details-row, .settings-row:last-child {
+margin-bottom: 0;
+}
+
button, a.btn {
margin-right: 5px;
}
@@ -673,7 +681,7 @@ button.form-control {
}
.theme-line .panel-body {
-padding: 10px 20px;
+padding: 20px;
}
.theme-line .main-content a.customize {
@@ -948,14 +956,14 @@ button.form-control {
.panel-details {
margin-top: 10px;
-padding: 0;
+padding: 10px;
border-radius: 5px;
border: thin dotted $ignite-border-color;
}
.group-section {
-margin-top: 30px;
+margin-top: 20px;
}
.group {
@@ -988,7 +996,7 @@ button.form-control {
}
.group-content {
-margin: 0 10px 10px 10px;
+margin: 10px;
table {
width: 100%;
@@ -1381,6 +1389,10 @@ a {
margin-top: 10px;
}
+.margin-top-dflt-2x {
+margin-top: 20px;
+}
+
.margin-bottom-dflt {
margin-bottom: 10px;
}
@@ -1496,7 +1508,7 @@ a {
.preview-panel {
min-height: 28px;
-margin: 10px 0 10px 20px;
+margin-left: 20px;
border-radius: 5px;
border: thin dotted $ignite-border-color;
@@ -1505,9 +1517,8 @@ a {
}
.preview-legend {
-top: -1px;
-right: 15px;
-margin-right: 10px;
+top: -10px;
+right: 20px;
position: absolute;
z-index: 900;
ignite git commit: IGNITE-2193: .NET: Fixed SerivceTest.cs.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 057ad5bb4 -> 889b26898
IGNITE-2193: .NET: Fixed SerivceTest.cs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/889b2689
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/889b2689
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/889b2689
Branch: refs/heads/ignite-1.5
Commit: 889b2689816a7185029eb7c992bf73f14600844c
Parents: 057ad5b
Author: Pavel Tupitsyn
Authored: Thu Dec 17 17:31:31 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:31:31 2015 +0300
--
.../Services/ServicesTest.cs| 23 +++-
1 file changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/889b2689/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
index 33f255e..ffcdea8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
@@ -218,10 +218,10 @@ namespace Apache.Ignite.Core.Tests.Services
}
Services.Cancel(SvcName + 0);
-Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 0);
-Assert.IsNull(Services.GetService(SvcName +
0));
-Assert.IsNull(Services.GetService(SvcName +
1));
+Services.Cancel(SvcName + 1);
+AssertNoService(SvcName + 1);
for (var i = 2; i < 10; i++)
Assert.IsNotNull(Services.GetService(SvcName + i));
@@ -229,7 +229,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
for (var i = 0; i < 10; i++)
-Assert.IsNull(Services.GetService(SvcName
+ i));
+AssertNoService(SvcName + i);
}
///
@@ -477,8 +477,7 @@ namespace Apache.Ignite.Core.Tests.Services
Services.CancelAll();
// Cancellation failed, but service is removed.
-foreach (var grid in Grids)
-
Assert.IsNull(grid.GetServices().GetService(SvcName));
+AssertNoService();
}
[Test]
@@ -579,6 +578,18 @@ namespace Apache.Ignite.Core.Tests.Services
}
///
+/// Asserts that there is no service on any grid with given name.
+///
+/// The name.
+private void AssertNoService(string name = SvcName)
+{
+foreach (var grid in Grids)
+Assert.IsTrue(
+TestUtils.WaitForCondition(() => grid.GetServices()
+.GetService(name) == null, 5000));
+}
+
+///
/// Gets the services.
///
protected virtual IServices Services
[2/9] ignite git commit: IGNITE-2188 Incorrect links in platform .Net documentation
IGNITE-2188 Incorrect links in platform .Net documentation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e4a486 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e4a486 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e4a486 Branch: refs/heads/ignite-1.5.1-2 Commit: e7e4a48677832aba35bf2828d23d16e5ce7a0093 Parents: e599f44 Author: Pavel Tupitsyn Authored: Thu Dec 17 13:55:45 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Dec 17 13:55:45 2015 +0300 -- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7e4a486/modules/platforms/dotnet/Apache.Ignite.dxg -- diff --git a/modules/platforms/dotnet/Apache.Ignite.dxg b/modules/platforms/dotnet/Apache.Ignite.dxg index e33e7d6..6337d83 100644 --- a/modules/platforms/dotnet/Apache.Ignite.dxg +++ b/modules/platforms/dotnet/Apache.Ignite.dxg @@ -299,7 +299,7 @@ MARKDOWN_SUPPORT = YES # globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. -AUTOLINK_SUPPORT = YES +AUTOLINK_SUPPORT = NO # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should set this
[8/9] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all
modes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/057ad5bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/057ad5bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/057ad5bb
Branch: refs/heads/ignite-1.5.1-2
Commit: 057ad5bb4d054cba90932ff5614a928b623d44cc
Parents: 1f484ea
Author: vozerov-gridgain
Authored: Thu Dec 17 17:00:29 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:00:29 2015 +0300
--
.../binary/BinaryReflectiveSerializer.java | 33 ++
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../internal/binary/BinaryClassDescriptor.java | 124 ++
.../ignite/internal/binary/BinaryContext.java | 109 -
.../internal/binary/BinaryFieldAccessor.java| 3 -
.../ignite/internal/binary/BinaryUtils.java | 49 ++-
.../ignite/internal/binary/BinaryWriteMode.java | 3 -
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java| 204 ++---
.../binary/BinaryFieldsAbstractSelfTest.java| 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java| 3 +-
.../binary/BinaryMarshallerSelfTest.java| 34 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 +++
...onQueryWithReflectiveSerializerSelfTest.java | 28 ++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java| 119 +-
26 files changed, 995 insertions(+), 220 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
new file mode 100644
index 000..fd0f841
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+/**
+ * Binary serializer which writes object fields using reflection. Transient
fields are not written.
+ */
+public class BinaryReflectiveSerializer implements BinarySerializer {
+/** {@inheritDoc} */
+@Override public void writeBinary(Object obj, BinaryWriter writer) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+
+/** {@inheritDoc} */
+@Override public void readBinary(Object obj, BinaryReader reader) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
index a694eaf..a00c061 100644
---
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
@@ -17,9 +17,10 @@
package org.apache.ignite.binary;
[7/9] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
new file mode 100644
index 000..b905646
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+/**
+ * Test for query with BinaryMarshaller and different serialization modes and
with reflective serializer.
+ */
+public class BinarySerializationQueryWithReflectiveSerializerSelfTest extends
BinarySerializationQuerySelfTest {
+/** {@inheritDoc} */
+@Override protected boolean useReflectiveSerializer() {
+return true;
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 64a1115..cae7f0c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest
extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery(String.class, "field
like '" + key + "'")).getAll();
-assertTrue("p2p marshalling failed, but error response was not
sent", binaryMarshaller());
+fail("p2p marshalling failed, but error response was not sent");
}
catch (CacheException e) {
-assertFalse("Unexpected exception: " + e, binaryMarshaller());
+// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 786b5b8..6abc2d4 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -18,31 +18,85 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest;
+import
org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheCrossCacheQuery
[5/9] ignite git commit: fixed https://issues.apache.org/jira/browse/IGNITE-2175
fixed https://issues.apache.org/jira/browse/IGNITE-2175
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3223b05c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3223b05c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3223b05c
Branch: refs/heads/ignite-1.5.1-2
Commit: 3223b05c082732ad77462f00cb09d24af2d768f7
Parents: c1e2926
Author: Yakov Zhdanov
Authored: Thu Dec 17 15:07:21 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 15:07:21 2015 +0300
--
.../examples/datagrid/CacheQueryExample.java| 11 +++---
.../streaming/StreamVisitorExample.java | 40 +++-
2 files changed, 36 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 2d86cde..ace7395 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -22,6 +22,7 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.query.QueryCursor;
@@ -126,12 +127,12 @@ public class CacheQueryExample {
* Example for scan query based on a predicate.
*/
private static void scanQuery() {
-IgniteCache, Person> cache =
Ignition.ignite().cache(PERSON_CACHE);
+IgniteCache cache =
Ignition.ignite().cache(PERSON_CACHE).withKeepBinary();
-ScanQuery, Person> scan = new ScanQuery<>(
-new IgniteBiPredicate, Person>() {
-@Override public boolean apply(AffinityKey key, Person
person) {
-return person.salary <= 1000;
+ScanQuery scan = new ScanQuery<>(
+new IgniteBiPredicate() {
+@Override public boolean apply(BinaryObject key, BinaryObject
person) {
+return person.field("salary") <= 1000;
}
}
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index f2e1e9f..819cfea 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -25,6 +25,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -75,21 +77,39 @@ public class StreamVisitorExample {
// Instead we update the instruments in the 'instCache'.
// Since both, 'instCache' and 'mktCache' use the same
key, updates are collocated.
mktStmr.receiver(new StreamVisitor() {
-@Override
-public void apply(IgniteCache cache,
Map.Entry e) {
+@Override public void apply(IgniteCache cache, Map.Entry e) {
String symbol = e.getKey();
Double tick = e.getValue();
-Instrument inst = instCache.get(symbol);
+IgniteCache binInstCache =
ignite.cache("instCache").withKeepBinary();
-if (inst == null)
-inst = new Instrument(symbol);
+BinaryObject inst = binInstCache.get(symbol);
-// Don't populate market cache, as we don't use it
for querying.
-// Update cached instrument based on the latest
market tick.
-inst.update(tick);
+BinaryObject
[3/9] ignite git commit: Ignite-2087
Ignite-2087
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd1f506e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd1f506e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd1f506e
Branch: refs/heads/ignite-1.5.1-2
Commit: bd1f506eaa618f803b39461f5198091d7cbea3a4
Parents: e7e4a48
Author: Anton Vinogradov
Authored: Thu Dec 17 14:27:16 2015 +0300
Committer: Anton Vinogradov
Committed: Thu Dec 17 14:27:16 2015 +0300
--
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +++-
.../java/org/apache/ignite/IgniteSpring.java| 4 +-
3 files changed, 43 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 84ed2cd..6e09d72 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -114,7 +114,7 @@ public class CacheManager implements
javax.cache.CacheManager {
ignite = (IgniteKernal)IgnitionEx.start(cfg);
}
else
-ignite = (IgniteKernal)IgnitionEx.start(uri.toURL());
+ignite = (IgniteKernal)IgnitionEx.start(uri.toURL(), clsLdr);
kernalGateway = ignite.context().gateway();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4f6c6d9..5153fb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -495,7 +495,7 @@ public class IgnitionEx {
URL url = U.resolveIgniteUrl(DFLT_CFG);
if (url != null)
-return start(DFLT_CFG, null, springCtx);
+return start(DFLT_CFG, null, springCtx, null);
U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?):
" + DFLT_CFG);
@@ -581,7 +581,7 @@ public class IgnitionEx {
return start(cfg);
}
else
-return start(springCfgPath, gridName, null);
+return start(springCfgPath, gridName, null, null);
}
/**
@@ -697,6 +697,7 @@ public class IgnitionEx {
* @param springCfgPath Spring XML configuration file path or URL. This
cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code
null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
* {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
@@ -707,10 +708,10 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(String springCfgPath, @Nullable String gridName,
-@Nullable GridSpringResourceContext springCtx) throws
IgniteCheckedException {
+@Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader
ldr) throws IgniteCheckedException {
URL url = U.resolveSpringUrl(springCfgPath);
-return start(url, gridName, springCtx);
+return start(url, gridName, springCtx, ldr);
}
/**
@@ -730,7 +731,28 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl) throws IgniteCheckedException
{
-return start(springCfgUrl, null, null);
+return start(springCfgUrl, null, null, null);
+}
+
+/**
+ * Starts all grids specified within given Spring XML configuration file
URL. If grid with given name
+ * is already started, then exception is thrown. In this case all
instances that may
+ * have been started so far will be stopped too.
+ *
+ * Usually Spring XML configuration file will contain only one Grid
definition. Note that
+ * Grid configuration bean(s) is retrieved form configuration file by
type, so the name of
+ * the Grid
[9/9] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/206e5a53 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/206e5a53 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/206e5a53 Branch: refs/heads/ignite-1.5.1-2 Commit: 206e5a53c3cfa6285d911efe093ede03a3a67892 Parents: 11bee91 057ad5b Author: Alexey Goncharuk Authored: Thu Dec 17 17:03:59 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Dec 17 17:03:59 2015 +0300 -- .../examples/datagrid/CacheQueryExample.java| 11 +- .../streaming/StreamVisitorExample.java | 40 +- .../binary/BinaryReflectiveSerializer.java | 33 ++ .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 124 ++ .../ignite/internal/binary/BinaryContext.java | 109 - .../internal/binary/BinaryFieldAccessor.java| 3 - .../ignite/internal/binary/BinaryUtils.java | 49 ++- .../ignite/internal/binary/BinaryWriteMode.java | 3 - .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java| 204 ++--- .../binary/BinaryFieldsAbstractSelfTest.java| 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java| 3 +- .../binary/BinaryMarshallerSelfTest.java| 34 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../cache/CacheStopAndDestroySelfTest.java | 2 + .../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +- .../cache/IgniteCacheSerializationSelfTest.java | 112 + .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../session/GridSessionCheckpointSelfTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- .../cache/BinarySerializationQuerySelfTest.java | 416 +++ ...onQueryWithReflectiveSerializerSelfTest.java | 28 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java| 119 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 32 files changed, 1147 insertions(+), 237 deletions(-) --
[6/9] ignite git commit: #Added test.
#Added test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f484ea1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f484ea1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f484ea1
Branch: refs/heads/ignite-1.5.1-2
Commit: 1f484ea17ced36b44c2b78201674c302a484db5e
Parents: 3223b05
Author: Alexey Goncharuk
Authored: Thu Dec 17 15:36:23 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 15:36:23 2015 +0300
--
.../cache/IgniteCacheSerializationSelfTest.java | 112 +++
1 file changed, 112 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f484ea1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
new file mode 100644
index 000..2c8c3bc
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+
+/**
+ *
+ */
+public class IgniteCacheSerializationSelfTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private static final int NODES = 3;
+
+/** */
+private static final int CLIENT = NODES - 1;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+if (getTestGridName(CLIENT).equals(gridName))
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+
+super.afterTestsStopped();
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGrids(NODES);
+}
+
+/**
+ * @param cacheMode Cache mode.
+ * @param atomicityMode Atomicity mode.
+ * @return Cache configuration.
+ */
+private CacheConfiguration cacheConfiguration(CacheMode
cacheMode, CacheAtomicityMode atomicityMode) {
+CacheConfiguration ccfg = new CacheConfiguration<>();
+
+ccfg.setCacheMode(cacheMode);
+ccfg.setAtomicityMode(atomicityMode);
+
+ccfg.setBackups(1);
+
+return ccfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testSerializeClosure() throws Exception {
+Ignite client = ignite(CLIENT);
+
+final IgniteCache clientCache =
client.createCache(cacheConfiguration(PARTITIONED, ATOMIC));
+
+try {
+client.compute(client.cluster().forRemotes().forRandom()).call(new
IgniteCallable() {
+@Override p
[4/9] ignite git commit: minor
minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e29266
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e29266
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e29266
Branch: refs/heads/ignite-1.5.1-2
Commit: c1e292667154d99eaa7e2621fc811b3d916e09a6
Parents: bd1f506
Author: Yakov Zhdanov
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 14:47:05 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerUpdateJob.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e29266/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index c49087f..c2ab0c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -168,4 +168,4 @@ class DataStreamerUpdateJob implements
GridPlainCallable {
ctx.security().authorize(cacheName, perm, null);
}
-}
\ No newline at end of file
+}
[1/9] ignite git commit: #Muting hanging test, created ticket.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.1-2 11bee9178 -> 206e5a53c
#Muting hanging test, created ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e599f44b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e599f44b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e599f44b
Branch: refs/heads/ignite-1.5.1-2
Commit: e599f44b2f8b90b9dde0de8e374f42cec8b61358
Parents: 914b727
Author: Alexey Goncharuk
Authored: Thu Dec 17 13:28:38 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 13:28:38 2015 +0300
--
.../internal/processors/cache/CacheStopAndDestroySelfTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e599f44b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 061a374..515ae87 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -539,6 +539,8 @@ public class CacheStopAndDestroySelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearClose() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-2189";);
+
IgniteCache cache0 =
grid(0).getOrCreateCache(getNearConfig());
// GridDhtTxPrepareRequest requests to Client node will be counted.
[09/15] ignite git commit: Ignite-2087
Ignite-2087
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd1f506e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd1f506e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd1f506e
Branch: refs/heads/ignite-843-rc2
Commit: bd1f506eaa618f803b39461f5198091d7cbea3a4
Parents: e7e4a48
Author: Anton Vinogradov
Authored: Thu Dec 17 14:27:16 2015 +0300
Committer: Anton Vinogradov
Committed: Thu Dec 17 14:27:16 2015 +0300
--
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +++-
.../java/org/apache/ignite/IgniteSpring.java| 4 +-
3 files changed, 43 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 84ed2cd..6e09d72 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -114,7 +114,7 @@ public class CacheManager implements
javax.cache.CacheManager {
ignite = (IgniteKernal)IgnitionEx.start(cfg);
}
else
-ignite = (IgniteKernal)IgnitionEx.start(uri.toURL());
+ignite = (IgniteKernal)IgnitionEx.start(uri.toURL(), clsLdr);
kernalGateway = ignite.context().gateway();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4f6c6d9..5153fb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -495,7 +495,7 @@ public class IgnitionEx {
URL url = U.resolveIgniteUrl(DFLT_CFG);
if (url != null)
-return start(DFLT_CFG, null, springCtx);
+return start(DFLT_CFG, null, springCtx, null);
U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?):
" + DFLT_CFG);
@@ -581,7 +581,7 @@ public class IgnitionEx {
return start(cfg);
}
else
-return start(springCfgPath, gridName, null);
+return start(springCfgPath, gridName, null, null);
}
/**
@@ -697,6 +697,7 @@ public class IgnitionEx {
* @param springCfgPath Spring XML configuration file path or URL. This
cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code
null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
* {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
@@ -707,10 +708,10 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(String springCfgPath, @Nullable String gridName,
-@Nullable GridSpringResourceContext springCtx) throws
IgniteCheckedException {
+@Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader
ldr) throws IgniteCheckedException {
URL url = U.resolveSpringUrl(springCfgPath);
-return start(url, gridName, springCtx);
+return start(url, gridName, springCtx, ldr);
}
/**
@@ -730,7 +731,28 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl) throws IgniteCheckedException
{
-return start(springCfgUrl, null, null);
+return start(springCfgUrl, null, null, null);
+}
+
+/**
+ * Starts all grids specified within given Spring XML configuration file
URL. If grid with given name
+ * is already started, then exception is thrown. In this case all
instances that may
+ * have been started so far will be stopped too.
+ *
+ * Usually Spring XML configuration file will contain only one Grid
definition. Note that
+ * Grid configuration bean(s) is retrieved form configuration file by
type, so the name of
+ * the Grid
[11/15] ignite git commit: fixed https://issues.apache.org/jira/browse/IGNITE-2175
fixed https://issues.apache.org/jira/browse/IGNITE-2175
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3223b05c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3223b05c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3223b05c
Branch: refs/heads/ignite-843-rc2
Commit: 3223b05c082732ad77462f00cb09d24af2d768f7
Parents: c1e2926
Author: Yakov Zhdanov
Authored: Thu Dec 17 15:07:21 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 15:07:21 2015 +0300
--
.../examples/datagrid/CacheQueryExample.java| 11 +++---
.../streaming/StreamVisitorExample.java | 40 +++-
2 files changed, 36 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 2d86cde..ace7395 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -22,6 +22,7 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.query.QueryCursor;
@@ -126,12 +127,12 @@ public class CacheQueryExample {
* Example for scan query based on a predicate.
*/
private static void scanQuery() {
-IgniteCache, Person> cache =
Ignition.ignite().cache(PERSON_CACHE);
+IgniteCache cache =
Ignition.ignite().cache(PERSON_CACHE).withKeepBinary();
-ScanQuery, Person> scan = new ScanQuery<>(
-new IgniteBiPredicate, Person>() {
-@Override public boolean apply(AffinityKey key, Person
person) {
-return person.salary <= 1000;
+ScanQuery scan = new ScanQuery<>(
+new IgniteBiPredicate() {
+@Override public boolean apply(BinaryObject key, BinaryObject
person) {
+return person.field("salary") <= 1000;
}
}
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index f2e1e9f..819cfea 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -25,6 +25,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -75,21 +77,39 @@ public class StreamVisitorExample {
// Instead we update the instruments in the 'instCache'.
// Since both, 'instCache' and 'mktCache' use the same
key, updates are collocated.
mktStmr.receiver(new StreamVisitor() {
-@Override
-public void apply(IgniteCache cache,
Map.Entry e) {
+@Override public void apply(IgniteCache cache, Map.Entry e) {
String symbol = e.getKey();
Double tick = e.getValue();
-Instrument inst = instCache.get(symbol);
+IgniteCache binInstCache =
ignite.cache("instCache").withKeepBinary();
-if (inst == null)
-inst = new Instrument(symbol);
+BinaryObject inst = binInstCache.get(symbol);
-// Don't populate market cache, as we don't use it
for querying.
-// Update cached instrument based on the latest
market tick.
-inst.update(tick);
+BinaryObject
[04/15] ignite git commit: 1.5.0-final-SNAPSHOT
1.5.0-final-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9087f019 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9087f019 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9087f019 Branch: refs/heads/ignite-843-rc2 Commit: 9087f019d06b3c7a35376590177868877311fec2 Parents: 916f59a Author: Ignite Teamcity Authored: Thu Dec 17 12:33:20 2015 +0300 Committer: Ignite Teamcity Committed: Thu Dec 17 12:33:20 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml| 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml| 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties| 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml| 2 +- modules/gce/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/jms11/pom.xml| 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml| 2 +- modules/log4j/pom.xml| 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml| 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac| 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac| 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml| 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml| 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml| 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml| 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml| 2 +- modules/visor-plugins/pom.xml| 2 +- modules/web/pom.xml | 2 +- modules/ya
[10/15] ignite git commit: minor
minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e29266
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e29266
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e29266
Branch: refs/heads/ignite-843-rc2
Commit: c1e292667154d99eaa7e2621fc811b3d916e09a6
Parents: bd1f506
Author: Yakov Zhdanov
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 14:47:05 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerUpdateJob.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e29266/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index c49087f..c2ab0c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -168,4 +168,4 @@ class DataStreamerUpdateJob implements
GridPlainCallable {
ctx.security().authorize(cacheName, perm, null);
}
-}
\ No newline at end of file
+}
[02/15] ignite git commit: ignite-1.5 Avoid NPE in dumpDebugInfo.
ignite-1.5 Avoid NPE in dumpDebugInfo.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f26538d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f26538d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f26538d
Branch: refs/heads/ignite-843-rc2
Commit: 5f26538d7ac7838500259e9213abf26db50da9d9
Parents: 7f35bc6
Author: sboikov
Authored: Thu Dec 17 11:58:32 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 11:58:32 2015 +0300
--
.../apache/ignite/internal/IgniteKernal.java| 35
1 file changed, 21 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f26538d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index e0503fa..6e0be10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -3245,26 +3245,33 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
/** {@inheritDoc} */
public void dumpDebugInfo() {
-GridKernalContextImpl ctx = this.ctx;
+try {
+GridKernalContextImpl ctx = this.ctx;
+
+GridDiscoveryManager discoMrg = ctx != null ? ctx.discovery() :
null;
-if (ctx != null) {
-boolean client = ctx.clientNode();
+ClusterNode locNode = discoMrg != null ? discoMrg.localNode() :
null;
-ClusterNode locNode = ctx.discovery().localNode();
+if (ctx != null && discoMrg != null && locNode != null) {
+boolean client = ctx.clientNode();
-UUID routerId = locNode instanceof TcpDiscoveryNode ?
((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
+UUID routerId = locNode instanceof TcpDiscoveryNode ?
((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
-U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
-", name=" + ctx.gridName() +
-", order=" + locNode.order() +
-", topVer=" + ctx.discovery().topologyVersion() +
-", client=" + client +
-(client && routerId != null ? ", routerId=" + routerId : "") +
']');
+U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
+", name=" + ctx.gridName() +
+", order=" + locNode.order() +
+", topVer=" + discoMrg.topologyVersion() +
+", client=" + client +
+(client && routerId != null ? ", routerId=" + routerId :
"") + ']');
-ctx.cache().context().exchange().dumpDebugInfo();
+ctx.cache().context().exchange().dumpDebugInfo();
+}
+else
+U.warn(log, "Dumping debug info for node, context is not
initialized [name=" + gridName + ']');
+}
+catch (Exception e) {
+U.error(log, "Failed to dump debug info for node: " + e, e);
}
-else
-U.warn(log, "Dumping debug info for node, context is not
initialized [name=" + gridName + ']');
}
/** {@inheritDoc} */
[15/15] ignite git commit: IGNITE-843 Merge ignite-1.5 into ignite-843-rc2
IGNITE-843 Merge ignite-1.5 into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/580d1a1d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/580d1a1d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/580d1a1d
Branch: refs/heads/ignite-843-rc2
Commit: 580d1a1d0811ee1273badaf7fdabe2b8e8c1661b
Parents: b90d3f7
Author: AKuznetsov
Authored: Thu Dec 17 20:59:38 2015 +0700
Committer: AKuznetsov
Committed: Thu Dec 17 20:59:38 2015 +0700
--
modules/control-center-agent/pom.xml | 2 +-
modules/control-center-web/pom.xml | 2 +-
modules/control-center-web/src/main/js/routes/agent.js | 4 ++--
modules/schema-import-db/pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/control-center-agent/pom.xml
--
diff --git a/modules/control-center-agent/pom.xml
b/modules/control-center-agent/pom.xml
index 00916d5..85d76ea 100644
--- a/modules/control-center-agent/pom.xml
+++ b/modules/control-center-agent/pom.xml
@@ -31,7 +31,7 @@
ignite-control-center-agent
-1.5.0-b2-SNAPSHOT
+1.5.0-final-SNAPSHOT
9.2.12.v20150709
http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/control-center-web/pom.xml
--
diff --git a/modules/control-center-web/pom.xml
b/modules/control-center-web/pom.xml
index c155b25..812e414 100644
--- a/modules/control-center-web/pom.xml
+++ b/modules/control-center-web/pom.xml
@@ -31,7 +31,7 @@
ignite-control-center-web
-1.5.0-b2-SNAPSHOT
+1.5.0-final-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/control-center-web/src/main/js/routes/agent.js
--
diff --git a/modules/control-center-web/src/main/js/routes/agent.js
b/modules/control-center-web/src/main/js/routes/agent.js
index f915df2..3c59150 100644
--- a/modules/control-center-web/src/main/js/routes/agent.js
+++ b/modules/control-center-web/src/main/js/routes/agent.js
@@ -45,7 +45,7 @@ router.get('/download/zip', function (req, res) {
var JSZip = require('jszip');
var config = require('../helpers/configuration-loader.js');
-var agentFld = 'ignite-web-agent-1.5.0-b2-SNAPSHOT';
+var agentFld = 'ignite-web-agent-1.5.0-final-SNAPSHOT';
var agentZip = agentFld + '.zip';
// Read a zip file.
@@ -86,7 +86,7 @@ router.post('/topology', function (req, res) {
client.ignite().cluster(false).then(function (clusters) {
var caches = clusters.map(function (cluster) {
return Object.keys(cluster._caches).map(function (key) {
-return {name: key, mode: cluster._caches[key]}
+return {name: key, mode: cluster._caches[key]};
});
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/schema-import-db/pom.xml
--
diff --git a/modules/schema-import-db/pom.xml b/modules/schema-import-db/pom.xml
index 7717472..405b905 100644
--- a/modules/schema-import-db/pom.xml
+++ b/modules/schema-import-db/pom.xml
@@ -32,7 +32,7 @@
ignite-schema-import-db
-1.5.0-b2-SNAPSHOT
+1.5.0-final-SNAPSHOT
[01/15] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 debb326d3 -> 580d1a1d0 Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d2f44e2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d2f44e2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d2f44e2 Branch: refs/heads/ignite-843-rc2 Commit: 2d2f44e2182d3356171d2d7b37110f8ed3c6bc9e Parents: 5b31c31 ed5f279 Author: AKuznetsov Authored: Tue Dec 15 22:22:38 2015 +0700 Committer: AKuznetsov Committed: Tue Dec 15 22:22:38 2015 +0700 -- bin/ignitevisorcmd.bat |1 + .../store/auto/CacheBinaryAutoStoreExample.java |7 +- modules/clients/pom.xml |2 +- .../org/apache/ignite/cache/CacheManager.java |2 + .../CacheDataStructuresManager.java |5 +- .../distributed/dht/GridDhtCacheAdapter.java|7 +- .../dht/GridPartitionedSingleGetFuture.java |7 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 36 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 25 + .../distributed/near/GridNearAtomicCache.java |3 + .../cache/query/GridCacheQueryRequest.java | 12 +- .../CacheSerializableTransactionsTest.java |8 + .../cache/GridCacheAbstractFullApiSelfTest.java |8 + ...IgniteCacheAtomicPutAllFailoverSelfTest.java |1 + ...ntNodeBinaryObjectMetadataMultinodeTest.java |8 +- .../GridCacheQueueApiSelfAbstractTest.java | 86 +- ...gniteAtomicLongChangingTopologySelfTest.java |8 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java |5 - ...ledFairAffinityMultiNodeFullApiSelfTest.java |5 - .../near/NearCacheSyncUpdateTest.java | 167 ++ .../GridCacheRebalancingSyncSelfTest.java | 12 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 30 +- ...CommunicationRecoveryAckClosureSelfTest.java | 39 +- .../testframework/junits/GridAbstractTest.java | 10 +- .../testsuites/IgniteCacheTestSuite2.java |2 + .../IgniteSpiDiscoverySelfTestSuite.java|6 + modules/platforms/cpp/cpp.dxg |2 +- modules/platforms/dotnet/Apache.Ignite.dxg |2 +- modules/platforms/dotnet/dotnet.dxg | 1795 -- .../Compute/ClosureExample.cs |2 +- .../Compute/TaskExample.cs |2 +- .../Datagrid/ContinuousQueryExample.cs |2 +- .../Datagrid/DataStreamerExample.cs |2 +- .../Datagrid/PutGetExample.cs |2 +- .../Datagrid/QueryExample.cs|2 +- .../Datagrid/StoreExample.cs|2 +- .../Datagrid/TransactionExample.cs |2 +- .../Events/EventsExample.cs |2 +- .../Services/ServicesExample.cs |2 +- .../cache/IgnitePutGetBatchBenchmark.java | 60 + .../cache/IgnitePutGetTxBatchBenchmark.java | 86 + 42 files changed, 554 insertions(+), 1923 deletions(-) --
[08/15] ignite git commit: IGNITE-2188 Incorrect links in platform .Net documentation
IGNITE-2188 Incorrect links in platform .Net documentation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e4a486 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e4a486 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e4a486 Branch: refs/heads/ignite-843-rc2 Commit: e7e4a48677832aba35bf2828d23d16e5ce7a0093 Parents: e599f44 Author: Pavel Tupitsyn Authored: Thu Dec 17 13:55:45 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Dec 17 13:55:45 2015 +0300 -- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7e4a486/modules/platforms/dotnet/Apache.Ignite.dxg -- diff --git a/modules/platforms/dotnet/Apache.Ignite.dxg b/modules/platforms/dotnet/Apache.Ignite.dxg index e33e7d6..6337d83 100644 --- a/modules/platforms/dotnet/Apache.Ignite.dxg +++ b/modules/platforms/dotnet/Apache.Ignite.dxg @@ -299,7 +299,7 @@ MARKDOWN_SUPPORT = YES # globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. -AUTOLINK_SUPPORT = YES +AUTOLINK_SUPPORT = NO # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should set this
[06/15] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/914b727b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/914b727b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/914b727b Branch: refs/heads/ignite-843-rc2 Commit: 914b727b3ed2a8dbdbd98c442016c188f37ea057 Parents: dfa84c8 9087f01 Author: vozerov-gridgain Authored: Thu Dec 17 12:52:00 2015 +0300 Committer: vozerov-gridgain Committed: Thu Dec 17 12:52:00 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../apache/ignite/internal/IgniteKernal.java| 35 +++-- .../processors/cache/GridCacheUtils.java| 18 +-- .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++-- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml| 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/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 +- modules/yarn/pom.xml| 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 67 files changed, 142 insertions(+), 106 deletions(-) --
[07/15] ignite git commit: #Muting hanging test, created ticket.
#Muting hanging test, created ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e599f44b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e599f44b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e599f44b
Branch: refs/heads/ignite-843-rc2
Commit: e599f44b2f8b90b9dde0de8e374f42cec8b61358
Parents: 914b727
Author: Alexey Goncharuk
Authored: Thu Dec 17 13:28:38 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 13:28:38 2015 +0300
--
.../internal/processors/cache/CacheStopAndDestroySelfTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e599f44b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 061a374..515ae87 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -539,6 +539,8 @@ public class CacheStopAndDestroySelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearClose() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-2189";);
+
IgniteCache cache0 =
grid(0).getOrCreateCache(getNearConfig());
// GridDhtTxPrepareRequest requests to Client node will be counted.
[12/15] ignite git commit: #Added test.
#Added test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f484ea1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f484ea1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f484ea1
Branch: refs/heads/ignite-843-rc2
Commit: 1f484ea17ced36b44c2b78201674c302a484db5e
Parents: 3223b05
Author: Alexey Goncharuk
Authored: Thu Dec 17 15:36:23 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 15:36:23 2015 +0300
--
.../cache/IgniteCacheSerializationSelfTest.java | 112 +++
1 file changed, 112 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f484ea1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
new file mode 100644
index 000..2c8c3bc
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+
+/**
+ *
+ */
+public class IgniteCacheSerializationSelfTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private static final int NODES = 3;
+
+/** */
+private static final int CLIENT = NODES - 1;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+if (getTestGridName(CLIENT).equals(gridName))
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+
+super.afterTestsStopped();
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGrids(NODES);
+}
+
+/**
+ * @param cacheMode Cache mode.
+ * @param atomicityMode Atomicity mode.
+ * @return Cache configuration.
+ */
+private CacheConfiguration cacheConfiguration(CacheMode
cacheMode, CacheAtomicityMode atomicityMode) {
+CacheConfiguration ccfg = new CacheConfiguration<>();
+
+ccfg.setCacheMode(cacheMode);
+ccfg.setAtomicityMode(atomicityMode);
+
+ccfg.setBackups(1);
+
+return ccfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testSerializeClosure() throws Exception {
+Ignite client = ignite(CLIENT);
+
+final IgniteCache clientCache =
client.createCache(cacheConfiguration(PARTITIONED, ATOMIC));
+
+try {
+client.compute(client.cluster().forRemotes().forRandom()).call(new
IgniteCallable() {
+@Override p
[14/15] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b90d3f7b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b90d3f7b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b90d3f7b Branch: refs/heads/ignite-843-rc2 Commit: b90d3f7bc4516f0f6a1e347b718dd7cbcb23efad Parents: 0f2bc67 1f484ea Author: AKuznetsov Authored: Thu Dec 17 20:44:44 2015 +0700 Committer: AKuznetsov Committed: Thu Dec 17 20:44:44 2015 +0700 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- .../examples/datagrid/CacheQueryExample.java| 11 +- .../streaming/StreamVisitorExample.java | 40 +-- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../org/apache/ignite/cache/CacheManager.java | 2 +- .../apache/ignite/internal/IgniteKernal.java| 35 +++--- .../org/apache/ignite/internal/IgnitionEx.java | 51 +++-- .../processors/cache/GridCacheUtils.java| 18 +-- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/CacheStopAndDestroySelfTest.java | 2 + .../cache/IgniteCacheSerializationSelfTest.java | 112 +++ modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 - modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml| 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Messaging/MessagingExample.cs | 6 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../java/org/apache/ignite/IgniteSpring.java| 4 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/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 +-
[05/15] ignite git commit: .NET MessagingExample: improved docs.
.NET MessagingExample: improved docs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfa84c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfa84c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfa84c82
Branch: refs/heads/ignite-843-rc2
Commit: dfa84c821eaef8de1486c8074d959c5c3ae24ae7
Parents: 7f35bc6
Author: vozerov-gridgain
Authored: Thu Dec 17 12:51:27 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 12:51:27 2015 +0300
--
.../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfa84c82/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
--
diff --git
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
index 3c74a42..3fafd8f 100644
---
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
+++
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
@@ -26,10 +26,10 @@ namespace Apache.Ignite.Examples.Messaging
///
/// Example demonstrating Ignite messaging. Should be run with standalone
Apache Ignite.NET node.
///
-/// 1) Run
%IGNITE_HOME%/platforms/dotnet/Apache.Ignite/bin/${Platform]/${Configuration}/Apache.Ignite.exe:
+/// 1) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
+///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder;
+/// 2) Run %IGNITE_HOME%/platforms/dotnet/bin/Apache.Ignite.exe:
/// Apache.Ignite.exe -IgniteHome="%IGNITE_HOME%"
-springConfigUrl=platforms\dotnet\examples\config\example-compute.xml
-assembly=[path_to_Apache.Ignite.ExamplesDll.dll]
-/// 2) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
-///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder.
/// 3) Set this class as startup object (Apache.Ignite.Examples project ->
right-click -> Properties ->
/// Application -> Startup object);
/// 4) Start example (F5 or Ctrl+F5).
[13/15] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f2bc67a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f2bc67a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f2bc67a Branch: refs/heads/ignite-843-rc2 Commit: 0f2bc67a27c27b5c016f70b21f9f734dde1a3028 Parents: 2d2f44e debb326 Author: AKuznetsov Authored: Thu Dec 17 20:39:05 2015 +0700 Committer: AKuznetsov Committed: Thu Dec 17 20:39:05 2015 +0700 -- .../store/auto/CacheBinaryAutoStoreExample.java | 2 +- .../store/dummy/CacheDummyPersonStore.java | 113 - .../store/dummy/CacheDummyStoreExample.java | 133 -- .../datagrid/store/dummy/package-info.java | 22 - .../store/jdbc/CacheJdbcPersonStore.java| 43 +- .../store/jdbc/CacheJdbcStoreExample.java | 24 +- .../store/spring/CacheSpringPersonStore.java| 131 - .../store/spring/CacheSpringStoreExample.java | 147 -- .../datagrid/store/spring/package-info.java | 22 - .../examples/ScalarSnowflakeSchemaExample.scala | 31 +- .../ignite/examples/CacheExamplesSelfTest.java | 10 +- .../handlers/DatabaseMetadataExtractor.java | 4 + .../ignite/agent/handlers/RestExecutor.java | 11 +- .../agent/testdrive/AgentMetadataTestDrive.java | 12 +- .../agent/testdrive/AgentSqlTestDrive.java | 8 +- modules/control-center-web/DEVNOTES.txt | 2 +- .../src/main/js/agents/agent-manager.js | 8 + modules/control-center-web/src/main/js/app.js | 2 - .../main/js/controllers/clusters-controller.js | 4 +- .../src/main/js/controllers/common-module.js| 23 +- .../main/js/controllers/metadata-controller.js | 149 +++--- .../src/main/js/controllers/models/caches.json | 4 +- .../main/js/controllers/models/metadata.json| 8 +- modules/control-center-web/src/main/js/db.js| 15 +- .../src/main/js/gulpfile.js/tasks/connect.js| 1 + .../main/js/helpers/generator/generator-java.js | 242 ++ .../helpers/generator/generator-properties.js | 2 +- .../main/js/helpers/generator/generator-xml.js | 60 +-- .../src/main/js/public/stylesheets/style.scss | 5 + .../src/main/js/routes/agent.js | 16 +- .../src/main/js/routes/presets.js | 68 --- .../src/main/js/views/configuration/caches.jade | 2 +- .../main/js/views/configuration/clusters.jade | 2 +- .../src/main/js/views/configuration/igfs.jade | 2 +- .../main/js/views/configuration/summary.jade| 2 +- .../src/main/js/views/includes/controls.jade| 9 +- .../src/main/js/views/sql/sql.jade | 6 +- .../main/js/views/templates/agent-download.jade | 3 +- modules/core/pom.xml| 5 + .../src/main/java/org/apache/ignite/Ignite.java | 19 + .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryObject.java | 15 + .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../configuration/CacheConfiguration.java | 19 +- .../apache/ignite/internal/IgniteKernal.java| 3 +- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryObjectExImpl.java | 7 + .../binary/BinaryObjectOffheapImpl.java | 7 + .../processors/cache/GridCacheProcessor.java| 12 +- .../cache/GridCacheSharedContext.java | 20 + .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../dht/GridPartitionedGetFuture.java | 15 +- .../dht/GridPartitionedSingleGetFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java| 30 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../cache/store/CacheOsStoreManager.java| 2 +- .../transactions/IgniteTxLocalAdapter.java | 23 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../service/GridServiceProcessor.java | 30 +- .../internal/visor/query/VisorQueryJob.java | 4 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +- .../core/src/main/resources/ignite.properties | 1 + .../CacheSerializableTransactionsTest.java | 8 + ...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 ++ .../cache/IgniteCacheNearLockValueSelfTest.java | 11 +- .../IgniteCacheStoreValueAbstractTest.java | 2 +- .../IgniteStartCacheInTransactionSelfTest.java | 39 +- .../GridCacheBinaryStoreAbstractSelfTest.java | 2 +- .../CacheGetInsideLockChangingTopologyTest.java | 475 +++ .../BinaryTxCacheLocalEntr
[03/15] ignite git commit: IGNITE-2178 - Fixed primary key set for scan query.
IGNITE-2178 - Fixed primary key set for scan query.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/916f59aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/916f59aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/916f59aa
Branch: refs/heads/ignite-843-rc2
Commit: 916f59aa1504a02288b965c50b9acffa29a2a464
Parents: 5f26538
Author: Alexey Goncharuk
Authored: Thu Dec 17 12:01:42 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 12:02:27 2015 +0300
--
.../processors/cache/GridCacheUtils.java| 18 +--
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++--
2 files changed, 50 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/916f59aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index f118003..51f6dcd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1578,23 +1578,7 @@ public class GridCacheUtils {
) {
return new CacheEntryPredicateAdapter() {
@Override public boolean apply(GridCacheEntryEx e) {
-return aff.isPrimary(n,
e.key().value(e.context().cacheObjectContext(), false));
-}
-};
-}
-
-/**
- * @param aff Affinity.
- * @param n Node.
- * @return Predicate that evaulates to {@code true} if entry is primary
for node.
- */
-public static IgnitePredicate> cachePrimary0(
-final Affinity aff,
-final ClusterNode n
-) {
-return new IgnitePredicate>() {
-@Override public boolean apply(Cache.Entry e) {
-return aff.isPrimary(n, e.getKey());
+return aff.isPrimary(n, e.key());
}
};
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/916f59aa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
index 091c633..5c1e578 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
@@ -19,16 +19,19 @@ package org.apache.ignite.internal.processors.cache;
import java.util.List;
import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -48,6 +51,9 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+/** Grid count. */
+public static final int GRID_CNT = 4;
+
/** */
private static ClassLoader extClassLoader;
@@ -94,8 +100,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
@Override protected void beforeTestsStarted() throws Exception {
extClassLoader = getExternalClassLoader();
-startGrids(4);
-
+startGrids(GRID_CNT);
}
/** {@inheritDoc} */
@@ -165,7 +170,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
*
[1/2] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 1f484ea17 -> 057ad5bb4
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
new file mode 100644
index 000..b905646
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQueryWithReflectiveSerializerSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+/**
+ * Test for query with BinaryMarshaller and different serialization modes and
with reflective serializer.
+ */
+public class BinarySerializationQueryWithReflectiveSerializerSelfTest extends
BinarySerializationQuerySelfTest {
+/** {@inheritDoc} */
+@Override protected boolean useReflectiveSerializer() {
+return true;
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 64a1115..cae7f0c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest
extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery(String.class, "field
like '" + key + "'")).getAll();
-assertTrue("p2p marshalling failed, but error response was not
sent", binaryMarshaller());
+fail("p2p marshalling failed, but error response was not sent");
}
catch (CacheException e) {
-assertFalse("Unexpected exception: " + e, binaryMarshaller());
+// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 786b5b8..6abc2d4 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -18,31 +18,85 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest;
+import
org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest;
+import
org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackS
[2/2] ignite git commit: IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all modes.
IGNITE-2100: Fixed serilaization of Externalizable. Now queries work in all
modes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/057ad5bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/057ad5bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/057ad5bb
Branch: refs/heads/ignite-1.5
Commit: 057ad5bb4d054cba90932ff5614a928b623d44cc
Parents: 1f484ea
Author: vozerov-gridgain
Authored: Thu Dec 17 17:00:29 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 17:00:29 2015 +0300
--
.../binary/BinaryReflectiveSerializer.java | 33 ++
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../internal/binary/BinaryClassDescriptor.java | 124 ++
.../ignite/internal/binary/BinaryContext.java | 109 -
.../internal/binary/BinaryFieldAccessor.java| 3 -
.../ignite/internal/binary/BinaryUtils.java | 49 ++-
.../ignite/internal/binary/BinaryWriteMode.java | 3 -
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java| 204 ++---
.../binary/BinaryFieldsAbstractSelfTest.java| 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java| 3 +-
.../binary/BinaryMarshallerSelfTest.java| 34 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 +++
...onQueryWithReflectiveSerializerSelfTest.java | 28 ++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java| 119 +-
26 files changed, 995 insertions(+), 220 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
new file mode 100644
index 000..fd0f841
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReflectiveSerializer.java
@@ -0,0 +1,33 @@
+/*
+ * 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.binary;
+
+/**
+ * Binary serializer which writes object fields using reflection. Transient
fields are not written.
+ */
+public class BinaryReflectiveSerializer implements BinarySerializer {
+/** {@inheritDoc} */
+@Override public void writeBinary(Object obj, BinaryWriter writer) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+
+/** {@inheritDoc} */
+@Override public void readBinary(Object obj, BinaryReader reader) throws
BinaryObjectException {
+assert false : "Method should not be called directly.";
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/057ad5bb/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
index a694eaf..a00c061 100644
---
a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
@@ -17,9 +17,10 @@
package org.apache.ignite.binary;
-
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 0df097c3d -> 99803f2f3
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99803f2f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99803f2f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99803f2f
Branch: refs/heads/ignite-1537
Commit: 99803f2f3849ef807f1dbd0dd06daf4741c3939e
Parents: 0df097c
Author: sboikov
Authored: Thu Dec 17 16:31:05 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 16:31:05 2015 +0300
--
.../ignite/session/GridSessionCheckpointAbstractSelfTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/99803f2f/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
index 06cbf1c..c087d38 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.compute.ComputeTaskSessionScope;
import org.apache.ignite.compute.ComputeTaskSplitAdapter;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.TaskSessionResource;
@@ -55,7 +56,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest
extends GridCommonAb
private static final int SPLIT_COUNT = 5;
/** */
-private static CountDownLatch taskLatch;
+private static volatile CountDownLatch taskLatch;
/** */
protected GridSessionCheckpointAbstractSelfTest() {
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 c7391b041 -> 0df097c3d
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0df097c3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0df097c3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0df097c3
Branch: refs/heads/ignite-1537
Commit: 0df097c3da54f84762c939c717b2a49a522c934c
Parents: c7391b0
Author: sboikov
Authored: Thu Dec 17 16:26:52 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 16:26:52 2015 +0300
--
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 2 +-
.../org/apache/ignite/messaging/IgniteMessagingWithClientTest.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0df097c3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 9a6246f..c46a66c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -482,7 +482,7 @@ public class GridDhtPreloader extends
GridCachePreloaderAdapter {
/** {@inheritDoc} */
@Override public IgniteInternalFuture initialRebalanceFuture() {
-return cctx.kernalContext().clientNode() ? new
GridFinishedFuture<>(true) : initRebalanceFut;
+return cctx.kernalContext().clientNode() ? startFut : initRebalanceFut;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0df097c3/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
index 62f4c1a..e885f48 100644
---
a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
@@ -78,8 +78,6 @@ public class IgniteMessagingWithClientTest extends
GridCommonAbstractTest implem
* @throws Exception If failed.
*/
public void testMessageSendWithClientJoin() throws Exception {
-fail("https://issues.apache.org/jira/browse/IGNITE-996";);
-
startGrid(0);
Ignite ignite1 = startGrid(1);
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 0cb04ba7d -> c7391b041
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7391b04
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7391b04
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7391b04
Branch: refs/heads/ignite-1537
Commit: c7391b041e93f583b63b963a3d12ba6f5c84e3bc
Parents: 0cb04ba
Author: sboikov
Authored: Thu Dec 17 16:20:02 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 16:20:02 2015 +0300
--
.../processors/cache/distributed/IgniteCacheSizeFailoverTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7391b04/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
index 8513620..5d074e1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
@@ -82,7 +82,7 @@ public class IgniteCacheSizeFailoverTest extends
GridCommonAbstractTest {
IgniteInternalFuture fut = GridTestUtils.runMultiThreadedAsync(new
Callable() {
@Override public Object call() throws Exception {
-int idx = cntr.getAndIncrement();
+int idx = cntr.getAndIncrement() % 2;
IgniteCache cache = ignite(idx).cache(null);
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 e63fd3c91 -> 0cb04ba7d
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0cb04ba7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0cb04ba7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0cb04ba7
Branch: refs/heads/ignite-1537
Commit: 0cb04ba7dd5e26ff1f2cee3a5f91e6acb651ee51
Parents: e63fd3c
Author: sboikov
Authored: Thu Dec 17 16:03:44 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 16:03:44 2015 +0300
--
.../org/apache/ignite/internal/util/nio/GridNioServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0cb04ba7/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index b0ce2f2..be28c30 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -425,10 +425,10 @@ public class GridNioServer {
int msgCnt = sys ? ses.offerSystemFuture(fut) : ses.offerFuture(fut);
-IgniteInClosure ackClosure;
+IgniteInClosure ackC;
-if (!sys && (ackClosure = ses.removeMeta(ACK_CLOSURE.ordinal())) !=
null)
-fut.ackClosure(ackClosure);
+if (!sys && (ackC = ses.removeMeta(ACK_CLOSURE.ordinal())) != null)
+fut.ackClosure(ackC);
if (ses.closed()) {
if (ses.removeFuture(fut))
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 07d6c6d80 -> e63fd3c91
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e63fd3c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e63fd3c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e63fd3c9
Branch: refs/heads/ignite-1537
Commit: e63fd3c91b9a6ebc2ce9da1906d6e9c7f676a9a4
Parents: 07d6c6d
Author: sboikov
Authored: Thu Dec 17 16:01:50 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 16:01:50 2015 +0300
--
.../org/apache/ignite/internal/util/nio/GridNioServer.java| 5 ++---
.../ignite/internal/util/nio/GridSelectorNioSessionImpl.java | 7 +++
2 files changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e63fd3c9/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 53cec84..b0ce2f2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -1609,15 +1609,14 @@ public class GridNioServer {
sessions.remove(ses);
-if (closed)
-ses.onServerStopped();
-
SelectionKey key = ses.key();
// Shutdown input and output so that remote client will see
correct socket close.
Socket sock = ((SocketChannel)key.channel()).socket();
if (ses.setClosed()) {
+ses.onClosed();
+
if (directBuf) {
if (ses.writeBuffer() != null)
((DirectBuffer)ses.writeBuffer()).cleaner().clean();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e63fd3c9/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
index 6b1f6a7..deb7d2b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
@@ -294,6 +294,13 @@ class GridSelectorNioSessionImpl extends
GridNioSessionImpl {
*
*/
void onServerStopped() {
+onClosed();
+}
+
+/**
+ *
+ */
+void onClosed() {
if (sem != null)
sem.release(1_000_000);
}
svn commit: r11639 - /dev/ignite/1.5.0-final-rc1/
Author: av Date: Thu Dec 17 12:49:26 2015 New Revision: 11639 Log: Removed obsolete rc versions Removed: dev/ignite/1.5.0-final-rc1/
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 41764213d -> 07d6c6d80
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/07d6c6d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/07d6c6d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/07d6c6d8
Branch: refs/heads/ignite-1537
Commit: 07d6c6d80d28fb63232a8497b7c8316f042c3d64
Parents: 4176421
Author: sboikov
Authored: Thu Dec 17 15:46:22 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 15:46:22 2015 +0300
--
.../java/org/apache/ignite/internal/TaskNodeRestartTest.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/07d6c6d8/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
index 323bfaf..1e3b213 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
@@ -109,12 +109,14 @@ public class TaskNodeRestartTest extends
GridCommonAbstractTest {
}
}, 2, "stop-thread");
+IgniteInternalFuture fut = null;
+
try {
final long stopTime = System.currentTimeMillis() + 60_000;
final AtomicInteger idx = new AtomicInteger();
-IgniteInternalFuture fut =
GridTestUtils.runMultiThreadedAsync(new Callable() {
+fut = GridTestUtils.runMultiThreadedAsync(new Callable() {
@Override public Void call() throws Exception {
int node = idx.getAndIncrement() % NODES;
@@ -152,6 +154,9 @@ public class TaskNodeRestartTest extends
GridCommonAbstractTest {
finally {
finished.set(true);
+if (fut != null)
+fut.cancel();
+
restartFut.get(5000);
}
}
ignite git commit: #Added test.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 3223b05c0 -> 1f484ea17
#Added test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f484ea1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f484ea1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f484ea1
Branch: refs/heads/ignite-1.5
Commit: 1f484ea17ced36b44c2b78201674c302a484db5e
Parents: 3223b05
Author: Alexey Goncharuk
Authored: Thu Dec 17 15:36:23 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 15:36:23 2015 +0300
--
.../cache/IgniteCacheSerializationSelfTest.java | 112 +++
1 file changed, 112 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f484ea1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
new file mode 100644
index 000..2c8c3bc
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+
+/**
+ *
+ */
+public class IgniteCacheSerializationSelfTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private static final int NODES = 3;
+
+/** */
+private static final int CLIENT = NODES - 1;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+if (getTestGridName(CLIENT).equals(gridName))
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+
+super.afterTestsStopped();
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGrids(NODES);
+}
+
+/**
+ * @param cacheMode Cache mode.
+ * @param atomicityMode Atomicity mode.
+ * @return Cache configuration.
+ */
+private CacheConfiguration cacheConfiguration(CacheMode
cacheMode, CacheAtomicityMode atomicityMode) {
+CacheConfiguration ccfg = new CacheConfiguration<>();
+
+ccfg.setCacheMode(cacheMode);
+ccfg.setAtomicityMode(atomicityMode);
+
+ccfg.setBackups(1);
+
+return ccfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testSerializeClosure() throws Exception {
+Ignite client = ignite(CLIENT);
+
+final IgniteCache clientCache =
client.createCache(cacheConfiguration(PARTITIONED, ATOMIC));
+
+try {
+client.compute(client.cluster().f
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 6f8d35749 -> 41764213d
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41764213
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41764213
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41764213
Branch: refs/heads/ignite-1537
Commit: 41764213dc7ea498fe58eb72684791b5465b2fe4
Parents: 6f8d357
Author: sboikov
Authored: Thu Dec 17 15:09:58 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 15:09:58 2015 +0300
--
.../service/GridServiceProcessorStopSelfTest.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/41764213/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
index 08f4415..dfea37a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteServices;
import org.apache.ignite.Ignition;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.services.Service;
import org.apache.ignite.services.ServiceContext;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -50,6 +51,8 @@ public class GridServiceProcessorStopSelfTest extends
GridCommonAbstractTest {
Thread t = new Thread(new Runnable() {
@Override public void run() {
+Thread.currentThread().setName("deploy-thread");
+
IgniteServices svcs = ignite.services();
IgniteServices services = svcs.withAsync();
@@ -76,7 +79,12 @@ public class GridServiceProcessorStopSelfTest extends
GridCommonAbstractTest {
Ignition.stopAll(true);
-assertTrue("Deploy future isn't completed", finishLatch.await(15,
TimeUnit.SECONDS));
+boolean wait = finishLatch.await(15, TimeUnit.SECONDS);
+
+if (!wait)
+U.dumpThreads(log);
+
+assertTrue("Deploy future isn't completed", wait);
}
/**
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 ba4883f2b -> 6f8d35749
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f8d3574
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f8d3574
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f8d3574
Branch: refs/heads/ignite-1537
Commit: 6f8d35749a40719a9bbfa8a5ae9270d409ef2eec
Parents: ba4883f
Author: sboikov
Authored: Thu Dec 17 15:08:52 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 15:08:52 2015 +0300
--
.../apache/ignite/internal/IgniteClientReconnectCacheTest.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f8d3574/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 5dbf75a..170d8ae 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -73,6 +73,7 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -169,6 +170,7 @@ public class IgniteClientReconnectCacheTest extends
IgniteClientReconnectAbstrac
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setName("nearCache");
+ccfg.setAtomicWriteOrderMode(PRIMARY);
final IgniteCache nearCache =
client.getOrCreateCache(ccfg, new NearCacheConfiguration<>());
@@ -786,8 +788,8 @@ public class IgniteClientReconnectCacheTest extends
IgniteClientReconnectAbstrac
for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) {
CacheAtomicWriteOrderMode[] writeOrders =
-atomicityMode == ATOMIC ? CacheAtomicWriteOrderMode.values() :
-new
CacheAtomicWriteOrderMode[]{CacheAtomicWriteOrderMode.CLOCK};
+atomicityMode == ATOMIC ? values() :
+new CacheAtomicWriteOrderMode[]{CLOCK};
for (CacheAtomicWriteOrderMode writeOrder : writeOrders) {
for (CacheWriteSynchronizationMode syncMode :
CacheWriteSynchronizationMode.values()) {
ignite git commit: fixed https://issues.apache.org/jira/browse/IGNITE-2175
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 c1e292667 -> 3223b05c0
fixed https://issues.apache.org/jira/browse/IGNITE-2175
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3223b05c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3223b05c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3223b05c
Branch: refs/heads/ignite-1.5
Commit: 3223b05c082732ad77462f00cb09d24af2d768f7
Parents: c1e2926
Author: Yakov Zhdanov
Authored: Thu Dec 17 15:07:21 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 15:07:21 2015 +0300
--
.../examples/datagrid/CacheQueryExample.java| 11 +++---
.../streaming/StreamVisitorExample.java | 40 +++-
2 files changed, 36 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 2d86cde..ace7395 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -22,6 +22,7 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.query.QueryCursor;
@@ -126,12 +127,12 @@ public class CacheQueryExample {
* Example for scan query based on a predicate.
*/
private static void scanQuery() {
-IgniteCache, Person> cache =
Ignition.ignite().cache(PERSON_CACHE);
+IgniteCache cache =
Ignition.ignite().cache(PERSON_CACHE).withKeepBinary();
-ScanQuery, Person> scan = new ScanQuery<>(
-new IgniteBiPredicate, Person>() {
-@Override public boolean apply(AffinityKey key, Person
person) {
-return person.salary <= 1000;
+ScanQuery scan = new ScanQuery<>(
+new IgniteBiPredicate() {
+@Override public boolean apply(BinaryObject key, BinaryObject
person) {
+return person.field("salary") <= 1000;
}
}
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3223b05c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index f2e1e9f..819cfea 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -25,6 +25,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -75,21 +77,39 @@ public class StreamVisitorExample {
// Instead we update the instruments in the 'instCache'.
// Since both, 'instCache' and 'mktCache' use the same
key, updates are collocated.
mktStmr.receiver(new StreamVisitor() {
-@Override
-public void apply(IgniteCache cache,
Map.Entry e) {
+@Override public void apply(IgniteCache cache, Map.Entry e) {
String symbol = e.getKey();
Double tick = e.getValue();
-Instrument inst = instCache.get(symbol);
+IgniteCache binInstCache =
ignite.cache("instCache").withKeepBinary();
-if (inst == null)
-inst = new Instrument(symbol);
+BinaryObject inst = binInstCache.get(symbol);
-// Don't populate market cache, as we don't use it
for querying.
-// Update cached instrument based on the latest
market tick.
-
[06/10] ignite git commit: #Muting hanging test, created ticket.
#Muting hanging test, created ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e599f44b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e599f44b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e599f44b
Branch: refs/heads/ignite-2100
Commit: e599f44b2f8b90b9dde0de8e374f42cec8b61358
Parents: 914b727
Author: Alexey Goncharuk
Authored: Thu Dec 17 13:28:38 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 13:28:38 2015 +0300
--
.../internal/processors/cache/CacheStopAndDestroySelfTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e599f44b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 061a374..515ae87 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -539,6 +539,8 @@ public class CacheStopAndDestroySelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearClose() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-2189";);
+
IgniteCache cache0 =
grid(0).getOrCreateCache(getNearConfig());
// GridDhtTxPrepareRequest requests to Client node will be counted.
[02/10] ignite git commit: IGNITE-2178 - Fixed primary key set for scan query.
IGNITE-2178 - Fixed primary key set for scan query.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/916f59aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/916f59aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/916f59aa
Branch: refs/heads/ignite-2100
Commit: 916f59aa1504a02288b965c50b9acffa29a2a464
Parents: 5f26538
Author: Alexey Goncharuk
Authored: Thu Dec 17 12:01:42 2015 +0300
Committer: Alexey Goncharuk
Committed: Thu Dec 17 12:02:27 2015 +0300
--
.../processors/cache/GridCacheUtils.java| 18 +--
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++--
2 files changed, 50 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/916f59aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index f118003..51f6dcd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1578,23 +1578,7 @@ public class GridCacheUtils {
) {
return new CacheEntryPredicateAdapter() {
@Override public boolean apply(GridCacheEntryEx e) {
-return aff.isPrimary(n,
e.key().value(e.context().cacheObjectContext(), false));
-}
-};
-}
-
-/**
- * @param aff Affinity.
- * @param n Node.
- * @return Predicate that evaulates to {@code true} if entry is primary
for node.
- */
-public static IgnitePredicate> cachePrimary0(
-final Affinity aff,
-final ClusterNode n
-) {
-return new IgnitePredicate>() {
-@Override public boolean apply(Cache.Entry e) {
-return aff.isPrimary(n, e.getKey());
+return aff.isPrimary(n, e.key());
}
};
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/916f59aa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
index 091c633..5c1e578 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
@@ -19,16 +19,19 @@ package org.apache.ignite.internal.processors.cache;
import java.util.List;
import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -48,6 +51,9 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+/** Grid count. */
+public static final int GRID_CNT = 4;
+
/** */
private static ClassLoader extClassLoader;
@@ -94,8 +100,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
@Override protected void beforeTestsStarted() throws Exception {
extClassLoader = getExternalClassLoader();
-startGrids(4);
-
+startGrids(GRID_CNT);
}
/** {@inheritDoc} */
@@ -165,7 +170,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends
GridCommonAbstractTes
* @th
[07/10] ignite git commit: IGNITE-2188 Incorrect links in platform .Net documentation
IGNITE-2188 Incorrect links in platform .Net documentation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e4a486 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e4a486 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e4a486 Branch: refs/heads/ignite-2100 Commit: e7e4a48677832aba35bf2828d23d16e5ce7a0093 Parents: e599f44 Author: Pavel Tupitsyn Authored: Thu Dec 17 13:55:45 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Dec 17 13:55:45 2015 +0300 -- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7e4a486/modules/platforms/dotnet/Apache.Ignite.dxg -- diff --git a/modules/platforms/dotnet/Apache.Ignite.dxg b/modules/platforms/dotnet/Apache.Ignite.dxg index e33e7d6..6337d83 100644 --- a/modules/platforms/dotnet/Apache.Ignite.dxg +++ b/modules/platforms/dotnet/Apache.Ignite.dxg @@ -299,7 +299,7 @@ MARKDOWN_SUPPORT = YES # globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. -AUTOLINK_SUPPORT = YES +AUTOLINK_SUPPORT = NO # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should set this
[10/10] ignite git commit: Merge branch 'ignite-1.5' into ignite-2100
Merge branch 'ignite-1.5' into ignite-2100 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d1cc92c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d1cc92c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d1cc92c Branch: refs/heads/ignite-2100 Commit: 4d1cc92c6a23ad657063841fc473595ede163930 Parents: b932135 c1e2926 Author: vozerov-gridgain Authored: Thu Dec 17 15:04:20 2015 +0300 Committer: vozerov-gridgain Committed: Thu Dec 17 15:04:20 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../org/apache/ignite/cache/CacheManager.java | 2 +- .../apache/ignite/internal/IgniteKernal.java| 35 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 51 +++ .../processors/cache/GridCacheUtils.java| 18 +-- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/CacheStopAndDestroySelfTest.java | 2 + modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++-- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml| 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Messaging/MessagingExample.cs | 6 +-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../java/org/apache/ignite/IgniteSpring.java| 4 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/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 +- modules/yarn/pom.xml| 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 74 files changed, 192 insertions(+), 125 deletions(-)
[01/10] ignite git commit: ignite-1.5 Avoid NPE in dumpDebugInfo.
Repository: ignite
Updated Branches:
refs/heads/ignite-2100 b932135cd -> 4d1cc92c6
ignite-1.5 Avoid NPE in dumpDebugInfo.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f26538d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f26538d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f26538d
Branch: refs/heads/ignite-2100
Commit: 5f26538d7ac7838500259e9213abf26db50da9d9
Parents: 7f35bc6
Author: sboikov
Authored: Thu Dec 17 11:58:32 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 11:58:32 2015 +0300
--
.../apache/ignite/internal/IgniteKernal.java| 35
1 file changed, 21 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f26538d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index e0503fa..6e0be10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -3245,26 +3245,33 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
/** {@inheritDoc} */
public void dumpDebugInfo() {
-GridKernalContextImpl ctx = this.ctx;
+try {
+GridKernalContextImpl ctx = this.ctx;
+
+GridDiscoveryManager discoMrg = ctx != null ? ctx.discovery() :
null;
-if (ctx != null) {
-boolean client = ctx.clientNode();
+ClusterNode locNode = discoMrg != null ? discoMrg.localNode() :
null;
-ClusterNode locNode = ctx.discovery().localNode();
+if (ctx != null && discoMrg != null && locNode != null) {
+boolean client = ctx.clientNode();
-UUID routerId = locNode instanceof TcpDiscoveryNode ?
((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
+UUID routerId = locNode instanceof TcpDiscoveryNode ?
((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
-U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
-", name=" + ctx.gridName() +
-", order=" + locNode.order() +
-", topVer=" + ctx.discovery().topologyVersion() +
-", client=" + client +
-(client && routerId != null ? ", routerId=" + routerId : "") +
']');
+U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
+", name=" + ctx.gridName() +
+", order=" + locNode.order() +
+", topVer=" + discoMrg.topologyVersion() +
+", client=" + client +
+(client && routerId != null ? ", routerId=" + routerId :
"") + ']');
-ctx.cache().context().exchange().dumpDebugInfo();
+ctx.cache().context().exchange().dumpDebugInfo();
+}
+else
+U.warn(log, "Dumping debug info for node, context is not
initialized [name=" + gridName + ']');
+}
+catch (Exception e) {
+U.error(log, "Failed to dump debug info for node: " + e, e);
}
-else
-U.warn(log, "Dumping debug info for node, context is not
initialized [name=" + gridName + ']');
}
/** {@inheritDoc} */
[05/10] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/914b727b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/914b727b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/914b727b Branch: refs/heads/ignite-2100 Commit: 914b727b3ed2a8dbdbd98c442016c188f37ea057 Parents: dfa84c8 9087f01 Author: vozerov-gridgain Authored: Thu Dec 17 12:52:00 2015 +0300 Committer: vozerov-gridgain Committed: Thu Dec 17 12:52:00 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../apache/ignite/internal/IgniteKernal.java| 35 +++-- .../processors/cache/GridCacheUtils.java| 18 +-- .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++-- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml| 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/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 +- modules/yarn/pom.xml| 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 67 files changed, 142 insertions(+), 106 deletions(-) --
[09/10] ignite git commit: minor
minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e29266
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e29266
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e29266
Branch: refs/heads/ignite-2100
Commit: c1e292667154d99eaa7e2621fc811b3d916e09a6
Parents: bd1f506
Author: Yakov Zhdanov
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 14:47:05 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerUpdateJob.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e29266/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index c49087f..c2ab0c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -168,4 +168,4 @@ class DataStreamerUpdateJob implements
GridPlainCallable {
ctx.security().authorize(cacheName, perm, null);
}
-}
\ No newline at end of file
+}
[03/10] ignite git commit: 1.5.0-final-SNAPSHOT
1.5.0-final-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9087f019 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9087f019 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9087f019 Branch: refs/heads/ignite-2100 Commit: 9087f019d06b3c7a35376590177868877311fec2 Parents: 916f59a Author: Ignite Teamcity Authored: Thu Dec 17 12:33:20 2015 +0300 Committer: Ignite Teamcity Committed: Thu Dec 17 12:33:20 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml| 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml| 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties| 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml| 2 +- modules/gce/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/jms11/pom.xml| 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml| 2 +- modules/log4j/pom.xml| 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml| 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac| 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac| 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml| 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml| 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml| 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml| 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml| 2 +- modules/visor-plugins/pom.xml| 2 +- modules/web/pom.xml | 2 +- modules/yards
[08/10] ignite git commit: Ignite-2087
Ignite-2087
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd1f506e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd1f506e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd1f506e
Branch: refs/heads/ignite-2100
Commit: bd1f506eaa618f803b39461f5198091d7cbea3a4
Parents: e7e4a48
Author: Anton Vinogradov
Authored: Thu Dec 17 14:27:16 2015 +0300
Committer: Anton Vinogradov
Committed: Thu Dec 17 14:27:16 2015 +0300
--
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +++-
.../java/org/apache/ignite/IgniteSpring.java| 4 +-
3 files changed, 43 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 84ed2cd..6e09d72 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -114,7 +114,7 @@ public class CacheManager implements
javax.cache.CacheManager {
ignite = (IgniteKernal)IgnitionEx.start(cfg);
}
else
-ignite = (IgniteKernal)IgnitionEx.start(uri.toURL());
+ignite = (IgniteKernal)IgnitionEx.start(uri.toURL(), clsLdr);
kernalGateway = ignite.context().gateway();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd1f506e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4f6c6d9..5153fb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -495,7 +495,7 @@ public class IgnitionEx {
URL url = U.resolveIgniteUrl(DFLT_CFG);
if (url != null)
-return start(DFLT_CFG, null, springCtx);
+return start(DFLT_CFG, null, springCtx, null);
U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?):
" + DFLT_CFG);
@@ -581,7 +581,7 @@ public class IgnitionEx {
return start(cfg);
}
else
-return start(springCfgPath, gridName, null);
+return start(springCfgPath, gridName, null, null);
}
/**
@@ -697,6 +697,7 @@ public class IgnitionEx {
* @param springCfgPath Spring XML configuration file path or URL. This
cannot be {@code null}.
* @param gridName Grid name that will override default.
* @param springCtx Optional Spring application context, possibly {@code
null}.
+ * @param ldr Optional class loader that will be used by default.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
* {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
@@ -707,10 +708,10 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(String springCfgPath, @Nullable String gridName,
-@Nullable GridSpringResourceContext springCtx) throws
IgniteCheckedException {
+@Nullable GridSpringResourceContext springCtx, @Nullable ClassLoader
ldr) throws IgniteCheckedException {
URL url = U.resolveSpringUrl(springCfgPath);
-return start(url, gridName, springCtx);
+return start(url, gridName, springCtx, ldr);
}
/**
@@ -730,7 +731,28 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl) throws IgniteCheckedException
{
-return start(springCfgUrl, null, null);
+return start(springCfgUrl, null, null, null);
+}
+
+/**
+ * Starts all grids specified within given Spring XML configuration file
URL. If grid with given name
+ * is already started, then exception is thrown. In this case all
instances that may
+ * have been started so far will be stopped too.
+ *
+ * Usually Spring XML configuration file will contain only one Grid
definition. Note that
+ * Grid configuration bean(s) is retrieved form configuration file by
type, so the name of
+ * the Grid co
[04/10] ignite git commit: .NET MessagingExample: improved docs.
.NET MessagingExample: improved docs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfa84c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfa84c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfa84c82
Branch: refs/heads/ignite-2100
Commit: dfa84c821eaef8de1486c8074d959c5c3ae24ae7
Parents: 7f35bc6
Author: vozerov-gridgain
Authored: Thu Dec 17 12:51:27 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Dec 17 12:51:27 2015 +0300
--
.../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfa84c82/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
--
diff --git
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
index 3c74a42..3fafd8f 100644
---
a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
+++
b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Messaging/MessagingExample.cs
@@ -26,10 +26,10 @@ namespace Apache.Ignite.Examples.Messaging
///
/// Example demonstrating Ignite messaging. Should be run with standalone
Apache Ignite.NET node.
///
-/// 1) Run
%IGNITE_HOME%/platforms/dotnet/Apache.Ignite/bin/${Platform]/${Configuration}/Apache.Ignite.exe:
+/// 1) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
+///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder;
+/// 2) Run %IGNITE_HOME%/platforms/dotnet/bin/Apache.Ignite.exe:
/// Apache.Ignite.exe -IgniteHome="%IGNITE_HOME%"
-springConfigUrl=platforms\dotnet\examples\config\example-compute.xml
-assembly=[path_to_Apache.Ignite.ExamplesDll.dll]
-/// 2) Build the project Apache.Ignite.ExamplesDll (select it ->
right-click -> Build).
-///Apache.Ignite.ExamplesDll.dll must appear in
%IGNITE_HOME%/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/bin/${Platform]/${Configuration}
folder.
/// 3) Set this class as startup object (Apache.Ignite.Examples project ->
right-click -> Properties ->
/// Application -> Startup object);
/// 4) Start example (F5 or Ctrl+F5).
ignite git commit: ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 9f40fae17 -> ba4883f2b
ignite-1.5 Properly handle duplicated job responses in
GridTaskWorker.onResponse.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba4883f2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba4883f2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba4883f2
Branch: refs/heads/ignite-1537
Commit: ba4883f2b86a3d6db59532fbf0f45716f18a381b
Parents: 9f40fae
Author: sboikov
Authored: Thu Dec 17 14:59:41 2015 +0300
Committer: sboikov
Committed: Thu Dec 17 14:59:41 2015 +0300
--
.../processors/service/GridServiceProcessorStopSelfTest.java | 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba4883f2/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
index 16ea5e4..08f4415 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
@@ -31,6 +31,13 @@ import
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
* Tests that {@link GridServiceProcessor} completes deploy/undeploy futures
during node stop.
*/
public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+stopAllGrids();
+
+super.afterTest();
+}
+
/**
* @throws Exception If failed.
*/
@@ -76,6 +83,7 @@ public class GridServiceProcessorStopSelfTest extends
GridCommonAbstractTest {
* Simple map service.
*/
public interface TestService {
+// No-op.
}
/**
ignite git commit: minor
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 bd1f506ea -> c1e292667
minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e29266
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e29266
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e29266
Branch: refs/heads/ignite-1.5
Commit: c1e292667154d99eaa7e2621fc811b3d916e09a6
Parents: bd1f506
Author: Yakov Zhdanov
Authored: Thu Dec 17 14:47:05 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Dec 17 14:47:05 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerUpdateJob.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e29266/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index c49087f..c2ab0c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -168,4 +168,4 @@ class DataStreamerUpdateJob implements
GridPlainCallable {
ctx.security().authorize(cacheName, perm, null);
}
-}
\ No newline at end of file
+}
