Github user JamesRTaylor commented on a diff in the pull request:
https://github.com/apache/incubator-phoenix/pull/8#discussion_r10001394
--- Diff:
phoenix-core/src/main/java/org/apache/phoenix/schema/PArrayDataType.java ---
@@ -289,75 +462,105 @@ private Object createPhoenixArray(byte[] bytes, int
offset, int length,
}
Object[] elements = (Object[])
java.lang.reflect.Array.newInstance(
baseDataType.getJavaClass(), noOfElements);
- if (!baseDataType.isFixedWidth() ||
baseDataType.isCoercibleTo(PDataType.VARCHAR)) {
- int indexOffset = buffer.getInt();
- int valArrayPostion = buffer.position();
- buffer.position(indexOffset + initPos);
- ByteBuffer indexArr = ByteBuffer
- .allocate(initOffsetArray(noOfElements,
baseSize));
- byte[] array = indexArr.array();
- buffer.get(array);
- int countOfElementsRead = 0;
- int i = 0;
- int currOff = -1;
- int nextOff = -1;
- if (noOfElements > 1) {
- while (indexArr.hasRemaining()) {
- if (countOfElementsRead < noOfElements)
{
- if (currOff == -1) {
- if
((indexArr.position() + 2 * baseSize) <= indexArr
-
.capacity()) {
- if (useShort) {
- currOff
= indexArr.getShort() + Short.MAX_VALUE;
- nextOff
= indexArr.getShort() + Short.MAX_VALUE;
- } else {
- currOff
= indexArr.getInt();
- nextOff
= indexArr.getInt();
- }
-
countOfElementsRead += 2;
- }
- } else {
- currOff = nextOff;
- if(useShort) {
- nextOff =
indexArr.getShort() + Short.MAX_VALUE;
- } else {
- nextOff =
indexArr.getInt();
- }
- countOfElementsRead +=
1;
- }
- int elementLength = nextOff -
currOff;
- buffer.position(currOff +
initPos);
- byte[] val = new
byte[elementLength];
- buffer.get(val);
- elements[i++] =
baseDataType.toObject(val,
- sortOrder);
- }
- }
- buffer.position(nextOff + initPos);
- byte[] val = new byte[indexOffset - nextOff];
- buffer.get(val);
- elements[i++] = baseDataType.toObject(val,
sortOrder);
- } else {
- byte[] val = new byte[indexOffset -
valArrayPostion];
- buffer.position(valArrayPostion + initPos);
- buffer.get(val);
- elements[i++] = baseDataType.toObject(val,
sortOrder);
- }
- } else {
- for (int i = 0; i < noOfElements; i++) {
- byte[] val;
- if (baseDataType.getByteSize() == null) {
- val = new byte[length];
- } else {
- val = new
byte[baseDataType.getByteSize()];
- }
- buffer.get(val);
- elements[i] = baseDataType.toObject(val,
sortOrder);
- }
- }
- return PArrayDataType
- .instantiatePhoenixArray(baseDataType,
elements);
- }
+ if (!baseDataType.isFixedWidth() ||
baseDataType.isCoercibleTo(PDataType.VARCHAR)) {
--- End diff --
This code looks pretty similar to positionAtArrayElement. Maybe some
refactoring is in order (after we get this change in perhaps)?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
