You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/08 18:07:30 UTC
[1/9] ignite git commit: IGNITE-1759: .NET: Improved GUID handling
for different platforms and endians. This closes #437.
Repository: ignite
Updated Branches:
refs/heads/ignite-2542 e5763b8c4 -> 52e7d9de6
IGNITE-1759: .NET: Improved GUID handling for different platforms and endians. This closes #437.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f07adff7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f07adff7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f07adff7
Branch: refs/heads/ignite-2542
Commit: f07adff7bb601971bb6c83b0459113678f387592
Parents: e88cc67
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Mon Feb 8 10:30:57 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Feb 8 10:30:57 2016 +0300
----------------------------------------------------------------------
.../Binary/BinarySelfTest.cs | 32 ++++
.../Impl/Binary/BinaryUtils.cs | 166 ++++++++++++++++---
2 files changed, 172 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f07adff7/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
index 44db6f7..f49a28a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
@@ -26,12 +26,15 @@ namespace Apache.Ignite.Core.Tests.Binary
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
+ using System.IO;
using System.Linq;
using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Impl.Binary;
using Apache.Ignite.Core.Impl.Binary.IO;
using NUnit.Framework;
+ using BinaryReader = Apache.Ignite.Core.Impl.Binary.BinaryReader;
+ using BinaryWriter = Apache.Ignite.Core.Impl.Binary.BinaryWriter;
/// <summary>
///
@@ -476,6 +479,35 @@ namespace Apache.Ignite.Core.Tests.Binary
Assert.AreEqual(vals, newVals);
}
+ /// <summary>
+ /// Checks that both methods produce identical results.
+ /// </summary>
+ [Test]
+ public void TestGuidSlowFast()
+ {
+ var stream = new BinaryHeapStream(128);
+
+ var guid = Guid.NewGuid();
+
+ BinaryUtils.WriteGuidFast(guid, stream);
+
+ stream.Seek(0, SeekOrigin.Begin);
+ Assert.AreEqual(guid, BinaryUtils.ReadGuidFast(stream));
+
+ stream.Seek(0, SeekOrigin.Begin);
+ Assert.AreEqual(guid, BinaryUtils.ReadGuidSlow(stream));
+
+
+ stream.Seek(0, SeekOrigin.Begin);
+ BinaryUtils.WriteGuidFast(guid, stream);
+
+ stream.Seek(0, SeekOrigin.Begin);
+ Assert.AreEqual(guid, BinaryUtils.ReadGuidFast(stream));
+
+ stream.Seek(0, SeekOrigin.Begin);
+ Assert.AreEqual(guid, BinaryUtils.ReadGuidSlow(stream));
+ }
+
/**
* <summary>Check write of enum.</summary>
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/f07adff7/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
index 06dec2c..9066bd1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
@@ -243,6 +243,17 @@ namespace Apache.Ignite.Core.Impl.Binary
private static readonly CopyOnWriteConcurrentDictionary<Type, Func<BinaryReader, bool, object>>
ArrayReaders = new CopyOnWriteConcurrentDictionary<Type, Func<BinaryReader, bool, object>>();
+ /** Flag indicating whether Guid struct is sequential in current runtime. */
+ private static readonly bool IsGuidSequential = GetIsGuidSequential();
+
+ /** Guid writer. */
+ public static readonly Action<Guid, IBinaryStream> WriteGuid = IsGuidSequential
+ ? (Action<Guid, IBinaryStream>)WriteGuidFast : WriteGuidSlow;
+
+ /** Guid reader. */
+ public static readonly Func<IBinaryStream, Guid?> ReadGuid = IsGuidSequential
+ ? (Func<IBinaryStream, Guid?>)ReadGuidFast : ReadGuidSlow;
+
/// <summary>
/// Default marshaller.
/// </summary>
@@ -900,12 +911,33 @@ namespace Apache.Ignite.Core.Impl.Binary
return vals;
}
- /**
- * <summary>Write GUID.</summary>
- * <param name="val">GUID.</param>
- * <param name="stream">Stream.</param>
- */
- public static unsafe void WriteGuid(Guid val, IBinaryStream stream)
+ /// <summary>
+ /// Gets a value indicating whether <see cref="Guid"/> fields are stored sequentially in memory.
+ /// </summary>
+ /// <returns></returns>
+ private static unsafe bool GetIsGuidSequential()
+ {
+ // Check that bitwise conversion returns correct result
+ var guid = Guid.NewGuid();
+
+ var bytes = guid.ToByteArray();
+
+ var bytes0 = (byte*) &guid;
+
+ for (var i = 0; i < bytes.Length; i++)
+ if (bytes[i] != bytes0[i])
+ return false;
+
+ return true;
+ }
+
+ /// <summary>
+ /// Writes a guid with bitwise conversion, assuming that <see cref="Guid"/>
+ /// is laid out in memory sequentially and without gaps between fields.
+ /// </summary>
+ /// <param name="val">The value.</param>
+ /// <param name="stream">The stream.</param>
+ public static unsafe void WriteGuidFast(Guid val, IBinaryStream stream)
{
var jguid = new JavaGuid(val);
@@ -913,13 +945,47 @@ namespace Apache.Ignite.Core.Impl.Binary
stream.Write((byte*) ptr, 16);
}
-
- /**
- * <summary>Read GUID.</summary>
- * <param name="stream">Stream.</param>
- * <returns>GUID</returns>
- */
- public static unsafe Guid? ReadGuid(IBinaryStream stream)
+
+ /// <summary>
+ /// Writes a guid byte by byte.
+ /// </summary>
+ /// <param name="val">The value.</param>
+ /// <param name="stream">The stream.</param>
+ public static unsafe void WriteGuidSlow(Guid val, IBinaryStream stream)
+ {
+ var bytes = val.ToByteArray();
+ byte* jBytes = stackalloc byte[16];
+
+ jBytes[0] = bytes[6]; // c1
+ jBytes[1] = bytes[7]; // c2
+
+ jBytes[2] = bytes[4]; // b1
+ jBytes[3] = bytes[5]; // b2
+
+ jBytes[4] = bytes[0]; // a1
+ jBytes[5] = bytes[1]; // a2
+ jBytes[6] = bytes[2]; // a3
+ jBytes[7] = bytes[3]; // a4
+
+ jBytes[8] = bytes[15]; // k
+ jBytes[9] = bytes[14]; // j
+ jBytes[10] = bytes[13]; // i
+ jBytes[11] = bytes[12]; // h
+ jBytes[12] = bytes[11]; // g
+ jBytes[13] = bytes[10]; // f
+ jBytes[14] = bytes[9]; // e
+ jBytes[15] = bytes[8]; // d
+
+ stream.Write(jBytes, 16);
+ }
+
+ /// <summary>
+ /// Reads a guid with bitwise conversion, assuming that <see cref="Guid"/>
+ /// is laid out in memory sequentially and without gaps between fields.
+ /// </summary>
+ /// <param name="stream">The stream.</param>
+ /// <returns>Guid.</returns>
+ public static unsafe Guid? ReadGuidFast(IBinaryStream stream)
{
JavaGuid jguid;
@@ -931,7 +997,43 @@ namespace Apache.Ignite.Core.Impl.Binary
return *(Guid*) (&dotnetGuid);
}
-
+
+ /// <summary>
+ /// Reads a guid byte by byte.
+ /// </summary>
+ /// <param name="stream">The stream.</param>
+ /// <returns>Guid.</returns>
+ public static unsafe Guid? ReadGuidSlow(IBinaryStream stream)
+ {
+ byte* jBytes = stackalloc byte[16];
+
+ stream.Read(jBytes, 16);
+
+ var bytes = new byte[16];
+
+ bytes[0] = jBytes[4]; // a1
+ bytes[1] = jBytes[5]; // a2
+ bytes[2] = jBytes[6]; // a3
+ bytes[3] = jBytes[7]; // a4
+
+ bytes[4] = jBytes[2]; // b1
+ bytes[5] = jBytes[3]; // b2
+
+ bytes[6] = jBytes[0]; // c1
+ bytes[7] = jBytes[1]; // c2
+
+ bytes[8] = jBytes[15]; // d
+ bytes[9] = jBytes[14]; // e
+ bytes[10] = jBytes[13]; // f
+ bytes[11] = jBytes[12]; // g
+ bytes[12] = jBytes[11]; // h
+ bytes[13] = jBytes[10]; // i
+ bytes[14] = jBytes[9]; // j
+ bytes[15] = jBytes[8]; // k
+
+ return new Guid(bytes);
+ }
+
/// <summary>
/// Write GUID array.
/// </summary>
@@ -1689,7 +1791,7 @@ namespace Apache.Ignite.Core.Impl.Binary
private struct GuidAccessor
{
public readonly ulong ABC;
- public readonly ulong DEGHIJK;
+ public readonly ulong DEFGHIJK;
/// <summary>
/// Initializes a new instance of the <see cref="GuidAccessor"/> struct.
@@ -1699,21 +1801,28 @@ namespace Apache.Ignite.Core.Impl.Binary
{
var l = val.CBA;
- ABC = ((l >> 32) & 0x00000000FFFFFFFF) | ((l << 48) & 0xFFFF000000000000) |
- ((l << 16) & 0x0000FFFF00000000);
+ if (BitConverter.IsLittleEndian)
+ ABC = ((l >> 32) & 0x00000000FFFFFFFF) | ((l << 48) & 0xFFFF000000000000) |
+ ((l << 16) & 0x0000FFFF00000000);
+ else
+ ABC = ((l << 32) & 0xFFFFFFFF00000000) | ((l >> 48) & 0x000000000000FFFF) |
+ ((l >> 16) & 0x00000000FFFF0000);
- DEGHIJK = ReverseByteOrder(val.KJIHGED);
+ // This is valid in any endianness (symmetrical)
+ DEFGHIJK = ReverseByteOrder(val.KJIHGFED);
}
}
/// <summary>
/// Struct with Java-style Guid memory layout.
/// </summary>
- [StructLayout(LayoutKind.Sequential, Pack = 0)]
+ [StructLayout(LayoutKind.Explicit)]
private struct JavaGuid
{
- public readonly ulong CBA;
- public readonly ulong KJIHGED;
+ [FieldOffset(0)] public readonly ulong CBA;
+ [FieldOffset(8)] public readonly ulong KJIHGFED;
+ [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ [FieldOffset(0)] public unsafe fixed byte Bytes [16];
/// <summary>
/// Initializes a new instance of the <see cref="JavaGuid"/> struct.
@@ -1721,17 +1830,22 @@ namespace Apache.Ignite.Core.Impl.Binary
/// <param name="val">The value.</param>
public unsafe JavaGuid(Guid val)
{
- // .Net returns bytes in the following order: _a(4), _b(2), _c(2), _d, _e, _g, _h, _i, _j, _k.
+ // .Net returns bytes in the following order: _a(4), _b(2), _c(2), _d, _e, _f, _g, _h, _i, _j, _k.
// And _a, _b and _c are always in little endian format irrespective of system configuration.
- // To be compliant with Java we rearrange them as follows: _c, _b_, a_, _k, _j, _i, _h, _g, _e, _d.
+ // To be compliant with Java we rearrange them as follows: _c, _b_, a_, _k, _j, _i, _h, _g, _f, _e, _d.
var accessor = *((GuidAccessor*)&val);
var l = accessor.ABC;
- CBA = ((l << 32) & 0xFFFFFFFF00000000) | ((l >> 48) & 0x000000000000FFFF) |
- ((l >> 16) & 0x00000000FFFF0000);
+ if (BitConverter.IsLittleEndian)
+ CBA = ((l << 32) & 0xFFFFFFFF00000000) | ((l >> 48) & 0x000000000000FFFF) |
+ ((l >> 16) & 0x00000000FFFF0000);
+ else
+ CBA = ((l >> 32) & 0x00000000FFFFFFFF) | ((l << 48) & 0xFFFF000000000000) |
+ ((l << 16) & 0x0000FFFF00000000);
- KJIHGED = ReverseByteOrder(accessor.DEGHIJK);
+ // This is valid in any endianness (symmetrical)
+ KJIHGFED = ReverseByteOrder(accessor.DEFGHIJK);
}
}
}
[5/9] ignite git commit: IGNITE-1187: Need to improve project setup
in Eclipse
Posted by sb...@apache.org.
IGNITE-1187: Need to improve project setup in Eclipse
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e18dfdaf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e18dfdaf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e18dfdaf
Branch: refs/heads/ignite-2542
Commit: e18dfdafca3c01ba48958562e1d07c68e71c9302
Parents: a383f2e
Author: Edouard Chevalier <ed...@techmydata.net>
Authored: Mon Feb 8 14:09:03 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Feb 8 14:09:03 2016 +0300
----------------------------------------------------------------------
.gitignore | 3 ++
modules/yardstick/.gitignore | 2 +
parent/pom.xml | 92 ++++++++++++++++++++++++++++++++++++++-
3 files changed, 96 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e18dfdaf/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e4e061c..4073a58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ git-patch-prop-local.sh
**/cpp/**/vs/Win32/
**/dotnet/**/obj/
/modules/platforms/cpp/doc/
+.settings
+.classpath
+.project
http://git-wip-us.apache.org/repos/asf/ignite/blob/e18dfdaf/modules/yardstick/.gitignore
----------------------------------------------------------------------
diff --git a/modules/yardstick/.gitignore b/modules/yardstick/.gitignore
new file mode 100644
index 0000000..a2c5e4a
--- /dev/null
+++ b/modules/yardstick/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/libs
http://git-wip-us.apache.org/repos/asf/ignite/blob/e18dfdaf/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 437a30b..e189807 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -513,7 +513,7 @@
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>${osgi.embed.transitive}</Embed-Transitive>
<_failok>${osgi.fail.ok}</_failok>
- <_invalidfilenames />
+ <_invalidfilenames/>
</instructions>
</configuration>
<executions>
@@ -1013,5 +1013,95 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>m2e</id>
+ <!--This profile is activated when eclipse interacts with maven (using m2e).-->
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!--eclipse do not support duplicated package-info.java, in both src and test.-->
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <testExcludes>
+ <exclude>**/package-info.java</exclude>
+ </testExcludes>
+ </configuration>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ <goal>properties-augmentation</goal>
+ <goal>licenses-file-rename</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <versionRange>[1.0.0-beta-3,)</versionRange>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <versionRange>[1.3.2,)</versionRange>
+ <goals>
+ <goal>java</goal>
+ <goal>default</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
</profiles>
</project>
[7/9] ignite git commit: IGNITE-2264: Minor refactoring to
GridDistributedTxMapping mapping handling.
Posted by sb...@apache.org.
IGNITE-2264: Minor refactoring to GridDistributedTxMapping mapping handling.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26719d3c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26719d3c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26719d3c
Branch: refs/heads/ignite-2542
Commit: 26719d3c1221177616a4f291b73950f69e5ed833
Parents: cbaa6e0
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Feb 8 15:49:38 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Feb 8 15:49:38 2016 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 33 +++++-----
...arOptimisticSerializableTxPrepareFuture.java | 4 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 2 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 66 +++++++++++---------
5 files changed, 56 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/26719d3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 4c783f7..732c298 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -1202,8 +1202,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
for (GridDistributedTxMapping nearMapping : tx.nearMap().values()) {
if (!tx.dhtMap().containsKey(nearMapping.node().id())) {
- assert nearMapping.writes() != null;
-
MiniFuture fut = new MiniFuture(nearMapping.node().id(), null, nearMapping);
add(fut); // Append new future.
@@ -1223,24 +1221,25 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
tx.taskNameHash(),
tx.activeCachesDeploymentEnabled());
- for (IgniteTxEntry entry : nearMapping.writes()) {
- try {
- if (entry.explicitVersion() == null) {
- GridCacheMvccCandidate added = entry.cached().candidate(version());
+ for (IgniteTxEntry entry : nearMapping.entries()) {
+ if (CU.writes().apply(entry)) {
+ try {
+ if (entry.explicitVersion() == null) {
+ GridCacheMvccCandidate added = entry.cached().candidate(version());
- assert added != null : "Null candidate for non-group-lock entry " +
- "[added=" + added + ", entry=" + entry + ']';
- assert added.dhtLocal() : "Got non-dht-local candidate for prepare future" +
- "[added=" + added + ", entry=" + entry + ']';
+ assert added != null : "Null candidate for non-group-lock entry " +
+ "[added=" + added + ", entry=" + entry + ']';
+ assert added.dhtLocal() : "Got non-dht-local candidate for prepare future" +
+ "[added=" + added + ", entry=" + entry + ']';
- if (added != null && added.ownerVersion() != null)
- req.owned(entry.txKey(), added.ownerVersion());
- }
+ if (added != null && added.ownerVersion() != null)
+ req.owned(entry.txKey(), added.ownerVersion());
+ }
- break;
- }
- catch (GridCacheEntryRemovedException ignore) {
- assert false : "Got removed exception on entry with dht local candidate: " + entry;
+ break;
+ } catch (GridCacheEntryRemovedException ignore) {
+ assert false : "Got removed exception on entry with dht local candidate: " + entry;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26719d3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 52ebfc8..d5483cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -443,7 +443,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
m.clientFirst(),
tx.activeCachesDeploymentEnabled());
- for (IgniteTxEntry txEntry : m.writes()) {
+ for (IgniteTxEntry txEntry : m.entries()) {
if (txEntry.op() == TRANSFORM)
req.addDhtVersion(txEntry.txKey(), null);
}
@@ -451,7 +451,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
// Must lock near entries separately.
if (m.near()) {
try {
- tx.optimisticLockEntries(F.concat(false, m.writes(), m.reads()));
+ tx.optimisticLockEntries(m.entries());
tx.userPrepare();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26719d3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index b968e57..8476dc3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -436,7 +436,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
m.clientFirst(),
tx.activeCachesDeploymentEnabled());
- for (IgniteTxEntry txEntry : m.writes()) {
+ for (IgniteTxEntry txEntry : m.entries()) {
if (txEntry.op() == TRANSFORM)
req.addDhtVersion(txEntry.txKey(), null);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26719d3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 615a92b..9adf580 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -230,7 +230,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
false,
tx.activeCachesDeploymentEnabled());
- for (IgniteTxEntry txEntry : m.writes()) {
+ for (IgniteTxEntry txEntry : m.entries()) {
if (txEntry.op() == TRANSFORM)
req.addDhtVersion(txEntry.txKey(), null);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26719d3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 0853b77..a70fb3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -661,55 +661,61 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers)
{
- readyNearLocks(mapping.writes(), mapping.dhtVersion(), pendingVers, committedVers, rolledbackVers);
- readyNearLocks(mapping.reads(), mapping.dhtVersion(), pendingVers, committedVers, rolledbackVers);
+ // Process writes, then reads.
+ for (IgniteTxEntry txEntry : mapping.entries()) {
+ if (CU.writes().apply(txEntry))
+ readyNearLock(txEntry, mapping.dhtVersion(), pendingVers, committedVers, rolledbackVers);
+ }
+
+ for (IgniteTxEntry txEntry : mapping.entries()) {
+ if (CU.reads().apply(txEntry))
+ readyNearLock(txEntry, mapping.dhtVersion(), pendingVers, committedVers, rolledbackVers);
+ }
}
/**
- * @param entries Entries.
+ * @param txEntry TX entry.
* @param dhtVer DHT version.
* @param pendingVers Pending versions.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
*/
- void readyNearLocks(Collection<IgniteTxEntry> entries,
+ void readyNearLock(IgniteTxEntry txEntry,
GridCacheVersion dhtVer,
Collection<GridCacheVersion> pendingVers,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers)
{
- for (IgniteTxEntry txEntry : entries) {
- while (true) {
- GridCacheContext cacheCtx = txEntry.cached().context();
+ while (true) {
+ GridCacheContext cacheCtx = txEntry.cached().context();
- assert cacheCtx.isNear();
+ assert cacheCtx.isNear();
- GridDistributedCacheEntry entry = (GridDistributedCacheEntry)txEntry.cached();
+ GridDistributedCacheEntry entry = (GridDistributedCacheEntry)txEntry.cached();
- try {
- // Handle explicit locks.
- GridCacheVersion explicit = txEntry.explicitVersion();
-
- if (explicit == null) {
- entry.readyNearLock(xidVer,
- dhtVer,
- committedVers,
- rolledbackVers,
- pendingVers);
- }
-
- break;
+ try {
+ // Handle explicit locks.
+ GridCacheVersion explicit = txEntry.explicitVersion();
+
+ if (explicit == null) {
+ entry.readyNearLock(xidVer,
+ dhtVer,
+ committedVers,
+ rolledbackVers,
+ pendingVers);
}
- catch (GridCacheEntryRemovedException ignored) {
- assert entry.obsoleteVersion() != null;
- if (log.isDebugEnabled())
- log.debug("Replacing obsolete entry in remote transaction [entry=" + entry +
- ", tx=" + this + ']');
+ break;
+ }
+ catch (GridCacheEntryRemovedException ignored) {
+ assert entry.obsoleteVersion() != null;
- // Replace the entry.
- txEntry.cached(txEntry.context().cache().entryEx(txEntry.key()));
- }
+ if (log.isDebugEnabled())
+ log.debug("Replacing obsolete entry in remote transaction [entry=" + entry +
+ ", tx=" + this + ']');
+
+ // Replace the entry.
+ txEntry.cached(txEntry.context().cache().entryEx(txEntry.key()));
}
}
}
[2/9] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d844e959
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d844e959
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d844e959
Branch: refs/heads/ignite-2542
Commit: d844e95991408970598b324b204c4b6942e67e13
Parents: f07adff bad0420
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Feb 8 10:31:14 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Feb 8 10:31:14 2016 +0300
----------------------------------------------------------------------
.../util/nio/SelectedSelectionKeySet.java | 65 +++++++++++++-------
1 file changed, 43 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[3/9] ignite git commit: Improved CacheStore + external class loader
tests
Posted by sb...@apache.org.
Improved CacheStore + external class loader tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf3a5ea6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf3a5ea6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf3a5ea6
Branch: refs/heads/ignite-2542
Commit: bf3a5ea652a9c36e5ce8dd87dba72b5fafc3ce86
Parents: bad0420
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Feb 8 13:41:38 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Feb 8 13:41:38 2016 +0300
----------------------------------------------------------------------
.../GridCacheReplicatedPreloadSelfTest.java | 120 +++++++++++++------
1 file changed, 82 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bf3a5ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 523f641..887fea4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -77,6 +77,9 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
private volatile boolean isClient = false;
/** */
+ private volatile boolean useExtClassLoader = false;
+
+ /** */
private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
@@ -108,7 +111,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
cfg.setEventStorageSpi(spi);
- if (getTestGridName(1).equals(gridName) || cfg.getMarshaller() instanceof BinaryMarshaller)
+ if (getTestGridName(1).equals(gridName) || useExtClassLoader ||
+ cfg.getMarshaller() instanceof BinaryMarshaller)
cfg.setClassLoader(getExternalClassLoader());
if (isClient)
@@ -187,7 +191,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < 3; i++) {
evts = g2.events().localQuery(F.<Event>alwaysTrue(),
- EVT_CACHE_REBALANCE_STARTED, EVT_CACHE_REBALANCE_STOPPED);
+ EVT_CACHE_REBALANCE_STARTED, EVT_CACHE_REBALANCE_STOPPED);
if (evts.size() != 2) {
info("Wrong events collection size (will retry in 1000 ms): " + evts.size());
@@ -284,7 +288,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
assert v3 != null;
assert v3.toString().equals(v1.toString());
assert !v3.getClass().getClassLoader().equals(getClass().getClassLoader());
- assert v3.getClass().getClassLoader().getClass().getName().contains("GridDeploymentClassLoader")||
+ assert v3.getClass().getClassLoader().getClass().getName().contains("GridDeploymentClassLoader") ||
grid(3).configuration().getMarshaller() instanceof BinaryMarshaller;
}
finally {
@@ -297,70 +301,110 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
*/
public void testStore() throws Exception {
try {
+ needStore = true;
+ useExtClassLoader = true;
+
Ignite g1 = startGrid(1);
- if (g1.configuration().getMarshaller() instanceof BinaryMarshaller) {
- stopAllGrids();
+ Ignite g2 = startGrid(2); // Checks deserialization at node join.
- needStore = true;
+ isClient = true;
- g1 = startGrid(1);
+ Ignite g3 = startGrid(3);
+
+ IgniteCache<Integer, Object> cache1 = g1.cache(null);
+ IgniteCache<Integer, Object> cache2 = g2.cache(null);
+ IgniteCache<Integer, Object> cache3 = g3.cache(null);
+
+ cache1.put(1, 1);
+
+ assertEquals(1, cache2.get(1));
+ assertEquals(1, cache3.get(1));
+ }
+ finally {
+ needStore = false;
+ isClient = false;
+ useExtClassLoader = false;
+ }
+ }
+
+ /**
+ * @throws Exception If test failed.
+ */
+ public void testStoreDynamicStart() throws Exception {
+ try {
+ needStore = false;
+ useExtClassLoader = true;
- ClassLoader ldr = grid(1).configuration().getClassLoader();
+ Ignite g1 = startGrid(1);
+ Ignite g2 = startGrid(2);
- CacheConfiguration cfg = defaultCacheConfiguration();
+ isClient = true;
- Ignite g2 = startGrid(2); // Checks deserialization at node join.
+ Ignite g3 = startGrid(3);
- isClient = true;
+ Object sf = getExternalClassLoader().loadClass(
+ "org.apache.ignite.tests.p2p.CacheDeploymentTestStoreFactory").newInstance();
- Ignite g3 = startGrid(3);
+ CacheConfiguration cfg = defaultCacheConfiguration();
- isClient = false;
+ cfg.setCacheStoreFactory((Factory)sf);
+ cfg.setName("customStore");
- IgniteCache<Integer, Object> cache1 = g1.cache(null);
- IgniteCache<Integer, Object> cache2 = g2.cache(null);
- IgniteCache<Integer, Object> cache3 = g3.cache(null);
+ IgniteCache<Integer, Object> cache1 = g1.createCache(cfg);
- cache1.put(1, 1);
+ IgniteCache<Integer, Object> cache2 = g2.getOrCreateCache(cfg); // Checks deserialization at cache creation.
+ IgniteCache<Integer, Object> cache3 = g3.getOrCreateCache(cfg); // Checks deserialization at cache creation.
- assertEquals(1, cache2.get(1));
- assertEquals(1, cache3.get(1));
+ cache1.put(1, 1);
- needStore = false;
+ assertEquals(1, cache2.get(1));
+ assertEquals(1, cache3.get(1));
+ }
+ finally {
+ needStore = false;
+ isClient = false;
+ useExtClassLoader = false;
+ }
+ }
- stopAllGrids();
+ /**
+ * @throws Exception If test failed.
+ */
+ public void testStoreDynamicStart2() throws Exception {
+ try {
+ needStore = false;
+ useExtClassLoader = true;
- g1 = startGrid(1);
- g2 = startGrid(2);
+ Ignite g1 = startGrid(1);
+ Ignite g2 = startGrid(2);
- isClient = true;
+ isClient = true;
- g3 = startGrid(3);
+ Ignite g3 = startGrid(3);
- isClient = false;
+ Object sf = getExternalClassLoader().loadClass(
+ "org.apache.ignite.tests.p2p.CacheDeploymentTestStoreFactory").newInstance();
- Object sf = ldr.loadClass("org.apache.ignite.tests.p2p.CacheDeploymentTestStoreFactory").newInstance();
+ CacheConfiguration cfg = defaultCacheConfiguration();
- cfg.setCacheStoreFactory((Factory)sf);
- cfg.setName("customStore");
+ cfg.setCacheStoreFactory((Factory)sf);
+ cfg.setName("customStore");
- cache1 = g1.createCache(cfg);
+ IgniteCache<Integer, Object> cache1 = g1.getOrCreateCache(cfg);
- cache2 = g2.getOrCreateCache(cfg); // Checks deserialization at cache creation.
- cache3 = g3.getOrCreateCache(cfg); // Checks deserialization at cache creation.
+ IgniteCache<Integer, Object> cache2 = g2.getOrCreateCache("customStore"); // Checks deserialization at cache creation.
+ IgniteCache<Integer, Object> cache3 = g3.getOrCreateCache("customStore"); // Checks deserialization at cache creation.
- cache1.put(1, 1);
+ cache1.put(1, 1);
- assertEquals(1, cache2.get(1));
- assertEquals(1, cache3.get(1));
- }
+ assertEquals(1, cache2.get(1));
+ assertEquals(1, cache3.get(1));
}
finally {
needStore = false;
isClient = false;
-
- stopAllGrids();
+ useExtClassLoader = false;
}
}
[4/9] ignite git commit: Merge remote-tracking branch
'apache-main/master' into master-main
Posted by sb...@apache.org.
Merge remote-tracking branch 'apache-main/master' into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a383f2e7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a383f2e7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a383f2e7
Branch: refs/heads/ignite-2542
Commit: a383f2e79401ecf5f60526aeec4bd8fa51679013
Parents: bf3a5ea d844e95
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Feb 8 13:43:06 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Feb 8 13:43:06 2016 +0300
----------------------------------------------------------------------
.../Binary/BinarySelfTest.cs | 32 ++++
.../Impl/Binary/BinaryUtils.cs | 166 ++++++++++++++++---
2 files changed, 172 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[6/9] ignite git commit: .NET: Fixed remaining analysis warnings
Posted by sb...@apache.org.
.NET: Fixed remaining analysis warnings
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cbaa6e02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cbaa6e02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cbaa6e02
Branch: refs/heads/ignite-2542
Commit: cbaa6e02010ee1aa8a1b4c8ee903c77ee560d8b1
Parents: e18dfda
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Mon Feb 8 14:14:30 2016 +0300
Committer: Pavel Tupitsyn <pt...@gridgain.com>
Committed: Mon Feb 8 14:14:30 2016 +0300
----------------------------------------------------------------------
.../Cache/Query/CacheQueriesCodeConfigurationTest.cs | 4 ++--
.../Apache.Ignite.Core/Cache/Configuration/QueryEntity.cs | 4 ++--
.../Discovery/Tcp/Multicast/TcpDiscoveryMulticastIpFinder.cs | 4 +++-
.../Discovery/Tcp/Static/TcpDiscoveryStaticIpFinder.cs | 6 ++++--
4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbaa6e02/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs
index a969127..684dd62 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs
@@ -189,7 +189,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query
/// <value>
/// The name.
/// </value>
- [QueryTextField]
+ [QueryTextField(Name = "Name")]
public string Name { get; set; }
/// <summary>
@@ -258,7 +258,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query
[QuerySqlField]
public double SqlField { get; set; }
- [QuerySqlField(IsIndexed = true, Name = "IndexedField1")]
+ [QuerySqlField(IsIndexed = true, Name = "IndexedField1", IsDescending = true)]
public int IndexedField { get; set; }
[QueryTextField]
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbaa6e02/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/QueryEntity.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/QueryEntity.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/QueryEntity.cs
index 4151540..4ce0211 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/QueryEntity.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/QueryEntity.cs
@@ -358,8 +358,8 @@ namespace Apache.Ignite.Core.Cache.Configuration
if (type.IsPrimitive)
yield break;
- var bindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance |
- BindingFlags.DeclaredOnly;
+ const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance |
+ BindingFlags.DeclaredOnly;
while (type != typeof (object) && type != null)
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbaa6e02/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Multicast/TcpDiscoveryMulticastIpFinder.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Multicast/TcpDiscoveryMulticastIpFinder.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Multicast/TcpDiscoveryMulticastIpFinder.cs
index 25adf56..5df5ea1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Multicast/TcpDiscoveryMulticastIpFinder.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Multicast/TcpDiscoveryMulticastIpFinder.cs
@@ -124,7 +124,9 @@ namespace Apache.Ignite.Core.Discovery.Tcp.Multicast
writer.WriteInt(TimeToLive.Value);
}
- /** <inheritdoc /> */
+ /// <summary>
+ /// Gets the type code to be used in Java to determine ip finder type.
+ /// </summary>
protected override byte TypeCode
{
get { return TypeCodeMulticastIpFinder; }
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbaa6e02/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Static/TcpDiscoveryStaticIpFinder.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Static/TcpDiscoveryStaticIpFinder.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Static/TcpDiscoveryStaticIpFinder.cs
index 331ca48..4672ed9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Static/TcpDiscoveryStaticIpFinder.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/Static/TcpDiscoveryStaticIpFinder.cs
@@ -74,8 +74,10 @@ namespace Apache.Ignite.Core.Discovery.Tcp.Static
else
writer.WriteInt(0);
}
-
- /** <inheritdoc /> */
+
+ /// <summary>
+ /// Gets the type code to be used in Java to determine ip finder type.
+ /// </summary>
protected override byte TypeCode
{
get { return TypeCodeVmIpFinder; }
[8/9] ignite git commit: Renamed the method.
Posted by sb...@apache.org.
Renamed the method.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa246cd2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa246cd2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa246cd2
Branch: refs/heads/ignite-2542
Commit: fa246cd2fa8bbf389677f256612124d4a1482afa
Parents: 26719d3
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Feb 8 17:55:35 2016 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Feb 8 17:55:35 2016 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa246cd2/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java
index 62420f7..42d6b5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryBasicNameMapper.java
@@ -59,7 +59,7 @@ public class BinaryBasicNameMapper implements BinaryNameMapper {
*
* @param isSimpleName Whether to use simple name of class or not.
*/
- public void setLowerCase(boolean isSimpleName) {
+ public void setSimpleName(boolean isSimpleName) {
this.isSimpleName = isSimpleName;
}
[9/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-2542
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-2542
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52e7d9de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52e7d9de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52e7d9de
Branch: refs/heads/ignite-2542
Commit: 52e7d9de6d4362e821ed4430daa8c2c7422161c5
Parents: e5763b8 fa246cd
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 8 20:06:53 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 8 20:06:53 2016 +0300
----------------------------------------------------------------------
.gitignore | 3 +
.../ignite/binary/BinaryBasicNameMapper.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 33 ++--
...arOptimisticSerializableTxPrepareFuture.java | 4 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 2 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 66 ++++----
.../GridCacheReplicatedPreloadSelfTest.java | 120 +++++++++-----
.../Binary/BinarySelfTest.cs | 32 ++++
.../Query/CacheQueriesCodeConfigurationTest.cs | 4 +-
.../Cache/Configuration/QueryEntity.cs | 4 +-
.../Multicast/TcpDiscoveryMulticastIpFinder.cs | 4 +-
.../Tcp/Static/TcpDiscoveryStaticIpFinder.cs | 6 +-
.../Impl/Binary/BinaryUtils.cs | 166 ++++++++++++++++---
modules/yardstick/.gitignore | 2 +
parent/pom.xml | 92 +++++++++-
16 files changed, 418 insertions(+), 124 deletions(-)
----------------------------------------------------------------------