fix #275

HasMany 数据重复问题

Author: shuxinqin

src/Chloe/Mapper/Activators/RootEntityActivator.cs

@@ -14,13 +14,13 @@ public class RootEntityActivator : IObjectActivator
     {
         IObjectActivator _entityActivator;
         IFitter _fitter;
-        IEntityRowComparer _entityRowComparer;
+        IEntityKey _entityKey;
 
-        public RootEntityActivator(IObjectActivator entityActivator, IFitter fitter, IEntityRowComparer entityRowComparer)
+        public RootEntityActivator(IObjectActivator entityActivator, IFitter fitter, IEntityKey entityKey)
         {
             this._entityActivator = entityActivator;
             this._fitter = fitter;
-            this._entityRowComparer = entityRowComparer;
+            this._entityKey = entityKey;
         }
 
         public void Prepare(IDataReader reader)
@@ -41,7 +41,7 @@ public async ObjectResultTask CreateInstance(IDataReader reader, bool @async)
 
             while (await queryDataReader.Read(true))
             {
-                if (!_entityRowComparer.IsEntityRow(entity, reader))
+                if (!this._entityKey.IsEntityRow(entity, reader))
                 {
                     queryDataReader.AllowReadNextRecord = false;
                     break;

src/Chloe/Mapper/IEntityRowComparer.cs src/Chloe/Mapper/IEntityKey.cs

@@ -6,16 +6,17 @@
 
 namespace Chloe.Mapper
 {
-    public interface IEntityRowComparer
+    public interface IEntityKey
     {
+        object GetKeyValue(IDataReader reader);
         bool IsEntityRow(object entity, IDataReader reader);
     }
-    public class EntityRowComparer : IEntityRowComparer
+    public class EntityKey : IEntityKey
     {
         List<Tuple<PropertyDescriptor, int, IDbValueReader>> _keys;
         object _entity;
         object[] _keyValues;
-        public EntityRowComparer(List<Tuple<PropertyDescriptor, int>> keys)
+        public EntityKey(List<Tuple<PropertyDescriptor, int>> keys)
         {
             List<Tuple<PropertyDescriptor, int, IDbValueReader>> keyList = new List<Tuple<PropertyDescriptor, int, IDbValueReader>>(keys.Count);
             for (int i = 0; i < keys.Count; i++)
@@ -30,6 +31,19 @@ public EntityRowComparer(List<Tuple<PropertyDescriptor, int>> keys)
             this._keyValues = new object[keys.Count];
         }
 
+        public object GetKeyValue(IDataReader reader)
+        {
+            if (this._keys.Count > 1)
+                throw new NotSupportedException();
+
+            var tuple = this._keys[0];
+            int ordinal = tuple.Item2;
+            var dbValueReader = tuple.Item3;
+            object keyValue = dbValueReader.GetValue(reader, ordinal);
+
+            return keyValue;
+        }
+
         public bool IsEntityRow(object entity, IDataReader reader)
         {
             object[] keyValues = this.GetKeyValues(entity);

src/Chloe/Mapper/IFitter.cs

@@ -56,14 +56,17 @@ public async VoidTask Fill(object entity, object owner, IDataReader reader, bool
     public class CollectionObjectFitter : IFitter
     {
         IObjectActivator _elementActivator;
-        IEntityRowComparer _entityRowComparer;
+        IEntityKey _entityKey;
         IFitter _elementFitter;
         PropertyDescriptor _elementOwnerProperty;
 
-        public CollectionObjectFitter(IObjectActivator elementActivator, IEntityRowComparer entityRowComparer, IFitter elementFitter, PropertyDescriptor elementOwnerProperty)
+        HashSet<object> _keySet = new HashSet<object>();
+        object _collection;
+
+        public CollectionObjectFitter(IObjectActivator elementActivator, IEntityKey entityKey, IFitter elementFitter, PropertyDescriptor elementOwnerProperty)
         {
             this._elementActivator = elementActivator;
-            this._entityRowComparer = entityRowComparer;
+            this._entityKey = entityKey;
             this._elementFitter = elementFitter;
             this._elementOwnerProperty = elementOwnerProperty;
         }
@@ -76,24 +79,33 @@ public void Prepare(IDataReader reader)
 
         public async VoidTask Fill(object collection, object owner, IDataReader reader, bool @async)
         {
+            if (this._collection != collection)
+            {
+                this._keySet.Clear();
+                this._collection = collection;
+            }
+
             IList entityContainer = collection as IList;
 
             object entity = null;
-            if (entityContainer.Count > 0)
-                entity = entityContainer[entityContainer.Count - 1];
 
-            if (entity == null || !this._entityRowComparer.IsEntityRow(entity, reader))
+            var keyValue = this._entityKey.GetKeyValue(reader);
+            if (!this._keySet.Contains(keyValue))
             {
                 entity = await this._elementActivator.CreateInstance(reader, @async);
-
-                if (entity == null)
-                    return;
-
-                this._elementOwnerProperty.SetValue(entity, owner); //entity.XX = owner
-                entityContainer.Add(entity);
+                if (entity != null)
+                {
+                    this._elementOwnerProperty.SetValue(entity, owner); //entity.XX = owner
+                    entityContainer.Add(entity);
+                    this._keySet.Add(keyValue);
+                }
             }
 
-            await this._elementFitter.Fill(entity, null, reader, @async);
+            if (entityContainer.Count > 0)
+            {
+                entity = entityContainer[entityContainer.Count - 1];
+                await this._elementFitter.Fill(entity, null, reader, @async);
+            }
         }
     }
 }

src/Chloe/Query/Mapping/CollectionObjectActivatorCreator.cs

@@ -46,11 +46,11 @@ public IFitter CreateFitter(IDbContext dbContext)
                 keys.Add(new Tuple<PropertyDescriptor, int>(primaryKey, elementActivatorCreator.PrimitiveMembers[primaryKey.Definition.Property]));
             }
 
-            IEntityRowComparer entityRowComparer = new EntityRowComparer(keys);
+            IEntityKey entityKey = new EntityKey(keys);
 
             PropertyDescriptor elementOwnerProperty = elementTypeDescriptor.ComplexPropertyDescriptors.Where(a => a.Definition.Property.PropertyType == this.OwnerType).First();
 
-            CollectionObjectFitter fitter = new CollectionObjectFitter(this.ElementActivatorCreator.CreateObjectActivator(dbContext), entityRowComparer, elementFitter, elementOwnerProperty);
+            CollectionObjectFitter fitter = new CollectionObjectFitter(this.ElementActivatorCreator.CreateObjectActivator(dbContext), entityKey, elementFitter, elementOwnerProperty);
             return fitter;
         }
     }

src/Chloe/Query/Mapping/ComplexObjectActivatorCreator.cs

@@ -68,8 +68,8 @@ public IObjectActivator CreateObjectActivator(IDbContext dbContext)
                     keys.Add(new Tuple<PropertyDescriptor, int>(primaryKey, this.PrimitiveMembers[primaryKey.Definition.Property]));
                 }
 
-                IEntityRowComparer entityRowComparer = new EntityRowComparer(keys);
-                objectActivator = new RootEntityActivator(objectActivator, this.CreateFitter(dbContext), entityRowComparer);
+                IEntityKey entityKey = new EntityKey(keys);
+                objectActivator = new RootEntityActivator(objectActivator, this.CreateFitter(dbContext), entityKey);
             }
 
             return objectActivator;