IGNITE-1655: Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b34657fb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b34657fb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b34657fb Branch: refs/heads/ignite-1655 Commit: b34657fb737753d180d761fd5e86527d526b8614 Parents: 61d4394 Author: vozerov-gridgain <[email protected]> Authored: Wed Oct 21 12:24:03 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Oct 21 12:24:03 2015 +0300 ---------------------------------------------------------------------- .../platform/PlatformContextImpl.java | 9 ++-- .../transactions/PlatformTransactions.java | 5 +- .../Apache.Ignite.Benchmarks/Model/TestModel.cs | 8 ++-- .../Portable/PortableSelfTest.cs | 48 ++++++++++---------- .../Apache.Ignite.Core/Events/EventBase.cs | 2 +- .../Impl/Cluster/ClusterMetricsImpl.cs | 6 +-- .../Impl/Portable/PortableReaderImpl.cs | 24 +++++----- .../Impl/Portable/PortableReflectiveRoutines.cs | 12 ++--- .../Portable/PortableReflectiveSerializer.cs | 2 +- .../Impl/Portable/PortableSystemHandlers.cs | 4 -- .../Impl/Portable/PortableWriterImpl.cs | 8 ++-- .../Impl/Transactions/TransactionMetricsImpl.cs | 4 +- .../Portable/IPortableRawReader.cs | 12 ++--- .../Portable/IPortableRawWriter.cs | 4 +- .../Portable/IPortableReader.cs | 12 ++--- .../Portable/IPortableWriter.cs | 4 +- 16 files changed, 81 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java index 0999f6a..177a732 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java @@ -73,6 +73,7 @@ import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.portable.PortableMetadata; import org.jetbrains.annotations.Nullable; +import java.sql.Timestamp; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -270,7 +271,7 @@ public class PlatformContextImpl implements PlatformContext { writer.writeBoolean(true); writer.writeLong(metrics.getLastUpdateTime()); - writer.writeDate(new Date(metrics.getLastUpdateTime())); + writer.writeTimestamp(new Timestamp(metrics.getLastUpdateTime())); writer.writeInt(metrics.getMaximumActiveJobs()); writer.writeInt(metrics.getCurrentActiveJobs()); writer.writeFloat(metrics.getAverageActiveJobs()); @@ -318,8 +319,8 @@ public class PlatformContextImpl implements PlatformContext { writer.writeLong(metrics.getNonHeapMemoryTotal()); writer.writeLong(metrics.getUpTime()); - writer.writeDate(new Date(metrics.getStartTime())); - writer.writeDate(new Date(metrics.getNodeStartTime())); + writer.writeTimestamp(new Timestamp(metrics.getStartTime())); + writer.writeTimestamp(new Timestamp(metrics.getNodeStartTime())); writer.writeInt(metrics.getCurrentThreadCount()); writer.writeInt(metrics.getMaximumThreadCount()); writer.writeLong(metrics.getTotalStartedThreadCount()); @@ -572,7 +573,7 @@ public class PlatformContextImpl implements PlatformContext { writer.writeString(evt.message()); writer.writeInt(evt.type()); writer.writeString(evt.name()); - writer.writeDate(new Date(evt.timestamp())); + writer.writeTimestamp(new Timestamp(evt.timestamp())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java index 1d2c315..c143212 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.platform.transactions; +import java.sql.Timestamp; import java.util.Date; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; @@ -245,8 +246,8 @@ public class PlatformTransactions extends PlatformAbstractTarget { case OP_METRICS: TransactionMetrics metrics = txs.metrics(); - writer.writeDate(new Date(metrics.commitTime())); - writer.writeDate(new Date(metrics.rollbackTime())); + writer.writeTimestamp(new Timestamp(metrics.commitTime())); + writer.writeTimestamp(new Timestamp(metrics.rollbackTime())); writer.writeInt(metrics.txCommits()); writer.writeInt(metrics.txRollbacks()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Model/TestModel.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Model/TestModel.cs b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Model/TestModel.cs index 2685dec..c84b219 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Model/TestModel.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Model/TestModel.cs @@ -71,8 +71,8 @@ namespace Apache.Ignite.Benchmarks.Model writer.WriteDoubleArray("DoubleArray", DoubleArray); writer.WriteDecimal("Decimal", Decimal); writer.WriteDecimalArray("DecimalArray", DecimalArray); - writer.WriteDate("Date", Date); - writer.WriteDateArray("DateArray", DateArray); + writer.WriteTimestamp("Date", Date); + writer.WriteTimestampArray("DateArray", DateArray); writer.WriteString("String", String); writer.WriteStringArray("StringArray", StringArray); writer.WriteGuid("Guid", Guid); @@ -100,8 +100,8 @@ namespace Apache.Ignite.Benchmarks.Model DoubleArray = reader.ReadDoubleArray("DoubleArray"); Decimal = reader.ReadDecimal("Decimal"); DecimalArray = reader.ReadDecimalArray("DecimalArray"); - Date = reader.ReadDate("Date"); - DateArray = reader.ReadDateArray("DateArray"); + Date = reader.ReadTimestamp("Date"); + DateArray = reader.ReadTimestampArray("DateArray"); String = reader.ReadString("String"); StringArray = reader.ReadStringArray("StringArray"); Guid = reader.ReadObject<Guid>("Guid"); http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableSelfTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableSelfTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableSelfTest.cs index 36faf36..464b84e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableSelfTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableSelfTest.cs @@ -2031,41 +2031,41 @@ namespace Apache.Ignite.Core.Tests.Portable /** <inheritDoc /> */ public void WritePortable(IPortableWriter writer) { - writer.WriteDate("loc", Loc); - writer.WriteDate("utc", Utc); - writer.WriteDate("locNull", LocNull); - writer.WriteDate("utcNull", UtcNull); - writer.WriteDateArray("locArr", LocArr); - writer.WriteDateArray("utcArr", UtcArr); + writer.WriteTimestamp("loc", Loc); + writer.WriteTimestamp("utc", Utc); + writer.WriteTimestamp("locNull", LocNull); + writer.WriteTimestamp("utcNull", UtcNull); + writer.WriteTimestampArray("locArr", LocArr); + writer.WriteTimestampArray("utcArr", UtcArr); IPortableRawWriter rawWriter = writer.GetRawWriter(); - rawWriter.WriteDate(LocRaw); - rawWriter.WriteDate(UtcRaw); - rawWriter.WriteDate(LocNullRaw); - rawWriter.WriteDate(UtcNullRaw); - rawWriter.WriteDateArray(LocArrRaw); - rawWriter.WriteDateArray(UtcArrRaw); + rawWriter.WriteTimestamp(LocRaw); + rawWriter.WriteTimestamp(UtcRaw); + rawWriter.WriteTimestamp(LocNullRaw); + rawWriter.WriteTimestamp(UtcNullRaw); + rawWriter.WriteTimestampArray(LocArrRaw); + rawWriter.WriteTimestampArray(UtcArrRaw); } /** <inheritDoc /> */ public void ReadPortable(IPortableReader reader) { - Loc = reader.ReadDate("loc", true).Value; - Utc = reader.ReadDate("utc", false).Value; - LocNull = reader.ReadDate("loc", true).Value; - UtcNull = reader.ReadDate("utc", false).Value; - LocArr = reader.ReadDateArray("locArr", true); - UtcArr = reader.ReadDateArray("utcArr", false); + Loc = reader.ReadTimestamp("loc", true).Value; + Utc = reader.ReadTimestamp("utc", false).Value; + LocNull = reader.ReadTimestamp("loc", true).Value; + UtcNull = reader.ReadTimestamp("utc", false).Value; + LocArr = reader.ReadTimestampArray("locArr", true); + UtcArr = reader.ReadTimestampArray("utcArr", false); IPortableRawReader rawReader = reader.GetRawReader(); - LocRaw = rawReader.ReadDate(true).Value; - UtcRaw = rawReader.ReadDate(false).Value; - LocNullRaw = rawReader.ReadDate(true).Value; - UtcNullRaw = rawReader.ReadDate(false).Value; - LocArrRaw = rawReader.ReadDateArray(true); - UtcArrRaw = rawReader.ReadDateArray(false); + LocRaw = rawReader.ReadTimestamp(true).Value; + UtcRaw = rawReader.ReadTimestamp(false).Value; + LocNullRaw = rawReader.ReadTimestamp(true).Value; + UtcNullRaw = rawReader.ReadTimestamp(false).Value; + LocArrRaw = rawReader.ReadTimestampArray(true); + UtcArrRaw = rawReader.ReadTimestampArray(false); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs index 96f94ad..62ab1a6 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs @@ -69,7 +69,7 @@ namespace Apache.Ignite.Core.Events _type = r.ReadInt(); _name = r.ReadString(); - var timestamp = r.ReadDate(); + var timestamp = r.ReadTimestamp(); Debug.Assert(timestamp.HasValue); _timestamp = timestamp.Value; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs index 81a9a5a..9d86311 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs @@ -35,7 +35,7 @@ namespace Apache.Ignite.Core.Impl.Cluster { LastUpdateTimeRaw = reader.ReadLong(); - var lastUpdateTime = reader.ReadDate(); + var lastUpdateTime = reader.ReadTimestamp(); Debug.Assert(lastUpdateTime.HasValue); LastUpdateTime = lastUpdateTime.Value; @@ -86,11 +86,11 @@ namespace Apache.Ignite.Core.Impl.Cluster NonHeapMemoryTotal = reader.ReadLong(); Uptime = reader.ReadLong(); - var startTime = reader.ReadDate(); + var startTime = reader.ReadTimestamp(); Debug.Assert(startTime.HasValue); StartTime = startTime.Value; - var nodeStartTime = reader.ReadDate(); + var nodeStartTime = reader.ReadTimestamp(); Debug.Assert(nodeStartTime.HasValue); NodeStartTime = nodeStartTime.Value; http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReaderImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReaderImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReaderImpl.cs index fe5f5c9..22d9bd2 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReaderImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReaderImpl.cs @@ -324,49 +324,49 @@ namespace Apache.Ignite.Core.Impl.Portable } /** <inheritdoc /> */ - public DateTime? ReadDate(string fieldName) + public DateTime? ReadTimestamp(string fieldName) { - return ReadDate(fieldName, false); + return ReadTimestamp(fieldName, false); } /** <inheritdoc /> */ - public DateTime? ReadDate(string fieldName, bool local) + public DateTime? ReadTimestamp(string fieldName, bool local) { return ReadField(fieldName, r => PortableUtils.ReadDate(r, local)); } /** <inheritdoc /> */ - public DateTime? ReadDate() + public DateTime? ReadTimestamp() { - return ReadDate(false); + return ReadTimestamp(false); } /** <inheritdoc /> */ - public DateTime? ReadDate(bool local) + public DateTime? ReadTimestamp(bool local) { return Read(r => PortableUtils.ReadDate(r, local)); } /** <inheritdoc /> */ - public DateTime?[] ReadDateArray(string fieldName) + public DateTime?[] ReadTimestampArray(string fieldName) { - return ReadDateArray(fieldName, false); + return ReadTimestampArray(fieldName, false); } /** <inheritdoc /> */ - public DateTime?[] ReadDateArray(string fieldName, bool local) + public DateTime?[] ReadTimestampArray(string fieldName, bool local) { return ReadField(fieldName, r => PortableUtils.ReadDateArray(r, local)); } /** <inheritdoc /> */ - public DateTime?[] ReadDateArray() + public DateTime?[] ReadTimestampArray() { - return ReadDateArray(false); + return ReadTimestampArray(false); } /** <inheritdoc /> */ - public DateTime?[] ReadDateArray(bool local) + public DateTime?[] ReadTimestampArray(bool local) { return Read(r => PortableUtils.ReadDateArray(r, local)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveRoutines.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveRoutines.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveRoutines.cs index 907c480..613f741 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveRoutines.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveRoutines.cs @@ -272,8 +272,8 @@ namespace Apache.Ignite.Core.Impl.Portable } else if (elemType == typeof(DateTime?)) { - writeAction = GetWriter<DateTime?[]>(field, (f, w, o) => w.WriteDateArray(f, o)); - readAction = GetReader(field, (f, r) => r.ReadDateArray(f)); + writeAction = GetWriter<DateTime?[]>(field, (f, w, o) => w.WriteTimestampArray(f, o)); + readAction = GetReader(field, (f, r) => r.ReadTimestampArray(f)); } else if (elemType.IsEnum) { @@ -326,13 +326,13 @@ namespace Apache.Ignite.Core.Impl.Portable } else if (type == typeof(DateTime)) { - writeAction = GetWriter<DateTime>(field, (f, w, o) => w.WriteDate(f, o)); - readAction = GetReader(field, (f, r) => r.ReadDate(f)); + writeAction = GetWriter<DateTime>(field, (f, w, o) => w.WriteTimestamp(f, o)); + readAction = GetReader(field, (f, r) => r.ReadTimestamp(f)); } else if (nullable && nullableType == typeof(DateTime)) { - writeAction = GetWriter<DateTime?>(field, (f, w, o) => w.WriteDate(f, o)); - readAction = GetReader(field, (f, r) => r.ReadDate(f)); + writeAction = GetWriter<DateTime?>(field, (f, w, o) => w.WriteTimestamp(f, o)); + readAction = GetReader(field, (f, r) => r.ReadTimestamp(f)); } else if (type.IsEnum) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveSerializer.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveSerializer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveSerializer.cs index 3dff691..849230e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveSerializer.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableReflectiveSerializer.cs @@ -33,7 +33,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// zone. It means that this difference will be different as you change time zones. /// To overcome this discrepancy Ignite always converts .Net date to UTC form /// before serializing and allows user to decide whether to deserialize them - /// in UTC or local form using <c>ReadDate(..., true/false)</c> methods in + /// in UTC or local form using <c>ReadTimestamp(..., true/false)</c> methods in /// <see cref="IPortableReader"/> and <see cref="IPortableRawReader"/>. /// This serializer always read dates in UTC form. It means that if you have /// local date in any field/property, it will be implicitly converted to UTC http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs index feac916..8e1b84f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs @@ -241,12 +241,8 @@ namespace Apache.Ignite.Core.Impl.Portable return WriteDecimalArray; else if (elemType == typeof(string)) return WriteStringArray; -// else if (elemType == typeof(DateTime)) -// return WriteDateArray; else if (elemType == typeof(DateTime?)) return WriteNullableDateArray; -// else if (elemType == typeof(Guid)) -// return WriteGuidArray; else if (elemType == typeof(Guid?)) return WriteNullableGuidArray; // Enums. http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index b8f3d90..d579b78 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -619,7 +619,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// </summary> /// <param name="fieldName">Field name.</param> /// <param name="val">Date value.</param> - public void WriteDate(string fieldName, DateTime? val) + public void WriteTimestamp(string fieldName, DateTime? val) { WriteFieldId(fieldName, PU.TypeTimestamp); @@ -638,7 +638,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// Write date value. /// </summary> /// <param name="val">Date value.</param> - public void WriteDate(DateTime? val) + public void WriteTimestamp(DateTime? val) { if (val == null) WriteNullRawField(); @@ -654,7 +654,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// </summary> /// <param name="fieldName">Field name.</param> /// <param name="val">Date array.</param> - public void WriteDateArray(string fieldName, DateTime?[] val) + public void WriteTimestampArray(string fieldName, DateTime?[] val) { WriteFieldId(fieldName, PU.TypeTimestamp); @@ -675,7 +675,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// Write date array. /// </summary> /// <param name="val">Date array.</param> - public void WriteDateArray(DateTime?[] val) + public void WriteTimestampArray(DateTime?[] val) { if (val == null) WriteNullRawField(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionMetricsImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionMetricsImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionMetricsImpl.cs index 4b15150..8afc36b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionMetricsImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionMetricsImpl.cs @@ -33,11 +33,11 @@ namespace Apache.Ignite.Core.Impl.Transactions /// <param name="reader">The reader.</param> public TransactionMetricsImpl(IPortableRawReader reader) { - var commitTime = reader.ReadDate(); + var commitTime = reader.ReadTimestamp(); Debug.Assert(commitTime.HasValue); CommitTime = commitTime.Value; - var rollbackTime = reader.ReadDate(); + var rollbackTime = reader.ReadTimestamp(); Debug.Assert(rollbackTime.HasValue); RollbackTime = rollbackTime.Value; http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawReader.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawReader.cs index a3e8dd5..f4cf8ba 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawReader.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawReader.cs @@ -135,30 +135,30 @@ namespace Apache.Ignite.Core.Portable decimal?[] ReadDecimalArray(); /// <summary> - /// Read date value in UTC form. Shortcut for <c>ReadDate(false)</c>. + /// Read date value in UTC form. Shortcut for <c>ReadTimestamp(false)</c>. /// </summary> /// <returns>Date value.</returns> - DateTime? ReadDate(); + DateTime? ReadTimestamp(); /// <summary> /// Read date value. /// </summary> /// <param name="local">Whether to read date in local (<c>true</c>) or UTC (<c>false</c>) form.</param> /// <returns></returns> - DateTime? ReadDate(bool local); + DateTime? ReadTimestamp(bool local); /// <summary> - /// Read date array in UTC form. Shortcut for <c>ReadDateArray(false)</c>. + /// Read date array in UTC form. Shortcut for <c>ReadTimestampArray(false)</c>. /// </summary> /// <returns>Date array.</returns> - DateTime?[] ReadDateArray(); + DateTime?[] ReadTimestampArray(); /// <summary> /// Read date array. /// </summary> /// <param name="local">Whether to read date array in local (<c>true</c>) or UTC (<c>false</c>) form.</param> /// <returns>Date array.</returns> - DateTime?[] ReadDateArray(bool local); + DateTime?[] ReadTimestampArray(bool local); /// <summary> /// Read string value. http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawWriter.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawWriter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawWriter.cs index cc14f45..b2f6375 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawWriter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawWriter.cs @@ -138,13 +138,13 @@ namespace Apache.Ignite.Core.Portable /// Write date value. /// </summary> /// <param name="val">Date value.</param> - void WriteDate(DateTime? val); + void WriteTimestamp(DateTime? val); /// <summary> /// Write date array. /// </summary> /// <param name="val">Date array.</param> - void WriteDateArray(DateTime?[] val); + void WriteTimestampArray(DateTime?[] val); /// <summary> /// Write string value. http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableReader.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableReader.cs index ed86b7e..d913a06 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableReader.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableReader.cs @@ -185,11 +185,11 @@ namespace Apache.Ignite.Core.Portable decimal?[] ReadDecimalArray(string fieldName); /// <summary> - /// Read named date value in UTC form. Shortcut for <c>ReadDate(fieldName, false)</c>. + /// Read named date value in UTC form. /// </summary> /// <param name="fieldName">Field name.</param> /// <returns>Date value.</returns> - DateTime? ReadDate(string fieldName); + DateTime? ReadTimestamp(string fieldName); /// <summary> /// Read named date value. @@ -197,14 +197,14 @@ namespace Apache.Ignite.Core.Portable /// <param name="fieldName">Field name.</param> /// <param name="local">Whether to read date in local (<c>true</c>) or UTC (<c>false</c>) form.</param> /// <returns>Date vaule.</returns> - DateTime? ReadDate(string fieldName, bool local); + DateTime? ReadTimestamp(string fieldName, bool local); /// <summary> - /// Read named date array in UTC form. Shortcut for <c>ReadDateArray(fieldName, false)</c>. + /// Read named date array in UTC form. /// </summary> /// <param name="fieldName">Field name.</param> /// <returns>Date array.</returns> - DateTime?[] ReadDateArray(string fieldName); + DateTime?[] ReadTimestampArray(string fieldName); /// <summary> /// Read named date array. @@ -212,7 +212,7 @@ namespace Apache.Ignite.Core.Portable /// <param name="fieldName">Field name.</param> /// <param name="local">Whether to read date in local (<c>true</c>) or UTC (<c>false</c>) form.</param> /// <returns>Date array.</returns> - DateTime?[] ReadDateArray(string fieldName, bool local); + DateTime?[] ReadTimestampArray(string fieldName, bool local); /// <summary> /// Read named string value. http://git-wip-us.apache.org/repos/asf/ignite/blob/b34657fb/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableWriter.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableWriter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableWriter.cs index 670a137..fd05c7c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableWriter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableWriter.cs @@ -157,14 +157,14 @@ namespace Apache.Ignite.Core.Portable /// </summary> /// <param name="fieldName">Field name.</param> /// <param name="val">Date value.</param> - void WriteDate(string fieldName, DateTime? val); + void WriteTimestamp(string fieldName, DateTime? val); /// <summary> /// Write named date array. /// </summary> /// <param name="fieldName">Field name.</param> /// <param name="val">Date array.</param> - void WriteDateArray(string fieldName, DateTime?[] val); + void WriteTimestampArray(string fieldName, DateTime?[] val); /// <summary> /// Write named string value.
