References lp:1208030 - realised the need to add flags parameter to preordered() call.

Author: ayurchen

wsrep_api.h

@@ -56,9 +56,24 @@ extern "C" {
 
 /*!
  *  Writeset flags
+ *
+ * COMMIT       the writeset and all preceding writesets must be committed
+ * ROLLBACK     all preceding writesets in a transaction must be rolled back
+ * PA_UNSAFE    the writeset cannot be applied in parallel
+ * ISOLATION    the writeset must be applied AND committed in isolation
+ * COMMUTATIVE  the order in which the writeset is applied does not matter
+ * NATIVE       the writeset contains another writeset in this provider format
+ *
+ * Note that some of the flags are mutually exclusive (e.g. COMMIT and
+ * ROLLBACK).
  */
-#define WSREP_FLAG_PA_SAFE              ( 1ULL << 0 )
-#define WSREP_FLAG_COMMUTATIVE          ( 1ULL << 1 )
+#define WSREP_FLAG_COMMIT               ( 1ULL << 0 )
+#define WSREP_FLAG_ROLLBACK             ( 1ULL << 1 )
+#define WSREP_FLAG_PA_UNSAFE            ( 1ULL << 3 )
+#define WSREP_FLAG_ISOLATION            ( 1ULL << 2 )
+#define WSREP_FLAG_COMMUTATIVE          ( 1ULL << 4 )
+#define WSREP_FLAG_NATIVE               ( 1ULL << 5 )
+
 
 typedef uint64_t wsrep_trx_id_t;  //!< application transaction ID
 typedef uint64_t wsrep_conn_id_t; //!< application connection ID
@@ -698,21 +713,21 @@ struct wsrep_ {
                                  enum wsrep_key_type type,
                                  wsrep_bool_t        copy);
 
-   /*!
-    * @brief Appends data to transaction writeset
-    *
-    * This method can be called any time before commit and it
-    * appends a number of data buffers to transaction writeset.
-    *
-    * Both copy and unordered flags can be ignored by provider.
-    *
-    * @param wsrep      provider handle
-    * @param ws_handle  writeset handle
-    * @param data       array of data buffers
-    * @param count      buffer count
-    * @param type       type of data
-    * @param copy       can be set to FALSE if data persists through commit.
-    */
+  /*!
+   * @brief Appends data to transaction writeset
+   *
+   * This method can be called any time before commit and it
+   * appends a number of data buffers to transaction writeset.
+   *
+   * Both copy and unordered flags can be ignored by provider.
+   *
+   * @param wsrep      provider handle
+   * @param ws_handle  writeset handle
+   * @param data       array of data buffers
+   * @param count      buffer count
+   * @param type       type of data
+   * @param copy       can be set to FALSE if data persists through commit.
+   */
     wsrep_status_t (*append_data)(wsrep_t*                wsrep,
                                   wsrep_ws_handle_t*      ws_handle,
                                   const struct wsrep_buf* data,
@@ -806,7 +821,8 @@ struct wsrep_ {
    *                  processing. Note: commits always happend in wsrep order.
    * @param data      an array of data buffers.
    * @param count     length of data buffer array.
-   * @param copy      whether provider needs to make a copy of event
+   * @param flags     WSREP_FLAG_... flags
+   * @param copy      whether provider needs to make a copy of event.
    *
    * @retval WSREP_OK         cluster commit succeeded
    * @retval WSREP_CONN_FAIL  must close client connection
@@ -817,6 +833,7 @@ struct wsrep_ {
                                  int                     pa_range,
                                  const struct wsrep_buf* data,
                                  int                     count,
+                                 uint64_t                flags,
                                  wsrep_bool_t            copy);
 
   /*!

wsrep_dummy.c

@@ -211,6 +211,7 @@ static wsrep_status_t dummy_preordered(
     int                     pa_range  __attribute__((unused)),
     const struct wsrep_buf* data      __attribute__((unused)),
     int                     count     __attribute__((unused)),
+    uint64_t                flags     __attribute__((unused)),
     wsrep_bool_t            copy      __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);

wsrep_gtid.c

@@ -27,10 +27,10 @@
  * Read GTID from string
  * @return length of GTID string representation or -EINVAL in case of error
  */
-ssize_t
+int
 wsrep_gtid_scan(const char* str, size_t str_len, wsrep_gtid_t* gtid)
 {
-    size_t offset;
+    unsigned int offset;
     char* endptr;
 
     if ((offset = wsrep_uuid_scan(str, str_len, &gtid->uuid)) > 0 &&
@@ -56,10 +56,10 @@ wsrep_gtid_scan(const char* str, size_t str_len, wsrep_gtid_t* gtid)
  * @return length of GTID stirng representation of -EMSGSIZE if string is too
  *         short
  */
-ssize_t
+int
 wsrep_gtid_print(const wsrep_gtid_t* gtid, char* str, size_t str_len)
 {
-    size_t offset, ret;
+    unsigned int offset, ret;
     if ((offset = wsrep_uuid_print(&gtid->uuid, str, str_len)) > 0)
     {
         ret = snprintf(str + offset, str_len - offset,

wsrep_uuid.c

@@ -26,21 +26,27 @@
  * Read UUID from string
  * @return length of UUID string representation or -EINVAL in case of error
  */
-ssize_t
+int
 wsrep_uuid_scan (const char* str, size_t str_len, wsrep_uuid_t* uuid)
 {
-    size_t uuid_len = 0;
-    size_t uuid_offt = 0;
+    unsigned int uuid_len  = 0;
+    unsigned int uuid_offt = 0;
 
     while (uuid_len + 1 < str_len) {
-        if ((4  == uuid_offt || 6 == uuid_offt || 8 == uuid_offt ||
-             10 == uuid_offt) && str[uuid_len] == '-') {
+        /* We are skipping potential '-' after uuid_offt == 4, 6, 8, 10
+         * which means
+         *     (uuid_offt >> 1) == 2, 3, 4, 5,
+         * which in turn means
+         *     (uuid_offt >> 1) - 2 <= 3
+         * since it is always >= 0, because uuid_offt is unsigned */
+        if (((uuid_offt >> 1) - 2) <= 3 && str[uuid_len] == '-') {
             // skip dashes after 4th, 6th, 8th and 10th positions
             uuid_len += 1;
             continue;
         }
+
         if (isxdigit(str[uuid_len]) && isxdigit(str[uuid_len + 1])) {
-            // got hex digit
+            // got hex digit, scan another byte to uuid, increment uuid_offt
             sscanf (str + uuid_len, "%2hhx", uuid->uuid + uuid_offt);
             uuid_len  += 2;
             uuid_offt += 1;
@@ -61,7 +67,7 @@ wsrep_uuid_scan (const char* str, size_t str_len, wsrep_uuid_t* uuid)
  * @return length of UUID string representation or -EMSGSIZE if string is too
  *         short
  */
-ssize_t
+int
 wsrep_uuid_print (const wsrep_uuid_t* uuid, char* str, size_t str_len)
 {
     if (str_len > 36) {