Feature/redis 5.0

.gitattributes

@@ -0,0 +1,29 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files that you want to always be normalized
+# and converted to native line endings on checkout.
+*.c text diff=cpp
+*.h text diff=cpp
+*.go text diff=golang
+*.py text diff=python
+*.sh text
+*.md text diff=markdown
+*.tcl text
+*.tex text diff=tex
+*.txt text
+*.xml text
+*.yml text
+*.json text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat text eol=crlf
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.rdb binary
+*.jpg binary
+*.png binary
+
+# Treat all files that under these dirs as binaries and won't modify.
+**/*deprecated/** binary

.gitignore

@@ -1,5 +1,5 @@
 *.log
-*.swp
+*.sw*
 *.out
 *.dump
 *.log.*
@@ -10,6 +10,7 @@
 .htaccess
 
 /bin
+/config
 /tmp
 /pkg/utils/version.go
 

Makefile

@@ -1,11 +1,14 @@
 .DEFAULT_GOAL := build-all
 
 export GO15VENDOREXPERIMENT=1
+REDIS_VER="5.0"
 
 build-all: codis-server codis-dashboard codis-proxy codis-admin codis-ha codis-fe clean-gotest
 
-codis-deps:
+deps:
 	@mkdir -p bin config && bash version
+
+codis-deps: deps
 	@make --no-print-directory -C vendor/github.com/spinlock/jemalloc-go/
 
 codis-dashboard: codis-deps
@@ -26,26 +29,26 @@ codis-fe: codis-deps
 	go build -i -o bin/codis-fe ./cmd/fe
 	@rm -rf bin/assets; cp -rf cmd/fe/assets bin/
 
-codis-server:
-	@mkdir -p bin
+codis-server: deps
 	@rm -f bin/codis-server*
-	make -j4 -C extern/redis-3.2.11/
-	@cp -f extern/redis-3.2.11/src/redis-server  bin/codis-server
-	@cp -f extern/redis-3.2.11/src/redis-benchmark bin/
-	@cp -f extern/redis-3.2.11/src/redis-cli bin/
-	@cp -f extern/redis-3.2.11/src/redis-sentinel bin/
-	@cp -f extern/redis-3.2.11/redis.conf config/
-	@sed -e "s/^sentinel/# sentinel/g" extern/redis-3.2.11/sentinel.conf > config/sentinel.conf
+	make -j4 -C extern/redis-$(REDIS_VER)/
+	@cp -f extern/redis-$(REDIS_VER)/src/redis-server  bin/codis-server
+	@cp -f extern/redis-$(REDIS_VER)/src/redis-benchmark bin/
+	@cp -f extern/redis-$(REDIS_VER)/src/redis-cli bin/
+	@cp -f extern/redis-$(REDIS_VER)/src/redis-sentinel bin/
+	@cp -f extern/redis-$(REDIS_VER)/redis.conf config/
+	@sed -e "s/^sentinel/# sentinel/g" extern/redis-$(REDIS_VER)/sentinel.conf > config/sentinel.conf
 
 clean-gotest:
 	@rm -rf ./pkg/topom/gotest.tmp
 
 clean: clean-gotest
 	@rm -rf bin
+	@rm -rf config
 	@rm -rf scripts/tmp
 
 distclean: clean
-	@make --no-print-directory --quiet -C extern/redis-3.2.11 distclean
+	@make --no-print-directory --quiet -C extern/redis-$(REDIS_VER) distclean
 	@make --no-print-directory --quiet -C vendor/github.com/spinlock/jemalloc-go/ distclean
 
 gotest: codis-deps

extern/redis-5.0/.gitignore

@@ -0,0 +1,30 @@
+.*.swp
+*.o
+*.log
+dump.rdb
+redis-benchmark
+redis-check-aof
+redis-check-rdb
+redis-check-dump
+redis-cli
+redis-sentinel
+redis-server
+doc-tools
+release
+misc/*
+src/release.h
+appendonly.aof
+SHORT_TERM_TODO
+release.h
+src/transfer.sh
+src/configs
+redis.ds
+src/redis.conf
+src/nodes.conf
+deps/lua/src/lua
+deps/lua/src/luac
+deps/lua/src/liblua.a
+.make-*
+.prerequisites
+*.dSYM
+Makefile.dep