Skip to content

Added couchbase combined storage #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kayrus wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Added couchbase combined storage #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5dd0fc1
added couchbase combined storage
Dec 27, 2013
50f398a
altered meta2tile.c
kayrus Dec 27, 2013
f59dbaa
altered meta2tile.c
kayrus Dec 27, 2013
eb144d7
added path variable meta2tile.c
kayrus Dec 29, 2013
ab6b77e
added force param to meta2tile.c
kayrus Dec 29, 2013
11efd4d
Added file descriptor close on error in meta2tile\n
kayrus Jan 10, 2014
252d991
Removed memcached_exist due to compilation problems
kayrus Jan 10, 2014
a947d7e
Removed memory leaks
kayrus Jan 13, 2014
8c4715b
Altered couchbase storage, implemented multihash storage for hashes, …
kayrus Jan 23, 2014
02005bd
Fixed compilation warnings, added full tiles check in couchbase_tile_…
kayrus Jan 23, 2014
22c2c2b
Updated spec and added safe free()
kayrus Jan 24, 2014
7f9c062
Minor code beautify
kayrus Jan 24, 2014
004fdfe
Added write retries for metahash, fixed typo in meta2tile.c
kayrus Jan 27, 2014
9861e60
Added logic to check if tile exists, increased tile write speed
kayrus Jan 28, 2014
228f41e
Initialize mh structure in couchbase_tile_stat
kayrus Jan 30, 2014
743e97e
Added deduplication logic in tile_stat function and improved metatile…
kayrus Jan 30, 2014
fd8076e
Added metahash count checking, minor debug fixes
kayrus Feb 4, 2014
91d0862
Removed unnecessary gets in stat function
kayrus Feb 4, 2014
e4ebf95
Removed openssl.h and meta_layout structure from metatile.h
kayrus Feb 13, 2014
721f1e7
Added check for openssl and memcached define
kayrus Feb 13, 2014
29e8116
Removed duplicate includes
kayrus Feb 13, 2014
020c328
Added pidfile to config for renderd daemon
kayrus Feb 20, 2014
59a23bc
Fixed memory leaks in store_rados.c
kayrus Feb 24, 2014
cf064e6
Added possibility to delete old tiles while update
kayrus Mar 3, 2014
6081b4a
Fixed typos in comments and debug logs, renamed "check_old" variable …
kayrus Mar 4, 2014
882f80b
Fixed tile check logic in tile write function
kayrus Mar 11, 2014
9cdb98a
Added request_queue_reenqueue_request functionality
orofarne Mar 13, 2014
b462176
Added live_slaves guard
orofarne Mar 13, 2014
08123f7
Added small hack for load balancing
orofarne Mar 13, 2014
299afca
Added SO_REUSEADDR for server socket
orofarne Mar 13, 2014
f686837
Added correct signal handlers
orofarne Mar 13, 2014
cca2659
Added bbox for renderd_list
kayrus Mar 24, 2014
7c5fb7f
Merge remote-tracking branch 'upstream/master'
kayrus Jul 29, 2014
ff9da81
Merge pull request #1 from orofarne/master
kayrus Sep 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I m4

AM_CPPFLAGS = $(FT2_CFLAGS) $(PTHREAD_CFLAGS) $(MAPNIK_INCLUDES) $(BOOST_CPPFLAGS) $(ICU_CPPFLAGS) $(CAIRO_CFLAGS) $(CAIROMM_CFLAGS) -DSYSTEM_LIBINIPARSER=@SYSTEM_LIBINIPARSER@

STORE_SOURCES = src/store.c src/store_file.c src/store_file_utils.c src/store_memcached.c src/store_rados.c src/store_ro_http_proxy.c src/store_ro_composite.c src/store_null.c
STORE_SOURCES = src/store.c src/store_file.c src/store_file_utils.c src/store_memcached.c src/store_couchbase.c src/store_rados.c src/store_ro_http_proxy.c src/store_ro_composite.c src/store_null.c
STORE_LDFLAGS = $(LIBMEMCACHED_LDFLAGS) $(LIBRADOS_LDFLAGS) $(LIBCURL) $(CAIRO_LIBS)

bin_PROGRAMS = renderd render_expired render_list render_speedtest render_old
Expand Down Expand Up @@ -45,10 +45,10 @@ test: gen_tile_test
./gen_tile_test

all-local:
$(APXS) -c $(DEF_LDLIBS) $(AM_CFLAGS) -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) @srcdir@/src/mod_tile.c @srcdir@/src/sys_utils.c @srcdir@/src/store.c @srcdir@/src/store_file.c @srcdir@/src/store_file_utils.c @srcdir@/src/store_memcached.c @srcdir@/src/store_rados.c @srcdir@/src/store_ro_http_proxy.c @srcdir@/src/store_ro_composite.c @srcdir@/src/store_null.c
$(APXS) -c $(DEF_LDLIBS) $(AM_CFLAGS) -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) @srcdir@/src/mod_tile.c @srcdir@/src/sys_utils.c @srcdir@/src/store.c @srcdir@/src/store_file.c @srcdir@/src/store_file_utils.c @srcdir@/src/store_memcached.c @srcdir@/src/store_couchbase.c @srcdir@/src/store_rados.c @srcdir@/src/store_ro_http_proxy.c @srcdir@/src/store_ro_composite.c @srcdir@/src/store_null.c

install-mod_tile:
mkdir -p $(DESTDIR)`$(APXS) -q LIBEXECDIR`
$(APXS) -S LIBEXECDIR=$(DESTDIR)`$(APXS) -q LIBEXECDIR` -c -i $(DEF_LDLIBS) $(AM_CFLAGS) -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) @srcdir@/src/mod_tile.c @srcdir@/src/sys_utils.c @srcdir@/src/store.c @srcdir@/src/store_file.c @srcdir@/src/store_file_utils.c @srcdir@/src/store_memcached.c @srcdir@/src/store_rados.c @srcdir@/src/store_ro_http_proxy.c @srcdir@/src/store_ro_composite.c @srcdir@/src/store_null.c
$(APXS) -S LIBEXECDIR=$(DESTDIR)`$(APXS) -q LIBEXECDIR` -c -i $(DEF_LDLIBS) $(AM_CFLAGS) -I@srcdir@/includes $(AM_LDFLAGS) $(STORE_LDFLAGS) @srcdir@/src/mod_tile.c @srcdir@/src/sys_utils.c @srcdir@/src/store.c @srcdir@/src/store_file.c @srcdir@/src/store_file_utils.c @srcdir@/src/store_memcached.c @srcdir@/src/store_couchbase.c @srcdir@/src/store_rados.c @srcdir@/src/store_ro_http_proxy.c @srcdir@/src/store_ro_composite.c @srcdir@/src/store_null.c


2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fi
# Checks for libraries.

# Checks for header files.
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h utime.h paths.h sys/cdefs.h sys/loadavg.h])
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h utime.h paths.h sys/cdefs.h sys/loadavg.h openssl/md5.h])

# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
Expand Down
6 changes: 4 additions & 2 deletions extra/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
meta2tile: meta2tile.c
gcc -O3 -std=gnu99 -I../includes -I/usr/include meta2tile.c -o meta2tile -lm
COUCHBASE_SRCS=../src/store_couchbase.c ../src/store_memcached.c

meta2tile: meta2tile.c $(COUCHBASE_SRCS)
gcc -O3 -std=gnu99 -I../includes -I/usr/include $(COUCHBASE_SRCS) meta2tile.c -o meta2tile -lm -lmemcached -lssl -Wall
Loading