Add a tinycdb-based nosql SCA component and integrate with server. Add a version of the store test that works with the nosql component.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@935459 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 249 insertions, 60 deletions

diff --git a/sca-cpp/trunk/components/nosqldb/Makefile.am b/sca-cpp/trunk/components/nosqldb/Makefile.am
index 6a9b0bdfdd..608de23527 100644
--- a/sca-cpp/trunk/components/nosqldb/Makefile.am
+++ b/sca-cpp/trunk/components/nosqldb/Makefile.am
@@ -19,16 +19,17 @@ if WANT_NOSQLDB
 
 INCLUDES = -I${TINYCDB_INCLUDE}
 
+comp_SCRIPTS = tinycdb
 compdir=$(prefix)/components/nosqldb
 
 comp_DATA = tinycdb.prefix
 tinycdb.prefix: $(top_builddir)/config.status
 	echo ${TINYCDB_PREFIX} >tinycdb.prefix
 
-#comp_LTLIBRARIES = libnosqldb.la
+comp_LTLIBRARIES = libnosqldb.la
 
-#libnosqldb_la_SOURCES = nosqldb.cpp
-#libnosqldb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb
+libnosqldb_la_SOURCES = nosqldb.cpp
+libnosqldb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb
 
 tinycdb_test_SOURCES = tinycdb-test.cpp
 tinycdb_test_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb
@@ -37,6 +38,6 @@ client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
 noinst_PROGRAMS = tinycdb-test client-test
-TESTS = nosqldb-test 
+TESTS = nosqldb-test server-test
 
 endif
diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb-test b/sca-cpp/trunk/components/nosqldb/nosqldb-test
index d1f9746860..30c9f89bc9 100755
--- a/sca-cpp/trunk/components/nosqldb/nosqldb-test
+++ b/sca-cpp/trunk/components/nosqldb/nosqldb-test
@@ -19,13 +19,10 @@
 
 # Setup
 mkdir -p tmp
-rm -f tmp/db.cdb
-cat >tmp/db.txt <<EOF
-EOF
-./tinycdb -c -m tmp/db.cdb <tmp/db.txt
+./tinycdb -c -m tmp/test.cdb </dev/null
 
 # Test
-./tinycdb-test # 2>/dev/null
+./tinycdb-test 2>/dev/null
 rc=$?
 
 # Cleanup
diff --git a/sca-cpp/trunk/components/nosqldb/store.composite b/sca-cpp/trunk/components/nosqldb/nosqldb.composite
index ccfd61fc4d..812f0739fe 100644
--- a/sca-cpp/trunk/components/nosqldb/store.composite
+++ b/sca-cpp/trunk/components/nosqldb/nosqldb.composite
@@ -20,12 +20,13 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://tuscany.apache.org/xmlns/sca/components"
-  name="store">
+  name="nosqldb">
         
