Skip to content

Commit 08f1a85

Browse files
author
wuxianrong
committed
Resolving code conflicts
1 parent e780a9f commit 08f1a85

18 files changed

Lines changed: 202 additions & 484 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ endif()
738738
aux_source_directory(src DIR_SRCS)
739739

740740
# # generate version
741-
string(TIMESTAMP TS "%Y-%m-%d %H:%M:%S" UTC)
741+
string(TIMESTAMP TS "%Y-%m-%d %H:%M:%S")
742742
set(PIKA_BUILD_DATE "${TS}")
743743

744744
find_package(Git)

‎codis/Makefile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22

33
export GO111MODULE=on
44

5-
build-all: codis-dashboard codis-proxy codis-admin codis-ha codis-fe generate-version
5+
build-all: generate-version codis-dashboard codis-proxy codis-admin codis-ha codis-fe
66

77
PRJ_ROOT=${CURDIR}
88

9+
generate-version:
10+
$(info generate version)
11+
@mkdir -p ./bin && ./version
912

1013
codis-deps:
11-
@mkdir -p ./bin && go version
14+
@go version
1215
codis-dashboard: codis-deps
1316
$(info build codis-dashboard)
1417
@cd ${PRJ_ROOT}/cmd/dashboard && go mod tidy && go build -buildvcs=false -o ${PRJ_ROOT}/bin/codis-dashboard .
@@ -32,10 +35,6 @@ codis-fe: codis-deps
3235
@cd ${PRJ_ROOT}/cmd/fe && go mod tidy && go build -buildvcs=false -o ${PRJ_ROOT}/bin/codis-fe .
3336
@rm -rf ${PRJ_ROOT}/bin/assets && cp -rf ${PRJ_ROOT}/cmd/fe/assets ./bin/
3437

35-
generate-version:
36-
$(info generate version)
37-
@./version
38-
3938
clean:
4039
$(info ...Clean Start!)
4140
@rm -rf bin

‎codis/cmd/dashboard/main.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ Options:
4848
return
4949

5050
case d["--version"].(bool):
51-
fmt.Println("version:", utils.Version)
52-
fmt.Println("compile:", utils.Compile)
51+
fmt.Printf("-----------Codis Dashboard----------\n")
52+
fmt.Println("codis_version:", utils.Version)
53+
fmt.Println("codis_git_sha:", utils.Gitsha)
54+
fmt.Println("codis_build_compile_date:", utils.Compile)
55+
fmt.Println("go version:", utils.GoVersion)
5356
return
5457

5558
}

‎codis/cmd/fe/main.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,11 @@ Options:
7272
}
7373

7474
if d["--version"].(bool) {
75-
fmt.Println("version:", utils.Version)
76-
fmt.Println("compile:", utils.Compile)
75+
fmt.Printf("-----------Codis FE----------\n")
76+
fmt.Println("codis_version:", utils.Version)
77+
fmt.Println("codis_git_sha:", utils.Gitsha)
78+
fmt.Println("codis_build_compile_date:", utils.Compile)
79+
fmt.Println("go version:", utils.GoVersion)
7780
return
7881
}
7982

‎codis/cmd/ha/main.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ Options:
3333
}
3434

3535
if d["--version"].(bool) {
36-
fmt.Println("version:", utils.Version)
37-
fmt.Println("compile:", utils.Compile)
36+
fmt.Printf("-----------Codis HA----------\n")
37+
fmt.Println("codis_version:", utils.Version)
38+
fmt.Println("codis_git_sha:", utils.Gitsha)
39+
fmt.Println("codis_build_compile_date:", utils.Compile)
40+
fmt.Println("go version:", utils.GoVersion)
3841
return
3942
}
4043

‎codis/cmd/proxy/main.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@ Options:
5555
return
5656

5757
case d["--version"].(bool):
58-
fmt.Println("version:", utils.Version)
59-
fmt.Println("compile:", utils.Compile)
58+
fmt.Printf("-----------Codis Proxy----------\n")
59+
fmt.Println("codis_version:", utils.Version)
60+
fmt.Println("codis_git_sha:", utils.Gitsha)
61+
fmt.Println("codis_build_compile_date:", utils.Compile)
62+
fmt.Println("go version:", utils.GoVersion)
6063
return
6164

6265
}

‎codis/version‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
11
#!/bin/bash
22

3-
version=`git log --date=iso --pretty=format:"%cd @%H" -1`
3+
CODIS_MAJOR=3
4+
CODIS_MINOR=5
5+
CODIS_PATCH=4
6+
7+
gitsha=`git log --pretty=format:"%H" -1`
48
if [ $? -ne 0 ]; then
5-
version="unknown version"
9+
gitsha ="unknown version gitsha"
610
fi
711

