Skip to content

Commit 3d921e8

Browse files
bp-alexbp-alex
committed
Add field numeric prefix to Library struct (sorts)
1 parent f342238 commit 3d921e8

File tree

3 files changed

+47
-33
lines changed

3 files changed

+47
-33
lines changed

‎src/main/java/org/lmdbjava/Env.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,19 @@ public EnvInfo info() throws NotOpenException, LmdbNativeException {
169169
checkRc(LIB.mdb_env_info(ptr, info));
170170

171171
final long mapAddress;
172-
if (info.me_mapaddr.get() == null) {
172+
if (info.f0_me_mapaddr.get() == null) {
173173
mapAddress = 0;
174174
} else {
175-
mapAddress = info.me_mapaddr.get().address();
175+
mapAddress = info.f0_me_mapaddr.get().address();
176176
}
177177

178178
return new EnvInfo(
179179
mapAddress,
180-
info.me_mapsize.longValue(),
181-
info.me_last_pgno.longValue(),
182-
info.me_last_txnid.longValue(),
183-
info.me_maxreaders.intValue(),
184-
info.me_numreaders.intValue());
180+
info.f1_me_mapsize.longValue(),
181+
info.f2_me_last_pgno.longValue(),
182+
info.f3_me_last_txnid.longValue(),
183+
info.f4_me_maxreaders.intValue(),
184+
info.f5_me_numreaders.intValue());
185185
}
186186

187187
/**
@@ -240,12 +240,12 @@ public EnvStat stat() throws NotOpenException, LmdbNativeException {
240240
final MDB_stat stat = new MDB_stat(RUNTIME);
241241
checkRc(LIB.mdb_env_stat(ptr, stat));
242242
return new EnvStat(
243-
stat.ms_psize.intValue(),
244-
stat.ms_depth.intValue(),
245-
stat.ms_branch_pages.longValue(),
246-
stat.ms_leaf_pages.longValue(),
247-
stat.ms_overflow_pages.longValue(),
248-
stat.ms_entries.longValue());
243+
stat.f0_ms_psize.intValue(),
244+
stat.f1_ms_depth.intValue(),
245+
stat.f2_ms_branch_pages.longValue(),
246+
stat.f3_ms_leaf_pages.longValue(),
247+
stat.f4_ms_overflow_pages.longValue(),
248+
stat.f5_ms_entries.longValue());
249249
}
250250

251251
/**

‎src/main/java/org/lmdbjava/Library.java‎

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,45 @@ final class Library {
4646
private Library() {
4747
}
4848

49-
public static final class MDB_stat extends Struct {
49+
@SuppressWarnings("PackageVisibleInnerClass")
50+
public static final class MDB_envinfo extends Struct {
5051

51-
public final u_int32_t ms_psize = new u_int32_t();
52-
public final u_int32_t ms_depth = new u_int32_t();
53-
public final size_t ms_branch_pages = new size_t();
54-
public final size_t ms_leaf_pages = new size_t();
55-
public final size_t ms_overflow_pages = new size_t();
56-
public final size_t ms_entries = new size_t();
52+
public final Pointer f0_me_mapaddr;
53+
public final size_t f1_me_mapsize;
54+
public final size_t f2_me_last_pgno;
55+
public final size_t f3_me_last_txnid;
56+
public final u_int32_t f4_me_maxreaders;
57+
public final u_int32_t f5_me_numreaders;
5758

58-
public MDB_stat(jnr.ffi.Runtime runtime) {
59+
public MDB_envinfo(jnr.ffi.Runtime runtime) {
5960
super(runtime);
61+
this.f0_me_mapaddr = new Pointer();
62+
this.f1_me_mapsize = new size_t();
63+
this.f2_me_last_pgno = new size_t();
64+
this.f3_me_last_txnid = new size_t();
65+
this.f4_me_maxreaders = new u_int32_t();
66+
this.f5_me_numreaders = new u_int32_t();
6067
}
6168
}
6269

63-
public static final class MDB_envinfo extends Struct {
64-
65-
public final Pointer me_mapaddr = new Pointer();
66-
public final size_t me_mapsize = new size_t();
67-
public final size_t me_last_pgno = new size_t();
68-
public final size_t me_last_txnid = new size_t();
69-
public final u_int32_t me_maxreaders = new u_int32_t();
70-
public final u_int32_t me_numreaders = new u_int32_t();
71-
72-
public MDB_envinfo(jnr.ffi.Runtime runtime) {
70+
@SuppressWarnings("PackageVisibleInnerClass")
71+
public static final class MDB_stat extends Struct {
72+
73+
public final u_int32_t f0_ms_psize;
74+
public final u_int32_t f1_ms_depth;
75+
public final size_t f2_ms_branch_pages;
76+
public final size_t f3_ms_leaf_pages;
77+
public final size_t f4_ms_overflow_pages;
78+
public final size_t f5_ms_entries;
79+
80+
public MDB_stat(jnr.ffi.Runtime runtime) {
7381
super(runtime);
82+
this.f0_ms_psize = new u_int32_t();
83+
this.f1_ms_depth = new u_int32_t();
84+
this.f2_ms_branch_pages = new size_t();
85+
this.f3_ms_leaf_pages = new size_t();
86+
this.f5_ms_entries = new size_t();
87+
this.f4_ms_overflow_pages = new size_t();
7488
}
7589
}
7690

‎src/test/java/org/lmdbjava/LibraryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void coverPrivateConstructors() throws Exception {
3333
@Test
3434
public void structureFieldOrder() throws Exception {
3535
MDB_envinfo v = new MDB_envinfo(RUNTIME);
36-
assertThat(v.me_mapaddr.offset(), is(0L));
37-
assertThat(v.me_mapsize.offset(), is((long) BYTES));
36+
assertThat(v.f0_me_mapaddr.offset(), is(0L));
37+
assertThat(v.f1_me_mapsize.offset(), is((long) BYTES));
3838
}
3939
}

0 commit comments

Comments
 (0)