
[Code reviewed by Love Hörnquist Åstrand <lha@kth.se>] Added heim_db_*() entry points for dealing with databases, and make krb5_aname_to_localname() use it. The following enhancements to libheimbase are included: - Add heim_data_t and heim_string_t "reference" variants to avoid memory copies of potentially large data/strings. See heim_data_ref_create() and heim_string_ref_create(). - Added enhancements to heim_array_t to allow their use for queues and stacks, and to improve performance. See heim_array_insert_value(). - Added XPath-like accessors for heim_object_t. See heim_path_get(), heim_path_copy(), heim_path_create(), and heim_path_delete(). These are used extensively in the DB framework's generic composition of ACID support and in the test_base program - Made libheimbase more consistent with Core Foundation naming conventions. See heim_{dict, array}_{get, copy}_value() and heim_path_{get, copy}(). - Added functionality to and fixed bugs in base/json.c: - heim_serialize(); - depth limit for JSON parsing (for DoS protection); - pretty-printing; - JSON compliance (see below); - flag options for parsing and serializing; these are needed because of impedance mismatches between heim_object_t and JSON (e.g., heim_dict_t allows non-string keys, but JSON does not; heimbase supports binary data, while JSON does not). - Added heim_error_enomem(). - Enhanced the test_base program to test new functionality and to use heim_path*() to better test JSON encoding. This includes some fuzz testing of JSON parsing, and running the test under valgrind. - Started to add doxygen documentation for libheimbase (but doc build for libheimbase is still incomplete). Note that there's still some incomplete JSON support: - JSON string quoting is not fully implemented; - libheimbase lacks support for real numbers, while JSON has it -- otherwise libheimbase is a superset of JSON, specifically in that any heim_object_t can be a key for an associative array. The following DB backends are supported natively: - "sorted-text", a binary search of sorted (in C locale), flat text files; - "json", a backend that stores DB contents serialized as JSON (this is intended for configuration-like contents). The DB framework supports: - multiple key/value tables per-DB - ACID transactions The DB framework also natively implements ACID transactions for any DB backends that a) do not provide transactions natively, b) do provide lock/unlock/sync methods (even on Windows). This includes autocommit of DB updates outside transactions. Future DB enhancements may include: - add backends for various DB types (BDB, CDB, MDB, ...); - make libhdb use heim_db_t; - add a command-line tool for interfacing to databases via libheimbase (e.g., to get/set/delete values, create/copy/ backup DBs, inspect history, check integrity); - framework-level transaction logging (with redo and undo logging), for generic incremental replication; - framework-level DB integrity checking. We could store a MAC of the XOR of a hash function applied to {key, value} for every entry in the DB, then use this to check DB integrity incrementally during incremental replication, as well as for the whole DB.
303 lines
6.1 KiB
C
303 lines
6.1 KiB
C
/*
|
|
* Copyright (c) 2002, 1997 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Portions Copyright (c) 2010 Apple Inc. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "baselocl.h"
|
|
|
|
struct hashentry {
|
|
struct hashentry **prev;
|
|
struct hashentry *next;
|
|
heim_object_t key;
|
|
heim_object_t value;
|
|
};
|
|
|
|
struct heim_dict_data {
|
|
size_t size;
|
|
struct hashentry **tab;
|
|
};
|
|
|
|
static void
|
|
dict_dealloc(void *ptr)
|
|
{
|
|
heim_dict_t dict = ptr;
|
|
struct hashentry **h, *g, *i;
|
|
|
|
for (h = dict->tab; h < &dict->tab[dict->size]; ++h) {
|
|
for (g = h[0]; g; g = i) {
|
|
i = g->next;
|
|
heim_release(g->key);
|
|
heim_release(g->value);
|
|
free(g);
|
|
}
|
|
}
|
|
free(dict->tab);
|
|
}
|
|
|
|
struct heim_type_data dict_object = {
|
|
HEIM_TID_DICT,
|
|
"dict-object",
|
|
NULL,
|
|
dict_dealloc,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
static size_t
|
|
isprime(size_t p)
|
|
{
|
|
size_t q, i;
|
|
|
|
for(i = 2 ; i < p; i++) {
|
|
q = p / i;
|
|
|
|
if (i * q == p)
|
|
return 0;
|
|
if (i * i > p)
|
|
return 1;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static size_t
|
|
findprime(size_t p)
|
|
{
|
|
if (p % 2 == 0)
|
|
p++;
|
|
|
|
while (isprime(p) == 0)
|
|
p += 2;
|
|
|
|
return p;
|
|
}
|
|
|
|
/**
|
|
* Allocate an array
|
|
*
|
|
* @return A new allocated array, free with heim_release()
|
|
*/
|
|
|
|
heim_dict_t
|
|
heim_dict_create(size_t size)
|
|
{
|
|
heim_dict_t dict;
|
|
|
|
dict = _heim_alloc_object(&dict_object, sizeof(*dict));
|
|
|
|
dict->size = findprime(size);
|
|
if (dict->size == 0) {
|
|
heim_release(dict);
|
|
return NULL;
|
|
}
|
|
|
|
dict->tab = calloc(dict->size, sizeof(dict->tab[0]));
|
|
if (dict->tab == NULL) {
|
|
dict->size = 0;
|
|
heim_release(dict);
|
|
return NULL;
|
|
}
|
|
|
|
return dict;
|
|
}
|
|
|
|
/**
|
|
* Get type id of an dict
|
|
*
|
|
* @return the type id
|
|
*/
|
|
|
|
heim_tid_t
|
|
heim_dict_get_type_id(void)
|
|
{
|
|
return HEIM_TID_DICT;
|
|
}
|
|
|
|
/* Intern search function */
|
|
|
|
static struct hashentry *
|
|
_search(heim_dict_t dict, heim_object_t ptr)
|
|
{
|
|
unsigned long v = heim_get_hash(ptr);
|
|
struct hashentry *p;
|
|
|
|
for (p = dict->tab[v % dict->size]; p != NULL; p = p->next)
|
|
if (heim_cmp(ptr, p->key) == 0)
|
|
return p;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* Search for element in hash table
|
|
*
|
|
* @value dict the dict to search in
|
|
* @value key the key to search for
|
|
*
|
|
* @return a not-retained copy of the value for key or NULL if not found
|
|
*/
|
|
|
|
heim_object_t
|
|
heim_dict_get_value(heim_dict_t dict, heim_object_t key)
|
|
{
|
|
struct hashentry *p;
|
|
p = _search(dict, key);
|
|
if (p == NULL)
|
|
return NULL;
|
|
|
|
return p->value;
|
|
}
|
|
|
|
/**
|
|
* Search for element in hash table
|
|
*
|
|
* @value dict the dict to search in
|
|
* @value key the key to search for
|
|
*
|
|
* @return a retained copy of the value for key or NULL if not found
|
|
*/
|
|
|
|
heim_object_t
|
|
heim_dict_copy_value(heim_dict_t dict, heim_object_t key)
|
|
{
|
|
struct hashentry *p;
|
|
p = _search(dict, key);
|
|
if (p == NULL)
|
|
return NULL;
|
|
|
|
return heim_retain(p->value);
|
|
}
|
|
|
|
/**
|
|
* Add key and value to dict
|
|
*
|
|
* @value dict the dict to add too
|
|
* @value key the key to add
|
|
* @value value the value to add
|
|
*
|
|
* @return 0 if added, errno if not
|
|
*/
|
|
|
|
int
|
|
heim_dict_set_value(heim_dict_t dict, heim_object_t key, heim_object_t value)
|
|
{
|
|
struct hashentry **tabptr, *h;
|
|
|
|
h = _search(dict, key);
|
|
if (h) {
|
|
heim_release(h->value);
|
|
h->value = heim_retain(value);
|
|
} else {
|
|
unsigned long v;
|
|
|
|
h = malloc(sizeof(*h));
|
|
if (h == NULL)
|
|
return ENOMEM;
|
|
|
|
h->key = heim_retain(key);
|
|
h->value = heim_retain(value);
|
|
|
|
v = heim_get_hash(key);
|
|
|
|
tabptr = &dict->tab[v % dict->size];
|
|
h->next = *tabptr;
|
|
*tabptr = h;
|
|
h->prev = tabptr;
|
|
if (h->next)
|
|
h->next->prev = &h->next;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Delete element with key key
|
|
*
|
|
* @value dict the dict to delete from
|
|
* @value key the key to delete
|
|
*/
|
|
|
|
void
|
|
heim_dict_delete_key(heim_dict_t dict, heim_object_t key)
|
|
{
|
|
struct hashentry *h = _search(dict, key);
|
|
|
|
if (h == NULL)
|
|
return;
|
|
|
|
heim_release(h->key);
|
|
heim_release(h->value);
|
|
|
|
if ((*(h->prev) = h->next) != NULL)
|
|
h->next->prev = h->prev;
|
|
|
|
free(h);
|
|
}
|
|
|
|
/**
|
|
* Do something for each element
|
|
*
|
|
* @value dict the dict to interate over
|
|
* @value func the function to search for
|
|
* @value arg argument to func
|
|
*/
|
|
|
|
void
|
|
heim_dict_iterate_f(heim_dict_t dict, void *arg, heim_dict_iterator_f_t func)
|
|
{
|
|
struct hashentry **h, *g;
|
|
|
|
for (h = dict->tab; h < &dict->tab[dict->size]; ++h)
|
|
for (g = *h; g; g = g->next)
|
|
func(g->key, g->value, arg);
|
|
}
|
|
|
|
#ifdef __BLOCKS__
|
|
/**
|
|
* Do something for each element
|
|
*
|
|
* @value dict the dict to interate over
|
|
* @value func the function to search for
|
|
*/
|
|
|
|
void
|
|
heim_dict_iterate(heim_dict_t dict, void (^func)(heim_object_t, heim_object_t))
|
|
{
|
|
struct hashentry **h, *g;
|
|
|
|
for (h = dict->tab; h < &dict->tab[dict->size]; ++h)
|
|
for (g = *h; g; g = g->next)
|
|
func(g->key, g->value);
|
|
}
|
|
#endif
|