diff options
| author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-11-24 18:56:42 +0300 |
|---|---|---|
| committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-11-24 18:56:42 +0300 |
| commit | a42ec6cd22040935d7b7a117cf0548740796c8a9 (patch) | |
| tree | cbedae68f6e50042486532d0cd14d814704ee7ac | |
| parent | 2edaa3cd520ca3cf02748f18587e2aa362c9346c (diff) | |
....I..... [ZBXNEXT-6999] added uuid generation for services
| -rw-r--r-- | create/src/schema.tmpl | 2 | ||||
| -rw-r--r-- | src/libs/zbxdbupgrade/dbupgrade_5050.c | 35 | ||||
| -rw-r--r-- | ui/include/defines.inc.php | 2 |
3 files changed, 37 insertions, 2 deletions
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index 42c2ee1e2d4..f4375690343 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -1929,4 +1929,4 @@ TABLE|dbversion|dbversionid| FIELD |dbversionid |t_id | |NOT NULL |0 FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |1 |5050128 |5050128 +ROW |1 |5050129 |5050129 diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c index e9ebbd51085..8ee3513629f 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_5050.c +++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c @@ -1640,6 +1640,40 @@ static int DBpatch_5050128(void) return DBdrop_field("services", "goodsla"); } +static int DBpatch_5050129(void) +{ + int ret = SUCCEED; + char *uuid, *sql = NULL; + size_t sql_alloc = 0, sql_offset = 0; + DB_ROW row; + DB_RESULT result; + + DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset); + + result = DBselect("select serviceid,name from services"); + + while (NULL != (row = DBfetch(result))) + { + uuid = zbx_gen_uuid4(row[1]); + zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "update services set uuid='%s' where serviceid=%s;\n", + uuid, row[0]); + zbx_free(uuid); + + if (SUCCEED != (ret = DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset))) + goto out; + } + + DBend_multiple_update(&sql, &sql_alloc, &sql_offset); + + if (16 < sql_offset && ZBX_DB_OK > DBexecute("%s", sql)) + ret = FAIL; +out: + DBfree_result(result); + zbx_free(sql); + + return ret; +} + #endif DBPATCH_START(5050) @@ -1762,5 +1796,6 @@ DBPATCH_ADD(5050125, 0, 1) DBPATCH_ADD(5050126, 0, 1) DBPATCH_ADD(5050127, 0, 1) DBPATCH_ADD(5050128, 0, 1) +DBPATCH_ADD(5050129, 0, 1) DBPATCH_END() diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index d603b513d20..0c42d5b9110 100644 --- a/ui/include/defines.inc.php +++ b/ui/include/defines.inc.php @@ -22,7 +22,7 @@ define('ZABBIX_VERSION', '6.0.0alpha7'); define('ZABBIX_API_VERSION', '6.0.0'); define('ZABBIX_EXPORT_VERSION', '6.0'); -define('ZABBIX_DB_VERSION', 5050128); +define('ZABBIX_DB_VERSION', 5050129); define('DB_VERSION_SUPPORTED', 0); define('DB_VERSION_LOWER_THAN_MINIMUM', 1); |