update 0.94

windancer79 · windancer79 · commit 0bf5817b97e2 · 2019-03-25T20:50:23.000+08:00
diff --git a/README.md b/README.md
diff --git a/README_CN.md b/README_CN.md
diff --git a/dolphindb_csharpapi/DBConnection.cs b/dolphindb_csharpapi/DBConnection.cs
@@ -375,6 +375,7 @@ public virtual IEntity run(string script, ProgressListener listener)
                     {
                         login();
                     }
+                    if (this.initialScript != "") run(initialScript);
                 }
                 int numObject = int.Parse(headers[1]);
 
@@ -519,6 +520,7 @@ public virtual IEntity run(string function, IList<IEntity> arguments)
                         {
                             login();
                         }
+                        if (this.initialScript != "") run(initialScript);
                     }
                     int numObject = int.Parse(headers[1]);
 
@@ -684,6 +686,7 @@ public virtual void upload(IDictionary<string, IEntity> variableObjectMap)
                         {
                             login();
                         }
+                        if (this.initialScript != "") run(initialScript);
                     }
                     string msg = @in.readLine();
                     if (!msg.Equals("OK"))
diff --git a/dolphindb_csharpapi/data/BasicDate.cs b/dolphindb_csharpapi/data/BasicDate.cs
@@ -78,6 +78,14 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicInt)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if (value != null && value.GetType() == Type.GetType("System.DateTime"))
+            {
+                base.setObject(Utils.countDays(Convert.ToDateTime(value)));
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicDateTime.cs b/dolphindb_csharpapi/data/BasicDateTime.cs
@@ -79,6 +79,14 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicInt)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if(value != null && value.GetType() == Type.GetType("System.DateTime"))
+            {
+                base.setObject(Utils.countSeconds(Convert.ToDateTime(value)));
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicMinute.cs b/dolphindb_csharpapi/data/BasicMinute.cs
@@ -79,6 +79,14 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicInt)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if (value != null && value.GetType() == Type.GetType("System.TimeSpan"))
+            {
+                base.setObject(Utils.countMinutes((TimeSpan)value));
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicMonth.cs b/dolphindb_csharpapi/data/BasicMonth.cs
@@ -85,6 +85,15 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicInt)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if (value != null && value.GetType() == Type.GetType("System.DateTime"))
+            {
+                var v = (DateTime)value;
+                base.setObject(v.Year * 12 + v.Month - 1);
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicNanoTime.cs b/dolphindb_csharpapi/data/BasicNanoTime.cs
@@ -8,7 +8,7 @@ public class BasicNanoTime : BasicLong
     {
         private static string format = "c";
 
-        public BasicNanoTime(DateTime value) : base(Utils.countNanoseconds(value))
+        public BasicNanoTime(TimeSpan value) : base(Utils.countNanoseconds(value))
         {
         }
 
@@ -80,6 +80,14 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicLong)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if (value != null && value.GetType() == Type.GetType("System.TimeSpan"))
+            {
+                base.setObject(Utils.countNanoseconds((TimeSpan)value));
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicNanoTimestamp.cs b/dolphindb_csharpapi/data/BasicNanoTimestamp.cs
@@ -77,6 +77,14 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicLong)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if (value != null && value.GetType() == Type.GetType("System.DateTime"))
+            {
+                base.setObject(Utils.countNanoseconds(Convert.ToDateTime(value)));
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicSecond.cs b/dolphindb_csharpapi/data/BasicSecond.cs
@@ -81,6 +81,14 @@ public override bool Equals(object o)
 				return base.getValue() == ((BasicInt)o).getValue();
 			}
 		}
-	}
+
+        public override void setObject(object value)
+        {
+            if (value != null && value.GetType() == Type.GetType("System.TimeSpan"))
+            {
+                base.setObject(Utils.countSeconds((TimeSpan)value));
+            }
+        }
+    }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicTable.cs b/dolphindb_csharpapi/data/BasicTable.cs
@@ -146,6 +146,11 @@ public virtual string getColumnName(int index)
             return names_[index];
         }
 
