Merge branch '144-flatbuffers-2.0.6' into 'dev'

Update to FlatBuffers 2.0.8

Closes #144

See merge request objectbox/objectbox-java!114

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/DebugFlags.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ObjectBox Ltd. All rights reserved.
+ * Copyright 2022 ObjectBox Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,5 +33,15 @@ private DebugFlags() { }
   public static final int LOG_CACHE_HITS = 32;
   public static final int LOG_CACHE_ALL = 64;
   public static final int LOG_TREE = 128;
+  /**
+   * For a limited number of error conditions, this will try to print stack traces.
+   * Note: this is Linux-only, experimental, and has several limitations:
+   * The usefulness of these stack traces depends on several factors and might not be helpful at all.
+   */
+  public static final int LOG_EXCEPTION_STACK_TRACE = 256;
+  /**
+   * Run a quick self-test to verify basic threading; somewhat paranoia to check the platform and the library setup.
+   */
+  public static final int RUN_THREADING_SELF_TEST = 512;
 }
 

objectbox-java/src/main/java/io/objectbox/flatbuffers/ByteBufferReadWriteBuf.java

@@ -2,7 +2,6 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.Buffer;
 
 public class ByteBufferReadWriteBuf implements ReadWriteBuf {
 
@@ -15,7 +14,7 @@ public ByteBufferReadWriteBuf(ByteBuffer bb) {
 
   @Override
   public void clear() {
-    ((Buffer) buffer).clear();
+    buffer.clear();
   }
 
   @Override
@@ -118,9 +117,9 @@ public void set(int index, byte value) {
   public void set(int index, byte[] value, int start, int length) {
     requestCapacity(index + (length - start));
     int curPos = buffer.position();
-    ((Buffer) buffer).position(index);
+    buffer.position(index);
     buffer.put(value, start, length);
-    ((Buffer) buffer).position(curPos);
+    buffer.position(curPos);
   }
 
   @Override

objectbox-java/src/main/java/io/objectbox/flatbuffers/ByteBufferUtil.java

@@ -19,7 +19,6 @@
 import static io.objectbox.flatbuffers.Constants.*;
 
 import java.nio.ByteBuffer;
-import java.nio.Buffer;
 
 /// @file
 /// @addtogroup flatbuffers_java_api
@@ -50,7 +49,7 @@ public static int getSizePrefix(ByteBuffer bb) {
      */
     public static ByteBuffer removeSizePrefix(ByteBuffer bb) {
         ByteBuffer s = bb.duplicate();
-        ((Buffer) s).position(s.position() + SIZE_PREFIX_LENGTH);
+        s.position(s.position() + SIZE_PREFIX_LENGTH);
         return s;
     }
 

objectbox-java/src/main/java/io/objectbox/flatbuffers/Constants.java

@@ -46,7 +46,7 @@ public class Constants {
     Changes to the Java implementation need to be sure to change
     the version here and in the code generator on every possible
     incompatible change */
-    public static void FLATBUFFERS_2_0_0() {}
+    public static void FLATBUFFERS_2_0_8() {}
 }
 
 /// @endcond

objectbox-java/src/main/java/io/objectbox/flatbuffers/FlatBufferBuilder.java

@@ -92,7 +92,7 @@ public FlatBufferBuilder(int initial_size, ByteBufferFactory bb_factory,
         this.bb_factory = bb_factory;
         if (existing_bb != null) {
           bb = existing_bb;
-          ((Buffer) bb).clear();
+          bb.clear();
           bb.order(ByteOrder.LITTLE_ENDIAN);
         } else {
           bb = bb_factory.newByteBuffer(initial_size);
@@ -154,7 +154,7 @@ public FlatBufferBuilder(ByteBuffer existing_bb) {
     public FlatBufferBuilder init(ByteBuffer existing_bb, ByteBufferFactory bb_factory){
         this.bb_factory = bb_factory;
         bb = existing_bb;
-        ((Buffer) bb).clear();
+        bb.clear();
         bb.order(ByteOrder.LITTLE_ENDIAN);
         minalign = 1;
         space = bb.capacity();
@@ -235,7 +235,7 @@ public static boolean isFieldPresent(Table table, int offset) {
      */
     public void clear(){
         space = bb.capacity();
-        ((Buffer) bb).clear();
+        bb.clear();
         minalign = 1;
         while(vtable_in_use > 0) vtable[--vtable_in_use] = 0;
         vtable_in_use = 0;
@@ -273,10 +273,10 @@ static ByteBuffer growByteBuffer(ByteBuffer bb, ByteBufferFactory bb_factory) {
             new_buf_size = (old_buf_size & 0xC0000000) != 0 ? MAX_BUFFER_SIZE : old_buf_size << 1;
         }
 
-        ((Buffer) bb).position(0);
+        bb.position(0);
         ByteBuffer nbb = bb_factory.newByteBuffer(new_buf_size);
-        new_buf_size = ((Buffer) nbb).clear().capacity(); // Ensure the returned buffer is treated as empty
-        ((Buffer) nbb).position(new_buf_size - old_buf_size);
+        new_buf_size = nbb.clear().capacity(); // Ensure the returned buffer is treated as empty
+        nbb.position(new_buf_size - old_buf_size);
         nbb.put(bb);
         return nbb;
     }
@@ -527,7 +527,7 @@ public ByteBuffer createUnintializedVector(int elem_size, int num_elems, int ali
         int length = elem_size * num_elems;
         startVector(elem_size, num_elems, alignment);
 
-        ((Buffer) bb).position(space -= length);
+        bb.position(space -= length);
 
         // Slice and limit the copy vector to point to the 'array'
         ByteBuffer copy = bb.slice().order(ByteOrder.LITTLE_ENDIAN);
@@ -602,7 +602,7 @@ public int createString(CharSequence s) {
         int length = utf8.encodedLength(s);
         addByte((byte)0);
         startVector(1, length, 1);
-        ((Buffer) bb).position(space -= length);
+        bb.position(space -= length);
         utf8.encodeUtf8(s, bb);
         return endVector();
     }
@@ -617,7 +617,7 @@ public int createString(ByteBuffer s) {
         int length = s.remaining();
         addByte((byte)0);
         startVector(1, length, 1);
-        ((Buffer) bb).position(space -= length);
+        bb.position(space -= length);
         bb.put(s);
         return endVector();
     }
@@ -631,7 +631,7 @@ public int createString(ByteBuffer s) {
     public int createByteVector(byte[] arr) {
         int length = arr.length;
         startVector(1, length, 1);
-        ((Buffer) bb).position(space -= length);
+        bb.position(space -= length);
         bb.put(arr);
         return endVector();
     }
@@ -646,7 +646,7 @@ public int createByteVector(byte[] arr) {
      */
     public int createByteVector(byte[] arr, int offset, int length) {
         startVector(1, length, 1);
-        ((Buffer) bb).position(space -= length);
+        bb.position(space -= length);
         bb.put(arr, offset, length);
         return endVector();
     }
@@ -663,7 +663,7 @@ public int createByteVector(byte[] arr, int offset, int length) {
     public int createByteVector(ByteBuffer byteBuffer) {
         int length = byteBuffer.remaining();
         startVector(1, length, 1);
-        ((Buffer) bb).position(space -= length);
+        bb.position(space -= length);
         bb.put(byteBuffer);
         return endVector();
     }
@@ -953,7 +953,7 @@ protected void finish(int root_table, boolean size_prefix) {
         if (size_prefix) {
             addInt(bb.capacity() - space);
         }
-        ((Buffer) bb).position(space);
+        bb.position(space);
         finished = true;
     }
 
@@ -1067,7 +1067,7 @@ private int dataStart() {
     public byte[] sizedByteArray(int start, int length){
         finished();
         byte[] array = new byte[length];
-        ((Buffer) bb).position(start);
+        bb.position(start);
         bb.get(array);
         return array;
     }
@@ -1090,7 +1090,7 @@ public byte[] sizedByteArray() {
     public InputStream sizedInputStream() {
         finished();
         ByteBuffer duplicate = bb.duplicate();
-        ((Buffer) duplicate).position(space);
+        duplicate.position(space);
         duplicate.limit(bb.capacity());
         return new ByteBufferBackedInputStream(duplicate);
     }

objectbox-java/src/main/java/io/objectbox/flatbuffers/FlexBuffers.java

@@ -23,7 +23,6 @@
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
-import java.nio.Buffer;
 import java.nio.charset.StandardCharsets;
 
 /// @file
@@ -689,7 +688,7 @@ public static Blob empty() {
          */
         public ByteBuffer data() {
             ByteBuffer dup = ByteBuffer.wrap(bb.data());
-            ((Buffer) dup).position(end);
+            dup.position(end);
             dup.limit(end + size());
             return dup.asReadOnlyBuffer().slice();
         }
@@ -789,7 +788,12 @@ int compareTo(byte[] other) {
                 if (io == other.length) {
                     // in our buffer we have an additional \0 byte
                     // but this does not exist in regular Java strings, so we return now
-                    return c1 - c2;
+                    int cmp = c1 - c2;
+                    if (cmp != 0 || bb.get(ia) == '\0') {
+                        return cmp;
+                    } else {
+                        return 1;
+                    }
                 }
             }
             while (c1 == c2);
@@ -962,7 +966,12 @@ private int compareBytes(ReadBuf bb, int start, byte[] other) {
                 if (l2 == other.length) {
                     // in our buffer we have an additional \0 byte
                     // but this does not exist in regular Java strings, so we return now
-                    return c1 - c2;
+                    int cmp = c1 - c2;
+                    if (cmp != 0 || bb.get(l1) == '\0') {
+                        return cmp;
+                    } else {
+                        return 1;
+                    }
                 }
             }
             while (c1 == c2);

objectbox-java/src/main/java/io/objectbox/flatbuffers/FlexBuffersBuilder.java

@@ -451,7 +451,7 @@ public int startVector() {
     /**
      * Finishes a vector, but writing the information in the buffer
      * @param key   key used to store element in map
-     * @param start reference for begining of the vector. Returned by {@link startVector()}
+     * @param start reference for beginning of the vector. Returned by {@link startVector()}
      * @param typed boolean indicating whether vector is typed
      * @param fixed boolean indicating whether vector is fixed
      * @return      Reference to the vector
@@ -602,7 +602,7 @@ public int startMap() {
     /**
      * Finishes a map, but writing the information in the buffer
      * @param key   key used to store element in map
-     * @param start reference for begining of the map. Returned by {@link startMap()}
+     * @param start reference for beginning of the map. Returned by {@link startMap()}
      * @return      Reference to the map
      */
     public int endMap(String key, int start) {
@@ -763,7 +763,7 @@ private static int elemWidth(int type, int minBitWidth, long iValue, int bufSize
                     // Compute relative offset.
                     long offset = offsetLoc - iValue;
                     // Does it fit?
-                    int bitWidth = widthUInBits((int) offset);
+                    int bitWidth = widthUInBits(offset);
                     if (((1L) << bitWidth) == byteWidth)
                         return bitWidth;
                 }