1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

Get the ABORT conflict resolution algorithm working. (CVS 362)

FossilOrigin-Name: 9be4d4c6f12056782966396dca0b8e2d384d0cf2
This commit is contained in:
drh
2002-02-02 18:49:19 +00:00
parent fa86c4127d
commit 663fc63a77
12 changed files with 508 additions and 234 deletions

View File

@@ -15,7 +15,7 @@
** or VDBE. The VDBE implements an abstract machine that runs a
** simple program to access and modify the underlying database.
**
** $Id: vdbe.h,v 1.39 2002/01/29 18:41:25 drh Exp $
** $Id: vdbe.h,v 1.40 2002/02/02 18:49:21 drh Exp $
*/
#ifndef _SQLITE_VDBE_H_
#define _SQLITE_VDBE_H_
@@ -69,139 +69,140 @@ typedef struct VdbeOp VdbeOp;
** can be used to renumber these opcodes when new opcodes are inserted.
*/
#define OP_Transaction 1
#define OP_Commit 2
#define OP_Rollback 3
#define OP_Checkpoint 2
#define OP_Commit 3
#define OP_Rollback 4
#define OP_ReadCookie 4
#define OP_SetCookie 5
#define OP_VerifyCookie 6
#define OP_ReadCookie 5
#define OP_SetCookie 6
#define OP_VerifyCookie 7
#define OP_Open 7
#define OP_OpenTemp 8
#define OP_OpenWrite 9
#define OP_OpenAux 10
#define OP_OpenWrAux 11
#define OP_Close 12
#define OP_MoveTo 13
#define OP_NewRecno 14
#define OP_PutIntKey 15
#define OP_PutStrKey 16
#define OP_Distinct 17
#define OP_Found 18
#define OP_NotFound 19
#define OP_IsUnique 20
#define OP_NotExists 21
#define OP_Delete 22
#define OP_Column 23
#define OP_KeyAsData 24
#define OP_Recno 25
#define OP_FullKey 26
#define OP_Rewind 27
#define OP_Next 28
#define OP_Open 8
#define OP_OpenTemp 9
#define OP_OpenWrite 10
#define OP_OpenAux 11
#define OP_OpenWrAux 12
#define OP_Close 13
#define OP_MoveTo 14
#define OP_NewRecno 15
#define OP_PutIntKey 16
#define OP_PutStrKey 17
#define OP_Distinct 18
#define OP_Found 19
#define OP_NotFound 20
#define OP_IsUnique 21
#define OP_NotExists 22
#define OP_Delete 23
#define OP_Column 24
#define OP_KeyAsData 25
#define OP_Recno 26
#define OP_FullKey 27
#define OP_Rewind 28
#define OP_Next 29
#define OP_Destroy 29
#define OP_Clear 30
#define OP_CreateIndex 31
#define OP_CreateTable 32
#define OP_Reorganize 33
#define OP_Destroy 30
#define OP_Clear 31
#define OP_CreateIndex 32
#define OP_CreateTable 33
#define OP_Reorganize 34
#define OP_IdxPut 34
#define OP_IdxDelete 35
#define OP_IdxRecno 36
#define OP_IdxGT 37
#define OP_IdxGE 38
#define OP_IdxPut 35
#define OP_IdxDelete 36
#define OP_IdxRecno 37
#define OP_IdxGT 38
#define OP_IdxGE 39
#define OP_MemLoad 39
#define OP_MemStore 40
#define OP_MemLoad 40
#define OP_MemStore 41
#define OP_ListWrite 41
#define OP_ListRewind 42
#define OP_ListRead 43
#define OP_ListReset 44
#define OP_ListWrite 42
#define OP_ListRewind 43
#define OP_ListRead 44
#define OP_ListReset 45
#define OP_SortPut 45
#define OP_SortMakeRec 46
#define OP_SortMakeKey 47
#define OP_Sort 48
#define OP_SortNext 49
#define OP_SortCallback 50
#define OP_SortReset 51
#define OP_SortPut 46
#define OP_SortMakeRec 47
#define OP_SortMakeKey 48
#define OP_Sort 49
#define OP_SortNext 50
#define OP_SortCallback 51
#define OP_SortReset 52
#define OP_FileOpen 52
#define OP_FileRead 53
#define OP_FileColumn 54
#define OP_FileOpen 53
#define OP_FileRead 54
#define OP_FileColumn 55
#define OP_AggReset 55
#define OP_AggFocus 56
#define OP_AggIncr 57
#define OP_AggNext 58
#define OP_AggSet 59
#define OP_AggGet 60
#define OP_AggReset 56
#define OP_AggFocus 57
#define OP_AggIncr 58
#define OP_AggNext 59
#define OP_AggSet 60
#define OP_AggGet 61
#define OP_SetInsert 61
#define OP_SetFound 62
#define OP_SetNotFound 63
#define OP_SetInsert 62
#define OP_SetFound 63
#define OP_SetNotFound 64
#define OP_MakeRecord 64
#define OP_MakeKey 65
#define OP_MakeIdxKey 66
#define OP_IncrKey 67
#define OP_MakeRecord 65
#define OP_MakeKey 66
#define OP_MakeIdxKey 67
#define OP_IncrKey 68
#define OP_Goto 68
#define OP_If 69
#define OP_Halt 70
#define OP_Goto 69
#define OP_If 70
#define OP_Halt 71
#define OP_ColumnCount 71
#define OP_ColumnName 72
#define OP_Callback 73
#define OP_NullCallback 74
#define OP_ColumnCount 72
#define OP_ColumnName 73
#define OP_Callback 74
#define OP_NullCallback 75
#define OP_Integer 75
#define OP_String 76
#define OP_Pop 77
#define OP_Dup 78
#define OP_Pull 79
#define OP_Push 80
#define OP_MustBeInt 81
#define OP_Integer 76
#define OP_String 77
#define OP_Pop 78
#define OP_Dup 79
#define OP_Pull 80
#define OP_Push 81
#define OP_MustBeInt 82
#define OP_Add 82
#define OP_AddImm 83
#define OP_Subtract 84
#define OP_Multiply 85
#define OP_Divide 86
#define OP_Remainder 87
#define OP_BitAnd 88
#define OP_BitOr 89
#define OP_BitNot 90
#define OP_ShiftLeft 91
#define OP_ShiftRight 92
#define OP_AbsValue 93
#define OP_Precision 94
#define OP_Min 95
#define OP_Max 96
#define OP_Like 97
#define OP_Glob 98
#define OP_Eq 99
#define OP_Ne 100
#define OP_Lt 101
#define OP_Le 102
#define OP_Gt 103
#define OP_Ge 104
#define OP_IsNull 105
#define OP_NotNull 106
#define OP_Negative 107
#define OP_And 108
#define OP_Or 109
#define OP_Not 110
#define OP_Concat 111
#define OP_Noop 112
#define OP_Add 83
#define OP_AddImm 84
#define OP_Subtract 85
#define OP_Multiply 86
#define OP_Divide 87
#define OP_Remainder 88
#define OP_BitAnd 89
#define OP_BitOr 90
#define OP_BitNot 91
#define OP_ShiftLeft 92
#define OP_ShiftRight 93
#define OP_AbsValue 94
#define OP_Precision 95
#define OP_Min 96
#define OP_Max 97
#define OP_Like 98
#define OP_Glob 99
#define OP_Eq 100
#define OP_Ne 101
#define OP_Lt 102
#define OP_Le 103
#define OP_Gt 104
#define OP_Ge 105
#define OP_IsNull 106
#define OP_NotNull 107
#define OP_Negative 108
#define OP_And 109
#define OP_Or 110
#define OP_Not 111
#define OP_Concat 112
#define OP_Noop 113
#define OP_Strlen 113
#define OP_Substr 114
#define OP_Strlen 114
#define OP_Substr 115
#define OP_Limit 115
#define OP_Limit 116
#define OP_MAX 115
#define OP_MAX 116
/*
** Prototypes for the VDBE interface. See comments on the implementation