Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Align config vars controlling in-memory DB with code (CVS 923) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
921656db9e3df865aea6b1abe1bc40b1 |
User & Date: | paul 2003-04-20 11:46:35.000 |
Context
2003-04-20
| ||
17:29 | Added tests for the in-memory database backend. Also updated some comments in other modules. (CVS 924) (check-in: fb89adf4d1 user: drh tags: trunk) | |
11:46 | Align config vars controlling in-memory DB with code (CVS 923) (check-in: 921656db9e user: paul tags: trunk) | |
11:41 | Reset pCur->eSkip on a MoveTo (CVS 922) (check-in: d983accf4a user: paul tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
59 60 61 62 63 64 65 | # Flags controlling use of the in memory btree implementation # # SQLITE_OMIT_INMEMORYDB is defined in order to omit the in-memory # red/black tree driver in the file btree_rb.c # # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to | | | > > > | > > | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | # Flags controlling use of the in memory btree implementation # # SQLITE_OMIT_INMEMORYDB is defined in order to omit the in-memory # red/black tree driver in the file btree_rb.c # # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to # default to file, 2 to default to memory, and 3 to force temporary # tables to always be in memory. # INMEMORYDB = @INMEMORYDB@ INCOREFLAGS = -DTEMP_STORE=@TEMP_STORE@ ifeq (${INMEMORYDB},0) INCOREFLAGS += -DSQLITE_OMIT_INMEMORYDB=1 endif # You should not have to change anything below this line ############################################################################### # Object files for the SQLite library. # LIBOBJ = attach.lo auth.lo btree.lo build.lo copy.lo \ delete.lo expr.lo func.lo hash.lo insert.lo \ main.lo opcodes.lo os.lo pager.lo parse.lo pragma.lo \ printf.lo random.lo select.lo table.lo tokenize.lo \ update.lo util.lo vacuum.lo vdbe.lo \ where.lo trigger.lo # Only build the in-core DB if it is required. ifeq (${INMEMORYDB},1) LIBOBJ += btree_rb.lo endif # All of the source code files. # SRC = \ $(TOP)/src/attach.c \ |
︙ | ︙ |
Changes to configure.
︙ | ︙ | |||
463 464 465 466 467 468 469 | # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" | | | 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR ENCODING ALLOWATTACHMEM INMEMORYDB TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TARGET_TCL_LIBS TARGET_TCL_INC TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. ac_init_help= ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. |
︙ | ︙ | |||
1430 1431 1432 1433 1434 1435 1436 | # The following RCS revision string applies to configure.in | | | 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 | # The following RCS revision string applies to configure.in # $Revision: 1.15 $ ######### # Programs needed # # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" |
︙ | ︙ | |||
8248 8249 8250 8251 8252 8253 8254 | # Do we want to support in-ram databases for ATTACH DATABASE and sqlite_open # # Check whether --enable-incore-db or --disable-incore-db was given. if test "${enable_incore_db+set}" = set; then enableval="$enable_incore_db" else | | | | < | < | | | | | | | | | > | 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 | # Do we want to support in-ram databases for ATTACH DATABASE and sqlite_open # # Check whether --enable-incore-db or --disable-incore-db was given. if test "${enable_incore_db+set}" = set; then enableval="$enable_incore_db" else enable_incore_db=yes fi; echo "$as_me:$LINENO: checking whether to support incore databases for attach and open" >&5 echo $ECHO_N "checking whether to support incore databases for attach and open... $ECHO_C" >&6 if test "$enable_incore_db" = "no"; then INMEMORYDB=0 echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 else INMEMORYDB=1 echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi ########## # Do we want temporary databases in memory # # Check whether --enable-tempdb-in-ram or --disable-tempdb-in-ram was given. if test "${enable_tempdb_in_ram+set}" = set; then enableval="$enable_tempdb_in_ram" else enable_tempdb_in_ram=no fi; echo "$as_me:$LINENO: checking whether to use an in-ram database for temporary tables" >&5 echo $ECHO_N "checking whether to use an in-ram database for temporary tables... $ECHO_C" >&6 case "$enable_tempdb_in_ram" in never ) TEMP_STORE=0 echo "$as_me:$LINENO: result: never" >&5 echo "${ECHO_T}never" >&6 ;; no ) INMEMORYDB=1 TEMP_STORE=1 echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 ;; always ) INMEMORYDB=1 TEMP_STORE=3 echo "$as_me:$LINENO: result: always" >&5 echo "${ECHO_T}always" >&6 ;; * ) INMEMORYDB=1 TEMP_STORE=2 echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 ;; esac ########### # Lots of things are different if we are compiling for Windows using # the CYGWIN environment. So check for that special case and handle # things accordingly. |
︙ | ︙ | |||
9923 9924 9925 9926 9927 9928 9929 | s,@TARGET_CFLAGS@,$TARGET_CFLAGS,;t t s,@TARGET_LINK@,$TARGET_LINK,;t t s,@TARGET_LFLAGS@,$TARGET_LFLAGS,;t t s,@TARGET_RANLIB@,$TARGET_RANLIB,;t t s,@TARGET_AR@,$TARGET_AR,;t t s,@ENCODING@,$ENCODING,;t t s,@ALLOWATTACHMEM@,$ALLOWATTACHMEM,;t t | | | | 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 | s,@TARGET_CFLAGS@,$TARGET_CFLAGS,;t t s,@TARGET_LINK@,$TARGET_LINK,;t t s,@TARGET_LFLAGS@,$TARGET_LFLAGS,;t t s,@TARGET_RANLIB@,$TARGET_RANLIB,;t t s,@TARGET_AR@,$TARGET_AR,;t t s,@ENCODING@,$ENCODING,;t t s,@ALLOWATTACHMEM@,$ALLOWATTACHMEM,;t t s,@INMEMORYDB@,$INMEMORYDB,;t t s,@TEMP_STORE@,$TEMP_STORE,;t t s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t s,@OS_UNIX@,$OS_UNIX,;t t s,@OS_WIN@,$OS_WIN,;t t s,@TARGET_EXEEXT@,$TARGET_EXEEXT,;t t s,@TARGET_LIBS@,$TARGET_LIBS,;t t s,@TARGET_TCL_LIBS@,$TARGET_TCL_LIBS,;t t s,@TARGET_TCL_INC@,$TARGET_TCL_INC,;t t |
︙ | ︙ |
Changes to configure.ac.
︙ | ︙ | |||
134 135 136 137 138 139 140 | # the corresponding code. # AC_INIT(src/sqlite.h.in) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in | | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | # the corresponding code. # AC_INIT(src/sqlite.h.in) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in # $Revision: 1.4 $ ######### # Programs needed # AC_PROG_LIBTOOL AC_PROG_INSTALL |
︙ | ︙ | |||
305 306 307 308 309 310 311 | fi AC_SUBST(ENCODING) ########## # Do we want to support in-ram databases for ATTACH DATABASE and sqlite_open # AC_ARG_ENABLE(incore-db, | | | | < | < | | | | | | | | | > | | | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 | fi AC_SUBST(ENCODING) ########## # Do we want to support in-ram databases for ATTACH DATABASE and sqlite_open # AC_ARG_ENABLE(incore-db, [ --enable-incore-db Support incore database],,enable_incore_db=yes) AC_MSG_CHECKING([whether to support incore databases for attach and open]) if test "$enable_incore_db" = "no"; then INMEMORYDB=0 AC_MSG_RESULT([no]) else INMEMORYDB=1 AC_MSG_RESULT([yes]) fi AC_SUBST(ALLOWATTACHMEM) ########## # Do we want temporary databases in memory # AC_ARG_ENABLE(tempdb-in-ram, [ --enable-tempdb-in-ram Use an in-ram database for temporary tables],,enable_tempdb_in_ram=no) AC_MSG_CHECKING([whether to use an in-ram database for temporary tables]) case "$enable_tempdb_in_ram" in never ) TEMP_STORE=0 AC_MSG_RESULT([never]) ;; no ) INMEMORYDB=1 TEMP_STORE=1 AC_MSG_RESULT([no]) ;; always ) INMEMORYDB=1 TEMP_STORE=3 AC_MSG_RESULT([always]) ;; * ) INMEMORYDB=1 TEMP_STORE=2 AC_MSG_RESULT([yes]) ;; esac AC_SUBST(INMEMORYDB) AC_SUBST(TEMP_STORE) ########### # Lots of things are different if we are compiling for Windows using # the CYGWIN environment. So check for that special case and handle # things accordingly. # AC_MSG_CHECKING([if executables have the .exe suffix]) |
︙ | ︙ |