persistent-cache-cpp

Merge lp:persistent-cache-cpp/devel into lp:persistent-cache-cpp

  1. devel
  2. Merge into trunk
Proposed by Michi Henning on 2015-07-29
Status: Merged
Approved by: Michi Henning on 2015-08-05
Approved revision: 28
Merged at revision: 17
Proposed branch: lp:persistent-cache-cpp/devel
Merge into: lp:persistent-cache-cpp
Diff against target: 462 lines (+93/-103)
9 files modified
.bzr-builddeb/default.conf (+2/-0)
CMakeLists.txt (+0/-20)
data/libpersistent-cache-cpp.pc.in (+1/-1)
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/tests/test-examples (+2/-2)
tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp (+3/-3)
tests/core/persistent_cache/persistent_cache_test.cpp (+72/-72)
tests/core/persistent_string_cache/persistent_string_cache_test.cpp (+5/-5)
To merge this branch: bzr merge lp:persistent-cache-cpp/devel
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve on 2015-07-29
PS Jenkins bot continuous-integration Approve on 2015-07-29
James Henstridge 2015-07-29 Approve on 2015-07-29
Review via email: mp+266169@code.launchpad.net

Commit Message

Initial revision for landing.

Description of the Change

Initial revision for landing.

To post a comment you must log in.
James Henstridge (jamesh) wrote :

Looks good.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Michi Henning (michihenning) wrote :

