Selecting by space_no/index_name shouldn't throw error now

closes tarantoolgh-42

Author: bigbes

src/tarantool.c

@@ -629,6 +629,55 @@ int convert_iterator(zval *iter, int all) {
 	return -1;
 }
 
+int obtain_space_by_spaceno(tarantool_connection *obj, uint32_t space_no) {
+	if (tarantool_schema_has_space_no(obj->schema, space_no)) {
+		return 0;
+	}
+
+	tarantool_tp_update(obj->tps);
+	tp_select(obj->tps, SPACE_SPACE, INDEX_SPACE_NO, 0, 4096);
+	tp_key(obj->tps, 1);
+	tp_encode_uint(obj->tps, space_no);
+	tp_reqid(obj->tps, TARANTOOL_G(sync_counter)++);
+
+	obj->value->len = tp_used(obj->tps);
+	tarantool_tp_flush(obj->tps);
+
+	if (tarantool_stream_send(obj) == FAILURE)
+		return FAILURE;
+
+	char pack_len[5] = {0, 0, 0, 0, 0};
+	if (tarantool_stream_read(obj, pack_len, 5) == FAILURE)
+		return FAILURE;
+	size_t body_size = php_mp_unpack_package_size(pack_len);
+	smart_string_ensure(obj->value, body_size);
+	if (tarantool_stream_read(obj, obj->value->c,
+				body_size) == FAILURE)
+		return FAILURE;
+
+	struct tnt_response resp; memset(&resp, 0, sizeof(struct tnt_response));
+	if (php_tp_response(&resp, obj->value->c, body_size) == -1) {
+		tarantool_throw_parsingexception("query");
+		return FAILURE;
+	}
+
+	if (resp.error) {
+		tarantool_throw_clienterror(resp.code, resp.error,
+					    resp.error_len);
+		return FAILURE;
+	}
+
+	if (tarantool_schema_add_spaces(obj->schema, resp.data, resp.data_len)) {
+		tarantool_throw_parsingexception("schema (space)");
+		return FAILURE;
+	}
+	if (!tarantool_schema_has_space_no(obj->schema, space_no)) {
+		THROW_EXC("No space %u defined", space_no);
+		return FAILURE;
+	}
+	return 0;
+}
+
 int get_spaceno_by_name(tarantool_connection *obj, zval *name) {
 	if (Z_TYPE_P(name) == IS_LONG)
 		return Z_LVAL_P(name);
@@ -695,6 +744,11 @@ int get_indexno_by_name(tarantool_connection *obj, int space_no,
 		THROW_EXC("Index ID must be String or Long");
 		return FAILURE;
 	}
+
+	if (obtain_space_by_spaceno(obj, space_no) == FAILURE) {
+		return FAILURE;
+	}
+
 	int32_t index_no = tarantool_schema_get_iid_by_string(obj->schema,
 			space_no, Z_STRVAL_P(name), Z_STRLEN_P(name));
 	if (index_no != FAILURE)

src/tarantool_proto.h

@@ -12,6 +12,8 @@
 #define SPACE_SPACE 281
 #define SPACE_INDEX 289
 
+#define INDEX_SPACE_NO      0
+#define INDEX_INDEX_NO      0
 #define INDEX_SPACE_NAME    2
 #define INDEX_INDEX_NAME    2
 

src/tarantool_schema.c

@@ -399,6 +399,21 @@ schema_add_space(
 	return -1;
 }
 
+int
+tarantool_schema_has_space_no(
+		struct tarantool_schema *schema_obj,
+		uint32_t space_no) {
+	/* Prepare key for space search */
+	struct schema_key space_key;
+	space_key.number = space_no;
+	space_key.id = (void *)&(space_key.number);
+	space_key.id_len = sizeof(uint32_t);
+
+	struct mh_schema_space_t *schema = schema_obj->space_hash;
+	mh_int_t space_slot = mh_schema_space_find(schema, &space_key, NULL);
+	return (space_slot != mh_end(schema));
+}
+
 int
 tarantool_schema_add_spaces(
 		struct tarantool_schema *schema_obj,

src/tarantool_schema.h

@@ -49,6 +49,9 @@ struct tarantool_schema {
 	struct mh_schema_space_t *space_hash;
 };
 
+int
+tarantool_schema_has_space_no(struct tarantool_schema *, uint32_t);
+
 int
 tarantool_schema_add_spaces(struct tarantool_schema *, const char *, uint32_t);
 int

test/DMLTest.php

@@ -474,4 +474,12 @@ public function test_18_02_delete_loop() {
 		gc_collect_cycles();
 		gc_collect_cycles();
 	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_19_schema_obtain_failed() {
+		$empty_tarantool = new Tarantool('localhost', getenv('PRIMARY_PORT'), 'test');
+		$empty_tarantool->select(289, [], 'name');
+	}
 }