Date: Thu, 21 May 2015 00:58:27 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386903 - in head/databases/beansdb: . files Message-ID: <201505210058.t4L0wRYo020771@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Thu May 21 00:58:26 2015 New Revision: 386903 URL: https://svnweb.freebsd.org/changeset/ports/386903 Log: Update to 0.6.0. Submitted by: KATO Tsuguru <tkato432 yahoo com> Added: head/databases/beansdb/files/ head/databases/beansdb/files/patch-configure.ac (contents, props changed) head/databases/beansdb/files/patch-src__bitcask.c (contents, props changed) head/databases/beansdb/files/patch-src__codec.c (contents, props changed) head/databases/beansdb/files/patch-src__hstore.c (contents, props changed) head/databases/beansdb/files/patch-src__htree.c (contents, props changed) Modified: head/databases/beansdb/Makefile head/databases/beansdb/distinfo head/databases/beansdb/pkg-descr Modified: head/databases/beansdb/Makefile ============================================================================== --- head/databases/beansdb/Makefile Thu May 21 00:17:22 2015 (r386902) +++ head/databases/beansdb/Makefile Thu May 21 00:58:26 2015 (r386903) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= beansdb -PORTVERSION= 0.5.3 +PORTVERSION= 0.6.0 +DISTVERSIONPREFIX= v CATEGORIES= databases -MASTER_SITES= GOOGLE_CODE \ - http://mirror.amdmi3.ru/googlecode/ +MASTER_SITES= GH MAINTAINER= ports@FreeBSD.org COMMENT= Yet another distributed key-value storage system from Douban Inc @@ -13,11 +13,12 @@ COMMENT= Yet another distributed key-val LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USE_GITHUB= yes +GH_ACCOUNT= douban + +USES= autoreconf GNU_CONFIGURE= yes -USE_CSTD= gnu89 -LDFLAGS+= -lpthread -PLIST_FILES= bin/beansdb \ - man/man1/beansdb.1.gz +PLIST_FILES= bin/beansdb man/man1/beansdb.1.gz .include <bsd.port.mk> Modified: head/databases/beansdb/distinfo ============================================================================== --- head/databases/beansdb/distinfo Thu May 21 00:17:22 2015 (r386902) +++ head/databases/beansdb/distinfo Thu May 21 00:58:26 2015 (r386903) @@ -1,2 +1,2 @@ -SHA256 (beansdb-0.5.3.tar.gz) = 5b0927c80e279750285bc05473369b45552c2af235634a234f2aaefbc98d6edc -SIZE (beansdb-0.5.3.tar.gz) = 144363 +SHA256 (douban-beansdb-v0.6.0_GH0.tar.gz) = 64817d3c4dfde3342a2194e39becd17763a8dd854688fe47011017548b6247d8 +SIZE (douban-beansdb-v0.6.0_GH0.tar.gz) = 151711 Added: head/databases/beansdb/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/beansdb/files/patch-configure.ac Thu May 21 00:58:26 2015 (r386903) @@ -0,0 +1,10 @@ +--- configure.ac.orig 2013-07-17 08:09:12 UTC ++++ configure.ac +@@ -1,6 +1,6 @@ + AC_PREREQ(2.61) + AC_INIT([beansdb], [0.6.0], [davies.liu@gmail.com]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) + AC_PROG_CC + AM_PROG_CC_C_O + AC_CONFIG_HEADERS([config.h]) Added: head/databases/beansdb/files/patch-src__bitcask.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/beansdb/files/patch-src__bitcask.c Thu May 21 00:58:26 2015 (r386903) @@ -0,0 +1,26 @@ +--- src/bitcask.c.orig 2013-07-17 08:09:12 UTC ++++ src/bitcask.c +@@ -99,12 +99,12 @@ Bitcask* bc_open2(Mgr *mgr, int depth, i + return bc; + } + +-inline bool file_exists(const char *path) { ++static inline bool file_exists(const char *path) { + struct stat st; + return stat(path, &st) == 0; + } + +-inline char *gen_path(char *dst, const char *base, const char *fmt, int i) ++static inline char *gen_path(char *dst, const char *base, const char *fmt, int i) + { + static char path[256]; + char name[16]; +@@ -114,7 +114,7 @@ inline char *gen_path(char *dst, const c + return dst; + } + +-inline char *new_path(char *dst, Mgr *mgr, const char *fmt, int i) ++static inline char *new_path(char *dst, Mgr *mgr, const char *fmt, int i) + { + char *path = gen_path(dst, mgr_base(mgr), fmt, i); + if (!file_exists(dst)) { Added: head/databases/beansdb/files/patch-src__codec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/beansdb/files/patch-src__codec.c Thu May 21 00:58:26 2015 (r386903) @@ -0,0 +1,11 @@ +--- src/codec.c.orig 2013-07-17 08:09:12 UTC ++++ src/codec.c +@@ -28,7 +28,7 @@ typedef struct { + char fmt[7]; + } Fmt; + +-inline int fmt_size(Fmt *fmt) { ++static inline int fmt_size(Fmt *fmt) { + return sizeof(Fmt) + strlen(fmt->fmt) - 7 + 1; + } + Added: head/databases/beansdb/files/patch-src__hstore.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/beansdb/files/patch-src__hstore.c Thu May 21 00:58:26 2015 (r386903) @@ -0,0 +1,19 @@ +--- src/hstore.c.orig 2013-07-17 08:09:12 UTC ++++ src/hstore.c +@@ -45,14 +45,14 @@ struct t_hstore { + Bitcask* bitcasks[]; + }; + +-inline int get_index(HStore *store, char *key) ++static inline int get_index(HStore *store, char *key) + { + if (store->height == 0) return 0; + uint32_t h = fnv1a(key, strlen(key)); + return h >> ((8 - store->height) * 4); + } + +-inline pthread_mutex_t* get_mutex(HStore *store, char *key) ++static inline pthread_mutex_t* get_mutex(HStore *store, char *key) + { + uint32_t i = fnv1a(key, strlen(key)) % NUM_OF_MUTEX; + return &store->locks[i]; Added: head/databases/beansdb/files/patch-src__htree.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/beansdb/files/patch-src__htree.c Thu May 21 00:58:26 2015 (r386903) @@ -0,0 +1,67 @@ +--- src/htree.c.orig 2013-07-17 08:09:12 UTC ++++ src/htree.c +@@ -74,23 +74,23 @@ static void split_node(HTree *tree, Node + static void merge_node(HTree *tree, Node *node); + static void update_node(HTree *tree, Node *node); + +-inline uint32_t get_pos(HTree *tree, Node *node) ++static inline uint32_t get_pos(HTree *tree, Node *node) + { + return (node - tree->root) - g_index[(int)node->depth]; + } + +-inline Node *get_child(HTree *tree, Node *node, int b) ++static inline Node *get_child(HTree *tree, Node *node, int b) + { + int i = g_index[node->depth + 1] + (get_pos(tree, node) << 4) + b; + return tree->root + i; + } + +-inline Data* get_data(Node *node) ++static inline Data* get_data(Node *node) + { + return node->data; + } + +-inline void set_data(Node *node, Data *data) ++static inline void set_data(Node *node, Data *data) + { + if (data != node->data) { + if (node->data) free(node->data); +@@ -98,7 +98,7 @@ inline void set_data(Node *node, Data *d + } + } + +-inline uint32_t key_hash(HTree *tree, Item* it) ++static inline uint32_t key_hash(HTree *tree, Item* it) + { + char buf[255]; + int n = dc_decode(tree->dc, buf, it->key, KEYLENGTH(it)); +@@ -256,8 +256,7 @@ static void merge_node(HTree *tree, Node + for (i=0; i<BUCKET_SIZE; i++){ + Data *data = get_data(child+i); + Item *it = data->head; +- int count = (child+i)->count; +- for (j=0; j < count; j++){ ++ for (j=0; j < data->count; j++){ + if (it->ver > 0) { + add_item(tree, node, it, key_hash(tree, it), false); + } // drop deleted items, ver < 0 +@@ -315,7 +314,7 @@ static Item* get_item_hash(HTree* tree, + return r; + } + +-inline int hex2int(char b) ++static inline int hex2int(char b) + { + if (('0'<=b && b<='9') || ('a'<=b && b<='f')) { + return (b>='a') ? (b-'a'+10) : (b-'0'); +@@ -690,7 +689,7 @@ void ht_destroy(HTree *tree) + free(tree); + } + +-inline uint32_t keyhash(const char *s, int len) ++static inline uint32_t keyhash(const char *s, int len) + { + return fnv1a(s, len); + } Modified: head/databases/beansdb/pkg-descr ============================================================================== --- head/databases/beansdb/pkg-descr Thu May 21 00:17:22 2015 (r386902) +++ head/databases/beansdb/pkg-descr Thu May 21 00:58:26 2015 (r386903) @@ -1,6 +1,6 @@ -BeansDB is a major amount of data for large, high-availability storage systems -distributed KeyValue using HashTree and simplified version number to -quickly synchronize to ensure consistency in the final (weak), +BeansDB is a major amount of data for large, high-availability storage +systems distributed KeyValue using HashTree and simplified version +number to quickly synchronize to ensure consistency in the final (weak), a simplified version of the Dynamo. -WWW: http://code.google.com/p/beansdb/ +WWW: http://github.com/douban/beansdb/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505210058.t4L0wRYo020771>