RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Apr-2011 00:58:09
Branch: HEAD Handle: 2011040322580501
Modified files:
rpm CHANGES
rpm/tests/mongo all_types.c auth.c benchmark.c count_delete.c
errors.c pair.c simple.c sizes.c test.h update.c
Log:
- mongo: drag-in the test suite. grdfs/replica_sets todo++.
Summary:
Revision Changes Path
1.3600 +1 -0 rpm/CHANGES
1.4 +19 -8 rpm/tests/mongo/all_types.c
1.4 +3 -0 rpm/tests/mongo/auth.c
1.5 +2 -2 rpm/tests/mongo/benchmark.c
1.4 +4 -2 rpm/tests/mongo/count_delete.c
1.4 +3 -0 rpm/tests/mongo/errors.c
1.4 +1 -0 rpm/tests/mongo/pair.c
1.4 +8 -1 rpm/tests/mongo/simple.c
1.3 +2 -1 rpm/tests/mongo/sizes.c
1.4 +9 -9 rpm/tests/mongo/test.h
1.4 +3 -0 rpm/tests/mongo/update.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3599 -r1.3600 CHANGES
--- rpm/CHANGES 3 Apr 2011 22:10:51 -0000 1.3599
+++ rpm/CHANGES 3 Apr 2011 22:58:05 -0000 1.3600
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+ - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++.
- jbj: mongo: and re-export the mongo-c-driver through librpmio.vers.
- jbj: mongo: pull in the gridfs methods from the mongo-c-driver too.
- jbj: mongo: update mongo-c-driver code, gridfs stil todo++.
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/all_types.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 all_types.c
--- rpm/tests/mongo/all_types.c 21 Sep 2010 21:44:52 -0000 1.3
+++ rpm/tests/mongo/all_types.c 3 Apr 2011 22:58:06 -0000 1.4
@@ -11,6 +11,11 @@
bson b;
bson_iterator it, it2, it3;
bson_oid_t oid;
+ bson_timestamp_t ts;
+ bson_timestamp_t ts_result;
+
+ ts.i = 1;
+ ts.t = 2;
bson_buffer_init(&bb);
bson_append_double(&bb, "d", 3.14);
@@ -49,13 +54,15 @@
bson_destroy(&scope);
}
- /* no timestamp test (internal) */
+ bson_append_timestamp(&bb, "timestamp", &ts);
bson_append_long(&bb, "l", 0x1122334455667788ULL);
bson_from_buffer(&b, &bb);
+ bson_print(&b);
+
bson_iterator_init(&it, b.data);
-
+
ASSERT(bson_iterator_more(&it));
ASSERT(bson_iterator_next(&it) == bson_double);
ASSERT(bson_iterator_type(&it) == bson_double);
@@ -87,7 +94,7 @@
ASSERT(bson_iterator_bin_type(&it3) == 8);
ASSERT(bson_iterator_bin_len(&it3) == 5);
ASSERT(!memcmp(bson_iterator_bin_data(&it3), "w\0rld", 5));
-
+
ASSERT(bson_iterator_more(&it3));
ASSERT(bson_iterator_next(&it3) == bson_eoo);
ASSERT(bson_iterator_type(&it3) == bson_eoo);
@@ -103,7 +110,6 @@
ASSERT(bson_iterator_type(&it) == bson_undefined);
ASSERT(!strcmp(bson_iterator_key(&it), "u"));
-
ASSERT(bson_iterator_more(&it));
ASSERT(bson_iterator_next(&it) == bson_oid);
ASSERT(bson_iterator_type(&it) == bson_oid);
@@ -174,6 +180,14 @@
}
ASSERT(bson_iterator_more(&it));
+ ASSERT(bson_iterator_next(&it) == bson_timestamp);
+ ASSERT(bson_iterator_type(&it) == bson_timestamp);
+ ASSERT(!strcmp(bson_iterator_key(&it), "timestamp"));
+ ts_result = bson_iterator_timestamp(&it);
+ ASSERT( ts_result.i == 1 );
+ ASSERT( ts_result.t == 2);
+
+ ASSERT(bson_iterator_more(&it));
ASSERT(bson_iterator_next(&it) == bson_long);
ASSERT(bson_iterator_type(&it) == bson_long);
ASSERT(!strcmp(bson_iterator_key(&it), "l"));
@@ -183,10 +197,7 @@
ASSERT(bson_iterator_next(&it) == bson_eoo);
ASSERT(bson_iterator_type(&it) == bson_eoo);
ASSERT(!bson_iterator_more(&it));
-
+
return 0;
}
-
-
-
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/auth.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 auth.c
--- rpm/tests/mongo/auth.c 18 Sep 2010 03:25:03 -0000 1.3
+++ rpm/tests/mongo/auth.c 3 Apr 2011 22:58:06 -0000 1.4
@@ -13,6 +13,7 @@
{
strncpy(opts.host, (argc > 1 ? argv[1] : TEST_SERVER), 255);
+
opts.host[254] = '\0';
opts.port = 27017;
@@ -27,5 +28,7 @@
mongo_cmd_add_user(conn, db, "user", "password");
ASSERT(mongo_cmd_authenticate(conn, db, "user", "password") == 1);
+ mongo_cmd_drop_db(conn, db);
+ mongo_destroy(conn);
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/benchmark.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 benchmark.c
--- rpm/tests/mongo/benchmark.c 21 Sep 2010 21:44:52 -0000 1.4
+++ rpm/tests/mongo/benchmark.c 3 Apr 2011 22:58:06 -0000 1.5
@@ -347,8 +347,7 @@
#define TIME(func, gle) (time_it(func, #func, gle))
-static void clean(void)
-{
+static void clean(void){
bson b;
if (!mongo_cmd_drop_db(conn, DB)){
printf("failed to drop db\n");
@@ -365,6 +364,7 @@
mongo_connection_options opts;
strncpy(opts.host, (argc > 1 ? argv[1] : TEST_SERVER), 255);
+
opts.host[254] = '\0';
opts.port = 27017;
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/count_delete.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 count_delete.c
--- rpm/tests/mongo/count_delete.c 18 Sep 2010 03:25:03 -0000 1.3
+++ rpm/tests/mongo/count_delete.c 3 Apr 2011 22:58:06 -0000 1.4
@@ -8,7 +8,7 @@
#include "debug.h"
#if !defined(TEST_SERVER)
-#define TEST_SERVER "127.0.0.1"
+#define TEST_SERVER "127.0.0.1"
#endif
int main(int argc, char *argv[])
@@ -24,6 +24,7 @@
const char * ns = "test.c.simple";
strncpy(opts.host, (argc > 1 ? argv[1] : TEST_SERVER), 255);
+
opts.host[254] = '\0';
opts.port = 27017;
@@ -67,6 +68,7 @@
ASSERT(mongo_count(conn, db, col, NULL) == 3);
ASSERT(mongo_count(conn, db, col, &b) == 0);
- mongo_destroy( conn );
+ mongo_cmd_drop_db(conn, db);
+ mongo_destroy(conn);
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/errors.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 errors.c
--- rpm/tests/mongo/errors.c 18 Sep 2010 03:25:03 -0000 1.3
+++ rpm/tests/mongo/errors.c 3 Apr 2011 22:58:06 -0000 1.4
@@ -15,6 +15,7 @@
bson obj;
strncpy(opts.host, (argc > 1 ? argv[1] : TEST_SERVER), 255);
+
opts.host[254] = '\0';
opts.port = 27017;
@@ -70,5 +71,7 @@
ASSERT(!mongo_cmd_get_last_error(conn, db, &obj));
bson_destroy(&obj);
+ mongo_cmd_drop_db(conn, db);
+ mongo_destroy(conn);
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/pair.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 pair.c
--- rpm/tests/mongo/pair.c 18 Sep 2010 03:25:03 -0000 1.3
+++ rpm/tests/mongo/pair.c 3 Apr 2011 22:58:06 -0000 1.4
@@ -13,6 +13,7 @@
{
strncpy(left.host, (argc > 1 ? argv[1] : TEST_SERVER), 255);
+
left.host[254] = '\0';
left.port = 27017;
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/simple.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 simple.c
--- rpm/tests/mongo/simple.c 18 Sep 2010 03:25:03 -0000 1.3
+++ rpm/tests/mongo/simple.c 3 Apr 2011 22:58:06 -0000 1.4
@@ -16,11 +16,13 @@
mongo_cursor * cursor;
int i;
char hex_oid[25];
+ bson_timestamp_t ts = { 1, 2 };
const char * col = "c.simple";
const char * ns = "test.c.simple";
strncpy(opts.host, (argc > 1 ? argv[1] : TEST_SERVER), 255);
+
opts.host[254] = '\0';
opts.port = 27017;
@@ -40,6 +42,7 @@
bson_buffer_init( & bb );
bson_append_new_oid( &bb, "_id" );
+ bson_append_timestamp( &bb, "ts", &ts );
bson_append_double( &bb , "a" , 17 );
bson_append_int( &bb , "b" , 17 );
bson_append_string( &bb , "c" , "17" );
@@ -60,7 +63,7 @@
mongo_insert( conn , ns , &b );
bson_destroy(&b);
}
-
+
cursor = mongo_find( conn , ns , bson_empty(&b) , 0 , 0 , 0 , 0 );
while (mongo_cursor_next(cursor)){
@@ -89,6 +92,9 @@
case bson_array:
fprintf(stderr, "(array) [...]\n");
break;
+ case bson_timestamp:
+ fprintf(stderr, "(timestamp) [...]\n");
+ break;
default:
fprintf(stderr, "(type %d)\n", bson_iterator_type(&it));
break;
@@ -98,6 +104,7 @@
}
mongo_cursor_destroy(cursor);
+ mongo_cmd_drop_db(conn, "test");
mongo_destroy( conn );
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/sizes.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 sizes.c
--- rpm/tests/mongo/sizes.c 17 Sep 2010 22:49:45 -0000 1.2
+++ rpm/tests/mongo/sizes.c 3 Apr 2011 22:58:06 -0000 1.3
@@ -7,7 +7,8 @@
#include "debug.h"
-int main(int argc, char *argv[]){
+int main(int argc, char *argv[])
+{
mongo_reply mr;
ASSERT(sizeof(int) == 4);
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/test.h
============================================================================
$ cvs diff -u -r1.3 -r1.4 test.h
--- rpm/tests/mongo/test.h 18 Sep 2010 14:02:50 -0000 1.3
+++ rpm/tests/mongo/test.h 3 Apr 2011 22:58:06 -0000 1.4
@@ -1,9 +1,9 @@
-#define ASSERT(x) \
- do{ \
- if(!(x)){ \
- printf("failed assert (%d): %s\n", __LINE__, #x); \
- exit(1); \
- }\
- }while(0)
-
-#define TEST_SERVER "127.0.0.1"
+#define ASSERT(x) \
+ do{ \
+ if(!(x)){ \
+ printf("failed assert (%d): %s\n", __LINE__, #x); \
+ exit(1); \
+ }\
+ }while(0)
+
+#define TEST_SERVER "127.0.0.1"
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/update.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 update.c
--- rpm/tests/mongo/update.c 18 Sep 2010 03:25:03 -0000 1.3
+++ rpm/tests/mongo/update.c 3 Apr 2011 22:58:06 -0000 1.4
@@ -18,6 +18,7 @@
const char* ns = "test.c.update_test";
strncpy(opts.host, (argc > 1 ? argv[1] : TEST_SERVER), 255);
+
opts.host[254] = '\0';
opts.port = 27017;
@@ -106,5 +107,7 @@
bson_destroy(&obj);
+ mongo_cmd_drop_db(conn, "test");
+ mongo_destroy(conn);
return 0;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
