Changeset 612

Timestamp:

05/06/08 17:30:57 (6 months ago)

Author:

smoku

Message:

Changed order of subdirs building

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• storage/storage_pgsql.c (modified) (6 diffs)

trunk/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST = Doxyfile.in README.win32 README.protocol contrib UPGRADE
 
-SUBDIRS = etc tools man mio sx util c2s router s2s sm storage
-
-.PHONY: docs
-
+SUBDIRS = etc man
 if USE_LIBSUBST
 SUBDIRS += subst
 endif
+SUBDIRS += tools mio sx util c2s router s2s sm storage
+
+.PHONY: docs
 
 docs: Doxyfile

trunk/storage/storage_pgsql.c

@@ -35 +35 @@
     char *prefix;
 
-    xht filters;
-    
     int txn;
 } *drvdata_t;
@@ -139 +137 @@
 static char *_st_pgsql_convert_filter(st_driver_t drv, const char *owner, const char *filter) {
     drvdata_t data = (drvdata_t) drv->private;
-    char *buf = NULL, *sbuf = NULL, *cfilter;
-    int buflen = 0, nbuf = 0, fbuf;
+    char *buf = NULL;
+    int buflen = 0, nbuf = 0;
     st_filter_t f;
 
@@ -146 +144 @@
 
     nbuf = sprintf(buf, "\"collection-owner\" = '%s'", owner);
-
-    sbuf = xhash_get(data->filters, filter);
-    if(sbuf != NULL) {
-        PGSQL_SAFE(buf, buflen + strlen(sbuf) + 7, buflen);
-        nbuf += sprintf(&buf[nbuf], " AND %s", sbuf);
-        return buf;
-    }
-
-    cfilter = pstrdup(xhash_pool(data->filters), filter);
 
     f = storage_filter(filter);
@@ -163 +152 @@
     nbuf += sprintf(&buf[nbuf], " AND ");
 
-    fbuf = nbuf;
-
     _st_pgsql_convert_filter_recursive(drv, f, &buf, &buflen, &nbuf);
-
-    xhash_put(data->filters, cfilter, pstrdup(xhash_pool(data->filters), &buf[fbuf]));
 
     pool_free(f->p);
@@ -647 +632 @@
     PQfinish(data->conn);
 
-    xhash_free(data->filters);
-
     free(data);
 }
@@ -681 +664 @@
 
     data->conn = conn;
-
-    data->filters = xhash_new(17);
 
     if(config_get_one(drv->st->sm->config, "storage.pgsql.transactions", 0) != NULL)