Merge remote-tracking branch 'origin/dev' into dev

Author: lucaijun

src/com/xxdb/DBConnection.java

@@ -508,7 +508,7 @@ private Entity run(String script, String scriptType, ProgressListener listener,
                     return new EntityBlockReader(in_);
                 }
                 EntityFactory factory = BasicEntityFactory.instance();
-                return factory.createEntity(df, dt, in_, extended, -1);
+                return factory.createEntity(df, dt, in_, extended);
             }catch (IOException ex){
                 isConnected_ = false;
                 socket_ = null;

src/com/xxdb/compression/VectorDecompressor.java

@@ -35,7 +35,7 @@ public Vector decompress(EntityFactory factory, ExtendedDataInput in, boolean ex
 		else if (dt == DATA_TYPE.DT_DECIMAL64)
 			return new BasicDecimal64Vector(DATA_FORM.DF_VECTOR, decompressedIn, tmp);
 		else
-			return (Vector)factory.createEntity(DATA_FORM.DF_VECTOR, dt, decompressedIn, extended, -1); // Haotian - TODO: this function `decompress` may need to be updated
+			return (Vector)factory.createEntity(DATA_FORM.DF_VECTOR, dt, decompressedIn, extended);
 	}
 
 }

src/com/xxdb/data/AbstractMatrix.java

@@ -35,7 +35,7 @@ protected AbstractMatrix(ExtendedDataInput in) throws IOException{
             	type -= 128;
 			if(form != DATA_FORM.DF_VECTOR.ordinal())
 				throw new IOException("The form of matrix row labels must be vector");
-			rowLabels = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, DATA_TYPE.valueOf(type), in, extended, -1);
+			rowLabels = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, DATA_TYPE.valueOf(type), in, extended);
 		}
 
 		if((hasLabels & 2) == 2){
@@ -50,7 +50,7 @@ protected AbstractMatrix(ExtendedDataInput in) throws IOException{
 				throw new IOException("The form of matrix columns labels must be vector");
 			if(type <0 || type >= DATA_TYPE.DT_OBJECT.getValue())
 				throw new IOException("Invalid data type for matrix column labels: " + type);
-			columnLabels = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, DATA_TYPE.valueOf(type), in, extended, -1);
+			columnLabels = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, DATA_TYPE.valueOf(type), in, extended);
 		}
 
 		short flag = in.readShort();

src/com/xxdb/data/AbstractVector.java

@@ -72,10 +72,7 @@ public String getJsonString(int rowIndex){
 	}
 
 	public String getString(){
-		StringBuilder sb = new StringBuilder();
-		if (get(0).isScalar())
-			sb.append("[");
-
+		StringBuilder sb = new StringBuilder("[");
 		int size = Math.min(DISPLAY_ROWS, rows());
 		if(size > 0)
 			sb.append(getString(0));
@@ -85,10 +82,7 @@ public String getString(){
 		}
 		if(size < rows())
 			sb.append(",...");
-
-		if (get(0).isScalar())
-			sb.append("]");
-
+		sb.append("]");
 		return sb.toString();
 	}
 

src/com/xxdb/data/BasicAnyVector.java

@@ -42,7 +42,7 @@ protected BasicAnyVector(ExtendedDataInput in) throws IOException{
             boolean extended = type >= 128;
             if(type >= 128)
             	type -= 128;
-			Entity obj = BasicEntityFactory.instance().createEntity(DATA_FORM.values()[form], DATA_TYPE.valueOf(type), in, extended, -1);
+			Entity obj = BasicEntityFactory.instance().createEntity(DATA_FORM.values()[form], DATA_TYPE.valueOf(type), in, extended);
 			values[i] = obj;
 		}
 	}

src/com/xxdb/data/BasicArrayVector.java

@@ -147,7 +147,7 @@ public BasicArrayVector(DATA_TYPE type, ExtendedDataInput in) throws IOException
 	}
 
 	public void deserialize(DATA_TYPE valueType,  ExtendedDataInput in, int rows, int cols, int scale) throws IOException {
-		valueVec = BasicEntityFactory.instance().createVectorWithDefaultValue(valueType, cols, scale);
+		valueVec = BasicEntityFactory.instance().createVectorWithDefaultValue(valueType, 0, scale);
 
 		ByteOrder bo = in.isLittleEndian() ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN;
 		this.baseUnitLength_ = valueVec.getUnitLength();

src/com/xxdb/data/BasicDecimal128.java

@@ -44,12 +44,8 @@ public BasicDecimal128(BigInteger unscaledVal, int scale) {
         this.scale = scale;
     }
 
-    public BasicDecimal128(ExtendedDataInput in, int extra) throws IOException {
-        if (extra != -1)
-            scale = extra;
-        else
-            scale = in.readInt();
-
+    public BasicDecimal128(ExtendedDataInput in) throws IOException {
+        scale = in.readInt();
         unscaledValue = handleLittleEndianBigEndian(in);
     }
 

src/com/xxdb/data/BasicDecimal32.java

@@ -11,12 +11,8 @@ public class BasicDecimal32 extends AbstractScalar implements Comparable<BasicDe
     private int scale_=0;
     private int value_;
 
-    public BasicDecimal32(ExtendedDataInput in, int extra) throws IOException{
-        if (extra != -1)
-            scale_ = extra;
-        else
-            scale_ = in.readInt();
-
+    public BasicDecimal32(ExtendedDataInput in) throws IOException{
+        scale_ = in.readInt();
         value_ = in.readInt();
     }
 

src/com/xxdb/data/BasicDecimal64.java

@@ -17,13 +17,9 @@ public class BasicDecimal64 extends AbstractScalar implements Comparable<BasicDe
     private static final BigDecimal DECIMAL64_MIN_VALUE = new BigDecimal("-9223372036854775808");
     private static final BigDecimal DECIMAL64_MAX_VALUE = new BigDecimal("9223372036854775807");
 
-    public BasicDecimal64(ExtendedDataInput in, int extra) throws IOException{
-        if (extra != -1)
-            scale_ = extra;
-        else
-            scale_ = in.readInt();
-
-        value_ = in.readInt();
+    public BasicDecimal64(ExtendedDataInput in) throws IOException{
+        scale_ = in.readInt();
+        value_ = in.readLong();
     }
 
     public BasicDecimal64(long value, int scale){

src/com/xxdb/data/BasicDictionary.java

@@ -34,7 +34,7 @@ public BasicDictionary(DATA_TYPE valueType, ExtendedDataInput in) throws IOExcep
 		if(form != DATA_FORM.DF_VECTOR.ordinal())
 			throw new IOException("The form of dictionary keys must be vector");
 		keyType = DATA_TYPE.valueOf(type);
-		Vector keys = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, keyType, in, extended, -1);
+		Vector keys = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, keyType, in, extended);
 
 		//read value vector
 		flag = in.readShort();
@@ -46,7 +46,7 @@ public BasicDictionary(DATA_TYPE valueType, ExtendedDataInput in) throws IOExcep
 		if(form != DATA_FORM.DF_VECTOR.ordinal())
 			throw new IOException("The form of dictionary values must be vector");
 		valueType = DATA_TYPE.valueOf(type);
-		Vector values = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, valueType, in, extended, -1);
+		Vector values = (Vector)BasicEntityFactory.instance().createEntity(DATA_FORM.DF_VECTOR, valueType, in, extended);
 
 		if(keys.rows() != values.rows()){
 			throw new IOException("The key size doesn't equate to value size.");