Repository: ignite Updated Branches: refs/heads/ignite-1567 0565eec0d -> 02ab0b309
IGNITE-1567: More correct fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02ab0b30 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02ab0b30 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02ab0b30 Branch: refs/heads/ignite-1567 Commit: 02ab0b309892cd1a2f9ef972f9baf041927cf613 Parents: 0565eec Author: vozerov-gridgain <[email protected]> Authored: Tue Sep 29 18:06:27 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Sep 29 18:06:27 2015 +0300 ---------------------------------------------------------------------- .../Impl/Portable/PortableSystemHandlers.cs | 8 +- .../Impl/Portable/PortableWriterImpl.cs | 234 +++++++++---------- .../Portable/IPortableRawWriter.cs | 44 ++-- .../Portable/IPortableWriter.cs | 52 ++--- 4 files changed, 169 insertions(+), 169 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/02ab0b30/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 658d15d..4e67370 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs @@ -238,12 +238,12 @@ 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 WriteDateArray; else if (elemType == typeof(DateTime?)) return WriteNullableDateArray; - else if (elemType == typeof(Guid)) - return WriteGuidArray; +// 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/02ab0b30/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 a2de3b3..e502840 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -594,62 +594,62 @@ namespace Apache.Ignite.Core.Impl.Portable } } - /// <summary> - /// Write named date value. - /// </summary> - /// <param name="fieldName">Field name.</param> - /// <param name="val">Date value.</param> - public void WriteDate(string fieldName, DateTime val) - { - WriteFieldId(fieldName, PU.TypeDate); - - _stream.WriteInt(PU.LengthTypeId + 12); - - _stream.WriteByte(PortableUtils.TypeDate); - PortableUtils.WriteDate(val, _stream); - } - - /// <summary> - /// Write date value. - /// </summary> - /// <param name="val">Date value.</param> - public void WriteDate(DateTime val) - { - _stream.WriteByte(PortableUtils.TypeDate); - PortableUtils.WriteDate(val, _stream); - } - - /// <summary> - /// Write named date array. - /// </summary> - /// <param name="fieldName">Field name.</param> - /// <param name="val">Date array.</param> - public void WriteDateArray(string fieldName, DateTime[] val) - { - WriteFieldId(fieldName, PU.TypeDate); - - if (val == null) - WriteNullField(); - else - { - int pos = SkipFieldLength(); - - _stream.WriteByte(PortableUtils.TypeArrayDate); - PortableUtils.WriteDateArray(val, _stream); - - WriteFieldLength(_stream, pos); - } - } - - /// <summary> - /// Write date array. - /// </summary> - /// <param name="val">Date array.</param> - public void WriteDateArray(DateTime[] val) - { - _stream.WriteByte(PortableUtils.TypeArrayDate); - PortableUtils.WriteDateArray(val, _stream); - } +// /// <summary> +// /// Write named date value. +// /// </summary> +// /// <param name="fieldName">Field name.</param> +// /// <param name="val">Date value.</param> +// public void WriteDate(string fieldName, DateTime val) +// { +// WriteFieldId(fieldName, PU.TypeDate); +// +// _stream.WriteInt(PU.LengthTypeId + 12); +// +// _stream.WriteByte(PortableUtils.TypeDate); +// PortableUtils.WriteDate(val, _stream); +// } +// +// /// <summary> +// /// Write date value. +// /// </summary> +// /// <param name="val">Date value.</param> +// public void WriteDate(DateTime val) +// { +// _stream.WriteByte(PortableUtils.TypeDate); +// PortableUtils.WriteDate(val, _stream); +// } +// +// /// <summary> +// /// Write named date array. +// /// </summary> +// /// <param name="fieldName">Field name.</param> +// /// <param name="val">Date array.</param> +// public void WriteDateArray(string fieldName, DateTime[] val) +// { +// WriteFieldId(fieldName, PU.TypeDate); +// +// if (val == null) +// WriteNullField(); +// else +// { +// int pos = SkipFieldLength(); +// +// _stream.WriteByte(PortableUtils.TypeArrayDate); +// PortableUtils.WriteDateArray(val, _stream); +// +// WriteFieldLength(_stream, pos); +// } +// } +// +// /// <summary> +// /// Write date array. +// /// </summary> +// /// <param name="val">Date array.</param> +// public void WriteDateArray(DateTime[] val) +// { +// _stream.WriteByte(PortableUtils.TypeArrayDate); +// PortableUtils.WriteDateArray(val, _stream); +// } /// <summary> /// Write named date value. @@ -797,30 +797,67 @@ namespace Apache.Ignite.Core.Impl.Portable } } - /// <summary> - /// Write named GUID value. - /// </summary> - /// <param name="fieldName">Field name.</param> - /// <param name="val">GUID value.</param> - public void WriteGuid(string fieldName, Guid val) - { - WriteFieldId(fieldName, PU.TypeGuid); - - _stream.WriteInt(PU.LengthTypeId + 16); - - _stream.WriteByte(PU.TypeGuid); - PU.WriteGuid(val, _stream); - } - - /// <summary> - /// Write GUID value. - /// </summary> - /// <param name="val">GUID value.</param> - public void WriteGuid(Guid val) - { - _stream.WriteByte(PU.TypeGuid); - PU.WriteGuid(val, _stream); - } +// /// <summary> +// /// Write named GUID value. +// /// </summary> +// /// <param name="fieldName">Field name.</param> +// /// <param name="val">GUID value.</param> +// public void WriteGuid(string fieldName, Guid val) +// { +// WriteFieldId(fieldName, PU.TypeGuid); +// +// _stream.WriteInt(PU.LengthTypeId + 16); +// +// _stream.WriteByte(PU.TypeGuid); +// PU.WriteGuid(val, _stream); +// } +// +// /// <summary> +// /// Write GUID value. +// /// </summary> +// /// <param name="val">GUID value.</param> +// public void WriteGuid(Guid val) +// { +// _stream.WriteByte(PU.TypeGuid); +// PU.WriteGuid(val, _stream); +// } +// +// /// <summary> +// /// Write named GUID array. +// /// </summary> +// /// <param name="fieldName">Field name.</param> +// /// <param name="val">GUID array.</param> +// public void WriteGuidArray(string fieldName, Guid[] val) +// { +// WriteFieldId(fieldName, PU.TypeArrayGuid); +// +// if (val == null) +// WriteNullField(); +// else +// { +// int pos = SkipFieldLength(); +// +// _stream.WriteByte(PU.TypeArrayGuid); +// PU.WriteGuidArray(val, _stream); +// +// WriteFieldLength(_stream, pos); +// } +// } +// +// /// <summary> +// /// Write GUID array. +// /// </summary> +// /// <param name="val">GUID array.</param> +// public void WriteGuidArray(Guid[] val) +// { +// if (val == null) +// WriteNullRawField(); +// else +// { +// _stream.WriteByte(PU.TypeArrayGuid); +// PU.WriteGuidArray(val, _stream); +// } +// } /// <summary> /// Write named GUID value. @@ -862,43 +899,6 @@ namespace Apache.Ignite.Core.Impl.Portable /// </summary> /// <param name="fieldName">Field name.</param> /// <param name="val">GUID array.</param> - public void WriteGuidArray(string fieldName, Guid[] val) - { - WriteFieldId(fieldName, PU.TypeArrayGuid); - - if (val == null) - WriteNullField(); - else - { - int pos = SkipFieldLength(); - - _stream.WriteByte(PU.TypeArrayGuid); - PU.WriteGuidArray(val, _stream); - - WriteFieldLength(_stream, pos); - } - } - - /// <summary> - /// Write GUID array. - /// </summary> - /// <param name="val">GUID array.</param> - public void WriteGuidArray(Guid[] val) - { - if (val == null) - WriteNullRawField(); - else - { - _stream.WriteByte(PU.TypeArrayGuid); - PU.WriteGuidArray(val, _stream); - } - } - - /// <summary> - /// Write named GUID array. - /// </summary> - /// <param name="fieldName">Field name.</param> - /// <param name="val">GUID array.</param> public void WriteGuidArray(string fieldName, Guid?[] val) { WriteFieldId(fieldName, PU.TypeArrayGuid); http://git-wip-us.apache.org/repos/asf/ignite/blob/02ab0b30/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 20400a3..42d8c66 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawWriter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableRawWriter.cs @@ -134,17 +134,17 @@ namespace Apache.Ignite.Core.Portable /// <param name="val">Decimal array.</param> void WriteDecimalArray(decimal[] val); - /// <summary> - /// Write date value. - /// </summary> - /// <param name="val">Date value.</param> - void WriteDate(DateTime val); - - /// <summary> - /// Write date array. - /// </summary> - /// <param name="val">Date array.</param> - void WriteDateArray(DateTime[] val); +// /// <summary> +// /// Write date value. +// /// </summary> +// /// <param name="val">Date value.</param> +// void WriteDate(DateTime val); +// +// /// <summary> +// /// Write date array. +// /// </summary> +// /// <param name="val">Date array.</param> +// void WriteDateArray(DateTime[] val); /// <summary> /// Write date value. @@ -170,17 +170,17 @@ namespace Apache.Ignite.Core.Portable /// <param name="val">String array.</param> void WriteStringArray(string[] val); - /// <summary> - /// Write GUID value. - /// </summary> - /// <param name="val">GUID value.</param> - void WriteGuid(Guid val); - - /// <summary> - /// Write GUID array. - /// </summary> - /// <param name="val">GUID array.</param> - void WriteGuidArray(Guid[] val); +// /// <summary> +// /// Write GUID value. +// /// </summary> +// /// <param name="val">GUID value.</param> +// void WriteGuid(Guid val); +// +// /// <summary> +// /// Write GUID array. +// /// </summary> +// /// <param name="val">GUID array.</param> +// void WriteGuidArray(Guid[] val); /// <summary> /// Write GUID value. http://git-wip-us.apache.org/repos/asf/ignite/blob/02ab0b30/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 5f9f35d..5bb2625 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableWriter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Portable/IPortableWriter.cs @@ -152,19 +152,19 @@ namespace Apache.Ignite.Core.Portable /// <param name="val">Decimal array.</param> void WriteDecimalArray(string fieldName, decimal[] val); - /// <summary> - /// Write named date value. - /// </summary> - /// <param name="fieldName">Field name.</param> - /// <param name="val">Date value.</param> - void WriteDate(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); +// /// <summary> +// /// Write named date value. +// /// </summary> +// /// <param name="fieldName">Field name.</param> +// /// <param name="val">Date value.</param> +// void WriteDate(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); /// <summary> /// Write named date value. @@ -194,19 +194,19 @@ namespace Apache.Ignite.Core.Portable /// <param name="val">String array.</param> void WriteStringArray(string fieldName, string[] val); - /// <summary> - /// Write named GUID value. - /// </summary> - /// <param name="fieldName">Field name.</param> - /// <param name="val">GUID value.</param> - void WriteGuid(string fieldName, Guid val); - - /// <summary> - /// Write named GUID array. - /// </summary> - /// <param name="fieldName">Field name.</param> - /// <param name="val">GUID array.</param> - void WriteGuidArray(string fieldName, Guid[] val); +// /// <summary> +// /// Write named GUID value. +// /// </summary> +// /// <param name="fieldName">Field name.</param> +// /// <param name="val">GUID value.</param> +// void WriteGuid(string fieldName, Guid val); +// +// /// <summary> +// /// Write named GUID array. +// /// </summary> +// /// <param name="fieldName">Field name.</param> +// /// <param name="val">GUID array.</param> +// void WriteGuidArray(string fieldName, Guid[] val); /// <summary> /// Write named GUID value.
