1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
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
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
|
*** Makefile.orig Mon Jan 26 02:44:10 2009
--- Makefile Tue Sep 13 15:17:04 2011
***************
*** 12,18 ****
# Targets
MYBINS = tctest qdbmtest ndbmtest sdbmtest gdbmtest tdbtest cdbtest bdbtest \
! maptest sqltest cmpsqltctest
--- 12,18 ----
# Targets
MYBINS = tctest qdbmtest ndbmtest sdbmtest gdbmtest tdbtest cdbtest bdbtest \
! maptest sqltest cmpsqltctest wttest
***************
*** 98,106 ****
bdbtest : bdbtest.c
! gcc -I/usr/local/bdb/include -D_GNU_SOURCE=1 \
-Wall -O3 -o $@ bdbtest.c \
! -static -L/usr/local/bdb/lib -ldb -lpthread -lc
maptest : maptest.cc
--- 98,112 ----
bdbtest : bdbtest.c
! gcc -I$(BDB_HOME)/build_unix -D_GNU_SOURCE=1 \
-Wall -O3 -o $@ bdbtest.c \
! -static $(BDB_HOME)/build_unix/libdb.a -lpthread -lc
!
!
! wttest : $(WT_HOME)/bench/tcbench/wttest.c
! gcc -I$(WT_HOME)/build_posix -D_GNU_SOURCE=1 \
! -Wall -O3 -o $@ $(WT_HOME)/bench/tcbench/wttest.c \
! -static $(WT_HOME)/build_posix/.libs/libwiredtiger.a -lpthread -lc
maptest : maptest.cc
--- reporter.orig 2008-07-27 22:30:39.000000000 +1000
+++ reporter 2011-08-05 17:20:26.500784436 +1000
@@ -11,9 +11,9 @@
use constant {
RECNUM => 1000000,
- TESTCOUNT => 20,
+ TESTCOUNT => 7,
REMOVETOP => 2,
- REMOVEBOTTOM => 8,
+ REMOVEBOTTOM => 2,
};
my @commands = (
@@ -47,6 +47,27 @@
'./bdbtest btread -rnd casket.bdbb_r ' . RECNUM,
'./tctest flwrite casket.tcf ' . RECNUM,
'./tctest flread casket.tcf ' . RECNUM,
+
+ './wttest write -bulk file:casket.wt_b ' . RECNUM,
+ './wttest read file:casket.wt_b ' . RECNUM,
+ './wttest write file:casket.wt_a ' . RECNUM,
+ './wttest read file:casket.wt_a ' . RECNUM,
+ './wttest write -rnd file:casket.wt_r ' . RECNUM,
+ './wttest read -rnd file:casket.wt_r ' . RECNUM,
+
+ './wttest vlcswrite -bulk file:casket.vlwt_b ' . RECNUM,
+ './wttest vlcsread file:casket.vlwt_b ' . RECNUM,
+ './wttest vlcswrite file:casket.vlwt_a ' . RECNUM,
+ './wttest vlcsread file:casket.vlwt_a ' . RECNUM,
+ './wttest vlcswrite -rnd file:casket.vlwt_r ' . RECNUM,
+ './wttest vlcsread -rnd file:casket.vlwt_r ' . RECNUM,
+
+ './wttest flcswrite file:casket.flwt_b ' . RECNUM,
+ './wttest flcsread file:casket.flwt_b ' . RECNUM,
+ './wttest flcswrite file:casket.flwt_a ' . RECNUM,
+ './wttest flcsread file:casket.flwt_a ' . RECNUM,
+ './wttest flcswrite -rnd file:casket.flwt_r ' . RECNUM,
+ './wttest flcsread -rnd file:casket.flwt_r ' . RECNUM,
);
my @names = (
@@ -65,6 +86,15 @@
'casket.bdbb',
'casket.bdbb_r',
'casket.tcf',
+ 'casket.wt_b',
+ 'casket.wt_a',
+ 'casket.wt_r',
+ 'casket.vlwt_b',
+ 'casket.vlwt_a',
+ 'casket.vlwt_r',
+ 'casket.flwt_b',
+ 'casket.flwt_a',
+ 'casket.flwt_r',
);
foreach my $name (@names){
@@ -120,22 +150,36 @@
}
printf("\n");
-printf("%s,%.5f,%.5f,%d\n", "TC", $table[0][1], $table[1][1], $sizes[0]);
-printf("%s,%.5f,%.5f,%d\n", "QDBM", $table[2][1], $table[3][1], $sizes[1]);
-printf("%s,%.5f,%.5f,%d\n", "NDBM", $table[4][1], $table[5][1], $sizes[2]);
-printf("%s,%.5f,%.5f,%d\n", "SDBM", $table[6][1], $table[7][1], $sizes[3]);
-printf("%s,%.5f,%.5f,%d\n", "GDBM", $table[8][1], $table[9][1], $sizes[4]);
-printf("%s,%.5f,%.5f,%d\n", "TDB", $table[10][1], $table[11][1], $sizes[5]);
-printf("%s,%.5f,%.5f,%d\n", "CDB", $table[12][1], $table[13][1], $sizes[6]);
-printf("%s,%.5f,%.5f,%d\n", "BDB", $table[14][1], $table[15][1], $sizes[7]);
+printf("%s,%.5f,%.5f,%d\n", "TC-HASH", $table[0][1], $table[1][1], $sizes[0]);
+printf("%s,%.5f,%.5f,%d\n", "QDBM-HASH", $table[2][1], $table[3][1], $sizes[1]);
+#printf("%s,%.5f,%.5f,%d\n", "NDBM", $table[4][1], $table[5][1], $sizes[2]);
+#printf("%s,%.5f,%.5f,%d\n", "SDBM", $table[6][1], $table[7][1], $sizes[3]);
+#printf("%s,%.5f,%.5f,%d\n", "GDBM", $table[8][1], $table[9][1], $sizes[4]);
+#printf("%s,%.5f,%.5f,%d\n", "TDB", $table[10][1], $table[11][1], $sizes[5]);
+#printf("%s,%.5f,%.5f,%d\n", "CDB", $table[12][1], $table[13][1], $sizes[6]);
+printf("%s,%.5f,%.5f,%d\n", "BDB-HASH", $table[14][1], $table[15][1], $sizes[7]);
+
+# Ordered trees, in-order writes
printf("%s,%.5f,%.5f,%d\n", "TC-BT-ASC", $table[16][1], $table[17][1], $sizes[8]);
-printf("%s,%.5f,%.5f,%d\n", "TC-BT-RND", $table[18][1], $table[19][1], $sizes[9]);
printf("%s,%.5f,%.5f,%d\n", "QDBM-BT-ASC", $table[20][1], $table[21][1], $sizes[10]);
-printf("%s,%.5f,%.5f,%d\n", "QDBM-BT-RND", $table[22][1], $table[23][1], $sizes[11]);
printf("%s,%.5f,%.5f,%d\n", "BDB-BT-ASC", $table[24][1], $table[25][1], $sizes[12]);
-printf("%s,%.5f,%.5f,%d\n", "BDB-BT-RND", $table[26][1], $table[27][1], $sizes[13]);
-printf("%s,%.5f,%.5f,%d\n", "TC-FIXED", $table[28][1], $table[29][1], $sizes[14]);
+printf("%s,%.5f,%.5f,%d\n", "WT-BT-BULK", $table[30][1], $table[31][1], $sizes[15]);
+printf("%s,%.5f,%.5f,%d\n", "WT-BT-ASC", $table[32][1], $table[33][1], $sizes[16]);
+# Ordered trees, random writes
+printf("%s,%.5f,%.5f,%d\n", "TC-BT-RND", $table[18][1], $table[19][1], $sizes[9]);
+printf("%s,%.5f,%.5f,%d\n", "QDBM-BT-RND", $table[22][1], $table[23][1], $sizes[11]);
+printf("%s,%.5f,%.5f,%d\n", "BDB-BT-RND", $table[26][1], $table[27][1], $sizes[13]);
+printf("%s,%.5f,%.5f,%d\n", "WT-BT-RND", $table[34][1], $table[35][1], $sizes[17]);
+# Fixed-size / column stores
+printf("%s,%.5f,%.5f,%d\n", "TC-FIXED", $table[28][1], $table[29][1], $sizes[14]);
+printf("%s,%.5f,%.5f,%d\n", "WT-VAR-BULK", $table[36][1], $table[37][1], $sizes[18]);
+printf("%s,%.5f,%.5f,%d\n", "WT-VAR", $table[38][1], $table[39][1], $sizes[19]);
+printf("%s,%.5f,%.5f,%d\n", "WT-VAR-RND", $table[40][1], $table[41][1], $sizes[20]);
+
+printf("%s,%.5f,%.5f,%d\n", "WT-FIX-BULK", $table[42][1], $table[43][1], $sizes[21]);
+printf("%s,%.5f,%.5f,%d\n", "WT-FIX", $table[44][1], $table[45][1], $sizes[22]);
+printf("%s,%.5f,%.5f,%d\n", "WT-FIX-RND", $table[46][1], $table[47][1], $sizes[23]);
# END OF FILE
--- reporter.orig 2011-08-05 17:20:26.500784436 +1000
+++ reporter 2011-09-14 06:19:44.702015434 +1000
@@ -33,16 +33,16 @@
'./cdbtest read casket.cdbh ' . RECNUM,
'./bdbtest write casket.bdbh ' . RECNUM,
'./bdbtest read casket.bdbh ' . RECNUM,
- './tctest btwrite casket.tcb ' . RECNUM,
- './tctest btread casket.tcb ' . RECNUM,
+ './tctest btwrite casket.tcb_a ' . RECNUM,
+ './tctest btread casket.tcb_a ' . RECNUM,
'./tctest btwrite -rnd casket.tcb_r ' . RECNUM,
'./tctest btread -rnd casket.tcb_r ' . RECNUM,
- './qdbmtest btwrite casket.qdbb ' . RECNUM,
- './qdbmtest btread casket.qdbb ' . RECNUM,
+ './qdbmtest btwrite casket.qdbb_a ' . RECNUM,
+ './qdbmtest btread casket.qdbb_a ' . RECNUM,
'./qdbmtest btwrite -rnd casket.qdbb_r ' . RECNUM,
'./qdbmtest btread -rnd casket.qdbb_r ' . RECNUM,
- './bdbtest btwrite casket.bdbb ' . RECNUM,
- './bdbtest btread casket.bdbb ' . RECNUM,
+ './bdbtest btwrite casket.bdbb_a ' . RECNUM,
+ './bdbtest btread casket.bdbb_a ' . RECNUM,
'./bdbtest btwrite -rnd casket.bdbb_r ' . RECNUM,
'./bdbtest btread -rnd casket.bdbb_r ' . RECNUM,
'./tctest flwrite casket.tcf ' . RECNUM,
@@ -79,11 +79,11 @@
'casket.tdbh',
'casket.cdbh',
'casket.bdbh',
- 'casket.tcb',
+ 'casket.tcb_a',
'casket.tcb_r',
- 'casket.qdbb',
+ 'casket.qdbb_a',
'casket.qdbb_r',
- 'casket.bdbb',
+ 'casket.bdbb_a',
'casket.bdbb_r',
'casket.tcf',
'casket.wt_b',
|
