Ticket #178: metadata_and_mvcms_register.patch

xapian-core/tests/api_metadata.cc

@@ -122 +122 @@
 }
 
 // Test metadata iterators.
-DEFINE_TESTCASE(metadata5, writable) {
+DEFINE_TESTCASE(metadata5, writable && !remote) {
     Xapian::WritableDatabase db = get_writable_database();
 
     // Check that iterator on empty database returns nothing.

xapian-core/tests/harness/testrunner.cc

@@ -58 +58 @@
                "synonyms,replicas,flint" },
     { "multi_flint", "backend,positional,multi" },
     { "multi_chert", "backend,positional,valuestats,multi" },
-    { "remoteprog_flint", "backend,remote,transactions,positional,writable" },
-    { "remotetcp_flint", "backend,remote,transactions,positional,writable" },
-    { "remoteprog_chert", "backend,remote,transactions,positional,valuestats,writable" },
-    { "remotetcp_chert", "backend,remote,transactions,positional,valuestats,writable" },
+    { "remoteprog_flint", "backend,remote,transactions,positional,writable,metadata" },
+    { "remotetcp_flint", "backend,remote,transactions,positional,writable,metadata" },
+    { "remoteprog_chert", "backend,remote,transactions,positional,valuestats,writable,metadata" },
+    { "remotetcp_chert", "backend,remote,transactions,positional,valuestats,writable,metadata" },
     { NULL, NULL }
 };
 

xapian-core/net/remoteserver.cc

@@ -185 +185 @@
                 &RemoteServer::msg_replacedocumentterm,
                 &RemoteServer::msg_deletedocument,
                 &RemoteServer::msg_writeaccess,
+                &RemoteServer::msg_getmetadata,
+                &RemoteServer::msg_setmetadata,
                 // MSG_GETMSET - used during a conversation.
                 // MSG_SHUTDOWN - handled by get_message().
             };
@@ -658 +660 @@
 
     send_message(REPLY_ADDDOCUMENT, encode_length(did));
 }
+
+
+void
+RemoteServer::msg_getmetadata(const string & message)
+{
+  send_message(REPLY_METADATA, db->get_metadata(message));
+}
+
+void
+RemoteServer::msg_setmetadata(const string & message)
+{               
+  if (!wdb)
+    throw Xapian::InvalidOperationError("Server is read-only");
+  const char *p = message.data();
+  const char *p_end = p + message.size();
+  size_t keylen = decode_length(&p, p_end, false);
+  string key = string(p, keylen);
+  p += keylen;
+  string val = string(p);
+  wdb->set_metadata(key, val);
+}

xapian-core/common/remote-database.h

@@ -241 +241 @@
                                    const Xapian::Document & document);
 
     std::string get_uuid() const;
+
+    string get_metadata(const string & key) const;
+
+    void set_metadata(const string & key, const string & value);
 };
 
 #endif // XAPIAN_INCLUDED_REMOTE_DATABASE_H

xapian-core/common/remoteprotocol.h

@@ -73 +73 @@
     MSG_REPLACEDOCUMENTTERM,    // Replace Document by term
     MSG_DELETEDOCUMENT,         // Delete Document
     MSG_WRITEACCESS,            // Upgrade to WritableDatabase
+    MSG_GETMETADATA,            // get metadata
+    MSG_SETMETADATA,            // set metadata
     MSG_GETMSET,                // Get MSet
     MSG_SHUTDOWN,               // Shutdown
     MSG_MAX
@@ -100 +102 @@
     REPLY_VALUE,                // Document Value
     REPLY_ADDDOCUMENT,          // Add Document
     REPLY_RESULTS,              // Results (MSet)
+    REPLY_METADATA,             // Metadata
     REPLY_MAX
 };
 

xapian-core/common/remoteserver.h

@@ -142 +142 @@
     // replace document with unique term
     void msg_replacedocumentterm(const std::string & message);
 
+    // get metadata
+    void msg_getmetadata(const std::string & message);
+
+    // set metadata
+    void msg_setmetadata(const std::string & message);
+
+
   public:
     /** Construct a RemoteServer.
      *

xapian-core/api/registry.cc

@@ -194 +194 @@
     Xapian::MatchSpy * spy;
     spy = new Xapian::ValueCountMatchSpy();
     matchspies[spy->name()] = spy;
+
+    Xapian::MatchSpy * mvspy;
+    mvspy = new Xapian::MultiValueCountMatchSpy();
+    matchspies[mvspy->name()] = mvspy;
 }
 
 void

xapian-core/backends/remote/remote-database.cc

@@ -723 +723 @@
 {
     return uuid;
 }
+
+
+string
+RemoteDatabase::get_metadata(const string & key) const
+{
+  send_message(MSG_GETMETADATA, key);
+  string metadata;
+  get_message(metadata, REPLY_METADATA);
+  return metadata;
+}
+
+void
+RemoteDatabase::set_metadata(const string & key, const string & value)
+{
+  string data = encode_length(key.size());
+  data += key;
+  data += value;
+  send_message(MSG_SETMETADATA, data);
+}