Merge lp:~brianlmoon/gearmand/sqlite-replace into lp:gearmand/1.0

[Brian Moon]

This will make both function_name and unique_id be the unique key on the SQL based persistent queue storage. That makes it the same as the in memory queue.

=== modified file 'libgearman-server/queue_libdrizzle.c'
--- libgearman-server/queue_libdrizzle.c	2010-04-02 02:04:04 +0000
+++ libgearman-server/queue_libdrizzle.c	2010-04-16 02:18:16 +0000
@@ -221,10 +221,11 @@
     snprintf(create, 1024,
              "CREATE TABLE %s"
              "("
-               "unique_key VARCHAR(%d) PRIMARY KEY,"
+               "unique_key VARCHAR(%d),"
                "function_name VARCHAR(255),"
                "priority INT,"
-               "data LONGBLOB"
+               "data LONGBLOB,"
+               "unique key (unique_key, function_name)"
              ")",
              queue->table, GEARMAN_UNIQUE_SIZE);
 
@@ -355,7 +356,7 @@
     query= queue->query;
 
   query_size= (size_t)snprintf(query, query_size,
-                               "INSERT INTO %s SET priority=%u,unique_key='",
+                               "REPLACE INTO %s SET priority=%u,unique_key='",
                                queue->table, (uint32_t)priority);
 
   query_size+= (size_t)drizzle_escape_string(query + query_size, unique,
@@ -426,6 +427,11 @@
   memcpy(query + query_size, "'", 1);
   query_size+= 1;
 
+  query_size+= (size_t)drizzle_escape_string(query + query_size, function_name,
+                                             function_name_size);
+  memcpy(query + query_size, "'", 1);
+  query_size+= 1;
+  
   if (_libdrizzle_query(server, queue, query, query_size) != DRIZZLE_RETURN_OK)
     return GEARMAN_QUEUE_ERROR;
 
 
=== modified file 'libgearman-server/queue_libpq.c'
--- libgearman-server/queue_libpq.c	2010-04-02 02:04:04 +0000
+++ libgearman-server/queue_libpq.c	2010-04-16 02:18:16 +0000
@@ -170,10 +170,11 @@
     snprintf(create, 1024,
              "CREATE TABLE %s"
              "("
-               "unique_key VARCHAR(%d) PRIMARY KEY,"
+               "unique_key VARCHAR(%d),"
                "function_name VARCHAR(255),"
                "priority INTEGER,"
-               "data BYTEA"
+               "data BYTEA,"
+               "UNIQUE KEY (unique_key, function_name)"
              ")",
              queue->table, GEARMAN_UNIQUE_SIZE);
 
@@ -355,6 +356,12 @@
                                   unique_size, NULL);
   memcpy(query + query_size, "'", 1);
   query_size+= 1;
+  
+  query_size+= PQescapeStringConn(queue->con, query + query_size, function_name,
+                                  function_name_size, NULL);
+  memcpy(query + query_size, "'", 1);
+  query_size+= 1;
+  
   query[query_size]= 0;
 
   result= PQexec(queue->con, query);
 
=== modified file 'libgearman-server/queue_libsqlite3.c'
--- libgearman-server/queue_libsqlite3.c	2010-04-02 02:04:04 +0000
+++ libgearman-server/queue_libsqlite3.c	2010-04-16 02:18:16 +0000
@@ -207,10 +207,11 @@
     snprintf(create, SQLITE_MAX_CREATE_TABLE_SIZE,
              "CREATE TABLE %s"
              "("
-             "unique_key TEXT PRIMARY KEY,"
+             "unique_key TEXT,"
              "function_name TEXT,"
              "priority INTEGER,"
-             "data BLOB"
+             "data BLOB,"
+             "PRIMARY KEY (unique_key, function_name)"
              ")",
              queue->table);
 
@@ -601,13 +602,14 @@
     query= queue->query;
 
   query_size= (size_t)snprintf(query, query_size,
-                               "DELETE FROM %s WHERE unique_key=?",
+                               "DELETE FROM %s WHERE unique_key=? and function_name=?",
                                queue->table);
 
   if (_sqlite_query(server, queue, query, query_size, &sth) != SQLITE_OK)
     return GEARMAN_QUEUE_ERROR;
 
   sqlite3_bind_text(sth, 1, unique, (int)unique_size, SQLITE_TRANSIENT);
+  sqlite3_bind_text(sth, 2, function_name, (int)function_name_size, SQLITE_TRANSIENT);
 
   if (sqlite3_step(sth) != SQLITE_DONE)
   {