Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2122


Ignore:
Timestamp:
06/28/09 14:28:30 (15 years ago)
Author:
svonolfe
Message:

Fixed issue related to the streaming of results (#680)

Location:
trunk/sources
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/HeuristicLab.Hive.Client.Communication-3.2.csproj

    r1939 r2122  
    140140    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponsePlugin.datasource" />
    141141    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseResultReceived.datasource" />
     142    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseSerializedJob.datasource" />
    142143    <None Include="Service References\ServerService\Arrays1.xsd" />
    143144    <None Include="Service References\ServerService\HeuristicLab.DataAccess1.xsd" />
    … …  
    146147    <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure.xsd" />
    147148    <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure2.xsd" />
    148     <None Include="Service References\ServerService\Message.xsd" />
     149    <None Include="Service References\ServerService\Message1.xsd" />
    149150    <None Include="Service References\ServerService\Reference.svcmap">
    150151      <Generator>WCF Proxy Generator</Generator>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/Arrays1.xsd

    r1594 r2122  
    2020  </xs:complexType>
    2121  <xs:element name="ArrayOfKeyValueOfguiddouble" nillable="true" type="tns:ArrayOfKeyValueOfguiddouble" />
     22  <xs:complexType name="ArrayOfguid">
     23    <xs:sequence>
     24      <xs:element minOccurs="0" maxOccurs="unbounded" name="guid" type="ser:guid" />
     25    </xs:sequence>
     26  </xs:complexType>
     27  <xs:element name="ArrayOfguid" nillable="true" type="tns:ArrayOfguid" />
    2228  <xs:complexType name="ArrayOfbase64Binary">
    2329    <xs:sequence>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/HeuristicLab.Hive.Contracts.BusinessObjects1.xsd

    r1939 r2122  
    5252      <xs:enumeration value="requestSnapshot" />
    5353      <xs:enumeration value="requestSnapshotSent" />
     54      <xs:enumeration value="pending" />
    5455    </xs:restriction>
    5556  </xs:simpleType>
    … …  
    6869      <xs:extension xmlns:q4="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess" base="q4:PersistableObject">
    6970        <xs:sequence>
     71          <xs:element xmlns:q5="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="AssignedResourceIds" nillable="true" type="q5:ArrayOfguid" />
    7072          <xs:element minOccurs="0" name="Client" nillable="true" type="tns:ClientInfo" />
    7173          <xs:element minOccurs="0" name="CoresNeeded" type="xs:int" />
    … …  
    7779          <xs:element minOccurs="0" name="PluginsNeeded" nillable="true" type="tns:ArrayOfHivePluginInfo" />
    7880          <xs:element minOccurs="0" name="Priority" type="xs:int" />
    79           <xs:element minOccurs="0" name="SerializedJob" nillable="true" type="xs:base64Binary" />
     81          <xs:element minOccurs="0" name="Project" nillable="true" type="tns:Project" />
    8082          <xs:element minOccurs="0" name="State" type="tns:State" />
    8183          <xs:element minOccurs="0" name="UserId" type="ser:guid" />
    … …  
    9395  <xs:complexType name="HivePluginInfo">
    9496    <xs:complexContent mixed="false">
    95       <xs:extension xmlns:q5="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess" base="q5:PersistableObject">
     97      <xs:extension xmlns:q6="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess" base="q6:PersistableObject">
    9698        <xs:sequence>
    9799          <xs:element minOccurs="0" name="BuildDate" type="xs:dateTime" />
    … …  
    103105  </xs:complexType>
    104106  <xs:element name="HivePluginInfo" nillable="true" type="tns:HivePluginInfo" />
     107  <xs:complexType name="Project">
     108    <xs:complexContent mixed="false">
     109      <xs:extension xmlns:q7="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess" base="q7:PersistableObject">
     110        <xs:sequence>
     111          <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
     112        </xs:sequence>
     113      </xs:extension>
     114    </xs:complexContent>
     115  </xs:complexType>
     116  <xs:element name="Project" nillable="true" type="tns:Project" />
     117  <xs:complexType name="SerializedJob">
     118    <xs:sequence>
     119      <xs:element minOccurs="0" name="JobInfo" nillable="true" type="tns:Job" />
     120      <xs:element minOccurs="0" name="SerializedJobData" nillable="true" type="xs:base64Binary" />
     121    </xs:sequence>
     122  </xs:complexType>
     123  <xs:element name="SerializedJob" nillable="true" type="tns:SerializedJob" />
    105124</xs:schema>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd

    r1939 r2122  
    4545      <xs:enumeration value="Shutdown" />
    4646      <xs:enumeration value="JobFailed" />
     47      <xs:enumeration value="UptimeLimitDisconnect" />
    4748    </xs:restriction>
    4849  </xs:simpleType>
    … …  
    5859  </xs:complexType>
    5960  <xs:element name="ResponseJob" nillable="true" type="tns:ResponseJob" />
     61  <xs:complexType name="ResponseSerializedJob">
     62    <xs:complexContent mixed="false">
     63      <xs:extension base="tns:Response">
     64        <xs:sequence>
     65          <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="Job" nillable="true" type="q2:SerializedJob" />
     66        </xs:sequence>
     67      </xs:extension>
     68    </xs:complexContent>
     69  </xs:complexType>
     70  <xs:element name="ResponseSerializedJob" nillable="true" type="tns:ResponseSerializedJob" />
    6071  <xs:complexType name="ResponseResultReceived">
    6172    <xs:complexContent mixed="false">
    … …  
    6374        <xs:sequence>
    6475          <xs:element minOccurs="0" name="JobId" type="ser:guid" />
     76          <xs:element minOccurs="0" name="JobResultId" type="ser:guid" />
    6577          <xs:element minOccurs="0" name="finished" type="xs:boolean" />
    6678        </xs:sequence>
    … …  
    7385      <xs:extension base="tns:Response">
    7486        <xs:sequence>
    75           <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="Plugins" nillable="true" type="q2:ArrayOfCachedHivePluginInfo" />
     87          <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="Plugins" nillable="true" type="q3:ArrayOfCachedHivePluginInfo" />
    7688        </xs:sequence>
    7789      </xs:extension>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/Reference.cs

    r2117 r2122  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3082
     4//     Runtime Version:2.0.50727.3053
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    1919        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHB))]
    2020        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseJob))]
     21        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseSerializedJob))]
    2122        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
    2223        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponsePlugin))]
    … …  
    4445        HeuristicLab.Hive.Contracts.ResponseJob EndSendJob(System.IAsyncResult result);
    4546       
     47        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendSerializedJob", ReplyAction="http://tempuri.org/IClientCommunicator/SendSerializedJobResponse")]
     48        HeuristicLab.Hive.Contracts.ResponseSerializedJob SendSerializedJob(System.Guid clientId);
     49       
     50        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendSerializedJob", ReplyAction="http://tempuri.org/IClientCommunicator/SendSerializedJobResponse")]
     51        System.IAsyncResult BeginSendSerializedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
     52       
     53        HeuristicLab.Hive.Contracts.ResponseSerializedJob EndSendSerializedJob(System.IAsyncResult result);
     54       
    4655        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/StoreFinishedJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/StoreFinishedJobResultResponse")]
    4756        HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, System.Exception exception);
    … …  
    6372        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHB))]
    6473        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseJob))]
     74        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseSerializedJob))]
    6575        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
    6676        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponsePlugin))]
    … …  
    7585        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHB))]
    7686        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseJob))]
     87        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseSerializedJob))]
    7788        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
    7889        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponsePlugin))]
    … …  
    195206    [System.Diagnostics.DebuggerStepThroughAttribute()]
    196207    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
     208    public partial class SendSerializedJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
     209       
     210        private object[] results;
     211       
     212        public SendSerializedJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
     213                base(exception, cancelled, userState) {
     214            this.results = results;
     215        }
     216       
     217        public HeuristicLab.Hive.Contracts.ResponseSerializedJob Result {
     218            get {
     219                base.RaiseExceptionIfNecessary();
     220                return ((HeuristicLab.Hive.Contracts.ResponseSerializedJob)(this.results[0]));
     221            }
     222        }
     223    }
     224   
     225    [System.Diagnostics.DebuggerStepThroughAttribute()]
     226    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
    197227    public partial class StoreFinishedJobResultCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    198228       
    … …  
    385415       
    386416        private System.Threading.SendOrPostCallback onSendJobCompletedDelegate;
     417       
     418        private BeginOperationDelegate onBeginSendSerializedJobDelegate;
     419       
     420        private EndOperationDelegate onEndSendSerializedJobDelegate;
     421       
     422        private System.Threading.SendOrPostCallback onSendSerializedJobCompletedDelegate;
    387423       
    388424        private BeginOperationDelegate onBeginStoreFinishedJobResultDelegate;
    … …  
    464500       
    465501        public event System.EventHandler<SendJobCompletedEventArgs> SendJobCompleted;
     502       
     503        public event System.EventHandler<SendSerializedJobCompletedEventArgs> SendSerializedJobCompleted;
    466504       
    467505        public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> StoreFinishedJobResultCompleted;
    … …  
    631669            base.InvokeAsync(this.onBeginSendJobDelegate, new object[] {
    632670                        clientId}, this.onEndSendJobDelegate, this.onSendJobCompletedDelegate, userState);
     671        }
     672       
     673        public HeuristicLab.Hive.Contracts.ResponseSerializedJob SendSerializedJob(System.Guid clientId) {
     674            return base.Channel.SendSerializedJob(clientId);
     675        }
     676       
     677        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     678        public System.IAsyncResult BeginSendSerializedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
     679            return base.Channel.BeginSendSerializedJob(clientId, callback, asyncState);
     680        }
     681       
     682        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     683        public HeuristicLab.Hive.Contracts.ResponseSerializedJob EndSendSerializedJob(System.IAsyncResult result) {
     684            return base.Channel.EndSendSerializedJob(result);
     685        }
     686       
     687        private System.IAsyncResult OnBeginSendSerializedJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
     688            System.Guid clientId = ((System.Guid)(inValues[0]));
     689            return this.BeginSendSerializedJob(clientId, callback, asyncState);
     690        }
     691       
     692        private object[] OnEndSendSerializedJob(System.IAsyncResult result) {
     693            HeuristicLab.Hive.Contracts.ResponseSerializedJob retVal = this.EndSendSerializedJob(result);
     694            return new object[] {
     695                    retVal};
     696        }
     697       
     698        private void OnSendSerializedJobCompleted(object state) {
     699            if ((this.SendSerializedJobCompleted != null)) {
     700                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
     701                this.SendSerializedJobCompleted(this, new SendSerializedJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
     702            }
     703        }
     704       
     705        public void SendSerializedJobAsync(System.Guid clientId) {
     706            this.SendSerializedJobAsync(clientId, null);
     707        }
     708       
     709        public void SendSerializedJobAsync(System.Guid clientId, object userState) {
     710            if ((this.onBeginSendSerializedJobDelegate == null)) {
     711                this.onBeginSendSerializedJobDelegate = new BeginOperationDelegate(this.OnBeginSendSerializedJob);
     712            }
     713            if ((this.onEndSendSerializedJobDelegate == null)) {
     714                this.onEndSendSerializedJobDelegate = new EndOperationDelegate(this.OnEndSendSerializedJob);
     715            }
     716            if ((this.onSendSerializedJobCompletedDelegate == null)) {
     717                this.onSendSerializedJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendSerializedJobCompleted);
     718            }
     719            base.InvokeAsync(this.onBeginSendSerializedJobDelegate, new object[] {
     720                        clientId}, this.onEndSendSerializedJobDelegate, this.onSendSerializedJobCompletedDelegate, userState);
    633721        }
    634722       

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/Reference.svcmap

    r1939 r2122  
    1818  </ClientOptions>
    1919  <MetadataSources>
    20     <MetadataSource Address="net.tcp://10.20.53.7:9000/HiveServer/mex" Protocol="mex" SourceId="1" />
     20    <MetadataSource Address="net.tcp://10.0.2.15:9000/HiveServer/mex" Protocol="mex" SourceId="1" />
    2121  </MetadataSources>
    2222  <Metadata>
    23     <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="d53938ec-48ba-418f-bb09-632f539cde8a" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    24     <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="a16a26be-18d5-4b62-a8d7-91b7bc268763" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    25     <MetadataFile FileName="service3.xsd" MetadataType="Schema" ID="4f67baa6-eb91-49e2-a96c-810e6d087176" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    26     <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="cb3b3f0d-0600-4026-bcb3-79ce12ad35e8" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    27     <MetadataFile FileName="HeuristicLab.DataAccess1.xsd" MetadataType="Schema" ID="a242f5d6-43b5-432f-896a-9e3690c252ed" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    28     <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="b3db33c3-5c13-42cc-a005-04e92465fe23" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    29     <MetadataFile FileName="Arrays1.xsd" MetadataType="Schema" ID="fefa8f39-1910-40e0-9ef1-e44ffc2f6345" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    30     <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="c92c72f7-5b07-4aa4-a719-1aabc2a53f18" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    31     <MetadataFile FileName="HeuristicLab.PluginInfrastructure2.xsd" MetadataType="Schema" ID="3a57272e-8914-4d62-b585-e69d27495bd4" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    32     <MetadataFile FileName="Message.xsd" MetadataType="Schema" ID="82cab27f-34e8-430c-be01-1d302547f342" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
     23    <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="67311a7a-922b-4675-a2bb-10ab57a84034" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     24    <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="b77a19d5-7c1f-453c-aab7-0899e51523ec" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     25    <MetadataFile FileName="service3.xsd" MetadataType="Schema" ID="f44e3d38-15e3-439c-87ef-f1fa9333bc3b" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     26    <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="770b7a79-ce79-43dc-9a74-d3343aa63612" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     27    <MetadataFile FileName="HeuristicLab.DataAccess1.xsd" MetadataType="Schema" ID="fbac237d-3ab8-487d-af6c-0fe4280cfdf3" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     28    <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="27f1b8eb-5d07-4ef1-949c-4d57e10b1301" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     29    <MetadataFile FileName="Arrays1.xsd" MetadataType="Schema" ID="17721bf1-192c-413b-9514-a9f214b3ae25" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     30    <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="69764c0a-dc15-4450-8089-3f7127023a79" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     31    <MetadataFile FileName="HeuristicLab.PluginInfrastructure2.xsd" MetadataType="Schema" ID="92730854-6687-4242-99b1-ce6d8282968e" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     32    <MetadataFile FileName="Message1.xsd" MetadataType="Schema" ID="34654b8c-c376-4952-82c5-7a7ea739b2bd" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
    3333  </Metadata>
    3434  <Extensions>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/configuration.svcinfo

    r1939 r2122  
    66  </bindings>
    77  <endpoints>
    8     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientFacade&quot; contract=&quot;ServerService.IClientFacade&quot; name=&quot;NetTcpBinding_IClientFacade&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08026@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientFacade&quot; contract=&quot;ServerService.IClientFacade&quot; name=&quot;NetTcpBinding_IClientFacade&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08026@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ServerService.IClientFacade" name="NetTcpBinding_IClientFacade" />
     8    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientFacade&quot; contract=&quot;ServerService.IClientFacade&quot; name=&quot;NetTcpBinding_IClientFacade&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;STEFAN-4710DBDB\Stefan&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientFacade&quot; contract=&quot;ServerService.IClientFacade&quot; name=&quot;NetTcpBinding_IClientFacade&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;STEFAN-4710DBDB\Stefan&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ServerService.IClientFacade" name="NetTcpBinding_IClientFacade" />
    99  </endpoints>
    1010</configurationSnapshot>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/configuration91.svcinfo

    r1939 r2122  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="s00QQcc2/XY558TAo0TIgu0l4q4=">
     2<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="kx3DG0eZsWj8OUKg2cLMJp8jj9s=">
    33  <bindingConfigurations>
    44    <bindingConfiguration bindingType="netTcpBinding" name="NetTcpBinding_IClientFacade">
    … …  
    107107  </bindingConfigurations>
    108108  <endpoints>
    109     <endpoint name="NetTcpBinding_IClientFacade" contract="ServerService.IClientFacade" bindingType="netTcpBinding" address="net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator" bindingConfiguration="NetTcpBinding_IClientFacade">
     109    <endpoint name="NetTcpBinding_IClientFacade" contract="ServerService.IClientFacade" bindingType="netTcpBinding" address="net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator" bindingConfiguration="NetTcpBinding_IClientFacade">
    110110      <properties>
    111111        <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    112           <serializedValue>net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator</serializedValue>
     112          <serializedValue>net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator</serializedValue>
    113113        </property>
    114114        <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    … …  
    137137        </property>
    138138        <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    139           <serializedValue>mse08026@fhs-hagenberg.ac.at</serializedValue>
     139          <serializedValue>STEFAN-4710DBDB\Stefan</serializedValue>
    140140        </property>
    141141        <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/service1.wsdl

    r1939 r2122  
    6767    <wsdl:part name="parameters" element="tns:SendJobResponse" />
    6868  </wsdl:message>
     69  <wsdl:message name="IClientFacade_SendSerializedJob_InputMessage">
     70    <wsdl:part name="parameters" element="tns:SendSerializedJob" />
     71  </wsdl:message>
     72  <wsdl:message name="IClientFacade_SendSerializedJob_OutputMessage">
     73    <wsdl:part name="parameters" element="tns:SendSerializedJobResponse" />
     74  </wsdl:message>
    6975  <wsdl:message name="IClientFacade_StoreFinishedJobResult_InputMessage">
    7076    <wsdl:part name="parameters" element="tns:StoreFinishedJobResult" />
    … …  
    133139      <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/SendJob" message="tns:IClientFacade_SendJob_InputMessage" />
    134140      <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/SendJobResponse" message="tns:IClientFacade_SendJob_OutputMessage" />
     141    </wsdl:operation>
     142    <wsdl:operation name="SendSerializedJob">
     143      <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/SendSerializedJob" message="tns:IClientFacade_SendSerializedJob_InputMessage" />
     144      <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/SendSerializedJobResponse" message="tns:IClientFacade_SendSerializedJob_OutputMessage" />
    135145    </wsdl:operation>
    136146    <wsdl:operation name="StoreFinishedJobResult">
    … …  
    202212      </wsdl:output>
    203213    </wsdl:operation>
     214    <wsdl:operation name="SendSerializedJob">
     215      <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/SendSerializedJob" style="document" />
     216      <wsdl:input>
     217        <soap12:body use="literal" />
     218      </wsdl:input>
     219      <wsdl:output>
     220        <soap12:body use="literal" />
     221      </wsdl:output>
     222    </wsdl:operation>
    204223    <wsdl:operation name="StoreFinishedJobResult">
    205224      <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/StoreFinishedJobResult" style="document" />
    … …  
    286305  <wsdl:service name="ClientFacade">
    287306    <wsdl:port name="NetTcpBinding_IClientFacade" binding="tns:NetTcpBinding_IClientFacade">
    288       <soap12:address location="net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator" />
     307      <soap12:address location="net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator" />
    289308      <wsa10:EndpointReference>
    290         <wsa10:Address>net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator</wsa10:Address>
     309        <wsa10:Address>net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator</wsa10:Address>
    291310        <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
    292           <Upn>mse08026@fhs-hagenberg.ac.at</Upn>
     311          <Upn>STEFAN-4710DBDB\Stefan</Upn>
    293312        </Identity>
    294313      </wsa10:EndpointReference>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/service2.xsd

    r1939 r2122  
    4848    </xs:complexType>
    4949  </xs:element>
     50  <xs:element name="SendSerializedJob">
     51    <xs:complexType>
     52      <xs:sequence>
     53        <xs:element xmlns:q7="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q7:guid" />
     54      </xs:sequence>
     55    </xs:complexType>
     56  </xs:element>
     57  <xs:element name="SendSerializedJobResponse">
     58    <xs:complexType>
     59      <xs:sequence>
     60        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendSerializedJobResult" nillable="true" type="q8:ResponseSerializedJob" />
     61      </xs:sequence>
     62    </xs:complexType>
     63  </xs:element>
    5064  <xs:element name="StoreFinishedJobResult">
    5165    <xs:complexType>
    5266      <xs:sequence>
    53         <xs:element xmlns:q7="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q7:guid" />
    54         <xs:element xmlns:q8="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="jobId" type="q8:guid" />
     67        <xs:element xmlns:q9="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q9:guid" />
     68        <xs:element xmlns:q10="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="jobId" type="q10:guid" />
    5569        <xs:element minOccurs="0" name="result" nillable="true" type="xs:base64Binary" />
    5670        <xs:element minOccurs="0" name="percentage" type="xs:double" />
    57         <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/System" minOccurs="0" name="exception" nillable="true" type="q9:Exception" />
     71        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/System" minOccurs="0" name="exception" nillable="true" type="q11:Exception" />
    5872      </xs:sequence>
    5973    </xs:complexType>
    … …  
    6276    <xs:complexType>
    6377      <xs:sequence>
    64         <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultResult" nillable="true" type="q10:ResponseResultReceived" />
     78        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultResult" nillable="true" type="q12:ResponseResultReceived" />
    6579      </xs:sequence>
    6680    </xs:complexType>
    … …  
    6983    <xs:complexType>
    7084      <xs:sequence>
    71         <xs:element xmlns:q11="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q11:guid" />
    72         <xs:element xmlns:q12="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="jobId" type="q12:guid" />
     85        <xs:element xmlns:q13="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q13:guid" />
     86        <xs:element xmlns:q14="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="jobId" type="q14:guid" />
    7387        <xs:element minOccurs="0" name="result" nillable="true" type="xs:base64Binary" />
    7488        <xs:element minOccurs="0" name="percentage" type="xs:double" />
    75         <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/System" minOccurs="0" name="exception" nillable="true" type="q13:Exception" />
     89        <xs:element xmlns:q15="http://schemas.datacontract.org/2004/07/System" minOccurs="0" name="exception" nillable="true" type="q15:Exception" />
    7690      </xs:sequence>
    7791    </xs:complexType>
    … …  
    8094    <xs:complexType>
    8195      <xs:sequence>
    82         <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotResult" nillable="true" type="q14:ResponseResultReceived" />
     96        <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotResult" nillable="true" type="q16:ResponseResultReceived" />
    8397      </xs:sequence>
    8498    </xs:complexType>
    … …  
    87101    <xs:complexType>
    88102      <xs:sequence>
    89         <xs:element xmlns:q15="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q15:guid" />
     103        <xs:element xmlns:q17="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q17:guid" />
    90104      </xs:sequence>
    91105    </xs:complexType>
    … …  
    94108    <xs:complexType>
    95109      <xs:sequence>
    96         <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LogoutResult" nillable="true" type="q16:Response" />
     110        <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LogoutResult" nillable="true" type="q18:Response" />
    97111      </xs:sequence>
    98112    </xs:complexType>
    … …  
    101115    <xs:complexType>
    102116      <xs:sequence>
    103         <xs:element xmlns:q17="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="jobId" type="q17:guid" />
     117        <xs:element xmlns:q19="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="jobId" type="q19:guid" />
    104118      </xs:sequence>
    105119    </xs:complexType>
    … …  
    108122    <xs:complexType>
    109123      <xs:sequence>
    110         <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="IsJobStillNeededResult" nillable="true" type="q18:Response" />
     124        <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="IsJobStillNeededResult" nillable="true" type="q20:Response" />
    111125      </xs:sequence>
    112126    </xs:complexType>
    … …  
    115129    <xs:complexType>
    116130      <xs:sequence>
    117         <xs:element xmlns:q19="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="pluginList" nillable="true" type="q19:ArrayOfHivePluginInfo" />
     131        <xs:element xmlns:q21="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="pluginList" nillable="true" type="q21:ArrayOfHivePluginInfo" />
    118132      </xs:sequence>
    119133    </xs:complexType>
    … …  
    122136    <xs:complexType>
    123137      <xs:sequence>
    124         <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendPluginsResult" nillable="true" type="q20:ResponsePlugin" />
     138        <xs:element xmlns:q22="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendPluginsResult" nillable="true" type="q22:ResponsePlugin" />
    125139      </xs:sequence>
    126140    </xs:complexType>
    … …  
    129143    <xs:complexType>
    130144      <xs:sequence>
    131         <xs:element xmlns:q21="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q21:guid" />
     145        <xs:element xmlns:q23="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q23:guid" />
    132146      </xs:sequence>
    133147    </xs:complexType>
    … …  
    136150    <xs:complexType>
    137151      <xs:sequence>
    138         <xs:element xmlns:q22="http://schemas.microsoft.com/Message" name="SendStreamedJobResult" type="q22:StreamBody" />
     152        <xs:element xmlns:q24="http://schemas.microsoft.com/Message" name="SendStreamedJobResult" type="q24:StreamBody" />
    139153      </xs:sequence>
    140154    </xs:complexType>
    … …  
    143157    <xs:complexType>
    144158      <xs:sequence>
    145         <xs:element xmlns:q23="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="pluginList" nillable="true" type="q23:ArrayOfHivePluginInfo" />
     159        <xs:element xmlns:q25="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="pluginList" nillable="true" type="q25:ArrayOfHivePluginInfo" />
    146160      </xs:sequence>
    147161    </xs:complexType>
    … …  
    150164    <xs:complexType>
    151165      <xs:sequence>
    152         <xs:element xmlns:q24="http://schemas.microsoft.com/Message" name="SendStreamedPluginsResult" type="q24:StreamBody" />
     166        <xs:element xmlns:q26="http://schemas.microsoft.com/Message" name="SendStreamedPluginsResult" type="q26:StreamBody" />
    153167      </xs:sequence>
    154168    </xs:complexType>
    … …  
    157171    <xs:complexType>
    158172      <xs:sequence>
    159         <xs:element xmlns:q25="http://schemas.microsoft.com/Message" name="stream" type="q25:StreamBody" />
     173        <xs:element xmlns:q27="http://schemas.microsoft.com/Message" name="stream" type="q27:StreamBody" />
    160174      </xs:sequence>
    161175    </xs:complexType>
    … …  
    164178    <xs:complexType>
    165179      <xs:sequence>
    166         <xs:element xmlns:q26="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultStreamedResult" nillable="true" type="q26:ResponseResultReceived" />
     180        <xs:element xmlns:q28="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultStreamedResult" nillable="true" type="q28:ResponseResultReceived" />
    167181      </xs:sequence>
    168182    </xs:complexType>
    … …  
    171185    <xs:complexType>
    172186      <xs:sequence>
    173         <xs:element xmlns:q27="http://schemas.microsoft.com/Message" name="stream" type="q27:StreamBody" />
     187        <xs:element xmlns:q29="http://schemas.microsoft.com/Message" name="stream" type="q29:StreamBody" />
    174188      </xs:sequence>
    175189    </xs:complexType>
    … …  
    178192    <xs:complexType>
    179193      <xs:sequence>
    180         <xs:element xmlns:q28="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotStreamedResult" nillable="true" type="q28:ResponseResultReceived" />
     194        <xs:element xmlns:q30="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotStreamedResult" nillable="true" type="q30:ResponseResultReceived" />
    181195      </xs:sequence>
    182196    </xs:complexType>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

    r2117 r2122  
    195195      if (e.Error == null) {
    196196        Stream stream = null;
     197        MemoryStream memStream = null;
    197198
    198199        try {
    … …  
    206207
    207208          //second deserialize the BLOB
    208           MemoryStream memStream = new MemoryStream();
     209          memStream = new MemoryStream();
     210
    209211          byte[] buffer = new byte[3024];
    210212          int read = 0;
    … …  
    213215          }
    214216
     217          memStream.Close();
     218
    215219          SendJobCompletedEventArgs completedEventArgs =
    216220            new SendJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
    … …  
    220224          if(stream != null)
    221225            stream.Dispose();
     226
     227          if (memStream != null)
     228            memStream.Dispose();
    222229        }
    223230      } else

  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/app.config

    r1939 r2122  
    2222        </bindings>
    2323        <client>
    24             <endpoint address="net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator"
     24            <endpoint address="net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator"
    2525                binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IClientFacade"
    2626                contract="ServerService.IClientFacade" name="NetTcpBinding_IClientFacade">
    2727                <identity>
    28                     <userPrincipalName value="mse08026@fhs-hagenberg.ac.at" />
     28                    <userPrincipalName value="STEFAN-4710DBDB\Stefan" />
    2929                </identity>
    3030            </endpoint>

  • trunk/sources/HeuristicLab.Hive.Contracts/3.2/ResponseResultReceived.cs

    r1530 r2122  
    3333    public Guid JobId { get; set; }
    3434    [DataMember]
     35    public Guid JobResultId { get; set; }
     36    [DataMember]
    3537    public bool finished { get; set; }
    3638  }

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

    r2117 r2122  
    3737using HeuristicLab.DataAccess.Interfaces;
    3838using System.IO;
     39using System.Runtime.Serialization.Formatters.Binary;
    3940
    4041namespace HeuristicLab.Hive.Server.Core {
    … …  
    465466
    466467    public ResponseResultReceived ProcessJobResult(
    467       JobResult result,
    468468      Stream stream,
    469469      bool finished) {
    … …  
    474474
    475475      try {
     476        BinaryFormatter formatter =
     477          new BinaryFormatter();
     478
     479        JobResult result =
     480          (JobResult)formatter.Deserialize(stream);
     481
    476482        tx = session.BeginTransaction();
    477483
    … …  
    485491          finished);
    486492
    487         //second deserialize the BLOB
    488         IJobResultsAdapter jobResultsAdapter =
    489           session.GetDataAdapter<JobResult, IJobResultsAdapter>();
    490 
    491         IJobAdapter jobAdapter =
    492           session.GetDataAdapter<Job, IJobAdapter>();
    493 
    494         jobResultStream =
    495           jobResultsAdapter.GetSerializedJobResultStream(result.Id, true);
    496 
    497         jobStream =
    498           jobAdapter.GetSerializedJobStream(result.JobId, true);
    499 
    500         byte[] buffer = new byte[3024];
    501         int read = 0;
    502         while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
    503           jobResultStream.Write(buffer, 0, read);
    504 
    505           if (finished)
     493        if (response.Success) {
     494          //second deserialize the BLOB
     495          IJobResultsAdapter jobResultsAdapter =
     496            session.GetDataAdapter<JobResult, IJobResultsAdapter>();
     497
     498          IJobAdapter jobAdapter =
     499            session.GetDataAdapter<Job, IJobAdapter>();
     500
     501          jobResultStream =
     502            jobResultsAdapter.GetSerializedJobResultStream(response.JobResultId, true);
     503
     504          jobStream =
     505            jobAdapter.GetSerializedJobStream(result.JobId, true);
     506
     507          byte[] buffer = new byte[3024];
     508          int read = 0;
     509          while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
     510            jobResultStream.Write(buffer, 0, read);
    506511            jobStream.Write(buffer, 0, read);
    507         }
    508 
    509         jobStream.Close();
    510 
    511         tx.Commit();
     512          }
     513
     514          jobResultStream.Close();
     515          jobStream.Close();
     516
     517          tx.Commit();
     518        }
    512519
    513520        return response;
    … …  
    565572          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
    566573          response.JobId = jobId;
     574          tx.Rollback();
    567575          return response;
    568576        }
    … …  
    570578          response.Success = false;
    571579          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
     580          tx.Rollback();
     581          return response;
    572582        }
    573583        if (job.JobInfo.Client == null) {
    … …  
    575585          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
    576586          response.JobId = jobId;
     587          tx.Rollback();
    577588          return response;
    578589        }
    … …  
    581592          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB;
    582593          response.JobId = jobId;
     594          tx.Rollback();
    583595          return response;
    584596        }
    … …  
    587599          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
    588600          response.JobId = jobId;
     601          tx.Rollback();
    589602          return response;
    590603        }
    … …  
    597610          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
    598611          response.JobId = jobId;
     612          tx.Rollback();
    599613          return response;
    600614        }
    … …  
    602616
    603617        if (finished) {
    604           job.JobInfo.State = State.finished;
    605           job.SerializedJobData = result;
    606           jobAdapter.UpdateSerializedJob(job);
    607         }
     618          job.JobInfo.State = State.finished;
     619        }
     620
     621        job.SerializedJobData = result;
     622        jobAdapter.UpdateSerializedJob(job);
    608623
    609624        List<JobResult> jobResults = new List<JobResult>(
    … …  
    625640
    626641        jobResultAdapter.UpdateSerializedJobResult(serializedjobResult);
    627         jobAdapter.Update(job.JobInfo);
    628642
    629643        response.Success = true;
    … …  
    631645        response.JobId = jobId;
    632646        response.finished = finished;
     647        response.JobResultId = jobResult.Id;
    633648
    634649        tx.Commit();

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientFacade.cs

    r2117 r2122  
    124124
    125125    public ResponseResultReceived StoreFinishedJobResultStreamed(Stream stream) {
    126       BinaryFormatter formatter =
    127           new BinaryFormatter();
    128 
    129       JobResult result =
    130         (JobResult)formatter.Deserialize(stream);
    131 
    132126      return ((IInternalClientCommunicator)
    133         clientCommunicator).ProcessJobResult(
    134           result, stream, true);
     127        clientCommunicator).ProcessJobResult(stream, true);
    135128    }
    136129
    137130    public ResponseResultReceived ProcessSnapshotStreamed(Stream stream) {
    138       BinaryFormatter formatter =
    139           new BinaryFormatter();
    140 
    141       JobResult result =
    142         (JobResult)formatter.Deserialize(stream);
    143 
    144131      return ((IInternalClientCommunicator)
    145         clientCommunicator).ProcessJobResult(
    146           result, stream, false);
     132        clientCommunicator).ProcessJobResult(stream, false);
    147133    }
    148134

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/DbTestApp.cs

    r2117 r2122  
    3232using HeuristicLab.DataAccess.Interfaces;
    3333using System.IO;
     34using HeuristicLab.Hive.Server.Core;
     35using HeuristicLab.Core;
    3436
    3537namespace HeuristicLab.Hive.Server {
    … …  
    301303
    302304      Stream s = jobAdapter.GetSerializedJobStream(
    303         new Guid("281602a2-1a47-4101-9a75-02974292d490"), true);
     305        new Guid("1b35f32b-d880-4c76-86af-4b4e283b30e6"), true);
     306
     307      int length = 0;
     308
     309      FileStream fs =
     310        new FileStream(@"W:\\result.gz", FileMode.Create);
    304311
    305312      byte[] buffer = new byte[1024];
    306       while(s.Read(buffer, 0, buffer.Length)>0)
     313      while((length = s.Read(buffer, 0, buffer.Length)) > 0)
    307314      {
    308          //do nothing
    309       }
    310 
     315        fs.Write(buffer, 0, length);
     316      }
     317
     318      fs.Close();
    311319      s.Close();
    312320
    313321      session.EndSession();
     322    }
     323
     324    private void TestJobResultStreaming() {
     325      ISessionFactory factory =
     326         ServiceLocator.GetSessionFactory();
     327
     328      ISession session =
     329           factory.GetSessionForCurrentThread();
     330
     331      IJobResultsAdapter jobResultsAdapter =
     332        session.GetDataAdapter<JobResult, IJobResultsAdapter>();
     333
     334      Stream s = jobResultsAdapter.GetSerializedJobResultStream(
     335        new Guid("c20b11a9-cde1-4d7f-8499-23dedb5a65ed"), true);
     336
     337      int length = 0;
     338
     339      FileStream fs =
     340        new FileStream(@"W:\\result.gz", FileMode.Create);
     341
     342      byte[] buffer = new byte[1024];
     343      while ((length = s.Read(buffer, 0, buffer.Length)) > 0) {
     344        fs.Write(buffer, 0, length);
     345      }
     346
     347      fs.Close();
     348      s.Close();
     349
     350      session.EndSession();
     351    }
     352
     353    private void TestJobResultDeserialization() {
     354      ExecutionEngineFacade executionEngineFacade =
     355        new ExecutionEngineFacade();
     356
     357     ResponseObject<SerializedJobResult> response =
     358       executionEngineFacade.GetLastSerializedResult(
     359       new Guid("56ce20bc-067b-424d-a7df-67aaace7c850"), false);
     360
     361       IStorable restoredJob =
     362         PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobResultData);
    314363    }
    315364
    … …  
    317366      //TestClientGroupAdapter();
    318367      //InsertTestClientGroups();
    319       TestJobStreaming();
     368      //TestJobStreaming();
     369      //TestJobResultStreaming();
     370      TestJobResultDeserialization();
    320371    }     
    321372  }

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/InternalInterfaces/IInternalClientCommunicator.cs

    r2117 r2122  
    3131  interface IInternalClientCommunicator {
    3232    ResponseResultReceived ProcessJobResult(
    33       JobResult result,
    3433      Stream stream,
    3534      bool finished);
Note: See TracChangeset for help on using the changeset viewer.