Import wiredtiger: d48181f6f4db08761ed7b80b0332908b272ad0d0 from branch mongodb-3.2

ref: 040e3d6f76..d48181f6f4
for: 3.2.12

SERVER-26545  Remove fixed-size limitation on WiredTiger hazard pointers
WT-2336       Add a test validating schema operations via file system call monitoring
WT-2402       Misaligned structure accesses lead to undefined behavior
WT-2670       Inefficient I/O when read full DB (poor readahead)
WT-283        Add a way to change persistent object settings
WT-2960       Inserting multi-megabyte values can cause pathological lookaside usage
WT-2969       Possible snapshot corruption during compaction
WT-3014       Add GCC/clang support for ELF symbol visibility.
WT-3021       Fixes needed for Java log cursor example, Java raw mode cursors, log cursors in raw mode
WT-3025       fix error path in log_force_sync
WT-3028       Workloads with all dirty pages could trigger diagnostic stuck check
WT-3030       Test failure indicating invalid key order during traversal
WT-3034       Add support for single-writer named snapshots.
WT-3037       Fix some outdated comments in logging
WT-3048       WiredTiger maximum size warning uses the wrong format.
WT-3051       Remove external __wt_hex symbol.
WT-3052       Improve search if an index hint is wrong
WT-3053       Review Python and Java calls to internal WiredTiger functions
WT-3054       Java PackTest, PackTest03 do not compile
WT-3055       Java AsyncTest faults
WT-3056       For cursors with projections, keys should be allowed
WT-3057       WiredTiger hazard pointers should use the WT_REF, not the WT_PAGE.
WT-3061       syscall test runs with checkpoint_sync=false and doesn't acknowledge pwrite64
WT-3064       minor tree cleanups: .gitignore, NEWS misspelling
WT-3066       lint
WT-3068       Copy wtperf artifacts when running Jenkins tests
WT-3069       Fix build failures in LevelDB APIs
WT-3070       Fix search_near() for index cursor
WT-3071       Java: fix build with -Werror=sign-conversion
WT-3075       Document and enforce that WiredTiger now depends on Python 2.7
WT-3078       Fix a hang in the reconfiguration test.
WT-3084       Fix Coverity resource leak complaint.

1 files changed, 35 insertions, 33 deletions

