Parcourir la source

CreateShardingDBInstance add ProtocolType, to support DynamoDB.

sdk-team il y a 6 ans
Parent
commit
65a601c5ba
28 fichiers modifiés avec 144 ajouts et 8 suppressions
  1. 4 0
      CHANGELOG
  2. 1 1
      VERSION
  3. 3 0
      dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h
  4. 3 0
      dds/include/alibabacloud/dds/model/DescribeAuditRecordsRequest.h
  5. 1 0
      dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h
  6. 3 0
      dds/include/alibabacloud/dds/model/DescribeDBInstancesRequest.h
  7. 3 0
      dds/include/alibabacloud/dds/model/DescribeParameterModificationHistoryRequest.h
  8. 3 0
      dds/include/alibabacloud/dds/model/DescribeParametersRequest.h
  9. 3 0
      dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsRequest.h
  10. 1 1
      dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsResult.h
  11. 3 0
      dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsRequest.h
  12. 1 0
      dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsResult.h
  13. 3 0
      dds/include/alibabacloud/dds/model/ModifyNodeSpecRequest.h
  14. 3 0
      dds/include/alibabacloud/dds/model/ModifyParametersRequest.h
  15. 3 3
      dds/src/DdsClient.cc
  16. 11 0
      dds/src/model/CreateShardingDBInstanceRequest.cc
  17. 2 2
      dds/src/model/CreateShardingDBInstanceResult.cc
  18. 11 0
      dds/src/model/DescribeAuditRecordsRequest.cc
  19. 2 0
      dds/src/model/DescribeDBInstanceAttributeResult.cc
  20. 11 0
      dds/src/model/DescribeDBInstancesRequest.cc
  21. 11 0
      dds/src/model/DescribeParameterModificationHistoryRequest.cc
  22. 11 0
      dds/src/model/DescribeParametersRequest.cc
  23. 11 0
      dds/src/model/DescribeRunningLogRecordsRequest.cc
  24. 1 1
      dds/src/model/DescribeRunningLogRecordsResult.cc
  25. 11 0
      dds/src/model/DescribeSlowLogRecordsRequest.cc
  26. 2 0
      dds/src/model/DescribeSlowLogRecordsResult.cc
  27. 11 0
      dds/src/model/ModifyNodeSpecRequest.cc
  28. 11 0
      dds/src/model/ModifyParametersRequest.cc

+ 4 - 0
CHANGELOG

@@ -1,3 +1,7 @@
+2020-07-02 Version: 1.36.491
+- CreateShardingDBInstance add ProtocolType, to support DynamoDB.
+- DescribeDBInstances add return ResourceGroupId.
+
 2020-07-01 Version: 1.36.490
 - Add ListFace-MotorAlgorithmResults API.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.490
+1.36.491

+ 3 - 0
dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h

@@ -98,6 +98,8 @@ namespace AlibabaCloud
 				void setVpcId(const std::string& vpcId);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
+				std::string getProtocolType()const;
+				void setProtocolType(const std::string& protocolType);
 				std::string getChargeType()const;
 				void setChargeType(const std::string& chargeType);
 
@@ -126,6 +128,7 @@ namespace AlibabaCloud
 				std::string autoRenew_;
 				std::string vpcId_;
 				std::string zoneId_;
+				std::string protocolType_;
 				std::string chargeType_;
 
 			};

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeAuditRecordsRequest.h

@@ -67,6 +67,8 @@ namespace AlibabaCloud
 				void setForm(const std::string& form);
 				std::string getUser()const;
 				void setUser(const std::string& user);
+				std::string getOrderType()const;
+				void setOrderType(const std::string& orderType);
 
             private:
 				long resourceOwnerId_;
@@ -85,6 +87,7 @@ namespace AlibabaCloud
 				long ownerId_;
 				std::string form_;
 				std::string user_;
+				std::string orderType_;
 
 			};
 		}

+ 1 - 0
dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h

@@ -101,6 +101,7 @@ namespace AlibabaCloud
 					std::string engine;
 					std::string maintainStartTime;
 					std::string replacateId;
+					bool dBInstanceReleaseProtection;
 					std::string engineVersion;
 					std::string zoneId;
 					std::string dBInstanceStatus;

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeDBInstancesRequest.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setReplicationFactor(const std::string& replicationFactor);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getExpired()const;
 				void setExpired(const std::string& expired);
 				std::string getSecurityToken()const;
@@ -97,6 +99,7 @@ namespace AlibabaCloud
 				int pageNumber_;
 				std::string replicationFactor_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string expired_;
 				std::string securityToken_;
 				std::string engine_;

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeParameterModificationHistoryRequest.h

@@ -55,6 +55,8 @@ namespace AlibabaCloud
 				void setEndTime(const std::string& endTime);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getCharacterType()const;
+				void setCharacterType(const std::string& characterType);
 
             private:
 				long resourceOwnerId_;
@@ -67,6 +69,7 @@ namespace AlibabaCloud
 				std::string ownerAccount_;
 				std::string endTime_;
 				long ownerId_;
