Import wiredtiger-wiredtiger-2.8.0-134-g5047aab.tar.gz from wiredtiger branch mongodb-3.4

ref: 9cf8eb2..5047aab

SERVER-23504  Coverity analysis defect 98177: Resource leak
WT-2330       in-memory configurations should not create on-disk collection files
WT-2513       conversion from 'int64_t' to 'uint32_t'
WT-2522       Incorrect format code in message
WT-2525       in-memory configurations: miscellaneous cleanups
WT-2527       OS X compile error, missing POSIX_FADV_WILLNEED #define
WT-2528       style error in WiredTiger build
WT-2529       The readonly test case is crashing with a stack overflow
WT-2531       in-memory tables are allocating unnecessary memory
WT-2532       WT_STREAM_APPEND and WT_STREAM_LINE_BUFFER flag overlap
WT-2533       Ensure that in-memory tables don't report a zero size
SERVER-23517  WiredTiger changes for MongoDB 3.3.5

1 files changed, 18 insertions, 15 deletions

diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c
index 471bb65cac0..0b287c228e5 100644
--- a/src/third_party/wiredtiger/src/meta/meta_turtle.c
+++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c
@@ -68,27 +68,27 @@ __metadata_init(WT_SESSION_IMPL *session)
 static int
 __metadata_load_hot_backup(WT_SESSION_IMPL *session)
 {
-	FILE *fp;
 	WT_DECL_ITEM(key);
 	WT_DECL_ITEM(value);
 	WT_DECL_RET;
+	WT_FH *fh;
 	bool exist;
 
 	/* Look for a hot backup file: if we find it, load it. */
 	WT_RET(__wt_exist(session, WT_METADATA_BACKUP, &exist));
 	if (!exist)
 		return (0);
-	WT_RET(__wt_fopen(session,
-	    WT_METADATA_BACKUP, WT_FHANDLE_READ, 0, &fp));
+	WT_RET(__wt_open(session, WT_METADATA_BACKUP,
+	    WT_FILE_TYPE_REGULAR, WT_OPEN_READONLY | WT_STREAM_READ, &fh));
 
 	/* Read line pairs and load them into the metadata file. */
 	WT_ERR(__wt_scr_alloc(session, 512, &key));
 	WT_ERR(__wt_scr_alloc(session, 512, &value));
 	for (;;) {
-		WT_ERR(__wt_getline(session, key, fp));
+		WT_ERR(__wt_getline(session, key, fh));
 		if (key->size == 0)
 			break;
-		WT_ERR(__wt_getline(session, value, fp));
+		WT_ERR(__wt_getline(session, value, fh));
 		if (value->size == 0)
 			WT_ERR(__wt_illegal_value(session, WT_METADATA_BACKUP));
 		WT_ERR(__wt_metadata_update(session, key->data, value->data));
@@ -96,7 +96,7 @@ __metadata_load_hot_backup(WT_SESSION_IMPL *session)
 
 	F_SET(S2C(session), WT_CONN_WAS_BACKUP);
 
-err:	WT_TRET(__wt_fclose(&fp, WT_FHANDLE_READ));
+err:	WT_TRET(__wt_close(session, &fh));
 	__wt_scr_free(session, &key);
 	__wt_scr_free(session, &value);
 	return (ret);
@@ -240,9 +240,9 @@ err:	__wt_free(session, metaconf);
 int
 __wt_turtle_read(WT_SESSION_IMPL *session, const char *key, char **valuep)
 {
-	FILE *fp;
 	WT_DECL_ITEM(buf);
 	WT_DECL_RET;
+	WT_FH *fh;
 	bool exist, match;
 
 	*valuep = NULL;
@@ -257,20 +257,20 @@ __wt_turtle_read(WT_SESSION_IMPL *session, const char *key, char **valuep)
 	if (!exist)
 		return (strcmp(key, WT_METAFILE_URI) == 0 ?
 		    __metadata_config(session, valuep) : WT_NOTFOUND);
-	WT_RET(__wt_fopen(session,
-	    WT_METADATA_TURTLE, WT_FHANDLE_READ, 0, &fp));
+	WT_RET(__wt_open(session, WT_METADATA_TURTLE,
+	    WT_FILE_TYPE_REGULAR, WT_OPEN_READONLY | WT_STREAM_READ, &fh));
 
 	/* Search for the key. */
 	WT_ERR(__wt_scr_alloc(session, 512, &buf));
 	for (match = false;;) {
-		WT_ERR(__wt_getline(session, buf, fp));
+		WT_ERR(__wt_getline(session, buf, fh));
 		if (buf->size == 0)
 			WT_ERR(WT_NOTFOUND);
 		if (strcmp(key, buf->data) == 0)
 			match = true;
 
 		/* Key matched: read the subsequent line for the value. */
-		WT_ERR(__wt_getline(session, buf, fp));
+		WT_ERR(__wt_getline(session, buf, fh));
 		if (buf->size == 0)
 			WT_ERR(__wt_illegal_value(session, WT_METADATA_TURTLE));
 		if (match)
@@ -280,8 +280,11 @@ __wt_turtle_read(WT_SESSION_IMPL *session, const char *key, char **valuep)
 	/* Copy the value for the caller. */
 	WT_ERR(__wt_strdup(session, buf->data, valuep));
 
-err:	WT_TRET(__wt_fclose(&fp, WT_FHANDLE_READ));
+err:	WT_TRET(__wt_close(session, &fh));
 	__wt_scr_free(session, &buf);
+
+	if (ret != 0)
+		__wt_free(session, *valuep);
 	return (ret);
 }
 
@@ -304,8 +307,8 @@ __wt_turtle_update(WT_SESSION_IMPL *session, const char *key, const char *value)
 	 * Create the turtle setup file: we currently re-write it from scratch
 	 * every time.
 	 */
-	WT_RET(__wt_open(session,
-	    WT_METADATA_TURTLE_SET, true, true, WT_FILE_TYPE_TURTLE, &fh));
+	WT_RET(__wt_open(session, WT_METADATA_TURTLE_SET,
+	    WT_FILE_TYPE_REGULAR, WT_OPEN_CREATE | WT_OPEN_EXCLUSIVE, &fh));
 
 	version = wiredtiger_version(&vmajor, &vminor, &vpatch);
 	WT_ERR(__wt_scr_alloc(session, 2 * 1024, &buf));
@@ -317,7 +320,7 @@ __wt_turtle_update(WT_SESSION_IMPL *session, const char *key, const char *value)
 	WT_ERR(__wt_write(session, fh, 0, buf->size, buf->data));
 
 	/* Flush the handle and rename the file into place. */
-	ret = __wt_fh_sync_and_rename(
+	ret = __wt_sync_handle_and_rename(
 	    session, &fh, WT_METADATA_TURTLE_SET, WT_METADATA_TURTLE);
 
 	/* Close any file handle left open, remove any temporary file. */