diff --git a/src/third_party/wiredtiger/lang/java/wiredtiger.i b/src/third_party/wiredtiger/lang/java/wiredtiger.i
index d6e0660dc2c..efc512f2f5a 100644
--- a/src/third_party/wiredtiger/lang/java/wiredtiger.i
+++ b/src/third_party/wiredtiger/lang/java/wiredtiger.i
@@ -127,7 +127,7 @@ static void throwWiredTigerException(JNIEnv *jenv, int err) {
 
 %typemap(javain) uint64_t "$javainput"
 %typemap(javaout) uint64_t {
-	return $jnicall;
+	return ($jnicall);
 }
 
 /* Return byte[] from cursor.get_value */
@@ -137,7 +137,7 @@ static void throwWiredTigerException(JNIEnv *jenv, int err) {
 
 %typemap(javain) WT_ITEM, WT_ITEM * "$javainput"
 %typemap(javaout) WT_ITEM, WT_ITEM * {
-	return $jnicall;
+	return ($jnicall);
 }
 
 %typemap(in) WT_ITEM * (WT_ITEM item) %{
@@ -165,7 +165,7 @@ static void throwWiredTigerException(JNIEnv *jenv, int err) {
 %typemap(out) int %{
 	if ($1 != 0 && $1 != WT_NOTFOUND) {
 		throwWiredTigerException(jenv, $1);
-		return $null;
+		return ($null);
 	}
 	$result = $1;
 %}
@@ -174,7 +174,7 @@ static void throwWiredTigerException(JNIEnv *jenv, int err) {
 	if (!val) {
 		SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException,
 		#name " is null");
-		return $null;
+		return ($null);
 	}
 %enddef
 
@@ -537,7 +537,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		k.data = NULL;
 		if ((ret = $self->get_key($self, &k)) != 0)
 			throwWiredTigerException(jenv, ret);
-		return k;
+		return (k);
 	}
 
 	%javamethodmodifiers get_value_wrap "protected";
@@ -547,40 +547,40 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		v.data = NULL;
 		if ((ret = $self->get_value($self, &v)) != 0)
 			throwWiredTigerException(jenv, ret);
-		return v;
+		return (v);
 	}
 
 	%javamethodmodifiers insert_wrap "protected";
 	int insert_wrap(WT_ITEM *k, WT_ITEM *v) {
 		$self->set_key($self, k);
 		$self->set_value($self, v);
-		return $self->insert($self);
+		return ($self->insert($self));
 	}
 
 	%javamethodmodifiers remove_wrap "protected";
 	int remove_wrap(WT_ITEM *k) {
 		$self->set_key($self, k);
-		return $self->remove($self);
+		return ($self->remove($self));
 	}
 
 	%javamethodmodifiers search_wrap "protected";
 	int search_wrap(WT_ITEM *k) {
 		$self->set_key($self, k);
-		return $self->search($self);
+		return ($self->search($self));
 	}
 
 	%javamethodmodifiers update_wrap "protected";
 	int update_wrap(WT_ITEM *k, WT_ITEM *v) {
 		$self->set_key($self, k);
 		$self->set_value($self, v);
-		return $self->update($self);
+		return ($self->update($self));
 	}
 
 	%javamethodmodifiers _java_raw "protected";
 	bool _java_raw(JNIEnv *jenv) {
 		(void)jenv;
 		JAVA_CALLBACK *jcb = (JAVA_CALLBACK *)$self->c.lang_private;
-		return jcb->cursor_raw;
+		return (jcb->cursor_raw);
 	}
 
 	%javamethodmodifiers _java_init "protected";
@@ -597,6 +597,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 %typemap(javabody) struct __wt_async_op %{
  private long swigCPtr;
  protected boolean swigCMemOwn;
+ protected boolean javaRaw;
  protected String keyFormat;
  protected String valueFormat;
  protected PackOutputStream keyPacker;
@@ -609,13 +610,14 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
    swigCPtr = cPtr;
    keyFormat = getKey_format();
    valueFormat = getValue_format();
-   keyPacker = new PackOutputStream(keyFormat);
-   valuePacker = new PackOutputStream(valueFormat);
+   javaRaw = _java_raw();
+   keyPacker = new PackOutputStream(keyFormat, javaRaw);
+   valuePacker = new PackOutputStream(valueFormat, javaRaw);
    wiredtigerJNI.AsyncOp__java_init(swigCPtr, this, this);
  }
 
  protected static long getCPtr($javaclassname obj) {
-   return (obj == null) ? 0 : obj.swigCPtr;
+	 return ((obj == null) ? 0 : obj.swigCPtr);
  }
 %}
 
@@ -1098,7 +1100,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		if (keyUnpacker == null)
 			keyUnpacker =
 			    new PackInputStream(keyFormat, get_key_wrap(),
-			    _java_raw());
+			    javaRaw);
 		return keyUnpacker;
 	}
 
@@ -1112,7 +1114,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		if (valueUnpacker == null)
 			valueUnpacker =
 			    new PackInputStream(valueFormat, get_value_wrap(),
-			    _java_raw());
+			    javaRaw);
 		return valueUnpacker;
 	}
 
@@ -1127,7 +1129,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		k.data = NULL;
 		if ((ret = $self->get_key($self, &k)) != 0)
 			throwWiredTigerException(jenv, ret);
-		return k;
+		return (k);
 	}
 
 	%javamethodmodifiers get_value_wrap "protected";
@@ -1137,20 +1139,20 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		v.data = NULL;
 		if ((ret = $self->get_value($self, &v)) != 0)
 			throwWiredTigerException(jenv, ret);
