Merge pull request #43 from sanekas/task/unsafe_primitives_reading

Reading primitives unsafe (natively through ByteBuffer API)
yandex · Mar 13, 2019 · 1f91a9e · 1f91a9e
2 parents c82df86 + 26822ce
commit 1f91a9e
Show file tree

Hide file tree

Showing 34 changed files with 1,757 additions and 68 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,5 +1,6 @@
 # Please keep the list sorted.
 
+Alexander Sergeev <[email protected]>
 Andrey Korzinev <[email protected]>
 Irina Kamalova <[email protected]>
 Svyatoslav Demidov <[email protected]>

diff --git a/core/src/main/java/com/yandex/yoctodb/immutable/DocumentProvider.java b/core/src/main/java/com/yandex/yoctodb/immutable/DocumentProvider.java
@@ -36,7 +36,7 @@ public interface DocumentProvider {
     /**
      * Get {@code document} document {@code fieldName} field value.
      *
-     * The field must be sortable.
+     * The field must be sortable, stored or full.
      *
      * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#SORTABLE
      * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#FULL
@@ -50,4 +50,89 @@ Buffer getFieldValue(
             int document,
             @NotNull
             String fieldName);
+
+    /**
+     * Get {@code document} document {@code fieldName} field value as long.
+     *
+     * The field must be sortable, stored or full.
+     *
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#SORTABLE
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#FULL
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#STORED
+     * @param document document index
+     * @param fieldName field name
+     * @return document field value as long
+     */
+    long getLongValue(
+            int document,
+            @NotNull
+            String fieldName);
+
+    /**
+     * Get {@code document} document {@code fieldName} field value as int.
+     *
+     * The field must be sortable, stored or full.
+     *
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#SORTABLE
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#FULL
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#STORED
+     * @param document document index
+     * @param fieldName field name
+     * @return document field value as int
+     */
+    int getIntValue(
+            int document,
+            @NotNull
+            String fieldName);
+
+    /**
+     * Get {@code document} document {@code fieldName} field value as short.
+     *
+     * The field must be sortable, stored or full.
+     *
+     * @param document document index
+     * @param fieldName field name
+     * @return document field value as short
+     */
+    short getShortValue(
+            int document,
+            @NotNull
+            String fieldName
+    );
+
+    /**
+     * Get {@code document} document {@code fieldName} field value as char.
+     *
+     * The field must be sortable, stored or full.
+     *
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#SORTABLE
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#FULL
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#STORED
+     * @param document document index
+     * @param fieldName field name
+     * @return document field value as char
+     */
+    char getCharValue(
+            int document,
+            @NotNull
+            String fieldName
+    );
+
+    /**
+     * Get {@code document} document {@code fieldName} field value as byte.
+     *
+     * The field must be sortable, stored or full.
+     *
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#SORTABLE
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#FULL
+     * @see com.yandex.yoctodb.mutable.DocumentBuilder.IndexOption#STORED
+     * @param document document index
+     * @param fieldName field name
+     * @return document field value as byte
+     */
+    byte getByteValue(
+            int document,
+            @NotNull
+            String fieldName
+    );
 }
diff --git a/core/src/main/java/com/yandex/yoctodb/immutable/StoredIndex.java b/core/src/main/java/com/yandex/yoctodb/immutable/StoredIndex.java
@@ -29,4 +29,44 @@ public interface StoredIndex extends Index {
      */
     @NotNull
     Buffer getStoredValue(int document);
+
+    /**
+     * Get stored value as long by document ID
+     *
+     * @param document document ID
+     * @return stored value as long
+     */
+    long getLongValue(int document);
+
+    /**
+     * Get stored value as int by document ID
+     *
+     * @param document document ID
+     * @return stored value as int
+     */
+    int getIntValue(int document);
+
+    /**
+     * Get stored value as short by document ID
+     *
+     * @param document document ID
+     * @return stored value as short
+     */
+    short getShortValue(int document);
+
+    /**
+     * Get stored value as char by document ID
+     *
+     * @param document document ID
+     * @return stored value as char
+     */
+    char getCharValue(int document);
+
+    /**
+     * Get stored value as byte by document ID
+     *
+     * @param document document ID
+     * @return stored value as byte
+     */
+    byte getByteValue(int document);
 }
diff --git a/core/src/main/java/com/yandex/yoctodb/mutable/AbstractDocumentBuilder.java b/core/src/main/java/com/yandex/yoctodb/mutable/AbstractDocumentBuilder.java
@@ -85,14 +85,22 @@ public DocumentBuilder withField(
     @Override
     public DocumentBuilder withField(
             @NotNull
-            final
-            String name,
+            final String name,
             final long value,
             @NotNull
             final IndexOption index) {
         return withField(name, UnsignedByteArrays.from(value), index, IndexType.FIXED_LENGTH);
     }
 
+    public DocumentBuilder withField(
+            @NotNull
+            final String name,
+            final char value,
+            @NotNull
+            final IndexOption index) {
+        return withField(name, UnsignedByteArrays.from(value), index, IndexType.FIXED_LENGTH);
+    }
+
     @NotNull
     @Override
     public DocumentBuilder withField(

diff --git a/core/src/main/java/com/yandex/yoctodb/mutable/DocumentBuilder.java b/core/src/main/java/com/yandex/yoctodb/mutable/DocumentBuilder.java
@@ -113,6 +113,15 @@ DocumentBuilder withField(
             @NotNull
             IndexOption index);
 
+    @NotNull
+    DocumentBuilder withField(
+            @NotNull
+            String name,
+            char c,
+            @NotNull
+            IndexOption index
+    );
+
     @NotNull
     DocumentBuilder withField(
             @NotNull

diff --git a/core/src/main/java/com/yandex/yoctodb/util/UnsignedByteArrays.java b/core/src/main/java/com/yandex/yoctodb/util/UnsignedByteArrays.java
@@ -82,6 +82,11 @@ public static UnsignedByteArray from(final int i) {
         return from(Ints.toByteArray(i ^ Integer.MIN_VALUE));
     }
 
+    @NotNull
+    public static UnsignedByteArray from(final char c) {
+        return from(Chars.toByteArray(c));
+    }
+
     public static int toInt(
             @NotNull
             final UnsignedByteArray bytes) {

diff --git a/core/src/main/java/com/yandex/yoctodb/util/buf/Buffer.java b/core/src/main/java/com/yandex/yoctodb/util/buf/Buffer.java
@@ -120,6 +120,10 @@ public byte[] toByteArray() {
 
     public abstract long getLong(long index);
 
+    public abstract char getChar();
+
+    public abstract char getChar(long index);
+
     public abstract short getShort();
 
     public abstract short getShort(long index);

diff --git a/core/src/main/java/com/yandex/yoctodb/util/buf/ByteBufferWrapper.java b/core/src/main/java/com/yandex/yoctodb/util/buf/ByteBufferWrapper.java
@@ -117,6 +117,18 @@ public long getLong(final long index) {
         return delegate.getLong((int) index);
     }
 
+    @Override
+    public char getChar() {
+        return delegate.getChar();
+    }
+
+    @Override
+    public char getChar(long index) {
+        assert index <= Integer.MAX_VALUE;
+
+        return delegate.getChar((int) index);
+    }
+
     @Override
     public short getShort() {
         return delegate.getShort();