minor refactoring
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_opentype@313 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/only.txt b/asterix-app/src/test/resources/runtimets/only.txt
index 5b5deb7..e69de29 100644
--- a/asterix-app/src/test/resources/runtimets/only.txt
+++ b/asterix-app/src/test/resources/runtimets/only.txt
@@ -1 +0,0 @@
-dml/
\ No newline at end of file
diff --git a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/ARecordAccessor.java b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/ARecordAccessor.java
index 63bc63e..e8e85ac 100644
--- a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/ARecordAccessor.java
+++ b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/ARecordAccessor.java
@@ -36,9 +36,9 @@
public class ARecordAccessor implements IBinaryAccessor {
- private List<AFlatValueAccessor> fieldNames = new ArrayList<AFlatValueAccessor>();
- private List<AFlatValueAccessor> fieldTypeTags = new ArrayList<AFlatValueAccessor>();
- private List<AFlatValueAccessor> fieldValues = new ArrayList<AFlatValueAccessor>();
+ private List<IBinaryAccessor> fieldNames = new ArrayList<IBinaryAccessor>();
+ private List<IBinaryAccessor> fieldTypeTags = new ArrayList<IBinaryAccessor>();
+ private List<IBinaryAccessor> fieldValues = new ArrayList<IBinaryAccessor>();
private byte[] typeBuffer = new byte[32768];
private ResettableByteArrayOutputStream typeBos = new ResettableByteArrayOutputStream();
@@ -225,7 +225,7 @@
fieldCursor++;
}
- private AFlatValueAccessor nextFieldName() {
+ private IBinaryAccessor nextFieldName() {
if (fieldCursor < fieldNames.size()) {
return fieldNames.get(fieldCursor);
} else {
@@ -235,7 +235,7 @@
}
}
- private AFlatValueAccessor nextFieldType() {
+ private IBinaryAccessor nextFieldType() {
if (fieldCursor < fieldTypeTags.size()) {
return fieldTypeTags.get(fieldCursor);
} else {
@@ -245,7 +245,7 @@
}
}
- private AFlatValueAccessor nextFieldValue() {
+ private IBinaryAccessor nextFieldValue() {
if (fieldCursor < fieldValues.size()) {
return fieldValues.get(fieldCursor);
} else {
@@ -259,15 +259,15 @@
return fieldCursor;
}
- public List<AFlatValueAccessor> getFieldNames() {
+ public List<IBinaryAccessor> getFieldNames() {
return fieldNames;
}
- public List<AFlatValueAccessor> getFieldTypeTags() {
+ public List<IBinaryAccessor> getFieldTypeTags() {
return fieldTypeTags;
}
- public List<AFlatValueAccessor> getFieldValues() {
+ public List<IBinaryAccessor> getFieldValues() {
return fieldValues;
}
diff --git a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/cast/ARecordCaster.java b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/cast/ARecordCaster.java
index 7b3968c..e7a35bd 100644
--- a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/cast/ARecordCaster.java
+++ b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/accessors/cast/ARecordCaster.java
@@ -30,6 +30,7 @@
import edu.uci.ics.asterix.om.util.NonTaggedFormatUtil;
import edu.uci.ics.asterix.runtime.accessors.AFlatValueAccessor;
import edu.uci.ics.asterix.runtime.accessors.ARecordAccessor;
+import edu.uci.ics.asterix.runtime.accessors.base.IBinaryAccessor;
import edu.uci.ics.asterix.runtime.util.ResettableByteArrayOutputStream;
import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparator;
import edu.uci.ics.hyracks.api.dataflow.value.INullWriter;
@@ -47,9 +48,9 @@
private boolean[] openFields;
private int[] fieldNamesSortedIndex;
- private List<AFlatValueAccessor> reqFieldNames = new ArrayList<AFlatValueAccessor>();
+ private List<IBinaryAccessor> reqFieldNames = new ArrayList<IBinaryAccessor>();
private int[] reqFieldNamesSortedIndex;
- private List<AFlatValueAccessor> reqFieldTypeTags = new ArrayList<AFlatValueAccessor>();
+ private List<IBinaryAccessor> reqFieldTypeTags = new ArrayList<IBinaryAccessor>();
private ARecordType cachedReqType = null;
private byte[] buffer = new byte[32768];
@@ -87,9 +88,9 @@
public void castRecord(ARecordAccessor recordAccessor, ARecordAccessor resultAccessor, ARecordType reqType,
ACastVisitor visitor) throws IOException {
- List<AFlatValueAccessor> fieldNames = recordAccessor.getFieldNames();
- List<AFlatValueAccessor> fieldTypeTags = recordAccessor.getFieldTypeTags();
- List<AFlatValueAccessor> fieldValues = recordAccessor.getFieldValues();
+ List<IBinaryAccessor> fieldNames = recordAccessor.getFieldNames();
+ List<IBinaryAccessor> fieldTypeTags = recordAccessor.getFieldTypeTags();
+ List<IBinaryAccessor> fieldValues = recordAccessor.getFieldValues();
numInputFields = recordAccessor.getCursor() + 1;
if (openFields == null || numInputFields > openFields.length) {
@@ -167,8 +168,8 @@
quickSort(reqFieldNamesSortedIndex, reqFieldNames, 0, reqFieldNamesSortedIndex.length - 1);
}
- private void matchClosedPart(List<AFlatValueAccessor> fieldNames, List<AFlatValueAccessor> fieldTypeTags,
- List<AFlatValueAccessor> fieldValues) {
+ private void matchClosedPart(List<IBinaryAccessor> fieldNames, List<IBinaryAccessor> fieldTypeTags,
+ List<IBinaryAccessor> fieldValues) {
// sort-merge based match
quickSort(fieldNamesSortedIndex, fieldNames, 0, numInputFields - 1);
int fnStart = 0;
@@ -178,8 +179,8 @@
int reqFnPos = reqFieldNamesSortedIndex[reqFnStart];
int c = compare(fieldNames.get(fnPos), reqFieldNames.get(reqFnPos));
if (c == 0) {
- AFlatValueAccessor fieldTypeTag = fieldTypeTags.get(fnPos);
- AFlatValueAccessor reqFieldTypeTag = reqFieldTypeTags.get(reqFnPos);
+ IBinaryAccessor fieldTypeTag = fieldTypeTags.get(fnPos);
+ IBinaryAccessor reqFieldTypeTag = reqFieldTypeTags.get(reqFnPos);
if (fieldTypeTag.equals(reqFieldTypeTag) || (
// match the null type of optional field
optionalFields[reqFnPos] && fieldTypeTag.equals(nullTypeTag))) {
@@ -213,8 +214,8 @@
}
}
- private void writeOutput(List<AFlatValueAccessor> fieldNames, List<AFlatValueAccessor> fieldTypeTags,
- List<AFlatValueAccessor> fieldValues, DataOutput output, ACastVisitor visitor) throws IOException {
+ private void writeOutput(List<IBinaryAccessor> fieldNames, List<IBinaryAccessor> fieldTypeTags,
+ List<IBinaryAccessor> fieldValues, DataOutput output, ACastVisitor visitor) throws IOException {
// reset the states of the record builder
recBuilder.reset(cachedReqType);
recBuilder.init();
@@ -222,7 +223,7 @@
// write the closed part
for (int i = 0; i < fieldPermutation.length; i++) {
int pos = fieldPermutation[i];
- AFlatValueAccessor field;
+ IBinaryAccessor field;
if (pos >= 0) {
field = fieldValues.get(pos);
} else {
@@ -234,15 +235,15 @@
// write the open part
for (int i = 0; i < numInputFields; i++) {
if (openFields[i]) {
- AFlatValueAccessor name = fieldNames.get(i);
- AFlatValueAccessor field = fieldValues.get(i);
+ IBinaryAccessor name = fieldNames.get(i);
+ IBinaryAccessor field = fieldValues.get(i);
recBuilder.addField(name, field);
}
}
recBuilder.write(output, true);
}
- private void quickSort(int[] index, List<AFlatValueAccessor> names, int start, int end) {
+ private void quickSort(int[] index, List<IBinaryAccessor> names, int start, int end) {
if (end <= start)
return;
int i = partition(index, names, start, end);
@@ -250,7 +251,7 @@
quickSort(index, names, i + 1, end);
}
- private int partition(int[] index, List<AFlatValueAccessor> names, int left, int right) {
+ private int partition(int[] index, List<IBinaryAccessor> names, int left, int right) {
int i = left - 1;
int j = right;
while (true) {