getlog: Switch interval to (since; until]

silicon-heaven · Oct 22, 2024 · 6a21aad · 6a21aad
1 parent fd0a642
commit 6a21aad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/libshvcore/src/utils/getlog.cpp b/libshvcore/src/utils/getlog.cpp
@@ -171,7 +171,7 @@ template <LogReader Type>
 				continue;
 			}
 
-			if (ctx.params.isSinceLast() || entry.epochMsec < params_since_msec) {
+			if (ctx.params.isSinceLast() || entry.epochMsec <= params_since_msec) {
 				logDGetLog() << "\t saving SNAPSHOT entry:" << entry.toRpcValueMap().toCpon();
 				AbstractShvJournal::addToSnapshot(snapshot, entry);
 			}
@@ -181,7 +181,7 @@ template <LogReader Type>
 				goto exit_nested_loop;
 			}
 
-			if (entry.epochMsec >= params_since_msec && !ctx.params.isSinceLast()) {
+			if (entry.epochMsec > params_since_msec && !ctx.params.isSinceLast()) {
 				if ((static_cast<int>(snapshot.keyvals.size()) + record_count + 1) > ctx.params.recordCountLimit) {
 					log_header.setRecordCountLimitHit(true);
 					if (last_entry.has_value() && entry.dateTime() != last_entry->dateTime()) {

diff --git a/libshvcore/tests/test_getlog.cpp b/libshvcore/tests/test_getlog.cpp
@@ -138,7 +138,6 @@ DOCTEST_TEST_CASE("getLog")
 			DOCTEST_SUBCASE("since")
 			{
 				expected_timestamps = {
-					"2022-07-07T18:06:17.872Z",
 					"2022-07-07T18:06:17.874Z",
 					"2022-07-07T18:06:17.880Z",
 				};
@@ -356,7 +355,6 @@ DOCTEST_TEST_CASE("getLog")
 			{
 				get_log_params.since = RpcValue::DateTime::fromUtcString("2022-07-07T18:06:17.800");
 				expected_entries = {
-					make_entry("2022-07-07T18:06:17.800Z", "value3", 200, false),
 					make_entry("2022-07-07T18:06:17.950Z", "value2", 10, false),
 				};
 			}
@@ -399,8 +397,7 @@ DOCTEST_TEST_CASE("getLog")
 					expected_entries = {
 						make_entry("2022-07-07T18:06:17.800Z", "value1", 0, true),
 						make_entry("2022-07-07T18:06:17.800Z", "value2", 1, true),
-						make_entry("2022-07-07T18:06:17.800Z", "value3", 3, true),
-						make_entry("2022-07-07T18:06:17.800Z", "value3", 200, false),
+						make_entry("2022-07-07T18:06:17.800Z", "value3", 200, true),
 						make_entry("2022-07-07T18:06:17.950", "value2", 10, false),
 					};
 				}
@@ -415,7 +412,7 @@ DOCTEST_TEST_CASE("getLog")
 				expected_entries = {
 					make_entry("2022-07-07T18:06:17.800Z", "value1", 0, true),
 					make_entry("2022-07-07T18:06:17.800Z", "value2", 1, true),
-					make_entry("2022-07-07T18:06:17.800Z", "value3", 3, true),
+					make_entry("2022-07-07T18:06:17.800Z", "value3", 200, true),
 				};
 			}