Add tnt_execute method to sql execution

Ilya · rtsisyk · commit d9542b8bc13c · 2017-09-07T12:26:33.000+03:00
diff --git a/include/tarantool/tarantool.h b/include/tarantool/tarantool.h
@@ -50,6 +50,7 @@ extern "C" {
 #include <tarantool/tnt_object.h>
 #include <tarantool/tnt_iter.h>
 #include <tarantool/tnt_call.h>
+#include <tarantool/tnt_execute.h>
 #include <tarantool/tnt_ping.h>
 #include <tarantool/tnt_insert.h>
 #include <tarantool/tnt_delete.h>
diff --git a/include/tarantool/tnt_execute.h b/include/tarantool/tnt_execute.h
@@ -0,0 +1,24 @@
+#ifndef TNT_EXECUTE_H_INCLUDED
+#define TNT_EXECUTE_H_INCLUDED
+
+/**
+ * \file tnt_execute.h
+ * \brief SQL execution request
+ */
+
+/**
+ * \brief Construct SQL request and write it into stream
+ *
+ * \param s    stream object to write request to
+ * \param expr SQL query string
+ * \param elen query length
+ * \param args tnt_object instance with messagepack array with params
+ *             to bind to the request
+ *
+ * \retval number of bytes written to stream
+ */
+ssize_t
+tnt_execute(struct tnt_stream *s, const char *expr, size_t elen,
+	    struct tnt_stream *params);
+
+#endif /* TNT_EXECUTE_H_INCLUDED */
diff --git a/include/tarantool/tnt_proto.h b/include/tarantool/tnt_proto.h
@@ -66,15 +66,18 @@ enum tnt_body_key_t {
 	TNT_VCLOCK = 0x26,
 	TNT_EXPRESSION = 0x27,
 	TNT_OPS = 0x28,
-
+	TNT_SQL_TEXT = 0x40,
+	TNT_SQL_BIND = 0x41,
 };
 
 /**
  * \brief Response body field types (keys)
  */
 enum tnt_response_key_t {
 	TNT_DATA = 0x30,
-	TNT_ERROR = 0x31
+	TNT_ERROR = 0x31,
+	TNT_METADATA = 0x32,
+	TNT_SQL_INFO = 0x43,
 };
 
 /**
@@ -91,6 +94,7 @@ enum tnt_request_t {
 	TNT_OP_EVAL      = 8,
 	TNT_OP_UPSERT    = 9,
 	TNT_OP_CALL      = 10,
+	TNT_OP_EXECUTE   = 11,
 	TNT_OP_PING      = 64,
 	TNT_OP_JOIN      = 65,
 	TNT_OP_SUBSCRIBE = 66
diff --git a/include/tarantool/tnt_reply.h b/include/tarantool/tnt_reply.h
@@ -67,6 +67,10 @@ struct tnt_reply {
 	const char *error_end;	/*!< end of error message (NULL if not present) */
 	const char *data;	/*!< tuple data (NULL if not present) */
 	const char *data_end;	/*!< end if tuple data (NULL if not present) */
+	const char *metadata;	/*!< tuple metadata (NULL if not present) */
+	const char *metadata_end; /*!< end if tuple metadata (NULL if not present) */
+	const char *sqlinfo;	/*!< map sqlinfo (NULL if not present) */
+	const char *sqlinfo_end;/*!< end if map sqlinfo (NULL if not present) */
 };
 
 /*!
diff --git a/test/shared/box.lua b/test/shared/box.lua
@@ -40,7 +40,9 @@ for k, v in pairs(lp) do
       if k == 'test' then
          box.schema.user.grant('test', 'read', 'space', '_space')
          box.schema.user.grant('test', 'read', 'space', '_index')
+         box.schema.user.grant('test', 'read', 'space', '_truncate')
          box.schema.user.grant('test', 'execute', 'universe')
+         box.schema.user.grant('test', 'write', 'universe')
       end
    end
 end
diff --git a/test/tarantool_unix.c b/test/tarantool_unix.c
@@ -287,8 +287,121 @@ test_insert_replace_delete(char *uri) {
 	return check_plan();
 }
 
+static int
+test_execute(char *uri) {
+	plan(43);
+	header();
+
+	const char bb1[]="\x83\x00\xce\x00\x00\x00\x00\x01\xcf\x00\x00\x00\x00\x00"
+			 "\x00\x00\x01\x05\xce\x00\x00\x00\x3f\x81\x43\xdf\x00\x00"
+			 "\x00\x01\x44\x01";
+	size_t bb1_len = sizeof(bb1) - 1;
+
+	const char bb2[]="\x83\x00\xce\x00\x00\x00\x00\x01\xcf\x00\x00\x00\x00\x00"
+			 "\x00\x00\x02\x05\xce\x00\x00\x00\x3f\x81\x43\xdf\x00\x00"
+			 "\x00\x01\x44\x01";
+	size_t bb2_len = sizeof(bb2) - 1;
+
+	const char bb3[]="\x83\x00\xce\x00\x00\x00\x00\x01\xcf\x00\x00\x00\x00\x00"
+			 "\x00\x00\x03\x05\xce\x00\x00\x00\x3f\x82\x32\xdd\x00\x00"
+			 "\x00\x01\x81\x29\xa2\x69\x64\x30\xdd\x00\x00\x00\x01\x91"
+			 "\x00";
+	size_t bb3_len = sizeof(bb3) - 1;
+
+	const char bb4[]="\x83\x00\xce\x00\x00\x00\x00\x01\xcf\x00\x00\x00\x00\x00"
+			 "\x00\x00\x04\x05\xce\x00\x00\x00\x41\x81\x43\xdf\x00\x00"
+			 "\x00\x01\x44\x01";
+	size_t bb4_len = sizeof(bb4) - 1;
+
+	struct tnt_reply reply;
+	char *query;
+	struct tnt_stream *args = NULL;
+
+	struct tnt_stream *tnt = NULL; tnt = tnt_net(NULL);
+	isnt(tnt, NULL, "Check connection creation");
+	isnt(tnt_set(tnt, TNT_OPT_URI, uri), -1, "Setting URI");
+	isnt(tnt_connect(tnt), -1, "Connecting");
+
+	args = tnt_object(NULL);
+	isnt(args, NULL, "Check object creation");
+	isnt(tnt_object_format(args, "[]"), -1, "check object filling");
+	query = "CREATE TABLE test_table(id INTEGER, PRIMARY KEY (id))";
+	isnt(tnt_execute(tnt, query, strlen(query), args), -1,
+	     "Create execute sql request: create table");
+	isnt(tnt_flush(tnt), -1, "Send to server");
+	tnt_stream_free(args);
+
+	tnt_reply_init(&reply);
+	isnt(tnt->read_reply(tnt, &reply), -1, "Read reply from server");
+	is  (check_rbytes(&reply, bb1, bb1_len), 0, "Check response");
+	is  (reply.error, NULL, "Check error absence");
+	isnt(reply.sqlinfo, NULL, "Check sqlinfo presence");
+	is  (reply.metadata, NULL, "Check metadata absence");
+	is  (reply.data, NULL, "Check data absence");
+	tnt_reply_free(&reply);
+
+	args = tnt_object(NULL);
+	isnt(args, NULL, "Check object creation");
+	isnt(tnt_object_format(args, "[%d]", 0), -1, "check object filling");
+	query = "INSERT INTO test_table(id) VALUES (?)";
+	isnt(tnt_execute(tnt, query, strlen(query), args), -1,
+	     "Create execute sql request: insert row");
+	isnt(tnt_flush(tnt), -1, "Send to server");
+	tnt_stream_free(args);
+
+	tnt_reply_init(&reply);
+	isnt(tnt->read_reply(tnt, &reply), -1, "Read reply from server");
+	is  (check_rbytes(&reply, bb2, bb2_len), 0, "Check response");
+	is  (reply.error, NULL, "Check error absence");
+	isnt(reply.sqlinfo, NULL, "Check sqlinfo presence");
+	is  (reply.metadata, NULL, "Check metadata absence");
+	is  (reply.data, NULL, "Check data absence");
+	tnt_reply_free(&reply);
+
+	args = tnt_object(NULL);
+	isnt(args, NULL, "Check object creation");
+	isnt(tnt_object_format(args, "[]"), -1, "check object filling");
+	query = "select * from test_table";
+	isnt(tnt_execute(tnt, query, strlen(query), args), -1,
+	     "Create execute sql request: select");
+	isnt(tnt_flush(tnt), -1, "Send to server");
+	tnt_stream_free(args);
+
+	tnt_reply_init(&reply);
+	isnt(tnt->read_reply(tnt, &reply), -1, "Read reply from server");
+	is  (check_rbytes(&reply, bb3, bb3_len), 0, "Check response");
+	is  (reply.error, NULL, "Check error absence");
+	is  (reply.sqlinfo, NULL, "Check sqlinfo absence");
+	isnt(reply.metadata, NULL, "Check metadata presence");
+	isnt(reply.data, NULL, "Check data presence");
+	tnt_reply_free(&reply);
+
+	args = tnt_object(NULL);
+	isnt(args, NULL, "Check object creation");
+	isnt(tnt_object_format(args, "[]"), -1, "check object filling");
+	query = "drop table test_table";
+	isnt(tnt_execute(tnt, query, strlen(query), args), -1,
+	     "Create execute sql request: drop table");
+	isnt(tnt_flush(tnt), -1, "Send to server");
+	tnt_stream_free(args);
+
+	tnt_reply_init(&reply);
+	isnt(tnt->read_reply(tnt, &reply), -1, "Read reply from server");
+	is  (check_rbytes(&reply, bb4, bb4_len), 0, "Check response");
+	is  (reply.error, NULL, "Check error absence");
+	isnt(reply.sqlinfo, NULL, "Check sqlinfo presence");
+	is  (reply.metadata, NULL, "Check metadata absence");
+	is  (reply.data, NULL, "Check data absence");
+	tnt_reply_free(&reply);
+
+	tnt_stream_free(tnt);
+
+	footer();
+	return check_plan();
+}
+
 int main() {
-	plan(4);
+	plan(5);
 
 	char uri[128] = {0};
 	snprintf(uri, 128, "%s%s", "test:test@", getenv("PRIMARY_PORT"));
@@ -297,6 +410,7 @@ int main() {
 	test_ping(uri);
 	test_auth_call(uri);
 	test_insert_replace_delete(uri);
+	test_execute(uri);
 
 	return check_plan();
 }
diff --git a/tnt/CMakeLists.txt b/tnt/CMakeLists.txt
@@ -28,6 +28,7 @@ set (TNT_SOURCES
      ${CMAKE_CURRENT_SOURCE_DIR}/tnt_select.c
      ${CMAKE_CURRENT_SOURCE_DIR}/tnt_insert.c
      ${CMAKE_CURRENT_SOURCE_DIR}/tnt_call.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/tnt_execute.c
      ${CMAKE_CURRENT_SOURCE_DIR}/tnt_delete.c
      ${CMAKE_CURRENT_SOURCE_DIR}/tnt_update.c
      ${CMAKE_CURRENT_SOURCE_DIR}/tnt_assoc.c
diff --git a/tnt/tnt_execute.c b/tnt/tnt_execute.c
@@ -0,0 +1,60 @@
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <limits.h>
+#include <string.h>
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include <msgpuck.h>
+
+#include <tarantool/tnt_reply.h>
+#include <tarantool/tnt_stream.h>
+#include <tarantool/tnt_buf.h>
+#include <tarantool/tnt_object.h>
+#include <tarantool/tnt_execute.h>
+
+#include "tnt_proto_internal.h"
+
+ssize_t
+tnt_execute(struct tnt_stream *s, const char *expr, size_t elen,
+	    struct tnt_stream *params)
+{
+	if (!expr || elen == 0)
+		return -1;
+	if (tnt_object_verify(params, MP_ARRAY))
+		return -1;
+	struct tnt_iheader hdr;
+	struct iovec v[6];
+	int v_sz = 6;
+	char *data = NULL, *body_start = NULL;
+	encode_header(&hdr, TNT_OP_EXECUTE, s->reqid++);
+	v[1].iov_base = (void *) hdr.header;
+	v[1].iov_len = hdr.end - hdr.header;
+	char body[64];
+	body_start = body;
+	data = body;
+
+	data = mp_encode_map(data, 2);
+	data = mp_encode_uint(data, TNT_SQL_TEXT);
+	data = mp_encode_strl(data, elen);
+	v[2].iov_base = body_start;
+	v[2].iov_len = data - body_start;
+	v[3].iov_base = (void *) expr;
+	v[3].iov_len = elen;
+	body_start = data;
+	data = mp_encode_uint(data, TNT_SQL_BIND);
+	v[4].iov_base = body_start;
+	v[4].iov_len = data - body_start;
+	v[5].iov_base = TNT_SBUF_DATA(params);
+	v[5].iov_len = TNT_SBUF_SIZE(params);
+
+	size_t package_len = 0;
+	for (int i = 1; i < v_sz; ++i)
+		package_len += v[i].iov_len;
+	char len_prefix[9];
+	char *len_end = mp_encode_luint32(len_prefix, package_len);
+	v[0].iov_base = len_prefix;
+	v[0].iov_len = len_end - len_prefix;
+	return s->writev(s, v, v_sz);
+}
diff --git a/tnt/tnt_reply.c b/tnt/tnt_reply.c
@@ -171,7 +171,10 @@ tnt_reply_body0(struct tnt_reply *r, const char *buf, size_t size, size_t *off)
 		return -1;
 	if (mp_typeof(*p) != MP_MAP)
 		return -1;
-	const char *error = NULL, *error_end = NULL, *data = NULL, *data_end = NULL;
+	const char *error = NULL, *error_end = NULL,
+		   *data = NULL, *data_end = NULL,
+		   *metadata = NULL, *metadata_end = NULL,
+		   *sqlinfo = NULL, *sqlinfo_end = NULL;
 	uint64_t bitmap = 0;
 	uint32_t n = mp_decode_map(&p);
 	while (n-- > 0) {
@@ -193,6 +196,26 @@ tnt_reply_body0(struct tnt_reply *r, const char *buf, size_t size, size_t *off)
 			data_end = p;
 			break;
 		}
+		case TNT_METADATA: {
+			if (mp_typeof(*p) != MP_ARRAY)
+				return -1;
+			metadata = p;
+			mp_next(&p);
+			metadata_end = p;
+			break;
+		}
+		case TNT_SQL_INFO: {
+			if (mp_typeof(*p) != MP_MAP)
+				return -1;
+			sqlinfo = p;
+			mp_next(&p);
+			sqlinfo_end = p;
+			break;
+		}
+		default: {
+			mp_next(&p);
+			break;
+		}
 		}
 		bitmap |= (1ULL << key);
 	}
@@ -201,6 +224,10 @@ tnt_reply_body0(struct tnt_reply *r, const char *buf, size_t size, size_t *off)
 		r->error_end = error_end;
 		r->data = data;
 		r->data_end = data_end;
+		r->metadata = metadata;
+		r->metadata_end = metadata_end;
+		r->sqlinfo = sqlinfo;
+		r->sqlinfo_end = sqlinfo_end;
 		r->bitmap |= bitmap;
 	}
 	if (off)
