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

Author: lucaijun

src/com/xxdb/DBConnection.java

@@ -177,18 +177,6 @@ private DBConnectionImpl(boolean asynTask, boolean sslEnable, boolean compress,
             this.lock_ = new ReentrantLock();
         }
 
-        private DBConnectionImpl(boolean asynTask, boolean sslEnable, boolean compress, boolean python, boolean ifUrgent, SqlStdEnum sqlStd){
-            sessionID_ = "";
-            this.sslEnable_ = sslEnable;
-            this.asynTask_ = asynTask;
-            this.compress_ = compress;
-            this.ifUrgent_ = ifUrgent;
-            this.python_ = python;
-            this.isReverseStreaming_ = false;
-            this.sqlStd_ = sqlStd;
-            this.lock_ = new ReentrantLock();
-        }
-
         private boolean connect(String hostName, int port, String userId, String password, int connTimeout) throws IOException{
             this.hostName_ = hostName;
             this.port_ = port;
@@ -245,6 +233,8 @@ private boolean connect()throws IOException{
                 return false;
             }
 
+            String msg = in_.readLine();
+
             isConnected_ = true;
 
             if (line.charAt(endPos + 1) == '0') {
@@ -447,17 +437,15 @@ private Entity run(String script, String scriptType, ProgressListener listener,
             if (asynTask_)
                 return null;
 
-            ExtendedDataInput in = remoteLittleEndian_ ? new LittleEndianDataInputStream(new BufferedInputStream(socket_.getInputStream())) :
-                    new BigEndianDataInputStream(new BufferedInputStream(socket_.getInputStream()));
             String header = null;
             try {
-                header = in.readLine();
+                header = in_.readLine();
                 while (header.equals("MSG")) {
                     //read intermediate message to indicate the progress
-                    String msg = in.readString();
+                    String msg = in_.readString();
                     if (listener != null)
                         listener.progress(msg);
-                    header = in.readLine();
+                    header = in_.readLine();
                 }
             }catch (IOException ex){
                 isConnected_ = false;
@@ -476,7 +464,7 @@ private Entity run(String script, String scriptType, ProgressListener listener,
             int numObject = Integer.parseInt(headers[1]);
 
             try {
-                header = in.readLine();
+                header = in_.readLine();
             }catch (IOException ex){
                 isConnected_ = false;
                 socket_ = null;
@@ -496,7 +484,7 @@ private Entity run(String script, String scriptType, ProgressListener listener,
 
             short flag;
             try {
-                flag = in.readShort();
+                flag = in_.readShort();
                 int form = flag >> 8;
                 int type = flag & 0xff;
                 boolean extended = type >= 128;
@@ -513,10 +501,10 @@ private Entity run(String script, String scriptType, ProgressListener listener,
 
 
                 if(fetchSize>0 && df == Entity.DATA_FORM.DF_VECTOR && dt == Entity.DATA_TYPE.DT_ANY){
-                    return new EntityBlockReader(in);
+                    return new EntityBlockReader(in_);
                 }
                 EntityFactory factory = BasicEntityFactory.instance();
-                return factory.createEntity(df, dt, in, extended);
+                return factory.createEntity(df, dt, in_, extended);
             }catch (IOException ex){
                 isConnected_ = false;
                 socket_ = null;
@@ -609,23 +597,23 @@ public DBConnection(boolean asynchronousTask, boolean useSSL, boolean compress)
     }
 
     public DBConnection(boolean asynchronousTask, boolean useSSL, boolean compress, boolean usePython){
-        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, false, SqlStdEnum.DolphinDB);
+        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, false, false, SqlStdEnum.DolphinDB);
         this.mutex_ = new ReentrantLock();
     }
 
 
     public DBConnection(boolean asynchronousTask, boolean useSSL, boolean compress, boolean usePython, SqlStdEnum sqlStd){
-        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, false, sqlStd);
+        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, false, false, sqlStd);
         this.mutex_ = new ReentrantLock();
     }
 
     public DBConnection(boolean asynchronousTask, boolean useSSL, boolean compress, boolean usePython, boolean isUrgent){
-        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, isUrgent, SqlStdEnum.DolphinDB);
+        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, isUrgent, false, SqlStdEnum.DolphinDB);
         this.mutex_ = new ReentrantLock();
     }
 
     public DBConnection(boolean asynchronousTask, boolean useSSL, boolean compress, boolean usePython, boolean isUrgent, SqlStdEnum sqlStd){
-        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, isUrgent, sqlStd);
+        this.conn_ = new DBConnectionImpl(asynchronousTask, useSSL, compress, usePython, isUrgent, false, sqlStd);
         this.mutex_ = new ReentrantLock();
     }
 

src/com/xxdb/data/BasicTable.java

@@ -130,9 +130,9 @@ public void setColName (final List<String> colNames) {
 	 */
 	public void replaceColName(String originalColName, String newColName) {
 		if (Utils.isEmpty(originalColName) || Utils.isEmpty(newColName))
-			throw new RuntimeException("The param 'newColName' cannot be null or empty.");
+			throw new RuntimeException("The param 'originalColName' or 'newColName' cannot be null or empty.");
 
-		if (!this.colNames.contains(originalColName) && this.colNames.contains(newColName))
+		if (this.colNames.contains(newColName))
 			throw new RuntimeException("The newColName '" + newColName +"' already exists in table. Column names cannot be duplicated.");
 
 		if (this.colNames.contains(originalColName)) {
@@ -410,9 +410,7 @@ public void replaceColumn(String colName, Vector col) {
 		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();
+		int index = colNames.indexOf(colName);
+		columns.set(index, col);
 	}
 }