Skip to content

Commit 8b4caed

Browse files
marinesovitchmarinesovitch
committed
WL#11854: clean up stuff related to build options, obsolete xmysqlnd module
- remove obsolete build config options: experimental, messages - messages are always enabled - delete old unused module xmysqlnd (in the past there were two: mysqlx as api layer and xmyslnd as driver) - remove mysqli dependency
1 parent b9b82ce commit 8b4caed

File tree

9 files changed

+20
-394
lines changed

9 files changed

+20
-394
lines changed

‎config.m4

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
dnl Note: see README for build details
22

3-
PHP_ARG_ENABLE(mysql-xdevapi-experimental-features, whether to disable experimental features in mysql-xdevapi,
4-
[ --disable-mysql-xdevapi-experimental-features
5-
Disable support for the experimental features in mysql-xdevapi], yes, no)
6-
7-
PHP_ARG_ENABLE(mysql-xdevapi-message-classes, whether to enable the experimental message classes in mysql-xdevapi,
8-
[ --enable-mysql-xdevapi-message-classes
9-
Enable support for the experimental message classes in mysql-xdevapi], yes, no)
10-
113
PHP_ARG_WITH(boost, for boost install dir,
124
[ --with-boost[=DIR] Point out boost library])
135

@@ -22,10 +14,6 @@ dnl If some extension uses mysql-xdevapi it will get compiled in PHP core
2214
if test "$PHP_MYSQL_XDEVAPI" != "no" || test "$PHP_MYSQL_XDEVAPI_ENABLED" = "yes"; then
2315
PHP_REQUIRE_CXX
2416

25-
if test "$PHP_MYSQL_XDEVAPI_EXPERIMENTAL_FEATURES" != "no"; then
26-
AC_DEFINE([MYSQL_XDEVAPI_EXPERIMENTAL_FEATURES], 1, [Enable experimental features])
27-
fi
28-
2917
mysqlx_devapi_sources=" \
3018
mysqlx_base_result.cc \
3119
mysqlx_base_result_iterator.cc \
@@ -70,33 +58,27 @@ if test "$PHP_MYSQL_XDEVAPI" != "no" || test "$PHP_MYSQL_XDEVAPI_ENABLED" = "yes
7058
mysqlx_x_session.cc \
7159
php_mysqlx.cc \
7260
php_mysqlx_ex.cc \
73-
php_xmysqlnd.cc \
7461
"
7562

76-
mysqlx_messages=""
77-
if test "$PHP_MYSQL_XDEVAPI_MESSAGE_CLASSES" != "no" || test "$PHP_MYSQL_XDEVAPI_MESSAGE_CLASSES_ENABLED" = "yes"; then
78-
AC_DEFINE([MYSQL_XDEVAPI_MESSAGE_CLASSES], 1, [Enable message classes])
79-
80-
mysqlx_messages=" \
81-
messages/mysqlx_connection.cc \
82-
messages/mysqlx_message__auth_continue.cc \
83-
messages/mysqlx_message__auth_ok.cc \
84-
messages/mysqlx_message__auth_start.cc \
85-
messages/mysqlx_message__capabilities.cc \
86-
messages/mysqlx_message__capabilities_get.cc \
87-
messages/mysqlx_message__capabilities_set.cc \
88-
messages/mysqlx_message__capability.cc \
89-
messages/mysqlx_message__data_fetch_done.cc \
90-
messages/mysqlx_message__error.cc \
91-
messages/mysqlx_message__ok.cc \
92-
messages/mysqlx_message__stmt_execute.cc \
93-
messages/mysqlx_message__stmt_execute_ok.cc \
94-
messages/mysqlx_pfc.cc \
95-
messages/mysqlx_resultset__column_metadata.cc \
96-
messages/mysqlx_resultset__data_row.cc \
97-
messages/mysqlx_resultset__resultset_metadata.cc \
98-
"
99-
fi
63+
mysqlx_messages=" \
64+
messages/mysqlx_connection.cc \
65+
messages/mysqlx_message__auth_continue.cc \
66+
messages/mysqlx_message__auth_ok.cc \
67+
messages/mysqlx_message__auth_start.cc \
68+
messages/mysqlx_message__capabilities.cc \
69+
messages/mysqlx_message__capabilities_get.cc \
70+
messages/mysqlx_message__capabilities_set.cc \
71+
messages/mysqlx_message__capability.cc \
72+
messages/mysqlx_message__data_fetch_done.cc \
73+
messages/mysqlx_message__error.cc \
74+
messages/mysqlx_message__ok.cc \
75+
messages/mysqlx_message__stmt_execute.cc \
76+
messages/mysqlx_message__stmt_execute_ok.cc \
77+
messages/mysqlx_pfc.cc \
78+
messages/mysqlx_resultset__column_metadata.cc \
79+
messages/mysqlx_resultset__data_row.cc \
80+
messages/mysqlx_resultset__resultset_metadata.cc \
81+
"
10082

10183
mysqlx_util=" \
10284
util/allocator.cc \

‎config.w32

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ ARG_ENABLE("mysql-xdevapi",
77
"MySQL XDevAPI support | Hybrid Native Client Driver",
88
"no");
99

