[tarantool-patches] [PATCH v1 23/28] sql: remove field errMask from struct sql
imeevma at tarantool.org
imeevma at tarantool.org
Mon Jun 10 16:57:03 MSK 2019
This field has become unused and should be removed.
---
src/box/sql/legacy.c | 1 -
src/box/sql/main.c | 1 -
src/box/sql/malloc.c | 2 +-
src/box/sql/prepare.c | 2 --
src/box/sql/sqlInt.h | 1 -
src/box/sql/vdbeapi.c | 3 +--
src/box/sql/vdbeaux.c | 9 ++-------
7 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/box/sql/legacy.c b/src/box/sql/legacy.c
index df40032..2f69007 100644
--- a/src/box/sql/legacy.c
+++ b/src/box/sql/legacy.c
@@ -163,6 +163,5 @@ sql_exec(sql * db, /* The database on which the SQL executes */
sqlDbFree(db, azCols);
assert(rc == 0);
- assert((rc & db->errMask) == rc);
return rc;
}
diff --git a/src/box/sql/main.c b/src/box/sql/main.c
index 76d464f..145964f 100644
--- a/src/box/sql/main.c
+++ b/src/box/sql/main.c
@@ -535,7 +535,6 @@ sql_init_db(sql **out_db)
*out_db = NULL;
return -1;
}
- db->errMask = 0xff;
db->magic = SQL_MAGIC_BUSY;
db->pVfs = sql_vfs_find(0);
diff --git a/src/box/sql/malloc.c b/src/box/sql/malloc.c
index 64873f2..f5612bf 100644
--- a/src/box/sql/malloc.c
+++ b/src/box/sql/malloc.c
@@ -783,5 +783,5 @@ sqlApiExit(sql * db, int rc)
if (db->mallocFailed) {
return apiOomError(db);
}
- return rc & db->errMask;
+ return rc;
}
diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c
index 0aa744f..f840d2f 100644
--- a/src/box/sql/prepare.c
+++ b/src/box/sql/prepare.c
@@ -176,8 +176,6 @@ sqlPrepare(sql * db, /* Database handle. */
end_prepare:
sql_parser_destroy(&sParse);
- rc = sqlApiExit(db, rc);
- assert((rc & db->errMask) == rc);
return rc;
}
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index d5a1a9a..fbf5f72 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -1355,7 +1355,6 @@ struct sql {
struct Vdbe *pVdbe; /* List of active virtual machines */
struct coll *pDfltColl; /* The default collating sequence (BINARY) */
i64 szMmap; /* Default mmap_size setting */
- int errMask; /* & result codes with this before returning */
u16 dbOptFlags; /* Flags to enable/disable optimizations */
u8 enc; /* Text encoding */
u8 temp_store; /* 1: file 2: memory 0: default */
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 268aff6..9380155 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -108,7 +108,6 @@ sql_reset(sql_stmt * pStmt)
checkProfileCallback(db, v);
int rc = sqlVdbeReset(v);
sqlVdbeRewind(v);
- assert((rc & (db->errMask)) == rc);
return sqlApiExit(db, rc);
}
@@ -465,7 +464,7 @@ sqlStep(Vdbe * p)
*/
rc = p->rc;
}
- return (rc & db->errMask);
+ return rc;
}
/*
diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c
index d4ba3a3..28b423d 100644
--- a/src/box/sql/vdbeaux.c
+++ b/src/box/sql/vdbeaux.c
@@ -2315,9 +2315,6 @@ sqlVdbeResetStepResult(Vdbe * p)
int
sqlVdbeReset(Vdbe * p)
{
- sql *db;
- db = p->db;
-
/* If the VM did not run to completion or if it encountered an
* error, then it might not have been halted properly. So halt
* it now.
@@ -2389,7 +2386,7 @@ sqlVdbeReset(Vdbe * p)
#endif
p->iCurrentTime = 0;
p->magic = VDBE_MAGIC_RESET;
- return p->rc & db->errMask;
+ return p->rc;
}
/*
@@ -2400,10 +2397,8 @@ int
sqlVdbeFinalize(Vdbe * p)
{
int rc = 0;
- if (p->magic == VDBE_MAGIC_RUN || p->magic == VDBE_MAGIC_HALT) {
+ if (p->magic == VDBE_MAGIC_RUN || p->magic == VDBE_MAGIC_HALT)
rc = sqlVdbeReset(p);
- assert((rc & p->db->errMask) == rc);
- }
sqlVdbeDelete(p);
return rc;
}
--
2.7.4
More information about the Tarantool-patches
mailing list