Skip to content

Add big endian support #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
staticlibs merged 1 commit into from
Mar 17, 2026
Merged

Add big endian support #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/jni/refs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jmethodID J_DuckStruct_init;
jclass J_ByteBuffer;
jmethodID J_ByteBuffer_order;
jclass J_ByteOrder;
jobject J_ByteOrder_LITTLE_ENDIAN;
jobject J_ByteOrder_NATIVE;

jclass J_DuckMap;
jmethodID J_DuckMap_getSQLTypeName;
Expand Down Expand Up @@ -156,6 +156,18 @@ static jfieldID get_field_id(JNIEnv *env, jclass clazz, const std::string &name,
return field_id;
}

static jobject make_static_method_call_ref(JNIEnv *env, jclass clazz, const std::string &name, const std::string &sig) {
jmethodID method_id = get_static_method_id(env, clazz, name, sig);
jobject local_ref = env->CallStaticObjectMethod(clazz, method_id);
check_not_null(local_ref, "Static method returned null, name: [" + name + "], signature: [" + sig + "]");
jobject global_ref = env->NewGlobalRef(local_ref);
check_not_null(global_ref,
"Cannot create global ref for static method result, name: [" + name + "], signature: [" + sig + "]");
env->DeleteLocalRef(local_ref);
global_refs.emplace_back(global_ref);
return global_ref;
}

