[Pvfs2-cvs] commit by mtmoore in pvfs2/src/io/trove: trove-internal.h trove.c trove.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/trove
In directory parlweb1:/tmp/cvs-serv10659/pvfs2/src/io/trove

Modified Files:
      Tag: Orange-mtmoore
	trove-internal.h trove.c trove.h 
Log Message:
Merge range query changes and other fixes


Index: trove-internal.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-internal.h,v
diff -p -u -r1.30.24.1 -r1.30.24.2
--- trove-internal.h	14 Jul 2009 17:19:36 -0000	1.30.24.1
+++ trove-internal.h	10 Aug 2009 15:30:08 -0000	1.30.24.2
@@ -132,10 +132,15 @@ struct TROVE_keyval_ops
 
    int (*keyval_read_value)(
                                TROVE_coll_id coll_id,
-                               TROVE_ds_position* position_p,
-                               PVFS_dirent* dirent_p,
-                               TROVE_keyval_s* key_p,
-                               TROVE_keyval_s* val_p,
+                               TROVE_ds_position *position_p,
+                               uint32_t type,
+                               TROVE_keyval_s *key_p,
+                               TROVE_keyval_s *val_p,
+                               PVFS_dirent *dirent_array,
+                               TROVE_keyval_s *key_array,
+                               TROVE_keyval_s *val_array,
+                               uint32_t *count,
+                               uint32_t *match_count,
                                TROVE_ds_flags flags,
                                TROVE_vtag_s* vtag,
                                void* user_ptr,

Index: trove.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove.c,v
diff -p -u -r1.14.24.1 -r1.14.24.2
--- trove.c	14 Jul 2009 17:19:36 -0000	1.14.24.1
+++ trove.c	10 Aug 2009 15:30:09 -0000	1.14.24.2
@@ -343,16 +343,20 @@ int trove_keyval_read(
            hints);
 }
 
-
 /** Initiate read of a single keyword/value pair based on <attr><value>. 
  * The secondary keyval index is used to perform this lookup.
  */
 int trove_keyval_read_value(
     TROVE_coll_id coll_id,
     TROVE_ds_position *position_p,
-    PVFS_dirent* dirent_p,
-    TROVE_keyval_s* key_p,
-    TROVE_keyval_s* val_p,
+    uint32_t query_type,
+    TROVE_keyval_s *key_p,
+    TROVE_keyval_s *val_p,
+    PVFS_dirent *dirent_array,
+    TROVE_keyval_s *key_array,
+    TROVE_keyval_s *val_array,
+    uint32_t * count,
+    uint32_t * match_count,
     TROVE_ds_flags flags,
     TROVE_vtag_s* vtag,
     void* user_ptr,
@@ -380,9 +384,14 @@ int trove_keyval_read_value(
     return keyval_method_table[method_id]->keyval_read_value(
            coll_id,
            position_p,
-           dirent_p,
+           query_type,
            key_p,
            val_p,
+           dirent_array,
+           key_array,
+           val_array,
+           count,
+           match_count,
            flags,
            vtag,
            user_ptr,

Index: trove.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove.h,v
diff -p -u -r1.45.24.1 -r1.45.24.2
--- trove.h	14 Jul 2009 17:19:38 -0000	1.45.24.1
+++ trove.h	10 Aug 2009 15:30:09 -0000	1.45.24.2
@@ -267,9 +267,14 @@ int trove_keyval_read(
 int trove_keyval_read_value(
 		      TROVE_coll_id coll_id,
                       TROVE_ds_position *position_p,
-                      PVFS_dirent *dirent_p,
+                      uint32_t query_type,
 		      TROVE_keyval_s *key_p,
 		      TROVE_keyval_s *val_p,
+                      PVFS_dirent *dirent_array,
+		      TROVE_keyval_s *key_array,
+		      TROVE_keyval_s *val_array,
+                      uint32_t * count,
+                      uint32_t * match_count,
 		      TROVE_ds_flags flags,
 		      TROVE_vtag_s *vtag, 
 		      void *user_ptr,