Skip to content

Removed unused redis code #128

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
erikdubbelboer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed unused redis code #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 31 additions & 31 deletions src/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,42 +108,42 @@ struct disqueServer server; /* server global state */
*/
struct serverCommand serverCommandTable[] = {
/* Server commands. */
{"auth",authCommand,2,"rlF",0,NULL,0,0,0,0,0},
{"ping",pingCommand,-1,"rF",0,NULL,0,0,0,0,0},
{"info",infoCommand,-1,"rl",0,NULL,0,0,0,0,0},
{"shutdown",shutdownCommand,-1,"arl",0,NULL,0,0,0,0,0},
{"monitor",monitorCommand,1,"ar",0,NULL,0,0,0,0,0},
{"debug",debugCommand,-2,"a",0,NULL,0,0,0,0,0},
{"config",configCommand,-2,"ar",0,NULL,0,0,0,0,0},
{"cluster",clusterCommand,-2,"ar",0,NULL,0,0,0,0,0},
{"client",clientCommand,-2,"ar",0,NULL,0,0,0,0,0},
{"slowlog",slowlogCommand,-2,"r",0,NULL,0,0,0,0,0},
{"time",timeCommand,1,"rF",0,NULL,0,0,0,0,0},
{"command",commandCommand,0,"rl",0,NULL,0,0,0,0,0},
{"latency",latencyCommand,-2,"arl",0,NULL,0,0,0,0,0},
{"hello",helloCommand,1,"rF",0,NULL,0,0,0,0,0},
{"auth",authCommand,2,"rlF",0,0,0,0,0,0},
{"ping",pingCommand,-1,"rF",0,0,0,0,0,0},
{"info",infoCommand,-1,"rl",0,0,0,0,0,0},
{"shutdown",shutdownCommand,-1,"arl",0,0,0,0,0,0},
{"monitor",monitorCommand,1,"ar",0,0,0,0,0,0},
{"debug",debugCommand,-2,"a",0,0,0,0,0,0},
{"config",configCommand,-2,"ar",0,0,0,0,0,0},
{"cluster",clusterCommand,-2,"ar",0,0,0,0,0,0},
{"client",clientCommand,-2,"ar",0,0,0,0,0,0},
{"slowlog",slowlogCommand,-2,"r",0,0,0,0,0,0},
{"time",timeCommand,1,"rF",0,0,0,0,0,0},
{"command",commandCommand,0,"rl",0,0,0,0,0,0},
{"latency",latencyCommand,-2,"arl",0,0,0,0,0,0},
{"hello",helloCommand,1,"rF",0,0,0,0,0,0},

/* Jobs */
{"addjob",addjobCommand,-4,"wmF",0,NULL,0,0,0,0,0},
{"getjob",getjobCommand,-2,"wF",0,NULL,0,0,0,0,0},
{"ackjob",ackjobCommand,-1,"wF",0,NULL,0,0,0,0,0},
{"fastack",fastackCommand,-1,"wF",0,NULL,0,0,0,0,0},
{"deljob",deljobCommand,-1,"wF",0,NULL,0,0,0,0,0},
{"show",showCommand,2,"rF",0,NULL,0,0,0,0,0},
{"addjob",addjobCommand,-4,"wmF",0,0,0,0,0,0},
{"getjob",getjobCommand,-2,"wF",0,0,0,0,0,0},
{"ackjob",ackjobCommand,-1,"wF",0,0,0,0,0,0},
{"fastack",fastackCommand,-1,"wF",0,0,0,0,0,0},
{"deljob",deljobCommand,-1,"wF",0,0,0,0,0,0},
{"show",showCommand,2,"rF",0,0,0,0,0,0},

/* AOF specific. */
{"loadjob",loadjobCommand,2,"w",0,NULL,0,0,0,0,0},
{"bgrewriteaof",bgrewriteaofCommand,1,"ar",0,NULL,0,0,0,0,0},
{"loadjob",loadjobCommand,2,"w",0,0,0,0,0,0},
{"bgrewriteaof",bgrewriteaofCommand,1,"ar",0,0,0,0,0,0},

/* Queues */
{"qlen",qlenCommand,2,"rF",0,NULL,0,0,0,0,0},
{"qpeek",qpeekCommand,3,"r",0,NULL,0,0,0,0,0},
{"qscan",qscanCommand,-1,"r",0,NULL,0,0,0,0,0},
{"jscan",jscanCommand,-1,"r",0,NULL,0,0,0,0,0},
{"enqueue",enqueueCommand,-1,"mwF",0,NULL,0,0,0,0,0},
{"nack",nackCommand,-1,"mwF",0,NULL,0,0,0,0,0},
{"dequeue",dequeueCommand,-1,"wF",0,NULL,0,0,0,0,0},
{"working",workingCommand,2,"wF",0,NULL,0,0,0,0,0}
{"qlen",qlenCommand,2,"rF",0,0,0,0,0,0},
{"qpeek",qpeekCommand,3,"r",0,0,0,0,0,0},
{"qscan",qscanCommand,-1,"r",0,0,0,0,0,0},
{"jscan",jscanCommand,-1,"r",0,0,0,0,0,0},
{"enqueue",enqueueCommand,-1,"mwF",0,0,0,0,0,0},
{"nack",nackCommand,-1,"mwF",0,0,0,0,0,0},
{"dequeue",dequeueCommand,-1,"wF",0,0,0,0,0,0},
{"working",workingCommand,2,"wF",0,0,0,0,0,0}
};

/*============================ Utility functions ============================ */
Expand Down Expand Up @@ -1106,7 +1106,7 @@ int restartServer(int flags, mstime_t delay) {
prepareForShutdown(SHUTDOWN_NOFLAGS) != C_OK) return C_ERR;

/* Close all file descriptors, with the exception of stdin, stdout, strerr
* which are useful if we restart a Redis server which is not daemonized. */
* which are useful if we restart a Disque server which is not daemonized. */
for (j = 3; j < (int)server.maxclients + 1024; j++) close(j);

/* Execute the server with the original command line. */
Expand Down
11 changes: 0 additions & 11 deletions src/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,29 +557,19 @@ struct disqueServer {

typedef void serverCommandProc(client *c);

typedef int *redisGetKeysProc(struct serverCommand *cmd, robj **argv, int argc, int *numkeys);

struct serverCommand {
char *name;
serverCommandProc *proc;
int arity;
char *sflags; /* Flags as string representation, one char per flag. */
int flags; /* The actual flags, obtained from the 'sflags' field. */
/* Use a function to determine keys arguments in a command line.
* Used for Disque Cluster redirect. */
redisGetKeysProc *getkeys_proc;
/* What keys should be loaded in background when calling this command? */
int firstkey; /* The first argument that's a key (0 = no keys) */
int lastkey; /* The last argument that's a key */
int keystep; /* The step between first and last key */
long long microseconds, calls;
};

struct redisFunctionSym {
char *name;
unsigned long pointer;
};

/* Structure to hold list iteration abstraction. */
typedef struct {
robj *subject;
Expand Down Expand Up @@ -648,7 +638,6 @@ mstime_t randomTimeError(mstime_t milliseconds);
void getRandomHexChars(char *p, unsigned int len);
uint64_t crc64(uint64_t crc, const unsigned char *s, uint64_t l);
void exitFromChild(int retcode);
size_t redisPopcount(void *s, long count);
void serverSetProcTitle(char *title);

/* networking.c -- Networking and Client related operations */
Expand Down