webserver: comparison src/server/plugins/postgresql/vfs.c

-:f78a585e1a2f
+:77506ec632a4
 contentlength,\n\
 etag,\n\
 regexp_split_to_array($1, '/') as pathelm,\n\
 1 as pathdepth\n\
 from Resource\n\
-where parent_id is null\n\
+where resource_id = $2\n\
 union\n\
 select\n\
 r.resource_id,\n\
 r.parent_id,\n\
 p.fullpath || '/' || r.nodename,\n\
 select resource_id, parent_id, fullpath, resoid, iscollection, lastmodified, creationdate, contentlength, etag from resolvepath\n\
 where fullpath = $1 ;";
 // Same as sql_resolve_path, but it returns the root collection
 // params: $1: path string (should be '/')
-static const char *sql_get_root = "select resource_id, parent_id, $1 as fullpath, resoid, true as iscollection, lastmodified, creationdate, contentlength, etag from Resource where parent_id is null;";
+static const char *sql_get_root = "select resource_id, parent_id, $1 as fullpath, resoid, true as iscollection, lastmodified, creationdate, contentlength, etag from Resource where resource_id = $2;";
 // Get all children of a specific collection
 // params: $1: parent resource_id
 static const char *sql_get_children = "select resource_id, nodename, iscollection, lastmodified, creationdate, contentlength, etag from Resource where parent_id = $1;";
 log_ereport(LOG_MISCONFIG, "postgresql vfs: resource pool %s not found", resource_pool);
 return NULL;
 }
 // resdata will be freed automatically when the request is finished
-return pg_vfs_create_from_resourcedata(sn, rq, resdata);
+return pg_vfs_create_from_resourcedata(sn, rq, repo, resdata);
 }
-VFS* pg_vfs_create_from_resourcedata(Session *sn, Request *rq, ResourceData *resdata) {
+VFS* pg_vfs_create_from_resourcedata(Session *sn, Request *rq, PgRepository *repo, ResourceData *resdata) {
 // Create a new VFS object and a separate instance object
 // VFS contains fptrs that can be copied from pg_vfs_class
 // instance contains request specific data (PGconn)
 VFS *vfs = pool_malloc(sn->pool, sizeof(VFS));
 if(!vfs) {
 pool_free(sn->pool, vfs);
 return NULL;
 }
 vfs_priv->connection = resdata->data;
 vfs_priv->pg_resource = resdata;
+vfs_priv->root_resource_id = repo->root_resource_id;
+snprintf(vfs_priv->root_resource_id_str, 32, "%" PRId64, repo->root_resource_id);
 memcpy(vfs, &pg_vfs_class, sizeof(VFS));
 vfs->flags = 0;
 vfs->instance = vfs_priv;
 int pg_resolve_path(
 PGconn *connection,
 const char *path,
+const char *root_id,
 int64_t *parent_id,
 int64_t *resource_id,
 Oid *oid,
 const char **resource_name,
 WSBool *iscollection,
 }
 // get last node of path
 *resource_name = util_resource_name(path);
 const char *sql = pathlen == 1 ? sql_get_root : sql_resolve_path;
+const char* params[2] = { path, root_id };
 PGresult *result = PQexecParams(
 connection,
 sql,
-1,     // number of parameters
+2,     // number of parameters
 NULL,
-&path, // parameter value
+params, // parameter value
 NULL,
 NULL,
 0);    // 0: result in text format
 if(pathf) {
 resource_id = -1;
 parent_id = -1;
 WSBool iscollection;
 Oid unused_oid = 0;
-int err = pg_resolve_path(pg->connection, parent_path, &parent_id, &resource_id, &unused_oid, &resname, &iscollection, NULL, NULL, &ctx->vfs_errno);
+int err = pg_resolve_path(
+pg->connection,
+parent_path,
+pg->root_resource_id_str,
+&parent_id,
+&resource_id,
+&unused_oid,
+&resname,
+&iscollection,
+NULL,
+NULL,
+&ctx->vfs_errno);
 FREE(parent_path);
 if(err) {
 ctx->vfs_errno = ENOENT;
 if(pathf) free(pathf);
 return 1;
 parent_id = -1;
 WSBool iscollection;
 struct stat s;
 char etag[PG_ETAG_MAXLEN];
 Oid oid = 0;
-if(pg_resolve_path(pg->connection, path, &parent_id, &resource_id, &oid, &resname, &iscollection, &s, etag, &ctx->vfs_errno)) {
+if(pg_resolve_path(pg->connection, path, pg->root_resource_id_str, &parent_id, &resource_id, &oid, &resname, &iscollection, &s, etag, &ctx->vfs_errno)) {
 if((oflags & O_CREAT) == O_CREAT) {
 if(pg_create_file(ctx, pg, path, &resource_id, &parent_id, &oid, &resname, &s, FALSE)) {
 return NULL;
 }
 iscollection = 0;
 PgVFS *pg = vfs->instance;
 int64_t parent_id, resource_id;
 const char *resname;
 WSBool iscollection;
-return pg_resolve_path(pg->connection, path, &parent_id, &resource_id, NULL, &resname, &iscollection, buf, NULL, &ctx->vfs_errno);
+return pg_resolve_path(pg->connection, path, pg->root_resource_id_str, &parent_id, &resource_id, NULL, &resname, &iscollection, buf, NULL, &ctx->vfs_errno);
 }
 int pg_vfs_fstat(VFSContext *ctx, SYS_FILE fd, struct stat *buf) {
 PgFile *pgfile = fd->data;
 memcpy(buf, &pgfile->s, sizeof(struct stat));
 resource_id = -1;
 parent_id = -1;
 WSBool iscollection;
 struct stat s;
 Oid oid = 0;
-if(!pg_resolve_path(pg->connection, path, &parent_id, &resource_id, &oid, &resname, &iscollection, &s, NULL, &ctx->vfs_errno)) {
+if(!pg_resolve_path(pg->connection, path, pg->root_resource_id_str, &parent_id, &resource_id, &oid, &resname, &iscollection, &s, NULL, &ctx->vfs_errno)) {
 ctx->vfs_errno = EEXIST;
 return 1;
 }
 if(pg_create_file(ctx, pg, path, NULL, NULL, NULL, NULL, NULL, TRUE)) {
 int64_t resource_id, parent_id;
 resource_id = -1;
 parent_id = -1;
 WSBool iscollection;
 Oid oid = 0;
-if(pg_resolve_path(pg->connection, path, &parent_id, &resource_id, &oid, &resname, &iscollection, NULL, NULL, &ctx->vfs_errno)) {
+if(pg_resolve_path(pg->connection, path, pg->root_resource_id_str, &parent_id, &resource_id, &oid, &resname, &iscollection, NULL, NULL, &ctx->vfs_errno)) {
 return 1;
 }
 if(iscollection) {
 ctx->vfs_errno = EISDIR;
 const char *resname;
 int64_t resource_id, parent_id;
 resource_id = -1;
 parent_id = -1;
 WSBool iscollection;
-if(pg_resolve_path(pg->connection, path, &parent_id, &resource_id, NULL, &resname, &iscollection, NULL, NULL, &ctx->vfs_errno)) {
+if(pg_resolve_path(pg->connection, path, pg->root_resource_id_str, &parent_id, &resource_id, NULL, &resname, &iscollection, NULL, NULL, &ctx->vfs_errno)) {
 return 1;
 }
 if(!iscollection) {
 ctx->vfs_errno = ENOTDIR;

Mercurial > hg > webserver / file comparison

comparison: src/server/plugins/postgresql/vfs.c

src/server/plugins/postgresql/vfs.c