Accepting request 542661 from home:adamm:branches:server:database
- 0334aa48.patch: Backported implementation and testcase for skipping particular paramset in bulk operation/. This is needed to get current stable MariaDB connector/ODBC actually compilable. OBS-URL: https://build.opensuse.org/request/show/542661 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=23
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
9002e14d20
commit
90ed5246bd
180
0334aa48.patch
Normal file
180
0334aa48.patch
Normal file
@ -0,0 +1,180 @@
|
||||
commit 0334aa4811ae751d3362facad136c25b9765693a
|
||||
Author: Lawrin Novitsky <lawrin.novitsky@mariadb.com>
|
||||
Date: Mon Aug 14 17:23:42 2017 +0200
|
||||
|
||||
Implementation and testcase for CONC-275 - skipping particular paramset in bulk operation - with help of special indicator value STMT_INDICATOR_IGNORE_ROW set in any column of the row.
|
||||
The revision also adds some (mainly VS specific) file/dirs definitions to .gitignore to make 'gid status' usable on Windows, and the typo in bulk1 testsuite
|
||||
|
||||
diff --git a/include/mariadb_stmt.h b/include/mariadb_stmt.h
|
||||
index 9e67ad8..5e1c711 100644
|
||||
--- a/include/mariadb_stmt.h
|
||||
+++ b/include/mariadb_stmt.h
|
||||
@@ -81,7 +81,8 @@ enum enum_indicator_type
|
||||
STMT_INDICATOR_NONE=0,
|
||||
STMT_INDICATOR_NULL=1,
|
||||
STMT_INDICATOR_DEFAULT=2,
|
||||
- STMT_INDICATOR_IGNORE=3
|
||||
+ STMT_INDICATOR_IGNORE=3,
|
||||
+ STMT_INDICATOR_IGNORE_ROW=4
|
||||
};
|
||||
|
||||
/*
|
||||
diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c
|
||||
index aba845e..869c6ea 100644
|
||||
--- a/libmariadb/mariadb_stmt.c
|
||||
+++ b/libmariadb/mariadb_stmt.c
|
||||
@@ -797,7 +797,21 @@ mem_error:
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
-/* {{{ mysqlnd_stmt_execute_generate_bulk_request */
|
||||
+/* {{{ mysql_stmt_skip_paramset */
|
||||
+my_bool mysql_stmt_skip_paramset(MYSQL_STMT *stmt, uint row)
|
||||
+{
|
||||
+ uint i;
|
||||
+ for (i=0; i < stmt->param_count; i++)
|
||||
+ {
|
||||
+ if (ma_get_indicator(stmt, i, row) == STMT_INDICATOR_IGNORE_ROW)
|
||||
+ return '\1';
|
||||
+ }
|
||||
+
|
||||
+ return '\0';
|
||||
+}
|
||||
+/* }}} */
|
||||
+
|
||||
+/* {{{ mysql_stmt_execute_generate_bulk_request */
|
||||
unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t *request_len)
|
||||
{
|
||||
/* execute packet has the following format:
|
||||
@@ -820,6 +834,7 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t
|
||||
STMT_INDICATOR_NULL 1
|
||||
STMT_INDICATOR_DEFAULT 2
|
||||
STMT_INDICATOR_IGNORE 3
|
||||
+ STMT_INDICATOR_SKIP_SET 4
|
||||
n data from bind buffer
|
||||
|
||||
*/
|
||||
@@ -894,6 +909,9 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t
|
||||
/* calculate data size */
|
||||
for (j=0; j < stmt->array_size; j++)
|
||||
{
|
||||
+ if (mysql_stmt_skip_paramset(stmt, j))
|
||||
+ continue;
|
||||
+
|
||||
for (i=0; i < stmt->param_count; i++)
|
||||
{
|
||||
size_t size= 0;
|
||||
diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c
|
||||
index e5f6ec9..c6623ce 100644
|
||||
--- a/unittest/libmariadb/bulk1.c
|
||||
+++ b/unittest/libmariadb/bulk1.c
|
||||
@@ -588,7 +588,7 @@ static int test_conc243(MYSQL *mysql)
|
||||
if (strcmp(row[0], "Monty") || strcmp(row[1], "Widenius"))
|
||||
{
|
||||
mysql_free_result(result);
|
||||
- diag("Wrong walues");
|
||||
+ diag("Wrong values");
|
||||
return FAIL;
|
||||
}
|
||||
mysql_free_result(result);
|
||||
@@ -767,6 +767,92 @@ static int test_char_conv2(MYSQL *mysql)
|
||||
return OK;
|
||||
}
|
||||
|
||||
+
|
||||
+static int bulk_skip_row(MYSQL *mysql)
|
||||
+{
|
||||
+ MYSQL_STMT *stmt;
|
||||
+ MYSQL_BIND bind[3];
|
||||
+ MYSQL_RES *result;
|
||||
+ MYSQL_ROW row;
|
||||
+
|
||||
+ struct st_data {
|
||||
+ unsigned long id;
|
||||
+ char id_ind;
|
||||
+ char forename[30];
|
||||
+ char forename_ind;
|
||||
+ char surname[30];
|
||||
+ char surname_ind;
|
||||
+ };
|
||||
+
|
||||
+ struct st_data data[]={
|
||||
+ { 0, STMT_INDICATOR_NULL, "Monty", STMT_INDICATOR_NTS, "Widenius", STMT_INDICATOR_IGNORE_ROW },
|
||||
+ { 0, STMT_INDICATOR_IGNORE_ROW, "David", STMT_INDICATOR_NTS, "Axmark", STMT_INDICATOR_NTS },
|
||||
+ { 0, STMT_INDICATOR_NULL, "default", STMT_INDICATOR_DEFAULT, "N.N.", STMT_INDICATOR_NTS },
|
||||
+ };
|
||||
+
|
||||
+ unsigned int array_size= 3;
|
||||
+ size_t row_size= sizeof(struct st_data);
|
||||
+ int rc;
|
||||
+
|
||||
+ rc= mysql_query(mysql, "DROP TABLE IF EXISTS bulk_example2");
|
||||
+ check_mysql_rc(rc, mysql);
|
||||
+
|
||||
+ rc= mysql_query(mysql, "CREATE TABLE bulk_example2 (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,"\
|
||||
+ "forename CHAR(30) NOT NULL DEFAULT 'unknown', surname CHAR(30))");
|
||||
+ check_mysql_rc(rc, mysql);
|
||||
+
|
||||
+ stmt= mysql_stmt_init(mysql);
|
||||
+ rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk_example2 VALUES (?,?,?)", -1);
|
||||
+ check_stmt_rc(rc, stmt);
|
||||
+
|
||||
+ memset(bind, 0, sizeof(MYSQL_BIND) * 3);
|
||||
+
|
||||
+ /* We autogenerate id's, so all indicators are STMT_INDICATOR_NULL */
|
||||
+ bind[0].u.indicator= &data[0].id_ind;
|
||||
+ bind[0].buffer_type= MYSQL_TYPE_LONG;
|
||||
+
|
||||
+ bind[1].buffer= &data[0].forename;
|
||||
+ bind[1].buffer_type= MYSQL_TYPE_STRING;
|
||||
+ bind[1].u.indicator= &data[0].forename_ind;
|
||||
+
|
||||
+ bind[2].buffer_type= MYSQL_TYPE_STRING;
|
||||
+ bind[2].buffer= &data[0].surname;
|
||||
+ bind[2].u.indicator= &data[0].surname_ind;
|
||||
+
|
||||
+ /* set array size */
|
||||
+ mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size);
|
||||
+
|
||||
+ /* set row size */
|
||||
+ mysql_stmt_attr_set(stmt, STMT_ATTR_ROW_SIZE, &row_size);
|
||||
+
|
||||
+ /* bind parameter */
|
||||
+ mysql_stmt_bind_param(stmt, bind);
|
||||
+
|
||||
+ /* execute */
|
||||
+ rc= mysql_stmt_execute(stmt);
|
||||
+ check_stmt_rc(rc, stmt);
|
||||
+
|
||||
+ mysql_stmt_close(stmt);
|
||||
+
|
||||
+ rc= mysql_query(mysql, "SELECT forename, surname FROM bulk_example2");
|
||||
+ check_mysql_rc(rc, mysql);
|
||||
+
|
||||
+ result= mysql_store_result(mysql);
|
||||
+ FAIL_IF(!result || mysql_num_rows(result) != 1, "Invalid resultset");
|
||||
+
|
||||
+ row = mysql_fetch_row(result);
|
||||
+ if (strcmp(row[0], "unknown") || strcmp(row[1], "N.N."))
|
||||
+ {
|
||||
+ mysql_free_result(result);
|
||||
+ diag("Wrong values");
|
||||
+ return FAIL;
|
||||
+ }
|
||||
+ mysql_free_result(result);
|
||||
+ rc= mysql_query(mysql, "DROP TABLE bulk_example2");
|
||||
+ check_mysql_rc(rc, mysql);
|
||||
+ return OK;
|
||||
+}
|
||||
+
|
||||
struct my_tests_st my_tests[] = {
|
||||
{"check_bulk", check_bulk, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
|
||||
{"test_char_conv1", test_char_conv1, TEST_CONNECTION_NEW, 0, NULL, NULL},
|
||||
@@ -780,6 +866,7 @@ struct my_tests_st my_tests[] = {
|
||||
{"bulk3", bulk3, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
|
||||
{"bulk4", bulk4, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
|
||||
{"bulk_null", bulk_null, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
|
||||
+ {"bulk_skip_row", bulk_skip_row, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
|
||||
{NULL, NULL, 0, 0, NULL, NULL}
|
||||
};
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 17 14:20:39 UTC 2017 - adam.majer@suse.de
|
||||
|
||||
- 0334aa48.patch: Backported implementation and testcase for
|
||||
skipping particular paramset in bulk operation/. This is needed
|
||||
to get current stable MariaDB connector/ODBC actually compilable.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 13 17:54:46 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
|
||||
@ -40,6 +40,7 @@ Source3: baselibs.conf
|
||||
Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch
|
||||
Patch3: absolute_path_fix.patch
|
||||
Patch4: private_library.patch
|
||||
Patch5: 0334aa48.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: cmake
|
||||
BuildRequires: curl-devel
|
||||
@ -115,6 +116,7 @@ This package holds the development files.
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user