update

windancer2010 · windancer2010 · commit 9586400403b0 · 2020-08-16T14:23:16.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,11 @@ dolphindb_csharpapi/bin/Release/dolphindb_csharpapi.pdb
 dolphindb_csharpapi/dolphindb_csharpapi.csproj.user
 dolphindb_csharpapi/dolphindb_csharpapi.csproj.user
 *.user
+.vs/dolphindb_csharpapi/v15/.suo
+dolphindb_csharpapi/nuget.exe
+dolphindb_csharpapi/dolphindb_csharpapi.nuspec
+dolphindb_csharpapi/dolphindb_csharpapi.1.0.0.nupkg
+dolphindb_csharpapi/release.bat
+dolphindb_csharpapi_test/obj/Release/CoreCompileInputs.cache
+dolphindb_csharpapi/obj/Release/CoreCompileInputs.cache
+.vs/dolphindb_csharpapi/v15/.suo
diff --git a/.vs/dolphindb_csharpapi/v15/.suo b/.vs/dolphindb_csharpapi/v15/.suo
diff --git a/bin/dolphindb_csharpapi.dll b/bin/dolphindb_csharpapi.dll
diff --git a/dolphindb_csharpapi/DBConnection.cs b/dolphindb_csharpapi/DBConnection.cs
@@ -250,12 +250,12 @@ public virtual IEntity tryRun(string script)
             }
         }
 
-        public virtual IEntity run(string script)
+        public IEntity run(string script)
         {
             return run(script, (ProgressListener)null);
         }
 
-        public virtual bool tryReconnect()
+        public bool tryReconnect()
         {
             socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
             socket.Connect(hostName, port);
@@ -301,7 +301,7 @@ public virtual bool tryReconnect()
             return true;
         }
 
-        public virtual IEntity run(string script, ProgressListener listener)
+        public IEntity run(string script, ProgressListener listener)
         {
             lock (threadLock)
             {
@@ -455,7 +455,7 @@ public virtual IEntity run(string script, ProgressListener listener)
             }
         }
 
-        public virtual IEntity tryRun(string function, IList<IEntity> arguments)
+        public IEntity tryRun(string function, IList<IEntity> arguments)
         {
             if (isBusy())
             {
@@ -470,7 +470,7 @@ public virtual IEntity tryRun(string function, IList<IEntity> arguments)
             }
         }
 
