Attachment 204671 Details for Bug 304191 – Revised Diffs

[patch] Revised Diffs

diffs.txt (text/plain), 3.38 KB, created by Nathan Kinder on 2007-09-24 23:38:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-09-24 23:38:07 UTC

Size: 3.38 KB

patch

obsolete

>Index: plugins/replication/cl5_api.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
>retrieving revision 1.15
>diff -u -5 -t -r1.15 cl5_api.c
>--- plugins/replication/cl5_api.c	11 Jun 2007 17:22:37 -0000	1.15
>+++ plugins/replication/cl5_api.c	24 Sep 2007 23:36:55 -0000
>@@ -6641,11 +6641,11 @@
> static char* _cl5GetHelperEntryKey (int type, char *csnStr)
> {
>         CSN *csn= csn_new();
>         char *rt;
> 
>-        csn_set_time(csn, type);
>+        csn_set_time(csn, (time_t)type);
>         csn_set_replicaid(csn, 0);
> 
>         rt = csn_as_string(csn, PR_FALSE, csnStr);
>         csn_free(&csn);
> 
>Index: slapd/tools/dbscan.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/dbscan.c,v
>retrieving revision 1.16
>diff -u -5 -t -r1.16 dbscan.c
>--- slapd/tools/dbscan.c	13 Aug 2007 15:35:35 -0000	1.16
>+++ slapd/tools/dbscan.c	24 Sep 2007 23:36:55 -0000
>@@ -91,10 +91,16 @@
> #define SLAPI_OPERATION_ABANDON  0x00000100UL
> #define SLAPI_OPERATION_EXTENDED 0x00000200UL
> #define SLAPI_OPERATION_ANY      0xFFFFFFFFUL
> #define SLAPI_OPERATION_NONE     0x00000000UL
> 
>+/* changelog ruv info.  These correspond with some special csn
>+ * timestamps from cl5_api.c */
>+#define ENTRY_COUNT_KEY "0000006f" /* 111 csn timestamp */
>+#define PURGE_RUV_KEY   "000000de" /* 222 csn timestamp */
>+#define MAX_RUV_KEY     "0000014d" /* 333 csn timestamp */
>+
> #define ONEMEG (1024*1024)
> 
> #if defined(linux)
> #include <getopt.h>
> #endif
>@@ -429,10 +435,29 @@
> 
>     (*buff) = pos;
>     free(type);
> }
> 
>+/* data format: <value count> <value size> <value> <value size> <value> ..... */
>+void print_ruv(unsigned char *buff)
>+{
>+    char *pos = buff;
>+    uint32 i;
>+    uint32 val_count;
>+
>+    /* need to do the copy first, to skirt around alignment problems on
>+       certain architectures */
>+    memcpy((char *)&val_count, pos, sizeof(val_count));
>+    val_count = ntohl(val_count);
>+    pos += sizeof (uint32);
>+
>+    for (i = 0; i < val_count; i++)
>+    {
>+        print_ber_attr(NULL, &pos);
>+    }
>+}
>+
> /*
>    *** Copied from cl5_api:cl5DBData2Entry ***
>    Data in db format:
>    ------------------
>    <1 byte version><1 byte change_type><sizeof uint32 time><null terminated dbid>
>@@ -672,11 +697,21 @@
>         if (file_type & INDEXTYPE) {
>             display_index_item(cursor, key, data, buf, buflen);
>         } else if (file_type & CHANGELOGTYPE) {
>             /* changelog db file */
>             printf("\ndbid: %s\n", format(key->data, key->size, buf, buflen));
>-            print_changelog(data->data, data->size);
>+            if (strncasecmp((char *)key->data, ENTRY_COUNT_KEY, 8) == 0) {
>+                printf("\tentry count: %d\n", *(int*)data->data);
>+            } else if (strncasecmp((char *)key->data, PURGE_RUV_KEY, 8) == 0) {
>+                printf("\tpurge ruv:\n");
>+                print_ruv(data->data);
>+            } else if (strncasecmp((char *)key->data, MAX_RUV_KEY, 8) == 0) {
>+                printf("\tmax ruv:\n");
>+                print_ruv(data->data);
>+            } else {
>+                print_changelog(data->data, data->size);
>+            }
>             return;
>         } else if (file_type & ENTRYTYPE) {
>             /* id2entry file */
>             ID entry_id = id_stored_to_internal(key->data);
>             printf("id %d\n", entry_id);

Actions: View | Diff

Attachments on bug 304191: 204611 | 204671