MXS-2020 Remove maxscale/debug.h

- Removed from all files.
- maxbase/assert.h included where necessary.

avro/maxavro.c

@@ -15,6 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro_internal.h"
+#include <maxbase/assert.h>
 #include <maxscale/log.h>
 #include <errno.h>
 

avro/maxavro_file.c

@@ -14,6 +14,7 @@
 #include "maxavro_internal.h"
 #include <errno.h>
 #include <string.h>
+#include <maxbase/assert.h>
 #include <maxscale/log.h>
 #include <zlib.h>
 

avro/maxavro_record.c

@@ -14,7 +14,7 @@
 #include <maxscale/cdefs.h>
 #include "maxavro_internal.h"
 #include <string.h>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/log.h>
 #include <errno.h>
 

avro/maxavro_schema.c

@@ -14,7 +14,7 @@
 #include "maxavro_internal.h"
 #include <jansson.h>
 #include <string.h>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/log.h>
 
 static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] =

avro/maxavrocheck.c

@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <getopt.h>
-#include <maxscale/debug.h>
 
 static int verbose = 0;
 static uint64_t seekto = 0;

include/maxscale/buffer.h

@@ -28,7 +28,6 @@
 
 #include <maxscale/cdefs.h>
 #include <string.h>
-#include <maxscale/debug.h>
 #include <maxscale/hint.h>
 #include <maxscale/spinlock.h>
 #include <stdint.h>

include/maxscale/buffer.hh

@@ -17,6 +17,7 @@
 #include <iterator>
 #include <new>
 #include <vector>
+#include <maxbase/assert.h>
 #include <maxscale/buffer.h>
 
 namespace maxscale

include/maxscale/dcb.h

@@ -21,6 +21,7 @@
 #include <maxbase/poll.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/buffer.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/protocol.h>
 #include <maxscale/spinlock.h>

include/maxscale/debug.h

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2018 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: 2022-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.
- */
- #pragma once
-
-#include <maxscale/cdefs.h>
-#include <maxbase/assert.h>
-#include <maxscale/log.h>
-
-MXS_BEGIN_DECLS
-
-MXS_END_DECLS

include/maxscale/hint.h

@@ -17,7 +17,6 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/http.hh

@@ -17,8 +17,6 @@
 #include <string>
 #include <time.h>
 
