commit 4baadce2ce6c2569f3cfc52dd635cb2b14636f5d
author Austin Schuh <austin.linux@gmail.com> Tue Oct 12 19:31:21 2021 -0700
committer Gerrit Code Review <gerrit@software.frc971.org> Tue Oct 12 19:31:21 2021 -0700
tree 05848a6f4d761ea68596d4ae23d12b0501363086
parent 5ad5a98e6fe700191fcf2c6320aade7f85e33d26
parent 4a5f5d27985eceac0df567725da746a05b5029e7

Merge "Fix merging schemas in aos configs"

aos/configuration.cc

diff --git a/aos/configuration.cc b/aos/configuration.cc
index 314f82f..97f4d4b 100644
--- a/aos/configuration.cc
+++ b/aos/configuration.cc
@@ -534,6 +534,10 @@
       auto result = channels.insert(RecursiveCopyFlatBuffer(c));
       if (!result.second) {
         // Already there, so merge the new table into the original.
+        // Schemas merge poorly, so pick the newest one.
+        if (result.first->message().has_schema() && c->has_schema()) {
+          result.first->mutable_message()->clear_schema();
+        }
         auto merged =
             MergeFlatBuffers(*result.first, RecursiveCopyFlatBuffer(c));
 

aos/flatbuffer_merge.cc

diff --git a/aos/flatbuffer_merge.cc b/aos/flatbuffer_merge.cc
index 18a190f..17f4468 100644
--- a/aos/flatbuffer_merge.cc
+++ b/aos/flatbuffer_merge.cc
@@ -38,9 +38,9 @@
   const bool t2_has = val2 != nullptr;
 
   if (t2_has) {
-    fbb->AddElement<T>(field_offset, flatbuffers::ReadScalar<T>(val2), 0);
+    fbb->AddElement<T>(field_offset, flatbuffers::ReadScalar<T>(val2));
   } else if (t1_has) {
-    fbb->AddElement<T>(field_offset, flatbuffers::ReadScalar<T>(val1), 0);
+    fbb->AddElement<T>(field_offset, flatbuffers::ReadScalar<T>(val1));
   }
 }
 

aos/flatbuffer_merge_test.cc

diff --git a/aos/flatbuffer_merge_test.cc b/aos/flatbuffer_merge_test.cc
index 4162edc..81aa2e1 100644
--- a/aos/flatbuffer_merge_test.cc
+++ b/aos/flatbuffer_merge_test.cc
@@ -258,6 +258,28 @@
     }
 
     {
+      flatbuffers::FlatBufferBuilder aos_flatbuffer_copy_fbb;
+      aos_flatbuffer_copy_fbb.ForceDefaults(false);
+
+      LOG(INFO) << "Copying without defaults " << in1 << " "
+                << absl::BytesToHexString(FromFbb(fb1)) << " at "
+                << reinterpret_cast<const void *>(fb1.span().data()) << " size "
+                << fb1.span().size();
+      aos_flatbuffer_copy_fbb.Finish(CopyFlatBuffer<Configuration>(
+          &fb1.message(), &aos_flatbuffer_copy_fbb));
+
+      const aos::FlatbufferDetachedBuffer<Configuration> fb_copy(
+          aos_flatbuffer_copy_fbb.Release());
+      ASSERT_NE(fb_copy.span().size(), 0u);
+
+      EXPECT_TRUE(fb1.Verify());
+
+      ASSERT_TRUE(fb_copy.Verify()) << in1;
+
+      EXPECT_EQ(in1, FlatbufferToJson(fb_copy));
+    }
+
+    {
       flatbuffers::FlatBufferBuilder aos_flatbuffer_copy_message_ptr_fbb;
       aos_flatbuffer_copy_message_ptr_fbb.ForceDefaults(true);