<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/15964">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">db upgrade: remove some code dup<br><br>Instead of a switch() for each version number with identical switch cases<br>except for the function name, use an array of function pointers and loop.<br><br>Also print a success message after each individual version upgrade, instead of<br>only one in the end (see change in db_upgrade_test.ok).<br><br>Change-Id: I1736af3d9a3f02e29db836966ac15ce49f94737b<br>---<br>M src/db.c<br>M tests/db_upgrade/db_upgrade_test.ok<br>2 files changed, 16 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/15964/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/db.c b/src/db.c</span><br><span>index 75ca889..93771bd 100644</span><br><span>--- a/src/db.c</span><br><span>+++ b/src/db.c</span><br><span>@@ -423,6 +423,13 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+typedef int (*db_upgrade_func_t)(struct db_context *dbc);</span><br><span style="color: hsl(120, 100%, 40%);">+static db_upgrade_func_t db_upgrade_path[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ db_upgrade_v1,</span><br><span style="color: hsl(120, 100%, 40%);">+ db_upgrade_v2,</span><br><span style="color: hsl(120, 100%, 40%);">+ db_upgrade_v3,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int db_get_user_version(struct db_context *dbc)</span><br><span> {</span><br><span> const char *user_version_sql = "PRAGMA user_version";</span><br><span>@@ -534,40 +541,17 @@</span><br><span> LOGP(DDB, LOGL_NOTICE, "Database '%s' has HLR DB schema version %d\n", dbc->fname, version);</span><br><span> </span><br><span> if (version < CURRENT_SCHEMA_VERSION && allow_upgrade) {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (version) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = db_upgrade_v1(dbc);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (;version < ARRAY_SIZE(db_upgrade_path); version++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ db_upgrade_func_t upgrade_func = db_upgrade_path[version];</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = upgrade_func(dbc);</span><br><span> if (rc != SQLITE_DONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 1: (rc=%d) %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rc, sqlite3_errmsg(dbc->db));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version %d: (rc=%d) %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ version+1, rc, sqlite3_errmsg(dbc->db));</span><br><span> goto out_free;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- version = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- /* fall through */</span><br><span style="color: hsl(0, 100%, 40%);">- case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = db_upgrade_v2(dbc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != SQLITE_DONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 2: (rc=%d) %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rc, sqlite3_errmsg(dbc->db));</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_free;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- version = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- /* fall through */</span><br><span style="color: hsl(0, 100%, 40%);">- case 2:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = db_upgrade_v3(dbc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != SQLITE_DONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 3: (rc=%d) %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rc, sqlite3_errmsg(dbc->db));</span><br><span style="color: hsl(0, 100%, 40%);">- goto out_free;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- version = 3;</span><br><span style="color: hsl(0, 100%, 40%);">- /* fall through */</span><br><span style="color: hsl(0, 100%, 40%);">- /* case N: ... */</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DDB, LOGL_NOTICE, "Database '%s' has been upgraded to HLR DB schema version %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ dbc->fname, version+1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DDB, LOGL_NOTICE, "Database '%s' has been upgraded to HLR DB schema version %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- dbc->fname, version);</span><br><span> }</span><br><span> </span><br><span> if (version != CURRENT_SCHEMA_VERSION) {</span><br><span>diff --git a/tests/db_upgrade/db_upgrade_test.ok b/tests/db_upgrade/db_upgrade_test.ok</span><br><span>index c1f0f9d..49e7151 100644</span><br><span>--- a/tests/db_upgrade/db_upgrade_test.ok</span><br><span>+++ b/tests/db_upgrade/db_upgrade_test.ok</span><br><span>@@ -80,6 +80,8 @@</span><br><span> DMAIN hlr starting</span><br><span> DDB using database: <PATH>test.db</span><br><span> DDB Database <PATH>test.db' has HLR DB schema version 0</span><br><span style="color: hsl(120, 100%, 40%);">+DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 1</span><br><span style="color: hsl(120, 100%, 40%);">+DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 2</span><br><span> DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 3</span><br><span> DMAIN Cmdline option --db-check: Database was opened successfully, quitting.</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/15964">change 15964</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-hlr/+/15964"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1736af3d9a3f02e29db836966ac15ce49f94737b </div>
<div style="display:none"> Gerrit-Change-Number: 15964 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>