merge mastre

include/snowflake/client.h

@@ -541,6 +541,10 @@ typedef struct SF_STMT {
     SF_STATS *stats;
     void *stmt_attrs;
     sf_bool is_dml;
+    sf_bool is_multi_stmt;
+    void* multi_stmt_result_ids;
+    int64 multi_stmt_count;
+    int64 paramset_size;
     sf_bool is_async;
     sf_bool is_async_initialized;
 

lib/client.c

@@ -2790,22 +2790,22 @@ snowflake_prepare(SF_STMT *sfstmt, const char *command, size_t command_size) {
 
 SF_STATUS STDCALL snowflake_describe_with_capture(SF_STMT *sfstmt,
                                                   SF_QUERY_RESULT_CAPTURE *result_capture) {
-    return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), result_capture, SF_BOOLEAN_TRUE, SF_BOOLEAN_FALSE);
+    return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), result_capture, SF_BOOLEAN_FALSE, SF_BOOLEAN_TRUE, SF_BOOLEAN_FALSE);
 }
 
 SF_STATUS STDCALL snowflake_execute(SF_STMT *sfstmt) {
-    return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), NULL, SF_BOOLEAN_FALSE, SF_BOOLEAN_FALSE);
+    return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), SF_BOOLEAN_TRUE, NULL, SF_BOOLEAN_FALSE, SF_BOOLEAN_FALSE);
 }
 
 SF_STATUS STDCALL snowflake_async_execute(SF_STMT *sfstmt) {
   if (!sfstmt->is_async) {
     sfstmt->is_async = SF_BOOLEAN_TRUE;
   }
-  return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), NULL, SF_BOOLEAN_FALSE, SF_BOOLEAN_TRUE);
+  return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), SF_BOOLEAN_TRUE, NULL, SF_BOOLEAN_FALSE, SF_BOOLEAN_TRUE);
 }
 
 SF_STATUS STDCALL snowflake_execute_with_capture(SF_STMT *sfstmt, SF_QUERY_RESULT_CAPTURE *result_capture) {
-    return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), result_capture, SF_BOOLEAN_FALSE, SF_BOOLEAN_FALSE);
+    return _snowflake_execute_ex(sfstmt, _is_put_get_command(sfstmt->sql_text), SF_BOOLEAN_TRUE, result_capture, SF_BOOLEAN_FALSE, SF_BOOLEAN_FALSE);
 }
 
 SF_STATUS STDCALL _snowflake_execute_ex(SF_STMT *sfstmt,
@@ -2873,11 +2873,17 @@ SF_STATUS STDCALL _snowflake_execute_ex(SF_STMT *sfstmt,
     // Create Body
     body = create_query_json_body(sfstmt->sql_text, sfstmt->sequence_counter,
                                   is_string_empty(sfstmt->connection->directURL) ?
-                                  NULL : sfstmt->request_id, is_describe_only);
-
-    snowflake_cJSON_AddBoolToObject(body, "asyncExec", is_async_exec);
-
-    if (bindings != NULL) {
+                                  NULL : sfstmt->request_id, is_describe_only,
+                                  sfstmt->multi_stmt_count);
+
+	snowflake_cJSON_AddBoolToObject(body, "asyncExec", is_async_exec);
+
+    if (bind_stage)
+    {
+      snowflake_cJSON_AddStringToObject(body, "bindStage", bind_stage);
+      SF_FREE(bind_stage);
+    }
+    else if (bindings != NULL) {
         /* binding parameters if exists */
       snowflake_cJSON_AddItemToObject(body, "bindings", bindings);
     }
@@ -3019,149 +3025,26 @@ SF_STATUS STDCALL _snowflake_execute_ex(SF_STMT *sfstmt,
             } else {
                 int64 stmt_type_id;
                 if (json_copy_int(&stmt_type_id, data, "statementTypeId")) {
-                    /* failed to get statement type id */
-                    sfstmt->is_dml = SF_BOOLEAN_FALSE;
-                } else {
-                    sfstmt->is_dml = detect_stmt_type(stmt_type_id);
+                  /* failed to get statement type id */
+                  sfstmt->is_multi_stmt = SF_BOOLEAN_FALSE;
                 }
-               rowtype = snowflake_cJSON_GetObjectItem(data, "rowtype");
-                if (snowflake_cJSON_IsArray(rowtype)) {
-                    sfstmt->total_fieldcount = snowflake_cJSON_GetArraySize(
-                      rowtype);
-                    _snowflake_stmt_desc_reset(sfstmt);
-                    sfstmt->desc = set_description(rowtype);
+                else {
+                  sfstmt->is_multi_stmt = (_SF_STMT_TYPE_MULTI_STMT == stmt_type_id);
                 }
-                stats = snowflake_cJSON_GetObjectItem(data, "stats");
-                if (snowflake_cJSON_IsObject(stats)) {
-                    _snowflake_stmt_row_metadata_reset(sfstmt);
-                    sfstmt->stats = set_stats(stats);
-                } else {
-                    sfstmt->stats = NULL;
-                }
-
-                // Determine query result format and detach rowset object from data.
-                cJSON * qrf = snowflake_cJSON_GetObjectItem(data, "queryResultFormat");
-                if (qrf) {
-                  char* qrf_str = snowflake_cJSON_GetStringValue(qrf);
-                  sfstmt->qrf = SF_CALLOC(1, sizeof(QueryResultFormat_t));
-                  cJSON* rowset = NULL;
-
-                  if (strcmp(qrf_str, "arrow") == 0 || strcmp(qrf_str, "arrow_force") == 0) {
-#ifdef SF_WIN32
-                    SET_SNOWFLAKE_STMT_ERROR(&sfstmt->error, SF_STATUS_ERROR_UNSUPPORTED_QUERY_RESULT_FORMAT,
-                      "Query results were fetched using Arrow, "
-                      "but the client library does not yet support decoding Arrow results", "",
-                      sfstmt->sfqid);
 
-                    return SF_STATUS_ERROR_UNSUPPORTED_QUERY_RESULT_FORMAT;
-#endif
-                    * ((QueryResultFormat_t*)sfstmt->qrf) = ARROW_FORMAT;
-                    rowset = snowflake_cJSON_DetachItemFromObject(data, "rowsetBase64");
-                    if (!rowset)
+                if (sfstmt->is_multi_stmt)
+                {
+                    if (!setup_multi_stmt_result(sfstmt, data))
                     {
-                      log_error("No valid rowset found in response");
-                      SET_SNOWFLAKE_STMT_ERROR(&sfstmt->error,
-                        SF_STATUS_ERROR_BAD_JSON,
-                        "Missing rowset from response. No results found.",
-                        SF_SQLSTATE_APP_REJECT_CONNECTION,
-                        sfstmt->sfqid);
-                      goto cleanup;
+                        goto cleanup;
                     }
-                  }
-                  else if (strcmp(qrf_str, "json") == 0) {
-                    *((QueryResultFormat_t*)sfstmt->qrf) = JSON_FORMAT;
-                    if (json_detach_array_from_object((cJSON**)(&rowset), data, "rowset"))
+                }
+                else
+                {
+                    if (!setup_result_with_json_resp(sfstmt, data))
                     {
-                      log_error("No valid rowset found in response");
-                      SET_SNOWFLAKE_STMT_ERROR(&sfstmt->error,
-                        SF_STATUS_ERROR_BAD_JSON,
-                        "Missing rowset from response. No results found.",
-                        SF_SQLSTATE_APP_REJECT_CONNECTION,
-                        sfstmt->sfqid);
-                      goto cleanup;
-                    }
-                  }
-                  else {
-                    log_error("Unsupported query result format: %s", qrf_str);
-                  }
-
-                  // Index starts at 0 and incremented each fetch
-                  sfstmt->total_row_index = 0;
-
-                  // When the result set is sufficient large, the server response will contain
-                  // an empty "rowset" object. Instead, it will have a "chunks" object that contains,
-                  // among other fields, a URL from which the result set can be downloaded in chunks.
-                  // In this case, we initialize the chunk downloader, which will download in the
-                  // background as calls to snowflake_fetch() are made.
-                  if ((chunks = snowflake_cJSON_GetObjectItem(data, "chunks")) != NULL) {
-                    // We don't care if there is no qrmk, so ignore return code
-                    json_copy_string(&qrmk, data, "qrmk");
-                    chunk_headers = snowflake_cJSON_GetObjectItem(data, "chunkHeaders");
-                    NON_JSON_RESP* (*callback_create_resp)(void) = NULL;
-                    if (ARROW_FORMAT == *((QueryResultFormat_t*)sfstmt->qrf)) {
-                      callback_create_resp = callback_create_arrow_resp;
-                    }
-
-                    sfstmt->chunk_downloader = chunk_downloader_init(
-                      qrmk,
-                      chunk_headers,
-                      chunks,
-                      2, // thread count
-                      4, // fetch slot
-                      &sfstmt->error,
-                      sfstmt->connection->insecure_mode,
-                      sfstmt->connection->ocsp_fail_open,
-                      callback_create_resp,
-                      sfstmt->connection->proxy,
-                      sfstmt->connection->no_proxy,
-                      get_retry_timeout(sfstmt->connection),
-                      sfstmt->connection->retry_count);
-                    if (!sfstmt->chunk_downloader) {
-                      // Unable to create chunk downloader.
-                      // Error is set in chunk_downloader_init function.
-                      goto cleanup;
-                    }
-
-                    // Even when the result set is split into chunks, JSON format will still
-                    // response with the first chunk in "rowset", so be sure to include it.
-                    sfstmt->result_set = rs_create_with_json_result(
-                      rowset,
-                      sfstmt->desc,
-                      (QueryResultFormat_t*)sfstmt->qrf,
-                      sfstmt->connection->timezone);
-
-                    // Update chunk row count. Controls the chunk downloader.
-                    sfstmt->chunk_rowcount = rs_get_row_count_in_chunk(
-                      sfstmt->result_set,
-                      (QueryResultFormat_t*)sfstmt->qrf);
-
-                    // Update total row count. Used in snowflake_num_rows().
-                    if (json_copy_int(&sfstmt->total_rowcount, data, "total")) {
-                      log_warn(
-                        "No total count found in response. Reverting to using array size of results");
-                      sfstmt->total_rowcount = sfstmt->chunk_rowcount;
-                    }
-                  }
-                  else {
-                    // Create a result set object and update the total rowcount.
-                    sfstmt->result_set = rs_create_with_json_result(
-                      rowset,
-                      sfstmt->desc,
-                      (QueryResultFormat_t*)sfstmt->qrf,
-                      sfstmt->connection->timezone);
-
-                    // Update chunk row count. Controls the chunk downloader.
-                    sfstmt->chunk_rowcount = rs_get_row_count_in_chunk(
-                      sfstmt->result_set,
-                      (QueryResultFormat_t*)sfstmt->qrf);
-
-                    // Update total row count. Used in snowflake_num_rows().
-                    if (json_copy_int(&sfstmt->total_rowcount, data, "total")) {
-                      log_warn(
-                        "No total count found in response. Reverting to using array size of results");
-                      sfstmt->total_rowcount = sfstmt->chunk_rowcount;
+                        goto cleanup;
                     }
-                  }
                 }
             }
         } else if (json_error != SF_JSON_ERROR_NONE) {

lib/client_int.h

@@ -41,6 +41,7 @@
 #define QUERY_URL "/queries/v1/query-request"
 #define RENEW_SESSION_URL "/session/token-request"
 #define DELETE_SESSION_URL "/session"
+#define QUERY_RESULT_URL_FORMAT "/queries/%s/result"
 #define QUERY_MONITOR_URL "/monitoring/queries/%s"
 // not used for now but add for URL checking on connection requests
 #define AUTHENTICATOR_URL "/session/authenticator-request"