Port changes from prox

Signed-off-by: Salil Chandra <schandra107@bloomberg.net>

Author: chands10

cdb2api/cdb2api.c

@@ -325,6 +325,7 @@ static int refresh_gbl_events_on_hndl(cdb2_hndl_tp *);
 static int cdb2_get_dbhosts(cdb2_hndl_tp *);
 static void hndl_set_comdb2buf(cdb2_hndl_tp *, COMDB2BUF *, int idx);
 static int send_reset(COMDB2BUF *sb, int localcache);
+static void free_raw_response(cdb2_hndl_tp *hndl);
 
 static int check_hb_on_blocked_write = 0; // temporary switch - this will be default behavior
 static int check_hb_on_blocked_write_set_from_env = 0;
@@ -4614,6 +4615,10 @@ static int cdb2_send_query(cdb2_hndl_tp *hndl, cdb2_hndl_tp *event_hndl, COMDB2B
 #if _LINUX_SOURCE
     sqlquery.little_endian = 1;
 #endif
+    if (hndl && hndl->is_tagged) {
+        sqlquery.has_is_tagged = 1;
+        sqlquery.is_tagged = 1;
+    }
 
     sqlquery.n_bindvars = n_bindvars;
     sqlquery.bindvars = bindvars;
@@ -5191,7 +5196,9 @@ int cdb2_close(cdb2_hndl_tp *hndl)
         newsql_disconnect(hndl, hndl->sb, __LINE__);
 
     if (hndl->firstresponse) {
-        cdb2__sqlresponse__free_unpacked(hndl->firstresponse, NULL);
+        free_raw_response(hndl);
+        if (hndl->firstresponse)
+            cdb2__sqlresponse__free_unpacked(hndl->firstresponse, NULL);
         hndl->firstresponse = NULL;
         free((void *)hndl->first_buf);
         hndl->first_buf = NULL;
@@ -6005,6 +6012,17 @@ static void attach_to_handle(cdb2_hndl_tp *child, cdb2_hndl_tp *parent)
     }
 }
 
+static void free_raw_response(cdb2_hndl_tp *hndl)
+{
+    // Tagged requests receive a RESPONSE_HEADER__SQL_RESPONSE_RAW response that
+    // contains both the "header" and the row data.  So the first response is
+    // also the last response and we only need to free one.
+    if (hndl->is_tagged && hndl->firstresponse && hndl->firstresponse == hndl->lastresponse) {
+        cdb2__sqlresponse__free_unpacked(hndl->firstresponse, NULL);
+        hndl->firstresponse = hndl->lastresponse = NULL;
+    }
+}
+
 static void pb_alloc_heuristic(cdb2_hndl_tp *hndl)
 {
     if (!cdb2_protobuf_heuristic)
@@ -8273,6 +8291,11 @@ static int get_connection_int(cdb2_hndl_tp *hndl, int *err)
     if (get_dbinfo || *err)
         return -1;
     before_discovery(hndl);
+    if (strcmp(hndl->type, "configured") == 0 && hndl->num_hosts > 0) {
+        // Special setting of "configured" means the proxy generated a list of hosts in its config and we should
+        // use that.  Don't try discovery or sockpool - use what's in the proxy config.
+        return 0;
+    }
     COMDB2BUF *sb = sockpool_get(hndl);
     after_discovery(hndl);
     if (sb == NULL)
@@ -8827,6 +8850,8 @@ int cdb2_open(cdb2_hndl_tp **handle, const char *dbname, const char *type,
     hndl->connected_host = -1;
     hndl->send_stack = 0;
     hndl->read_intrans_results = 1;
+    hndl->is_admin = (flags & CDB2_ADMIN);
+    hndl->is_tagged = (flags & CDB2_SET_TAGGED);
 
     /* We don't do dbinfo if DIRECT_CPU. So we'd default peer SSL mode to
        ALLOW. We will find it out later when we send SSL negotitaion packet
@@ -8836,8 +8861,6 @@ int cdb2_open(cdb2_hndl_tp **handle, const char *dbname, const char *type,
     hndl->max_retries = MAX_RETRIES;
     hndl->min_retries = MIN_RETRIES;
 
-    hndl->is_admin = (flags & CDB2_ADMIN);
-
     if (cdb2_use_env_vars) {
         hndl->db_default_type_override_env = 0;
         hndl->sockpool_enabled = 0;

cdb2api/cdb2api.h

@@ -42,7 +42,8 @@ enum cdb2_hndl_alloc_flags {
 #endif
     CDB2_REQUIRE_FASTSQL = 512,
     CDB2_MASTER = 1024,
-    CDB2_ALLOW_INCOHERENT = 2048
+    CDB2_ALLOW_INCOHERENT = 2048,
+    CDB2_SET_TAGGED = 4096
 };
 
 enum cdb2_request_type {

cdb2api/cdb2api_hndl.h

@@ -236,5 +236,6 @@ struct cdb2_hndl {
     CDB2SQLQUERY__IdentityBlob *id_blob;
     struct cdb2_stmt_types *stmt_types;
     RETRY_CALLBACK retry_clbk;
+    int is_tagged;
 };
 #endif