GeezerVison is showing github.com — Continue to use UNSAFE.[get|put]Long(..) (#97) · lmdbjava/lmdbjava@a5ef8b5
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: src/main/java/org/lmdbjava/ByteBufferProxy.java +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -277,20 +277,20 @@ private static final class UnsafeProxy extends AbstractByteBufferProxy { | 277 | 277 | protected void in(final ByteBuffer buffer, final Pointer ptr, | 278 | 278 | final long ptrAddr) { | 279 | 279 | UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE, buffer.remaining()); | 280 | | - UNSAFE.putAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA, address(buffer)); | | 280 | + UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA, address(buffer)); | 281 | 281 | } | 282 | 282 |
| 283 | 283 | @Override | 284 | 284 | protected void in(final ByteBuffer buffer, final int size, final Pointer ptr, | 285 | 285 | final long ptrAddr) { | 286 | 286 | UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE, size); | 287 | | - UNSAFE.putAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA, address(buffer)); | | 287 | + UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA, address(buffer)); | 288 | 288 | } | 289 | 289 |
| 290 | 290 | @Override | 291 | 291 | protected ByteBuffer out(final ByteBuffer buffer, final Pointer ptr, | 292 | 292 | final long ptrAddr) { | 293 | | - final long addr = UNSAFE.getAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA); | | 293 | + final long addr = UNSAFE.getLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA); | 294 | 294 | final long size = UNSAFE.getLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE); | 295 | 295 | UNSAFE.putLong(buffer, ADDRESS_OFFSET, addr); | 296 | 296 | UNSAFE.putInt(buffer, CAPACITY_OFFSET, (int) size); | |
Collapse file Copy file name to clipboardExpand all lines: src/main/java/org/lmdbjava/DirectBufferProxy.java +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -130,22 +130,22 @@ protected void in(final DirectBuffer buffer, final Pointer ptr, | 130 | 130 | final long ptrAddr) { | 131 | 131 | final long addr = buffer.addressOffset(); | 132 | 132 | final long size = buffer.capacity(); | 133 | | - UNSAFE.putAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA, addr); | | 133 | + UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA, addr); | 134 | 134 | UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE, size); | 135 | 135 | } | 136 | 136 |
| 137 | 137 | @Override | 138 | 138 | protected void in(final DirectBuffer buffer, final int size, final Pointer ptr, | 139 | 139 | final long ptrAddr) { | 140 | 140 | final long addr = buffer.addressOffset(); | 141 | | - UNSAFE.putAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA, addr); | | 141 | + UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA, addr); | 142 | 142 | UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE, size); | 143 | 143 | } | 144 | 144 |
| 145 | 145 | @Override | 146 | 146 | protected DirectBuffer out(final DirectBuffer buffer, final Pointer ptr, | 147 | 147 | final long ptrAddr) { | 148 | | - final long addr = UNSAFE.getAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA); | | 148 | + final long addr = UNSAFE.getLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA); | 149 | 149 | final long size = UNSAFE.getLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE); | 150 | 150 | buffer.wrap(addr, (int) size); | 151 | 151 | return buffer; | |
Collapse file Copy file name to clipboardExpand all lines: src/test/java/org/lmdbjava/ByteBufProxy.java +5-5Lines changed: 5 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -121,23 +121,23 @@ protected byte[] getBytes(final ByteBuf buffer) { | 121 | 121 | protected void in(final ByteBuf buffer, final Pointer ptr, final long ptrAddr) { | 122 | 122 | UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE, | 123 | 123 | buffer.writerIndex() - buffer.readerIndex()); | 124 | | - UNSAFE.putAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA, | 125 | | - buffer.memoryAddress() + buffer.readerIndex()); | | 124 | + UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA, | | 125 | + buffer.memoryAddress() + buffer.readerIndex()); | 126 | 126 | } | 127 | 127 |
| 128 | 128 | @Override | 129 | 129 | protected void in(final ByteBuf buffer, final int size, final Pointer ptr, | 130 | 130 | final long ptrAddr) { | 131 | 131 | UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE, | 132 | 132 | size); | 133 | | - UNSAFE.putAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA, | 134 | | - buffer.memoryAddress() + buffer.readerIndex()); | | 133 | + UNSAFE.putLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA, | | 134 | + buffer.memoryAddress() + buffer.readerIndex()); | 135 | 135 | } | 136 | 136 |
| 137 | 137 | @Override | 138 | 138 | protected ByteBuf out(final ByteBuf buffer, final Pointer ptr, | 139 | 139 | final long ptrAddr) { | 140 | | - final long addr = UNSAFE.getAddress(ptrAddr + STRUCT_FIELD_OFFSET_DATA); | | 140 | + final long addr = UNSAFE.getLong(ptrAddr + STRUCT_FIELD_OFFSET_DATA); | 141 | 141 | final long size = UNSAFE.getLong(ptrAddr + STRUCT_FIELD_OFFSET_SIZE); | 142 | 142 | UNSAFE.putLong(buffer, ADDRESS_OFFSET, addr); | 143 | 143 | UNSAFE.putInt(buffer, LENGTH_OFFSET, (int) size); | |
|