summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2002-08-03 10:33:27 +0000
committerfukachan <fukachan>2002-08-03 10:33:27 +0000
commit41179da7ee58a30d5165142c66cd27291de5f90d (patch)
tree3ec44d91da9ddf46b59159e7f958d585e6f5ebac
parente0ecacab03a53e001d665f285d37d8e1c890574d (diff)
downloadfml8-41179da7ee58a30d5165142c66cd27291de5f90d.tar.gz
fml8-41179da7ee58a30d5165142c66cd27291de5f90d.tar.bz2
fml8-41179da7ee58a30d5165142c66cd27291de5f90d.zip
more checks on keys() et.al.
-rwxr-xr-xregress/base/journaleddir.pl125
-rwxr-xr-xregress/base/journaledfile.pl25
2 files changed, 143 insertions, 7 deletions
diff --git a/regress/base/journaleddir.pl b/regress/base/journaleddir.pl
index 39d27820..496e9a20 100755
--- a/regress/base/journaleddir.pl
+++ b/regress/base/journaleddir.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
#
-# $FML: journaleddir.pl,v 1.5 2002/04/18 14:18:07 fukachan Exp $
+# $FML: journaleddir.pl,v 1.6 2002/05/11 08:34:52 fukachan Exp $
#
BEGIN {
@@ -17,8 +17,6 @@ my $key = shift || 'uja';
my $unit = shift || 2;
my $dir = "/tmp/fml5/jd";
-print "Tie::JournaledDir ";
-
my $debug = defined $ENV{'debug'} ? 1 : 0;
if (-d $dir) {
@@ -46,9 +44,26 @@ for my $k (keys %$testpat) {
$testpat->{ $k.$newkey } = $buf;
}
+# 1.1 write/read
+print "Tie::JournaledDir write ... ";
&_write($testpat);
&_read($testpat);
+# 1.2 write/read
+print "Tie::JournaledDir write 2 ... ";
+&_write2($testpat);
+&_write($testpat);
+&_write2($testpat);
+&_read($testpat);
+
+# 2. keys
+print "Tie::JournaledDir keys ... ";
+&_keys($testpat);
+
+# 3. get_all_values()
+print "Tie::JournaledDir get_all_values ... ";
+&_get_all_values($testpat);
+
exit 0;
@@ -83,7 +98,7 @@ sub _read
}
}
- for (%found) {
+ for (keys %found) {
$error++;
print "$_ is not found in journaled dir/ ?\n";
}
@@ -106,7 +121,7 @@ sub _read
sub _write
{
- my ($pat) = @_;
+ my ($pat, $mode) = @_;
print "write journaleddir " if $debug;
for my $key (keys %$pat) {
@@ -117,9 +132,109 @@ sub _write
$db{ $key } = $pat->{ $key };
print "$key " if $debug;
+
+ # XXX use several files in dir/
+ print "." unless $debug;
sleep 1;
untie %db;
}
+
print " done\n" if $debug;
}
+
+
+sub _write2
+{
+ my ($pat, $mode) = @_;
+
+ tie %db, 'Tie::JournaledDir', {
+ unit => $unit,
+ dir => $dir,
+ };
+
+ sleep 1;
+
+ my $time = time;
+ my $key = 'rudo';
+ my $value = "rudo $time last";
+
+ $db{ $key } = $pat->{ $key } = $value;
+ print "$key " if $debug;
+
+ # XXX use several files in dir/
+ print "." unless $debug;
+ sleep 1;
+
+ untie %db;
+}
+
+
+sub _keys
+{
+ my ($k, $v);
+ my $raw_hash = {};
+
+ # raw access
+ use FileHandle;
+ use DirHandle;
+ my $dh = new DirHandle $dir;
+ while ($dh->read) {
+ if (-f "$dir/$_") {
+ my $fh = new FileHandle "$dir/$_";
+ if (defined $fh) {
+ while (<$fh>) {
+ ($k, $v) = split(/s+/, $_, 2);
+ $raw_hash->{ $k } = $v;
+ }
+ $fh->close();
+ }
+ }
+ }
+
+ # go!
+ tie %db, 'Tie::JournaledDir', {
+ unit => $unit,
+ dir => $dir,
+ };
+
+ my $len_orig = length(keys %$raw_access);
+ my $len = length(keys %db);
+
+ if ($len == $len_orig) {
+ print "ok\n";
+ }
+ else {
+ print "fail\n";
+ }
+
+ untie %db;
+}
+
+
+sub _get_all_values
+{
+ unless ($debug) {
+ print "not check if not in debug mode\n";
+ return;
+ }
+
+ # go!
+ tie %db, 'Tie::JournaledDir', {
+ unit => $unit,
+ dir => $dir,
+ };
+
+ my @k = keys %db;
+
+ untie %db;
+
+ my $obj = new Tie::JournaledDir {
+ unit => $unit,
+ dir => $dir,
+ };
+
+ my $a = $obj->get_all_values_as_hash_ref();
+ use Data::Dumper;
+ print Dumper( $a );
+}
diff --git a/regress/base/journaledfile.pl b/regress/base/journaledfile.pl
index 9734f133..62c60f44 100755
--- a/regress/base/journaledfile.pl
+++ b/regress/base/journaledfile.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
#
-# $FML: journaledfile.pl,v 1.3 2002/04/18 14:18:07 fukachan Exp $
+# $FML: journaledfile.pl,v 1.4 2002/05/11 08:34:52 fukachan Exp $
#
use strict;
@@ -8,7 +8,11 @@ use lib qw(../../fml/lib);
use Tie::JournaledFile;
$| = 1;
-print "Tie::JournaledFile ";
+
+#
+# 1. read/write
+#
+print "Tie::JournaledFile write ... ";
my $debug = defined $ENV{'debug'} ? 1 : 0;
my %db = ();
@@ -35,4 +39,21 @@ else {
print " >", $buf, "<\n";
}
+
+#
+# 2. keys
+#
+print "Tie::JournaledFile keys ... ";
+
+my @p = keys %db;
+my $count_orig = ` awk '{print $1}' $file | sort | uniq | wc -l `;
+my $count = $#p + 1;
+
+if ($count_orig == $count) {
+ print "ok\n";
+}
+else {
+ print "fail ($count_orig != $count)\n";
+}
+
exit 0;