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

Author: lucaijun

src/com/xxdb/data/BasicTable.java

@@ -17,6 +17,7 @@ public class BasicTable extends AbstractEntity implements Table{
 	private List<String> colNames = new ArrayList<String>();
 	private Map<String, Integer> colNamesIndex = new HashMap<String, Integer>();
 	private int[] colCompresses = null;
+	private int colRows;
 
 	public BasicTable(ExtendedDataInput in) throws IOException{
 		int rows = in.readInt();
@@ -60,6 +61,7 @@ public BasicTable(ExtendedDataInput in) throws IOException{
 			}
 			if(vector.rows() != rows && vector.rows()!= 1)
 				throw new IOException("The number of rows for column " + colNames.get(i) + " is not consistent with other columns");
+			this.colRows = rows;
 			columns.add(vector);
 		}
 		if(collection != null)
@@ -70,10 +72,11 @@ public BasicTable(final List<String> colNames, final List<Vector> cols) {
 		if(colNames.size() != cols.size()){
 			throw new Error("The length of column name and column data is unequal.");
 		}
-		int rowsCount = cols.get(0).rows();
+
+		this.colRows = cols.get(0).rows();
 		for (int i=0;i<cols.size();i++) {
 			Vector v = cols.get(i);
-			if(v.rows() != rowsCount)
+			if(v.rows() != this.colRows)
 				throw new Error("The length of column " + colNames.get(i) + "  must be the same as the first column length.");
 		}
         this.setColName(colNames);
@@ -126,14 +129,17 @@ public void setColName (final List<String> colNames) {
 	 * @param newColName
 	 */
 	public void replaceColName(String originalColName, String newColName) {
-		if (Utils.isEmpty(originalColName))
-			throw new RuntimeException("colName cannot be null.");
+		if (Utils.isEmpty(originalColName) || Utils.isEmpty(newColName))
+			throw new RuntimeException("The param 'newColName' cannot be null or empty.");
+
+		if (!this.colNames.contains(originalColName) && this.colNames.contains(newColName))
+			throw new RuntimeException("The newColName '" + newColName +"' already exists in table. Column names cannot be duplicated.");
 
 		if (this.colNames.contains(originalColName)) {
 			int index = colNames.indexOf(originalColName);
 			colNames.set(index, newColName);
 		} else {
-			throw new RuntimeException("colName '" + originalColName +"' does not exist in table.");
+			throw new RuntimeException("The param originalColName '" + originalColName +"' does not exist in table.");
 		}
 	}
 
@@ -165,7 +171,7 @@ public int rows() {
 		if(columns()<=0)
 			return 0;
 		else
-			return columns.get(0).rows();
+			return this.colRows;
 	}
 
 	@Override
@@ -378,22 +384,35 @@ public void addColumn(String colName, Vector col) {
 		if (Objects.isNull(colName) || Objects.isNull(col))
 			throw new RuntimeException("The param 'colName' or 'col' in table cannot be null.");
 
+		if (colName.isEmpty())
+			throw new RuntimeException("The param 'colName' cannot be empty.");
+
 		if (colNames.contains(colName))
 			throw new RuntimeException("The table already contains column '" + colName + "'.");
+
+		if (this.colRows != 0 && col.rows() != this.colRows)
+			throw new RuntimeException("The length of column " + colName + "  must be the same as the first column length: " + this.colRows +".");
+
 		colNames.add(colName);
 		colNamesIndex.put(colName, colNamesIndex.size());
 		columns.add(col);
+		this.colRows = col.rows();
 	}
 
 	@Override
 	public void replaceColumn(String colName, Vector col) {
-		if (colNames.contains(colName)) {
-			int index = colNames.indexOf(colName);
-			columns.set(index, col);
-		} else {
-			colNames.add(colName);
-			columns.add(col);
-			colNamesIndex.put(colName, colNamesIndex.size());
-		}
+		if (Objects.isNull(colName) || Objects.isNull(col))
+			throw new RuntimeException("The param 'colName' or 'col' in table cannot be null.");
+
+		if (!colNames.contains(colName))
+			throw new RuntimeException("The column '" + colName + "' to be replaced doesn't exist in the table.");
+
+		if (this.colRows != 0 && col.rows() != this.colRows)
+			throw new RuntimeException("The length of column " + colName + "  must be the same as the first column length: " + this.colRows +".");
+
+		colNames.add(colName);
+		colNamesIndex.put(colName, colNamesIndex.size());
+		columns.add(col);
+		this.colRows = col.rows();
 	}
 }

src/com/xxdb/streaming/client/MessageParser.java

@@ -62,10 +62,8 @@ public void run() {
 
             if (this.dBConnectionAndSocket == null ) {
                 throw new Exception("dBConnectionAndSocket is null!");
-            } else
-            {
-                if (this.dBConnectionAndSocket.socket != null)
-                {
+            } else {
+                if (this.dBConnectionAndSocket.socket != null) {
                     if (this.dBConnectionAndSocket.conn != null)
                         throw new Exception("Either conn or socket must be null!");
                     socket = this.dBConnectionAndSocket.socket;