gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/keydbpro' into PRO_RELEASE_6

Browse Source 
Former-commit-id: 11214acb5aff8af1e09a64ee2db71357899a9bf7
This commit is contained in:
malavan 2021-08-16 22:49:18 +00:00
commit e226ca4aad
6 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/deb/conf/keydb.conf
View File

@ -2035,9 +2035,9 @@ server-threads 2
# bringing up replicas can result in data loss (the first master will win). # bringing up replicas can result in data loss (the first master will win).
# active-replica yes # active-replica yes
# Enable Enterprise? KeyDB Enterprise provides support for Enterprise only features # Enable Pro? KeyDB pro provides support for pro only features
# note: you may omit the license key to demo Enterprise features for a limited time # note: you may omit the license key to demo pro features for a limited time
# enable-enterprise [License Key] # enable-pro [License Key]
# Enable FLASH support? (Enterprise Only) # Enable FLASH support? (Pro Only)
# storage-provider flash /path/to/flash/db # storage-provider flash /path/to/flash/db

1
pkg/deb/debian/keydb-enterprise-tools.install
View File

@ -5,3 +5,4 @@ src/keydb-check-rdb /usr/bin
src/keydb-cli /usr/bin src/keydb-cli /usr/bin
src/keydb-server /usr/bin src/keydb-server /usr/bin
src/keydb-sentinel /usr/bin src/keydb-sentinel /usr/bin
src/keydb-diagnostic-tool /usr/bin

1
pkg/deb/debian_dh9/keydb-enterprise-tools.install
View File

@ -5,3 +5,4 @@ src/keydb-check-rdb /usr/bin
src/keydb-cli /usr/bin src/keydb-cli /usr/bin
src/keydb-server /usr/bin src/keydb-server /usr/bin
src/keydb-sentinel /usr/bin src/keydb-sentinel /usr/bin
src/keydb-diagnostic-tool /usr/bin

8
pkg/rpm/generate_rpms.sh
View File

@ -25,7 +25,13 @@ mkdir -p $DIR/keydb_build/keydb_rpm/var/log/keydb
# move binaries to bin # move binaries to bin
rm $DIR/keydb_build/keydb_rpm/usr/bin/* rm $DIR/keydb_build/keydb_rpm/usr/bin/*
cp $DIR/../../src/keydb-* $DIR/keydb_build/keydb_rpm/usr/bin/ cp $DIR/../../src/keydb-server $DIR/keydb_build/keydb_rpm/usr/bin/
cp $DIR/../../src/keydb-sentinel $DIR/keydb_build/keydb_rpm/usr/bin/
cp $DIR/../../src/keydb-cli $DIR/keydb_build/keydb_rpm/usr/bin/
cp $DIR/../../src/keydb-benchmark $DIR/keydb_build/keydb_rpm/usr/bin/
cp $DIR/../../src/keydb-check-aof $DIR/keydb_build/keydb_rpm/usr/bin/
cp $DIR/../../src/keydb-check-rdb $DIR/keydb_build/keydb_rpm/usr/bin/
cp $DIR/../../src/keydb-diagnostic-tool $DIR/keydb_build/keydb_rpm/usr/bin/
# update spec file with build info # update spec file with build info
sed -i '2d' $DIR/keydb_build/keydb.spec sed -i '2d' $DIR/keydb_build/keydb.spec

8
pkg/rpm/keydb_build/keydb_rpm/etc/keydb/keydb.conf
View File

@ -2035,9 +2035,9 @@ server-threads 2
# bringing up replicas can result in data loss (the first master will win). # bringing up replicas can result in data loss (the first master will win).
# active-replica yes # active-replica yes
# Enable Enterprise? KeyDB Enterprise provides support for Enterprise only features # Enable Pro? KeyDB pro provides support for pro only features
# note: you may omit the license key to demo Enterprise features for a limited time # note: you may omit the license key to demo pro features for a limited time
# enable-enterprise [License Key] # enable-pro [License Key]
# Enable FLASH support? (Enterprise Only) # Enable FLASH support? (Pro Only)
# storage-provider flash /path/to/flash/db # storage-provider flash /path/to/flash/db

5
src/keydb-diagnostic-tool.cpp
View File

@ -211,6 +211,11 @@ extern "C" void _serverAssert(const char *estr, const char *file, int line) {
*((char*)-1) = 'x'; *((char*)-1) = 'x';
} }
/* asyncFreeDictTable is needed by dict */
extern "C" void asyncFreeDictTable(struct dictEntry **de) {
zfree(de);
}
static redisContext *getRedisContext(const char *ip, int port, static redisContext *getRedisContext(const char *ip, int port,
const char *hostsocket) const char *hostsocket)
{ {