-		return v;
+		return (v);
 	}
 
 	%javamethodmodifiers insert_wrap "protected";
 	int insert_wrap(WT_ITEM *k, WT_ITEM *v) {
 		$self->set_key($self, k);
 		$self->set_value($self, v);
-		return $self->insert($self);
+		return ($self->insert($self));
 	}
 
 	%javamethodmodifiers remove_wrap "protected";
 	int remove_wrap(WT_ITEM *k) {
 		$self->set_key($self, k);
-		return $self->remove($self);
+		return ($self->remove($self));
 	}
 
 	%javamethodmodifiers reset_wrap "protected";
@@ -1161,7 +1163,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 	%javamethodmodifiers search_wrap "protected";
 	int search_wrap(WT_ITEM *k) {
 		$self->set_key($self, k);
-		return $self->search($self);
+		return ($self->search($self));
 	}
 
 	%javamethodmodifiers search_near_wrap "protected";
@@ -1181,7 +1183,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 	int update_wrap(WT_ITEM *k, WT_ITEM *v) {
 		$self->set_key($self, k);
 		$self->set_value($self, v);
-		return $self->update($self);
+		return ($self->update($self));
 	}
 
 	%javamethodmodifiers compare_wrap "protected";
@@ -1189,7 +1191,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		int cmp, ret = $self->compare($self, other, &cmp);
 		if (ret != 0)
 			throwWiredTigerException(jenv, ret);
-		return cmp;
+		return (cmp);
 	}
 
 	%javamethodmodifiers equals_wrap "protected";
@@ -1197,14 +1199,14 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
 		int cmp, ret = $self->equals($self, other, &cmp);
 		if (ret != 0)
 			throwWiredTigerException(jenv, ret);
-		return cmp;
+		return (cmp);
 	}
 
 	%javamethodmodifiers _java_raw "protected";
 	bool _java_raw(JNIEnv *jenv) {
 		(void)jenv;
 		JAVA_CALLBACK *jcb = (JAVA_CALLBACK *)$self->lang_private;
-		return jcb->cursor_raw;
+		return (jcb->cursor_raw);
 	}
 
 	%javamethodmodifiers _java_init "protected";
@@ -1232,8 +1234,8 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler};
    swigCPtr = cPtr;
    keyFormat = getKey_format();
    valueFormat = getValue_format();
-   keyPacker = new PackOutputStream(keyFormat);
-   valuePacker = new PackOutputStream(valueFormat);
+   keyPacker = new PackOutputStream(keyFormat, _java_raw());
+   valuePacker = new PackOutputStream(valueFormat, _java_raw());
    wiredtigerJNI.Cursor__java_init(swigCPtr, this, this);
  }
 
@@ -1953,7 +1955,7 @@ WT_CONNECTION *wiredtiger_open_wrap(JNIEnv *jenv, const char *home, const char *
 
 err:	if (ret != 0)
 		throwWiredTigerException(jenv, ret);
-	return conn;
+	return (conn);
 }
 }
 
@@ -1983,7 +1985,7 @@ err:	if (ret != 0)
 
 err:		if (ret != 0)
 			throwWiredTigerException(jenv, ret);
-		return asyncop;
+		return (asyncop);
 	}
 }
 
@@ -2007,7 +2009,7 @@ err:		if (ret != 0)
 
 err:		if (ret != 0)
 			throwWiredTigerException(jenv, ret);
-		return session;
+		return (session);
 	}
 }
 
@@ -2035,14 +2037,14 @@ err:		if (ret != 0)
 
 err:		if (ret != 0)
 			throwWiredTigerException(jenv, ret);
-		return cursor;
+		return (cursor);
 	}
 }
 
 %extend __wt_async_op {
 	long get_id_wrap(JNIEnv *jenv) {
 		WT_UNUSED(jenv);
-		return (self->get_id(self));
+		return ((long)self->get_id(self));
 	}
 }
 
@@ -2053,6 +2055,6 @@ err:		if (ret != 0)
 		ret = self->transaction_pinned_range(self, &range);
 		if (ret != 0)
 			throwWiredTigerException(jenv, ret);
-		return range;
+		return ((long)range);
 	}
 }