← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to pb2gentest.pl

  • Committer: John H. Embretsen
  • Date: 2010-02-24 15:53:20 UTC
  • mto: (0.101.19 lp-randgen-xml)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: john.embretsen@sun.com-20100224155320-vrxl8ondyuk5t5lp
Categorized configuration files by moving them into subdirectories with descriptive names.
THIS CHANGE MAY BREAK EXISTING USAGE PATTERNS!
Announced at https://lists.launchpad.net/randgen/msg00014.html.

==> usage of --grammar, --gendata and other options referring to files need to take this into account.

All files in conf/ have been moved into respective subdirectories, representing categories.
Sub-categories also exist, e.g. engines/innodb/ or optimizer/archive/.
Archive-subcategories are for older files that may still be useful but that have been superseeded by other files.
Updated other files referring to files in the conf/ directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pb2gentest.pl
319
319
#
320
320
if ($test =~ m{falcon_.*transactions}io ) {
321
321
        $command = '
322
 
                --grammar='.$conf.'/transactions.yy
323
 
                --gendata='.$conf.'/transactions.zz
 
322
                --grammar='.$conf.'/transactions/transactions.yy
 
323
                --gendata='.$conf.'/transactions/transactions.zz
324
324
                --mysqld=--falcon-consistent-read=1
325
325
                --mysqld=--transaction-isolation=REPEATABLE-READ
326
326
                --validator=DatabaseConsistency
328
328
        ';
329
329
} elsif ($test =~ m{falcon_.*durability}io ) {
330
330
        $command = '
331
 
                --grammar='.$conf.'/transaction_durability.yy
 
331
                --grammar='.$conf.'/transactions/transaction_durability.yy
332
332
                --vardir1='.$vardir.'/vardir-'.$engine.'
333
333
                --vardir2='.$vardir.'/vardir-innodb
334
334
                --mysqld=--default-storage-engine='.$engine.'
338
338
        ';
339
339
} elsif ($test =~ m{falcon_repeatable_read}io ) {
340
340
        $command = '
341
 
                --grammar='.$conf.'/repeatable_read.yy
342
 
                --gendata='.$conf.'/transactions.zz
 
341
                --grammar='.$conf.'/transactions/repeatable_read.yy
 
342
                --gendata='.$conf.'/transactions/transactions.zz
343
343
                --mysqld=--falcon-consistent-read=1
344
344
                --mysqld=--transaction-isolation=REPEATABLE-READ
345
345
                --validator=RepeatableRead
348
348
        ';
349
349
} elsif ($test =~ m{falcon_chill_thaw_compare}io) {
350
350
        $command = '
351
 
                --grammar='.$conf.'/falcon_chill_thaw.yy
352
 
                --gendata='.$conf.'/falcon_chill_thaw.zz
 
351
                --grammar='.$conf.'/engines/falcon/falcon_chill_thaw.yy
 
352
                --gendata='.$conf.'/engines/falcon/falcon_chill_thaw.zz
353
353
                --mysqld=--falcon-record-chill-threshold=1K
354
354
                --mysqld=--falcon-index-chill-threshold=1K 
355
355
                --threads=1
359
359
        ';
360
360
} elsif ($test =~ m{falcon_chill_thaw}io) {
361
361
        $command = '
362
 
                --grammar='.$conf.'/falcon_chill_thaw.yy
 
362
                --grammar='.$conf.'/engines/falcon/falcon_chill_thaw.yy
363
363
                --mysqld=--falcon-index-chill-threshold=4K 
364
364
                --mysqld=--falcon-record-chill-threshold=4K
365
365
        ';
366
366
} elsif ($test =~ m{falcon_online_alter}io) {
367
367
        $command = '
368
 
                --grammar='.$conf.'/falcon_online_alter.yy
 
368
                --grammar='.$conf.'/engines/falcon/falcon_online_alter.yy
369
369
        ';
370
370
} elsif ($test =~ m{falcon_ddl}io) {
371
371
        $command = '
372
 
                --grammar='.$conf.'/falcon_ddl.yy
 
372
                --grammar='.$conf.'/engines/falcon/falcon_ddl.yy
373
373
        ';
374
374
} elsif ($test =~ m{falcon_limit_compare_self}io ) {
375
375
        $command = '
376
 
                --grammar='.$conf.'/falcon_nolimit.yy
 
376
                --grammar='.$conf.'/engines/falcon/falcon_nolimit.yy
377
377
                --threads=1
378
378
                --validator=Limit
379
379
        ';
380
380
} elsif ($test =~ m{falcon_limit_compare_innodb}io ) {
381
381
        $command = '
382
 
                --grammar='.$conf.'/limit_compare.yy
 
382
                --grammar='.$conf.'/engines/falcon/limit_compare.yy
383
383
                --vardir1='.$vardir.'/vardir-falcon
384
384
                --vardir2='.$vardir.'/vardir-innodb
385
385
                --mysqld=--default-storage-engine=Falcon
389
389
        ';
390
390
} elsif ($test =~ m{falcon_limit}io ) {
391
391
        $command = '
392
 
                --grammar='.$conf.'/falcon_limit.yy
 
392
                --grammar='.$conf.'/engines/falcon/falcon_limit.yy
393
393
                --mysqld=--loose-maria-pagecache-buffer-size=64M
394
394
        ';
395
395
} elsif ($test =~ m{falcon_recovery}io ) {
396
396
        $command = '
397
 
                --grammar='.$conf.'/falcon_recovery.yy
398
 
                --gendata='.$conf.'/falcon_recovery.zz
 
397
                --grammar='.$conf.'/engines/falcon/falcon_recovery.yy
 
398
                --gendata='.$conf.'/engines/falcon/falcon_recovery.zz
399
399
                --mysqld=--falcon-checkpoint-schedule="1 1 1 1 1"
400
400
        ';
401
401
} elsif ($test =~ m{falcon_pagesize_32K}io ) {
402
402
        $command = '
403
 
                --grammar='.$conf.'/falcon_pagesize.yy
 
403
                --grammar='.$conf.'/engines/falcon/falcon_pagesize.yy
404
404
                --mysqld=--falcon-page-size=32K
405
 
                --gendata='.$conf.'/falcon_pagesize32K.zz
 
405
                --gendata='.$conf.'/engines/falcon/falcon_pagesize32K.zz
406
406
        ';
407
407
} elsif ($test =~ m{falcon_pagesize_2K}io) {
408
408
        $command = '
409
 
                --grammar='.$conf.'/falcon_pagesize.yy
 
409
                --grammar='.$conf.'/engines/falcon/falcon_pagesize.yy
410
410
                --mysqld=--falcon-page-size=2K
411
 
                --gendata='.$conf.'/falcon_pagesize2K.zz
 
411
                --gendata='.$conf.'/engines/falcon/falcon_pagesize2K.zz
412
412
        ';
413
413
} elsif ($test =~ m{falcon_select_autocommit}io) {
414
414
        $command = '
415
 
                --grammar='.$conf.'/falcon_select_autocommit.yy
 
415
                --grammar='.$conf.'/engines/falcon/falcon_select_autocommit.yy
416
416
                --queries=10000000
417
417
        ';
418
418
} elsif ($test =~ m{falcon_backlog}io ) {
419
419
        $command = '
420
 
                --grammar='.$conf.'/falcon_backlog.yy
421
 
                --gendata='.$conf.'/falcon_backlog.zz
 
420
                --grammar='.$conf.'/engines/falcon/falcon_backlog.yy
 
421
                --gendata='.$conf.'/engines/falcon/falcon_backlog.zz
422
422
                --mysqld=--transaction-isolation=REPEATABLE-READ
423
423
                --mysqld=--falcon-record-memory-max=10M
424
424
                --mysqld=--falcon-record-chill-threshold=1K
428
428
        # Datatypes YEAR and TIME disabled in grammars due to Bug#45499 (InnoDB). 
429
429
        # Revert to falcon_data_types.{yy|zz} when that bug is resolved in relevant branches.
430
430
        $command = '
431
 
                --grammar='.$conf.'/falcon_data_types_no_year_time.yy
432
 
                --gendata='.$conf.'/falcon_data_types_no_year_time.zz
 
431
                --grammar='.$conf.'/engines/falcon/falcon_data_types_no_year_time.yy
 
432
                --gendata='.$conf.'/engines/falcon/falcon_data_types_no_year_time.zz
433
433
                --vardir1='.$vardir.'/vardir-falcon
434
434
                --vardir2='.$vardir.'/vardir-innodb
435
435
                --mysqld=--default-storage-engine=Falcon
439
439
        ';
440
440
} elsif ($test =~ m{falcon_compare_self}io ) {
441
441
        $command = '
442
 
                --grammar='.$conf.'/falcon_data_types.yy
443
 
                --gendata='.$conf.'/falcon_data_types.zz
 
442
                --grammar='.$conf.'/engines/falcon/falcon_data_types.yy
 
443
                --gendata='.$conf.'/engines/falcon/falcon_data_types.zz
444
444
                --vardir1='.$vardir.'/'.$engine.'-vardir1
445
445
                --vardir2='.$vardir.'/'.$engine.'-vardir2
446
446
                --threads=1
452
452
} elsif ($test =~ m{innodb_repeatable_read}io ) {
453
453
        # Transactional test. See also falcon_repeatable_read.
454
454
        $command = '
455
 
                --grammar='.$conf.'/repeatable_read.yy
456
 
                --gendata='.$conf.'/transactions.zz
 
455
                --grammar='.$conf.'/transactions/repeatable_read.yy
 
456
                --gendata='.$conf.'/transactions/transactions.zz
457
457
                --mysqld=--transaction-isolation=REPEATABLE-READ
458
458
                --validator=RepeatableRead
459
459
        ';
460
460
} elsif ($test =~ m{(falcon|myisam)_blob_recovery}io ) {
461
461
        $command = '
462
 
                --grammar='.$conf.'/falcon_blobs.yy
463
 
                --gendata='.$conf.'/falcon_blobs.zz
 
462
                --grammar='.$conf.'/engines/falcon/falcon_blobs.yy
 
463
                --gendata='.$conf.'/engines/falcon/falcon_blobs.zz
464
464
                --duration=130
465
465
                --threads=1
466
466
                --reporters=Deadlock,ErrorLog,Backtrace,Recovery,Shutdown
473
473
        }
