database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Require the SQLITE_ENABLE_RTREE compile-time option in speedtest1.c in order

Browse Source 
to enable the R-Tree tests.

FossilOrigin-Name: 5d29a033b0f17b0fd74656b28a8367a9a9067f81
This commit is contained in:
drh
2014-10-11 10:52:54 +00:00
parent 4929047d1a
commit 8683e08676
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manifest
View File

@@ -1,5 +1,5 @@
C Make\ssure\sthat\sa\sGROUP\sBY\sthat\salso\simplements\san\sORDER\sBY\sscans\sthe\stable\nin\sthe\scorrect\sorder.\s\sFix\sfor\sticket\s[ba7cbfaedc7e6]. C Require\sthe\sSQLITE_ENABLE_RTREE\scompile-time\soption\sin\sspeedtest1.c\sin\sorder\nto\senable\sthe\sR-Tree\stests.
D 2014-10-11T02:12:58.777 D 2014-10-11T10:52:54.590
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -860,7 +860,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
F test/speedtest1.c 83f6b3318f7ee60e52b978b5a5e5dd7e83dfb7ee F test/speedtest1.c e4e2aa37ff66bad9f414a50a8cb9edfaac65c9e5
F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49 F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9 F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9
F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
@@ -1204,8 +1204,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P c5dc83ebded914f07286b7f98d0a50c28c16f609 2a9573962b837973c4959465d8a5f2641d109a5a P 7a32fdfd4be2138c0ab00f3dc6f54a70e4e07be4
R 6f36f8a6a865ae8ec418dbbf6437f4b9 R 4281e286fbeeaa18c9716d9bb0cdd63c
T +closed 2a9573962b837973c4959465d8a5f2641d109a5a
U drh U drh
Z b85f219ca12b10b385d8fb433d0ee994 Z 50870d5e316ccf74380338fbaf696334

2
manifest.uuid
View File

@@ -1 +1 @@
7a32fdfd4be2138c0ab00f3dc6f54a70e4e07be4 5d29a033b0f17b0fd74656b28a8367a9a9067f81

11
test/speedtest1.c
View File

@@ -934,6 +934,7 @@ void testset_cte(void){
} }
#ifdef SQLITE_ENABLE_RTREE
/* Generate two numbers between 1 and mx. The first number is less than /* Generate two numbers between 1 and mx. The first number is less than
** the second. Usually the numbers are near each other but can sometimes ** the second. Usually the numbers are near each other but can sometimes
** be far apart. ** be far apart.
@@ -954,7 +955,9 @@ static void twoCoords(
*pX0 = x0; *pX0 = x0;
*pX1 = x1; *pX1 = x1;
} }
#endif
#ifdef SQLITE_ENABLE_RTREE
/* The following routine is an R-Tree geometry callback. It returns /* The following routine is an R-Tree geometry callback. It returns
** true if the object overlaps a slice on the Y coordinate between the ** true if the object overlaps a slice on the Y coordinate between the
** two values given as arguments. In other words ** two values given as arguments. In other words
@@ -974,7 +977,9 @@ static int xsliceGeometryCallback(
*pRes = aCoord[3]>=p->aParam[0] && aCoord[2]<=p->aParam[1]; *pRes = aCoord[3]>=p->aParam[0] && aCoord[2]<=p->aParam[1];
return SQLITE_OK; return SQLITE_OK;
} }
#endif /* SQLITE_ENABLE_RTREE */
#ifdef SQLITE_ENABLE_RTREE
/* /*
** A testset for the R-Tree virtual table ** A testset for the R-Tree virtual table
*/ */
@@ -1110,6 +1115,7 @@ void testset_rtree(int p1, int p2){
} }
speedtest1_end_test(); speedtest1_end_test();
} }
#endif /* SQLITE_ENABLE_RTREE */
/* /*
** A testset used for debugging speedtest1 itself. ** A testset used for debugging speedtest1 itself.
@@ -1329,7 +1335,12 @@ int main(int argc, char **argv){
}else if( strcmp(zTSet,"cte")==0 ){ }else if( strcmp(zTSet,"cte")==0 ){
testset_cte(); testset_cte();
}else if( strcmp(zTSet,"rtree")==0 ){ }else if( strcmp(zTSet,"rtree")==0 ){
#ifdef SQLITE_ENABLE_RTREE
testset_rtree(6, 147); testset_rtree(6, 147);
#else
fatal_error("compile with -DSQLITE_ENABLE_RTREE to enable "
"the R-Tree tests\n");
#endif
}else{ }else{
fatal_error("unknown testset: \"%s\"\nChoices: main debug1 cte rtree\n", fatal_error("unknown testset: \"%s\"\nChoices: main debug1 cte rtree\n",
zTSet); zTSet);