From a02bc3d40b5b290b01c02c77b504a9bf9df7a649 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 8 Aug 2017 09:30:57 +0300
Subject: [PATCH] MXS-1348 Treat usage differences as non-fatal

In the context of subselects and CTEs it is somewhat difficult to
make qc_sqlite and qc_mysqlembedded to agree upon in what context
a particular field is used. As that information is not used anywhere,
a usage discrepancy is for now treated as a warning.
---
 query_classifier/test/compare.cc | 77 +++++++++++++++++---------------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc
index 3f6536612..ef0452768 100644
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@@ -909,6 +909,43 @@ public:
         return rv;
     }
 
+    bool has_same_name(const QcFieldInfo& o) const
+    {
+        return
+            m_database == o.m_database &&
+            m_table == o.m_table &&
+            m_column == o.m_column;
+    }
+
+    static bool at_most_usage_differs(const std::set<QcFieldInfo>& l,
+                                      const std::set<QcFieldInfo>& r)
+    {
+        bool rv = false;
+
+        if (l.size() == r.size())
+        {
+            rv = true;
+
+            std::set<QcFieldInfo>::iterator i = l.begin();
+            std::set<QcFieldInfo>::iterator j = r.begin();
+
+            while (rv && (i != l.end()))
+            {
+                if (!i->has_same_name(*j))
+                {
+                    rv = false;
+                }
+                else
+                {
+                    ++i;
+                    ++j;
+                }
+            }
+        }
+
+        return rv;
+    }
+
     void print(ostream& out) const
     {
         if (!m_database.empty())
@@ -972,41 +1009,6 @@ bool operator == (const QcFieldInfo& lhs, const QcFieldInfo& rhs)
     return lhs.eq(rhs);
 }
 
-bool are_equal(const QC_FIELD_INFO* fields1, size_t n_fields1,
-               const QC_FIELD_INFO* fields2, size_t n_fields2)
-{
-    bool rv = (n_fields1 == n_fields2);
-
-    if (rv)
-    {
-
-        size_t i = 0;
-        while (rv && (i < n_fields1))
-        {
-            rv = *fields1 == *fields2;
-            ++i;
-        }
-    }
-
-    return rv;
-}
-
-ostream& print(ostream& out, const QC_FIELD_INFO* fields, size_t n_fields)
-{
-    size_t i = 0;
-    while (i < n_fields)
-    {
-        out << fields[i++];
-
-        if (i != n_fields)
-        {
-            out << " ";
-        }
-    }
-
-    return out;
-}
-
 bool compare_get_field_info(QUERY_CLASSIFIER* pClassifier1, GWBUF* pCopy1,
                             QUERY_CLASSIFIER* pClassifier2, GWBUF* pCopy2)
 {
@@ -1038,6 +1040,11 @@ bool compare_get_field_info(QUERY_CLASSIFIER* pClassifier1, GWBUF* pCopy1,
         ss << f1;
         success = true;
     }
+    else if (QcFieldInfo::at_most_usage_differs(f1, f2))
+    {
+        ss << "WRN: " << f1 << " != " << f2;
+        success = true;
+    }
     else
     {
         ss << "ERR: " << f1 << " != " << f2;