summaryrefslogtreecommitdiff
path: root/lang/java
diff options
context:
space:
mode:
Diffstat (limited to 'lang/java')
-rw-r--r--lang/java/java_doc.i1
-rw-r--r--lang/java/src/com/wiredtiger/db/PackOutputStream.java23
-rw-r--r--lang/java/wiredtiger.i68
3 files changed, 55 insertions, 37 deletions
diff --git a/lang/java/java_doc.i b/lang/java/java_doc.i
index 2264cb31ef1..3606bed1d69 100644
--- a/lang/java/java_doc.i
+++ b/lang/java/java_doc.i
@@ -27,6 +27,7 @@ COPYDOC(__wt_async_op, WT_ASYNC_OP, remove)
COPYDOC(__wt_async_op, WT_ASYNC_OP, compact)
COPYDOC(__wt_async_op, WT_ASYNC_OP, get_id)
COPYDOC(__wt_async_op, WT_ASYNC_OP, get_type)
+COPYDOC(__wt_session, WT_SESSION, alter)
COPYDOC(__wt_session, WT_SESSION, close)
COPYDOC(__wt_session, WT_SESSION, reconfigure)
COPYDOC(__wt_session, WT_SESSION, open_cursor)
diff --git a/lang/java/src/com/wiredtiger/db/PackOutputStream.java b/lang/java/src/com/wiredtiger/db/PackOutputStream.java
index 46b3aef0974..b6804a2992f 100644
--- a/lang/java/src/com/wiredtiger/db/PackOutputStream.java
+++ b/lang/java/src/com/wiredtiger/db/PackOutputStream.java
@@ -42,6 +42,7 @@ public class PackOutputStream {
protected PackFormatInputStream format;
protected ByteArrayOutputStream packed;
protected byte[] intBuf;
+ protected boolean isRaw;
/**
* Constructor.
@@ -50,9 +51,21 @@ public class PackOutputStream {
* defines the layout of this packed value.
*/
public PackOutputStream(String format) {
- this.format = new PackFormatInputStream(format, false);
- intBuf = new byte[MAX_INT_BYTES];
- packed = new ByteArrayOutputStream(100);
+ this(format, false);
+ }
+
+ /**
+ * Constructor.
+ *
+ * \param format A String that contains the WiredTiger format that
+ * defines the layout of this packed value.
+ * \param isRaw The stream is opened raw.
+ */
+ public PackOutputStream(String format, boolean isRaw) {
+ this.format = new PackFormatInputStream(format, isRaw);
+ this.intBuf = new byte[MAX_INT_BYTES];
+ this.packed = new ByteArrayOutputStream(100);
+ this.isRaw = isRaw;
}
/**
@@ -111,7 +124,9 @@ public class PackOutputStream {
throws WiredTigerPackingException {
int padBytes = 0;
- format.checkType('U', false);
+ if (!isRaw) {
+ format.checkType('U', false);
+ }
boolean havesize = format.hasLength();
char type = format.getType();
if (havesize) {
diff --git a/lang/java/wiredtiger.i b/lang/java/wiredtiger.i
index d6e0660dc2c..efc512f2f5a 100644
--- a/lang/java/wiredtiger.i
+++ b/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);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-09-11 14:25:38 +0000