organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Remove the overload for Add(RepeatedField<T>)

Browse source 
We now just perform the optimization within AddRange itself.

This is a breaking change in terms of "drop in the DLL", but is
source compatible, which should be fine.
This commit is contained in:
Jon Skeet 2016-07-09 08:02:14 +01:00
parent 2ee1e52380
commit 5e0de1ebee
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
View file

@ -153,10 +153,18 @@ namespace Google.Protobuf.Collections
}
[Test]
public void Add_RepeatedField()
public void AddRange_AlreadyNotEmpty()
{
var list = new RepeatedField<int> { 1, 2, 3 };
list.AddRange(new List<int> { 4, 5, 6 });
CollectionAssert.AreEqual(new[] { 1, 2, 3, 4, 5, 6 }, list);
}
[Test]
public void AddRange_RepeatedField()
{
var list = new RepeatedField<string> { "original" };
list.Add(new RepeatedField<string> { "foo", "bar" });
list.AddRange(new RepeatedField<string> { "foo", "bar" });
Assert.AreEqual(3, list.Count);
Assert.AreEqual("original", list[0]);
Assert.AreEqual("foo", list[1]);

30
csharp/src/Google.Protobuf/Collections/RepeatedField.cs
View file

@ -288,21 +288,6 @@ namespace Google.Protobuf.Collections
/// </summary>
public bool IsReadOnly => false;
// TODO: Remove this overload and just handle it in the one below, at execution time?
/// <summary>
/// Adds all of the specified values into this collection.
/// </summary>
/// <param name="values">The values to add to this collection.</param>
public void Add(RepeatedField<T> values)
{
ProtoPreconditions.CheckNotNull(values, nameof(values));
EnsureSize(count + values.count);
// We know that all the values will be valid, because it's a RepeatedField.
Array.Copy(values.array, 0, array, count, values.count);
count += values.count;
}
/// <summary>
/// Adds all of the specified values into this collection.
/// </summary>
@ -311,8 +296,19 @@ namespace Google.Protobuf.Collections
{
ProtoPreconditions.CheckNotNull(values, nameof(values));
// Optimize the case where we know the size and can ask the collection to
// copy itself.
// Optimization 1: If the collection we're adding is already a RepeatedField<T>,
// we know the values are valid.
var otherRepeatedField = values as RepeatedField<T>;
if (otherRepeatedField != null)
{
EnsureSize(count + otherRepeatedField.count);
Array.Copy(otherRepeatedField.array, 0, array, count, otherRepeatedField.count);
count += otherRepeatedField.count;
return;
}
// Optimization 2: The collection is an ICollection, so we can expand
// just once and ask the collection to copy itself into the array.
var collection = values as ICollection;
if (collection != null)
{