From 72ddb9327f1ddd0c96fe8d7004f6eb104b27ca8d Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 27 Dec 2013 18:33:48 +0400
Subject: [PATCH] [map-map] Remove DELETE_1_3
---
src/box/request.cc | 4 +---
src/box/request.h | 1 -
test/box/admin.result | 6 ------
test/box/lua_misc.result | 1 -
test/box/stat.result | 6 ------
5 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/src/box/request.cc b/src/box/request.cc
index c33075e5cd..82d2b22e35 100644
--- a/src/box/request.cc
+++ b/src/box/request.cc
@@ -207,8 +207,7 @@ static bool
request_check_type(uint32_t type)
{
return (type != REPLACE && type != SELECT &&
- type != UPDATE && type != DELETE_1_3 &&
- type != DELETE && type != CALL);
+ type != UPDATE && type != DELETE && type != CALL);
}
const char *
@@ -272,7 +271,6 @@ request_create(struct request *request, uint32_t type, const char *data,
/* Do not parse the tail, tuple_update will do it */
request->u.expr_end = reqend;
break;
- case DELETE_1_3:
case DELETE:
request->execute = execute_delete;
request->d.space_no = pick_u32(reqpos, reqend);
diff --git a/src/box/request.h b/src/box/request.h
index 52cc5d9579..1b0dee6c1d 100644
--- a/src/box/request.h
+++ b/src/box/request.h
@@ -65,7 +65,6 @@ struct port;
_(REPLACE, 13) \
_(SELECT, 17) \
_(UPDATE, 19) \
- _(DELETE_1_3, 20) \
_(DELETE, 21) \
_(CALL, 22)
diff --git a/test/box/admin.result b/test/box/admin.result
index e20eacb6bb..b7d18a845d 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -23,9 +23,6 @@ box.stat()
UPDATE:
total: 0
rps: 0
- DELETE_1_3:
- total: 0
- rps: 0
...
help()
---
@@ -89,9 +86,6 @@ box.stat()
UPDATE:
total: 0
rps: 0
- DELETE_1_3:
- total: 0
- rps: 0
...
box.insert(0, 1, 'tuple')
---
diff --git a/test/box/lua_misc.result b/test/box/lua_misc.result
index 6a8a39d5d1..4cb5a38e26 100644
--- a/test/box/lua_misc.result
+++ b/test/box/lua_misc.result
@@ -52,7 +52,6 @@ t;
- REPLACE
- CALL
- UPDATE
- - DELETE_1_3
- total
- rps
- total
diff --git a/test/box/stat.result b/test/box/stat.result
index f234415b26..e905c8abb0 100644
--- a/test/box/stat.result
+++ b/test/box/stat.result
@@ -29,9 +29,6 @@ box.stat()
UPDATE:
total: 0
rps: 0
- DELETE_1_3:
- total: 0
- rps: 0
...
--# stop server default
--# start server default
@@ -53,9 +50,6 @@ box.stat()
UPDATE:
total: 0
rps: 0
- DELETE_1_3:
- total: 0
- rps: 0
...
-- cleanup
box.space[0]:drop()
--
GitLab