You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/10 05:21:55 UTC
[24/36] git commit: merge from master branch
merge from master branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/de488eac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/de488eac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/de488eac
Branch: refs/heads/4.0
Commit: de488eac38cb97a4e668db8ec4cf2052f69a4471
Parents: dc94419 65ac0ca
Author: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Authored: Sat Mar 8 19:05:53 2014 -0800
Committer: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Committed: Sat Mar 8 19:05:53 2014 -0800
----------------------------------------------------------------------
.../phoenix/compile/CreateSequenceCompiler.java | 16 +-
.../phoenix/compile/ExpressionCompiler.java | 24 +-
.../apache/phoenix/compile/LimitCompiler.java | 15 +-
.../phoenix/compile/ProjectionCompiler.java | 10 +-
.../apache/phoenix/compile/UpsertCompiler.java | 53 +-
.../apache/phoenix/compile/WhereOptimizer.java | 17 +-
.../coprocessor/SequenceRegionObserver.java | 2 +-
.../UngroupedAggregateRegionObserver.java | 21 +-
.../phoenix/exception/SQLExceptionCode.java | 2 +-
.../ValueTypeIncompatibleException.java | 4 +-
.../expression/ArithmeticExpression.java | 31 +
.../expression/BaseAddSubtractExpression.java | 17 +-
.../phoenix/expression/BaseExpression.java | 11 +-
.../phoenix/expression/CaseExpression.java | 7 +-
.../phoenix/expression/CoerceExpression.java | 29 +-
.../phoenix/expression/ColumnExpression.java | 26 +-
.../expression/ComparisonExpression.java | 2 +-
.../expression/DecimalAddExpression.java | 19 +-
.../expression/DecimalDivideExpression.java | 5 +-
.../expression/DecimalMultiplyExpression.java | 5 +-
.../expression/DecimalSubtractExpression.java | 19 +-
.../phoenix/expression/DivideExpression.java | 31 +-
.../phoenix/expression/LiteralExpression.java | 16 +-
.../phoenix/expression/MultiplyExpression.java | 30 +-
.../expression/RowKeyColumnExpression.java | 17 +-
.../RowValueConstructorExpression.java | 5 +-
.../expression/function/ArrayIndexFunction.java | 7 +-
.../expression/function/CoalesceFunction.java | 12 +-
.../expression/function/InvertFunction.java | 10 +-
.../expression/function/LTrimFunction.java | 12 +-
.../expression/function/MD5Function.java | 98 +-
.../expression/function/PrefixFunction.java | 5 +-
.../expression/function/RTrimFunction.java | 16 +-
.../function/RegexpSubstrFunction.java | 15 +-
.../function/RoundDateExpression.java | 17 +-
.../expression/function/SubstrFunction.java | 23 +-
.../expression/function/TrimFunction.java | 11 +-
.../hbase/index/util/KeyValueBuilder.java | 4 +-
.../apache/phoenix/index/IndexMaintainer.java | 34 +-
.../apache/phoenix/index/PhoenixIndexCodec.java | 7 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 4 -
.../phoenix/jdbc/PhoenixParameterMetaData.java | 7 +-
.../phoenix/jdbc/PhoenixResultSetMetaData.java | 8 +-
.../apache/phoenix/jdbc/PhoenixStatement.java | 4 -
.../org/apache/phoenix/parse/ColumnDef.java | 42 +-
.../phoenix/query/ConnectionQueryServices.java | 2 +-
.../query/ConnectionQueryServicesImpl.java | 50 +-
.../query/ConnectionlessQueryServicesImpl.java | 2 +-
.../query/DelegateConnectionQueryServices.java | 4 +-
.../apache/phoenix/query/QueryConstants.java | 2 +-
.../phoenix/query/QueryServicesOptions.java | 2 +-
.../apache/phoenix/schema/DelegateDatum.java | 7 +-
.../apache/phoenix/schema/MetaDataClient.java | 4 +-
.../apache/phoenix/schema/PArrayDataType.java | 39 +-
.../org/apache/phoenix/schema/PBaseColumn.java | 5 -
.../org/apache/phoenix/schema/PColumnImpl.java | 7 -
.../org/apache/phoenix/schema/PDataType.java | 1453 +++++++-----------
.../java/org/apache/phoenix/schema/PDatum.java | 5 -
.../org/apache/phoenix/schema/PTableImpl.java | 25 +-
.../phoenix/schema/RowKeyValueAccessor.java | 4 +-
.../org/apache/phoenix/schema/Sequence.java | 8 +-
.../org/apache/phoenix/schema/ValueSchema.java | 4 +-
.../java/org/apache/phoenix/util/IndexUtil.java | 7 +-
.../org/apache/phoenix/util/NumberUtil.java | 8 +-
.../org/apache/phoenix/util/SchemaUtil.java | 20 +-
.../arithmetic/ArithmeticOperationTest.java | 45 +-
.../phoenix/client/TestClientKeyValue.java | 8 +-
.../phoenix/client/TestClientKeyValueLocal.java | 6 +
.../apache/phoenix/compile/ScanRangesTest.java | 20 +-
.../phoenix/end2end/ArithmeticQueryTest.java | 22 +-
.../phoenix/end2end/ExecuteStatementsTest.java | 8 +-
.../end2end/QueryDatabaseMetaDataTest.java | 29 +-
...RangeParallelIteratorRegionSplitterTest.java | 4 -
.../end2end/UpsertSelectAutoCommitTest.java | 2 +-
.../phoenix/end2end/UpsertValuesTest.java | 88 ++
.../phoenix/end2end/VariableLengthPKTest.java | 13 +-
.../phoenix/end2end/index/MutableIndexTest.java | 1 -
.../filter/SkipScanFilterIntersectTest.java | 20 +-
.../phoenix/filter/SkipScanFilterTest.java | 21 +-
.../apache/phoenix/schema/PDataTypeTest.java | 12 +-
.../apache/phoenix/schema/SortOrderTest.java | 13 +
.../apache/phoenix/schema/ValueBitSetTest.java | 8 +-
.../apache/phoenix/util/MetaDataUtilTest.java | 34 +-
.../phoenix/util/MinVersionTestRunner.java | 64 +
.../org/apache/phoenix/util/ScanUtilTest.java | 24 +-
85 files changed, 1267 insertions(+), 1603 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
index d715591,53cb2f1..fd49689
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
@@@ -148,11 -131,9 +148,11 @@@ public class SequenceRegionObserver ext
KeyValue currentValueKV = Sequence.getCurrentValueKV(result);
KeyValue incrementByKV = Sequence.getIncrementByKV(result);
KeyValue cacheSizeKV = Sequence.getCacheSizeKV(result);
- long value = PDataType.LONG.getCodec().decodeLong(currentValueKV.getBuffer(), currentValueKV.getValueOffset(), SortOrder.getDefault());
- long incrementBy = PDataType.LONG.getCodec().decodeLong(incrementByKV.getBuffer(), incrementByKV.getValueOffset(), SortOrder.getDefault());
- long cacheSize = PDataType.LONG.getCodec().decodeLong(cacheSizeKV.getBuffer(), cacheSizeKV.getValueOffset(), SortOrder.getDefault());
+
+ long value = PDataType.LONG.getCodec().decodeLong(currentValueKV.getValueArray(), currentValueKV.getValueOffset(), SortOrder.getDefault());
+ long incrementBy = PDataType.LONG.getCodec().decodeLong(incrementByKV.getValueArray(), incrementByKV.getValueOffset(), SortOrder.getDefault());
- int cacheSize = PDataType.INTEGER.getCodec().decodeInt(cacheSizeKV.getValueArray(), cacheSizeKV.getValueOffset(), SortOrder.getDefault());
++ int cacheSize = PDataType.LONG.getCodec().decodeInt(cacheSizeKV.getValueArray(), cacheSizeKV.getValueOffset(), SortOrder.getDefault());
+
value += incrementBy * cacheSize;
byte[] valueBuffer = new byte[PDataType.LONG.getByteSize()];
PDataType.LONG.getCodec().encodeLong(value, valueBuffer, 0);
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/KeyValueBuilder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/schema/PColumnImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
index c62edc4,4fc985a..65bebf6
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
@@@ -309,9 -308,9 +309,9 @@@ public class Sequence
KeyValue incrementByKV = getIncrementByKV(r);
KeyValue cacheSizeKV = getCacheSizeKV(r);
timestamp = currentValueKV.getTimestamp();
- nextValue = PDataType.LONG.getCodec().decodeLong(currentValueKV.getBuffer(), currentValueKV.getValueOffset(), SortOrder.getDefault());
- incrementBy = PDataType.LONG.getCodec().decodeLong(incrementByKV.getBuffer(), incrementByKV.getValueOffset(), SortOrder.getDefault());
- cacheSize = PDataType.LONG.getCodec().decodeLong(cacheSizeKV.getBuffer(), cacheSizeKV.getValueOffset(), SortOrder.getDefault());
+ nextValue = PDataType.LONG.getCodec().decodeLong(currentValueKV.getValueArray(), currentValueKV.getValueOffset(), SortOrder.getDefault());
+ incrementBy = PDataType.LONG.getCodec().decodeLong(incrementByKV.getValueArray(), incrementByKV.getValueOffset(), SortOrder.getDefault());
- cacheSize = PDataType.INTEGER.getCodec().decodeInt(cacheSizeKV.getValueArray(), cacheSizeKV.getValueOffset(), SortOrder.getDefault());
++ cacheSize = PDataType.LONG.getCodec().decodeLong(cacheSizeKV.getValueArray(), cacheSizeKV.getValueOffset(), SortOrder.getDefault());
currentValue = nextValue - incrementBy * cacheSize;
}
}
@@@ -350,14 -349,14 +350,14 @@@
if (timestamp != HConstants.LATEST_TIMESTAMP) {
append.setAttribute(SequenceRegionObserver.MAX_TIMERANGE_ATTRIB, Bytes.toBytes(timestamp));
}
- Map<byte[], List<KeyValue>> familyMap = append.getFamilyMap();
+ Map<byte[], List<Cell>> familyMap = append.getFamilyCellMap();
byte[] startWithBuf = PDataType.LONG.toBytes(startWith);
- familyMap.put(PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, Arrays.<KeyValue>asList(
- KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, QueryConstants.EMPTY_COLUMN_BYTES, timestamp, ByteUtil.EMPTY_BYTE_ARRAY),
- KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.CURRENT_VALUE_BYTES, timestamp, startWithBuf),
- KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.START_WITH_BYTES, timestamp, startWithBuf),
- KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.INCREMENT_BY_BYTES, timestamp, PDataType.LONG.toBytes(incrementBy)),
- KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.CACHE_SIZE_BYTES, timestamp, PDataType.LONG.toBytes(cacheSize))
+ familyMap.put(PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, Arrays.<Cell>asList(
+ (Cell)KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, QueryConstants.EMPTY_COLUMN_BYTES, timestamp, ByteUtil.EMPTY_BYTE_ARRAY),
+ (Cell)KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.CURRENT_VALUE_BYTES, timestamp, startWithBuf),
+ (Cell)KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.START_WITH_BYTES, timestamp, startWithBuf),
+ (Cell)KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.INCREMENT_BY_BYTES, timestamp, PDataType.LONG.toBytes(incrementBy)),
- (Cell)KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.CACHE_SIZE_BYTES, timestamp, PDataType.INTEGER.toBytes(cacheSize))
++ (Cell)KeyValueUtil.newKeyValue(key, PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, PhoenixDatabaseMetaData.CACHE_SIZE_BYTES, timestamp, PDataType.LONG.toBytes(cacheSize))
));
return append;
}
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/test/java/org/apache/phoenix/client/TestClientKeyValueLocal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/test/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/de488eac/phoenix-core/src/test/java/org/apache/phoenix/filter/SkipScanFilterTest.java
----------------------------------------------------------------------