FIX: Fix setting ts_event during DBNv2 upgrade

Author: threecgreen

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.17.1 - TBD
+
+### Bug fixes
+- Added missing copying of `ts_event` when upgrading structs from DBNv1 to DBNv2
+- Fixed setting of compiler warnings and warnings that had accumulated
+
 ## 0.17.0 - 2024-04-01
 
 ### Enhancements

CMakeLists.txt

@@ -102,7 +102,7 @@ message(STATUS "Added all header and implementation files.")
 
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
 include(cmake/CompilerWarnings.cmake)
-set_project_warnings(${PROJECT_NAME})
+set_target_warnings(${PROJECT_NAME})
 include(cmake/Sanitizers.cmake)
 
 # Ensure std::string debug info is included

cmake/CompilerWarnings.cmake

@@ -1,10 +1,9 @@
 # from here:
 #
-# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Avai
-# lable.md
+# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
 # Courtesy of Jason Turner
 
-function(set_project_warnings project_name)
+function(set_target_warnings target)
   set(MSVC_WARNINGS
       /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss
               # of data
@@ -89,9 +88,5 @@ function(set_project_warnings project_name)
     message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
   endif()
 
-  add_compile_options(${PROJECT_WARNINGS})
-
-  if(NOT TARGET ${project_name})
-    message(AUTHOR_WARNING "${project_name} is not a target, thus no compiler warning were added.")
-  endif()
+  target_compile_options(${target} PRIVATE ${PROJECT_WARNINGS})
 endfunction()

cmake/Utils.cmake

@@ -55,4 +55,5 @@ function(add_example_target name file)
       databento::databento
   )
   target_compile_features(${name} PUBLIC cxx_std_11)
+  set_target_warnings(${name})
 endfunction()

src/compat.cpp

@@ -11,7 +11,8 @@ namespace databento {
 InstrumentDefMsgV2 InstrumentDefMsgV1::ToV2() const {
   InstrumentDefMsgV2 ret{
       RecordHeader{sizeof(InstrumentDefMsgV2) / RecordHeader::kLengthMultiplier,
-                   RType::InstrumentDef, hd.publisher_id, hd.instrument_id},
+                   RType::InstrumentDef, hd.publisher_id, hd.instrument_id,
+                   hd.ts_event},
       ts_recv,
       min_price_increment,
       display_factor,
@@ -72,7 +73,7 @@ InstrumentDefMsgV2 InstrumentDefMsgV1::ToV2() const {
       contract_multiplier_unit,
       flow_schedule_type,
       tick_rule,
-  };
+      {}};
   std::copy(currency.begin(), currency.end(), ret.currency.begin());
   std::copy(settl_currency.begin(), settl_currency.end(),
             ret.settl_currency.begin());
@@ -95,7 +96,8 @@ InstrumentDefMsgV2 InstrumentDefMsgV1::ToV2() const {
 ErrorMsgV2 ErrorMsgV1::ToV2() const {
   ErrorMsgV2 ret{
       RecordHeader{sizeof(ErrorMsgV2) / RecordHeader::kLengthMultiplier,
-                   RType::Error, hd.publisher_id, hd.instrument_id},
+                   RType::Error, hd.publisher_id, hd.instrument_id,
+                   hd.ts_event},
       {},
       std::numeric_limits<std::uint8_t>::max(),
       std::numeric_limits<std::uint8_t>::max()};
@@ -106,7 +108,8 @@ ErrorMsgV2 ErrorMsgV1::ToV2() const {
 SymbolMappingMsgV2 SymbolMappingMsgV1::ToV2() const {
   SymbolMappingMsgV2 ret{
       RecordHeader{sizeof(SymbolMappingMsgV2) / RecordHeader::kLengthMultiplier,
-                   RType::SymbolMapping, hd.publisher_id, hd.instrument_id},
+                   RType::SymbolMapping, hd.publisher_id, hd.instrument_id,
+                   hd.ts_event},
       // invalid
       static_cast<SType>(std::numeric_limits<std::uint8_t>::max()),
       {},
@@ -125,7 +128,8 @@ SymbolMappingMsgV2 SymbolMappingMsgV1::ToV2() const {
 SystemMsgV2 SystemMsgV1::ToV2() const {
   SystemMsgV2 ret{
       RecordHeader{sizeof(SystemMsgV2) / RecordHeader::kLengthMultiplier,
-                   RType::System, hd.publisher_id, hd.instrument_id},
+                   RType::System, hd.publisher_id, hd.instrument_id,
+                   hd.ts_event},
       {},
       std::numeric_limits<std::uint8_t>::max()};
   std::copy(msg.begin(), msg.end(), ret.msg.begin());

src/dbn_decoder.cpp

@@ -52,12 +52,12 @@ std::string Consume(std::vector<std::uint8_t>::const_iterator& byte_it,
                     const std::ptrdiff_t num_bytes, const char* context) {
   const auto cstr = Consume(byte_it, num_bytes);
   // strnlen isn't portable
-  const std::size_t str_len = std::find(cstr, cstr + num_bytes, '\0') - cstr;
+  const auto str_len = std::find(cstr, cstr + num_bytes, '\0') - cstr;
   if (str_len == num_bytes) {
     throw databento::DbnResponseError{std::string{"Invalid "} + context +
                                       " missing null terminator"};
   }
-  return std::string{cstr, str_len};
+  return std::string{cstr, static_cast<std::size_t>(str_len)};
 }
 }  // namespace
 

test/src/dbn_decoder_tests.cpp

@@ -157,13 +157,17 @@ TEST_F(DbnDecoderTests, TestUpgradeSymbolMappingWithTsOut) {
       DbnDecoder::DecodeRecordCompat(1, VersionUpgradePolicy::Upgrade, true,
                                      &compat_buffer, Record{&orig.rec.hd});
   const auto& upgraded = res.Get<WithTsOut<SymbolMappingMsgV2>>();
-  ASSERT_EQ(orig.ts_out, upgraded.ts_out);
-  ASSERT_STREQ(orig.rec.STypeInSymbol(), upgraded.rec.STypeInSymbol());
-  ASSERT_STREQ(orig.rec.STypeOutSymbol(), upgraded.rec.STypeOutSymbol());
+  EXPECT_EQ(orig.rec.hd.rtype, upgraded.rec.hd.rtype);
+  EXPECT_EQ(orig.rec.hd.instrument_id, upgraded.rec.hd.instrument_id);
+  EXPECT_EQ(orig.rec.hd.publisher_id, upgraded.rec.hd.publisher_id);
+  EXPECT_EQ(orig.rec.hd.ts_event, upgraded.rec.hd.ts_event);
+  EXPECT_EQ(orig.ts_out, upgraded.ts_out);
+  EXPECT_STREQ(orig.rec.STypeInSymbol(), upgraded.rec.STypeInSymbol());
+  EXPECT_STREQ(orig.rec.STypeOutSymbol(), upgraded.rec.STypeOutSymbol());
   // `length` properly set
-  ASSERT_EQ(upgraded.rec.hd.Size(), sizeof(upgraded));
+  EXPECT_EQ(upgraded.rec.hd.Size(), sizeof(upgraded));
   // used compat buffer
-  ASSERT_EQ(reinterpret_cast<const std::uint8_t*>(&upgraded),
+  EXPECT_EQ(reinterpret_cast<const std::uint8_t*>(&upgraded),
             compat_buffer.data());
 }