/ Check-in [63ebcb52]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix so that the TCL test harness works even if SQLITE_ENABLE_FTS is omitted.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | broken-build
Files: files | file ages | folders
SHA1: 63ebcb52a1909aca80f2fef3e982f8fb5929b73b
User & Date: drh 2011-06-15 13:02:21
Context
2011-06-15
13:11
Merge the improved incremental doclist loading test from the broken-build branch (which is now fixed) into trunk. check-in: f9750870 user: drh tags: trunk
13:02
Fix so that the TCL test harness works even if SQLITE_ENABLE_FTS is omitted. Closed-Leaf check-in: 63ebcb52 user: drh tags: broken-build
12:43
Fix a couple of compiler warnings. check-in: 3899f3b9 user: drh tags: broken-build
Changes
Hide Diffs Unified Diffs Show Whitespace Changes Patch

Changes to ext/fts3/fts3_test.c.

269
270
271
272
273
274
275

276
277
278
279
280
281
282
...
302
303
304
305
306
307
308

309
310
311
312
313
314
315
316
317
318
319
*/
static int fts3_configure_incr_load_cmd(
  ClientData clientData,
  Tcl_Interp *interp,
  int objc,
  Tcl_Obj *CONST objv[]
){

  extern int test_fts3_node_chunksize;
  extern int test_fts3_node_chunk_threshold;
  int iArg1;
  int iArg2;
  Tcl_Obj *pRet;

  if( objc!=1 && objc!=3 ){
................................................................................
    }
    test_fts3_node_chunksize = iArg1;
    test_fts3_node_chunk_threshold = iArg2;
  }

  Tcl_SetObjResult(interp, pRet);
  Tcl_DecrRefCount(pRet);

  return TCL_OK;
}

int Sqlitetestfts3_Init(Tcl_Interp *interp){
  Tcl_CreateObjCommand(interp, "fts3_near_match", fts3_near_match_cmd, 0, 0);
  Tcl_CreateObjCommand(interp, 
      "fts3_configure_incr_load", fts3_configure_incr_load_cmd, 0, 0
  );
  return TCL_OK;
}








>







 







>










<
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
...
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320

*/
static int fts3_configure_incr_load_cmd(
  ClientData clientData,
  Tcl_Interp *interp,
  int objc,
  Tcl_Obj *CONST objv[]
){
#ifdef SQLITE_ENABLE_FTS3
  extern int test_fts3_node_chunksize;
  extern int test_fts3_node_chunk_threshold;
  int iArg1;
  int iArg2;
  Tcl_Obj *pRet;

  if( objc!=1 && objc!=3 ){
................................................................................
    }
    test_fts3_node_chunksize = iArg1;
    test_fts3_node_chunk_threshold = iArg2;
  }

  Tcl_SetObjResult(interp, pRet);
  Tcl_DecrRefCount(pRet);
#endif
  return TCL_OK;
}

int Sqlitetestfts3_Init(Tcl_Interp *interp){
  Tcl_CreateObjCommand(interp, "fts3_near_match", fts3_near_match_cmd, 0, 0);
  Tcl_CreateObjCommand(interp, 
      "fts3_configure_incr_load", fts3_configure_incr_load_cmd, 0, 0
  );
  return TCL_OK;
}