474
474
} elsif ($test =~ m{(falcon|innodb|myisam)_many_indexes}io ) {
475
475
        $command = '
476
 
                --grammar='.$conf.'/many_indexes.yy
477
 
                --gendata='.$conf.'/many_indexes.zz
 
476
                --grammar='.$conf.'/engines/many_indexes.yy
 
477
                --gendata='.$conf.'/engines/many_indexes.zz
478
478
        ';
479
479
} elsif ($test =~ m{(falcon|innodb|myisam)_tiny_inserts}io) {
480
480
        $command = '
481
 
                --gendata='.$conf.'/tiny_inserts.zz
482
 
                --grammar='.$conf.'/tiny_inserts.yy
 
481
                --gendata='.$conf.'/engines/tiny_inserts.zz
 
482
                --grammar='.$conf.'/engines/tiny_inserts.yy
483
483
                --queries=10000000
484
484
        ';
485
485
} elsif ($test =~ m{innodb_transactions}io) {
486
486
        $command = '
487
 
                --grammar='.$conf.'/transactions.yy
488
 
                --gendata='.$conf.'/transactions.zz
 
487
                --grammar='.$conf.'/transactions/transactions.yy
 
488
                --gendata='.$conf.'/transactions/transactions.zz
489
489
                --mysqld=--transaction-isolation=REPEATABLE-READ
490
490
                --validator=DatabaseConsistency
491
491
        ';
497
497
#
498
498
} elsif ($test =~ m{^backup_.*?_simple}io) {
499
499
        $command = '
500
 
                --grammar='.$conf.'/backup_simple.yy
 
500
                --grammar='.$conf.'/backup/backup_simple.yy
501
501
                --reporters=Deadlock,ErrorLog,Backtrace
502
502
                --mysqld=--mysql-backup
503
503
        ';
504
504
} elsif ($test =~ m{^backup_.*?_consistency}io) {
505
505
        $command = '
506
 
                --gendata='.$conf.'/invariant.zz
507
 
                --grammar='.$conf.'/invariant.yy
 
506
                --gendata='.$conf.'/backup/invariant.zz
 
507
                --grammar='.$conf.'/backup/invariant.yy
508
508
                --validator=Invariant
509
509
                --reporters=Deadlock,ErrorLog,Backtrace,BackupAndRestoreInvariant,Shutdown
510
510
                --mysqld=--mysql-backup
513
513
        ';
514
514
} elsif ($test =~ m{dml_alter}io ) {
515
515
        $command = '
516
 
                --gendata='.$conf.'/maria.zz
517
 
                --grammar='.$conf.'/maria_dml_alter.yy
 
516
                --gendata='.$conf.'/engines/maria/maria.zz
 
517
                --grammar='.$conf.'/engines/maria/maria_dml_alter.yy
518
518
        ';
519
519
} elsif ($test =~ m{^info_schema}io ) {
520
520
        $command = '
521
 
                --grammar='.$conf.'/information_schema.yy
 
521
                --grammar='.$conf.'/runtime/information_schema.yy
522
522
                --threads=10
523
523
                --duration=300
524
524
                --mysqld=--log-output=file
525
525
        ';
526
526
} elsif ($test =~ m{^mdl_stability}io ) {
527
527
        $command = '
528
 
                --grammar='.$conf.'/metadata_stability.yy
529
 
                --gendata='.$conf.'/metadata_stability.zz
 
528
                --grammar='.$conf.'/runtime/metadata_stability.yy
 
529
                --gendata='.$conf.'/runtime/metadata_stability.zz
530
530
                --validator=SelectStability,QueryProperties
531
531
                --engine=Innodb
532
532
                --mysqld=--innodb
546
546
        # InnoDB should be loaded but the test is not per se for InnoDB, hence
547
547
        # no "innodb" in test name.
548
548
        $command = '
549
 
                --grammar=conf/WL5004_sql.yy
 
549
                --grammar=conf/runtime/WL5004_sql.yy
550
550
                --threads=10
551
551
                --queries=1M
552
552
                --duration=1800
554
554
        ';
555
555
} elsif ($test =~ m{^partition_ddl}io ) {
556
556
        $command = '
557
 
                --grammar='.$conf.'/partitions-ddl.yy
 
557
                --grammar='.$conf.'/partitioning/partitions-ddl.yy
558
558
                --mysqld=--innodb
559
559
                --threads=1
560
560
                --queries=100K
562
562
} elsif ($test =~ m{partn_pruning(|.valgrind)$}io ) {
563
563
        # reduced duration to half since gendata phase takes longer in this case
564
564
        $command = '
565
 
                --gendata='.$conf.'/partition_pruning.zz
566
 
                --grammar='.$conf.'/partition_pruning.yy
 
565
                --gendata='.$conf.'/partitioning/partition_pruning.zz
 
566
                --grammar='.$conf.'/partitioning/partition_pruning.yy
567
567
                --mysqld=--innodb
568
568
                --threads=1
569
569
                --queries=100000
571
571
        ';
572
572
} elsif ($test =~ m{^partn_pruning_compare_50}io) {
573
573
        $command = '
574
 
        --gendata='.$conf.'/partition_pruning.zz
575
 
        --grammar='.$conf.'/partition_pruning.yy
 
574
        --gendata='.$conf.'/partitioning/partition_pruning.zz
 
575
        --grammar='.$conf.'/partitioning/partition_pruning.yy
576
576
        --basedir1='.$basedir.'
577
577
        --basedir2='.$basedirRelease50.'
578
578
        --vardir1='.$vardir.'/vardir-bzr
588
588
        # Not used; rpl testing needs adjustments (some of the failures this
589
589
        # produces are known replication issues documented in the manual).
590
590
        $command = '
591
 
                --gendata='.$conf.'/replication_single_engine.zz
592
 
                --grammar='.$conf.'/replication_simple.yy
 
591
                --gendata='.$conf.'/replication/replication_single_engine.zz
 
592
                --grammar='.$conf.'/replication/replication_simple.yy
593
593
                --mysqld=--log-output=table,file
594
594
        ';
595
595
} elsif ($test =~ m{^rpl_.*?_complex}io) {
596
596
        # Not used; rpl testing needs adjustments (some of the failures this
597
597
        # produces are known replication issues documented in the manual).
598
598
        $command = '
599
 
                --gendata='.$conf.'/replication_single_engine_pk.zz
600
 
                --grammar='.$conf.'/replication.yy
 
599
                --gendata='.$conf.'/replication/replication_single_engine_pk.zz
 
600
                --grammar='.$conf.'/replication/replication.yy
601
601
                --mysqld=--log-output=table,file
602
602
                --mysqld=--innodb
603
603
        ';
642
642
                $plugins = 'rpl_semi_sync_master='.$prefix.$master_plugin_name.':rpl_semi_sync_slave='.$prefix.'semisync_slave.so';
643
643
        }
644
644
        $command = '
645
 
                --gendata='.$conf.'/replication_single_engine.zz
 
645
                --gendata='.$conf.'/replication/replication_single_engine.zz
646
646
                --engine=InnoDB
647
 
                --grammar='.$conf.'/replication_simple.yy
 
647
                --grammar='.$conf.'/replication/replication_simple.yy
648
648
                --rpl_mode=default
649
649
                --mysqld=--plugin-dir='.$plugin_dir.'
650
650
                --mysqld=--plugin-load='.$plugins.'
662
662
                --threads=10
663
663
                --queries=1M
664
664
                --duration=300
665
 
                --grammar='.$conf.'/signal_resignal.yy
 
665
                --grammar='.$conf.'/runtime/signal_resignal.yy
666
666
                --mysqld=--max-sp-recursion-depth=10
667
667
        ';
668
668
} elsif ($test =~ m{(innodb|maria|myisam)_stress}io ) {
669
669
        $command = '
670
 
                --grammar='.$conf.'/maria_stress.yy
 
670
                --grammar='.$conf.'/engines/maria/maria_stress.yy
671
671
        ';
672
672
} else {
673
673
        print("[ERROR]: Test configuration for test name '$test' is not ".