10-
ARG_ENABLE("mysql-xdevapi-experimental-features",
11-
"Disable support for the experimental features in mysql-xdevapi",
12-
"yes");
13-
14-
ARG_ENABLE("mysql-xdevapi-message-classes",
15-
"Enable support for the experimental message classes in mysql-xdevapi",
16-
"yes");
17-
1810
ARG_WITH("boost",
1911
"boost library install dir",
2012
"");
@@ -81,7 +73,6 @@ var mysqlx_devapi_sources = [
8173
"mysqlx_x_session.cc",
8274
"php_mysqlx.cc",
8375
"php_mysqlx_ex.cc",
84-
"php_xmysqlnd.cc"
8576
];
8677

8778
var mysqlx_messages = [
@@ -571,9 +562,7 @@ function get_preprocessor_definitions() {
571562
return [
572563
"/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1",
573564
"/D ZEND_WIN32_KEEP_INLINE",
574-
"/U ZEND_WIN32_FORCE_INLINE",
575-
cfg_preprocessor_def(PHP_MYSQL_XDEVAPI_MESSAGE_CLASSES, "MYSQL_XDEVAPI_MESSAGE_CLASSES"),
576-
cfg_preprocessor_def(PHP_MYSQL_XDEVAPI_EXPERIMENTAL_FEATURES, "MYSQL_XDEVAPI_EXPERIMENTAL_FEATURES")
565+
"/U ZEND_WIN32_FORCE_INLINE"
577566
].join(' ');
578567
}
579568

‎package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ The X DevAPI introduces a new, modern and easy-to-learn way to work with your da
167167
<file name="php_mysqlx.h" role="src" />
168168
<file name="php_mysqlx_ex.cc" role="src" />
169169
<file name="php_mysqlx_ex.h" role="src" />
170-
<file name="php_xmysqlnd.cc" role="src" />
171170
<file name="php_xmysqlnd.h" role="src" />
172171
<file name="product_data.txt" role="doc" />
173172
<file name="protobuf_api.h" role="src" />

‎php_mysqlx_ex.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ extern "C" {
5858
#include "mysqlx_object.h"
5959
#include "mysqlx_warning.h"
6060

61-
62-
#ifdef MYSQL_XDEVAPI_MESSAGE_CLASSES
63-
6461
#include "messages/mysqlx_connection.h"
6562
#include "messages/mysqlx_pfc.h"
6663

@@ -81,8 +78,6 @@ extern "C" {
8178
#include "messages/mysqlx_message__stmt_execute_ok.h"
8279
#include "messages/mysqlx_message__data_fetch_done.h"
8380

84-
#endif
85-
8681
namespace mysqlx {
8782

8883
namespace devapi {
@@ -149,7 +144,6 @@ mysqlx_minit_classes(INIT_FUNC_ARGS)
149144
mysqlx_register_table__update_class(INIT_FUNC_ARGS_PASSTHRU, &mysqlx_std_object_handlers);
150145

151146

152-
#if MYSQL_XDEVAPI_MESSAGE_CLASSES
153147
using namespace msg;
154148

155149
mysqlx_register_connection_class(INIT_FUNC_ARGS_PASSTHRU, &mysqlx_std_object_handlers);
@@ -173,7 +167,6 @@ mysqlx_minit_classes(INIT_FUNC_ARGS)
173167
mysqlx_register_resultset_metadata_class(INIT_FUNC_ARGS_PASSTHRU, &mysqlx_std_object_handlers);
174168
mysqlx_register_data_row_class(INIT_FUNC_ARGS_PASSTHRU, &mysqlx_std_object_handlers);
175169
mysqlx_register_message__data_fetch_done_class(INIT_FUNC_ARGS_PASSTHRU, &mysqlx_std_object_handlers);
176-
#endif
177170

178171
/* xmysqlnd_real_connect flags */
179172
REGISTER_LONG_CONSTANT("MYSQLX_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT);
@@ -228,7 +221,6 @@ mysqlx_minit_classes(INIT_FUNC_ARGS)
228221
PHP_MYSQL_XDEVAPI_API int
229222
mysqlx_mshutdown_classes(SHUTDOWN_FUNC_ARGS)
230223
{
231-
#ifdef MYSQL_XDEVAPI_MESSAGE_CLASSES
232224
using namespace msg;
233225

234226
mysqlx_unregister_message__data_fetch_done_class(SHUTDOWN_FUNC_ARGS_PASSTHRU);
@@ -251,7 +243,6 @@ mysqlx_mshutdown_classes(SHUTDOWN_FUNC_ARGS)
251243
mysqlx_unregister_message__ok_class(SHUTDOWN_FUNC_ARGS_PASSTHRU);
252244
mysqlx_unregister_pfc_class(SHUTDOWN_FUNC_ARGS_PASSTHRU);
253245
mysqlx_unregister_connection_class(SHUTDOWN_FUNC_ARGS_PASSTHRU);
254-
#endif
255246

256247
mysqlx_unregister_table__update_class(SHUTDOWN_FUNC_ARGS_PASSTHRU);
257248
mysqlx_unregister_table__select_class(SHUTDOWN_FUNC_ARGS_PASSTHRU);

0 commit comments

Comments
 (0)