+        public virtual IList<string> getColumnNames()
+        {
+            return names_;
+        }
+
         public virtual string getString()
         {
             int rows = Math.Min(Utils.DISPLAY_ROWS, this.rows());
@@ -547,6 +552,7 @@ public object getObject()
         {
             throw new NotImplementedException();
         }
+
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicTime.cs b/dolphindb_csharpapi/data/BasicTime.cs
@@ -79,6 +79,15 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicInt)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if (value != null && value.GetType() == Type.GetType("System.TimeSpan"))
+            {
+                var t = (TimeSpan)value;
+                base.setObject(Utils.countMilliseconds(t.Hours,t.Minutes,t.Seconds,t.Milliseconds));
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/BasicTimestamp.cs b/dolphindb_csharpapi/data/BasicTimestamp.cs
@@ -81,6 +81,14 @@ public override bool Equals(object o)
                 return base.getValue() == ((BasicLong)o).getValue();
             }
         }
+
+        public override void setObject(object value)
+        {
+            if (value!=null && value.GetType() == Type.GetType("System.DateTime"))
+            {
+                base.setObject(Utils.countMilliseconds(Convert.ToDateTime(value)));
+            }
+        }
     }
 
 }
diff --git a/dolphindb_csharpapi/data/ITable.cs b/dolphindb_csharpapi/data/ITable.cs
@@ -1,10 +1,13 @@
-﻿namespace dolphindb.data
+﻿using System.Collections.Generic;
+
+namespace dolphindb.data
 {
     public interface ITable : IEntity
     {
         IVector getColumn(int index);
         IVector getColumn(string name);
         string getColumnName(int index);
+        IList<string> getColumnNames();
     }
 
 }
diff --git a/dolphindb_csharpapi/io/AbstractExtendedDataInputStream.cs b/dolphindb_csharpapi/io/AbstractExtendedDataInputStream.cs
@@ -54,11 +54,14 @@ public int skipBytes(int n)
 
         protected internal virtual byte readAndCheckByte()
         {
-            byte b = ReadByte();
+            int b = this.Read();
 
-            byte b1 = b;
+            if (-1 == b)
+            {
+                throw new EndOfStreamException();
+            }
 
-            return (byte)b1;
+            return (byte)b;
         }
 
         protected internal virtual int fromBytes(byte b1, byte b2, byte b3, byte b4)
diff --git a/dolphindb_csharpapi/streaming/MessageParser.cs b/dolphindb_csharpapi/streaming/MessageParser.cs
@@ -94,7 +94,12 @@ public void run()
                     {
                         throw;
                     }
-                    if (body.isVector())
+                    if (body.isTable())
+                    {
+                        if (body.rows() != 0)
+                            throw new Exception("When message is table, it should be empty.");
+                    }
+                    else if (body.isVector())
                     {
                         BasicAnyVector dTable = (BasicAnyVector)body;
 
@@ -128,7 +133,7 @@ public void run()
                     }
                     else
                     {
-                        throw new Exception("message body has an invalid format.vector is expected");
+                        throw new Exception("message body has an invalid format. Vector or table is expected");
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -375,6 +375,7 @@ public virtual IEntity run(string script, ProgressListener listener)`
`375`	`375`	`{`
`376`	`376`	`login();`
`377`	`377`	`}`
	`378`	`+ if (this.initialScript != "") run(initialScript);`
`378`	`379`	`}`
`379`	`380`	`int numObject = int.Parse(headers[1]);`
`380`	`381`
`@@ -519,6 +520,7 @@ public virtual IEntity run(string function, IList<IEntity> arguments)`
`519`	`520`	`{`
`520`	`521`	`login();`
`521`	`522`	`}`
	`523`	`+ if (this.initialScript != "") run(initialScript);`
`522`	`524`	`}`
`523`	`525`	`int numObject = int.Parse(headers[1]);`
`524`	`526`
`@@ -684,6 +686,7 @@ public virtual void upload(IDictionary<string, IEntity> variableObjectMap)`
`684`	`686`	`{`
`685`	`687`	`login();`
`686`	`688`	`}`
	`689`	`+ if (this.initialScript != "") run(initialScript);`
`687`	`690`	`}`
`688`	`691`	`string msg = @in.readLine();`
`689`	`692`	`if (!msg.Equals("OK"))`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,14 @@ public override bool Equals(object o)`
`78`	`78`	`return base.getValue() == ((BasicInt)o).getValue();`
`79`	`79`	`}`
`80`	`80`	`}`
	`81`	`+`
	`82`	`+ public override void setObject(object value)`
	`83`	`+ {`
	`84`	`+ if (value != null && value.GetType() == Type.GetType("System.DateTime"))`
	`85`	`+ {`
	`86`	`+ base.setObject(Utils.countDays(Convert.ToDateTime(value)));`
	`87`	`+ }`
	`88`	`+ }`
