Improved processing of pending warning and errors

Author: Bogdan Degtyariov

xapi/mysqlx_cc_internal.h

@@ -130,11 +130,13 @@ typedef struct mysqlx_result_struct : public Mysqlx_diag
   std::vector<mysqlx_row_t*> m_row_set;
   std::vector<mysqlx_doc_t*> m_doc_set;
   cdk::scoped_ptr<mysqlx_error_t> m_current_warning;
+  cdk::scoped_ptr<mysqlx_error_t> m_current_error;
 
   // We need column names in UTF8
   std::vector<Column_info> m_col_info;
   uint32_t m_filter_mask;
-  cdk::foundation::Diagnostic_iterator *m_warning_iter;
+  uint32_t m_current_warning_index;
+  uint32_t m_current_error_index;
 
   std::vector<std::string> m_doc_id_list;
   uint64_t m_current_id_index;
@@ -187,6 +189,8 @@ typedef struct mysqlx_result_struct : public Mysqlx_diag
 
   mysqlx_error_t *get_next_warning();
 
+  virtual mysqlx_error_t *get_error();
+
   /*
     Read the next row from the result set and advance the cursor position
   */

xapi/result.cc

@@ -111,7 +111,8 @@ bool mysqlx_result_t::init_result(bool wait)
   if (wait)
     m_reply.wait();
 
-  m_warning_iter = NULL;
+  m_current_warning_index = 0;
+  m_current_error_index = 0;
 
   if (m_reply.has_results())
   {
@@ -537,19 +538,53 @@ const char * mysqlx_result_t::get_next_doc_id()
   return m_doc_id_list[m_current_id_index - 1].data();
 }
 
+mysqlx_error_t * mysqlx_result_t::get_error()
+{
+  mysqlx_error_t *err = Mysqlx_diag::get_error();
+  
+  if (err)
+    return err; // return the error if there is any
+
+  // Otherwise the error might be pending
+  m_reply.wait();
+  if (m_reply.entry_count() > m_current_error_index)
+  {
+    cdk::foundation::Diagnostic_iterator *m_iter;
+    uint32_t num = 0;
+    m_iter = &(m_reply.get_entries(cdk::foundation::api::Severity::ERROR));
+
+    while (m_iter->next())
+    {
+      if (++num > m_current_error_index)
+      {
+        m_current_error_index = num;
+        m_current_error.reset(new mysqlx_error_t(m_iter->entry().get_error(), true));
+        return m_current_error.get();
+      }
+    }
+  }
+
+  return NULL;
+}
+
 
 mysqlx_error_t * mysqlx_result_t::get_next_warning()
 {
-  if (get_warning_count())
+  if (get_warning_count() > m_current_warning_index)
   {
-    if (m_warning_iter == NULL)
-      m_warning_iter = &(m_reply.get_entries(cdk::foundation::api::Severity::WARNING));
-    if (m_warning_iter->next())
-      m_current_warning.reset(new mysqlx_error_t(m_warning_iter->entry().get_error(), true));
-    else
-      m_current_warning.reset(NULL);
+    cdk::foundation::Diagnostic_iterator *m_iter;
+    uint32_t num = 0;
+    m_iter = &(m_reply.get_entries(cdk::foundation::api::Severity::WARNING));
 
-    return m_current_warning.get();
+    while (m_iter->next())
+    {
+      if (++num > m_current_warning_index)
+      {
+        m_current_warning_index = num;
+        m_current_warning.reset(new mysqlx_error_t(m_iter->entry().get_error(), true));
+        return m_current_warning.get();
+      }
+    }
   }
 
   return NULL;

xapi/tests/xapi_crud-t.cc

@@ -2175,7 +2175,7 @@ TEST_F(xapi_bugs, collection_id_test)
 {
   SKIP_IF_NO_XPLUGIN
 
-  mysqlx_result_t *res;
+    mysqlx_result_t *res;
   mysqlx_stmt_t *stmt;
   mysqlx_schema_t *schema;
   mysqlx_collection_t *collection;
@@ -2230,19 +2230,53 @@ TEST_F(xapi_bugs, collection_id_test)
 
     switch (i)
     {
-      case 0: // just _id in the JSON
-        EXPECT_TRUE(strstr(json_string, "a_key") == NULL);
+    case 0: // just _id in the JSON
+      EXPECT_TRUE(strstr(json_string, "a_key") == NULL);
       break;
-      case 1: // { "a_key" : 100}
-        EXPECT_TRUE(strstr(json_string, "\"a_key\": 100") != NULL);
-        break;
-      case 2: // { "a_key" : 200, "_id" : "111222333"}
-        EXPECT_TRUE(strstr(json_string, "\"a_key\": 200") != NULL);
-        break;
-      default: // no more documents in the result
-        FAIL();
+    case 1: // { "a_key" : 100}
+      EXPECT_TRUE(strstr(json_string, "\"a_key\": 100") != NULL);
+      break;
+    case 2: // { "a_key" : 200, "_id" : "111222333"}
+      EXPECT_TRUE(strstr(json_string, "\"a_key\": 200") != NULL);
+      break;
+    default: // no more documents in the result
+      FAIL();
     }
 
     ++i;
   }
 }
+
+TEST_F(xapi_bugs, myc_352_stored_proc_err)
+{
+  SKIP_IF_NO_XPLUGIN
+
+    mysqlx_result_t *res;
+  const char *schema_name = "cc_crud_test";
+  const char *errmsg = NULL;
+
+  AUTHENTICATE();
+
+  mysqlx_schema_drop(get_session(), schema_name);
+  EXPECT_EQ(RESULT_OK, mysqlx_schema_create(get_session(), schema_name));
+
+  res = mysqlx_sql(get_session(),
+    "CREATE PROCEDURE cc_crud_test.myc_352(d INT)" \
+    " BEGIN" \
+    "   select 1, 2, 3;" \
+    " IF d = 0 THEN " \
+    " BEGIN " \
+    " select point(1, 0) / point(1, 2); " \
+    " END; " \
+    " END IF; " \
+    " select 'abc', 1.0; " \
+    " END", MYSQLX_NULL_TERMINATED);
+
+  res = mysqlx_sql(get_session(), "CALL cc_crud_test.myc_352(0)",
+    MYSQLX_NULL_TERMINATED);
+
+  EXPECT_EQ(RESULT_OK, mysqlx_store_result(res, NULL));
+  EXPECT_EQ(RESULT_ERROR, mysqlx_next_result(res));
+  EXPECT_TRUE((errmsg = mysqlx_error_message(res)) != NULL);
+  printf("\nExpected error: %s\n", errmsg);
+}