summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Bostic <keith.bostic@wiredtiger.com>2011-05-07 11:14:55 -0400
committerKeith Bostic <keith.bostic@wiredtiger.com>2011-05-07 11:14:55 -0400
commit31f7d45032700fff0bdaa01df7f50ac076305c22 (patch)
treea82939c3d55865f520ad449e1e4346e3dcd6ca31 /src
parent44bc72d58c141e8922b7142f79f646696b9dec8e (diff)
downloadmongo-31f7d45032700fff0bdaa01df7f50ac076305c22.tar.gz
Copy a list of bad-arg errors out of the original bulk code into the bulk
cursor code for later resolution.
Diffstat (limited to 'src')
-rw-r--r--src/api/cur_bulk.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/api/cur_bulk.c b/src/api/cur_bulk.c
index 2b39abea228..89106e0e700 100644
--- a/src/api/cur_bulk.c
+++ b/src/api/cur_bulk.c
@@ -19,8 +19,25 @@ __curbulk_insert(WT_CURSOR *cursor)
cbulk = (CURSOR_BULK *)cursor;
/* TODO: check the state of the key/value pair. */
+#if 0
+ These are errors set in the original bulk-load code that need
+ to be reported somewhere.
- WT_RET(__wt_bulk_var_insert(cbulk));
+ /* if key value specified to a column-store */
+ __wt_errx(session,
+ "column-store keys are implied and should not be returned by "
+ "the bulk load input routine"
+
+ /* if 0-length key to row-store */
+ __wt_errx(session, "zero-length keys are not supported");
+
+ /* the high-bit is set on fixed-length keys to signify deletion. */
+ __wt_errx(session,
+ "the first bit may not be stored in fixed-length column-store "
+ "file items");
+#endif
+
+ WT_RET(__wt_bulk_insert(cbulk));
return (0);
}