Changeset 4372 for trunk/psLib/test/dataIO/tst_psDB.c
- Timestamp:
- Jun 23, 2005, 3:49:25 PM (21 years ago)
- File:
-
- 1 edited
-
trunk/psLib/test/dataIO/tst_psDB.c (modified) (39 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/test/dataIO/tst_psDB.c
r4318 r4372 9 9 * @author Aaron Culliney, MHPCC 10 10 * 11 * @version $Revision: 1.2 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-06-2 0 19:04:56$11 * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-24 01:49:25 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 51 51 #define CONST_ROW_2_F64 56.75 52 52 #define CONST_ROW_2_BOOL FALSE 53 54 #define TAB_COL_0_NAME "key_string" 55 #define TAB_COL_1_NAME "key_s32" 56 #define TAB_COL_2_NAME "key_f32" 57 #define TAB_COL_3_NAME "key_f64" 58 #define TAB_COL_4_NAME "key_bool" 59 #define TAB_COL_5_NAME "key_s32_0" 53 60 54 61 static psDB *_init_psDB( void ); … … 98 105 {TPDBInsertRows, 849, "dbInsertRows", 0, false}, 99 106 {TPDBDumpRows, 850, "dbDumpRows", 0, false}, 100 {TPDBDumpCols, -11,"dbDumpCols", 0, false},107 {TPDBDumpCols, 851, "dbDumpCols", 0, false}, 101 108 {TPDBUpdateRows, -12, "dbUpdateRows", 0, false}, 102 109 {TPDBDeleteRows, -13, "dbDeleteRows", 0, false}, … … 128 135 { 129 136 return _get_RowMetadata( 130 "key_string", "comment-string", "90000", // value used to determine size of field131 "key_s32", "Primary Key", 0, // values unused here ...132 "key_f32", "Key", 0.0,133 "key_f64", "", 0.0,134 "key_bool", "", FALSE,135 "key_s32_0", "Key,AUTO_INCREMENT", 0);137 TAB_COL_0_NAME, "comment-string", "90000", // value used to determine size of field 138 TAB_COL_1_NAME, "Primary Key", 0, // values unused here ... 139 TAB_COL_2_NAME, "Key", 0.0, 140 TAB_COL_3_NAME, "", 0.0, 141 TAB_COL_4_NAME, "", FALSE, 142 TAB_COL_5_NAME, "Key,AUTO_INCREMENT", 0); 136 143 } 137 144 … … 139 146 { 140 147 return _get_RowMetadata( 141 "key_string", "comment-string", val0,142 "key_s32", "comment-s32", val1,143 "key_f32", "comment-f32", val2,144 "key_f64", "comment-f64", val3,145 "key_bool", "comment-bool", val4,148 TAB_COL_0_NAME, "comment-string", val0, 149 TAB_COL_1_NAME, "comment-s32", val1, 150 TAB_COL_2_NAME, "comment-f32", val2, 151 TAB_COL_3_NAME, "comment-f64", val3, 152 TAB_COL_4_NAME, "comment-bool", val4, 146 153 NULL, NULL, 0.0); 147 154 } … … 206 213 snprintf(buf, 32, "%s", CONST_ROW_1_STR ); 207 214 return _get_RowMetadata( 208 "key_string", "comment-string", buf,209 "key_s32", "comment-s32", CONST_ROW_1_S32,210 "key_f32", "comment-f32", CONST_ROW_1_F32,211 "key_f64", "comment-f64", CONST_ROW_1_F64,212 "key_bool", "comment-bool", CONST_ROW_1_BOOL,215 TAB_COL_0_NAME, "comment-string", buf, 216 TAB_COL_1_NAME, "comment-s32", CONST_ROW_1_S32, 217 TAB_COL_2_NAME, "comment-f32", CONST_ROW_1_F32, 218 TAB_COL_3_NAME, "comment-f64", CONST_ROW_1_F64, 219 TAB_COL_4_NAME, "comment-bool", CONST_ROW_1_BOOL, 213 220 NULL, NULL, 0.0); 214 221 } … … 219 226 snprintf(buf, 32, "%s",CONST_ROW_2_STR); 220 227 return _get_RowMetadata( 221 "key_string", "comment-string", buf,222 "key_s32", "comment-s32", CONST_ROW_2_S32,223 "key_f32", "comment-f32", CONST_ROW_2_F32,224 "key_f64", "comment-f64", CONST_ROW_2_F64,225 "key_bool", "comment-bool", CONST_ROW_2_BOOL,228 TAB_COL_0_NAME, "comment-string", buf, 229 TAB_COL_1_NAME, "comment-s32", CONST_ROW_2_S32, 230 TAB_COL_2_NAME, "comment-f32", CONST_ROW_2_F32, 231 TAB_COL_3_NAME, "comment-f64", CONST_ROW_2_F64, 232 TAB_COL_4_NAME, "comment-bool", CONST_ROW_2_BOOL, 226 233 NULL, NULL, 0.0); 227 234 } … … 230 237 { 231 238 return _get_RowMetadata( 232 "key_string", "comment-string", STR_1,233 "key_s32", "comment-s32", S32_1,234 "key_f32", "comment-f32", F32_1,235 "key_f64", "comment-f64", F64_1,236 "key_bool", "comment-bool", B_1,239 TAB_COL_0_NAME, "comment-string", STR_1, 240 TAB_COL_1_NAME, "comment-s32", S32_1, 241 TAB_COL_2_NAME, "comment-f32", F32_1, 242 TAB_COL_3_NAME, "comment-f64", F64_1, 243 TAB_COL_4_NAME, "comment-bool", B_1, 237 244 NULL, NULL, 0.0); 238 245 } … … 241 248 { 242 249 return _get_RowMetadata( 243 "key_string", "comment-string", STR_1,244 "key_s32", "comment-s32", S32_1,250 TAB_COL_0_NAME, "comment-string", STR_1, 251 TAB_COL_1_NAME, "comment-s32", S32_1, 245 252 "key_999", "comment-f32", F32_1, 246 "key_f64", "comment-f64", F64_1,247 "key_bool", "comment-bool", B_1,253 TAB_COL_3_NAME, "comment-f64", F64_1, 254 TAB_COL_4_NAME, "comment-bool", B_1, 248 255 NULL, NULL, 0.0); 249 256 } … … 259 266 return NULL; 260 267 } 261 s32 = psMetadataItemAllocS32( "key_s32", "", S32_1);268 s32 = psMetadataItemAllocS32(TAB_COL_1_NAME, "", S32_1); 262 269 if (s32 == NULL) { 263 270 psError(PS_ERR_UNKNOWN, true, "could not create psMetadataItem in %s!", __func__ ); … … 283 290 psMetadataItem* item = NULL; 284 291 285 item = psMetadataLookup(row, "key_string");292 item = psMetadataLookup(row,TAB_COL_0_NAME); 286 293 if((item==NULL) || (strcmp(item->data.V,STR_1)!=0)) { 287 294 psError(PS_ERR_UNKNOWN,true,"Column key_string item %s not as expected %s", … … 290 297 } 291 298 292 item = psMetadataLookup(row, "key_s32");299 item = psMetadataLookup(row,TAB_COL_1_NAME); 293 300 if((item==NULL) || (item->data.S32 != S32_1)) { 294 301 psError(PS_ERR_UNKNOWN,true,"Column key_s32 item %d not as expected %d", … … 297 304 } 298 305 299 item = psMetadataLookup(row, "key_f32");306 item = psMetadataLookup(row,TAB_COL_2_NAME); 300 307 if((item==NULL) || (fabs(item->data.F32-F32_1)>ERROR_TOL)) { 301 308 psError(PS_ERR_UNKNOWN,true,"Column key_f32 item %f not as expected %f", … … 304 311 } 305 312 306 item = psMetadataLookup(row, "key_f64");313 item = psMetadataLookup(row,TAB_COL_3_NAME); 307 314 if((item==NULL) || (fabs(item->data.F64-F64_1)>ERROR_TOL)) { 308 315 psError(PS_ERR_UNKNOWN,true,"Column key_f64 item %lf not as expected %lf", … … 311 318 } 312 319 313 item = psMetadataLookup(row, "key_bool");320 item = psMetadataLookup(row,TAB_COL_4_NAME); 314 321 if((item==NULL) || (item->data.B != B_1)) { 315 322 psError(PS_ERR_UNKNOWN,true,"Column key_bool item %d not as expected %d", … … 326 333 psMetadataItem* item = NULL; 327 334 328 item = psMetadataLookup(row, "key_string");335 item = psMetadataLookup(row,TAB_COL_0_NAME); 329 336 if((item==NULL) || (strcmp(item->data.V,CONST_ROW_1_STR)!=0)) { 330 337 psError(PS_ERR_UNKNOWN,true,"Column key_string item %s not as expected %s", … … 333 340 } 334 341 335 item = psMetadataLookup(row, "key_s32");342 item = psMetadataLookup(row,TAB_COL_1_NAME); 336 343 if((item==NULL) || (item->data.S32 != CONST_ROW_1_S32)) { 337 344 psError(PS_ERR_UNKNOWN,true,"Column key_s32 item %d not as expected %d", … … 340 347 } 341 348 342 item = psMetadataLookup(row, "key_f32");349 item = psMetadataLookup(row,TAB_COL_2_NAME); 343 350 if((item==NULL) || (fabs(item->data.F32-CONST_ROW_1_F32)>ERROR_TOL)) { 344 351 psError(PS_ERR_UNKNOWN,true,"Column key_f32 item %f not as expected %f", … … 347 354 } 348 355 349 item = psMetadataLookup(row, "key_f64");356 item = psMetadataLookup(row,TAB_COL_3_NAME); 350 357 if((item==NULL) || (fabs(item->data.F64-CONST_ROW_1_F64)>ERROR_TOL)) { 351 358 psError(PS_ERR_UNKNOWN,true,"Column key_f64 item %lf not as expected %lf", … … 354 361 } 355 362 356 item = psMetadataLookup(row, "key_bool");363 item = psMetadataLookup(row,TAB_COL_4_NAME); 357 364 if((item==NULL) || (item->data.B != CONST_ROW_1_BOOL)) { 358 365 psError(PS_ERR_UNKNOWN,true,"Column key_bool item %d not as expected %d", … … 369 376 psMetadataItem* item = NULL; 370 377 371 item = psMetadataLookup(row, "key_string");378 item = psMetadataLookup(row,TAB_COL_0_NAME); 372 379 if((item==NULL) || (strcmp(item->data.V,CONST_ROW_2_STR)!=0)) { 373 380 psError(PS_ERR_UNKNOWN,true,"Column key_string item %s not as expected %s", … … 376 383 } 377 384 378 item = psMetadataLookup(row, "key_s32");385 item = psMetadataLookup(row,TAB_COL_1_NAME); 379 386 if((item==NULL) || (item->data.S32 != CONST_ROW_2_S32)) { 380 387 psError(PS_ERR_UNKNOWN,true,"Column key_s32 item %d not as expected %d", … … 383 390 } 384 391 385 item = psMetadataLookup(row, "key_f32");392 item = psMetadataLookup(row,TAB_COL_2_NAME); 386 393 if((item==NULL) || (fabs(item->data.F32-CONST_ROW_2_F32)>ERROR_TOL)) { 387 394 psError(PS_ERR_UNKNOWN,true,"Column key_f32 item %f not as expected %f", … … 390 397 } 391 398 392 item = psMetadataLookup(row, "key_f64");399 item = psMetadataLookup(row,TAB_COL_3_NAME); 393 400 if((item==NULL) || (fabs(item->data.F64-CONST_ROW_2_F64)>ERROR_TOL)) { 394 401 psError(PS_ERR_UNKNOWN,true,"Column key_f64 item %lf not as expected %lf", … … 397 404 } 398 405 399 item = psMetadataLookup(row, "key_bool");406 item = psMetadataLookup(row,TAB_COL_4_NAME); 400 407 if((item==NULL) || (item->data.B != CONST_ROW_2_BOOL)) { 401 408 psError(PS_ERR_UNKNOWN,true,"Column key_bool item %d not as expected %d", … … 676 683 677 684 // Select all items in column key_string with valid arguments 678 ary = psDBSelectColumn(dbh, table, "key_string", 0);685 ary = psDBSelectColumn(dbh, table, TAB_COL_0_NAME, 0); 679 686 if (ary == NULL) { 680 687 psError(PS_ERR_UNKNOWN,true,"Did not expect return value of NULL"); … … 719 726 720 727 // Select items in column key_bool with limit 10 and valid arguments 721 ary = psDBSelectColumn(dbh, table, "key_bool", 10);728 ary = psDBSelectColumn(dbh, table, TAB_COL_4_NAME, 10); 722 729 if (ary == NULL) { 723 730 psError(PS_ERR_UNKNOWN,true,"Did not expect return value of NULL"); … … 842 849 843 850 // Use valid arguments to select column with numeric values to return vector 844 vec = psDBSelectColumnNum(dbh, table, "key_s32", PS_TYPE_S32, 0);851 vec = psDBSelectColumnNum(dbh, table, TAB_COL_1_NAME, PS_TYPE_S32, 0); 845 852 846 853 // Verify vector returned … … 888 895 889 896 // Use valid arguments to select column with numeric values to return vector 890 vec = psDBSelectColumnNum(dbh, table, "key_bool", PS_TYPE_BOOL, 0);897 vec = psDBSelectColumnNum(dbh, table, TAB_COL_4_NAME, PS_TYPE_BOOL, 0); 891 898 892 899 // Verify vector returned … … 935 942 // Attempt to select columns from NULL database 936 943 psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error for NULL database object"); 937 if(psDBSelectColumnNum(NULL,table, "key_bool",PS_TYPE_BOOL,10) != NULL) {944 if(psDBSelectColumnNum(NULL,table,TAB_COL_4_NAME,PS_TYPE_BOOL,10) != NULL) { 938 945 psError(PS_ERR_UNKNOWN,true,"Did not expect non-NULL return with NULL database object"); 939 946 psDBDropTable(dbh,table); … … 944 951 // Attempt to select columns from NULL table 945 952 psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error for NULL table"); 946 if(psDBSelectColumnNum(dbh,NULL, "key_bool",PS_TYPE_BOOL,10) != NULL) {953 if(psDBSelectColumnNum(dbh,NULL,TAB_COL_4_NAME,PS_TYPE_BOOL,10) != NULL) { 947 954 psError(PS_ERR_UNKNOWN,true,"Did not expect non-NULL return with NULL table"); 948 955 psDBDropTable(dbh,table); … … 962 969 // Attempt to select columns from invalid column 963 970 psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error for invalid type"); 964 if(psDBSelectColumnNum(dbh,table, "key_string",0,10) != NULL) {971 if(psDBSelectColumnNum(dbh,table,TAB_COL_0_NAME,0,10) != NULL) { 965 972 psError(PS_ERR_UNKNOWN,true,"Did not expect non-NULL return with invalid type"); 966 973 psDBDropTable(dbh,table); … … 1050 1057 1051 1058 // Get key_s32 item from metadata 1052 item = psMetadataLookup(row, "key_s32");1059 item = psMetadataLookup(row, TAB_COL_1_NAME); 1053 1060 if (item == NULL) { 1054 1061 psError(PS_ERR_UNKNOWN,true,"Could not find key_s32 item in row metadata"); … … 1066 1073 1067 1074 // Get key_bool item from metadata 1068 item = psMetadataLookup(row, "key_bool");1075 item = psMetadataLookup(row, TAB_COL_4_NAME); 1069 1076 if (item == NULL) { 1070 1077 psError(PS_ERR_UNKNOWN,true,"Could not find key_bool item in row metadata"); … … 1291 1298 row = (psMetadata*)psArrayGet(dumpRowSet, 0); 1292 1299 // Verify contents for column key_s32 1293 item = psMetadataLookup(row, "key_s32");1300 item = psMetadataLookup(row, TAB_COL_1_NAME); 1294 1301 if ((item == NULL) || (item->data.S32 != S32_1)) { 1295 1302 psError(PS_ERR_UNKNOWN,true,"Column value %d not as expected %d", … … 1300 1307 } 1301 1308 // Verify contents for column key_bool 1302 item = psMetadataLookup(row, "key_bool");1309 item = psMetadataLookup(row, TAB_COL_4_NAME); 1303 1310 if ((item == NULL) || (item->data.B != B_1)) { 1304 1311 psError(PS_ERR_UNKNOWN,true,"Column value %d not as expected %d", … … 1470 1477 } 1471 1478 1472 // Testpoint # XXX, TPDBDumpCols shall dump all cols from a test table ...1479 // Testpoint #851, TPDBDumpCols shall dump all cols from a test table ... 1473 1480 psS32 TPDBDumpCols( void ) 1474 1481 { 1475 psS32 failed = 0; 1476 psDB *dbh = NULL; 1477 const char* table = "table9"; 1478 psMetadata *row=NULL, *meta=NULL, *md = _get_CreateTableMetadata(); 1479 1482 psDB* dbh = NULL; 1483 const char* table = "table9"; 1484 psMetadata* row = NULL; 1485 psMetadata* meta = NULL; 1486 psMetadata* md = NULL; 1487 psMetadataIterator* mdIter = NULL; 1488 psMetadataItem* mdItem = NULL; 1489 int itemNum = 0; 1490 1491 // Create database table definition 1492 md = _get_CreateTableMetadata(); 1493 1494 // Initialize database connection 1480 1495 dbh = _init_psDB(); 1481 1496 if (dbh == NULL) { 1497 psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return to initialize database"); 1482 1498 return 1; 1483 1499 } 1484 1500 1485 psLogMsg( __func__, PS_LOG_INFO, "psDBDumpCols shall dump all cols from a test table.\n" ); 1486 1487 failed = ! psDBCreateTable(dbh, table, md); 1488 if (!failed) { 1489 1490 row = _get_const_row1(); 1491 psDBInsertOneRow(dbh, table, row); 1492 psFree(row); 1493 1494 row = _get_const_row2(); 1495 psDBInsertOneRow(dbh, table, row); 1496 psFree(row); 1497 1498 row = _get_row(); 1499 failed = ! psDBInsertOneRow(dbh, table, row); 1500 psFree(row); 1501 1502 meta = psDBDumpCols(dbh, table); 1503 if (meta == NULL) { 1504 failed = 1; 1505 } else { 1506 _print_row(meta); 1507 psFree(meta); 1501 // Create database table for testing 1502 if(!psDBCreateTable(dbh, table, md)) { 1503 psError(PS_ERR_UNKNOWN,true,"Did not expect return of false to create test table"); 1504 psDBCleanup(dbh); 1505 return 2; 1506 } 1507 1508 // Add row with known data values 1509 row = _get_const_row1(); 1510 psDBInsertOneRow(dbh, table, row); 1511 psFree(row); 1512 1513 row = _get_const_row2(); 1514 psDBInsertOneRow(dbh, table, row); 1515 psFree(row); 1516 1517 row = _get_row(); 1518 psDBInsertOneRow(dbh, table, row); 1519 psFree(row); 1520 1521 // Dump columns with valid arguments 1522 meta = psDBDumpCols(dbh, table); 1523 mdIter = psMetadataIteratorAlloc(meta,PS_LIST_HEAD,NULL); 1524 1525 // Verify contents of metadata returned 1526 if (meta == NULL) { 1527 psError(PS_ERR_UNKNOWN,true,"Did not expect return value NULL for dumpCols with valid args"); 1528 psDBDropTable(dbh,table); 1529 psDBCleanup(dbh); 1530 return 3; 1531 } 1532 if(meta->list->size != 6) { 1533 psError(PS_ERR_UNKNOWN,true,"Number of cols = %d not as expected %d", 1534 meta->list->size,6); 1535 psDBDropTable(dbh,table); 1536 psDBCleanup(dbh); 1537 return 4; 1538 } 1539 // Verify the metadata items 1540 itemNum = 0; 1541 while ((mdItem = psMetadataGetAndIncrement(mdIter)) != NULL) { 1542 switch(itemNum) { 1543 case 0: 1544 if(mdItem->type != PS_META_ARRAY) { 1545 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", 1546 itemNum,mdItem->type,PS_META_ARRAY); 1547 psDBDropTable(dbh,table); 1548 psDBCleanup(dbh); 1549 return 5*(itemNum+1); 1550 } 1551 // if(((psArray*)mdItem->data[0])->type.type != PS_TYPE_S32) { 1552 // psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d", 1553 // itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_S32); 1554 // psDBDropTable(dbh,table); 1555 // psDBCleanup(dbh); 1556 // return 6*(itemNum+1); 1557 // } 1558 if(((psArray*)mdItem->data.V)->n != 3) { 1559 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d", 1560 itemNum,((psArray*)mdItem->data.V)->n,3); 1561 psDBDropTable(dbh,table); 1562 psDBCleanup(dbh); 1563 return 7*(itemNum+1); 1564 } 1565 if(strcmp(mdItem->name,TAB_COL_0_NAME) != 0) { 1566 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s", 1567 itemNum,mdItem->name,TAB_COL_0_NAME); 1568 psDBDropTable(dbh,table); 1569 psDBCleanup(dbh); 1570 return 8*(itemNum+1); 1571 } 1572 break; 1573 case 1: 1574 if(mdItem->type != PS_META_VEC) { 1575 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", 1576 itemNum,mdItem->type,PS_META_VEC); 1577 psDBDropTable(dbh,table); 1578 psDBCleanup(dbh); 1579 return 5*(itemNum+1); 1580 } 1581 if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_S32) { 1582 psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d", 1583 itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_S32); 1584 psDBDropTable(dbh,table); 1585 psDBCleanup(dbh); 1586 return 6*(itemNum+1); 1587 } 1588 if(((psVector*)mdItem->data.V)->n != 3) { 1589 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d", 1590 itemNum,((psVector*)mdItem->data.V)->n,3); 1591 psDBDropTable(dbh,table); 1592 psDBCleanup(dbh); 1593 return 7*(itemNum+1); 1594 } 1595 if(strcmp(mdItem->name,TAB_COL_1_NAME) != 0) { 1596 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s", 1597 itemNum,mdItem->name,TAB_COL_1_NAME); 1598 psDBDropTable(dbh,table); 1599 psDBCleanup(dbh); 1600 return 8*(itemNum+1); 1601 } 1602 break; 1603 case 2: 1604 if(mdItem->type != PS_META_VEC) { 1605 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", 1606 itemNum,mdItem->type,PS_META_VEC); 1607 psDBDropTable(dbh,table); 1608 psDBCleanup(dbh); 1609 return 5*(itemNum+1); 1610 } 1611 if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_F32) { 1612 psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d", 1613 itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_F32); 1614 psDBDropTable(dbh,table); 1615 psDBCleanup(dbh); 1616 return 6*(itemNum+1); 1617 } 1618 if(((psVector*)mdItem->data.V)->n != 3) { 1619 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d", 1620 itemNum,((psVector*)mdItem->data.V)->n,3); 1621 psDBDropTable(dbh,table); 1622 psDBCleanup(dbh); 1623 return 7*(itemNum+1); 1624 } 1625 if(strcmp(mdItem->name,TAB_COL_2_NAME) != 0) { 1626 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s", 1627 itemNum,mdItem->name,TAB_COL_2_NAME); 1628 psDBDropTable(dbh,table); 1629 psDBCleanup(dbh); 1630 return 8*(itemNum+1); 1631 } 1632 break; 1633 case 3: 1634 if(mdItem->type != PS_META_VEC) { 1635 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", 1636 itemNum,mdItem->type,PS_META_VEC); 1637 psDBDropTable(dbh,table); 1638 psDBCleanup(dbh); 1639 return 5*(itemNum+1); 1640 } 1641 if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_F64) { 1642 psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d", 1643 itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_F64); 1644 psDBDropTable(dbh,table); 1645 psDBCleanup(dbh); 1646 return 6*(itemNum+1); 1647 } 1648 if(((psVector*)mdItem->data.V)->n != 3) { 1649 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d", 1650 itemNum,((psVector*)mdItem->data.V)->n,3); 1651 psDBDropTable(dbh,table); 1652 psDBCleanup(dbh); 1653 return 7*(itemNum+1); 1654 } 1655 if(strcmp(mdItem->name,TAB_COL_3_NAME) != 0) { 1656 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s", 1657 itemNum,mdItem->name,TAB_COL_3_NAME); 1658 psDBDropTable(dbh,table); 1659 psDBCleanup(dbh); 1660 return 8*(itemNum+1); 1661 } 1662 break; 1663 case 4: 1664 if(mdItem->type != PS_META_VEC) { 1665 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", 1666 itemNum,mdItem->type,PS_META_VEC); 1667 psDBDropTable(dbh,table); 1668 psDBCleanup(dbh); 1669 return 5*(itemNum+1); 1670 } 1671 if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_BOOL) { 1672 psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d", 1673 itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_BOOL); 1674 psDBDropTable(dbh,table); 1675 psDBCleanup(dbh); 1676 return 6*(itemNum+1); 1677 } 1678 if(((psVector*)mdItem->data.V)->n != 3) { 1679 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d", 1680 itemNum,((psVector*)mdItem->data.V)->n,3); 1681 psDBDropTable(dbh,table); 1682 psDBCleanup(dbh); 1683 return 7*(itemNum+1); 1684 } 1685 if(strcmp(mdItem->name,TAB_COL_4_NAME) != 0) { 1686 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s", 1687 itemNum,mdItem->name,TAB_COL_4_NAME); 1688 psDBDropTable(dbh,table); 1689 psDBCleanup(dbh); 1690 return 8*(itemNum+1); 1691 } 1692 break; 1693 case 5: 1694 if(mdItem->type != PS_META_VEC) { 1695 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", 1696 itemNum,mdItem->type,PS_META_VEC); 1697 psDBDropTable(dbh,table); 1698 psDBCleanup(dbh); 1699 return 5*(itemNum+1); 1700 } 1701 if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_S32) { 1702 psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d", 1703 itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_S32); 1704 psDBDropTable(dbh,table); 1705 psDBCleanup(dbh); 1706 return 6*(itemNum+1); 1707 } 1708 if(((psVector*)mdItem->data.V)->n != 3) { 1709 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d", 1710 itemNum,((psVector*)mdItem->data.V)->n,3); 1711 psDBDropTable(dbh,table); 1712 psDBCleanup(dbh); 1713 return 7*(itemNum+1); 1714 } 1715 if(strcmp(mdItem->name,TAB_COL_5_NAME) != 0) { 1716 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s", 1717 itemNum,mdItem->name,TAB_COL_5_NAME); 1718 psDBDropTable(dbh,table); 1719 psDBCleanup(dbh); 1720 return 8*(itemNum+1); 1721 } 1722 break; 1723 break; 1724 1725 default: 1726 break; 1508 1727 } 1509 psDBDropTable(dbh, table); 1510 } 1728 itemNum++; 1729 } 1730 psFree(mdIter); 1731 psFree(meta); 1732 1733 psDBDropTable(dbh, table); 1511 1734 1512 1735 psFree(md); 1736 1513 1737 psDBCleanup(dbh); 1514 1738 1515 return failed;1739 return 0; 1516 1740 } 1517 1741 … … 1564 1788 _print_row(row); 1565 1789 1566 item = psMetadataLookup(row, "key_s32");1790 item = psMetadataLookup(row, TAB_COL_1_NAME); 1567 1791 if ((item == NULL) || (item->data.S32 != S32_2)) { 1568 1792 psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected output!\n" ); … … 1572 1796 } 1573 1797 1574 item = psMetadataLookup(row, "key_bool");1798 item = psMetadataLookup(row, TAB_COL_4_NAME); 1575 1799 if ((item == NULL) || (item->data.B != B_2)) { 1576 1800 psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected output!\n" );
Note:
See TracChangeset
for help on using the changeset viewer.
