支持解析V1与V2同时出现在同一文件中的功能

wukan1986 · wukan1986 · commit 193f68d33622 · 2015-04-27T15:08:59.000+08:00
diff --git a/QuantBox.Data.Serializer/Converter/V1_to_V2.cs b/QuantBox.Data.Serializer/Converter/V1_to_V2.cs
@@ -16,9 +16,13 @@ public class V1_to_V2
         /// <returns></returns>
         public static V2.PbTick Converter(V1.PbTick oldTick)
         {
+            if (oldTick == null)
+                return null;
+
             V2.PbTick tick = new V2.PbTick();
 
             tick.Config = new V2.ConfigInfo().Default();
+            tick.Config.Version = oldTick.Config.Version;
             tick.Config.AveragePriceMultiplier = oldTick.Config.AveragePriceMultiplier;
             tick.Config.ContractMultiplier = oldTick.Config.ContractMultiplier;
             tick.Config.SettlementPriceMultiplier = oldTick.Config.SettlementPriceMultiplier;
diff --git a/QuantBox.Data.Serializer/PbTickSerializer.cs b/QuantBox.Data.Serializer/PbTickSerializer.cs
@@ -15,40 +15,53 @@ public class PbTickSerializer
     {
         private V1.PbTickSerializer v1Reader = new V1.PbTickSerializer();
         private V2.PbTickSerializer v2Reader = new V2.PbTickSerializer();
-        private bool bV2 = true;
-
-        //public PbTickCodec Codec = new PbTickCodec();
-
+        private int nVersion = 2;
+        private int nMaxVersion = 2;
+        
         public V2.PbTick ReadOne(Stream stream)
         {
+            // 计划如果简单的将V2和V1的文件合并成一个文件也能读取
             long Position = stream.Position;
             V2.PbTick tick = null;
 
-            try
+            bool bFisrtException = true;
+
+            do
             {
-                if(bV2)
+                try
                 {
-                    tick = v2Reader.ReadOne(stream);
+                    switch (nVersion)
+                    {
+                        case 1:
+                            tick = V1_to_V2.Converter(v1Reader.ReadOne(stream));
+                            break;
+                        case 2:
+                            tick = v2Reader.ReadOne(stream);
+                            break;
+                        default:
+                            throw new Exception(string.Format("Invalid file, version {0}", nVersion));
+                    }
+                    return tick;
                 }
-                else
+                catch (ProtobufDataZeroException ex)
                 {
-                    V1.PbTick tmp = v1Reader.ReadOne(stream);
-                    if (tmp == null)
-                        return null;
-                    tick = V1_to_V2.Converter(tmp);
+                    bFisrtException = false;
+                    nVersion = ex.CurrentVersion;
+                    stream.Seek(Position, SeekOrigin.Begin);
                 }
-            }
-            catch
-            {
-                bV2 = false;
-                stream.Seek(Position, SeekOrigin.Begin);
-                V1.PbTick tmp = v1Reader.ReadOne(stream);
-                if (tmp == null)
-                    return null;
-                tick = V1_to_V2.Converter(tmp);
-            }
+                catch(ProtoException ex)
+                {
+                    // 第一次出现问题后，从最新格式开始向后进行解析
+                    if (bFisrtException)
+                        nVersion = nMaxVersion;
+                    else
+                        --nVersion;
+
+                    bFisrtException = false;
+                    stream.Seek(Position, SeekOrigin.Begin);
+                }
+            }while(true);
 
-            //Codec.Config = tick.Config;
             return tick;
         }
 
diff --git a/QuantBox.Data.Serializer/ProtobufDataZeroException.cs b/QuantBox.Data.Serializer/ProtobufDataZeroException.cs
@@ -0,0 +1,18 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace QuantBox.Data.Serializer
+{
+    public class ProtobufDataZeroException:Exception
+    {
+        public int CurrentVersion;
+        public int ExpectVersion;
+        public ProtobufDataZeroException(string message,int currentVersion,int expectVersion):base(message)
+        {
+            CurrentVersion = currentVersion;
+            ExpectVersion = expectVersion;
+        }
+    }
+}
diff --git a/QuantBox.Data.Serializer/QuantBox.Data.Serializer.csproj b/QuantBox.Data.Serializer/QuantBox.Data.Serializer.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converter\V1_to_V2.cs" />
+    <Compile Include="ProtobufDataZeroException.cs" />
     <Compile Include="PbTickSerializer.cs" />
     <Compile Include="V1\Double2IntConverter.cs" />
     <Compile Include="V1\DoubleContract.cs" />
diff --git a/QuantBox.Data.Serializer/V1/PbTickSerializer.cs b/QuantBox.Data.Serializer/V1/PbTickSerializer.cs
@@ -52,7 +52,7 @@ public PbTick ReadOne(Stream source)
             _lastRead = Codec.Restore(_lastRead, raw);
             if (_lastRead.Config.Version != 1)
             {
-                throw new InvalidDataException("only support pd0 file version 1");
+                throw new ProtobufDataZeroException("only support pd0 file version 1", _lastRead.Config.Version, 1);
             }
             return _lastRead;
         }
diff --git a/QuantBox.Data.Serializer/V2/PbTickSerializer.cs b/QuantBox.Data.Serializer/V2/PbTickSerializer.cs
@@ -94,7 +94,7 @@ public PbTick ReadOne(Stream source)
             _lastRead = Codec.Restore(_lastRead, raw);
             if (_lastRead.Config.Version != 2)
             {
-                throw new InvalidDataException("only support pd0 file version 2");
+                throw new ProtobufDataZeroException("only support pd0 file version 2", _lastRead.Config.Version, 2);
             }
             
             return _lastRead;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public PbTick ReadOne(Stream source)`
`52`	`52`	`_lastRead = Codec.Restore(_lastRead, raw);`
`53`	`53`	`if (_lastRead.Config.Version != 1)`
`54`	`54`	`{`
`55`		`- throw new InvalidDataException("only support pd0 file version 1");`
	`55`	`+ throw new ProtobufDataZeroException("only support pd0 file version 1", _lastRead.Config.Version, 1);`
`56`	`56`	`}`
`57`	`57`	`return _lastRead;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public PbTick ReadOne(Stream source)`
`94`	`94`	`_lastRead = Codec.Restore(_lastRead, raw);`
`95`	`95`	`if (_lastRead.Config.Version != 2)`
`96`	`96`	`{`
`97`		`- throw new InvalidDataException("only support pd0 file version 2");`
	`97`	`+ throw new ProtobufDataZeroException("only support pd0 file version 2", _lastRead.Config.Version, 2);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`return _lastRead;`