Skip to content

Commit ca12566

Browse files
committed
WL#11945: remove obsolete routines throwing not_implemented exception
- remove util::xdevapi_exception::Code::not_implemented exception - implement getSession for schema, collection, and table - test-cases
1 parent 35560da commit ca12566

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

mysqlx_collection.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_collection, getSession)
162162

163163
zval* object_zv{nullptr};
164164
if (FAILURE == util::zend::parse_method_parameters(
165-
execute_data,
166-
getThis(),
165+
execute_data,
166+
getThis(),
167167
"O",
168-
&object_zv,
168+
&object_zv,
169169
mysqlx_collection_class_entry))
170170
{
171171
DBG_VOID_RETURN;

mysqlx_schema.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_schema, getSession)
130130

131131
zval* object_zv{nullptr};
132132
if (FAILURE == util::zend::parse_method_parameters(
133-
execute_data,
134-
getThis(),
133+
execute_data,
134+
getThis(),
135135
"O",
136-
&object_zv,
136+
&object_zv,
137137
mysqlx_schema_class_entry))
138138
{
139139
DBG_VOID_RETURN;

mysqlx_session.cc

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,16 +1050,9 @@ mysqlx_new_session(zval* return_value, drv::XMYSQLND_SESSION session)
10501050
{
10511051
DBG_ENTER("mysqlx_new_session");
10521052

1053-
if (SUCCESS == object_init_ex(return_value, mysqlx_session_class_entry) && IS_OBJECT == Z_TYPE_P(return_value)) {
1054-
const st_mysqlx_object* const mysqlx_object{ Z_MYSQLX_P(return_value) };
1055-
st_mysqlx_session* const object{ static_cast<st_mysqlx_session*>(mysqlx_object->ptr) };
1056-
if (object) {
1057-
object->session = session;
1058-
} else {
1059-
zval_ptr_dtor(return_value);
1060-
throw util::doc_ref_exception(util::doc_ref_exception::Severity::warning, mysqlx_object->zo.ce);
1061-
}
1062-
}
1053+
st_mysqlx_session& data_object{
1054+
util::init_object<st_mysqlx_session>(mysqlx_session_class_entry, return_value) };
1055+
data_object.session = session;
10631056

10641057
DBG_VOID_RETURN;
10651058
}

mysqlx_table.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_table, getSession)
122122

123123
zval* object_zv{nullptr};
124124
if (FAILURE == util::zend::parse_method_parameters(
125-
execute_data,
126-
getThis(),
125+
execute_data,
126+
getThis(),
127127
"O",
128-
&object_zv,
128+
&object_zv,
129129
mysqlx_table_class_entry))
130130
{
131131
DBG_VOID_RETURN;

0 commit comments

Comments
 (0)