8-
compile=`date +"%F %T %z"`" by "`go version`
12+
compile=`date +"%F %T %Z"`
913
if [ $? -ne 0 ]; then
1014
compile="unknown datetime"
1115
fi
1216

13-
describe=`git describe --tags 2>/dev/null`
14-
if [ $? -eq 0 ]; then
15-
version="${version} @${describe}"
17+
goversion=$(go version | sed 's/go version //')
18+
if [ $? -ne 0 ]; then
19+
compile="unknown go version"
1620
fi
1721

1822
cat << EOF | gofmt > pkg/utils/version.go
1923
package utils
2024
2125
const (
22-
Version = "$version"
26+
Version = "$CODIS_MAJOR.$CODIS_MINOR.$CODIS_PATCH"
27+
Gitsha = "$gitsha"
2328
Compile = "$compile"
29+
GoVersion = "$goversion"
2430
)
2531
EOF
2632

2733
cat << EOF > bin/version
28-
version = $version
34+
gitsha = $gitsha
2935
compile = $compile
3036
EOF

‎include/pika_cache.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class PikaCache : public pstd::noncopyable, public std::enable_shared_from_this<
139139
rocksdb::Status SAddIfKeyExist(std::string& key, std::vector<std::string>& members);
140140
rocksdb::Status SAddnx(std::string& key, std::vector<std::string>& members, int64_t ttl);
141141
rocksdb::Status SAddnxWithoutTTL(std::string& key, std::vector<std::string>& members);
142-
rocksdb::Status SCard(std::string& key, uint64_t* len);
142+
rocksdb::Status SCard(const std::string& key, uint64_t* len);
143143
rocksdb::Status SIsmember(std::string& key, std::string& member);
144144
rocksdb::Status SMembers(std::string& key, std::vector<std::string>* members);
145145
rocksdb::Status SRem(std::string& key, std::vector<std::string>& members);
@@ -150,7 +150,7 @@ class PikaCache : public pstd::noncopyable, public std::enable_shared_from_this<
150150
rocksdb::Status ZAddIfKeyExist(std::string& key, std::vector<storage::ScoreMember>& score_members);
151151
rocksdb::Status ZAddnx(std::string& key, std::vector<storage::ScoreMember>& score_members, int64_t ttl);
152152
rocksdb::Status ZAddnxWithoutTTL(std::string& key, std::vector<storage::ScoreMember>& score_members);
153-
rocksdb::Status ZCard(std::string& key, uint32_t* len, const std::shared_ptr<DB>& db);
153+
rocksdb::Status ZCard(const std::string& key, uint32_t* len, const std::shared_ptr<DB>& db);
154154
rocksdb::Status ZCount(std::string& key, std::string& min, std::string& max, uint64_t* len, ZCountCmd* cmd);
155155
rocksdb::Status ZIncrby(std::string& key, std::string& member, double increment);
156156
rocksdb::Status ZIncrbyIfKeyExist(std::string& key, std::string& member, double increment, ZIncrbyCmd* cmd, const std::shared_ptr<DB>& db);

‎src/cache/include/cache.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class RedisCache {
114114
// Set Commands
115115
Status SAdd(std::string& key, std::vector<std::string> &members);
116116
Status SAddIfKeyExist(std::string& key, std::vector<std::string> &members);
117-
Status SCard(std::string& key, uint64_t *len);
117+
Status SCard(const std::string& key, uint64_t *len);
118118
Status SIsmember(std::string& key, std::string& member);
119119
Status SMembers(std::string& key, std::vector<std::string> *members);
120120
Status SRem(std::string& key, std::vector<std::string> &members);
@@ -123,7 +123,7 @@ class RedisCache {
123123
// Zset Commands
124124
Status ZAdd(std::string& key, std::vector<storage::ScoreMember> &score_members);
125125
Status ZAddIfKeyExist(std::string& key, std::vector<storage::ScoreMember> &score_members);
126-
Status ZCard(std::string& key, uint64_t *len);
126+
Status ZCard(const std::string& key, uint64_t *len);
127127
Status ZCount(std::string& key, std::string &min, std::string &max, uint64_t *len);
128128
Status ZIncrby(std::string& key, std::string& member, double increment);
129129
Status ZRange(std::string& key,

‎src/cache/src/set.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Status RedisCache::SAdd(std::string& key, std::vector<std::string> &members) {
5858
return Status::OK();
5959
}
6060

61-
Status RedisCache::SCard(std::string& key, uint64_t *len) {
61+
Status RedisCache::SCard(const std::string& key, uint64_t *len) {
6262
robj *kobj = createObject(OBJ_STRING, sdsnewlen(key.data(), key.size()));
6363
DEFER {
6464
DecrObjectsRefCount(kobj);

0 commit comments

Comments
 (0)