Skip to content

Commit b34ab30

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into 5a877221
2 parents ba63675 + 5e3132e commit b34ab30

152 files changed

Lines changed: 6028 additions & 1665 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,9 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
211211
table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
212212
update.lo userauth.lo upsert.lo util.lo vacuum.lo \
213213
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
214-
vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
215-
window.lo utf.lo vtab.lo $(CRYPTOLIBOBJ)
214+
vdbetrace.lo vdbevtab.lo \
215+
wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
216+
window.lo utf.lo vtab.lo $(CRYPTOLIBOBJ)
216217

217218
# Object files for the amalgamation.
218219
#
@@ -318,6 +319,7 @@ SRC = \
318319
$(TOP)/src/vdbemem.c \
319320
$(TOP)/src/vdbesort.c \
320321
$(TOP)/src/vdbetrace.c \
322+
$(TOP)/src/vdbevtab.c \
321323
$(TOP)/src/vdbeInt.h \
322324
$(TOP)/src/vtab.c \
323325
$(TOP)/src/vxworks.h \
@@ -524,6 +526,7 @@ TESTSRC2 = \
524526
$(TOP)/src/vdbe.c \
525527
$(TOP)/src/vdbemem.c \
526528
$(TOP)/src/vdbetrace.c \
529+
$(TOP)/src/vdbevtab.c \
527530
$(TOP)/src/where.c \
528531
$(TOP)/src/wherecode.c \
529532
$(TOP)/src/whereexpr.c \
@@ -629,6 +632,7 @@ SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
629632
SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
630633
SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
631634
SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
635+
SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
632636
SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
633637
SHELL_OPT += -DSQLITE_ENABLE_DESERIALIZE
634638
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
@@ -637,10 +641,12 @@ FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
637641
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
638642
FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
639643
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
644+
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS3_PARENTHESIS
640645
#FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
641646
FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
642647
FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
643648
FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
649+
FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
644650
FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c
645651
DBFUZZ_OPT =
646652

@@ -710,6 +716,7 @@ DBFUZZ2_OPTS = \
710716
-DSQLITE_ENABLE_DESERIALIZE \
711717
-DSQLITE_DEBUG \
712718
-DSQLITE_ENABLE_DBSTAT_VTAB \
719+
-DSQLITE_ENABLE_BYTECODE_VTAB \
713720
-DSQLITE_ENABLE_RTREE \
714721
-DSQLITE_ENABLE_FTS4 \
715722
-DSQLITE_ENABLE_FTS5
@@ -1041,6 +1048,9 @@ vdbesort.lo: $(TOP)/src/vdbesort.c $(HDR)
10411048
vdbetrace.lo: $(TOP)/src/vdbetrace.c $(HDR)
10421049
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbetrace.c
10431050

1051+
vdbevtab.lo: $(TOP)/src/vdbevtab.c $(HDR)
1052+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbevtab.c
1053+
10441054
vtab.lo: $(TOP)/src/vtab.c $(HDR)
10451055
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vtab.c
10461056

@@ -1106,6 +1116,7 @@ SHELL_SRC = \
11061116
$(TOP)/ext/misc/fileio.c \
11071117
$(TOP)/ext/misc/completion.c \
11081118
$(TOP)/ext/misc/sqlar.c \
1119+
$(TOP)/ext/misc/uint.c \
11091120
$(TOP)/ext/expert/sqlite3expert.c \
11101121
$(TOP)/ext/expert/sqlite3expert.h \
11111122
$(TOP)/ext/misc/zipfile.c \
@@ -1247,6 +1258,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
12471258
TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
12481259
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
12491260
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
1261+
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
12501262
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
12511263

12521264
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la

‎Makefile.msc‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,15 @@ OSTRACE = 0
234234
DEBUG = 0
235235
!ENDIF
236236

237+
# <<mark>>
238+
# Disable use of the --linemacros argument to the mksqlite3c.tcl tool, which
239+
# is used to build the amalgamation.
240+
#
241+
!IFNDEF NO_LINEMACROS
242+
NO_LINEMACROS = 0
243+
!ENDIF
244+
# <</mark>>
245+
237246
# Enable use of available compiler optimizations? Normally, this should be
238247
# non-zero. Setting this to zero, thus disabling all compiler optimizations,
239248
# can be useful for testing.
@@ -357,6 +366,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
357366
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
358367
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
359368
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
369+
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
360370
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
361371
!ENDIF
362372
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -775,7 +785,7 @@ MKSQLITE3C_TOOL = $(TOP)\tool\mksqlite3c.tcl
775785
!ENDIF
776786

