AJ-439: rename 'getUserID' to 'getUserId'; JAVAOS-147: optimize some code; AJ-442: AbstractClient support server to 300.

Author: chengyitian

src/com/xxdb/BasicDBTask.java

@@ -92,7 +92,7 @@ public void waitFor(int timeOut) {
 					synchronized (this) {
 						if (status == TaskStatus.PENDING) {
 							DBConnection connection = new DBConnection();
-							connection.connect(conn.getHostName(), conn.getPort(), conn.getUserID(), conn.getPwd());
+							connection.connect(conn.getHostName(), conn.getPort(), conn.getUserId(), conn.getPwd());
 							String sessionId = connection.getSessionID();
 							BasicStringVector bs = (BasicStringVector) connection.run("exec rootJobId from getConsoleJobs() where sessionId = " + sessionId);
 							List<Entity> arguments = new ArrayList<>();

src/com/xxdb/DBConnection.java

@@ -1269,7 +1269,7 @@ public int getPort() {
         return this.conn_.port_;
     }
 
-    public String getUserID(){
+    public String getUserId(){
         return this.conn_.userId_;
     }
 

src/com/xxdb/data/BasicDecimal128Vector.java

@@ -450,9 +450,9 @@ public void addRange(BigDecimal[] valueList) {
     public void Append(Scalar value) throws Exception{
         if (scale_ < 0)
             throw new RuntimeException("Please set scale first.");
-        if(value.getDataType() == DT_DECIMAL128) {
+
+        if(value.getDataType() == DT_DECIMAL128)
             add(value.getString());
-        }
         else
             add(value.getNumber().toString());
     }

src/com/xxdb/data/BasicDecimal32Vector.java

@@ -333,9 +333,9 @@ public void Append(Scalar value) throws Exception{
         if (scale_ < 0){
             throw new RuntimeException("Please set scale first.");
         }
-        if(value.getDataType() == DT_DECIMAL32) {
+
+        if(value.getDataType() == DT_DECIMAL32)
             add(value.getString());
-        }
         else
             add(value.getNumber().doubleValue());
     }

src/com/xxdb/data/BasicDecimal64Vector.java

@@ -9,8 +9,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
-
-import static com.xxdb.data.Entity.DATA_TYPE.DT_DECIMAL32;
 import static com.xxdb.data.Entity.DATA_TYPE.DT_DECIMAL64;
 
 public class BasicDecimal64Vector extends AbstractVector{
@@ -340,9 +338,9 @@ public void addRange(double[] valueList) {
     public void Append(Scalar value) throws Exception{
         if (scale_ < 0)
             throw new RuntimeException("Please set scale first.");
-        if(value.getDataType() == DT_DECIMAL64) {
+
+        if(value.getDataType() == DT_DECIMAL64)
             add(value.getString());
-        }
         else
             add(value.getNumber().doubleValue());
     }

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

@@ -608,7 +608,7 @@ void checkServerVersion(String host, int port) throws IOException {
         int v1 = Integer.parseInt(_[1]);
         int v2 = Integer.parseInt(_[2]);
 
-        if((v0 == 2 && v1 == 0 && v2 >= 9) || (v0 == 2 && v1 == 10)){
+        if((v0 == 2 && v1 == 0 && v2 >= 9) || (v0 == 2 && v1 == 10) || (v0 == 3 && v1 == 0 && v2 >= 0)){
             //server only support reverse connection
             listeningPort = 0;
         }else{