`81`	`89`	`}`
`82`	`90`
`83`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,14 @@ public override bool Equals(object o)`
`79`	`79`	`return base.getValue() == ((BasicInt)o).getValue();`
`80`	`80`	`}`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ public override void setObject(object value)`
	`84`	`+ {`
	`85`	`+ if(value != null && value.GetType() == Type.GetType("System.DateTime"))`
	`86`	`+ {`
	`87`	`+ base.setObject(Utils.countSeconds(Convert.ToDateTime(value)));`
	`88`	`+ }`
	`89`	`+ }`
`82`	`90`	`}`
`83`	`91`
`84`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,15 @@ public override bool Equals(object o)`
`85`	`85`	`return base.getValue() == ((BasicInt)o).getValue();`
`86`	`86`	`}`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ public override void setObject(object value)`
	`90`	`+ {`
	`91`	`+ if (value != null && value.GetType() == Type.GetType("System.DateTime"))`
	`92`	`+ {`
	`93`	`+ var v = (DateTime)value;`
	`94`	`+ base.setObject(v.Year * 12 + v.Month - 1);`
	`95`	`+ }`
	`96`	`+ }`
`88`	`97`	`}`
`89`	`98`
`90`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class BasicNanoTime : BasicLong`
`8`	`8`	`{`
`9`	`9`	`private static string format = "c";`
`10`	`10`
`11`		`- public BasicNanoTime(DateTime value) : base(Utils.countNanoseconds(value))`
	`11`	`+ public BasicNanoTime(TimeSpan value) : base(Utils.countNanoseconds(value))`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`@@ -80,6 +80,14 @@ public override bool Equals(object o)`
`80`	`80`	`return base.getValue() == ((BasicLong)o).getValue();`
`81`	`81`	`}`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+ public override void setObject(object value)`
	`85`	`+ {`
	`86`	`+ if (value != null && value.GetType() == Type.GetType("System.TimeSpan"))`
	`87`	`+ {`
	`88`	`+ base.setObject(Utils.countNanoseconds((TimeSpan)value));`
	`89`	`+ }`
	`90`	`+ }`
`83`	`91`	`}`
`84`	`92`
`85`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,14 @@ public override bool Equals(object o)`
`77`	`77`	`return base.getValue() == ((BasicLong)o).getValue();`
`78`	`78`	`}`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ public override void setObject(object value)`
	`82`	`+ {`
	`83`	`+ if (value != null && value.GetType() == Type.GetType("System.DateTime"))`
	`84`	`+ {`
	`85`	`+ base.setObject(Utils.countNanoseconds(Convert.ToDateTime(value)));`
	`86`	`+ }`
	`87`	`+ }`
`80`	`88`	`}`
`81`	`89`
`82`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,14 @@ public override bool Equals(object o)`
`81`	`81`	`return base.getValue() == ((BasicInt)o).getValue();`
`82`	`82`	`}`
`83`	`83`	`}`
`84`		`- }`
	`84`	`+`
	`85`	`+ public override void setObject(object value)`
	`86`	`+ {`
	`87`	`+ if (value != null && value.GetType() == Type.GetType("System.TimeSpan"))`
	`88`	`+ {`
	`89`	`+ base.setObject(Utils.countSeconds((TimeSpan)value));`
	`90`	`+ }`
	`91`	`+ }`
	`92`	`+ }`
`85`	`93`
`86`	`94`	`}`