Generated 2019-09-01 for OceanBasePro.

sdk-team · sdk-team · commit 0b5624444345 · 2025-08-07T07:31:46.000Z
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.36.2096
+1.36.2097
diff --git a/oceanbasepro/CMakeLists.txt b/oceanbasepro/CMakeLists.txt
@@ -125,6 +125,8 @@ set(oceanbasepro_public_header_model
 	include/alibabacloud/oceanbasepro/model/DescribeInstancesResult.h
 	include/alibabacloud/oceanbasepro/model/DescribeMetricsDataRequest.h
 	include/alibabacloud/oceanbasepro/model/DescribeMetricsDataResult.h
+	include/alibabacloud/oceanbasepro/model/DescribeMetricsDataV2Request.h
+	include/alibabacloud/oceanbasepro/model/DescribeMetricsDataV2Result.h
 	include/alibabacloud/oceanbasepro/model/DescribeNodeMetricsRequest.h
 	include/alibabacloud/oceanbasepro/model/DescribeNodeMetricsResult.h
 	include/alibabacloud/oceanbasepro/model/DescribeOasAnomalySQLListRequest.h
@@ -406,6 +408,8 @@ set(oceanbasepro_src
 	src/model/DescribeInstancesResult.cc
 	src/model/DescribeMetricsDataRequest.cc
 	src/model/DescribeMetricsDataResult.cc
+	src/model/DescribeMetricsDataV2Request.cc
+	src/model/DescribeMetricsDataV2Result.cc
 	src/model/DescribeNodeMetricsRequest.cc
 	src/model/DescribeNodeMetricsResult.cc
 	src/model/DescribeOasAnomalySQLListRequest.cc
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/OceanBaseProClient.h b/oceanbasepro/include/alibabacloud/oceanbasepro/OceanBaseProClient.h
@@ -126,6 +126,8 @@
 #include "model/DescribeInstancesResult.h"
 #include "model/DescribeMetricsDataRequest.h"
 #include "model/DescribeMetricsDataResult.h"
+#include "model/DescribeMetricsDataV2Request.h"
+#include "model/DescribeMetricsDataV2Result.h"
 #include "model/DescribeNodeMetricsRequest.h"
 #include "model/DescribeNodeMetricsResult.h"
 #include "model/DescribeOasAnomalySQLListRequest.h"
@@ -465,6 +467,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeMetricsDataResult> DescribeMetricsDataOutcome;
 			typedef std::future<DescribeMetricsDataOutcome> DescribeMetricsDataOutcomeCallable;
 			typedef std::function<void(const OceanBaseProClient*, const Model::DescribeMetricsDataRequest&, const DescribeMetricsDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeMetricsDataAsyncHandler;
+			typedef Outcome<Error, Model::DescribeMetricsDataV2Result> DescribeMetricsDataV2Outcome;
+			typedef std::future<DescribeMetricsDataV2Outcome> DescribeMetricsDataV2OutcomeCallable;
+			typedef std::function<void(const OceanBaseProClient*, const Model::DescribeMetricsDataV2Request&, const DescribeMetricsDataV2Outcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeMetricsDataV2AsyncHandler;
 			typedef Outcome<Error, Model::DescribeNodeMetricsResult> DescribeNodeMetricsOutcome;
 			typedef std::future<DescribeNodeMetricsOutcome> DescribeNodeMetricsOutcomeCallable;
 			typedef std::function<void(const OceanBaseProClient*, const Model::DescribeNodeMetricsRequest&, const DescribeNodeMetricsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeNodeMetricsAsyncHandler;
@@ -887,6 +892,9 @@ namespace AlibabaCloud
 			DescribeMetricsDataOutcome describeMetricsData(const Model::DescribeMetricsDataRequest &request)const;
 			void describeMetricsDataAsync(const Model::DescribeMetricsDataRequest& request, const DescribeMetricsDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeMetricsDataOutcomeCallable describeMetricsDataCallable(const Model::DescribeMetricsDataRequest& request) const;
+			DescribeMetricsDataV2Outcome describeMetricsDataV2(const Model::DescribeMetricsDataV2Request &request)const;
+			void describeMetricsDataV2Async(const Model::DescribeMetricsDataV2Request& request, const DescribeMetricsDataV2AsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeMetricsDataV2OutcomeCallable describeMetricsDataV2Callable(const Model::DescribeMetricsDataV2Request& request) const;
 			DescribeNodeMetricsOutcome describeNodeMetrics(const Model::DescribeNodeMetricsRequest &request)const;
 			void describeNodeMetricsAsync(const Model::DescribeNodeMetricsRequest& request, const DescribeNodeMetricsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeNodeMetricsOutcomeCallable describeNodeMetricsCallable(const Model::DescribeNodeMetricsRequest& request) const;
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/CreateBackupSetDownloadLinkResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/CreateBackupSetDownloadLinkResult.h
@@ -32,17 +32,21 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_OCEANBASEPRO_EXPORT CreateBackupSetDownloadLinkResult : public ServiceResult
 			{
 			public:
+				struct Data
+				{
+					long downloadTaskId;
+				};
 
 
 				CreateBackupSetDownloadLinkResult();
 				explicit CreateBackupSetDownloadLinkResult(const std::string &payload);
 				~CreateBackupSetDownloadLinkResult();
-				long getDownloadTaskId()const;
+				Data getData()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				long downloadTaskId_;
+				Data data_;
 
 			};
 		}
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstanceResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstanceResult.h
@@ -151,7 +151,7 @@ namespace AlibabaCloud
 					std::string deployType;
 					std::string proxyServiceStatus;
 					ReadOnlyResource readOnlyResource;
-					std::string nodeNum;
+					long nodeNum;
 					bool enableIsolationOptimization;
 					std::string dataMergeTime;
 					std::string specType;
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataV2Request.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataV2Request.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_OCEANBASEPRO_MODEL_DESCRIBEMETRICSDATAV2REQUEST_H_
+#define ALIBABACLOUD_OCEANBASEPRO_MODEL_DESCRIBEMETRICSDATAV2REQUEST_H_
+
+#include <alibabacloud/oceanbasepro/OceanBaseProExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace OceanBasePro {
+namespace Model {
+class ALIBABACLOUD_OCEANBASEPRO_EXPORT DescribeMetricsDataV2Request : public RpcServiceRequest {
+public:
+	DescribeMetricsDataV2Request();
+	~DescribeMetricsDataV2Request();
+	std::string getGroupByLabels() const;
+	void setGroupByLabels(const std::string &groupByLabels);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	std::string getLimit() const;
+	void setLimit(const std::string &limit);
+	std::string getSortOrder() const;
+	void setSortOrder(const std::string &sortOrder);
+	std::string getSortMetricKey() const;
+	void setSortMetricKey(const std::string &sortMetricKey);
+	std::string getReplicaType() const;
+	void setReplicaType(const std::string &replicaType);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	std::string getLabels() const;
+	void setLabels(const std::string &labels);
+	std::string getInstanceId() const;
+	void setInstanceId(const std::string &instanceId);
+	std::string getMetrics() const;
+	void setMetrics(const std::string &metrics);
+
+private:
+	std::string groupByLabels_;
+	std::string startTime_;
+	std::string limit_;
+	std::string sortOrder_;
+	std::string sortMetricKey_;
+	std::string replicaType_;
+	std::string endTime_;
+	std::string labels_;
+	std::string instanceId_;
+	std::string metrics_;
+};
+} // namespace Model
+} // namespace OceanBasePro
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_OCEANBASEPRO_MODEL_DESCRIBEMETRICSDATAV2REQUEST_H_
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataV2Result.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataV2Result.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_OCEANBASEPRO_MODEL_DESCRIBEMETRICSDATAV2RESULT_H_
+#define ALIBABACLOUD_OCEANBASEPRO_MODEL_DESCRIBEMETRICSDATAV2RESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/oceanbasepro/OceanBaseProExport.h>
+
+namespace AlibabaCloud
+{
+	namespace OceanBasePro
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_OCEANBASEPRO_EXPORT DescribeMetricsDataV2Result : public ServiceResult
+			{
+			public:
+				struct DataItem
+				{
+					struct DataItem2
+					{
+						std::string metricValue;
+						long timestamp;
+					};
+					std::string labels;
+					std::vector<DataItem::DataItem2> data1;
+				};
+
+
+				DescribeMetricsDataV2Result();
+				explicit DescribeMetricsDataV2Result(const std::string &payload);
+				~DescribeMetricsDataV2Result();
+				std::vector<DataItem> getData()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<DataItem> data_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_OCEANBASEPRO_MODEL_DESCRIBEMETRICSDATAV2RESULT_H_
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeProxyServiceResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeProxyServiceResult.h
@@ -38,11 +38,16 @@ namespace AlibabaCloud
 					long currentEndpointNum;
 					std::string zone;
 					long unitNum;
+					long exclusiveUnitNumLimit;
 					std::string createTime;
 					std::string proxyVersion;
 					std::string proxyClusterId;
 					long unitNumLimit;
+					long serverNumLimit;
+					bool allowModifyServerNum;
+					long sharedUnitNumLimit;
 					long endpointNumQuota;
+					std::string deployMode;
 					std::string unitSpec;
 					std::string expireTime;
 					std::string proxyServiceVersion;
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLSamplesResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLSamplesResult.h
@@ -53,7 +53,9 @@ namespace AlibabaCloud
 					long requestId;
 					std::string requestTime;
 					std::string paramsValue;
+					std::string sqlId;
 					long ssstoreReadRows;
+					std::string sqlTextShort;
 					double scheduleTime;
 					long obUserId;
 					std::string traceId;
diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantResult.h
@@ -119,6 +119,7 @@ namespace AlibabaCloud
 						std::string proxyClusterId;
 						int intranetPort;
 						long parallelQueryDegree;
+						std::string intranetAddressServiceType;
 						int internetSqlPort;
 						int internetRpcPort;
 						std::string connectionReplicaType;
@@ -131,6 +132,7 @@ namespace AlibabaCloud
 						long internetMaxConnectionLimit;
 						int intranetRpcPort;
 						std::string odpVersion;
+						std::string internetAddressServiceType;
 						std::string intranetAddress;
 						std::string vpcId;
 						std::vector<std::string> connectionLogicalZones;
@@ -193,7 +195,7 @@ namespace AlibabaCloud
 					std::string timeZone;
 					TenantResource tenantResource;
 					std::string vpcId;
-					std::string tenantMaxConnections;
+					long tenantMaxConnections;
 				};
 
 
diff --git a/oceanbasepro/src/OceanBaseProClient.cc b/oceanbasepro/src/OceanBaseProClient.cc
@@ -1923,6 +1923,42 @@ OceanBaseProClient::DescribeMetricsDataOutcomeCallable OceanBaseProClient::descr
 	return task->get_future();
 }
 
+OceanBaseProClient::DescribeMetricsDataV2Outcome OceanBaseProClient::describeMetricsDataV2(const DescribeMetricsDataV2Request &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeMetricsDataV2Outcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeMetricsDataV2Outcome(DescribeMetricsDataV2Result(outcome.result()));
+	else
+		return DescribeMetricsDataV2Outcome(outcome.error());
+}
+
+void OceanBaseProClient::describeMetricsDataV2Async(const DescribeMetricsDataV2Request& request, const DescribeMetricsDataV2AsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeMetricsDataV2(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+OceanBaseProClient::DescribeMetricsDataV2OutcomeCallable OceanBaseProClient::describeMetricsDataV2Callable(const DescribeMetricsDataV2Request &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeMetricsDataV2Outcome()>>(
+			[this, request]()
+			{
+			return this->describeMetricsDataV2(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 OceanBaseProClient::DescribeNodeMetricsOutcome OceanBaseProClient::describeNodeMetrics(const DescribeNodeMetricsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
diff --git a/oceanbasepro/src/model/CreateBackupSetDownloadLinkResult.cc b/oceanbasepro/src/model/CreateBackupSetDownloadLinkResult.cc
@@ -39,13 +39,14 @@ void CreateBackupSetDownloadLinkResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["DownloadTaskId"].isNull())
-		downloadTaskId_ = std::stol(value["DownloadTaskId"].asString());
+	auto dataNode = value["Data"];
+	if(!dataNode["DownloadTaskId"].isNull())
+		data_.downloadTaskId = std::stol(dataNode["DownloadTaskId"].asString());
 
 }
 
-long CreateBackupSetDownloadLinkResult::getDownloadTaskId()const
+CreateBackupSetDownloadLinkResult::Data CreateBackupSetDownloadLinkResult::getData()const
 {
-	return downloadTaskId_;
+	return data_;
 }
 
diff --git a/oceanbasepro/src/model/DescribeInstanceResult.cc b/oceanbasepro/src/model/DescribeInstanceResult.cc
@@ -83,7 +83,7 @@ void DescribeInstanceResult::parse(const std::string &payload)
 	if(!instanceNode["InstanceRole"].isNull())
 		instance_.instanceRole = instanceNode["InstanceRole"].asString();
 	if(!instanceNode["NodeNum"].isNull())
-		instance_.nodeNum = instanceNode["NodeNum"].asString();
+		instance_.nodeNum = std::stol(instanceNode["NodeNum"].asString());
 	if(!instanceNode["ReplicaMode"].isNull())
 		instance_.replicaMode = instanceNode["ReplicaMode"].asString();
 	if(!instanceNode["IsolationOptimization"].isNull())
diff --git a/oceanbasepro/src/model/DescribeMetricsDataV2Request.cc b/oceanbasepro/src/model/DescribeMetricsDataV2Request.cc
diff --git a/oceanbasepro/src/model/DescribeMetricsDataV2Result.cc b/oceanbasepro/src/model/DescribeMetricsDataV2Result.cc
diff --git a/oceanbasepro/src/model/DescribeProxyServiceResult.cc b/oceanbasepro/src/model/DescribeProxyServiceResult.cc
diff --git a/oceanbasepro/src/model/DescribeSQLSamplesResult.cc b/oceanbasepro/src/model/DescribeSQLSamplesResult.cc
diff --git a/oceanbasepro/src/model/DescribeTenantResult.cc b/oceanbasepro/src/model/DescribeTenantResult.cc
