Attachment 204611 Details for Bug 304191 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 2.52 KB, created by Nathan Kinder on 2007-09-24 22:04:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-09-24 22:04:38 UTC

Size: 2.52 KB

patch

obsolete

>Index: 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
>--- dbscan.c	13 Aug 2007 15:35:35 -0000	1.16
>+++ dbscan.c	24 Sep 2007 21:54:18 -0000
>@@ -91,10 +91,15 @@
> #define SLAPI_OPERATION_ABANDON  0x00000100UL
> #define SLAPI_OPERATION_EXTENDED 0x00000200UL
> #define SLAPI_OPERATION_ANY      0xFFFFFFFFUL
> #define SLAPI_OPERATION_NONE     0x00000000UL
> 
>+/* changelog ruv info */
>+#define ENTRY_COUNT_KEY "0000006f"
>+#define PURGE_RUV_KEY   "000000de"
>+#define MAX_RUV_KEY     "0000014d"
>+
> #define ONEMEG (1024*1024)
> 
> #if defined(linux)
> #include <getopt.h>
> #endif
>@@ -429,10 +434,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 +696,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