From 739b87c15428d1d26ec0160444b7b693543772c2 Mon Sep 17 00:00:00 2001
From: Jake Heinz <jh@discordapp.com>
Date: Thu, 26 May 2022 22:00:38 +0000
Subject: [PATCH] [datatype] fix equals method for udt datatypes across schema
 upgrades

Cherry-picked from #datastax/a5a34fb7e1bddab1456829acdb58eab4178d2060
---
 src/data_type.hpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/data_type.hpp b/src/data_type.hpp
index 0e4258403..ba3e8b219 100644
--- a/src/data_type.hpp
+++ b/src/data_type.hpp
@@ -28,6 +28,8 @@
 #include "types.hpp"
 #include "vector.hpp"
 
+#include <algorithm>
+
 namespace datastax { namespace internal { namespace core {
 
 class Collection;
@@ -365,11 +367,15 @@ class UserType : public DataType {
       return false;
     }
 
-    if (fields_.size() != user_type->fields_.size()) {
-      return false;
-    }
 
-    for (size_t i = 0; i < fields_.size(); ++i) {
+    // UDT's can be considered equal as long as the mutual first fields shared
+    // between them are equal. UDT's are append only as far as fields go, so a
+    // newer 'version' of the UDT data type after a schema change event should be
+    // treated as equivalent in this scenario, by simply looking at the first N
+    // mutual fields they should share.
+    size_t min_fields_size = std::min(fields_.size(), user_type->fields_.size());
+
+    for (size_t i = 0; i < min_fields_size; ++i) {
       if (fields_[i].name != user_type->fields_[i].name ||
           !fields_[i].type->equals(user_type->fields_[i].type)) {
         return false;