added:Upload files support specifying bucket or not specifying

Author: xengine-qyt

XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h

@@ -97,27 +97,32 @@ extern "C" BOOL APIHelp_Distributed_DLStorage(LPCTSTR lpszMsgBuffer, list<XENGIN
 /********************************************************************
 函数名称：APIHelp_Distributed_UPStorage
 函数功能：通过分布式存储列表获得一个存储地址
- 参数.一：pStl_ListBucket
+ 参数.一：lpszMsgBuffer
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要解析的URL
+ 参数.二：pStl_ListBucket
   In/Out：In
   类型：容器指针
   可空：N
   意思：输入要解析的列表
- 参数.二：pSt_StorageBucket
+ 参数.三：pSt_StorageBucket
   In/Out：Out
   类型：数据结构指针
   可空：N
   意思：输出获取到的可用存储
- 参数.三：nMode
+ 参数.四：nMode
   In/Out：In
   类型：整数型
   可空：N
-  意思：输入选择模式
+  意思：输入LB的模式
 返回值
   类型：逻辑型
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" BOOL APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket, int nMode);
+extern "C" BOOL APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer, list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket, int nMode);
 /********************************************************************
 函数名称：APIHelp_Distributed_GetPathKey
 函数功能：通过BUCKET名称查找对应路径

XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp

@@ -216,22 +216,32 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_DLStorage(LPCTSTR lpszMsgBuffer,
 /********************************************************************
 函数名称：APIHelp_Distributed_UPStorage
 函数功能：通过分布式存储列表获得一个存储地址
- 参数.一：pStl_ListBucket
+ 参数.一：lpszMsgBuffer
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要解析的URL
+ 参数.二：pStl_ListBucket
   In/Out：In
   类型：容器指针
   可空：N
   意思：输入要解析的列表
- 参数.二：pSt_StorageBucket
+ 参数.三：pSt_StorageBucket
   In/Out：Out
   类型：数据结构指针
   可空：N
   意思：输出获取到的可用存储
+ 参数.四：nMode
+  In/Out：In
+  类型：整数型
+  可空：N
+  意思：输入LB的模式
 返回值
   类型：逻辑型
   意思：是否成功
 备注：
 *********************************************************************/
-BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket, int nMode)
+BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer, list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket, int nMode)
 {
 	APIHelp_IsErrorOccur = FALSE;
 
@@ -241,81 +251,91 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUC
 		APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_PARAMENT;
 		return FALSE;
 	}
-	int nLastLevel = 99999;
-	list<XENGINE_STORAGEBUCKET> stl_BuckSelect;
-	//先得到最小级别
-	for (auto stl_ListIterator = pStl_ListBucket->begin(); stl_ListIterator != pStl_ListBucket->end(); stl_ListIterator++)
+	if (4 == nMode)
 	{
-		//只处理启用的
-		if (stl_ListIterator->bEnable)
+		if (!APIHelp_Distributed_DLStorage(lpszMsgBuffer, pStl_ListBucket, pSt_StorageBucket))
 		{
-			if (stl_ListIterator->nLevel < nLastLevel)
-			{
-				nLastLevel = stl_ListIterator->nLevel; //得到最小级别
-			}
+			return FALSE;
 		}
 	}
-	//在来获得这个级别的列表
-	for (auto stl_ListIterator = pStl_ListBucket->begin(); stl_ListIterator != pStl_ListBucket->end(); stl_ListIterator++)
+	else
 	{
-		//只处理启用的
-		if (stl_ListIterator->bEnable)
+		int nLastLevel = 99999;
+		list<XENGINE_STORAGEBUCKET> stl_BuckSelect;
+		//先得到最小级别
+		for (auto stl_ListIterator = pStl_ListBucket->begin(); stl_ListIterator != pStl_ListBucket->end(); stl_ListIterator++)
 		{
-			//处理优先级
-			if (stl_ListIterator->nLevel == nLastLevel)
+			//只处理启用的
+			if (stl_ListIterator->bEnable)
 			{
-				int nListCount = 0;
-				__int64u nDirCount = 0;   //当前目录大小
-				CHAR** ppListFile;
-				SystemApi_File_EnumFile(stl_ListIterator->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1);
-				for (int j = 0; j < nListCount; j++)
+				if (stl_ListIterator->nLevel < nLastLevel)
 				{
-					struct __stat64 st_FStat;
-					_stat64(ppListFile[j], &st_FStat);
-					nDirCount += st_FStat.st_size;
+					nLastLevel = stl_ListIterator->nLevel; //得到最小级别
 				}
-				BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);
-				//如果当前目录大小大于设定的大小.那么忽略
-				if (nDirCount >= APIHelp_Distributed_GetSize(stl_ListIterator->tszBuckSize))
+			}
+		}
+		//在来获得这个级别的列表
+		for (auto stl_ListIterator = pStl_ListBucket->begin(); stl_ListIterator != pStl_ListBucket->end(); stl_ListIterator++)
+		{
+			//只处理启用的
+			if (stl_ListIterator->bEnable)
+			{
+				//处理优先级
+				if (stl_ListIterator->nLevel == nLastLevel)
 				{
-					continue;
+					int nListCount = 0;
+					__int64u nDirCount = 0;   //当前目录大小
+					CHAR** ppListFile;
+					SystemApi_File_EnumFile(stl_ListIterator->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1);
+					for (int j = 0; j < nListCount; j++)
+					{
+						struct __stat64 st_FStat;
+						_stat64(ppListFile[j], &st_FStat);
+						nDirCount += st_FStat.st_size;
+					}
+					BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);
+					//如果当前目录大小大于设定的大小.那么忽略
+					if (nDirCount >= APIHelp_Distributed_GetSize(stl_ListIterator->tszBuckSize))
+					{
+						continue;
+					}
+					stl_BuckSelect.push_back(*stl_ListIterator);
 				}
-				stl_BuckSelect.push_back(*stl_ListIterator);
 			}
 		}
