t/issue_3.t @@ -2288,7 +2288,7 @@ static void write_and_free(conn *c, char *buf, int bytes) { } } -static inline void set_noreply_maybe(conn *c, token_t *tokens, size_t ntokens) +static inline bool set_noreply_maybe(conn *c, token_t *tokens, size_t ntokens) { int noreply_index = ntokens - 2; @@ -2303,6 +2303,7 @@ static inline void set_noreply_maybe(conn *c, token_t *tokens, size_t ntokens) && strcmp(tokens[noreply_index].value, "noreply") == 0) { c->noreply = true; } + return c->noreply; } void append_stat(const char *name, ADD_STAT add_stats, conn *c, @@ -2870,7 +2871,12 @@ static void process_delete_command(conn *c, token_t *tokens, const size_t ntoken assert(c != NULL); - set_noreply_maybe(c, tokens, ntokens); + if (ntokens == 4) { + if (!set_noreply_maybe(c, tokens, ntokens)) { + out_string(c, "CLIENT_ERROR bad command line format"); + return; + } + } key = tokens[KEY_TOKEN].value; nkey = tokens[KEY_TOKEN].length; memcached.c @@ -34,7 +34,7 @@ print $sock "stats detail dump\r\n"; is(scalar <$sock>, "PREFIX foo get 2 hit 1 set 1 del 0\r\n", "details after get without hit"); is(scalar <$sock>, "END\r\n", "end of details"); -print $sock "delete foo:125 0\r\n"; +print $sock "delete foo:125\r\n"; is(scalar <$sock>, "NOT_FOUND\r\n", "sent delete command"); print $sock "stats detail dump\r\n"; t/stats-detail.t @@ -57,7 +57,7 @@ for my $prot (::IS_ASCII,::IS_BINARY) { udp_get_test($prot,45,"404$prot","1",::ENTRY_MISSING); udp_incr_decr_test($prot,45,"aval$prot","1","incr",1); udp_incr_decr_test($prot,45,"aval$prot","1","decr",2); - udp_delete_test($prot,45,"aval$prot","0"); + udp_delete_test($prot,45,"aval$prot"); } sub udp_set_test { @@ -123,12 +123,12 @@ sub udp_get_test { } sub udp_delete_test { - my ($protocol, $req_id, $key, $time) = @_; + my ($protocol, $req_id, $key) = @_; my $req = ""; my $key_len = length($key); if ($protocol == ::IS_ASCII) { - $req = "delete $key $time\r\n"; + $req = "delete $key\r\n"; } elsif ($protocol == ::IS_BINARY) { $req = pack(::REQ_PKT_FMT, ::BIN_REQ_MAGIC, ::CMD_DELETE, $key_len, 0, 0, 0, $key_len, 0, 0, 0); $req .= $key; t/udp.t 47ab3b002b1591de6b51430dbabc0fe33542ce55 Dustin Sallings dustin@spy.net http://github.com/trondn/memcached/commit/dd599c0e95fed031258ed7363281c643d517ab79 dd599c0e95fed031258ed7363281c643d517ab79 2009-10-29T10:07:11-07:00 2009-10-28T23:03:01-07:00 Provide better errors for deletion scenarios. bug3 c4fdd000730c80e7abb4203858c1d1c684b6b9e5 Trond Norbye Trond.Norbye@sun.com