basho · alexmoore · Dec 13, 2016 · Nov 22, 2016 · Nov 23, 2016 · Nov 23, 2016
diff --git a/RELNOTES.md b/RELNOTES.md
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+### 2.1.1
+
+Following issues / PRs addressed:
+
+*  [Added TS 1.5 Feature Support](https://github.com/basho/riak-java-client/pull/691)
+
 ### 2.1.0
 
 **Notes**

diff --git a/riak_pb b/riak_pb
diff --git a/src/main/java/com/basho/riak/client/core/codec/TermToBinaryCodec.java b/src/main/java/com/basho/riak/client/core/codec/TermToBinaryCodec.java
@@ -64,7 +64,7 @@ public static OtpOutputStream encodeTsQueryRequest(String queryText, byte[] cove
         final OtpOutputStream os = new OtpOutputStream();
         os.write(OtpExternal.versionTag); // NB: this is the reqired 0x83 (131) value
 
-        // TsQueryReq is a 4-tuple: {'tsqueryreq', TsInt, boolIsStreaming, bytesCoverContext}
+        // TsQueryReq is a 4-tuple: {'tsqueryreq', TsInterpolation, boolIsStreaming, bytesCoverContext}
         os.write_tuple_head(4);
         os.write_atom(TS_QUERY_REQ);
 
@@ -171,6 +171,10 @@ else if (cell.hasDouble())
         {
             stream.write_double(cell.getDouble());
         }
+        else if(cell.hasBlob())
+        {
+            stream.write_binary(cell.getBlob());
+        }
         else
         {
             logger.error("Unknown TS cell type encountered.");
@@ -181,11 +185,9 @@ else if (cell.hasDouble())
     private static QueryResult decodeTsResponse(byte[] response)
             throws OtpErlangDecodeException, InvalidTermToBinaryException
     {
-        QueryResult result = null;
-
-        OtpInputStream is = new OtpInputStream(response);
+        final OtpInputStream is = new OtpInputStream(response);
 
-        int firstByte = is.read1skip_version();
+        final int firstByte = is.read1skip_version();
         is.reset();
 
         if (firstByte != OtpExternal.smallTupleTag && firstByte != OtpExternal.largeTupleTag)
@@ -213,7 +215,7 @@ private static QueryResult parseAtomResult(OtpInputStream is)
     private static QueryResult parseTupleResult(OtpInputStream is)
             throws OtpErlangDecodeException, InvalidTermToBinaryException
     {
-        QueryResult result;
+        final QueryResult result;
         final int msgArity = is.read_tuple_head();
         // Response is:
         // {'rpberrorresp', ErrMsg, ErrCode}
@@ -322,30 +324,37 @@ private static Cell parseCell(List<RiakTsPB.TsColumnDescription> columnDescripti
     {
         if (cell instanceof OtpErlangBinary)
         {
-            OtpErlangBinary v = (OtpErlangBinary) cell;
-            String s = new String(v.binaryValue(), StandardCharsets.UTF_8);
-            return new Cell(s);
+            final OtpErlangBinary v = (OtpErlangBinary) cell;
+            if (columnDescriptions.get(j).getType() == RiakTsPB.TsColumnType.VARCHAR)
+            {
+                final String s = new String(v.binaryValue(), StandardCharsets.UTF_8);
+                return new Cell(s);
+            }
+            else if (columnDescriptions.get(j).getType() == RiakTsPB.TsColumnType.BLOB)
+            {
+                return new Cell(v.binaryValue());
+            }
         }
         else if (cell instanceof OtpErlangLong)
         {
-            OtpErlangLong v = (OtpErlangLong) cell;
+            final OtpErlangLong v = (OtpErlangLong) cell;
             if (columnDescriptions.get(j).getType() == RiakTsPB.TsColumnType.TIMESTAMP)
             {
                 return Cell.newTimestamp(v.longValue());
             }
-            else
+            else if (columnDescriptions.get(j).getType() == RiakTsPB.TsColumnType.SINT64)
             {
                 return new Cell(v.longValue());
             }
         }
         else if (cell instanceof OtpErlangDouble)
         {
-            OtpErlangDouble v = (OtpErlangDouble) cell;
+            final OtpErlangDouble v = (OtpErlangDouble) cell;
             return new Cell(v.doubleValue());
         }
         else if (cell instanceof OtpErlangAtom)
         {
-            OtpErlangAtom v = (OtpErlangAtom) cell;
+            final OtpErlangAtom v = (OtpErlangAtom) cell;
             return new Cell(v.booleanValue());
         }
         else if (cell instanceof OtpErlangList)
@@ -354,10 +363,8 @@ else if (cell instanceof OtpErlangList)
             assert (l.arity() == 0);
             return null;
         }
-        else
-        {
-            throw new InvalidTermToBinaryException("Unknown cell type encountered: " + cell.toString() + ", unable to" +
-                                                           " continue parsing.");
-        }
+
+        throw new InvalidTermToBinaryException("Unknown cell type encountered: " + cell.toString() +
+                                               ", unable to continue parsing.");
     }
 }
diff --git a/src/main/java/com/basho/riak/client/core/operations/ts/CreateTableOperation.java b/src/main/java/com/basho/riak/client/core/operations/ts/CreateTableOperation.java
@@ -36,7 +36,6 @@
  */
 public class CreateTableOperation extends PBFutureOperation<Void, RiakTsPB.TsQueryResp, String>
 {
-    private final RiakTsPB.TsQueryReq.Builder reqBuilder;
     private final String queryText;
 
     private CreateTableOperation(AbstractBuilder builder)
@@ -46,7 +45,6 @@ private CreateTableOperation(AbstractBuilder builder)
                 builder.reqBuilder,
                 RiakTsPB.TsQueryResp.PARSER);
 
-        this.reqBuilder = builder.reqBuilder;
         this.queryText = builder.queryText;
     }
 
@@ -205,6 +203,12 @@ private static StringBuilder generateKeys(TableDefinition tableDefinition, int q
             {
                 sb.append(", ")
                         .append(lk.getName());
+
+                if (lk.hasKeyOrder())
+                {
+                    sb.append(" ");
+                    sb.append(lk.getKeyOrder().toString());
+                }
             }
 
             return sb;

diff --git a/src/main/java/com/basho/riak/client/core/query/ConvertibleIterator.java b/src/main/java/com/basho/riak/client/core/query/ConvertibleIterator.java
@@ -1,16 +1,15 @@
 package com.basho.riak.client.core.query;
 
-import com.basho.riak.protobuf.RiakTsPB;
-
 import java.util.Iterator;
 
 /**
  * @author Sergey Galkin <srggal at gmail dot com>
  * @author Alex Moore <amoore at basho dot com>
  * @since 2.0.3
  */
-public abstract class ConvertibleIterator<S,D> implements Iterator<D> {
-    private final Iterator<S> iterator;
+public abstract class ConvertibleIterator<S,D> implements Iterator<D>
+{
+    protected final Iterator<S> iterator;
 
     public ConvertibleIterator(Iterator<S> iterator) {
         this.iterator = iterator;
@@ -19,17 +18,17 @@ public ConvertibleIterator(Iterator<S> iterator) {
     abstract protected D convert(S source);
 
     @Override
-    public final boolean hasNext() {
+    public boolean hasNext() {
         return iterator.hasNext();
     }
 
     @Override
-    public final D next() {
+    public D next() {
         return convert(iterator.next());
     }
 
     @Override
     public final void remove() {
         throw new UnsupportedOperationException();
     }
-}
+}
diff --git a/src/main/java/com/basho/riak/client/core/query/timeseries/Cell.java b/src/main/java/com/basho/riak/client/core/query/timeseries/Cell.java
@@ -5,18 +5,21 @@
 import com.basho.riak.protobuf.RiakTsPB;
 import com.google.protobuf.ByteString;
 
+import javax.xml.bind.DatatypeConverter;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 
 /**
  * Holds a piece of data for a Time Series @{link Row}.
- * A cell can hold 5 different types of raw data:
+ * A cell can hold 6 different types of raw data:
  * <ol>
  * <li><b>Varchar</b>s, which can hold byte arrays. Commonly used to store encoded strings.</li>
  * <li><b>SInt64</b>s, which can hold any signed 64-bit integers.</li>
  * <li><b>Double</b>s, which can hold any 64-bit floating point numbers.</li>
  * <li><b>Timestamp</b>s, which can hold any unix/epoch timestamp. Millisecond resolution is required.</li>
  * <li><b>Boolean</b>s, which can hold a true/false value. </li>
+ * <li><b>Blob</b>s, which can hold any binary data.</li>
  * </ol>
  * Immutable once created.
  *
@@ -32,13 +35,15 @@ public class Cell
     private static final int DOUBLE_MASK = 0x00000004;
     private static final int TIMESTAMP_MASK = 0x00000008;
     private static final int BOOLEAN_MASK = 0x00000010;
+    private static final int BLOB_MASK = 0x00000011;
     private int typeBitfield = 0x0;
 
     private String varcharValue = "";
     private long sint64Value = 0L;
     private double doubleValue = 0.0;
     private long timestampValue = 0L;
     private boolean booleanValue = false;
+    private byte[] blobValue = {};
 
     /**
      * Creates a new "Varchar" Cell, based on the UTF8 binary encoding of the provided String.
@@ -130,7 +135,22 @@ public Cell(Date timestampValue)
         initTimestamp(timestampValue.getTime());
     }
 
-    Cell(RiakTsPB.TsCell pbCell)
+    /**
+     * Creates a new "Blob" Cell from the provided byte array.
+     *
+     * @param blobValue The blob to store.
+     */
+    public Cell(byte[] blobValue)
+    {
+        if (blobValue == null)
+        {
+            throw new IllegalArgumentException("Value for BLOB value cannot be NULL.");
+        }
+
+        initBlob(blobValue);
+    }
+
+    Cell(RiakTsPB.TsCell pbCell, RiakTsPB.TsColumnDescription columnDescription)
     {
         if (pbCell.hasBooleanValue())
         {
@@ -148,10 +168,14 @@ else if (pbCell.hasTimestampValue())
         {
             initTimestamp(pbCell.getTimestampValue());
         }
-        else if (pbCell.hasVarcharValue())
+        else if (pbCell.hasVarcharValue() && columnDescription.getType() == RiakTsPB.TsColumnType.VARCHAR)
         {
             initVarchar(pbCell.getVarcharValue().toStringUtf8());
         }
+        else if (pbCell.hasVarcharValue() && columnDescription.getType() == RiakTsPB.TsColumnType.BLOB)
+        {
+            initBlob(pbCell.getVarcharValue().toByteArray());
+        }
         else
         {
             throw new IllegalArgumentException("Unknown PB Cell encountered.");
@@ -205,14 +229,20 @@ private void initVarchar(String stringValue)
         this.varcharValue = stringValue;
     }
 
+    private void initBlob(byte[] blobValue)
+    {
+        setBitfieldType(BLOB_MASK);
+        this.blobValue = blobValue;
+    }
+
     private void setBitfieldType(int mask)
     {
         typeBitfield |= mask;
     }
 
     private boolean bitfieldHasType(int mask)
     {
-        return (typeBitfield & mask) == mask;
+        return typeBitfield == mask;
     }
 
     public boolean hasVarcharValue()
@@ -240,6 +270,11 @@ public boolean hasBoolean()
         return bitfieldHasType(BOOLEAN_MASK);
     }
 
+    public boolean hasBlob()
+    {
+        return bitfieldHasType(BLOB_MASK);
+    }
+
     public String getVarcharAsUTF8String()
     {
         return varcharValue;
@@ -270,6 +305,11 @@ public boolean getBoolean()
         return booleanValue;
     }
 
+    public byte[] getBlob()
+    {
+        return blobValue;
+    }
+
     RiakTsPB.TsCell getPbCell()
     {
         final RiakTsPB.TsCell.Builder builder = RiakTsPB.TsCell.newBuilder();
@@ -294,6 +334,10 @@ else if (hasDouble())
         {
             builder.setDoubleValue(doubleValue);
         }
+        else if(hasBlob())
+        {
+            builder.setVarcharValue(ByteString.copyFrom(blobValue));
+        }
 
         return builder.build();
     }
@@ -332,6 +376,13 @@ else if (this.hasBoolean())
         {
             sb.append(this.getBoolean());
         }
+        else if (this.hasBlob())
+        {
+            final int length = blobValue.length > 8 ? 8 : blobValue.length;
+            final byte[] blobBlurb = Arrays.copyOfRange(blobValue, 0, length);
+            sb.append("0x");
+            sb.append(DatatypeConverter.printHexBinary(blobBlurb));
+        }
 
         sb.append(" }");
         return sb.toString();
@@ -351,6 +402,10 @@ public boolean equals(Object o)
 
         Cell cell = (Cell) o;
 
+        if (typeBitfield != cell.typeBitfield)
+        {
+            return false;
+        }
         if (sint64Value != cell.sint64Value)
         {
             return false;
@@ -367,25 +422,27 @@ public boolean equals(Object o)
         {
             return false;
         }
-        if (typeBitfield != cell.typeBitfield)
+        if (varcharValue != null ? !varcharValue.equals(cell.varcharValue) : cell.varcharValue != null)
         {
             return false;
         }
-        return varcharValue.equals(cell.varcharValue);
+        return Arrays.equals(blobValue, cell.blobValue);
+
     }
 
     @Override
     public int hashCode()
     {
         int result;
         long temp;
-        result = varcharValue.hashCode();
+        result = typeBitfield;
+        result = 31 * result + (varcharValue != null ? varcharValue.hashCode() : 0);
         result = 31 * result + (int) (sint64Value ^ (sint64Value >>> 32));
         temp = Double.doubleToLongBits(doubleValue);
         result = 31 * result + (int) (temp ^ (temp >>> 32));
         result = 31 * result + (int) (timestampValue ^ (timestampValue >>> 32));
         result = 31 * result + (booleanValue ? 1 : 0);
-        result = 31 * result + typeBitfield;
+        result = 31 * result + Arrays.hashCode(blobValue);
         return result;
     }
 }
diff --git a/src/main/java/com/basho/riak/client/core/query/timeseries/ColumnDescription.java b/src/main/java/com/basho/riak/client/core/query/timeseries/ColumnDescription.java
@@ -62,7 +62,8 @@ public enum ColumnType
         SINT64,
         DOUBLE,
         TIMESTAMP,
-        BOOLEAN
+        BOOLEAN,
+        BLOB
     }
 
     @Override
+7 −0		.gitignore
+11 −0		.thumbs.yml
+14 −2		src/riak_dt.proto
+40 −3		src/riak_pb_dt_codec.erl
+17 −6		src/riak_pb_ts_codec.erl
+1 −0		src/riak_ts.proto
+78 −0		test/riak_pb_dt_codec_tests.erl
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,8 @@ public enum ColumnType @@
             SINT64,
             DOUBLE,
             TIMESTAMP,
-            BOOLEAN
+            BOOLEAN,
+            BLOB
         }
         @Override
@@ Expand Down @@