Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Test suite infrastructure changes to produce cleaner output when globally testing connection flags. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
26ca8062a71e77950414c192da768447 |
| User & Date: | mistachkin 2014-01-04 01:23:30 |
Context
|
2014-01-04
| ||
| 01:36 | More work on connection flags handling in the test suite infrastructure. check-in: aef2b03cf4 user: mistachkin tags: trunk | |
| 01:23 | Test suite infrastructure changes to produce cleaner output when globally testing connection flags. check-in: 26ca8062a7 user: mistachkin tags: trunk | |
| 01:03 | Put new connection flags in logical order. Add several new composite connection flags. Update comments. check-in: 133692ee96 user: mistachkin tags: trunk | |
Changes
Changes to Tests/common.eagle.
1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 .... 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 .... 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 |
proc trimSql { sql } {
return [regsub -all -- {\s+} [string trim $sql] " "]
}
proc executeSql { sql {execute none} {format none} {fileName ""} } {
if {[string length $fileName] == 0} then {set fileName :memory:}
setupDb $fileName "" "" "" "" "" false false false false
try {
return [uplevel 1 [list \
sql execute -execute $execute -format $format $db $sql]]
} finally {
cleanupDb $fileName db false false false
}
}
proc setupDb {
fileName {mode ""} {dateTimeFormat ""} {dateTimeKind ""} {flags ""}
{extra ""} {qualify true} {delete true} {uri false}
{temporary true} {varName db} } {
#
# NOTE: First, see if our caller has requested an in-memory database.
#
set isMemory [isMemoryDb $fileName]
#
# NOTE: For now, all test databases used by the test suite are placed
................................................................................
# NOTE: Attempt to delete any pre-existing database with the same file
# name.
#
if {[catch {file delete $fileName} error]} then {
#
# NOTE: We somehow failed to delete the file, report why.
#
tputs $::test_channel [appendArgs \
"==== WARNING: failed to delete database file \"" $fileName \
"\" during setup, error: " \n\t $error \n]
}
}
#
# NOTE: Refer to the specified variable (e.g. "db") in the context of our
# caller. The handle to the opened database will be stored there.
#
................................................................................
# NOTE: If there are any global (per test run) connection flags currently
# set, use them now (i.e. by combining them with the ones for this
# connection).
#
if {[info exists ::connection_flags] && \
[string length $::connection_flags] > 0} then {
#
# NOTE: Show (and log) that we detected some global connection flags.
#
tputs $::test_channel [appendArgs \
"---- global connection flags detected: " $::connection_flags \n]
#
# NOTE: Combine and/or replace the connection flags and then show the
# new value.
#
set flags [combineFlags $flags $::connection_flags]
tputs $::test_channel [appendArgs \
"---- combined connection flags are: " $flags \n]
}
#
# NOTE: If our caller specified some SQLiteConnectionFlags, add the
# necessary portion of the connection string now.
#
if {[string length $flags] > 0} then {
|
| | > | | | > | > | > > > | > > > > > | | > |
1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 .... 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 .... 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 |
proc trimSql { sql } {
return [regsub -all -- {\s+} [string trim $sql] " "]
}
proc executeSql { sql {execute none} {format none} {fileName ""} } {
if {[string length $fileName] == 0} then {set fileName :memory:}
setupDb $fileName "" "" "" "" "" false false false false db true
try {
return [uplevel 1 [list \
sql execute -execute $execute -format $format $db $sql]]
} finally {
cleanupDb $fileName db false false false
}
}
proc setupDb {
fileName {mode ""} {dateTimeFormat ""} {dateTimeKind ""} {flags ""}
{extra ""} {qualify true} {delete true} {uri false}
{temporary true} {varName db} {quiet false} } {
#
# NOTE: First, see if our caller has requested an in-memory database.
#
set isMemory [isMemoryDb $fileName]
#
# NOTE: For now, all test databases used by the test suite are placed
................................................................................
# NOTE: Attempt to delete any pre-existing database with the same file
# name.
#
if {[catch {file delete $fileName} error]} then {
#
# NOTE: We somehow failed to delete the file, report why.
#
if {!$quiet} then {
tputs $::test_channel [appendArgs \
"==== WARNING: failed to delete database file \"" $fileName \
"\" during setup, error: " \n\t $error \n]
}
}
}
#
# NOTE: Refer to the specified variable (e.g. "db") in the context of our
# caller. The handle to the opened database will be stored there.
#
................................................................................
# NOTE: If there are any global (per test run) connection flags currently
# set, use them now (i.e. by combining them with the ones for this
# connection).
#
if {[info exists ::connection_flags] && \
[string length $::connection_flags] > 0} then {
#
# NOTE: Show (and log) that the local and global connection flags.
#
if {!$quiet} then {
tputs $::test_channel [appendArgs \
"---- local connection flags are: " $flags \n]
tputs $::test_channel [appendArgs \
"---- global connection flags detected: " $::connection_flags \n]
}
#
# NOTE: Combine and/or replace the connection flags and then show the
# new value.
#
set flags [combineFlags $flags $::connection_flags]
#
# NOTE: Show (and log) the new effective connection flags.
#
if {!$quiet} then {
tputs $::test_channel [appendArgs \
"---- combined connection flags are: " $flags \n]
}
}
#
# NOTE: If our caller specified some SQLiteConnectionFlags, add the
# necessary portion of the connection string now.
#
if {[string length $flags] > 0} then {
|
Changes to Tests/stress.eagle.
58 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 |
#
# NOTE: This should be an in-memory database; therefore, skip attempting
# to delete the underlying database file as that would not make any
# sense. Also, disable use of "PRAGMA temp_store_directory" when
# setting up the new connection because it is not thread-safe.
#
uplevel 1 [list setupDb $fileName "" "" "" "" "" false false true false \
$varName]
}
#############################################################################
proc setupWorkloadFileDb { fileName {varName db} } {
#
# NOTE: Skip attempting to delete the underlying database file. Also,
# disable use of "PRAGMA temp_store_directory" when setting up
# the new connection because it is not thread-safe.
#
uplevel 1 [list setupDb $fileName "" "" "" "" "" true false false false \
$varName]
}
#############################################################################
proc formatWorkloadResult { index } {
set result [appendArgs "---- iterations for workload (" $index "): "]
|
| | |
58 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 |
#
# NOTE: This should be an in-memory database; therefore, skip attempting
# to delete the underlying database file as that would not make any
# sense. Also, disable use of "PRAGMA temp_store_directory" when
# setting up the new connection because it is not thread-safe.
#
uplevel 1 [list setupDb $fileName "" "" "" "" "" false false true false \
$varName true]
}
#############################################################################
proc setupWorkloadFileDb { fileName {varName db} } {
#
# NOTE: Skip attempting to delete the underlying database file. Also,
# disable use of "PRAGMA temp_store_directory" when setting up
# the new connection because it is not thread-safe.
#
uplevel 1 [list setupDb $fileName "" "" "" "" "" true false false false \
$varName true]
}
#############################################################################
proc formatWorkloadResult { index } {
set result [appendArgs "---- iterations for workload (" $index "): "]
|