implement cache recording segment split by age (#611)

- also fixes weird DateTime/TimeSpan comparison operator

2 files changed, 83 insertions, 5 deletions

diff --git a/src/zencore/compactbinary.cpp b/src/zencore/compactbinary.cpp
index 9152a8bfc..6677b5a61 100644
--- a/src/zencore/compactbinary.cpp
+++ b/src/zencore/compactbinary.cpp
@@ -2463,6 +2463,58 @@ TEST_CASE("json.uson")
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////
+
+TEST_SUITE_BEGIN("core.datetime");
+
+TEST_CASE("core.datetime.compare")
+{
+	DateTime T1(2000, 12, 13);
+	DateTime T2(2000, 12, 14);
+	CHECK(T1 < T2);
+	CHECK(T2 > T1);
+	CHECK(T1 == T1);
+	CHECK(T1 != T2);
+	CHECK(T1 >= T1);
+	CHECK(T2 >= T1);
+	CHECK(T1 <= T1);
+	CHECK(T1 <= T2);
+}
+
+TEST_CASE("core.datetime.add")
+{
+	DateTime T1(2000, 12, 13);
+	DateTime T2(2000, 12, 14);
+	TimeSpan dT	 = T2 - T1;
+	TimeSpan dT1 = T1 - T1;
+
+	CHECK(T1 + dT == T2);
+	CHECK(dT + T1 == T2);
+	CHECK(dT + T1 - T2 == dT1);
+}
+
+TEST_SUITE_END();
+
+TEST_SUITE_BEGIN("core.timespan");
+
+TEST_CASE("core.timespan.compare")
+{
+	TimeSpan T1(1000);
+	TimeSpan T2(1001);
+	CHECK(T1 < T2);
+	CHECK(T2 > T1);
+	CHECK(T1 == T1);
+	CHECK(T1 != T2);
+	CHECK(T1 >= T1);
+	CHECK(T2 >= T1);
+	CHECK(T1 <= T1);
+	CHECK(T1 <= T2);
+}
+
+TEST_SUITE_END();
+
+//////////////////////////////////////////////////////////////////////////
+
 #endif
 
 }  // namespace zen
diff --git a/src/zencore/include/zencore/compactbinary.h b/src/zencore/include/zencore/compactbinary.h
index cb032e34a..675e2a8d4 100644
--- a/src/zencore/include/zencore/compactbinary.h
+++ b/src/zencore/include/zencore/compactbinary.h
@@ -26,12 +26,13 @@
 
 namespace zen {
 
-class CbObjectView;
 class CbArrayView;
+class CbObjectView;
+class CbValue;
+class CompressedBuffer;
 class BinaryReader;
 class BinaryWriter;
-class CompressedBuffer;
-class CbValue;
+class TimeSpan;
 
 class DateTime
 {
@@ -58,7 +59,11 @@ public:
 	void GetDate(int& Year, int& Month, int& Day) const;
 
 	inline bool operator==(const DateTime& Rhs) const { return Ticks == Rhs.Ticks; }
-	inline auto operator<=>(const DateTime& Rhs) const { return Ticks - Rhs.Ticks; }
+	inline auto operator<=>(const DateTime& Rhs) const = default;
+
+	friend inline TimeSpan operator-(const DateTime& Lhs, const DateTime& Rhs);
+	friend inline DateTime operator+(const DateTime& Lhs, const TimeSpan& Rhs);
+	friend inline DateTime operator+(const TimeSpan& Lhs, const DateTime& Rhs);
 
 	std::string ToString(const char* Format) const;
 	std::string ToIso8601() const;
@@ -78,7 +83,7 @@ public:
 
 	inline uint64_t GetTicks() const { return Ticks; }
 	inline bool		operator==(const TimeSpan& Rhs) const { return Ticks == Rhs.Ticks; }
-	inline auto		operator<=>(const TimeSpan& Rhs) const { return Ticks - Rhs.Ticks; }
+	inline auto		operator<=>(const TimeSpan& Rhs) const = default;
 
 	/**
 	 * Time span related constants.
@@ -136,12 +141,33 @@ public:
 	ZENCORE_API std::string ToString(const char* Format) const;
 	ZENCORE_API std::string ToString() const;
 
+	friend inline DateTime operator+(const DateTime& Lhs, const TimeSpan& Rhs);
+	friend inline DateTime operator+(const TimeSpan& Lhs, const DateTime& Rhs);
+
 private:
 	void Set(int Days, int Hours, int Minutes, int Seconds, int FractionNano);
 
 	uint64_t Ticks;
 };
 
+inline TimeSpan
+operator-(const DateTime& Lhs, const DateTime& Rhs)
+{
+	return TimeSpan(Lhs.Ticks - Rhs.Ticks);
+}
+
+inline DateTime
+operator+(const DateTime& Lhs, const TimeSpan& Rhs)
+{
+	return DateTime(Lhs.Ticks + Rhs.Ticks);
+}
+
+inline DateTime
+operator+(const TimeSpan& Lhs, const DateTime& Rhs)
+{
+	return DateTime(Lhs.Ticks + Rhs.Ticks);
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 /**