You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/06/04 02:44:08 UTC
[04/29] incubator-asterixdb git commit: Supports Left Outer Join and
Left Outer Unnest in SQL++.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/ARecordVisitablePointable.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/ARecordVisitablePointable.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/ARecordVisitablePointable.java
index ca4a5be..68fff2f 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/ARecordVisitablePointable.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/ARecordVisitablePointable.java
@@ -57,9 +57,9 @@ public class ARecordVisitablePointable extends AbstractVisitablePointable {
};
// access results: field names, field types, and field values
- private final List<IVisitablePointable> fieldNames = new ArrayList<IVisitablePointable>();
- private final List<IVisitablePointable> fieldTypeTags = new ArrayList<IVisitablePointable>();
- private final List<IVisitablePointable> fieldValues = new ArrayList<IVisitablePointable>();
+ private final List<IVisitablePointable> fieldNames = new ArrayList<>();
+ private final List<IVisitablePointable> fieldTypeTags = new ArrayList<>();
+ private final List<IVisitablePointable> fieldValues = new ArrayList<>();
// pointable allocator
private final PointableAllocator allocator = new PointableAllocator();
@@ -76,6 +76,7 @@ public class ARecordVisitablePointable extends AbstractVisitablePointable {
private final int numberOfSchemaFields;
private final int[] fieldOffsets;
private final IVisitablePointable nullReference = AFlatValuePointable.FACTORY.create(null);
+ private final IVisitablePointable missingReference = AFlatValuePointable.FACTORY.create(null);
private int closedPartTypeInfoSize = 0;
private int offsetArrayOffset;
@@ -127,6 +128,12 @@ public class ARecordVisitablePointable extends AbstractVisitablePointable {
typeDos.writeByte(ATypeTag.SERIALIZED_NULL_TYPE_TAG);
int nullFieldEnd = typeBos.size();
nullReference.set(typeBos.getByteArray(), nullFieldStart, nullFieldEnd - nullFieldStart);
+
+ // initialize a constant: missing value bytes reference
+ int missingFieldStart = typeBos.size();
+ typeDos.writeByte(ATypeTag.SERIALIZED_MISSING_TYPE_TAG);
+ int missingFieldEnd = typeBos.size();
+ missingReference.set(typeBos.getByteArray(), missingFieldStart, missingFieldEnd - missingFieldStart);
} catch (IOException e) {
throw new IllegalStateException(e);
}
@@ -181,11 +188,11 @@ public class ARecordVisitablePointable extends AbstractVisitablePointable {
if (numberOfSchemaFields > 0) {
s += 4;
int nullBitMapOffset = 0;
- boolean hasNullableFields = NonTaggedFormatUtil.hasNullableField(inputRecType);
- if (hasNullableFields) {
+ boolean hasOptionalFields = NonTaggedFormatUtil.hasOptionalField(inputRecType);
+ if (hasOptionalFields) {
nullBitMapOffset = s;
- offsetArrayOffset = s + (this.numberOfSchemaFields % 8 == 0 ? numberOfSchemaFields / 8
- : numberOfSchemaFields / 8 + 1);
+ offsetArrayOffset = s + (this.numberOfSchemaFields % 4 == 0 ? numberOfSchemaFields / 4
+ : numberOfSchemaFields / 4 + 1);
} else {
offsetArrayOffset = s;
}
@@ -194,14 +201,20 @@ public class ARecordVisitablePointable extends AbstractVisitablePointable {
offsetArrayOffset += 4;
}
for (int fieldNumber = 0; fieldNumber < numberOfSchemaFields; fieldNumber++) {
- if (hasNullableFields) {
- byte b1 = b[nullBitMapOffset + fieldNumber / 8];
- int p = 1 << (7 - (fieldNumber % 8));
+ if (hasOptionalFields) {
+ byte b1 = b[nullBitMapOffset + fieldNumber / 4];
+ int p = 1 << (7 - 2 * (fieldNumber % 4));
if ((b1 & p) == 0) {
// set null value (including type tag inside)
fieldValues.add(nullReference);
continue;
}
+ p = 1 << (7 - 2 * (fieldNumber % 4) - 1);
+ if ((b1 & p) == 0) {
+ // set missing value (including type tag inside)
+ fieldValues.add(missingReference);
+ continue;
+ }
}
IAType[] fieldTypes = inputRecType.getFieldTypes();
int fieldValueLength = 0;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ACastVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ACastVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ACastVisitor.java
index be00153..b551c88 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ACastVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ACastVisitor.java
@@ -52,8 +52,8 @@ import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
*/
public class ACastVisitor implements IVisitablePointableVisitor<Void, Triple<IVisitablePointable, IAType, Boolean>> {
- private final Map<IVisitablePointable, ARecordCaster> raccessorToCaster = new HashMap<IVisitablePointable, ARecordCaster>();
- private final Map<IVisitablePointable, AListCaster> laccessorToCaster = new HashMap<IVisitablePointable, AListCaster>();
+ private final Map<IVisitablePointable, ARecordCaster> raccessorToCaster = new HashMap<>();
+ private final Map<IVisitablePointable, AListCaster> laccessorToCaster = new HashMap<>();
private final ArrayBackedValueStorage castBuffer = new ArrayBackedValueStorage();
@Override
@@ -126,13 +126,7 @@ public class ACastVisitor implements IVisitablePointableVisitor<Void, Triple<IVi
}
private boolean needPromote(ATypeTag tag0, ATypeTag tag1) {
- if (tag0 == tag1) {
- return false;
- }
- if (tag0 == ATypeTag.NULL) {
- return false;
- }
- return true;
+ return !(tag0 == tag1 || tag0 == ATypeTag.NULL || tag0 == ATypeTag.MISSING);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/AListCaster.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/AListCaster.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/AListCaster.java
index 4a7f689..5dee990 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/AListCaster.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/AListCaster.java
@@ -31,9 +31,7 @@ import org.apache.asterix.om.pointables.AListVisitablePointable;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
-import org.apache.asterix.om.types.AOrderedListType;
import org.apache.asterix.om.types.ATypeTag;
-import org.apache.asterix.om.types.AUnorderedListType;
import org.apache.asterix.om.types.AbstractCollectionType;
import org.apache.asterix.om.types.EnumDeserializer;
import org.apache.asterix.om.types.IAType;
@@ -50,8 +48,8 @@ class AListCaster {
// for storing the cast result
private final IVisitablePointable itemTempReference = allocator.allocateEmpty();
- private final Triple<IVisitablePointable, IAType, Boolean> itemVisitorArg = new Triple<IVisitablePointable, IAType, Boolean>(
- itemTempReference, null, null);
+ private final Triple<IVisitablePointable, IAType, Boolean> itemVisitorArg = new Triple<>(itemTempReference, null,
+ null);
private final UnorderedListBuilder unOrderedListBuilder = new UnorderedListBuilder();
private final OrderedListBuilder orderedListBuilder = new OrderedListBuilder();
@@ -60,18 +58,14 @@ class AListCaster {
private final DataOutput dataDos = new DataOutputStream(dataBos);
private IAType reqItemType;
- public AListCaster() {
-
- }
-
public void castList(AListVisitablePointable listAccessor, IVisitablePointable resultAccessor,
AbstractCollectionType reqType, ACastVisitor visitor) throws IOException, AsterixException {
if (reqType.getTypeTag().equals(ATypeTag.UNORDEREDLIST)) {
- unOrderedListBuilder.reset((AUnorderedListType) reqType);
+ unOrderedListBuilder.reset(reqType);
reqItemType = reqType.getItemType();
}
if (reqType.getTypeTag().equals(ATypeTag.ORDEREDLIST)) {
- orderedListBuilder.reset((AOrderedListType) reqType);
+ orderedListBuilder.reset(reqType);
reqItemType = reqType.getItemType();
}
dataBos.reset();
@@ -83,8 +77,8 @@ class AListCaster {
for (int i = 0; i < items.size(); i++) {
IVisitablePointable itemTypeTag = itemTags.get(i);
IVisitablePointable item = items.get(i);
- ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(itemTypeTag.getByteArray()[itemTypeTag
- .getStartOffset()]);
+ ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER
+ .deserialize(itemTypeTag.getByteArray()[itemTypeTag.getStartOffset()]);
if (reqItemType == null || reqItemType.getTypeTag().equals(ATypeTag.ANY)) {
itemVisitorArg.second = DefaultOpenFieldType.getDefaultOpenFieldType(typeTag);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
index 960d7ea..d213046 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
@@ -29,7 +29,6 @@ import java.util.List;
import org.apache.asterix.builders.RecordBuilder;
import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.common.exceptions.TypeException;
import org.apache.asterix.om.pointables.ARecordVisitablePointable;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
@@ -63,15 +62,14 @@ class ARecordCaster {
// pointable allocator
private final PointableAllocator allocator = new PointableAllocator();
- private final List<IVisitablePointable> reqFieldNames = new ArrayList<IVisitablePointable>();
- private final List<IVisitablePointable> reqFieldTypeTags = new ArrayList<IVisitablePointable>();
+ private final List<IVisitablePointable> reqFieldNames = new ArrayList<>();
+ private final List<IVisitablePointable> reqFieldTypeTags = new ArrayList<>();
private ARecordType cachedReqType = null;
private final ResettableByteArrayOutputStream bos = new ResettableByteArrayOutputStream();
private final DataOutputStream dos = new DataOutputStream(bos);
private final RecordBuilder recBuilder = new RecordBuilder();
- private final IVisitablePointable nullReference = allocator.allocateEmpty();
private final IVisitablePointable nullTypeTag = allocator.allocateEmpty();
private final IVisitablePointable missingTypeTag = allocator.allocateEmpty();
@@ -82,8 +80,8 @@ class ARecordCaster {
private final DataOutputStream outputDos = new DataOutputStream(outputBos);
private final IVisitablePointable fieldTempReference = allocator.allocateEmpty();
- private final Triple<IVisitablePointable, IAType, Boolean> nestedVisitorArg = new Triple<IVisitablePointable, IAType, Boolean>(
- fieldTempReference, null, null);
+ private final Triple<IVisitablePointable, IAType, Boolean> nestedVisitorArg = new Triple<>(fieldTempReference, null,
+ null);
private int numInputFields = 0;
@@ -102,15 +100,11 @@ class ARecordCaster {
try {
bos.reset();
int start = bos.size();
- dos.writeByte(ATypeTag.SERIALIZED_NULL_TYPE_TAG);
+ dos.writeByte(ATypeTag.SERIALIZED_MISSING_TYPE_TAG);
int end = bos.size();
- nullReference.set(bos.getByteArray(), start, end - start);
- start = bos.size();
- dos.write(ATypeTag.SERIALIZED_MISSING_TYPE_TAG);
- end = bos.size();
missingTypeTag.set(bos.getByteArray(), start, end - start);
start = bos.size();
- dos.write(ATypeTag.SERIALIZED_NULL_TYPE_TAG);
+ dos.writeByte(ATypeTag.SERIALIZED_NULL_TYPE_TAG);
end = bos.size();
nullTypeTag.set(bos.getByteArray(), start, end - start);
} catch (IOException e) {
@@ -119,7 +113,7 @@ class ARecordCaster {
}
public void castRecord(ARecordVisitablePointable recordAccessor, IVisitablePointable resultAccessor,
- ARecordType reqType, ACastVisitor visitor) throws IOException, TypeException {
+ ARecordType reqType, ACastVisitor visitor) throws IOException {
List<IVisitablePointable> fieldNames = recordAccessor.getFieldNames();
List<IVisitablePointable> fieldTypeTags = recordAccessor.getFieldTypeTags();
List<IVisitablePointable> fieldValues = recordAccessor.getFieldValues();
@@ -140,7 +134,7 @@ class ARecordCaster {
writeOutput(fieldNames, fieldTypeTags, fieldValues, outputDos, visitor);
resultAccessor.set(outputBos.getByteArray(), 0, outputBos.size());
} catch (AsterixException e) {
- throw new TypeException("Unable to cast record to " + reqType.getTypeName(), e);
+ throw new HyracksDataException("Unable to cast record to " + reqType.getTypeName(), e);
}
}
@@ -191,7 +185,7 @@ class ARecordCaster {
// add type name pointable (including a string type tag)
int nameStart = bos.size();
- dos.write(ATypeTag.STRING.serialize());
+ dos.writeByte(ATypeTag.SERIALIZED_STRING_TYPE_TAG);
utf8Writer.writeUTF8(fname, dos);
int nameEnd = bos.size();
IVisitablePointable typeNamePointable = allocator.allocateEmpty();
@@ -252,13 +246,13 @@ class ARecordCaster {
// check unmatched fields in the input type
for (int i = 0; i < openFields.length; i++) {
- if (openFields[i] == true && !cachedReqType.isOpen()) {
+ if (openFields[i] && !cachedReqType.isOpen()) {
//print the field name
IVisitablePointable fieldName = fieldNames.get(i);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(bos);
+ ByteArrayOutputStream fieldBos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(fieldBos);
APrintVisitor printVisitor = new APrintVisitor();
- Pair<PrintStream, ATypeTag> visitorArg = new Pair<PrintStream, ATypeTag>(ps, ATypeTag.STRING);
+ Pair<PrintStream, ATypeTag> visitorArg = new Pair<>(ps, ATypeTag.STRING);
fieldName.accept(printVisitor, visitorArg);
//print the colon
@@ -271,7 +265,7 @@ class ARecordCaster {
ps.print(typeTag);
//collect the output message
- byte[] output = bos.toByteArray();
+ byte[] output = fieldBos.toByteArray();
//throw the exception
throw new IllegalStateException("type mismatch: including an extra field " + new String(output));
@@ -301,16 +295,18 @@ class ARecordCaster {
// write the closed part
for (int i = 0; i < fieldPermutation.length; i++) {
final int pos = fieldPermutation[i];
- final IVisitablePointable field = pos >= 0 ? fieldValues.get(pos) : nullReference;
+ final IVisitablePointable field = pos >= 0 ? fieldValues.get(pos) : missingTypeTag;
final IAType fType = cachedReqType.getFieldTypes()[i];
nestedVisitorArg.second = fType;
// recursively casting, the result of casting can always be thought
// as flat
if (optionalFields[i]) {
- if (pos == -1 || fieldTypeTags.get(pos) == null || fieldTypeTags.get(pos).equals(nullTypeTag)
- || fieldTypeTags.get(pos).equals(missingTypeTag)) {
- //the field is optional in the input record
+ //the field is optional in the input record
+ IVisitablePointable fieldTypeTag = pos >= 0 ? fieldTypeTags.get(pos) : null;
+ if (fieldTypeTag == null || fieldTypeTag.equals(missingTypeTag)) {
+ nestedVisitorArg.second = BuiltinType.AMISSING;
+ } else if (fieldTypeTag.equals(nullTypeTag)) {
nestedVisitorArg.second = BuiltinType.ANULL;
} else {
nestedVisitorArg.second = ((AUnionType) fType).getActualType();
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java
index 257914c..08cde54 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java
@@ -49,7 +49,7 @@ import org.apache.hyracks.util.string.UTF8StringWriter;
* byte isExpanded;
* int openOffset?;
* int numberOfClosedFields;
- * byte[ceil (numberOfFields / 8)] nullBitMap; // 1 bit per field, "1" means field is Null for this record
+ * byte[ceil (numberOfFields / 4)] nullBitMap; // 1 bit per field, "1" means field is Null for this record
* int[numberOfClosedFields] closedFieldOffset;
* IPointable[numberOfClosedFields] fieldValue;
* int numberOfOpenFields?;
@@ -69,6 +69,8 @@ import org.apache.hyracks.util.string.UTF8StringWriter;
*/
public class ARecordPointable extends AbstractPointable {
+ private final UTF8StringWriter utf8Writer = new UTF8StringWriter();
+
public static final ITypeTraits TYPE_TRAITS = new ITypeTraits() {
private static final long serialVersionUID = 1L;
@@ -119,8 +121,6 @@ public class ARecordPointable extends AbstractPointable {
return recordType == null || recordType.isOpen();
}
- private final UTF8StringWriter utf8Writer = new UTF8StringWriter();
-
public int getSchemeFieldCount(ARecordType recordType) {
return recordType.getFieldNames().length;
}
@@ -152,25 +152,25 @@ public class ARecordPointable extends AbstractPointable {
public boolean isExpanded(ARecordType recordType) {
if (isOpen(recordType)) {
- return BooleanPointable.getBoolean(bytes, getExpendedOffset(recordType));
+ return BooleanPointable.getBoolean(bytes, getExpandedOffset(recordType));
}
return false;
}
- public int getExpendedOffset(ARecordType recordType) {
+ public int getExpandedOffset(ARecordType recordType) {
return getLengthOffset() + getLengthSize();
}
public int getExpandedSize(ARecordType recordType) {
- return (isOpen(recordType)) ? EXPANDED_SIZE : 0;
+ return isOpen(recordType) ? EXPANDED_SIZE : 0;
}
public int getOpenPartOffset(ARecordType recordType) {
- return getExpendedOffset(recordType) + getExpandedSize(recordType);
+ return getExpandedOffset(recordType) + getExpandedSize(recordType);
}
public int getOpenPartSize(ARecordType recordType) {
- return (isExpanded(recordType)) ? OPEN_OFFSET_SIZE : 0;
+ return isExpanded(recordType) ? OPEN_OFFSET_SIZE : 0;
}
public int getClosedFieldCount(ARecordType recordType) {
@@ -195,7 +195,14 @@ public class ARecordPointable extends AbstractPointable {
public boolean isClosedFieldNull(ARecordType recordType, int fieldId) {
if (getNullBitmapSize(recordType) > 0) {
- return ((bytes[getNullBitmapOffset(recordType) + fieldId / 8] & (1 << (7 - (fieldId % 8)))) == 0);
+ return (bytes[getNullBitmapOffset(recordType) + fieldId / 4] & (1 << (7 - 2 * (fieldId % 4)))) == 0;
+ }
+ return false;
+ }
+
+ public boolean isClosedFieldMissing(ARecordType recordType, int fieldId) {
+ if (getNullBitmapSize(recordType) > 0) {
+ return (bytes[getNullBitmapOffset(recordType) + fieldId / 4] & (1 << (7 - 2 * (fieldId % 4) - 1))) == 0;
}
return false;
}
@@ -208,6 +215,8 @@ public class ARecordPointable extends AbstractPointable {
throws IOException, AsterixException {
if (isClosedFieldNull(recordType, fieldId)) {
dOut.writeByte(ATypeTag.SERIALIZED_NULL_TYPE_TAG);
+ } else if (isClosedFieldMissing(recordType, fieldId)) {
+ dOut.writeByte(ATypeTag.SERIALIZED_MISSING_TYPE_TAG);
} else {
dOut.write(getClosedFieldTag(recordType, fieldId));
dOut.write(bytes, getClosedFieldOffset(recordType, fieldId), getClosedFieldSize(recordType, fieldId));
@@ -258,7 +267,7 @@ public class ARecordPointable extends AbstractPointable {
}
public int getOpenFieldCountSize(ARecordType recordType) {
- return (isExpanded(recordType)) ? OPEN_COUNT_SIZE : 0;
+ return isExpanded(recordType) ? OPEN_COUNT_SIZE : 0;
}
public int getOpenFieldCountOffset(ARecordType recordType) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java
index cfcd8b7..1a91d8b 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java
@@ -53,43 +53,47 @@ public class ARecordPrinter {
public void printRecord(ARecordVisitablePointable recordAccessor, PrintStream ps, IPrintVisitor visitor)
throws IOException, AsterixException {
List<IVisitablePointable> fieldNames = recordAccessor.getFieldNames();
- List<IVisitablePointable> fieldTags = recordAccessor.getFieldTypeTags();
List<IVisitablePointable> fieldValues = recordAccessor.getFieldValues();
nameVisitorArg.first = ps;
itemVisitorArg.first = ps;
ps.print(startRecord);
-
- // print field 0 to n-2
final int size = fieldNames.size();
- for (int i = 0; i < size - 1; i++) {
- printField(ps, visitor, fieldNames, fieldTags, fieldValues, i);
- ps.print(fieldSeparator);
- }
+ IVisitablePointable fieldValue = size > 0 ? fieldValues.get(0) : null;
+ ATypeTag typeTag = fieldValue != null ? EnumDeserializer.ATYPETAGDESERIALIZER
+ .deserialize(fieldValue.getByteArray()[fieldValue.getStartOffset()]) : null;
+ for (int i = 0; i < size; ++i) {
+ IVisitablePointable fieldName = fieldNames.get(i);
- // print field n-1
- if (size > 0) {
- printField(ps, visitor, fieldNames, fieldTags, fieldValues, size - 1);
- }
+ // Prints the current field.
+ if (typeTag != ATypeTag.MISSING) {
+ printField(ps, visitor, fieldName, fieldValue, typeTag);
+ }
+ // Prints the field separator.
+ if (i < size - 1) {
+ fieldValue = fieldValues.get(i + 1);
+ ATypeTag nextTypeTag = EnumDeserializer.ATYPETAGDESERIALIZER
+ .deserialize(fieldValue.getByteArray()[fieldValue.getStartOffset()]);
+ if (!(i == 0 && typeTag == ATypeTag.MISSING) && nextTypeTag != ATypeTag.MISSING) {
+ ps.print(fieldSeparator);
+ }
+ typeTag = nextTypeTag;
+ }
+ }
ps.print(endRecord);
}
- private void printField(PrintStream ps, IPrintVisitor visitor, List<IVisitablePointable> fieldNames,
- List<IVisitablePointable> fieldTags, List<IVisitablePointable> fieldValues, int i) throws AsterixException {
- IVisitablePointable itemTypeTag = fieldTags.get(i);
- IVisitablePointable item = fieldValues.get(i);
- ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER
- .deserialize(itemTypeTag.getByteArray()[itemTypeTag.getStartOffset()]);
- itemVisitorArg.second = item.getLength() <= 1 ? ATypeTag.NULL : typeTag;
-
+ private void printField(PrintStream ps, IPrintVisitor visitor, IVisitablePointable fieldName,
+ IVisitablePointable fieldValue, ATypeTag fieldTypeTag) throws AsterixException {
+ itemVisitorArg.second = fieldTypeTag;
if (fieldNameSeparator != null) {
// print field name
- fieldNames.get(i).accept(visitor, nameVisitorArg);
+ fieldName.accept(visitor, nameVisitorArg);
ps.print(fieldNameSeparator);
}
// print field value
- item.accept(visitor, itemVisitorArg);
+ fieldValue.accept(visitor, itemVisitorArg);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/AbstractResultTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/AbstractResultTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/AbstractResultTypeComputer.java
index f3e0472..fb83091 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/AbstractResultTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/AbstractResultTypeComputer.java
@@ -37,7 +37,7 @@ public abstract class AbstractResultTypeComputer implements IResultTypeComputer
public IAType computeType(ILogicalExpression expression, IVariableTypeEnvironment env,
IMetadataProvider<?, ?> metadataProvider) throws AlgebricksException {
return TypeComputeUtils.resolveResultType(expression, env, (index, type) -> checkArgType(index, type),
- types -> getResultType(types), true);
+ this::getResultType, true);
}
/**
@@ -56,9 +56,13 @@ public abstract class AbstractResultTypeComputer implements IResultTypeComputer
/**
* Returns the result type without considering optional types.
*
+ * @param expr
+ * the expression under consideration.
* @param strippedInputTypes,
* the stripped input types.
* @return the result type without considering optional types.
+ * @throws AlgebricksException
*/
- protected abstract IAType getResultType(IAType... strippedInputTypes);
+ protected abstract IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes)
+ throws AlgebricksException;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABinaryTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABinaryTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABinaryTypeComputer.java
index 7f47961..9332633 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABinaryTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABinaryTypeComputer.java
@@ -22,6 +22,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ABinaryTypeComputer extends AbstractResultTypeComputer {
public static final ABinaryTypeComputer INSTANCE = new ABinaryTypeComputer();
@@ -31,7 +33,7 @@ public class ABinaryTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ABINARY;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABooleanTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABooleanTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABooleanTypeComputer.java
index 89ffd4c..2a054bf 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABooleanTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ABooleanTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ABooleanTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ABooleanTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ABOOLEAN;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ACircleTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ACircleTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ACircleTypeComputer.java
index e81d2f4..591fdb6 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ACircleTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ACircleTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ACircleTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ACircleTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ACIRCLE;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTimeTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTimeTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTimeTypeComputer.java
index 2f4d0d1..2e2667a 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTimeTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTimeTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ADateTimeTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ADateTimeTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ADATETIME;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTypeComputer.java
index dd892cd..5ac7613 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADateTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ADateTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ADateTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ADATE;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADayTimeDurationTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADayTimeDurationTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADayTimeDurationTypeComputer.java
index 6139b0d..b8cc9b4 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADayTimeDurationTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADayTimeDurationTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ADayTimeDurationTypeComputer extends AbstractResultTypeComputer {
@@ -31,7 +33,7 @@ public class ADayTimeDurationTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ADAYTIMEDURATION;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADoubleTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADoubleTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADoubleTypeComputer.java
index eb3de27..ec415e8 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADoubleTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADoubleTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ADoubleTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ADoubleTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ADOUBLE;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADurationTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADurationTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADurationTypeComputer.java
index 9021284..4f23ed0 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADurationTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ADurationTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ADurationTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ADurationTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ADURATION;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AFloatTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AFloatTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AFloatTypeComputer.java
index d2fd672..77c01e1 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AFloatTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AFloatTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AFloatTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class AFloatTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AFLOAT;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt16TypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt16TypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt16TypeComputer.java
index ed9d785..1fbc603 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt16TypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt16TypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AInt16TypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class AInt16TypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AINT16;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt32TypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt32TypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt32TypeComputer.java
index f0c8f89..8f676ae 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt32TypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt32TypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AInt32TypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class AInt32TypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AINT32;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt64TypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt64TypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt64TypeComputer.java
index 7c43d67..9909c3d 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt64TypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt64TypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AInt64TypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class AInt64TypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AINT64;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt8TypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt8TypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt8TypeComputer.java
index 021e514..4fe6dc3 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt8TypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AInt8TypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AInt8TypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class AInt8TypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AINT8;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AIntervalTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AIntervalTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AIntervalTypeComputer.java
index 93d5a9a..5b333e5 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AIntervalTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AIntervalTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AIntervalTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class AIntervalTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AINTERVAL;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ALineTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ALineTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ALineTypeComputer.java
index 6c93088..c332717 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ALineTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ALineTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ALineTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ALineTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ALINE;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APoint3DTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APoint3DTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APoint3DTypeComputer.java
index 74dc67b..40838b1 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APoint3DTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APoint3DTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class APoint3DTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class APoint3DTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.APOINT3D;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APointTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APointTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APointTypeComputer.java
index d6cd6f7..c308781 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APointTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APointTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class APointTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class APointTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.APOINT;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APolygonTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APolygonTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APolygonTypeComputer.java
index 3c7e383..37eef7c 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APolygonTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/APolygonTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class APolygonTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class APolygonTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.APOLYGON;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ARectangleTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ARectangleTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ARectangleTypeComputer.java
index f308b81..eae0818 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ARectangleTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ARectangleTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ARectangleTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ARectangleTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ARECTANGLE;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AStringTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AStringTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AStringTypeComputer.java
index f900b77..3537fb7 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AStringTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AStringTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AStringTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class AStringTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ASTRING;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ATimeTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ATimeTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ATimeTypeComputer.java
index a6950e1..359a9e4 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ATimeTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ATimeTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class ATimeTypeComputer extends AbstractResultTypeComputer {
@@ -30,7 +32,7 @@ public class ATimeTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.ATIME;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java
index 0a0c923..d241585 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AUUIDTypeComputer.java
@@ -22,6 +22,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AUUIDTypeComputer extends AbstractResultTypeComputer {
@@ -31,7 +33,7 @@ public class AUUIDTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AUUID;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AYearMonthDurationTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AYearMonthDurationTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AYearMonthDurationTypeComputer.java
index 6360f11..7885a75 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AYearMonthDurationTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AYearMonthDurationTypeComputer.java
@@ -21,6 +21,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class AYearMonthDurationTypeComputer extends AbstractResultTypeComputer {
@@ -31,7 +33,7 @@ public class AYearMonthDurationTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
return BuiltinType.AYEARMONTHDURATION;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AbstractStringTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AbstractStringTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AbstractStringTypeComputer.java
index e45c4cc..ee53964 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AbstractStringTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/AbstractStringTypeComputer.java
@@ -22,6 +22,7 @@ import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
abstract public class AbstractStringTypeComputer extends AbstractResultTypeComputer {
@@ -34,5 +35,6 @@ abstract public class AbstractStringTypeComputer extends AbstractResultTypeCompu
}
@Override
- protected abstract IAType getResultType(IAType... strippedInputTypes);
+ protected abstract IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes)
+ throws AlgebricksException;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/BooleanFunctionTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/BooleanFunctionTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/BooleanFunctionTypeComputer.java
index 95d8508..6364d57 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/BooleanFunctionTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/BooleanFunctionTypeComputer.java
@@ -43,7 +43,7 @@ public class BooleanFunctionTypeComputer extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) {
return AUnionType.createUnknownableType(BuiltinType.ABOOLEAN);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ClosedRecordConstructorResultType.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ClosedRecordConstructorResultType.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ClosedRecordConstructorResultType.java
index cccc13f..1aa06bd 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ClosedRecordConstructorResultType.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ClosedRecordConstructorResultType.java
@@ -28,7 +28,6 @@ import org.apache.asterix.om.typecomputer.base.TypeCastUtils;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
-import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -65,12 +64,9 @@ public class ClosedRecordConstructorResultType implements IResultTypeComputer {
ILogicalExpression e1 = argIter.next().getValue();
ILogicalExpression e2 = argIter.next().getValue();
IAType e2Type = (IAType) env.getType(e2);
- if (e2Type.getTypeTag() == ATypeTag.MISSING) {
- // Converts missing to null for a closed field.
- e2Type = BuiltinType.ANULL;
- } else if (e2Type.getTypeTag() == ATypeTag.UNION) {
+ if (e2Type.getTypeTag() == ATypeTag.UNION) {
AUnionType unionType = (AUnionType) e2Type;
- e2Type = AUnionType.createNullableType(unionType.getActualType());
+ e2Type = AUnionType.createUnknownableType(unionType.getActualType());
}
fieldTypes[i] = e2Type;
if (e1.getExpressionTag() == LogicalExpressionTag.CONSTANT) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
index ecdb1d0..714048e 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
@@ -24,6 +24,7 @@ import org.apache.asterix.om.types.AbstractCollectionType;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
public class CollectionMemberResultType extends AbstractResultTypeComputer {
@@ -42,7 +43,7 @@ public class CollectionMemberResultType extends AbstractResultTypeComputer {
}
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
IAType type = strippedInputTypes[0];
if (type.getTypeTag() == ATypeTag.ANY) {
return BuiltinType.ANY;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionToSequenceTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionToSequenceTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionToSequenceTypeComputer.java
index 9e93b71..60d783d 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionToSequenceTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionToSequenceTypeComputer.java
@@ -22,6 +22,8 @@ import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AbstractCollectionType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
/**
* This function is to make a sequence of records and a singleton collection of records
@@ -34,7 +36,7 @@ public class CollectionToSequenceTypeComputer extends AbstractResultTypeComputer
public static final CollectionToSequenceTypeComputer INSTANCE = new CollectionToSequenceTypeComputer();
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
IAType argType = strippedInputTypes[0];
ATypeTag argTypeTag = argType.getTypeTag();
if (argTypeTag == ATypeTag.ORDEREDLIST || argTypeTag == ATypeTag.UNORDEREDLIST) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ConcatNonNullTypeComputer.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ConcatNonNullTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ConcatNonNullTypeComputer.java
index d6fc75d..af027c4 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ConcatNonNullTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/ConcatNonNullTypeComputer.java
@@ -22,6 +22,8 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
/**
* The type computer for concat-not-null.
@@ -34,7 +36,7 @@ public class ConcatNonNullTypeComputer extends AbstractResultTypeComputer {
public static final ConcatNonNullTypeComputer INSTANCE = new ConcatNonNullTypeComputer();
@Override
- protected IAType getResultType(IAType... strippedInputTypes) {
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
boolean any = false;
IAType currentType = null;
for (IAType type : strippedInputTypes) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByIndexResultType.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByIndexResultType.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByIndexResultType.java
index 0cdbb27..2b4cf59 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByIndexResultType.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByIndexResultType.java
@@ -21,7 +21,7 @@ package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.base.AInt32;
import org.apache.asterix.om.base.IAObject;
import org.apache.asterix.om.constants.AsterixConstantValue;
-import org.apache.asterix.om.typecomputer.base.IResultTypeComputer;
+import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.BuiltinType;
@@ -31,10 +31,8 @@ import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
-import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
-public class FieldAccessByIndexResultType implements IResultTypeComputer {
+public class FieldAccessByIndexResultType extends AbstractResultTypeComputer {
public static final FieldAccessByIndexResultType INSTANCE = new FieldAccessByIndexResultType();
@@ -42,37 +40,31 @@ public class FieldAccessByIndexResultType implements IResultTypeComputer {
}
@Override
- public IAType computeType(ILogicalExpression expression, IVariableTypeEnvironment env,
- IMetadataProvider<?, ?> metadataProvider) throws AlgebricksException {
- AbstractFunctionCallExpression f = (AbstractFunctionCallExpression) expression;
- Object obj;
- try {
- obj = env.getType(f.getArguments().get(0).getValue());
- } catch (AlgebricksException e) {
- throw new AlgebricksException(e);
+ protected void checkArgType(int argIndex, IAType type) throws AlgebricksException {
+ if (argIndex == 0 && type.getTypeTag() != ATypeTag.RECORD) {
+ throw new AlgebricksException("The first argument should be a RECORD, but it is " + type + ".");
}
- if (obj == null) {
- return null;
+ if (argIndex == 1 && type.getTypeTag() != ATypeTag.INT32) {
+ throw new AlgebricksException("The second argument should be an INT32, but it is found " + type + ".");
}
- IAType type0 = (IAType) obj;
- ARecordType t0 = FieldAccessByNameResultType.getRecordTypeFromType(type0, expression);
- if (t0 == null) {
+ }
+
+ @Override
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
+ IAType firstArgType = strippedInputTypes[0];
+ if (firstArgType.getTypeTag() != ATypeTag.RECORD) {
return BuiltinType.ANY;
}
- ILogicalExpression arg1 = f.getArguments().get(1).getValue();
+ AbstractFunctionCallExpression funcExpr = (AbstractFunctionCallExpression) expr;
+ ILogicalExpression arg1 = funcExpr.getArguments().get(1).getValue();
if (arg1.getExpressionTag() != LogicalExpressionTag.CONSTANT) {
return BuiltinType.ANY;
}
ConstantExpression ce = (ConstantExpression) arg1;
- if (!(ce.getValue() instanceof AsterixConstantValue)) {
- throw new AlgebricksException("Typing error: expecting an integer, found " + ce + " instead.");
- }
IAObject v = ((AsterixConstantValue) ce.getValue()).getObject();
- if (v.getType().getTypeTag() != ATypeTag.INT32) {
- throw new AlgebricksException("Typing error: expecting an INT32, found " + ce + " instead.");
- }
int pos = ((AInt32) v).getIntegerValue();
- return t0.getFieldTypes()[pos];
+ ARecordType recType = (ARecordType) firstArgType;
+ return recType.getFieldTypes()[pos];
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b0fe0ac0/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByNameResultType.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByNameResultType.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByNameResultType.java
index 2e43316..4332bb1 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByNameResultType.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessByNameResultType.java
@@ -19,24 +19,20 @@
package org.apache.asterix.om.typecomputer.impl;
import org.apache.asterix.om.base.AString;
+import org.apache.asterix.om.base.IAObject;
import org.apache.asterix.om.constants.AsterixConstantValue;
-import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
-import org.apache.asterix.om.typecomputer.base.IResultTypeComputer;
+import org.apache.asterix.om.typecomputer.base.AbstractResultTypeComputer;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
-import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractLogicalExpression;
import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
-import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
-public class FieldAccessByNameResultType implements IResultTypeComputer {
+public class FieldAccessByNameResultType extends AbstractResultTypeComputer {
public static final FieldAccessByNameResultType INSTANCE = new FieldAccessByNameResultType();
@@ -44,57 +40,31 @@ public class FieldAccessByNameResultType implements IResultTypeComputer {
}
@Override
- public IAType computeType(ILogicalExpression expression, IVariableTypeEnvironment env,
- IMetadataProvider<?, ?> metadataProvider) throws AlgebricksException {
- AbstractFunctionCallExpression f = (AbstractFunctionCallExpression) expression;
- Object obj = env.getType(f.getArguments().get(0).getValue());
-
- if (obj == null) {
- return null;
+ protected void checkArgType(int argIndex, IAType type) throws AlgebricksException {
+ if (argIndex == 0 && type.getTypeTag() != ATypeTag.RECORD) {
+ throw new AlgebricksException("The first argument should be a RECORD, but it is " + type + ".");
}
- IAType type0 = (IAType) obj;
- ARecordType t0 = getRecordTypeFromType(type0, expression);
- if (t0 == null) {
- return BuiltinType.ANY;
+ if (argIndex == 1 && type.getTypeTag() != ATypeTag.STRING) {
+ throw new AlgebricksException("The second argument should be an STRING, but it is found " + type + ".");
}
+ }
- AbstractLogicalExpression arg1 = (AbstractLogicalExpression) f.getArguments().get(1).getValue();
+ @Override
+ protected IAType getResultType(ILogicalExpression expr, IAType... strippedInputTypes) throws AlgebricksException {
+ IAType firstArgType = strippedInputTypes[0];
+ if (firstArgType.getTypeTag() != ATypeTag.RECORD) {
+ return BuiltinType.ANY;
+ }
+ AbstractFunctionCallExpression funcExpr = (AbstractFunctionCallExpression) expr;
+ ILogicalExpression arg1 = funcExpr.getArguments().get(1).getValue();
if (arg1.getExpressionTag() != LogicalExpressionTag.CONSTANT) {
- return null;
+ return BuiltinType.ANY;
}
-
ConstantExpression ce = (ConstantExpression) arg1;
- String typeName = ((AString) ((AsterixConstantValue) ce.getValue()).getObject()).getStringValue();
- for (int i = 0; i < t0.getFieldNames().length; i++) {
- if (t0.getFieldNames()[i].equals(typeName)) {
- return t0.getFieldTypes()[i];
- }
- }
- return BuiltinType.ANY;
+ IAObject v = ((AsterixConstantValue) ce.getValue()).getObject();
+ String fieldName = ((AString) v).getStringValue();
+ ARecordType recType = (ARecordType) firstArgType;
+ IAType fieldType = recType.getFieldType(fieldName);
+ return fieldType == null ? BuiltinType.ANY : fieldType;
}
-
- static ARecordType getRecordTypeFromType(IAType type0, ILogicalExpression expression) throws AlgebricksException {
- switch (type0.getTypeTag()) {
- case RECORD:
- return (ARecordType) type0;
- case ANY:
- return DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE;
- case UNION:
- AUnionType u = (AUnionType) type0;
- IAType t1 = u.getActualType();
- if (t1.getTypeTag() == ATypeTag.RECORD) {
- return (ARecordType) t1;
- } else if (t1.getTypeTag() == ATypeTag.ANY) {
- return DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE;
- } else {
- throw new AlgebricksException(
- "Unsupported type " + type0 + " for field access expression: " + expression);
- }
- default:
- throw new AlgebricksException(
- "Unsupported type " + type0 + " for field access expression: " + expression);
- }
-
- }
-
}