-#include <maxscale/debug.h>
-
 /**
  * @brief Return the current HTTP-date
  *

include/maxscale/jansson.hh

@@ -18,9 +18,9 @@
 #include <sstream>
 #include <string>
 
+#include <maxbase/assert.h>
 #include <maxbase/jansson.h>
 #include <maxscale/alloc.h>
-#include <maxscale/debug.h>
 
 namespace std
 {

include/maxscale/modinfo.h

@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/spinlock.h

@@ -25,7 +25,6 @@
 
 #include <maxscale/cdefs.h>
 #include <stdbool.h>
-#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -60,7 +60,7 @@
 
 #include <pthread.h>
 
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>

query_classifier/qc_sqlite/builtin_functions.c

@@ -14,7 +14,7 @@
 #include "builtin_functions.h"
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 
 static struct
 {

server/core/admin.cc

@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 
 #include <maxbase/atomic.h>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/utils.h>
 #include <maxscale/config.h>
 #include <maxscale/clock.h>

server/core/backend.cc

@@ -16,7 +16,6 @@
 #include <sstream>
 
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/debug.h>
 
 using namespace maxscale;
 

server/core/buffer.cc

@@ -17,12 +17,12 @@
 #include <stdlib.h>
 #include <sstream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/assert.h>
 #include <maxbase/atomic.h>
-#include <maxscale/debug.h>
-#include <maxscale/spinlock.h>
+#include <maxscale/alloc.h>
 #include <maxscale/hint.h>
 #include <maxscale/log.h>
+#include <maxscale/spinlock.h>
 #include <maxscale/utils.h>
 
 #if defined(BUFFER_TRACE)

server/core/event.cc

@@ -14,8 +14,8 @@
 #include "internal/event.hh"
 #include <algorithm>
 #include <string.h>
+#include <maxbase/assert.h>
 #include <maxbase/atomic.h>
-#include <maxscale/debug.h>
 
 using namespace std;
 

server/core/externcmd.cc

@@ -21,8 +21,8 @@
 #include <string>
 #include <thread>
 
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/debug.h>
 #include <maxscale/log.h>
 #include <maxscale/pcre2.h>
 

server/core/hint.cc

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <maxbase/assert.h>
 #include <maxscale/hint.h>
 #include <maxscale/alloc.h>
 

server/core/internal/modules.h

@@ -19,7 +19,6 @@
 #include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

server/core/log.cc

@@ -22,7 +22,6 @@
 #include <maxbase/logger.hh>
 
 #include <maxscale/config.h>
-#include <maxscale/debug.h>
 #include <maxscale/json_api.h>
 #include <maxscale/session.h>
 

server/core/mariadb.cc

@@ -12,7 +12,7 @@
  */
 
 #include <maxscale/mariadb.hh>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 
 namespace
 {

server/core/maxscale_pcre2.cc

@@ -25,8 +25,8 @@
  */
 
 #include <maxscale/pcre2.h>
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/debug.h>
 #include <maxscale/log.h>
 
 /**

server/core/mysql_binlog.cc

@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <maxscale/log.h>
 #include <string.h>
-#include <maxscale/debug.h>
 #include <maxscale/users.h>
 #include <strings.h>
 #include <math.h>

server/core/mysql_utils.cc

@@ -29,7 +29,6 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
-#include <maxscale/debug.h>
 #include <maxscale/log.h>
 
 namespace

server/core/spinlock.cc

@@ -12,9 +12,9 @@
  */
 
 #include <maxscale/spinlock.h>
+#include <maxbase/assert.h>
 #include <maxbase/atomic.h>
 #include <time.h>
-#include <maxscale/debug.h>
 
 
 void spinlock_init(SPINLOCK *lock)

server/core/statistics.cc

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
-#include <maxscale/debug.h>
+#include <maxscale/log.h>
 #include <maxscale/utils.h>
 
 static int thread_count = 0;

server/core/test/test_atomic.cc

@@ -16,8 +16,8 @@
 #include <stdio.h>
 #include <thread>
 
+#include <maxbase/assert.h>
 #include <maxbase/atomic.h>
-#include <maxscale/debug.h>
 
 
 #define NTHR 10

server/core/test/test_buffer.cc

@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/hint.h>

server/core/test/test_event.cc

@@ -20,7 +20,7 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/log.h>
 
 using namespace maxscale;

server/core/test/test_hint.cc

@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <maxbase/assert.h>
 #include <maxscale/hint.h>
 #include <maxscale/alloc.h>
 

server/core/test/test_http.cc

@@ -13,7 +13,7 @@
 
 #include <iostream>
 
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/http.hh>
 
 using std::string;

server/core/test/test_json.cc

@@ -15,7 +15,6 @@
 
 #include <string>
 
-#include <maxscale/debug.h>
 #include <maxscale/jansson.hh>
 #include <maxscale/json_api.h>
 

server/core/test/test_log.cc

@@ -19,9 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log.h>
-#include <maxscale/debug.h>
 
 static void skygw_log_enable(int priority)
 {

server/core/test/test_logorder.cc

@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/debug.h>
 #include <maxscale/log.h>
 
 static void skygw_log_enable(int priority)

server/core/test/test_maxscalepcre2.cc

@@ -35,7 +35,6 @@
 #include <string.h>
 #include <maxscale/alloc.h>
 #include <maxscale/pcre2.h>
-#include <maxscale/debug.h>
 
 #define test_assert(a, b) if(!(a)){fprintf(stderr, b);return 1;}
 

server/core/test/test_utils.cc

@@ -11,6 +11,7 @@
  * Public License.
  */
 
+#include <maxbase/assert.h>
 #include <maxscale/utils.h>
 #include <maxscale/utils.hh>
 #include <string.h>

server/modules/filter/cache/cache_storage_api.h

@@ -18,7 +18,6 @@
 #include <jansson.h>
 #include <maxscale/buffer.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/debug.h>
 
 MXS_BEGIN_DECLS
 

server/modules/filter/cache/test/testrules.cc

@@ -26,7 +26,7 @@ using namespace std;
 #if !defined(SS_DEBUG)
 #define SS_DEBUG
 #endif
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 
 GWBUF* create_gwbuf(const char* s)
 {

server/modules/filter/dbfwfilter/test/tempfile.cc

@@ -14,7 +14,7 @@
 #include "tempfile.hh"
 #include <string.h>
 #include <unistd.h>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 
 namespace
 {

server/modules/filter/masking/maskingrules.cc

@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <functional>
 #include <string.h>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/jansson.hh>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/pcre2.hh>

server/modules/filter/masking/test/testrules.cc

@@ -14,7 +14,7 @@
 #define TESTING_MASKINGRULES
 #include "maskingrules.hh"
 #include <iostream>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 
 using namespace std;
 

server/modules/filter/maxrows/maxrows.cc

@@ -22,9 +22,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/debug.h>
 #include <maxscale/filter.h>
 #include <maxscale/log.h>
 #include <maxscale/modinfo.h>

server/modules/monitor/auroramon/auroramon.cc

@@ -20,7 +20,7 @@
 #include "auroramon.hh"
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.h>
 

server/modules/monitor/mariadbmon/gtid.cc

@@ -15,7 +15,7 @@
 
 #include <algorithm>
 #include <sstream>
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 
 using std::string;
 
@@ -234,4 +234,4 @@ Gtid GtidList::get_gtid(uint32_t domain) const
         rval = *found;
     }
     return rval;
-}
+}

server/modules/monitor/mariadbmon/mariadbmon.cc

@@ -17,9 +17,9 @@
 #include "mariadbmon.hh"
 #include <inttypes.h>
 #include <sstream>
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/debug.h>
 #include <maxscale/modulecmd.h>
 
 #include <maxscale/mysql_utils.h>

server/modules/routing/avrorouter/avro_converter.cc

@@ -15,8 +15,8 @@
 
 #include <limits.h>
 
+#include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/debug.h>
 #include <maxscale/log.h>
 
 /**

server/modules/routing/avrorouter/avro_schema.cc

@@ -25,7 +25,6 @@
 #include <maxscale/log.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <maxscale/debug.h>
 #include <string.h>
 #include <strings.h>
 #include <maxscale/alloc.h>

server/modules/routing/avrorouter/rpl.cc

@@ -17,7 +17,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include <maxscale/debug.h>
+#include <maxbase/assert.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/protocol/mysql.h>