-	}
-	//通过指定模式获得一个key
-	if (!stl_BuckSelect.empty())
-	{
-		APIHelp_IsErrorOccur = TRUE;
-		APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_NOTFOUND;
-		return FALSE;
-	}
-	if (1 == nMode)
-	{
-		XNETHANDLE xhToken = 0;
-		BaseLib_OperatorHandle_Create(&xhToken, 0, stl_BuckSelect.size(), FALSE);
-		if (xhToken == stl_BuckSelect.size())
+		//通过指定模式获得一个key
+		if (stl_BuckSelect.empty())
 		{
-			xhToken--;
+			APIHelp_IsErrorOccur = TRUE;
+			APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_NOTFOUND;
+			return FALSE;
 		}
-		list<XENGINE_STORAGEBUCKET>::const_iterator stl_ListIterator = stl_BuckSelect.begin();
-		for (XNETHANDLE i = 0; stl_ListIterator != stl_BuckSelect.end(); stl_ListIterator++, i++)
+		if (1 == nMode)
 		{
-			if (xhToken == i)
+			XNETHANDLE xhToken = 0;
+			BaseLib_OperatorHandle_Create(&xhToken, 0, stl_BuckSelect.size(), FALSE);
+			if (xhToken == stl_BuckSelect.size())
 			{
-				*pSt_StorageBucket = *stl_ListIterator;
-				break;
+				xhToken--;
+			}
+			list<XENGINE_STORAGEBUCKET>::const_iterator stl_ListIterator = stl_BuckSelect.begin();
+			for (XNETHANDLE i = 0; stl_ListIterator != stl_BuckSelect.end(); stl_ListIterator++, i++)
+			{
+				if (xhToken == i)
+				{
+					*pSt_StorageBucket = *stl_ListIterator;
+					break;
+				}
 			}
 		}
-	}
-	else if (2 == nMode)
-	{
-		*pSt_StorageBucket = stl_BuckSelect.front();
-	}
-	else if (3 == nMode)
-	{
-		*pSt_StorageBucket = stl_BuckSelect.back();
+		else if (2 == nMode)
+		{
+			*pSt_StorageBucket = stl_BuckSelect.front();
+		}
+		else if (3 == nMode)
+		{
+			*pSt_StorageBucket = stl_BuckSelect.back();
+		}
 	}
 
 	return TRUE;

XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.h

@@ -21,7 +21,7 @@ class CAPIHelp_Distributed
 	BOOL APIHelp_Distributed_RandomAddr(list<string>* pStl_ListAddr, TCHAR* ptszAddr, int nMode);
 	BOOL APIHelp_Distributed_FileList(list<APIHELP_LBFILEINFO>* pStl_ListParse, XSTORAGECORE_DBFILE*** pppSt_ListPacket, int* pInt_ListCount);
 	BOOL APIHelp_Distributed_DLStorage(LPCTSTR lpszMsgBuffer, list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket);
-	BOOL APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket, int nMode);
+	BOOL APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer, list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket, int nMode);
 	BOOL APIHelp_Distributed_GetPathKey(list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, LPCTSTR lpszBuckKey, TCHAR* ptszFilePath);
 protected:
 	BOOL APIHelp_Distributed_FileListParse(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE* pSt_DBFile);

XEngine_Source/StorageModule_APIHelp/pch.cpp

@@ -43,9 +43,9 @@ extern "C" BOOL APIHelp_Distributed_DLStorage(LPCTSTR lpszMsgBuffer, list<XENGIN
 {
 	return m_APIDistributed.APIHelp_Distributed_DLStorage(lpszMsgBuffer, pStl_ListBucket, pSt_StorageBucket);
 }
-extern "C" BOOL APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUCKET>*pStl_ListBucket, XENGINE_STORAGEBUCKET * pSt_StorageBucket, int nMode)
+extern "C" BOOL APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer, list<XENGINE_STORAGEBUCKET>*pStl_ListBucket, XENGINE_STORAGEBUCKET * pSt_StorageBucket, int nMode)
 {
-	return m_APIDistributed.APIHelp_Distributed_UPStorage(pStl_ListBucket, pSt_StorageBucket, nMode);
+	return m_APIDistributed.APIHelp_Distributed_UPStorage(lpszMsgBuffer, pStl_ListBucket, pSt_StorageBucket, nMode);
 }
 extern "C" BOOL APIHelp_Distributed_GetPathKey(list<XENGINE_STORAGEBUCKET>*pStl_ListBucket, LPCTSTR lpszBuckKey, TCHAR * ptszFilePath)
 {

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

@@ -146,7 +146,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 	XENGINE_STORAGEBUCKET st_StorageBucket;
 	memset(&st_StorageBucket, '\0', sizeof(XENGINE_STORAGEBUCKET));
 
-	if (!APIHelp_Distributed_UPStorage(st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket, st_LoadbalanceCfg.st_LBLocation.nUPLoadMode))
+	if (!APIHelp_Distributed_UPStorage(pSt_HTTPParam->tszHttpUri, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket, st_LoadbalanceCfg.st_LBLocation.nUPLoadMode))
 	{
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("上传客户端:%s,请求上传文件失败,可能BUCKET:% 不正确,错误：%lX"), lpszClientAddr, pSt_HTTPParam->tszHttpUri, APIHelp_GetLastError());
 		return FALSE;