V1.2.8.8

Fix a problem of indexfileproxy. continue the loop when _DDXFileEnum[i].Current == null.
aoaob · Jan 1, 2013 · 2bd663f · 2bd663f
1 parent c355b7a
commit 2bd663f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/C#/src/Hubble.Data/Hubble.Core/Properties/AssemblyInfo.cs b/C#/src/Hubble.Data/Hubble.Core/Properties/AssemblyInfo.cs
@@ -36,8 +36,8 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.8.7")]
-[assembly: AssemblyFileVersion("1.2.8.7")]
+[assembly: AssemblyVersion("1.2.8.8")]
+[assembly: AssemblyFileVersion("1.2.8.8")]
 
 /*****************************************************************************************
  * Hubble.Core modification records
@@ -248,4 +248,6 @@ select top 10 * from News where title match 'abc' order by score desc
  * Fix a bug. If the expression like : (a match 'xxx' or b match 'yyy') and c match 'xxx' ...
  * it should be a complex expression. Old version think it is not a complex expression and return 
  * a small result when the expression has between keyword.
+ * 1.2.8.8
+ * Fix a problem of indexfileproxy. continue the loop when _DDXFileEnum[i].Current == null.
  *****************************************************************************************/
diff --git a/C#/src/Hubble.Data/Hubble.Core/Store/IndexFileProxy.cs b/C#/src/Hubble.Data/Hubble.Core/Store/IndexFileProxy.cs
@@ -319,6 +319,8 @@ public IEnumerable<MergedWordFilePostionList> MergedWordFilePostionList
                             yield break;
                         }
 
+
+
                         //Get Min Doc id
                         for (int i = 0; i < _DDXFileEnum.Length; i++)
                         {
@@ -328,6 +330,12 @@ public IEnumerable<MergedWordFilePostionList> MergedWordFilePostionList
                                 continue;
                             }
 
+                            if (_DDXFileEnum[i].Current == null)
+                            {
+                                //DDXFile i reached end of the file. eaglet modified at 2013-1-1
+                                continue;
+                            }
+
                             if (Hubble.Framework.Text.UnicodeString.Comparer(_DDXFileEnum[i].Current.Word, minWord) < 0)
                             {
                                 minWord = _DDXFileEnum[i].Current.Word;
@@ -340,6 +348,13 @@ public IEnumerable<MergedWordFilePostionList> MergedWordFilePostionList
                         //Return min word file position list;
                         for (int i = 0; i < _DDXFileEnum.Length; i++)
                         {
+                            if (_DDXFileEnum[i].Current == null)
+                            {
+                                //DDXFile i reached end of the file. eaglet modified at 2013-1-1
+                                needShrink = true;
+                                continue;
+                            }
+
                             if (minWord == _DDXFileEnum[i].Current.Word)
                             {
                                 result.FilePositionList.Add(new IndexFile.FilePosition(_DDXFileEnum[i].Serial,