Skip to content
Snippets Groups Projects
Commit 01cdfa6c authored by Mergen Imeev's avatar Mergen Imeev Committed by Vladimir Davydov
Browse files

box: remove static_assert() from field_def.h

This patch removes the static_assert(). This static_assert was necessary
because after commit 037e2e44 ("sql: clean-up affinity from SQL
source code") and before commit 078bcf00 ("sql: remove implicit cast
from comparison opcodes"), 4 bits of the p5 field of the struct VdbeOp
were used to store the field type in VDBE comparison opcodes. After the
commit 078bcf00 ("sql: remove implicit cast from comparison
opcodes"), these opcodes no longer need the field type, so this
static_assert() is now unneeded.

NO_DOC=refactoring
NO_TEST=refactoring
NO_CHANGELOG=refactoring
parent fec19727
No related branches found
No related tags found
No related merge requests found
......@@ -89,22 +89,6 @@ enum on_conflict_action {
/** \endcond public */
enum {
/**
* This mask allows to store in VdbeOp.p5 operand of
* OP_Eq, OP_Lt etc opcodes field type alongside with
* flags.
*/
FIELD_TYPE_MASK = 15
};
/**
* For detailed explanation see context of OP_Eq, OP_Lt etc
* opcodes in vdbe.c.
*/
static_assert((int) field_type_MAX <= (int) FIELD_TYPE_MASK,
"values of enum field_type should fit into 4 bits of VdbeOp.p5");
extern const char *field_type_strs[];
extern const char *on_conflict_action_strs[];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment