uuid in connection info

Author: dorinhogea

db/sql.h

@@ -1341,6 +1341,7 @@ struct connection_info {
     enum connection_state state_int;
     int64_t in_transaction;
     int64_t in_local_cache;
+    char *uuid;
 };
 
 /* makes master swing verbose */

db/sqlinterfaces.c

@@ -6728,6 +6728,10 @@ static void gather_connection_int(struct connection_info *c, struct sqlclntstate
     c->in_transaction = clnt->in_client_trans;
     c->in_local_cache = clnt->in_local_cache;
     Pthread_mutex_unlock(&clnt->state_lk);
+    uuidstr_t us;
+    comdb2uuidstr(clnt->unifieduuid, us);
+    c->uuid = malloc(strlen(us) + 1);
+    snprintf(c->uuid, strlen(us) + 1, "%s", us);
 }
 
 static void gather_connections_evbuffer(struct connection_info **info, int *num_connections)
@@ -6757,8 +6761,9 @@ void free_connection_info(struct connection_info *info, int num_connections)
 {
     if (info == NULL) return;
     for (int i = 0; i < num_connections; i++) {
-        if (info[i].sql) free(info[i].sql);
-        if (info[i].fingerprint) free(info[i].fingerprint);
+        free(info[i].sql);
+        free(info[i].fingerprint);
+        free(info[i].uuid);
         /* state is static, don't free */
     }
     free(info);

sqlite/ext/comdb2/connections.c

@@ -98,5 +98,6 @@ int systblConnectionsInit(sqlite3 *db) {
             CDB2_INTEGER, "has_cert", -1, offsetof(struct connection_info, has_cert),
             CDB2_CSTRING, "common_name", -1, offsetof(struct connection_info, common_name),
             CDB2_INTEGER, "in_local_cache", -1, offsetof(struct connection_info, in_local_cache),
+            CDB2_CSTRING, "uuid", -1, offsetof(struct connection_info, uuid),
             SYSTABLE_END_OF_FIELDS);
 }

tests/unifiedcancel.test/test_cancel.sh

@@ -20,6 +20,7 @@ S_CDB2_OPTIONS="--cdb2cfg ${a_cdb2config}"
 mach=`cdb2sql ${S_CDB2_OPTIONS} --tabs $a_dbname default "SELECT comdb2_host()"`
 
 S_SQL="cdb2sql ${S_CDB2_OPTIONS} --host $mach $a_dbname"
+S_TSQL="cdb2sql --tabs ${S_CDB2_OPTIONS} --host $mach $a_dbname"
 
 function header
 {
@@ -46,7 +47,7 @@ if [[ $? != 0 ]] ; then
 fi
 
 echo "collecting the sleep uuid"
-uuid=`$S_SQL "select uuid from comdb2_connections where sql like '%sleep%' and sql not like '%connections%'"`
+uuid=`$S_TSQL "select uuid from comdb2_connections where sql like '%sleep%' and sql not like '%connections%'"`
 if [[ $? != 0 ]] ; then
     echo "Failed to select uuid"
     exit 1
@@ -65,14 +66,14 @@ if [[ $? != 0 ]] ; then
     exit 1
 fi
 
-echo "check the ${uuid} is gone"
-found_uuid=`$S_SQL "select uuid from comdb2_connections where sql like '%sleep%' and sql not like '%connections%'"
+echo "check if the ${uuid} is gone"
+found_uuid=`$S_TSQL "select uuid from comdb2_connections where sql like '%sleep%' and sql not like '%connections%'"`
 if [[ $? != 0 ]] ; then
     echo "Failed to run cancel message"
     exit 1
 fi
 
-if [[ ! =z ${found_uuid} ]] ; then
+if [[ ! -z ${found_uuid} ]] ; then
     echo "Failed to cancel the sleep select"
     exit 1
 fi