+				std::string characterType_;
 
 			};
 		}

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeParametersRequest.h

@@ -51,6 +51,8 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getCharacterType()const;
+				void setCharacterType(const std::string& characterType);
 
             private:
 				long resourceOwnerId_;
@@ -61,6 +63,7 @@ namespace AlibabaCloud
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
+				std::string characterType_;
 
 			};
 		}

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsRequest.h

@@ -65,6 +65,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getDBName()const;
 				void setDBName(const std::string& dBName);
+				std::string getOrderType()const;
+				void setOrderType(const std::string& orderType);
 
             private:
 				long resourceOwnerId_;
@@ -82,6 +84,7 @@ namespace AlibabaCloud
 				std::string endTime_;
 				long ownerId_;
 				std::string dBName_;
+				std::string orderType_;
 
 			};
 		}

+ 1 - 1
dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsResult.h

@@ -36,7 +36,7 @@ namespace AlibabaCloud
 				{
 					std::string connInfo;
 					std::string category;
-					std::string content;
+					long content;
 					std::string createTime;
 					int id;
 				};

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsRequest.h

@@ -63,6 +63,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getDBName()const;
 				void setDBName(const std::string& dBName);
+				std::string getOrderType()const;
+				void setOrderType(const std::string& orderType);
 
             private:
 				long resourceOwnerId_;
@@ -79,6 +81,7 @@ namespace AlibabaCloud
 				std::string endTime_;
 				long ownerId_;
 				std::string dBName_;
+				std::string orderType_;
 
 			};
 		}

+ 1 - 0
dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsResult.h

@@ -34,6 +34,7 @@ namespace AlibabaCloud
 			public:
 				struct LogRecords
 				{
+					std::string tableName;
 					std::string queryTimes;
 					std::string executionStartTime;
 					long returnRowCounts;

+ 3 - 0
dds/include/alibabacloud/dds/model/ModifyNodeSpecRequest.h

@@ -63,6 +63,8 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getOrderType()const;
+				void setOrderType(const std::string& orderType);
 
             private:
 				long resourceOwnerId_;
@@ -79,6 +81,7 @@ namespace AlibabaCloud
 				int nodeStorage_;
 				std::string ownerAccount_;
 				long ownerId_;
+				std::string orderType_;
 
 			};
 		}

+ 3 - 0
dds/include/alibabacloud/dds/model/ModifyParametersRequest.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getParameters()const;
 				void setParameters(const std::string& parameters);
+				std::string getCharacterType()const;
+				void setCharacterType(const std::string& characterType);
 
             private:
 				long resourceOwnerId_;
@@ -64,6 +66,7 @@ namespace AlibabaCloud
 				std::string ownerAccount_;
 				long ownerId_;
 				std::string parameters_;
+				std::string characterType_;
 
 			};
 		}

+ 3 - 3
dds/src/DdsClient.cc

@@ -31,21 +31,21 @@ DdsClient::DdsClient(const Credentials &credentials, const ClientConfiguration &
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "dds");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "Dds");
 }
 
 DdsClient::DdsClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "dds");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "Dds");
 }
 
 DdsClient::DdsClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "dds");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "Dds");
 }
 
 DdsClient::~DdsClient()

+ 11 - 0
dds/src/model/CreateShardingDBInstanceRequest.cc

@@ -305,6 +305,17 @@ void CreateShardingDBInstanceRequest::setZoneId(const std::string& zoneId)
 	setParameter("ZoneId", zoneId);
 }
 
+std::string CreateShardingDBInstanceRequest::getProtocolType()const
+{
+	return protocolType_;
+}
+
+void CreateShardingDBInstanceRequest::setProtocolType(const std::string& protocolType)
+{
+	protocolType_ = protocolType;
+	setParameter("ProtocolType", protocolType);
+}
+
 std::string CreateShardingDBInstanceRequest::getChargeType()const
 {
 	return chargeType_;

+ 2 - 2
dds/src/model/CreateShardingDBInstanceResult.cc

@@ -39,10 +39,10 @@ void CreateShardingDBInstanceResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["OrderId"].isNull())
-		orderId_ = value["OrderId"].asString();
 	if(!value["DBInstanceId"].isNull())
 		dBInstanceId_ = value["DBInstanceId"].asString();
+	if(!value["OrderId"].isNull())
+		orderId_ = value["OrderId"].asString();
 
 }
 

+ 11 - 0
dds/src/model/DescribeAuditRecordsRequest.cc

@@ -203,3 +203,14 @@ void DescribeAuditRecordsRequest::setUser(const std::string& user)
 	setParameter("User", user);
 }
 
+std::string DescribeAuditRecordsRequest::getOrderType()const
+{
+	return orderType_;
+}
+
+void DescribeAuditRecordsRequest::setOrderType(const std::string& orderType)
+{
+	orderType_ = orderType;
+	setParameter("OrderType", orderType);
+}
+

+ 2 - 0
dds/src/model/DescribeDBInstanceAttributeResult.cc

@@ -107,6 +107,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload)
 			dBInstancesObject.protocolType = valueDBInstancesDBInstance["ProtocolType"].asString();
 		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
 			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceReleaseProtection"].isNull())