Re-approving for the silo.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2015-08-05 00:20:39 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'CMakeLists.txt'
10--- CMakeLists.txt 2015-07-28 02:08:50 +0000
11+++ CMakeLists.txt 2015-08-05 00:20:39 +0000
12@@ -130,23 +130,3 @@
13 )
14 install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
15 DESTINATION share/doc/${LIBNAME})
16-
17-# TODO: Below is the way doc can be generated without using add_doxygen() from cmake-extras.
18-# This avoids re-building the doc even though nothing is out of date.
19-# See bug 1476488.
20-
21-#find_package(Doxygen)
22-#find_program(DOT_EXECUTABLE dot /usr/bin)
23-#if (NOT DOXYGEN_FOUND OR NOT DOT_EXECUTABLE)
24-# message(WARNING "Cannot generate documentation: doxygen and/or graphviz not found")
25-#else()
26-# configure_file(${PROJECT_SOURCE_DIR}/doc/Doxyfile.in ${PROJECT_BINARY_DIR}/doc/Doxyfile @ONLY IMMEDIATE)
27-# add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/lib${LIBNAME}/index.html
28-# COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/doc/Doxyfile
29-# DEPENDS ${PROJECT_BINARY_DIR}/doc/Doxyfile
30-# ${PROJECT_SOURCE_DIR}/include/core/*.h)
31-# add_custom_target(doc ALL
32-# DEPENDS ${PROJECT_BINARY_DIR}/doc/lib${LIBNAME}/index.html)
33-# install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/lib${LIBNAME}
34-# DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc)
35-#endif()
36
37=== modified file 'data/libpersistent-cache-cpp.pc.in'
38--- data/libpersistent-cache-cpp.pc.in 2015-07-24 02:25:49 +0000
39+++ data/libpersistent-cache-cpp.pc.in 2015-08-05 00:20:39 +0000
40@@ -5,5 +5,5 @@
41 Name: lib@LIBNAME@
42 Description: Cache of key-value pairs with persistent storage for C++
43 Version: @LIBVERSION@
44-Libs: -L${libdir} -l@LIBNAME@
45+Libs: -L${libdir} -l@LIBNAME@ -lleveldb
46 Cflags: -I${includedir}
47
48=== modified file 'debian/changelog'
49--- debian/changelog 2015-07-23 06:28:36 +0000
50+++ debian/changelog 2015-08-05 00:20:39 +0000
51@@ -1,3 +1,10 @@
52+persistent-cache-cpp (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
53+
54+ * Fixes: 1481144
55+ * Changes to tests for boost 1.58
56+
57+ -- Michi Henning <michi.henning@canonical.com> Wed, 5 Aug 2015 12:40:24 +1000
58+
59 persistent-cache-cpp (1.0.0) UNRELEASED; urgency=medium
60
61 * Initial release.
62
63=== modified file 'debian/control'
64--- debian/control 2015-07-28 23:50:38 +0000
65+++ debian/control 2015-08-05 00:20:39 +0000
66@@ -9,6 +9,7 @@
67 libgtest-dev,
68 libleveldb-dev,
69 pkg-config,
70+ python3,
71 Standards-Version: 3.9.6
72 XS-Testsuite: autopkgtest
73 Section: libs
74
75=== modified file 'debian/tests/test-examples'
76--- debian/tests/test-examples 2015-07-27 06:22:27 +0000
77+++ debian/tests/test-examples 2015-08-05 00:20:39 +0000
78@@ -27,9 +27,9 @@
79 cp /usr/share/doc/persistent-cache-cpp/examples/string_cache.cpp .
80 cp /usr/share/doc/persistent-cache-cpp/examples/person_cache.cpp .
81
82-g++ --std=c++11 -o string_cache string_cache.cpp `pkg-config --cflags --libs libpersistent-cache-cpp` -lleveldb
83+g++ --std=c++11 -o string_cache string_cache.cpp `pkg-config --cflags --libs libpersistent-cache-cpp`
84 [ -x string_cache ]
85-g++ --std=c++11 -o person_cache person_cache.cpp `pkg-config --cflags --libs libpersistent-cache-cpp` -lleveldb
86+g++ --std=c++11 -o person_cache person_cache.cpp `pkg-config --cflags --libs libpersistent-cache-cpp`
87 [ -x person_cache ]
88
89 ./string_cache
90
91=== modified file 'tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp'
92--- tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp 2015-07-21 06:22:48 +0000
93+++ tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp 2015-08-05 00:20:39 +0000
94@@ -464,7 +464,7 @@
95 EXPECT_EQ(0, s.hits());
96
97 throw_std_exception_called = false;
98- EXPECT_TRUE(c->get_or_put("1", throw_std_exception));
99+ EXPECT_TRUE(bool(c->get_or_put("1", throw_std_exception)));
100 EXPECT_FALSE(throw_std_exception_called); // Entry exists, loader must not have run.
101
102 s = c->stats();
103@@ -516,7 +516,7 @@
104 load_entry_called = false;
105 auto v = c->get_or_put("1", load_entry);
106 EXPECT_TRUE(load_entry_called);
107- EXPECT_TRUE(v);
108+ EXPECT_TRUE(bool(v));
109 EXPECT_EQ("load_entry", *v);
110 EXPECT_EQ(0, s.hits());
111 EXPECT_EQ(1, s.misses());
112@@ -527,7 +527,7 @@
113 load_with_metadata_called = false;
114 auto data = c->get_or_put_data("1", load_with_metadata);
115 EXPECT_TRUE(load_with_metadata_called);
116- EXPECT_TRUE(data);
117+ EXPECT_TRUE(bool(data));
118 EXPECT_EQ("value", data->value);
119 EXPECT_EQ("metadata", data->metadata);
120 EXPECT_EQ(0, s.hits());
121
122=== modified file 'tests/core/persistent_cache/persistent_cache_test.cpp'
123--- tests/core/persistent_cache/persistent_cache_test.cpp 2015-07-27 05:06:45 +0000
124+++ tests/core/persistent_cache/persistent_cache_test.cpp 2015-08-05 00:20:39 +0000
125@@ -145,13 +145,13 @@
126
127 EXPECT_TRUE(c->put(1, 2.0));
128 data = c->take_data(1);
129- EXPECT_TRUE(data);
130+ EXPECT_TRUE(bool(data));
131 EXPECT_EQ(2.0, data->value);
132 EXPECT_EQ('\0', data->metadata);
133
134 EXPECT_TRUE(c->put(2, 3, '4'));
135 data = c->take_data(2);
136- EXPECT_TRUE(data);
137+ EXPECT_TRUE(bool(data));
138 EXPECT_EQ(3, data->value);
139 EXPECT_EQ('4', data->metadata);
140
141@@ -235,13 +235,13 @@
142 };
143
144 loader_called = false;
145- EXPECT_TRUE(c->get_or_put(3, loader));
146-
147- loader_called = false;
148- EXPECT_TRUE(c->get_or_put_data(4, loader));
149-
150- loader_called = false;
151- EXPECT_FALSE(c->get_or_put_data(99, loader));
152+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
153+
154+ loader_called = false;
155+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
156+
157+ loader_called = false;
158+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
159 }
160 }
161
162@@ -311,13 +311,13 @@
163
164 EXPECT_TRUE(c->put("1", 2.0));
165 data = c->take_data("1");
166- EXPECT_TRUE(data);
167+ EXPECT_TRUE(bool(data));
168 EXPECT_EQ(2.0, data->value);
169 EXPECT_EQ('\0', data->metadata);
170
171 EXPECT_TRUE(c->put("2", 3, '4'));
172 data = c->take_data("2");
173- EXPECT_TRUE(data);
174+ EXPECT_TRUE(bool(data));
175 EXPECT_EQ(3, data->value);
176 EXPECT_EQ('4', data->metadata);
177
178@@ -383,13 +383,13 @@
179 };
180
181 loader_called = false;
182- EXPECT_TRUE(c->get_or_put("3", loader));
183-
184- loader_called = false;
185- EXPECT_TRUE(c->get_or_put_data("4", loader));
186-
187- loader_called = false;
188- EXPECT_FALSE(c->get_or_put_data("99", loader));
189+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
190+
191+ loader_called = false;
192+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
193+
194+ loader_called = false;
195+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
196 }
197 }
198
199@@ -456,13 +456,13 @@
200
201 EXPECT_TRUE(c->put(1, "2.0"));
202 data = c->take_data(1);
203- EXPECT_TRUE(data);
204+ EXPECT_TRUE(bool(data));
205 EXPECT_EQ("2.0", data->value);
206 EXPECT_EQ('\0', data->metadata);
207
208 EXPECT_TRUE(c->put(2, string("3"), '4'));
209 data = c->take_data(2);
210- EXPECT_TRUE(data);
211+ EXPECT_TRUE(bool(data));
212 EXPECT_EQ("3", data->value);
213 EXPECT_EQ('4', data->metadata);
214
215@@ -528,13 +528,13 @@
216 };
217
218 loader_called = false;
219- EXPECT_TRUE(c->get_or_put(3, loader));
220-
221- loader_called = false;
222- EXPECT_TRUE(c->get_or_put_data(4, loader));
223-
224- loader_called = false;
225- EXPECT_FALSE(c->get_or_put_data(99, loader));
226+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
227+
228+ loader_called = false;
229+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
230+
231+ loader_called = false;
232+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
233
234 // Extra put() overloads
235 c->invalidate();
236@@ -615,13 +615,13 @@
237
238 EXPECT_TRUE(c->put(1, 2.0));
239 data = c->take_data(1);
240- EXPECT_TRUE(data);
241+ EXPECT_TRUE(bool(data));
242 EXPECT_EQ(2.0, data->value);
243 EXPECT_EQ("\0", data->metadata);
244
245 EXPECT_TRUE(c->put(2, 3, "4"));
246 data = c->take_data(2);
247- EXPECT_TRUE(data);
248+ EXPECT_TRUE(bool(data));
249 EXPECT_EQ(3, data->value);
250 EXPECT_EQ("4", data->metadata);
251
252@@ -686,13 +686,13 @@
253 };
254
255 loader_called = false;
256- EXPECT_TRUE(c->get_or_put(3, loader));
257-
258- loader_called = false;
259- EXPECT_TRUE(c->get_or_put_data(4, loader));
260-
261- loader_called = false;
262- EXPECT_FALSE(c->get_or_put_data(99, loader));
263+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
264+
265+ loader_called = false;
266+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
267+
268+ loader_called = false;
269+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
270
271 // Extra put() overload
272 c->invalidate();
273@@ -774,13 +774,13 @@
274
275 EXPECT_TRUE(c->put("1", "2.0"));
276 data = c->take_data("1");
277- EXPECT_TRUE(data);
278+ EXPECT_TRUE(bool(data));
279 EXPECT_EQ("2.0", data->value);
280 EXPECT_EQ('\0', data->metadata);
281
282 EXPECT_TRUE(c->put("2", string("3"), '4'));
283 data = c->take_data("2");
284- EXPECT_TRUE(data);
285+ EXPECT_TRUE(bool(data));
286 EXPECT_EQ("3", data->value);
287 EXPECT_EQ('4', data->metadata);
288
289@@ -846,13 +846,13 @@
290 };
291
292 loader_called = false;
293- EXPECT_TRUE(c->get_or_put("3", loader));
294-
295- loader_called = false;
296- EXPECT_TRUE(c->get_or_put_data("4", loader));
297-
298- loader_called = false;
299- EXPECT_FALSE(c->get_or_put_data("99", loader));
300+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
301+
302+ loader_called = false;
303+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
304+
305+ loader_called = false;
306+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
307
308 // Extra put() overloads
309 c->invalidate();
310@@ -933,13 +933,13 @@
311
312 EXPECT_TRUE(c->put("1", 2.0));
313 data = c->take_data("1");
314- EXPECT_TRUE(data);
315+ EXPECT_TRUE(bool(data));
316 EXPECT_EQ(2.0, data->value);
317 EXPECT_EQ("", data->metadata);
318
319 EXPECT_TRUE(c->put("2", 3, "4"));
320 data = c->take_data("2");
321- EXPECT_TRUE(data);
322+ EXPECT_TRUE(bool(data));
323 EXPECT_EQ(3, data->value);
324 EXPECT_EQ("4", data->metadata);
325
326@@ -1005,13 +1005,13 @@
327 };
328
329 loader_called = false;
330- EXPECT_TRUE(c->get_or_put("3", loader));
331-
332- loader_called = false;
333- EXPECT_TRUE(c->get_or_put_data("4", loader));
334-
335- loader_called = false;
336- EXPECT_FALSE(c->get_or_put_data("99", loader));
337+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
338+
339+ loader_called = false;
340+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
341+
342+ loader_called = false;
343+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
344
345 // Extra put() overload
346 c->invalidate();
347@@ -1092,13 +1092,13 @@
348
349 EXPECT_TRUE(c->put(1, "2.0"));
350 data = c->take_data(1);
351- EXPECT_TRUE(data);
352+ EXPECT_TRUE(bool(data));
353 EXPECT_EQ("2.0", data->value);
354 EXPECT_EQ("\0", data->metadata);
355
356 EXPECT_TRUE(c->put(2, string("3"), "4"));
357 data = c->take_data(2);
358- EXPECT_TRUE(data);
359+ EXPECT_TRUE(bool(data));
360 EXPECT_EQ("3", data->value);
361 EXPECT_EQ("4", data->metadata);
362
363@@ -1164,13 +1164,13 @@
364 };
365
366 loader_called = false;
367- EXPECT_TRUE(c->get_or_put(3, loader));
368-
369- loader_called = false;
370- EXPECT_TRUE(c->get_or_put_data(4, loader));
371-
372- loader_called = false;
373- EXPECT_FALSE(c->get_or_put_data(99, loader));
374+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
375+
376+ loader_called = false;
377+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
378+
379+ loader_called = false;
380+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
381
382 // Extra put() overloads
383 c->invalidate();
384@@ -1258,13 +1258,13 @@
385
386 EXPECT_TRUE(c->put("1", "2.0"));
387 data = c->take_data("1");
388- EXPECT_TRUE(data);
389+ EXPECT_TRUE(bool(data));
390 EXPECT_EQ("2.0", data->value);
391 EXPECT_EQ("", data->metadata);
392
393 EXPECT_TRUE(c->put("2", string("3"), "4"));
394 data = c->take_data("2");
395- EXPECT_TRUE(data);
396+ EXPECT_TRUE(bool(data));
397 EXPECT_EQ("3", data->value);
398 EXPECT_EQ("4", data->metadata);
399
400@@ -1330,13 +1330,13 @@
401 };
402
403 loader_called = false;
404- EXPECT_TRUE(c->get_or_put("3", loader));
405-
406- loader_called = false;
407- EXPECT_TRUE(c->get_or_put_data("4", loader));
408-
409- loader_called = false;
410- EXPECT_FALSE(c->get_or_put_data("99", loader));
411+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
412+
413+ loader_called = false;
414+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
415+
416+ loader_called = false;
417+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
418
419 // Extra put() overloads
420 c->invalidate();
421
422=== modified file 'tests/core/persistent_string_cache/persistent_string_cache_test.cpp'
423--- tests/core/persistent_string_cache/persistent_string_cache_test.cpp 2015-07-21 06:22:48 +0000
424+++ tests/core/persistent_string_cache/persistent_string_cache_test.cpp 2015-08-05 00:20:39 +0000
425@@ -92,7 +92,7 @@
426 EXPECT_TRUE(c->put_metadata("x", "z"));
427 EXPECT_TRUE(c->put_metadata("x", "z", 1));
428 data = c->take_data("x");
429- EXPECT_TRUE(data);
430+ EXPECT_TRUE(bool(data));
431 EXPECT_EQ("y", data->value);
432 EXPECT_EQ("z", data->metadata);
433 PersistentStringCache::Data data2;
434@@ -178,7 +178,7 @@
435 auto now = chrono::system_clock::now();
436 c->put("x", "y");
437 EXPECT_FALSE(c->get("y"));
438- EXPECT_TRUE(c->get("x"));
439+ EXPECT_TRUE(bool(c->get("x")));
440
441 s = c->stats();
442 EXPECT_EQ(test_db, s.cache_path()); // Must not have changed.
443@@ -210,8 +210,8 @@
444
445 // Two more hits.
446 now = chrono::system_clock::now();
447- EXPECT_TRUE(c->get("x"));
448- EXPECT_TRUE(c->get("x"));
449+ EXPECT_TRUE(bool(c->get("x")));
450+ EXPECT_TRUE(bool(c->get("x")));
451
452 s = c->stats();
453 EXPECT_EQ(3, s.hits());
454@@ -260,7 +260,7 @@
455
456 // One more hit
457 now = chrono::system_clock::now();
458- EXPECT_TRUE(c->get("x"));
459+ EXPECT_TRUE(bool(c->get("x")));
460
461 s = c->stats();
462 EXPECT_EQ(4, s.hits());

Subscribers

People subscribed via source and target branches

to all changes: