From 1da33c44232e600be558a3f6003666c20f83ec34 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 10 Apr 2018 15:24:03 +0300
Subject: [PATCH] MXS-1625 Remove RWS RouteInfo

Now uses the one in QueryClassifier directly.
---
 .../routing/readwritesplit/readwritesplit.cc   |  1 -
 .../routing/readwritesplit/routeinfo.hh        | 18 ------------------
 .../readwritesplit/rwsplit_route_stmt.cc       |  8 +++-----
 .../routing/readwritesplit/rwsplitsession.cc   |  5 ++---
 .../routing/readwritesplit/rwsplitsession.hh   |  3 +--
 5 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 server/modules/routing/readwritesplit/routeinfo.hh

diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc
index 8b520add1..7de26169d 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@@ -33,7 +33,6 @@
 #include <maxscale/mysql_utils.h>
 
 #include "rwsplitsession.hh"
-#include "routeinfo.hh"
 
 using namespace maxscale;
 
diff --git a/server/modules/routing/readwritesplit/routeinfo.hh b/server/modules/routing/readwritesplit/routeinfo.hh
deleted file mode 100644
index fa6b5800e..000000000
--- a/server/modules/routing/readwritesplit/routeinfo.hh
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-/*
- * Copyright (c) 2016 MariaDB Corporation Ab
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
- *
- * Change Date: 2020-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2 or later of the General
- * Public License.
- */
-
-#include "readwritesplit.hh"
-#include <maxscale/queryclassifier.hh>
-
-typedef maxscale::QueryClassifier::RouteInfo RouteInfo;
diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
index 5e5a4063f..f155fc999 100644
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@@ -28,8 +28,6 @@
 #include <maxscale/session_command.hh>
 #include <maxscale/utils.hh>
 
-#include "routeinfo.hh"
-
 using namespace maxscale;
 
 /**
@@ -140,16 +138,16 @@ void RWSplitSession::retry_query(GWBUF* querybuf)
 /**
  * Routing function. Find out query type, backend type, and target DCB(s).
  * Then route query to found target(s).
- * @param inst      router instance
- * @param rses      router session
  * @param querybuf  GWBUF including the query
  *
  * @return true if routing succeed or if it failed due to unsupported query.
  * false if backend failure was encountered.
  */
-bool RWSplitSession::route_single_stmt(GWBUF *querybuf, const RouteInfo& info)
+bool RWSplitSession::route_single_stmt(GWBUF *querybuf)
 {
     bool succp = false;
+
+    const QueryClassifier::RouteInfo& info = m_qc.current_route_info();
     uint32_t stmt_id = info.stmt_id();
     uint8_t command = info.command();
     uint32_t qtype = info.type_mask();
diff --git a/server/modules/routing/readwritesplit/rwsplitsession.cc b/server/modules/routing/readwritesplit/rwsplitsession.cc
index 0b77a5b11..f9f0dd67f 100644
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@@ -12,7 +12,6 @@
  */
 
 #include "rwsplitsession.hh"
-#include "routeinfo.hh"
 
 #include <cmath>
 
@@ -138,10 +137,10 @@ int32_t RWSplitSession::routeQuery(GWBUF* querybuf)
             current_target = QueryClassifier::CURRENT_TARGET_SLAVE;
         }
 
-        RouteInfo info = m_qc.update_route_info(current_target, querybuf);
+        m_qc.update_route_info(current_target, querybuf);
 
         /** No active or pending queries */
-        if (route_single_stmt(querybuf, info))
+        if (route_single_stmt(querybuf))
         {
             rval = 1;
         }
diff --git a/server/modules/routing/readwritesplit/rwsplitsession.hh b/server/modules/routing/readwritesplit/rwsplitsession.hh
index bd9cdf78d..7d9a78305 100644
--- a/server/modules/routing/readwritesplit/rwsplitsession.hh
+++ b/server/modules/routing/readwritesplit/rwsplitsession.hh
@@ -15,7 +15,6 @@
 #include "readwritesplit.hh"
 #include "rwsplit_ps.hh"
 #include "rwbackend.hh"
-#include "routeinfo.hh"
 
 #include <string>
 
@@ -147,7 +146,7 @@ private:
     void purge_history(mxs::SSessionCommand& sescmd);
 
     bool route_session_write(GWBUF *querybuf, uint8_t command, uint32_t type);
-    bool route_single_stmt(GWBUF *querybuf, const RouteInfo& info);
+    bool route_single_stmt(GWBUF *querybuf);
     bool route_stored_query();
 
     mxs::SRWBackend get_hinted_backend(char *name);