From fe1d17a48f53b10b3bea6b84685dbb3f282e086f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 26 May 2017 18:47:23 +0200 Subject: dbwrap: Remove unused dbwrap_cache Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- lib/dbwrap/dbwrap_cache.c | 227 ---------------------------------------------- lib/dbwrap/dbwrap_cache.h | 28 ------ lib/dbwrap/wscript_build | 2 +- 3 files changed, 1 insertion(+), 256 deletions(-) delete mode 100644 lib/dbwrap/dbwrap_cache.c delete mode 100644 lib/dbwrap/dbwrap_cache.h (limited to 'lib/dbwrap') diff --git a/lib/dbwrap/dbwrap_cache.c b/lib/dbwrap/dbwrap_cache.c deleted file mode 100644 index e4cee558484..00000000000 --- a/lib/dbwrap/dbwrap_cache.c +++ /dev/null @@ -1,227 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Cache db contents for parse_record based on seqnum - Copyright (C) Volker Lendecke 2012 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "replace.h" -#include "lib/param/loadparm.h" -#include "lib/dbwrap/dbwrap_cache.h" -#include "lib/dbwrap/dbwrap_private.h" -#include "lib/dbwrap/dbwrap_rbt.h" -#include "lib/util/talloc_stack.h" - -struct db_cache_ctx { - int seqnum; - struct db_context *backing; - struct db_context *positive; - struct db_context *negative; -}; - -static bool dbwrap_cache_validate(struct db_cache_ctx *ctx) -{ - int backing_seqnum; - - backing_seqnum = dbwrap_get_seqnum(ctx->backing); - if (backing_seqnum == ctx->seqnum) { - return true; - } - - TALLOC_FREE(ctx->positive); - ctx->positive = db_open_rbt(ctx); - if (ctx->positive == NULL) { - return false; - } - - TALLOC_FREE(ctx->negative); - ctx->negative = db_open_rbt(ctx); - if (ctx->negative == NULL) { - return false; - } - - ctx->seqnum = backing_seqnum; - return true; -} - -static NTSTATUS dbwrap_cache_parse_record( - struct db_context *db, TDB_DATA key, - void (*parser)(TDB_DATA key, TDB_DATA data, void *private_data), - void *private_data) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - TDB_DATA value; - NTSTATUS status; - - if (!dbwrap_cache_validate(ctx)) { - return NT_STATUS_NO_MEMORY; - } - - if (dbwrap_exists(ctx->negative, key)) { - return NT_STATUS_NOT_FOUND; - } - status = dbwrap_parse_record(ctx->positive, key, parser, private_data); - if (NT_STATUS_IS_OK(status)) { - return status; - } - - status = dbwrap_fetch(ctx->backing, talloc_tos(), key, &value); - - if (NT_STATUS_IS_OK(status)) { - dbwrap_store(ctx->positive, key, value, 0); - parser(key, value, private_data); - TALLOC_FREE(value.dptr); - return NT_STATUS_OK; - } - - if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { - char c = '\0'; - value.dptr = (uint8_t *)&c; - value.dsize = sizeof(c); - dbwrap_store(ctx->negative, key, value, 0); - return NT_STATUS_NOT_FOUND; - } - return status; -} - -static struct db_record *dbwrap_cache_fetch_locked( - struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - return dbwrap_fetch_locked(ctx->backing, mem_ctx, key); -} - -static int dbwrap_cache_traverse(struct db_context *db, - int (*f)(struct db_record *rec, - void *private_data), - void *private_data) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - NTSTATUS status; - int ret; - status = dbwrap_traverse(ctx->backing, f, private_data, &ret); - if (!NT_STATUS_IS_OK(status)) { - return -1; - } - return ret; -} - -static int dbwrap_cache_traverse_read(struct db_context *db, - int (*f)(struct db_record *rec, - void *private_data), - void *private_data) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - NTSTATUS status; - int ret; - status = dbwrap_traverse_read(ctx->backing, f, private_data, &ret); - if (!NT_STATUS_IS_OK(status)) { - return -1; - } - return ret; -} - -static int dbwrap_cache_get_seqnum(struct db_context *db) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - return dbwrap_get_seqnum(ctx->backing); -} - -static int dbwrap_cache_transaction_start(struct db_context *db) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - return dbwrap_transaction_start(ctx->backing); -} - -static int dbwrap_cache_transaction_commit(struct db_context *db) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - return dbwrap_transaction_commit(ctx->backing); -} - -static int dbwrap_cache_transaction_cancel(struct db_context *db) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - return dbwrap_transaction_cancel(ctx->backing); -} - -static int dbwrap_cache_exists(struct db_context *db, TDB_DATA key) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - - if (ctx->positive && dbwrap_exists(ctx->positive, key)) { - return true; - } - if (ctx->negative && dbwrap_exists(ctx->negative, key)) { - return false; - } - return dbwrap_exists(ctx->backing, key); -} - -static size_t dbwrap_cache_id(struct db_context *db, uint8_t *id, - size_t idlen) -{ - struct db_cache_ctx *ctx = talloc_get_type_abort( - db->private_data, struct db_cache_ctx); - - return dbwrap_db_id(ctx->backing, id, idlen); -} - -struct db_context *db_open_cache(TALLOC_CTX *mem_ctx, - struct db_context *backing) -{ - struct db_context *db; - struct db_cache_ctx *ctx; - - db = talloc_zero(mem_ctx, struct db_context); - if (db == NULL) { - return NULL; - } - ctx = talloc_zero(db, struct db_cache_ctx); - if (ctx == NULL) { - TALLOC_FREE(db); - return NULL; - } - - ctx->seqnum = -1; - ctx->backing = talloc_move(ctx, &backing); - db->private_data = ctx; - if (!dbwrap_cache_validate(ctx)) { - TALLOC_FREE(db); - return NULL; - } - - db->fetch_locked = dbwrap_cache_fetch_locked; - db->traverse = dbwrap_cache_traverse; - db->traverse_read = dbwrap_cache_traverse_read; - db->get_seqnum = dbwrap_cache_get_seqnum; - db->transaction_start = dbwrap_cache_transaction_start; - db->transaction_commit = dbwrap_cache_transaction_commit; - db->transaction_cancel = dbwrap_cache_transaction_cancel; - db->parse_record = dbwrap_cache_parse_record; - db->exists = dbwrap_cache_exists; - db->id = dbwrap_cache_id; - db->name = dbwrap_name(ctx->backing); - return db; -} diff --git a/lib/dbwrap/dbwrap_cache.h b/lib/dbwrap/dbwrap_cache.h deleted file mode 100644 index e69d58efce6..00000000000 --- a/lib/dbwrap/dbwrap_cache.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Database interface wrapper around ctdbd - Copyright (C) Volker Lendecke 2012 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef __DBWRAP_CACHE_H__ -#define __DBWRAP_CACHE_H__ - -#include "dbwrap.h" - -struct db_context *db_open_cache(TALLOC_CTX *mem_ctx, - struct db_context *backing); - -#endif /* __DBWRAP_CACHE_H__ */ diff --git a/lib/dbwrap/wscript_build b/lib/dbwrap/wscript_build index 83e5895a7b1..e6e9d5e4384 100644 --- a/lib/dbwrap/wscript_build +++ b/lib/dbwrap/wscript_build @@ -1,4 +1,4 @@ -SRC = '''dbwrap.c dbwrap_util.c dbwrap_rbt.c dbwrap_cache.c dbwrap_tdb.c +SRC = '''dbwrap.c dbwrap_util.c dbwrap_rbt.c dbwrap_tdb.c dbwrap_local_open.c''' DEPS= '''samba-util util_tdb samba-errors tdb tdb-wrap samba-hostconfig tevent tevent-util''' -- cgit v1.2.1