Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: tarantool-patches@freelists.org, Nikita Pettik <korablev@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH 6/7] sql: don't add system spaces to Table hash
Date: Tue, 28 Aug 2018 21:58:27 -0300	[thread overview]
Message-ID: <d895d72d-e7c0-f7a3-b194-496fa8233b23@tarantool.org> (raw)
In-Reply-To: <b449ef840392ee36d16eacfa184bd81052708cda.1535064700.git.korablev@tarantool.org>

Thanks for the patch! See my review fixes on the branch and
below:

commit 882627479793ae3958cec7274cc3e353395aea40
Author: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Date:   Tue Aug 28 21:28:49 2018 -0300

     Review fixes

diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c
index a59e70dd0..0dfdf251f 100644
--- a/src/box/sql/prepare.c
+++ b/src/box/sql/prepare.c
@@ -133,26 +133,14 @@ sql_init_callback(struct init_data *init, const char *name,
  extern int
  sqlite3InitDatabase(sqlite3 * db)
  {
-	int rc;
-	struct init_data init;
-
  	assert(db->pSchema != NULL);
-
-	memset(&init, 0, sizeof(init));
-	init.db = db;
-	/* Read the schema information out of the schema tables
-	 */
  	assert(db->init.busy);
-	{
-		rc = init.rc;
-		if (rc == SQLITE_OK)
-			sql_analysis_load(db);
-	}
+	sql_analysis_load(db);
  	if (db->mallocFailed) {
-		rc = SQLITE_NOMEM_BKPT;
  		sqlite3ResetAllSchemasOfConnection(db);
+		return SQLITE_NOMEM_BKPT;
  	}
-	return rc;
+	return SQLITE_OK;
  }
  
  
diff --git a/src/box/sql/tarantoolInt.h b/src/box/sql/tarantoolInt.h
index 9334de52d..8622cd19f 100644
--- a/src/box/sql/tarantoolInt.h
+++ b/src/box/sql/tarantoolInt.h
@@ -10,10 +10,6 @@
  
  struct fkey_def;
  
-/* Insert or replace operation types - necessary for vdbe */
-#define TARANTOOL_INDEX_INSERT 1
-#define TARANTOOL_INDEX_REPLACE 2
-
  /* Misc */
  const char *tarantoolErrorMessage();
  

  reply	other threads:[~2018-08-29  0:58 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-23 22:55 [tarantool-patches] [PATCH 0/7] Finish SQL DD integration Nikita Pettik
     [not found] ` <cover.1535064700.git.korablev@tarantool.org>
2018-08-23 22:55   ` [tarantool-patches] [PATCH 1/7] sql: remove struct schema from struct Table Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:51       ` n.pettik
2018-09-16 19:32     ` Vladislav Shpilevoy
2018-09-19 10:58       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 2/7] sql: remove SQLite original struct Index Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:51       ` n.pettik
2018-09-06 19:54         ` Vladislav Shpilevoy
2018-09-16 19:04           ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 3/7] sql: remove struct Table from analyze routine Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:52       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 4/7] sql: refactor ALTER RENAME code generation Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:52       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 5/7] sql: remove lookups in Table hash Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:52       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 6/7] sql: don't add system spaces to " Nikita Pettik
2018-08-29  0:58     ` Vladislav Shpilevoy [this message]
2018-09-02 23:52       ` [tarantool-patches] " n.pettik
2018-09-06 19:54         ` Vladislav Shpilevoy
2018-09-16 19:04           ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 7/7] sql: finish DD integration Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-20 14:45       ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d895d72d-e7c0-f7a3-b194-496fa8233b23@tarantool.org \
    --to=v.shpilevoy@tarantool.org \
    --cc=korablev@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='[tarantool-patches] Re: [PATCH 6/7] sql: don'\''t add system spaces to Table hash' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox