db_version must be int64_t in network.c

Author: marcobambini

src/cloudsync.c

@@ -125,7 +125,7 @@ struct cloudsync_context {
     // version the DB would have if the transaction committed now
     int64_t    pending_db_version;
     // used to set an order inside each transaction
-    int         seq;
+    int        seq;
 
     // augmented tables are stored in-memory so we do not need to retrieve information about
     // col_names and cid from the disk each time a write statement is performed

src/dbutils.c

@@ -102,11 +102,12 @@ int dbutils_binary_comparison (int x, int y) {
     return (x == y) ? 0 : (x > y ? 1 : -1);
 }
 
-char *dbutils_settings_get_value (db_t *db, const char *key, char *buffer, size_t blen) {
+char *dbutils_settings_get_value (db_t *db, const char *key, char *buffer, size_t blen, int64_t *intvalue) {
     DEBUG_SETTINGS("dbutils_settings_get_value key: %s", key);
 
     // check if heap allocation must be forced
     if (!buffer || blen == 0) blen = 0;
+    if (intvalue) *intvalue = 0;
     size_t size = 0;
 
     dbvm_t *vm = NULL;
@@ -126,21 +127,27 @@ char *dbutils_settings_get_value (db_t *db, const char *key, char *buffer, size_
         goto finalize_get_value;
     }
 
-    const char *value = database_column_text(vm, 0);
-    #if CLOUDSYNC_UNITTEST
-    size = (buffer == OUT_OF_MEMORY_BUFFER) ? (SQLITE_MAX_ALLOCATION_SIZE + 1) :(size_t)database_column_bytes(vm, 0);
-    #else
-    size = (size_t)database_column_bytes(vm, 0);
-    #endif
-    if (size + 1 > blen) {
-        buffer = cloudsync_memory_alloc((uint64_t)(size + 1));
-        if (!buffer) {
-            rc = DBRES_NOMEM;
-            goto finalize_get_value;
+    if (intvalue) {
+        // check if we are only interested in the intvalue
+        *intvalue = database_column_int(vm, 0);
+    } else {
+        // if intvalue is NULL then proceed with text case
+        const char *value = database_column_text(vm, 0);
+        #if CLOUDSYNC_UNITTEST
+        size = (buffer == OUT_OF_MEMORY_BUFFER) ? (SQLITE_MAX_ALLOCATION_SIZE + 1) :(size_t)database_column_bytes(vm, 0);
+        #else
+        size = (size_t)database_column_bytes(vm, 0);
+        #endif
+        if (size + 1 > blen) {
+            buffer = cloudsync_memory_alloc((uint64_t)(size + 1));
+            if (!buffer) {
+                rc = DBRES_NOMEM;
+                goto finalize_get_value;
+            }
         }
+        memcpy(buffer, value, size+1);
     }
 
-    memcpy(buffer, value, size+1);
     rc = DBRES_OK;
 
 finalize_get_value:
@@ -180,15 +187,25 @@ int dbutils_settings_set_key_value (db_t *db, cloudsync_context *data, const cha
 int dbutils_settings_get_int_value (db_t *db, const char *key) {
     DEBUG_SETTINGS("dbutils_settings_get_int_value key: %s", key);
     char buffer[256] = {0};
-    if (dbutils_settings_get_value(db, key, buffer, sizeof(buffer)) == NULL) return -1;
+    int64_t value = 0;
+    if (dbutils_settings_get_value(db, key, buffer, sizeof(buffer), &value) == NULL) return -1;
+    
+    return (int)value;
+}
+
+int64_t dbutils_settings_get_int64_value (db_t *db, const char *key) {
+    DEBUG_SETTINGS("dbutils_settings_get_int_value key: %s", key);
+    char buffer[256] = {0};
+    int64_t value = 0;
+    if (dbutils_settings_get_value(db, key, buffer, sizeof(buffer), &value) == NULL) return -1;
 
-    return (int)strtol(buffer, NULL, 0);
+    return value;
 }
 
 int dbutils_settings_check_version (db_t *db, const char *version) {
     DEBUG_SETTINGS("dbutils_settings_check_version");
     char buffer[256];
-    if (dbutils_settings_get_value(db, CLOUDSYNC_KEY_LIBVERSION, buffer, sizeof(buffer)) == NULL) return -666;
+    if (dbutils_settings_get_value(db, CLOUDSYNC_KEY_LIBVERSION, buffer, sizeof(buffer), NULL) == NULL) return -666;
 
     int major1, minor1, patch1;
     int major2, minor2, patch2;

src/dbutils.h

@@ -32,10 +32,11 @@ int dbutils_settings_init (db_t *db, void *cloudsync_data);
 int dbutils_settings_cleanup (db_t *db);
 int dbutils_settings_set_key_value (db_t *db, cloudsync_context *data, const char *key, const char *value);
 int dbutils_settings_get_int_value (db_t *db, const char *key);
+int64_t dbutils_settings_get_int64_value (db_t *db, const char *key);
 
 // table settings
 int        dbutils_table_settings_set_key_value (db_t *db, cloudsync_context *data, const char *table, const char *column, const char *key, const char *value);
-int64_t   dbutils_table_settings_count_tables (db_t *db);
+int64_t    dbutils_table_settings_count_tables (db_t *db);
 char      *dbutils_table_settings_get_value (db_t *db, const char *table_name, const char *column, const char *key, char *buffer, size_t blen);
 table_algo dbutils_table_settings_get_algo (db_t *db, const char *table_name);
 

src/network.c

@@ -785,7 +785,7 @@ int cloudsync_network_check_internal(sqlite3_context *context, int *pnrows) {
 
     sqlite3 *db = sqlite3_context_db_handle(context);
 
-    int db_version = dbutils_settings_get_int_value(db, CLOUDSYNC_KEY_CHECK_DBVERSION);
+    int64_t db_version = dbutils_settings_get_int64_value(db, CLOUDSYNC_KEY_CHECK_DBVERSION);
     if (db_version<0) {sqlite3_result_error(context, "Unable to retrieve db_version.", -1); return -1;}
 
     int seq = dbutils_settings_get_int_value(db, CLOUDSYNC_KEY_CHECK_SEQ);

test/unit.c

@@ -36,7 +36,7 @@ void dbvm_reset (dbvm_t *stmt);
 int dbvm_count (dbvm_t *stmt, const char *value, size_t len, int type);
 int dbvm_execute (dbvm_t *stmt, void *data);
 
-char *dbutils_settings_get_value (db_t *db, const char *key, char *buffer, size_t blen);;
+char *dbutils_settings_get_value (db_t *db, const char *key, char *buffer, size_t blen, int64_t *intvalue);
 int dbutils_settings_table_load_callback (void *xdata, int ncols, char **values, char **names);
 int dbutils_settings_check_version (db_t *db, const char *version);
 bool dbutils_settings_migrate (db_t *db);
@@ -2010,8 +2010,8 @@ bool do_test_dbutils (void) {
     dbutils_settings_set_key_value(db, NULL, "key2", "test2");
     dbutils_settings_set_key_value(db, NULL, "key2", NULL);
 
-    char *value1 = dbutils_settings_get_value(db, "key1", NULL, 0);
-    char *value2 = dbutils_settings_get_value(db, "key2", NULL, 0);
+    char *value1 = dbutils_settings_get_value(db, "key1", NULL, 0, NULL);
+    char *value2 = dbutils_settings_get_value(db, "key2", NULL, 0, NULL);
     if (value1 == NULL) goto finalize;
     if (value2 != NULL) goto finalize;
     cloudsync_memory_free(value1);
@@ -2048,7 +2048,7 @@ bool do_test_dbutils (void) {
     cloudsync_memory_free(site_id_blob);
 
     // force out-of-memory test
-    value1 = dbutils_settings_get_value(db, "key1", OUT_OF_MEMORY_BUFFER, 0);
+    value1 = dbutils_settings_get_value(db, "key1", OUT_OF_MEMORY_BUFFER, 0, NULL);
     if (value1 != NULL) goto finalize;
 
     value1 = dbutils_table_settings_get_value(db, "foo", NULL, "key1", OUT_OF_MEMORY_BUFFER, 0);