+			dBInstancesObject.dBInstanceReleaseProtection = valueDBInstancesDBInstance["DBInstanceReleaseProtection"].asString() == "true";
 		auto allMongosListNode = allDBInstancesNode["MongosList"]["MongosAttribute"];
 		for (auto allDBInstancesNodeMongosListMongosAttribute : allMongosListNode)
 		{

+ 11 - 0
dds/src/model/DescribeDBInstancesRequest.cc

@@ -93,6 +93,17 @@ void DescribeDBInstancesRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeDBInstancesRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeDBInstancesRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeDBInstancesRequest::getExpired()const
 {
 	return expired_;

+ 11 - 0
dds/src/model/DescribeParameterModificationHistoryRequest.cc

@@ -137,3 +137,14 @@ void DescribeParameterModificationHistoryRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::string DescribeParameterModificationHistoryRequest::getCharacterType()const
+{
+	return characterType_;
+}
+
+void DescribeParameterModificationHistoryRequest::setCharacterType(const std::string& characterType)
+{
+	characterType_ = characterType;
+	setParameter("CharacterType", characterType);
+}
+

+ 11 - 0
dds/src/model/DescribeParametersRequest.cc

@@ -115,3 +115,14 @@ void DescribeParametersRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::string DescribeParametersRequest::getCharacterType()const
+{
+	return characterType_;
+}
+
+void DescribeParametersRequest::setCharacterType(const std::string& characterType)
+{
+	characterType_ = characterType;
+	setParameter("CharacterType", characterType);
+}
+

+ 11 - 0
dds/src/model/DescribeRunningLogRecordsRequest.cc

@@ -192,3 +192,14 @@ void DescribeRunningLogRecordsRequest::setDBName(const std::string& dBName)
 	setParameter("DBName", dBName);
 }
 
+std::string DescribeRunningLogRecordsRequest::getOrderType()const
+{
+	return orderType_;
+}
+
+void DescribeRunningLogRecordsRequest::setOrderType(const std::string& orderType)
+{
+	orderType_ = orderType;
+	setParameter("OrderType", orderType);
+}
+

+ 1 - 1
dds/src/model/DescribeRunningLogRecordsResult.cc

@@ -52,7 +52,7 @@ void DescribeRunningLogRecordsResult::parse(const std::string &payload)
 		if(!valueItemsLogRecords["ConnInfo"].isNull())
 			itemsObject.connInfo = valueItemsLogRecords["ConnInfo"].asString();
 		if(!valueItemsLogRecords["Content"].isNull())
-			itemsObject.content = valueItemsLogRecords["Content"].asString();
+			itemsObject.content = std::stol(valueItemsLogRecords["Content"].asString());
 		items_.push_back(itemsObject);
 	}
 	if(!value["Engine"].isNull())

+ 11 - 0
dds/src/model/DescribeSlowLogRecordsRequest.cc

@@ -181,3 +181,14 @@ void DescribeSlowLogRecordsRequest::setDBName(const std::string& dBName)
 	setParameter("DBName", dBName);
 }
 
+std::string DescribeSlowLogRecordsRequest::getOrderType()const
+{
+	return orderType_;
+}
+
+void DescribeSlowLogRecordsRequest::setOrderType(const std::string& orderType)
+{
+	orderType_ = orderType;
+	setParameter("OrderType", orderType);
+}
+

+ 2 - 0
dds/src/model/DescribeSlowLogRecordsResult.cc

@@ -61,6 +61,8 @@ void DescribeSlowLogRecordsResult::parse(const std::string &payload)
 			itemsObject.executionStartTime = valueItemsLogRecords["ExecutionStartTime"].asString();
 		if(!valueItemsLogRecords["AccountName"].isNull())
 			itemsObject.accountName = valueItemsLogRecords["AccountName"].asString();
+		if(!valueItemsLogRecords["TableName"].isNull())
+			itemsObject.tableName = valueItemsLogRecords["TableName"].asString();
 		items_.push_back(itemsObject);
 	}
 	if(!value["Engine"].isNull())

+ 11 - 0
dds/src/model/ModifyNodeSpecRequest.cc

@@ -181,3 +181,14 @@ void ModifyNodeSpecRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::string ModifyNodeSpecRequest::getOrderType()const
+{
+	return orderType_;
+}
+
+void ModifyNodeSpecRequest::setOrderType(const std::string& orderType)
+{
+	orderType_ = orderType;
+	setParameter("OrderType", orderType);
+}
+

+ 11 - 0
dds/src/model/ModifyParametersRequest.cc

@@ -126,3 +126,14 @@ void ModifyParametersRequest::setParameters(const std::string& parameters)
 	setParameter("Parameters", parameters);
 }
 
+std::string ModifyParametersRequest::getCharacterType()const
+{
+	return characterType_;
+}
+
+void ModifyParametersRequest::setCharacterType(const std::string& characterType)
+{
+	characterType_ = characterType;
+	setParameter("CharacterType", characterType);
+}
+