static jobject make_static_object_field_ref(JNIEnv *env, jclass clazz, const std::string &name,
const std::string &sig) {
jfieldID field_id = env->GetStaticFieldID(clazz, name.c_str(), sig.c_str());
Expand Down Expand Up @@ -278,7 +290,7 @@ void create_refs(JNIEnv *env) {
J_ByteBuffer = make_class_ref(env, "java/nio/ByteBuffer");
J_ByteBuffer_order = get_method_id(env, J_ByteBuffer, "order", "(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;");
J_ByteOrder = make_class_ref(env, "java/nio/ByteOrder");
J_ByteOrder_LITTLE_ENDIAN = make_static_object_field_ref(env, J_ByteOrder, "LITTLE_ENDIAN", "Ljava/nio/ByteOrder;");
J_ByteOrder_NATIVE = make_static_method_call_ref(env, J_ByteOrder, "nativeOrder", "()Ljava/nio/ByteOrder;");

J_ProfilerPrintFormat = make_class_ref(env, "org/duckdb/ProfilerPrintFormat");
J_ProfilerPrintFormat_QUERY_TREE =
Expand Down
2 changes: 1 addition & 1 deletion src/jni/refs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ extern jmethodID J_DuckStruct_init;
extern jclass J_ByteBuffer;
extern jmethodID J_ByteBuffer_order;
extern jclass J_ByteOrder;
extern jobject J_ByteOrder_LITTLE_ENDIAN;
extern jobject J_ByteOrder_NATIVE;

extern jclass J_DuckMap;
extern jmethodID J_DuckMap_getSQLTypeName;
Expand Down
2 changes: 1 addition & 1 deletion src/jni/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobject make_ptr_buf(JNIEnv *env, void *ptr) {
jobject make_data_buf(JNIEnv *env, void *data, idx_t len) {
if (data != nullptr) {
jobject buf = env->NewDirectByteBuffer(data, uint64_to_jlong(len));
env->CallObjectMethod(buf, J_ByteBuffer_order, J_ByteOrder_LITTLE_ENDIAN);
env->CallObjectMethod(buf, J_ByteBuffer_order, J_ByteOrder_NATIVE);
return buf;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/duckdb/DuckDBResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ public int read(byte[] bytes, int off, int len) throws IOException {

public DuckDBBlobResult(ByteBuffer buffer_p) {
buffer_p.position(0);
buffer_p.order(ByteOrder.LITTLE_ENDIAN);
buffer_p.order(ByteOrder.nativeOrder());
this.buffer = buffer_p;
}

Expand Down
55 changes: 20 additions & 35 deletions src/main/java/org/duckdb/DuckDBVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ Boolean getBoolean(int idx) throws SQLException {

protected ByteBuffer getbuf(int idx, int typeWidth) {
ByteBuffer buf = constlen_data;
buf.order(ByteOrder.LITTLE_ENDIAN);
buf.order(ByteOrder.nativeOrder());
buf.position(idx * typeWidth);
return buf;
}
Expand Down Expand Up @@ -505,9 +505,7 @@ short getUint8(int idx) throws SQLException {
return 0;
}
if (isType(DuckDBColumnType.UTINYINT)) {
ByteBuffer buf = ByteBuffer.allocate(2);
getbuf(idx, 1).get(buf.array(), 1, 1);
return buf.getShort();
return (short) Byte.toUnsignedInt(getbuf(idx, 1).get());
}
throw new SQLFeatureNotSupportedException("getUint8");
}
Expand All @@ -517,10 +515,7 @@ long getUint32(int idx) throws SQLException {
return 0;
}
if (isType(DuckDBColumnType.UINTEGER)) {
ByteBuffer buf = ByteBuffer.allocate(8);
buf.order(ByteOrder.LITTLE_ENDIAN);
getbuf(idx, 4).get(buf.array(), 0, 4);
return buf.getLong();
return Integer.toUnsignedLong(getbuf(idx, 4).getInt());
}
throw new SQLFeatureNotSupportedException("getUint32");
}
Expand All @@ -530,10 +525,7 @@ int getUint16(int idx) throws SQLException {
return 0;
}
if (isType(DuckDBColumnType.USMALLINT)) {
ByteBuffer buf = ByteBuffer.allocate(4);
buf.order(ByteOrder.LITTLE_ENDIAN);
getbuf(idx, 2).get(buf.array(), 0, 2);
return buf.getInt();
return Short.toUnsignedInt(getbuf(idx, 2).getShort());
}
throw new SQLFeatureNotSupportedException("getUint16");
}
Expand All @@ -543,13 +535,10 @@ BigInteger getUint64(int idx) throws SQLException {
return BigInteger.ZERO;
}
if (isType(DuckDBColumnType.UBIGINT)) {
byte[] buf_res = new byte[16];
byte[] buf = new byte[8];
getbuf(idx, 8).get(buf);
for (int i = 0; i < 8; i++) {
buf_res[i + 8] = buf[7 - i];
}
return new BigInteger(buf_res);
byte[] buf_res = new byte[8];
long value = getbuf(idx, 8).getLong();
ByteBuffer.wrap(buf_res).putLong(value);
return new BigInteger(1, buf_res);
}
throw new SQLFeatureNotSupportedException("getUint64");
}
Expand Down Expand Up @@ -601,14 +590,12 @@ BigInteger getHugeint(int idx) throws SQLException {
return BigInteger.ZERO;
}
if (isType(DuckDBColumnType.HUGEINT)) {
byte[] buf = new byte[16];
getbuf(idx, 16).get(buf);
for (int i = 0; i < 8; i++) {
byte keep = buf[i];
buf[i] = buf[15 - i];
buf[15 - i] = keep;
}
return new BigInteger(buf);
byte[] buf_res = new byte[16];
ByteBuffer buf = getbuf(idx, 16);
long lower = buf.getLong();
long upper = buf.getLong();
ByteBuffer.wrap(buf_res).putLong(upper).putLong(lower);
return new BigInteger(buf_res);
}
Object o = getObject(idx);
return new BigInteger(o.toString());
Expand All @@ -619,14 +606,12 @@ BigInteger getUhugeint(int idx) throws SQLException {
return BigInteger.ZERO;
}
if (isType(DuckDBColumnType.UHUGEINT)) {
byte[] buf = new byte[16];
getbuf(idx, 16).get(buf);
for (int i = 0; i < 8; i++) {
byte keep = buf[i];
buf[i] = buf[15 - i];
buf[15 - i] = keep;
}
return new BigInteger(1, buf);
byte[] buf_res = new byte[16];
ByteBuffer buf = getbuf(idx, 16);
long lower = buf.getLong();
long upper = buf.getLong();
ByteBuffer.wrap(buf_res).putLong(upper).putLong(lower);
return new BigInteger(1, buf_res);
}
Object o = getObject(idx);
return new BigInteger(o.toString());
Expand Down