修正数据库加载实体组件异常

kbengine#621

Author: kebiao

kbe/src/lib/db_mysql/entity_table_mysql.cpp

@@ -1551,7 +1551,12 @@ void EntityTableItemMysql_Component::addToStream(MemoryStream* s, mysql::DBConte
 			{
 				std::vector<DBID>& dbids = iter->second->dbids[resultDBID];
 
-				if (dbids.size() > 0)
+				// 如果一个实体已经存档，开发中又对实体加入了组件，那么数据库中此时是没有数据的，加载实体时需要对这样的情况做一些判断
+				// 例如：实体加载时重新写入组件默认数据值
+				bool foundData = dbids.size() > 0;
+				(*s) << foundData;
+
+				if (foundData)
 				{
 					// 理论上一定是不会大于1个的
 					KBE_ASSERT(dbids.size() == 1);

kbe/src/lib/entitydef/datatype.cpp

@@ -2710,7 +2710,10 @@ PyObject* EntityComponentType::createCellDataFromPersistentStream(MemoryStream*
 		if (!propertyDescription->hasCell())
 			continue;
 
-		PyObject* pyobj = propertyDescription->createFromStream(mstream);
+		PyObject* pyobj = NULL;
+		
+		if(mstream)
+			propertyDescription->createFromStream(mstream);
 
 		if (pyobj == NULL)
 		{

kbe/src/lib/entitydef/scriptdef_module.h

@@ -91,6 +91,10 @@ class ScriptDefModule : public RefCountable
 	PropertyDescription* findAliasPropertyDescription(ENTITY_DEF_ALIASID aliasID);
 	MethodDescription* findAliasMethodDescription(ENTITY_DEF_ALIASID aliasID);
 
+	size_t numPropertys() {
+		return getCellPropertyDescriptions().size() + getBasePropertyDescriptions().size();
+	}
+
 	INLINE PROPERTYDESCRIPTION_MAP& getCellPropertyDescriptions();
 	INLINE PROPERTYDESCRIPTION_MAP& getCellPropertyDescriptionsByDetailLevel(int8 detailLevel);
 	INLINE PROPERTYDESCRIPTION_MAP& getBasePropertyDescriptions();

kbe/src/server/baseapp/baseapp.cpp

@@ -67,9 +67,53 @@ PyObject* createDictDataFromPersistentStream(MemoryStream& s, const char* entity
 			PyObject* pyVal = NULL;
 			const char* attrname = propertyDescription->getName();
 
-			if (propertyDescription->getDataType()->type() == DATA_TYPE_ENTITY_COMPONENT && !propertyDescription->hasBase())
+			if (propertyDescription->getDataType()->type() == DATA_TYPE_ENTITY_COMPONENT)
 			{
-				pyVal = ((EntityComponentType*)propertyDescription->getDataType())->createCellDataFromPersistentStream(&s);
+				bool hasComponentData = false;
+				EntityComponentType* pEntityComponentType = ((EntityComponentType*)propertyDescription->getDataType());
+
+				if(pEntityComponentType->pScriptDefModule()->numPropertys() > 0)
+					s >> hasComponentData;
+
+				if (hasComponentData)
+				{
+					if (!propertyDescription->hasBase())
+					{
+						pyVal = pEntityComponentType->createCellDataFromPersistentStream(&s);
+					}
+					else
+					{
+						pyVal = propertyDescription->createFromPersistentStream(&s);
+
+						if (!propertyDescription->isSameType(pyVal))
+						{
+							if (pyVal)
+							{
+								Py_DECREF(pyVal);
+							}
+
+							ERROR_MSG(fmt::format("Baseapp::createDictDataFromPersistentStream: {}.{} error, set to default!\n",
+								entityType, attrname));
+
+							pyVal = propertyDescription->parseDefaultStr("");
+						}
+					}
+				}
+				else
+				{
+					if (!propertyDescription->hasBase())
+					{
+						pyVal = ((EntityComponentType*)propertyDescription->getDataType())->createCellDataFromPersistentStream(NULL);
+					}
+					else
+					{
+
+						ERROR_MSG(fmt::format("Baseapp::createDictDataFromPersistentStream: {}.{} error, set to default!\n",
+							entityType, attrname));
+
+						pyVal = propertyDescription->parseDefaultStr("");
+					}
+				}
 			}
 			else
 			{

kbe/src/server/baseapp/entity.cpp

@@ -414,7 +414,7 @@ void Entity::addPersistentsDataToStream(uint32 flags, MemoryStream* s)
 			{
 				// 由于存在一种情况， 组件def中没有内容， 但有cell脚本，此时baseapp上无法判断他是否有cell属性，所以写celldata时没有数据写入
 				EntityComponentType* pEntityComponentType = (EntityComponentType*)propertyDescription->getDataType();
-				if (pEntityComponentType->pScriptDefModule()->getPropertyDescrs().size() == 0 && pEntityComponentType->pScriptDefModule()->getCellPropertyDescriptions().size() == 0)
+				if (pEntityComponentType->pScriptDefModule()->numPropertys() == 0)
 					continue;
 			}