-    <component name="store">
-        <implementation.cpp path=".libs" library="libstore"/>
-        <service name="store">
-            <t:binding.http uri="store"/>
+    <component name="nosqldb">
+        <implementation.cpp path=".libs" library="libnosqldb"/>
+        <property name="dbname">tmp/test.cdb</property>
+        <service name="nosqldb">
+            <t:binding.http uri="nosqldb"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb.cpp b/sca-cpp/trunk/components/nosqldb/nosqldb.cpp
new file mode 100644
index 0000000000..638434c26f
--- /dev/null
+++ b/sca-cpp/trunk/components/nosqldb/nosqldb.cpp
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* $Rev$ $Date$ */
+
+/**
+ * TinyCDB-based database component implementation.
+ */
+
+#include <apr_uuid.h>
+
+#include "string.hpp"
+
+#include "function.hpp"
+#include "list.hpp"
+#include "value.hpp"
+#include "monad.hpp"
+#include "tinycdb.hpp"
+
+namespace tuscany {
+namespace nosqldb {
+
+/**
+ * Get an item from the database.
+ */
+const failable<value> get(const list<value>& params, tinycdb::TinyCDB& cdb) {
+    return tinycdb::get(car(params), cdb);
+}
+
+/**
+ * Post an item to the database.
+ */
+const value uuidValue() {
+    apr_uuid_t uuid;
+    apr_uuid_get(&uuid);
+    char buf[APR_UUID_FORMATTED_LENGTH];
+    apr_uuid_format(buf, &uuid);
+    return value(string(buf, APR_UUID_FORMATTED_LENGTH));
+}
+
+const failable<value> post(const list<value>& params, tinycdb::TinyCDB& cdb) {
+    const value id = append<value>(car(params), mklist(uuidValue()));
+    const failable<bool> val = tinycdb::post(id, cadr(params), cdb);
+    if (!hasContent(val))
+        return mkfailure<value>(reason(val));
+    return id;
+}
+
+/**
+ * Put an item into the database.
+ */
+const failable<value> put(const list<value>& params, tinycdb::TinyCDB& cdb) {
+    const failable<bool> val = tinycdb::put(car(params), cadr(params), cdb);
+    if (!hasContent(val))
+        return mkfailure<value>(reason(val));
+    return value(content(val));
+}
+
+/**
+ * Delete an item from the database.
+ */
+const failable<value> del(const list<value>& params, tinycdb::TinyCDB& cdb) {
+    const failable<bool> val = tinycdb::del(car(params), cdb);
+    if (!hasContent(val))
+        return mkfailure<value>(reason(val));
+    return value(content(val));
+}
+
+/**
+ * Component implementation lambda function.
+ */
+class applyNoSqldb {
+public:
+    applyNoSqldb(tinycdb::TinyCDB& cdb) : cdb(cdb) {
+    }
+
+    const value operator()(const list<value>& params) const {
+        const value func(car(params));
+        if (func == "get")
+            return get(cdr(params), cdb);
+        if (func == "post")
+            return post(cdr(params), cdb);
+        if (func == "put")
+            return put(cdr(params), cdb);
+        if (func == "delete")
+            return del(cdr(params), cdb);
+        return tuscany::mkfailure<tuscany::value>();
+    }
+
+private:
+    tinycdb::TinyCDB& cdb;
+};
+
+/**
+ * Start the component.
+ */
+const failable<value> start(unused const list<value>& params) {
+    // Connect to the configured database and table
+    const value dbname = ((lambda<value(list<value>)>)car(params))(list<value>());
+    tinycdb::TinyCDB& cdb = *(new (gc_new<tinycdb::TinyCDB>()) tinycdb::TinyCDB(dbname));
+
+    // Return the component implementation lambda function
+    return value(lambda<value(const list<value>&)>(applyNoSqldb(cdb)));
+}
+
+}
+}
+
+extern "C" {
+
+const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
+    const tuscany::value func(car(params));
+    if (func == "start")
+        return tuscany::nosqldb::start(cdr(params));
+    return tuscany::mkfailure<tuscany::value>();
+}
+
+}
diff --git a/sca-cpp/trunk/components/nosqldb/server-test b/sca-cpp/trunk/components/nosqldb/server-test
index 784c7156c5..5a5d792a32 100755
--- a/sca-cpp/trunk/components/nosqldb/server-test
+++ b/sca-cpp/trunk/components/nosqldb/server-test
@@ -23,12 +23,10 @@
 ../../modules/server/scheme-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
 SCAContribution `pwd`/
-SCAComposite sqldb.composite
+SCAComposite nosqldb.composite
 EOF
 
-./pgsql-start tmp
-./pgsql "drop table test;" 1>/dev/null 2>&1
-./pgsql "create table test(key text, value text);" 1>/dev/null 2>&1
+./tinycdb -c -m tmp/test.cdb </dev/null
 ../../modules/http/httpd-start tmp
 sleep 2
 
@@ -38,6 +36,5 @@ rc=$?
 
 # Cleanup
 ../../modules/http/httpd-stop tmp
-./pgsql-stop tmp
 sleep 2
 return $rc
diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp b/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp
index 4eeb92d3fc..b3b4ea7fd7 100644
--- a/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp
+++ b/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp
@@ -33,7 +33,7 @@ namespace tuscany {
 namespace tinycdb {
 
 bool testTinyCDB() {
-    TinyCDB cdb("tmp/db.cdb");
+    TinyCDB cdb("tmp/test.cdb");
     const value k = mklist<value>("a");
 
     assert(hasContent(post(k, string("AAA"), cdb)));
@@ -59,7 +59,7 @@ struct getLoop {
 
 bool testGetPerf() {
     const value k = mklist<value>("c");
-    TinyCDB cdb("tmp/db.cdb");
+    TinyCDB cdb("tmp/test.cdb");
     assert(hasContent(post(k, string("CCC"), cdb)));
 
     const lambda<bool()> gl = getLoop(k, cdb);
diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb.hpp b/sca-cpp/trunk/components/nosqldb/tinycdb.hpp
index c2d1f2c50f..b98d622e25 100644
--- a/sca-cpp/trunk/components/nosqldb/tinycdb.hpp
+++ b/sca-cpp/trunk/components/nosqldb/tinycdb.hpp
@@ -23,6 +23,8 @@
 #define tuscany_tinycdb_hpp
 
 #include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
 #include <cdb.h>
 
 #include "string.hpp"
@@ -92,16 +94,16 @@ const bool free(const buffer&b) {
  */
 class TinyCDB {
 public:
-    TinyCDB() : owner(false) {
+    TinyCDB() : owner(false), fd(-1) {
+        st.st_ino = 0;
     }
 
-    TinyCDB(const string& file) : owner(true), file(file) {
-        fd = open(c_str(file), O_RDONLY);
+    TinyCDB(const string& name) : owner(true), name(name), fd(-1) {
+        st.st_ino = 0;
     }
 
-    TinyCDB(const TinyCDB& c) : owner(false) {
-        file = c.file;
-        fd = c.fd;
+    TinyCDB(const TinyCDB& c) : owner(false), name(c.name), fd(c.fd) {
+        st.st_ino = c.st.st_ino;
     }
 
     ~TinyCDB() {
@@ -114,43 +116,90 @@ public:
 
 private:
     bool owner;
-    string file;
+    string name;
     int fd;
-
-    friend const failable<bool> post(const value& key, const value& val, TinyCDB& cdb);
-    friend const failable<bool> put(const value& key, const value& val, const TinyCDB& cdb);
-    friend const failable<value> get(const value& key, const TinyCDB& cdb);
-    friend const failable<bool> del(const value& key, const TinyCDB& cdb);
-    friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, TinyCDB& cdb);
-    friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb);
+    struct stat st;
+
+    //friend const failable<bool> post(const value& key, const value& val, TinyCDB& cdb);
+    //friend const failable<bool> put(const value& key, const value& val, TinyCDB& cdb);
+    //friend const failable<value> get(const value& key, const TinyCDB& cdb);
+    //friend const failable<bool> del(const value& key, TinyCDB& cdb);
+    //friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, TinyCDB& cdb);
+    //friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb);
+
+    friend const string dbname(const TinyCDB& cdb);
+    friend const failable<int> cdbopen(TinyCDB& cdb);
+    friend const failable<bool> cdbclose(TinyCDB& cdb);
 };
 
 /**
+ * Return the name of the database.
+ */
+const string dbname(const TinyCDB& cdb) {
+    return cdb.name;
+}
+
+/**
+ * Open a database.
+ */
+const failable<int> cdbopen(TinyCDB& cdb) {
+    struct stat st;
+    int s = stat(c_str(cdb.name), &st);
+    if (s == -1)
+        return mkfailure<int>(string("Couldn't read database stat ") + cdb.name);
+    if (st.st_ino != cdb.st.st_ino || cdb.fd == -1) {
+        if (cdb.fd != -1)
+            close(cdb.fd);
+        cdb.fd = open(c_str(cdb.name), O_RDONLY);
+        if (cdb.fd == -1)
+            return mkfailure<int>(string("Couldn't open database file ") + cdb.name);
+        debug(cdb.fd, "tinycdb::open::fd");
+        cdb.st = st;
+    }
+    return cdb.fd;
+}
+
+/**
+ * Close a database.
+ */
+const failable<bool> cdbclose(TinyCDB& cdb) {
+    close(cdb.fd);
+    cdb.fd = -1;
+    return true;
+}
+
+/**
  * Rewrite a database. The given update function is passed each entry, and
  * can return true to let the entry added to the new db, false to skip the
  * entry, or a failure.
  */
-const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb) {
+const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, buffer& buf, const int tmpfd, TinyCDB& cdb) {
 
     // Initialize new db structure
     struct cdb_make cdbm;
-    cdb_make_start(&cdbm, fd);
+    cdb_make_start(&cdbm, tmpfd);
+
+    // Open existing db
+    failable<int> ffd = cdbopen(cdb);
+    if (!hasContent(ffd))
+        return mkfailure<bool>(reason(ffd));
+    const int fd = content(ffd);
 
     // Read the db header
     unsigned int pos = 0;
-    if (lseek(cdb.fd, 0, SEEK_SET) != 0)
+    if (lseek(fd, 0, SEEK_SET) != 0)
         return mkfailure<bool>("Could not seek to database start");
-    if (::read(cdb.fd, buf, 2048) != 2048)
+    if (::read(fd, buf, 2048) != 2048)
         return mkfailure<bool>("Could not read database header");
     pos += 2048;
     unsigned int eod = cdb_unpack(buf);
-    debug(pos, "tinycdb::post::eod");
+    debug(pos, "tinycdb::rewrite::eod");
 
     // Read and add the existing entries
     while(pos < eod) {
         if (eod - pos < 8)
             return mkfailure<bool>("Invalid database format, couldn't read entry header");
-        if (::read(cdb.fd, buf, 8) != 8)
+        if (::read(fd, buf, 8) != 8)
             return mkfailure<bool>("Couldn't read entry header");
         pos += 8;
         unsigned int klen = cdb_unpack(buf);
@@ -161,13 +210,13 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
         buf = mkbuffer(buf, elen);
         if (eod - pos < elen)
             return mkfailure<bool>("Invalid database format, couldn't read entry");
-        if ((unsigned int)::read(cdb.fd, buf, elen) != elen)
+        if ((unsigned int)::read(fd, buf, elen) != elen)
             return mkfailure<bool>("Couldn't read entry");
         pos += elen;
 
         // Apply the update function to the entry
-        debug(string((char*)buf, klen), "tinycdb::post::existing key");
-        debug(string(((char*)buf) + klen, vlen), "tinycdb::post::existing value");
+        debug(string((char*)buf, klen), "tinycdb::rewrite::existing key");
+        debug(string(((char*)buf) + klen, vlen), "tinycdb::rewrite::existing value");
         const failable<bool> u = update(buf, klen, vlen);
         if (!hasContent(u))
             return u;
@@ -196,30 +245,29 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
 }
 
 const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, TinyCDB& cdb) {
-    if (cdb.fd == -1)
-        return mkfailure<bool>("Could not open database");
 
     // Create a new temporary db file
-    const char* tmpfile = c_str(cdb.file + ".tmp");
-    unlink(tmpfile);
-    int fd = open(tmpfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0666);
-    if (fd == -1)
+    string tmpname = dbname(cdb) + ".XXXXXX";
+    int tmpfd = mkstemp(const_cast<char*>(c_str(tmpname)));
+    if (tmpfd == -1)
         return mkfailure<bool>("Could not create temporary database");
 
     // Rewrite the db, apply the update function to each entry
     buffer buf = mkbuffer(2048);
-    const failable<bool> r = rewrite(update, finish, buf, fd, cdb);
+    const failable<bool> r = rewrite(update, finish, buf, tmpfd, cdb);
     if (!hasContent(r)) {
-        close(fd);
+        close(tmpfd);
         free(buf);
         return r;
     }
 
     // Atomically replace the db and reopen it in read mode
-    if (rename(tmpfile, c_str(cdb.file)) == -1)
+    if (rename(c_str(tmpname), c_str(dbname(cdb))) == -1)
         return mkfailure<bool>("Could not rename temporary database");
-    close(cdb.fd);
-    cdb.fd = open(c_str(cdb.file), O_RDONLY);
+    cdbclose(cdb);
+    failable<int> ffd = cdbopen(cdb);
+    if (!hasContent(ffd))
+        return mkfailure<bool>(reason(ffd));
 
     return true;
 }
@@ -230,6 +278,7 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
 const failable<bool> post(const value& key, const value& val, TinyCDB& cdb) {
     debug(key, "tinycdb::post::key");
     debug(val, "tinycdb::post::value");
+    debug(dbname(cdb), "tinycdb::post::dbname");
 
     const string ks(scheme::writeValue(key));
     const string vs(scheme::writeValue(val));
@@ -260,6 +309,7 @@ const failable<bool> post(const value& key, const value& val, TinyCDB& cdb) {
 const failable<bool> put(const value& key, const value& val, TinyCDB& cdb) {
     debug(key, "tinycdb::put::key");
     debug(val, "tinycdb::put::value");
+    debug(dbname(cdb), "tinycdb::put::dbname");
 
     const string ks(scheme::writeValue(key));
     const string vs(scheme::writeValue(val));
@@ -287,18 +337,22 @@ const failable<bool> put(const value& key, const value& val, TinyCDB& cdb) {
 /**
  * Get an item from the database.
  */
-const failable<value> get(const value& key, const TinyCDB& cdb) {
+const failable<value> get(const value& key, TinyCDB& cdb) {
     debug(key, "tinycdb::get::key");
-    if (cdb.fd == -1)
-        return mkfailure<value>("Could not open database");
+    debug(dbname(cdb), "tinycdb::get::dbname");
+
+    const failable<int> ffd = cdbopen(cdb);
+    if (!hasContent(ffd))
+        return mkfailure<value>(reason(ffd));
+    const int fd = content(ffd);
 
     const string ks(scheme::writeValue(key));
 
     cdbi_t vlen;
-    if (cdb_seek(cdb.fd, c_str(ks), length(ks), &vlen) <= 0)
+    if (cdb_seek(fd, c_str(ks), length(ks), &vlen) <= 0)
         return mkfailure<value>("Could not get entry");
     char* data = gc_cnew(vlen + 1);
-    cdb_bread(cdb.fd, data, vlen);
+    cdb_bread(fd, data, vlen);
     data[vlen] = '\0';
     const value val(scheme::readValue(string(data)));
 
@@ -311,6 +365,7 @@ const failable<value> get(const value& key, const TinyCDB& cdb) {
  */
 const failable<bool> del(const value& key, TinyCDB& cdb) {
     debug(key, "tinycdb::delete::key");
+    debug(dbname(cdb), "tinycdb::delete::dbname");
 
     const string ks(scheme::writeValue(key));
 
diff --git a/sca-cpp/trunk/components/sqldb/pgsql.hpp b/sca-cpp/trunk/components/sqldb/pgsql.hpp
index 25b55cc522..bb37d125b8 100644
--- a/sca-cpp/trunk/components/sqldb/pgsql.hpp
+++ b/sca-cpp/trunk/components/sqldb/pgsql.hpp
@@ -138,6 +138,7 @@ private:
 const failable<bool> post(const value& key, const value& val, const PGSql& pgsql) {
     debug(key, "pgsql::post::key");
     debug(val, "pgsql::post::value");
+    debug(pgsql.conninfo, "pgsql::post::conninfo");
     debug(pgsql.table, "pgsql::post::table");
 
     const string ks(scheme::writeValue(key));
@@ -158,6 +159,7 @@ const failable<bool> post(const value& key, const value& val, const PGSql& pgsql
 const failable<bool> put(const value& key, const value& val, const PGSql& pgsql) {
     debug(key, "pgsql::put::key");
     debug(val, "pgsql::put::value");
+    debug(pgsql.conninfo, "pgsql::put::conninfo");
     debug(pgsql.table, "pgsql::put::table");
 
     const string ks(scheme::writeValue(key));
@@ -188,6 +190,7 @@ const failable<bool> put(const value& key, const value& val, const PGSql& pgsql)
  */
 const failable<value> get(const value& key, const PGSql& pgsql) {
     debug(key, "pgsql::get::key");
+    debug(pgsql.conninfo, "pgsql::get::conninfo");
     debug(pgsql.table, "pgsql::get::table");
 
     const string ks(scheme::writeValue(key));
@@ -212,6 +215,7 @@ const failable<value> get(const value& key, const PGSql& pgsql) {
  */
 const failable<bool> del(const value& key, const PGSql& pgsql) {
     debug(key, "pgsql::delete::key");
+    debug(pgsql.conninfo, "pgsql::delete::conninfo");
     debug(pgsql.table, "pgsql::delete::table");
 
     const string ks(scheme::writeValue(key));