777787
!IFNDEF MKSQLITE3C_ARGS
778-
!IF $(DEBUG)>1
788+
!IF $(DEBUG)>1 && $(NO_LINEMACROS)==0
779789
MKSQLITE3C_ARGS = --linemacros
780790
!ELSE
781791
MKSQLITE3C_ARGS =
@@ -1246,7 +1256,8 @@ LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
12461256
table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
12471257
update.lo upsert.lo util.lo vacuum.lo \
12481258
vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
1249-
vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
1259+
vdbetrace.lo vdbevtab.lo wal.lo walker.lo where.lo wherecode.lo \
1260+
whereexpr.lo \
12501261
window.lo utf.lo vtab.lo
12511262
# <</mark>>
12521263

@@ -1361,6 +1372,7 @@ SRC01 = \
13611372
$(TOP)\src\vdbemem.c \
13621373
$(TOP)\src\vdbesort.c \
13631374
$(TOP)\src\vdbetrace.c \
1375+
$(TOP)\src\vdbevtab.c \
13641376
$(TOP)\src\vtab.c \
13651377
$(TOP)\src\wal.c \
13661378
$(TOP)\src\walker.c \
@@ -1692,6 +1704,7 @@ FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
16921704
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
16931705
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
16941706
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DBSTAT_VTAB
1707+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_BYTECODE_VTAB
16951708

16961709
FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
16971710
OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
@@ -2117,6 +2130,9 @@ vdbesort.lo: $(TOP)\src\vdbesort.c $(HDR)
21172130
vdbetrace.lo: $(TOP)\src\vdbetrace.c $(HDR)
21182131
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbetrace.c
21192132

2133+
vdbevtab.lo: $(TOP)\src\vdbevtab.c $(HDR)
2134+
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbevtab.c
2135+
21202136
vtab.lo: $(TOP)\src\vtab.c $(HDR)
21212137
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vtab.c
21222138

@@ -2190,6 +2206,7 @@ SHELL_SRC = \
21902206
$(TOP)\ext\misc\shathree.c \
21912207
$(TOP)\ext\misc\fileio.c \
21922208
$(TOP)\ext\misc\completion.c \
2209+
$(TOP)\ext\misc\uint.c \
21932210
$(TOP)\ext\expert\sqlite3expert.c \
21942211
$(TOP)\ext\expert\sqlite3expert.h \
21952212
$(TOP)\ext\misc\memtrace.c \
@@ -2360,6 +2377,7 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
23602377
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
23612378
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
23622379
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
2380+
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
23632381
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
23642382
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
23652383
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)

‎autoconf/Makefile.msc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ OSTRACE = 0
196196
DEBUG = 0
197197
!ENDIF
198198

199+
199200
# Enable use of available compiler optimizations? Normally, this should be
200201
# non-zero. Setting this to zero, thus disabling all compiler optimizations,
201202
# can be useful for testing.
@@ -288,6 +289,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
288289
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
289290
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
290291
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
292+
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
291293
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
292294
!ENDIF
293295
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1

‎doc/lemon.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ <h3>Command Line Options</h3>
123123
<li><b>-r</b>
124124
Do not sort or renumber the parser states as part of optimization.
125125
<li><b>-s</b>
126-
Show parser statistics before existing.
126+
Show parser statistics before exiting.
127127
<li><b>-T<i>file</i></b>
128128
Use <i>file</i> as the template for the generated C-code parser implementation.
129129
<li><b>-x</b>
@@ -488,7 +488,7 @@ <h3>Precedence Rules</h3>
488488
The precedence of a grammar rule is equal to the precedence of the
489489
left-most terminal symbol in the rule for which a precedence is
490490
defined. This is normally what you want, but in those cases where
491-
you want to precedence of a grammar rule to be something different,
491+
you want the precedence of a grammar rule to be something different,
492492
you can specify an alternative precedence symbol by putting the
493493
symbol in square braces after the period at the end of the rule and
494494
before any C-code. For example:</p>
@@ -689,7 +689,7 @@ <h4>The <tt>%extra_argument</tt> directive</h4>
689689
<a name='extractx'></a>
690690
<h4>The <tt>%extra_context</tt> directive</h4>
691691

692-
The <tt>%extra_context</tt> directive instructs Lemon to add a 2th parameter
692+
The <tt>%extra_context</tt> directive instructs Lemon to add a 2nd parameter
693693
to the parameter list of the ParseAlloc() and ParseInif() functions. Lemon
694694
doesn't do anything itself with these extra argument, but it does
695695
store the value make it available to C-code action routines, destructors,
@@ -699,9 +699,9 @@ <h4>The <tt>%extra_context</tt> directive</h4>
699699
%extra_context { MyStruct *pAbc }
700700
</pre></p>
701701

702-
<p>Then the ParseAlloc() and ParseInit() functions will have an 2th parameter
702+
<p>Then the ParseAlloc() and ParseInit() functions will have an 2nd parameter
703703
of type "MyStruct*" and all action routines will have access to
704-
a variable named "pAbc" that is the value of that 2th parameter.</p>
704+
a variable named "pAbc" that is the value of that 2nd parameter.</p>
705705

