AJ-543: duration support exchange calendar

Author: lucaijun

src/com/xxdb/data/BasicDuration.java

@@ -10,15 +10,41 @@ public class BasicDuration extends AbstractScalar implements Comparable<BasicDur
 	private static final String[] unitSyms = {"ns", "us", "ms", "s", "m", "H", "d", "w", "M", "y", "B"};
 	private int value;
 	private DURATION unit;
+	private int exchange_;
 
 	public BasicDuration(DURATION unit, int value){
 		this.value = value;
 		this.unit = unit;
+		this.exchange_ = unit.ordinal();
+	}
+
+	public BasicDuration(String unit, int value) {
+		this.value = value;
+		int codeNumber = getCodeNumber(unit);
+		if (codeNumber >= 0 && codeNumber <= 10)
+			this.unit = DURATION.values()[codeNumber];
+		else
+			this.unit = DURATION.TDAY;
+		this.exchange_ = codeNumber;
+	}
+
+	protected BasicDuration(int exchange_, int value) {
+		this.value = value;
+		if (exchange_ >= 0 && exchange_ <= 10)
+			this.unit = DURATION.values()[exchange_];
+		else
+			this.unit = DURATION.TDAY;
+		this.exchange_ = exchange_;
 	}
 
 	public BasicDuration(ExtendedDataInput in) throws IOException{
 		value = in.readInt();
-		unit = DURATION.values()[in.readInt()];
+		int codeNumber = in.readInt();
+		if (codeNumber >= 0 && codeNumber <= 10)
+			unit = DURATION.values()[codeNumber];
+		else
+			unit = DURATION.TDAY;
+		exchange_ = codeNumber;
 	}
 
 	public int getDuration() {
@@ -29,6 +55,22 @@ public DURATION getUnit() {
 		return unit;
 	}
 
+	public int getExchangeInt() {
+		return exchange_;
+	}
+
+	public String getExchangeName() {
+		if (exchange_ >= 0 && exchange_ <= 10) {
+			return unitSyms[exchange_];
+		}
+		char[] codes = new char[4];
+		codes[0] = (char) ((exchange_ >> 24) & 255);
+		codes[1] = (char) ((exchange_ >> 16) & 255);
+		codes[2] = (char) ((exchange_ >> 8) & 255);
+		codes[3] = (char) (exchange_ & 255);
+		return String.valueOf(codes);
+	}
+
 	@Override
 	public boolean isNull() {
 		return value == Integer.MIN_VALUE;
@@ -75,19 +117,19 @@ public String getString() {
 		if(value == Integer.MIN_VALUE)
 			return "";
 		else
-			return String.valueOf(value) + unitSyms[unit.ordinal()];
+			return value + getExchangeName();
 	}
 
 	@Override
 	protected void writeScalarToOutputStream(ExtendedDataOutput out) throws IOException {
 		out.writeInt(value);
-		out.writeInt(unit.ordinal());
+		out.writeInt(exchange_);
 	}
 
 	@Override
 	public int compareTo(BasicDuration o) {
-		if(unit==o.unit)
-			return Integer.compare(((BasicDuration)o).value,value);
+		if (unit == o.unit && exchange_ == o.exchange_)
+			return Integer.compare(o.value, value);
 		else
 			return -1;
 	}
@@ -97,12 +139,51 @@ public boolean equals(Object o){
 		if(! (o instanceof BasicDuration) || o == null)
 			return false;
 		else
-			return value == ((BasicDuration)o).value && unit == ((BasicDuration)o).unit;
+			return value == ((BasicDuration) o).value && unit == ((BasicDuration) o).unit && exchange_ == ((BasicDuration) o).exchange_;
 	}
 
 	@JsonIgnore
 	@Override
 	public int getScale(){
 		return super.getScale();
 	}
+
+	private int getCodeNumber(String unit) {
+		if (unit.length() == 1 || unit.length() == 2) {
+			switch (unit) {
+				case "ns":
+					return 0;
+				case "us":
+					return 1;
+				case "ms":
+					return 2;
+				case "s":
+					return 3;
+				case "m":
+					return 4;
+				case "H":
+					return 5;
+				case "d":
+					return 6;
+				case "w":
+					return 7;
+				case "M":
+					return 8;
+				case "y":
+					return 9;
+				case "B":
+					return 10;
+				default:
+					throw new RuntimeException("error unit: " + unit);
+			}
+		} else if (unit.length() == 4) {
+			int[] codes = new int[4];
+			for (int i = 0; i < 4; i++) {
+				codes[i] = unit.charAt(i);
+			}
+			return (codes[0] << 24) + (codes[1] << 16) + (codes[2] << 8) + codes[3];
+		} else {
+			throw new RuntimeException("error length of unit, " + unit.length());
+		}
+	}
 }

src/com/xxdb/data/BasicDurationVector.java

@@ -53,13 +53,13 @@ public Entity get(int index){
 		if(unitIndex == Integer.MIN_VALUE)
 			return new BasicDuration(DURATION.NS, Integer.MIN_VALUE);
 		else
-			return new BasicDuration(DURATION.values()[values[2*index + 1]], values[2*index]);
+			return new BasicDuration(values[2*index + 1], values[2*index]);
 	}
 
 	public void set(int index, Entity value) throws Exception {
 		BasicDuration duration = (BasicDuration)value;
 		values[2*index] = duration.getDuration();
-		values[2*index + 1] = duration.getUnit().ordinal();
+		values[2*index + 1] = duration.getExchangeInt();
 	}
 
 	@Override
@@ -95,7 +95,7 @@ public void addRange(int[] valueList) {
 
 	@Override
 	public void Append(Scalar value) throws Exception{
-		add(((BasicDuration)value).getDuration(), ((BasicDuration)value).getUnit().ordinal());
+		add(((BasicDuration)value).getDuration(), ((BasicDuration)value).getExchangeInt());
 	}
 
 	@Override

src/com/xxdb/data/Entity.java

@@ -66,7 +66,7 @@ public static DATA_TYPE valueOfTypeName(String name){
 	enum DATA_CATEGORY {NOTHING,LOGICAL,INTEGRAL,FLOATING,TEMPORAL,LITERAL,SYSTEM,MIXED,BINARY,ARRAY,DENARY};
 	enum DATA_FORM {DF_SCALAR,DF_VECTOR,DF_PAIR,DF_MATRIX,DF_SET,DF_DICTIONARY,DF_TABLE,DF_CHART,DF_CHUNK,DF_SYSOBJ};
 	enum PARTITION_TYPE {SEQ, VALUE, RANGE, LIST, COMPO, HASH}
-	enum DURATION {NS, US, MS, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR, BDAY};
+	enum DURATION {NS, US, MS, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR, BDAY, TDAY};
 	DATA_FORM getDataForm();
 	DATA_CATEGORY getDataCategory();
 	DATA_TYPE getDataType();