-
Notifications
You must be signed in to change notification settings - Fork 15.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Well-known type operations for Timestamp and Duration (but not JSON f…
…ormatting). While I've provided operators, I haven't yet provided the method equivalents. It's not clear to me that they're actually a good idea, while we're really targeting C# developers who definitely *can* use the user-defined operators.
- Loading branch information
Showing
7 changed files
with
563 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
#region Copyright notice and license | ||
// Protocol Buffers - Google's data interchange format | ||
// Copyright 2015 Google Inc. All rights reserved. | ||
// https://developers.google.com/protocol-buffers/ | ||
// | ||
// Redistribution and use in source and binary forms, with or without | ||
// modification, are permitted provided that the following conditions are | ||
// met: | ||
// | ||
// * Redistributions of source code must retain the above copyright | ||
// notice, this list of conditions and the following disclaimer. | ||
// * Redistributions in binary form must reproduce the above | ||
// copyright notice, this list of conditions and the following disclaimer | ||
// in the documentation and/or other materials provided with the | ||
// distribution. | ||
// * Neither the name of Google Inc. nor the names of its | ||
// contributors may be used to endorse or promote products derived from | ||
// this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
#endregion | ||
|
||
using NUnit.Framework; | ||
using System; | ||
|
||
namespace Google.Protobuf.WellKnownTypes | ||
{ | ||
public class DurationTest | ||
{ | ||
[Test] | ||
public void ToTimeSpan() | ||
{ | ||
Assert.AreEqual(TimeSpan.FromSeconds(1), new Duration { Seconds = 1 }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromSeconds(-1), new Duration { Seconds = -1 }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromMilliseconds(1), new Duration { Nanos = 1000000 }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromMilliseconds(-1), new Duration { Nanos = -1000000 }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromTicks(1), new Duration { Nanos = 100 }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromTicks(-1), new Duration { Nanos = -100 }.ToTimeSpan()); | ||
|
||
// Rounding is towards 0 | ||
Assert.AreEqual(TimeSpan.FromTicks(2), new Duration { Nanos = 250 }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromTicks(-2), new Duration { Nanos = -250 }.ToTimeSpan()); | ||
|
||
// Non-normalized durations | ||
Assert.AreEqual(TimeSpan.FromSeconds(3), new Duration { Seconds = 1, Nanos = 2 * Duration.NanosecondsPerSecond }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromSeconds(1), new Duration { Seconds = 3, Nanos = -2 * Duration.NanosecondsPerSecond }.ToTimeSpan()); | ||
Assert.AreEqual(TimeSpan.FromSeconds(-1), new Duration { Seconds = 1, Nanos = -2 * Duration.NanosecondsPerSecond }.ToTimeSpan()); | ||
} | ||
|
||
[Test] | ||
public void Addition() | ||
{ | ||
Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 }, | ||
new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = 500000000 }); | ||
Assert.AreEqual(new Duration { Seconds = -2, Nanos = -100000000 }, | ||
new Duration { Seconds = -1, Nanos = -600000000 } + new Duration { Nanos = -500000000 }); | ||
Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 }, | ||
new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = -500000000 }); | ||
|
||
// Non-normalized durations, or non-normalized intermediate results | ||
Assert.AreEqual(new Duration { Seconds = 1 }, | ||
new Duration { Seconds = 1, Nanos = -500000000 } + new Duration { Nanos = 500000000 }); | ||
|
||
Assert.AreEqual(new Duration { Nanos = -900000000 }, | ||
new Duration { Seconds = -1, Nanos = -100000000 } + new Duration { Nanos = 200000000 }); | ||
Assert.AreEqual(new Duration { Nanos = 900000000 }, | ||
new Duration { Seconds = 1, Nanos = 100000000 } + new Duration { Nanos = -200000000 }); | ||
} | ||
|
||
[Test] | ||
public void Subtraction() | ||
{ | ||
Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 }, | ||
new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = 500000000 }); | ||
Assert.AreEqual(new Duration { Seconds = -1, Nanos = -100000000 }, | ||
new Duration { Seconds = -1, Nanos = -600000000 } - new Duration { Nanos = -500000000 }); | ||
Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 }, | ||
new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = -500000000 }); | ||
|
||
// Non-normalized durations | ||
Assert.AreEqual(new Duration(), | ||
new Duration { Seconds = 1, Nanos = -500000000 } - new Duration { Nanos = 500000000 }); | ||
Assert.AreEqual(new Duration { Seconds = 1 }, | ||
new Duration { Nanos = 2000000000 } - new Duration { Nanos = 1000000000 }); | ||
} | ||
|
||
[Test] | ||
public void FromTimeSpan() | ||
{ | ||
Assert.AreEqual(new Duration { Seconds = 1 }, Duration.FromTimeSpan(TimeSpan.FromSeconds(1))); | ||
Assert.AreEqual(new Duration { Nanos = Duration.NanosecondsPerTick }, Duration.FromTimeSpan(TimeSpan.FromTicks(1))); | ||
} | ||
} | ||
} |
84 changes: 84 additions & 0 deletions
84
csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
#region Copyright notice and license | ||
// Protocol Buffers - Google's data interchange format | ||
// Copyright 2015 Google Inc. All rights reserved. | ||
// https://developers.google.com/protocol-buffers/ | ||
// | ||
// Redistribution and use in source and binary forms, with or without | ||
// modification, are permitted provided that the following conditions are | ||
// met: | ||
// | ||
// * Redistributions of source code must retain the above copyright | ||
// notice, this list of conditions and the following disclaimer. | ||
// * Redistributions in binary form must reproduce the above | ||
// copyright notice, this list of conditions and the following disclaimer | ||
// in the documentation and/or other materials provided with the | ||
// distribution. | ||
// * Neither the name of Google Inc. nor the names of its | ||
// contributors may be used to endorse or promote products derived from | ||
// this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
#endregion | ||
|
||
using NUnit.Framework; | ||
using System; | ||
|
||
namespace Google.Protobuf.WellKnownTypes | ||
{ | ||
public class TimestampTest | ||
{ | ||
[Test] | ||
public void FromAndToDateTime() | ||
{ | ||
DateTime utcMin = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc); | ||
DateTime utcMax = DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc); | ||
AssertRoundtrip(new Timestamp { Seconds = -62135596800 }, utcMin); | ||
AssertRoundtrip(new Timestamp { Seconds = 253402300799, Nanos = 999999900 }, utcMax); | ||
AssertRoundtrip(new Timestamp(), new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)); | ||
AssertRoundtrip(new Timestamp { Nanos = 1000000}, new DateTime(1970, 1, 1, 0, 0, 0, 1, DateTimeKind.Utc)); | ||
AssertRoundtrip(new Timestamp { Seconds = -1, Nanos = 999000000 }, new DateTime(1969, 12, 31, 23, 59, 59, 999, DateTimeKind.Utc)); | ||
AssertRoundtrip(new Timestamp { Seconds = 3600 }, new DateTime(1970, 1, 1, 1, 0, 0, DateTimeKind.Utc)); | ||
AssertRoundtrip(new Timestamp { Seconds = -3600 }, new DateTime(1969, 12, 31, 23, 0, 0, DateTimeKind.Utc)); | ||
} | ||
|
||
[Test] | ||
public void ToDateTimeTruncation() | ||
{ | ||
var t1 = new Timestamp { Seconds = 1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 }; | ||
Assert.AreEqual(new DateTime(1970, 1, 1, 0, 0, 1, DateTimeKind.Utc).AddMilliseconds(1), t1.ToDateTime()); | ||
|
||
var t2 = new Timestamp { Seconds = -1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 }; | ||
Assert.AreEqual(new DateTime(1969, 12, 31, 23, 59, 59).AddMilliseconds(1), t2.ToDateTime()); | ||
} | ||
|
||
private static void AssertRoundtrip(Timestamp timestamp, DateTime dateTime) | ||
{ | ||
Assert.AreEqual(timestamp, Timestamp.FromDateTime(dateTime)); | ||
Assert.AreEqual(dateTime, timestamp.ToDateTime()); | ||
Assert.AreEqual(DateTimeKind.Utc, timestamp.ToDateTime().Kind); | ||
} | ||
|
||
[Test] | ||
public void Arithmetic() | ||
{ | ||
Timestamp t1 = new Timestamp { Seconds = 10000, Nanos = 5000 }; | ||
Timestamp t2 = new Timestamp { Seconds = 8000, Nanos = 10000 }; | ||
Duration difference = new Duration { Seconds = 1999, Nanos = Duration.NanosecondsPerSecond - 5000 }; | ||
Assert.AreEqual(difference, t1 - t2); | ||
Assert.AreEqual(-difference, t2 - t1); | ||
|
||
Assert.AreEqual(t1, t2 + difference); | ||
Assert.AreEqual(t2, t1 - difference); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,145 @@ | ||
#region Copyright notice and license | ||
// Protocol Buffers - Google's data interchange format | ||
// Copyright 2015 Google Inc. All rights reserved. | ||
// https://developers.google.com/protocol-buffers/ | ||
// | ||
// Redistribution and use in source and binary forms, with or without | ||
// modification, are permitted provided that the following conditions are | ||
// met: | ||
// | ||
// * Redistributions of source code must retain the above copyright | ||
// notice, this list of conditions and the following disclaimer. | ||
// * Redistributions in binary form must reproduce the above | ||
// copyright notice, this list of conditions and the following disclaimer | ||
// in the documentation and/or other materials provided with the | ||
// distribution. | ||
// * Neither the name of Google Inc. nor the names of its | ||
// contributors may be used to endorse or promote products derived from | ||
// this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
#endregion | ||
|
||
using System; | ||
|
||
namespace Google.Protobuf.WellKnownTypes | ||
{ | ||
// Manually-written partial class for the Duration well-known type, | ||
// providing a conversion to TimeSpan and convenience operators. | ||
public partial class Duration | ||
{ | ||
public const int NanosecondsPerSecond = 1000000000; | ||
public const int NanosecondsPerTick = 100; | ||
|
||
/// <summary> | ||
/// Converts this <see cref="Duration"/> to a <see cref="TimeSpan"/>. | ||
/// </summary> | ||
/// <remarks>If the duration is not a precise number of ticks, it is truncated towards 0.</remarks> | ||
/// <returns>The value of this duration, as a <c>TimeSpan</c>.</returns> | ||
public TimeSpan ToTimeSpan() | ||
{ | ||
checked | ||
{ | ||
long ticks = Seconds * TimeSpan.TicksPerSecond + Nanos / NanosecondsPerTick; | ||
return TimeSpan.FromTicks(ticks); | ||
} | ||
} | ||
|
||
/// <summary> | ||
/// Converts the given <see cref="TimeSpan"/> to a <see cref="Duration"/>. | ||
/// </summary> | ||
/// <param name="timeSpan">The <c>TimeSpan</c> to convert.</param> | ||
/// <returns>The value of the given <c>TimeSpan</c>, as a <c>Duration</c>.</returns> | ||
public static Duration FromTimeSpan(TimeSpan timeSpan) | ||
{ | ||
checked | ||
{ | ||
long ticks = timeSpan.Ticks; | ||
long seconds = ticks / TimeSpan.TicksPerSecond; | ||
int nanos = (int) (ticks % TimeSpan.TicksPerSecond) * NanosecondsPerTick; | ||
return new Duration { Seconds = seconds, Nanos = nanos }; | ||
} | ||
} | ||
|
||
/// <summary> | ||
/// Returns the result of negating the duration. For example, the negation of 5 minutes is -5 minutes. | ||
/// </summary> | ||
/// <param name="value">The duration to negate. Must not be null.</param> | ||
/// <returns>The negated value of this duration.</returns> | ||
public static Duration operator -(Duration value) | ||
{ | ||
Preconditions.CheckNotNull(value, "value"); | ||
checked | ||
{ | ||
return Normalize(-value.Seconds, -value.Nanos); | ||
} | ||
} | ||
|
||
/// <summary> | ||
/// Adds the two specified <see cref="Duration"/> values together. | ||
/// </summary> | ||
/// <param name="lhs">The first value to add. Must not be null.</param> | ||
/// <param name="rhs">The second value to add. Must not be null.</param> | ||
/// <returns></returns> | ||
public static Duration operator +(Duration lhs, Duration rhs) | ||
{ | ||
Preconditions.CheckNotNull(lhs, "lhs"); | ||
Preconditions.CheckNotNull(rhs, "rhs"); | ||
checked | ||
{ | ||
return Normalize(lhs.Seconds + rhs.Seconds, lhs.Nanos + rhs.Nanos); | ||
} | ||
} | ||
|
||
/// <summary> | ||
/// Subtracts one <see cref="Duration"/> from another. | ||
/// </summary> | ||
/// <param name="lhs">The duration to subtract from. Must not be null.</param> | ||
/// <param name="rhs">The duration to subtract. Must not be null.</param> | ||
/// <returns>The difference between the two specified durations.</returns> | ||
public static Duration operator -(Duration lhs, Duration rhs) | ||
{ | ||
Preconditions.CheckNotNull(lhs, "lhs"); | ||
Preconditions.CheckNotNull(rhs, "rhs"); | ||
checked | ||
{ | ||
return Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos); | ||
} | ||
} | ||
|
||
/// <summary> | ||
/// Creates a duration with the normalized values from the given number of seconds and | ||
/// nanoseconds, conforming with the description in the proto file. | ||
/// </summary> | ||
internal static Duration Normalize(long seconds, int nanoseconds) | ||
{ | ||
// Ensure that nanoseconds is in the range (-1,000,000,000, +1,000,000,000) | ||
int extraSeconds = nanoseconds / NanosecondsPerSecond; | ||
seconds += extraSeconds; | ||
nanoseconds -= extraSeconds * NanosecondsPerSecond; | ||
|
||
// Now make sure that Sign(seconds) == Sign(nanoseconds) if Sign(seconds) != 0. | ||
if (seconds < 0 && nanoseconds > 0) | ||
{ | ||
seconds += 1; | ||
nanoseconds -= NanosecondsPerSecond; | ||
} | ||
else if (seconds > 0 && nanoseconds < 0) | ||
{ | ||
seconds -= 1; | ||
nanoseconds += NanosecondsPerSecond; | ||
} | ||
return new Duration { Seconds = seconds, Nanos = nanoseconds }; | ||
} | ||
} | ||
} |
Oops, something went wrong.