-        public virtual IEntity run(string function, IList<IEntity> arguments)
+        public IEntity run(string function, IList<IEntity> arguments)
         {
             lock (threadLock)
             {
@@ -615,7 +615,7 @@ public virtual IEntity run(string function, IList<IEntity> arguments)
 
         }
 
-        public virtual void tryUpload(IDictionary<string, IEntity> variableObjectMap)
+        public void tryUpload(IDictionary<string, IEntity> variableObjectMap)
         {
             if (isBusy())
             {
@@ -629,7 +629,7 @@ public virtual void tryUpload(IDictionary<string, IEntity> variableObjectMap)
             {
             }
         }
-        public virtual void upload(IDictionary<string, IEntity> variableObjectMap)
+        public void upload(IDictionary<string, IEntity> variableObjectMap)
         {
             if (variableObjectMap == null || variableObjectMap.Count == 0)
             {
@@ -745,11 +745,43 @@ public virtual void upload(IDictionary<string, IEntity> variableObjectMap)
                         }
                         if (this.startup != "") run(startup);
                     }
+
+                    int numObject = int.Parse(headers[1]);
+
                     string msg = @in.readLine();
                     if (!msg.Equals("OK"))
                     {
                         throw new IOException(msg);
                     }
+
+                    if (numObject > 0)
+                    {
+                        try
+                        {
+                            short flag = @in.readShort();
+                            int form = flag >> 8;
+                            int type = flag & 0xff;
+
+                            if (form < 0 || form > MAX_FORM_VALUE)
+                            {
+                                throw new IOException("Invalid form value: " + form);
+                            }
+                            if (type < 0 || type > MAX_TYPE_VALUE)
+                            {
+                                throw new IOException("Invalid type value: " + type);
+                            }
+
+                            DATA_FORM df = (DATA_FORM)Enum.GetValues(typeof(DATA_FORM)).GetValue(form);
+                            DATA_TYPE dt = (DATA_TYPE)Enum.GetValues(typeof(DATA_TYPE)).GetValue(type);
+
+                            IEntity re = factory.createEntity(df, dt, @in);
+                        }
+                        catch (IOException ex)
+                        {
+                            socket = null;
+                            throw ex;
+                        }
+                    }
                 }
                 finally
                 {
diff --git a/dolphindb_csharpapi/Properties/AssemblyInfo.cs b/dolphindb_csharpapi/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.10")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/dolphindb_csharpapi/bin/Release/dolphindb_csharpapi.dll b/dolphindb_csharpapi/bin/Release/dolphindb_csharpapi.dll
diff --git a/dolphindb_csharpapi/obj/Release/CoreCompileInputs.cache b/dolphindb_csharpapi/obj/Release/CoreCompileInputs.cache
@@ -1 +1 @@
-b94b533843c0749de21218a97cc9b7645b7a9542
+5f31fec995e3516ee8132f57a767782ea8ecadbb
diff --git a/dolphindb_csharpapi/pack.bat b/dolphindb_csharpapi/pack.bat
@@ -0,0 +1 @@
+Nuget pack dolphindb_csharpapi.csproj
diff --git a/dolphindb_csharpapi/streaming/AbstractClient.cs b/dolphindb_csharpapi/streaming/AbstractClient.cs
@@ -275,7 +275,9 @@ protected void unsubscribeInternal(string host, int port, string tableName, stri
             dbConn.connect(host, port);
             try
             {
-                string localIP = dbConn.LocalAddress;
+                string localIP = listeningHost;
+                if (localIP == null || localIP.Equals(String.Empty))
+                    localIP = dbConn.LocalAddress; 
                 List<IEntity> @params = new List<IEntity>
                 {
                     new BasicString(localIP),
diff --git a/dolphindb_csharpapi_test/.gitignore b/dolphindb_csharpapi_test/.gitignore
@@ -0,0 +1 @@
+/*.user
diff --git a/dolphindb_csharpapi_test/DBConnection_test.cs b/dolphindb_csharpapi_test/DBConnection_test.cs
@@ -17,8 +17,8 @@ namespace dolphindb_csharpapi_test
     [TestClass]
     public class DBConnection_test
     {
-        private readonly string SERVER = "115.239.209.224";
-        private readonly int PORT = 18531;
+        private readonly string SERVER = "localhost";
+        private readonly int PORT = 8848;
         private readonly string USER = "admin";
         private readonly string PASSWORD = "123456";
 
@@ -89,11 +89,8 @@ public void Test_Connect()
         public void Test_Connect_withLogin()
         {
             DBConnection db = new DBConnection();
-            db.connect(SERVER, PORT);
-            // Assert.AreEqual(true, db.connect(SERVER, PORT,"admin","1234567"));
-            db.login("admin", "123456", false);
-            //db.login("admin", "123456", true);
-            //db.run("login('admin', '123456')");
+            bool re = db.connect(SERVER, PORT);
+            Assert.AreEqual(true, re);
         }
 
 
diff --git a/dolphindb_csharpapi_test/dolphindb_csharpapi_test.csproj b/dolphindb_csharpapi_test/dolphindb_csharpapi_test.csproj
@@ -39,7 +39,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject />
+    <StartupObject>
+    </StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
diff --git a/dolphindb_csharpapi_test/obj/Release/CoreCompileInputs.cache b/dolphindb_csharpapi_test/obj/Release/CoreCompileInputs.cache
@@ -1 +1 @@
-30a0a5f3a7d94db4563d8ebe4a2c3b117abaa6b3
+4748b03433637aad6ec2921e84bbfa360c7da0f1

Original file line number	Diff line number	Diff line change
`@@ -250,12 +250,12 @@ public virtual IEntity tryRun(string script)`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
`253`		`- public virtual IEntity run(string script)`
	`253`	`+ public IEntity run(string script)`
`254`	`254`	`{`
`255`	`255`	`return run(script, (ProgressListener)null);`
`256`	`256`	`}`
`257`	`257`
`258`		`- public virtual bool tryReconnect()`
	`258`	`+ public bool tryReconnect()`
`259`	`259`	`{`
`260`	`260`	`socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);`
`261`	`261`	`socket.Connect(hostName, port);`
`@@ -301,7 +301,7 @@ public virtual bool tryReconnect()`
`301`	`301`	`return true;`
`302`	`302`	`}`
`303`	`303`
`304`		`- public virtual IEntity run(string script, ProgressListener listener)`
	`304`	`+ public IEntity run(string script, ProgressListener listener)`
`305`	`305`	`{`
`306`	`306`	`lock (threadLock)`
`307`	`307`	`{`
`@@ -455,7 +455,7 @@ public virtual IEntity run(string script, ProgressListener listener)`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`458`		`- public virtual IEntity tryRun(string function, IList<IEntity> arguments)`
	`458`	`+ public IEntity tryRun(string function, IList<IEntity> arguments)`
`459`	`459`	`{`
`460`	`460`	`if (isBusy())`
`461`	`461`	`{`
`@@ -470,7 +470,7 @@ public virtual IEntity tryRun(string function, IList<IEntity> arguments)`
`470`	`470`	`}`
`471`	`471`	`}`
`472`	`472`
`473`		`- public virtual IEntity run(string function, IList<IEntity> arguments)`
	`473`	`+ public IEntity run(string function, IList<IEntity> arguments)`
`474`	`474`	`{`
`475`	`475`	`lock (threadLock)`
`476`	`476`	`{`
`@@ -615,7 +615,7 @@ public virtual IEntity run(string function, IList<IEntity> arguments)`
`615`	`615`
`616`	`616`	`}`
`617`	`617`
`618`		`- public virtual void tryUpload(IDictionary<string, IEntity> variableObjectMap)`
	`618`	`+ public void tryUpload(IDictionary<string, IEntity> variableObjectMap)`
`619`	`619`	`{`
`620`	`620`	`if (isBusy())`
`621`	`621`	`{`
`@@ -629,7 +629,7 @@ public virtual void tryUpload(IDictionary<string, IEntity> variableObjectMap)`
`629`	`629`	`{`
`630`	`630`	`}`
`631`	`631`	`}`
`632`		`- public virtual void upload(IDictionary<string, IEntity> variableObjectMap)`
	`632`	`+ public void upload(IDictionary<string, IEntity> variableObjectMap)`
`633`	`633`	`{`
`634`	`634`	`if (variableObjectMap == null \|\| variableObjectMap.Count == 0)`
`635`	`635`	`{`
`@@ -745,11 +745,43 @@ public virtual void upload(IDictionary<string, IEntity> variableObjectMap)`
`745`	`745`	`}`
`746`	`746`	`if (this.startup != "") run(startup);`
`747`	`747`	`}`
	`748`	`+`
	`749`	`+ int numObject = int.Parse(headers[1]);`
	`750`	`+`
`748`	`751`	`string msg = @in.readLine();`
`749`	`752`	`if (!msg.Equals("OK"))`
`750`	`753`	`{`
`751`	`754`	`throw new IOException(msg);`
`752`	`755`	`}`
	`756`	`+`
	`757`	`+ if (numObject > 0)`
	`758`	`+ {`
	`759`	`+ try`
	`760`	`+ {`
	`761`	`+ short flag = @in.readShort();`
	`762`	`+ int form = flag >> 8;`
	`763`	`+ int type = flag & 0xff;`
	`764`	`+`
	`765`	`+ if (form < 0 \|\| form > MAX_FORM_VALUE)`
	`766`	`+ {`
	`767`	`+ throw new IOException("Invalid form value: " + form);`
	`768`	`+ }`
	`769`	`+ if (type < 0 \|\| type > MAX_TYPE_VALUE)`
	`770`	`+ {`
	`771`	`+ throw new IOException("Invalid type value: " + type);`
	`772`	`+ }`
	`773`	`+`
	`774`	`+ DATA_FORM df = (DATA_FORM)Enum.GetValues(typeof(DATA_FORM)).GetValue(form);`
	`775`	`+ DATA_TYPE dt = (DATA_TYPE)Enum.GetValues(typeof(DATA_TYPE)).GetValue(type);`
	`776`	`+`
	`777`	`+ IEntity re = factory.createEntity(df, dt, @in);`
	`778`	`+ }`
	`779`	`+ catch (IOException ex)`
	`780`	`+ {`
	`781`	`+ socket = null;`
	`782`	`+ throw ex;`
	`783`	`+ }`
	`784`	`+ }`
`753`	`785`	`}`
`754`	`786`	`finally`
`755`	`787`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b94b533843c0749de21218a97cc9b7645b7a9542`
	`1`	`+5f31fec995e3516ee8132f57a767782ea8ecadbb`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,9 @@ protected void unsubscribeInternal(string host, int port, string tableName, stri`
`275`	`275`	`dbConn.connect(host, port);`
`276`	`276`	`try`
`277`	`277`	`{`
`278`		`- string localIP = dbConn.LocalAddress;`
	`278`	`+ string localIP = listeningHost;`
	`279`	`+ if (localIP == null \|\| localIP.Equals(String.Empty))`
	`280`	`+ localIP = dbConn.LocalAddress;`
`279`	`281`	`List<IEntity> @params = new List<IEntity>`
`280`	`282`	`{`
`281`	`283`	`new BasicString(localIP),`