From 1fdc1513b53b12586f0f21f71fdc5acf878b0674 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 7 Feb 2023 16:30:57 +0000
Subject: Clean up unused storageframework time related code

---
 .../src/tests/storageframework/clock/timetest.cpp  | 11 ++------
 .../vespa/storageframework/generic/clock/time.h    | 30 ++--------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

(limited to 'storage')

diff --git a/storage/src/tests/storageframework/clock/timetest.cpp b/storage/src/tests/storageframework/clock/timetest.cpp
index e1270156aa0..9dbcdd409d8 100644
--- a/storage/src/tests/storageframework/clock/timetest.cpp
+++ b/storage/src/tests/storageframework/clock/timetest.cpp
@@ -8,16 +8,12 @@ namespace storage::framework::defaultimplementation {
 
 TEST(TimeTest, testBasics)
 {
-    SecondTime timeSec(1);
 
-    MilliSecTime timeMillis = timeSec.getMillis();
+    MilliSecTime timeMillis(1000);
     EXPECT_EQ(uint64_t(1000), timeMillis.getTime());
-    EXPECT_EQ(timeSec, timeMillis.getSeconds());
 
-    MicroSecTime timeMicros = timeSec.getMicros();
-    EXPECT_EQ(timeSec.getMicros(), timeMillis.getMicros());
+    MicroSecTime timeMicros = timeMillis.getMicros();
     EXPECT_EQ(timeMillis, timeMicros.getMillis());
-    EXPECT_EQ(timeSec, timeMicros.getSeconds());
 
     MicroSecTime timeMicros2 = timeMicros;
     EXPECT_EQ(timeMicros2, timeMicros);
@@ -32,7 +28,6 @@ TEST(TimeTest, testBasics)
     MilliSecTime timeMillis2 = timeMicros2.getMillis();
     EXPECT_GT(timeMillis2, timeMillis);
     EXPECT_EQ(uint64_t(1050), timeMillis2.getTime());
-    EXPECT_EQ(timeSec, timeMillis2.getSeconds());
 }
 
 TEST(TimeTest, testCreatedFromClock)
@@ -40,7 +35,6 @@ TEST(TimeTest, testCreatedFromClock)
     defaultimplementation::FakeClock clock;
     clock.setAbsoluteTimeInSeconds(600);
 
-    EXPECT_EQ(SecondTime(600), SecondTime(clock));
     EXPECT_EQ(MilliSecTime(600 * 1000), MilliSecTime(clock));
     EXPECT_EQ(MicroSecTime(600 * 1000 * 1000), MicroSecTime(clock));
 }
@@ -51,7 +45,6 @@ TEST(TimeTest, canAssignMicrosecondResolutionTimeToFakeClock)
     clock.setAbsoluteTimeInMicroSeconds(1234567); // 1.234567 seconds
 
     // All non-microsec time points must necessarily be truncated.
-    EXPECT_EQ(SecondTime(1), SecondTime(clock));
     EXPECT_EQ(MilliSecTime(1234), MilliSecTime(clock));
     EXPECT_EQ(MicroSecTime(1234567), MicroSecTime(clock));
 }
diff --git a/storage/src/vespa/storageframework/generic/clock/time.h b/storage/src/vespa/storageframework/generic/clock/time.h
index 372110a1374..882ff58fb74 100644
--- a/storage/src/vespa/storageframework/generic/clock/time.h
+++ b/storage/src/vespa/storageframework/generic/clock/time.h
@@ -10,8 +10,8 @@ namespace vespalib {
 
 namespace storage::framework {
 
-using MonotonicTimePoint = std::chrono::steady_clock::time_point;
-using MonotonicDuration = std::chrono::steady_clock::duration;
+using MonotonicTimePoint = vespalib::steady_time;
+using MonotonicDuration = vespalib::duration;
 
 struct Clock;
 
@@ -111,9 +111,6 @@ struct SecondTime : public Time<SecondTime, 1000000> {
     explicit SecondTime(uint64_t t = 0) : Time<SecondTime, 1000000>(t) {}
     explicit SecondTime(const Clock& clock)
         : Time<SecondTime, 1000000>(getRawMicroTime(clock) / 1000000) {}
-
-    [[nodiscard]] MilliSecTime getMillis() const;
-    [[nodiscard]] MicroSecTime getMicros() const;
 };
 
 /**
@@ -131,7 +128,6 @@ struct MilliSecTime : public Time<MilliSecTime, 1000> {
     explicit MilliSecTime(const Clock& clock)
         : Time<MilliSecTime, 1000>(getRawMicroTime(clock) / 1000) {}
 
-    [[nodiscard]] SecondTime getSeconds() const { return SecondTime(getTime() / 1000); }
     [[nodiscard]] MicroSecTime getMicros() const;
 };
 
@@ -154,14 +150,6 @@ struct MicroSecTime : public Time<MicroSecTime, 1> {
     [[nodiscard]] SecondTime getSeconds() const { return SecondTime(getTime() / 1000000); }
 };
 
-inline MilliSecTime SecondTime::getMillis() const {
-    return MilliSecTime(getTime() * 1000);
-}
-
-inline MicroSecTime SecondTime::getMicros() const {
-    return MicroSecTime(getTime() * 1000 * 1000);
-}
-
 inline MicroSecTime MilliSecTime::getMicros() const {
     return MicroSecTime(getTime() * 1000);
 }
@@ -180,13 +168,6 @@ operator + (MilliSecTime a, MilliSecTime b) {
     return result;
 }
 
-inline SecondTime
-operator + (SecondTime a, SecondTime b) {
-    SecondTime result(a);
-    result += b;
-    return result;
-}
-
 inline MicroSecTime
 operator - (MicroSecTime a, MicroSecTime b) {
     MicroSecTime result(a);
@@ -194,11 +175,4 @@ operator - (MicroSecTime a, MicroSecTime b) {
     return result;
 }
 
-inline SecondTime
-operator - (SecondTime a, SecondTime b) {
-    SecondTime result(a);
-    result -= b;
-    return result;
-}
-
 }
-- 
cgit v1.2.3