You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ch...@apache.org on 2019/03/06 20:01:20 UTC
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5122: PHOENIX-4322
breaks client backward compatibility
This is an automated email from the ASF dual-hosted git repository.
chinmayskulkarni pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
new 0780b84 PHOENIX-5122: PHOENIX-4322 breaks client backward compatibility
0780b84 is described below
commit 0780b8436d856c0778cff13f92c0f1f3de33af15
Author: Jacob Isaac <ja...@gmail.com>
AuthorDate: Wed Feb 27 14:11:55 2019 -0800
PHOENIX-5122: PHOENIX-4322 breaks client backward compatibility
Signed-off-by: Chinmay Kulkarni <ch...@gmail.com>
---
.../expression/RowValueConstructorExpression.java | 53 +++++++++++++++++++---
1 file changed, 47 insertions(+), 6 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
index 9bb7234..c06bdc8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
@@ -28,6 +28,7 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Arrays;
+import java.util.BitSet;
import java.util.List;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
@@ -47,13 +48,42 @@ public class RowValueConstructorExpression extends BaseCompoundExpression {
private int partialEvalIndex = -1;
private int estimatedByteSize;
+ // The boolean field that indicated the object is a literal constant,
+ // has been repurposed to a bitset and now holds additional information.
+ // This is to facilitate b/w compat to 4.13 clients.
+ // @see <a href="https://issues.apache.org/jira/browse/PHOENIX-5122">PHOENIX-5122</a>
+ private BitSet extraFields;
+
+ // Important : When you want to add new bits make sure to add those towards the end,
+ // else will break b/w compat again.
+ private enum ExtraFieldPosition {
+
+ LITERAL_CONSTANT(0),
+ STRIP_TRAILING_SEPARATOR_BYTE(1);
+
+ private int bitPosition;
+
+ private ExtraFieldPosition(int position) {
+ bitPosition = position;
+ }
+
+ private int getBitPosition() {
+ return bitPosition;
+ }
+ }
+
public RowValueConstructorExpression() {
}
public RowValueConstructorExpression(List<Expression> children, boolean isConstant) {
super(children);
+ extraFields = new BitSet(8);
+ extraFields.set(ExtraFieldPosition.STRIP_TRAILING_SEPARATOR_BYTE.getBitPosition());
+ if (isConstant) {
+ extraFields.set(ExtraFieldPosition.LITERAL_CONSTANT.getBitPosition());
+ }
estimatedByteSize = 0;
- init(isConstant);
+ init();
}
public RowValueConstructorExpression clone(List<Expression> children) {
@@ -82,24 +112,34 @@ public class RowValueConstructorExpression extends BaseCompoundExpression {
@Override
public void readFields(DataInput input) throws IOException {
super.readFields(input);
- init(input.readBoolean());
+ extraFields = BitSet.valueOf(new byte[] {input.readByte()});
+ init();
}
@Override
public void write(DataOutput output) throws IOException {
super.write(output);
- output.writeBoolean(literalExprPtr != null);
+ byte[] b = extraFields.toByteArray();
+ output.writeByte((int)(b.length > 0 ? b[0] & 0xff : 0));
}
- private void init(boolean isConstant) {
+ private void init() {
this.ptrs = new ImmutableBytesWritable[children.size()];
- if(isConstant) {
+ if (isConstant()) {
ImmutableBytesWritable ptr = new ImmutableBytesWritable();
this.evaluate(null, ptr);
literalExprPtr = ptr;
}
}
+ private boolean isConstant() {
+ return extraFields.get(ExtraFieldPosition.LITERAL_CONSTANT.getBitPosition());
+ }
+
+ private boolean isStripTrailingSepByte() {
+ return extraFields.get(ExtraFieldPosition.STRIP_TRAILING_SEPARATOR_BYTE.getBitPosition());
+ }
+
@Override
public PDataType getDataType() {
return PVarbinary.INSTANCE;
@@ -200,7 +240,8 @@ public class RowValueConstructorExpression extends BaseCompoundExpression {
for (int k = expressionCount -1 ;
k >=0 && getChildren().get(k).getDataType() != null
&& !getChildren().get(k).getDataType().isFixedWidth()
- && outputBytes[outputSize-1] == SchemaUtil.getSeparatorByte(true, false, getChildren().get(k)) ; k--) {
+ && outputBytes[outputSize-1] == SchemaUtil.getSeparatorByte(true, false, getChildren().get(k))
+ && isStripTrailingSepByte() ; k--) {
outputSize--;
}
ptr.set(outputBytes, 0, outputSize);