706706
<p>The <tt>%extra_argument</tt> directive works the same except that it
707707
is passed in on the Parse() routine instead of on ParseAlloc()/ParseInit().
@@ -996,7 +996,7 @@ <h4>The <tt>%token_type</tt> and <tt>%type</tt> directives</h4>
996996
symbols. The values of all terminal symbols must be of the same
997997
type. This turns out to be the same data type as the 3rd parameter
998998
to the Parse() function generated by Lemon. Typically, you will
999-
make the value of a terminal symbol by a pointer to some kind of
999+
make the value of a terminal symbol be a pointer to some kind of
10001000
token structure. Like this:</p>
10011001

10021002
<p><pre>

‎ext/expert/expert1.test‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ proc squish {txt} {
3737

3838
proc do_setup_rec_test {tn setup sql res} {
3939
reset_db
40+
if {[info exists ::set_main_db_name]} {
41+
dbconfig_maindbname_icecube db
42+
}
4043
db eval $setup
4144
uplevel [list do_rec_test $tn $sql $res]
4245
}
@@ -76,6 +79,10 @@ foreach {tn setup} {
7679
}
7780
}
7881
3 {
82+
if {[info commands sqlite3_expert_new]==""} { continue }
83+
set ::set_main_db_name 1
84+
}
85+
4 {
7986
if {![file executable $CLI]} { continue }
8087

8188
proc do_rec_test {tn sql res} {
@@ -336,7 +343,7 @@ proc do_candidates_test {tn sql res} {
336343

337344

338345
reset_db
339-
do_execsql_test 4.0 {
346+
do_execsql_test 5.0 {
340347
CREATE TABLE t1(a, b);
341348
CREATE TABLE t2(c, d);
342349

@@ -346,7 +353,7 @@ do_execsql_test 4.0 {
346353
WITH s(i) AS ( VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<100)
347354
INSERT INTO t2 SELECT (i-1)/20, (i-1)/5 FROM s;
348355
}
349-
do_candidates_test 4.1 {
356+
do_candidates_test 5.1 {
350357
SELECT * FROM t1,t2 WHERE (b=? OR a=?) AND (c=? OR d=?)
351358
} {
352359
CREATE INDEX t1_idx_00000062 ON t1(b); -- stat1: 100 20
@@ -355,14 +362,14 @@ do_candidates_test 4.1 {
355362
CREATE INDEX t2_idx_00000064 ON t2(d); -- stat1: 100 5
356363
}
357364

358-
do_candidates_test 4.2 {
365+
do_candidates_test 5.2 {
359366
SELECT * FROM t1,t2 WHERE a=? AND b=? AND c=? AND d=?
360367
} {
361368
CREATE INDEX t1_idx_000123a7 ON t1(a, b); -- stat1: 100 50 17
362369
CREATE INDEX t2_idx_0001295b ON t2(c, d); -- stat1: 100 20 5
363370
}
364371

365-
do_execsql_test 4.3 {
372+
do_execsql_test 5.3 {
366373
CREATE INDEX t1_idx_00000061 ON t1(a); -- stat1: 100 50
367374
CREATE INDEX t1_idx_00000062 ON t1(b); -- stat1: 100 20
368375
CREATE INDEX t1_idx_000123a7 ON t1(a, b); -- stat1: 100 50 16

‎ext/expert/sqlite3expert.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,14 +1128,19 @@ int idxFindIndexes(
11281128
/* int iParent = sqlite3_column_int(pExplain, 1); */
11291129
/* int iNotUsed = sqlite3_column_int(pExplain, 2); */
11301130
const char *zDetail = (const char*)sqlite3_column_text(pExplain, 3);
1131-
int nDetail = STRLEN(zDetail);
1131+
int nDetail;
11321132
int i;
11331133

1134+
if( !zDetail ) continue;
1135+
nDetail = STRLEN(zDetail);
1136+
11341137
for(i=0; i<nDetail; i++){
11351138
const char *zIdx = 0;
1136-
if( memcmp(&zDetail[i], " USING INDEX ", 13)==0 ){
1139+
if( i+13<nDetail && memcmp(&zDetail[i], " USING INDEX ", 13)==0 ){
11371140
zIdx = &zDetail[i+13];
1138-
}else if( memcmp(&zDetail[i], " USING COVERING INDEX ", 22)==0 ){
1141+
}else if( i+22<nDetail
1142+
&& memcmp(&zDetail[i], " USING COVERING INDEX ", 22)==0
1143+
){
11391144
zIdx = &zDetail[i+22];
11401145
}
11411146
if( zIdx ){
@@ -1950,4 +1955,4 @@ void sqlite3_expert_destroy(sqlite3expert *p){
19501955
}
19511956
}
19521957

1953-
#endif /* ifndef SQLITE_OMIT_VIRTUAL_TABLE */
1958+
#endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */

0 commit comments

Comments
 (0)