You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/08 14:45:52 UTC
[10/50] ignite git commit: fix raw operation
fix raw operation
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4208f93e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4208f93e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4208f93e
Branch: refs/heads/ignite-3199-1
Commit: 4208f93e472d1f28d5d25fa86ae6b12fe9532cf7
Parents: 5a503c7
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Mon Sep 5 17:42:01 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Mon Sep 5 17:42:01 2016 +0300
----------------------------------------------------------------------
.../Impl/AspNet/SessionStateData.cs | 2 +-
.../KeyValueDirtyTrackedCollection.cs | 25 ++++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4208f93e/modules/platforms/dotnet/Apache.Ignite.Core/Impl/AspNet/SessionStateData.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/AspNet/SessionStateData.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/AspNet/SessionStateData.cs
index 1e088bd..da4d96b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/AspNet/SessionStateData.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/AspNet/SessionStateData.cs
@@ -92,7 +92,7 @@ namespace Apache.Ignite.Core.Impl.AspNet
/// <param name="writer">Writer.</param>
public void WriteBinary(IBinaryWriter writer)
{
- var raw = (IBinaryRawWriter) writer;
+ var raw = writer.GetRawWriter();
raw.WriteInt(Timeout);
raw.WriteGuid(LockNodeId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/4208f93e/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Collections/KeyValueDirtyTrackedCollection.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Collections/KeyValueDirtyTrackedCollection.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Collections/KeyValueDirtyTrackedCollection.cs
index d02e133..028a18d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Collections/KeyValueDirtyTrackedCollection.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Collections/KeyValueDirtyTrackedCollection.cs
@@ -192,33 +192,34 @@ namespace Apache.Ignite.Core.Impl.Collections
if (_isDiff)
throw new InvalidOperationException(string.Format("Cannot serialize incomplete {0}.", GetType()));
- var wr = (BinaryWriter) writer;
+ var raw = writer.GetRawWriter();
+ var wr = (BinaryWriter) raw;
if (_isNew || _dirtyAll || !WriteChangesOnly || (_removedKeys == null && _list.All(x => x.IsDirty)))
{
// Write in full mode.
- wr.WriteBoolean(true);
- wr.WriteInt(_list.Count);
+ raw.WriteBoolean(true);
+ raw.WriteInt(_list.Count);
foreach (var entry in _list)
{
- wr.WriteString(entry.Key);
+ raw.WriteString(entry.Key);
// Write as byte array to enable partial deserialization.
- wr.WriteByteArray(entry.GetBytes(wr.Marshaller));
+ raw.WriteByteArray(entry.GetBytes(wr.Marshaller));
}
}
else
{
// Write in diff mode.
- wr.WriteBoolean(false);
+ raw.WriteBoolean(false);
var stream = wr.Stream;
var countPos = stream.Position;
var count = 0;
- wr.WriteInt(count); // reserve count
+ raw.WriteInt(count); // reserve count
// Write dirty items.
foreach (var entry in _list)
@@ -226,10 +227,10 @@ namespace Apache.Ignite.Core.Impl.Collections
if (!entry.IsDirty)
continue;
- wr.WriteString(entry.Key);
+ raw.WriteString(entry.Key);
// Write as byte array to enable partial deserialization.
- wr.WriteByteArray(entry.GetBytes(wr.Marshaller));
+ raw.WriteByteArray(entry.GetBytes(wr.Marshaller));
count++;
}
@@ -250,14 +251,14 @@ namespace Apache.Ignite.Core.Impl.Collections
foreach (var entry in _list)
removed.Remove(entry.Key);
- wr.WriteInt(removed.Count);
+ raw.WriteInt(removed.Count);
foreach (var removedKey in removed)
- wr.WriteString(removedKey);
+ raw.WriteString(removedKey);
}
else
{
- wr.WriteInt(0);
+ raw.WriteInt(0);
}
}
}