Attachment 156896 Details for Bug 200296 – databases_beansdb.diff

[patch] databases_beansdb.diff

databases_beansdb.diff (text/plain), 7.78 KB, created by tkato432 on 2015-05-18 18:33:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-05-18 18:33:06 UTC

Size: 7.78 KB

patch

obsolete

>diff -urN /usr/ports/databases/beansdb/Makefile databases/beansdb/Makefile
>--- /usr/ports/databases/beansdb/Makefile	2015-05-08 05:11:17.120020000 +0900
>+++ databases/beansdb/Makefile	2015-05-19 00:00:00.000000000 +0900
>@@ -2,10 +2,10 @@
> # $FreeBSD: head/databases/beansdb/Makefile 385620 2015-05-07 10:52:15Z amdmi3 $
> 
> 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 @@
> 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>
>diff -urN /usr/ports/databases/beansdb/distinfo databases/beansdb/distinfo
>--- /usr/ports/databases/beansdb/distinfo	2014-06-21 17:46:32.000000000 +0900
>+++ databases/beansdb/distinfo	2015-05-19 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/databases/beansdb/files/patch-configure.ac databases/beansdb/files/patch-configure.ac
>--- /usr/ports/databases/beansdb/files/patch-configure.ac	1970-01-01 09:00:00.000000000 +0900
>+++ databases/beansdb/files/patch-configure.ac	2015-05-19 00:00:00.000000000 +0900
>@@ -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])
>diff -urN /usr/ports/databases/beansdb/files/patch-src__bitcask.c databases/beansdb/files/patch-src__bitcask.c
>--- /usr/ports/databases/beansdb/files/patch-src__bitcask.c	1970-01-01 09:00:00.000000000 +0900
>+++ databases/beansdb/files/patch-src__bitcask.c	2015-05-19 00:00:00.000000000 +0900
>@@ -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)) {
>diff -urN /usr/ports/databases/beansdb/files/patch-src__codec.c databases/beansdb/files/patch-src__codec.c
>--- /usr/ports/databases/beansdb/files/patch-src__codec.c	1970-01-01 09:00:00.000000000 +0900
>+++ databases/beansdb/files/patch-src__codec.c	2015-05-19 00:00:00.000000000 +0900
>@@ -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;
>+ }
>+ 
>diff -urN /usr/ports/databases/beansdb/files/patch-src__hstore.c databases/beansdb/files/patch-src__hstore.c
>--- /usr/ports/databases/beansdb/files/patch-src__hstore.c	1970-01-01 09:00:00.000000000 +0900
>+++ databases/beansdb/files/patch-src__hstore.c	2015-05-19 00:00:00.000000000 +0900
>@@ -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];
>diff -urN /usr/ports/databases/beansdb/files/patch-src__htree.c databases/beansdb/files/patch-src__htree.c
>--- /usr/ports/databases/beansdb/files/patch-src__htree.c	1970-01-01 09:00:00.000000000 +0900
>+++ databases/beansdb/files/patch-src__htree.c	2015-05-19 00:00:00.000000000 +0900
>@@ -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);
>+ }
>diff -urN /usr/ports/databases/beansdb/pkg-descr databases/beansdb/pkg-descr
>--- /usr/ports/databases/beansdb/pkg-descr	2014-06-21 17:46:32.000000000 +0900
>+++ databases/beansdb/pkg-descr	2015-05-19 00:00:00.000000000 +0900
>@@ -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/

Actions: View | Diff

Attachments on bug 200296: 156896