From fb86207f1d13815a463ad9af2e49668faeabc57a Mon Sep 17 00:00:00 2001 From: sdk-team Date: Wed, 9 Jul 2025 06:19:44 +0000 Subject: [PATCH] Generated 2019-09-01 for OceanBasePro. --- VERSION | 2 +- .../model/DescribeInstanceResult.h | 1 + .../model/DescribeInstancesResult.h | 1 + .../model/DescribeMetricsDataRequest.h | 3 ++ .../model/DescribeOasAnomalySQLListResult.h | 2 +- .../model/DescribeOasSQLHistoryListResult.h | 36 +++++++++---------- .../model/DescribeOasSlowSQLListResult.h | 30 ++++++++-------- .../model/DescribeOasTopSQLListResult.h | 18 +++++----- .../DescribeProcessStatsCompositionResult.h | 6 ++-- .../model/DescribeSQLSamplesResult.h | 34 +++++++++--------- .../model/DescribeSQLTuningAdvicesResult.h | 2 +- .../model/DescribeSampleSqlRawTextsRequest.h | 6 ++-- .../model/DescribeSqlAuditStatRequest.h | 3 ++ .../model/DescribeSqlAuditStatResult.h | 2 ++ .../oceanbasepro/model/DescribeTenantResult.h | 1 + .../model/DescribeTenantsResult.h | 1 + .../model/ModifyTenantResourceRequest.h | 3 ++ .../src/model/DescribeInstanceResult.cc | 2 ++ .../src/model/DescribeInstancesResult.cc | 2 ++ .../src/model/DescribeMetricsDataRequest.cc | 9 +++++ .../model/DescribeOasSQLHistoryListResult.cc | 36 +++++++++---------- .../src/model/DescribeOasSlowSQLListResult.cc | 30 ++++++++-------- .../src/model/DescribeOasTopSQLListResult.cc | 18 +++++----- .../DescribeProcessStatsCompositionResult.cc | 6 ++-- .../src/model/DescribeSQLSamplesResult.cc | 34 +++++++++--------- .../model/DescribeSQLTuningAdvicesResult.cc | 2 +- .../model/DescribeSampleSqlRawTextsRequest.cc | 6 ++-- .../src/model/DescribeSqlAuditStatRequest.cc | 9 +++++ .../src/model/DescribeSqlAuditStatResult.cc | 7 ++++ .../src/model/DescribeTenantResult.cc | 2 ++ .../src/model/DescribeTenantsResult.cc | 2 ++ .../src/model/ModifyTenantResourceRequest.cc | 9 +++++ 32 files changed, 191 insertions(+), 134 deletions(-) diff --git a/VERSION b/VERSION index 5c86690d5..b10ab058f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.2082 \ No newline at end of file +1.36.2083 \ No newline at end of file diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstanceResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstanceResult.h index eb8403ff3..2235b9d62 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstanceResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstanceResult.h @@ -185,6 +185,7 @@ namespace AlibabaCloud Resource resource; std::string instanceClass; std::string payType; + int iops; bool dataDiskAutoScale; bool enableProxyService; std::string instanceName; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstancesResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstancesResult.h index 35d54e0b0..89dc54273 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstancesResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeInstancesResult.h @@ -121,6 +121,7 @@ namespace AlibabaCloud std::string instanceClass; bool migratable; std::string payType; + int iops; std::string instanceName; std::string series; DataDiskAutoScaleConfig dataDiskAutoScaleConfig; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataRequest.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataRequest.h index 2d6e9b4e1..fb8631a2e 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataRequest.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeMetricsDataRequest.h @@ -42,6 +42,8 @@ public: void setSortMetricKey(const std::string &sortMetricKey); std::string getReplicaType() const; void setReplicaType(const std::string &replicaType); + std::string getMetricScope() const; + void setMetricScope(const std::string &metricScope); std::string getEndTime() const; void setEndTime(const std::string &endTime); std::string getLabels() const; @@ -58,6 +60,7 @@ private: std::string sortOrder_; std::string sortMetricKey_; std::string replicaType_; + std::string metricScope_; std::string endTime_; std::string labels_; std::string instanceId_; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasAnomalySQLListResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasAnomalySQLListResult.h index a2803cc1e..5006fab1f 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasAnomalySQLListResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasAnomalySQLListResult.h @@ -63,7 +63,7 @@ namespace AlibabaCloud double sumDbTime; std::vector sqlList; std::string userName; - double lastExecutedTime; + std::string lastExecutedTime; float avgRetryCount; double avgGetPlanTime; double cpuTime; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSQLHistoryListResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSQLHistoryListResult.h index 851d5e720..a2b26235d 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSQLHistoryListResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSQLHistoryListResult.h @@ -35,47 +35,47 @@ namespace AlibabaCloud struct DataItem { long executions; - long avgRowCacheHit; + double avgRowCacheHit; std::string server; double maxApplicationWaitTime; double maxAffectedRows; double maxUserIoWaitTime; double avgUserIoWaitTime; long retryCount; - double retCode6002Count; + long retCode6002Count; long missPlans; - long avgLogicalReads; - double retCode5167Count; - long avgBlockCacheHit; + double avgLogicalReads; + long retCode5167Count; + double avgBlockCacheHit; double execPs; double tableScanPercentage; - double retCode5217Count; + long retCode5217Count; double avgUsedWorkerCount; double maxElapsedTime; double localPlanPercentage; double avgGetPlanTime; double avgNetTime; double remotePlanPercentage; - long avgAffectedRows; + double avgAffectedRows; double avgApplicationWaitTime; - long avgSsstoreReadRows; - long avgMemstoreReadRows; + double avgSsstoreReadRows; + double avgMemstoreReadRows; double avgQueueTime; double maxCpuTime; - long avgDiskReads; - double retCode5001Count; + double avgDiskReads; + long retCode5001Count; double avgCpuTime; - double retCode5024Count; + long retCode5024Count; double sumLogicalReads; double sumDbTime; double strongConsistencyPercentage; - double retCode4013Count; + long retCode4013Count; double avgConcurrencyWaitTime; std::string timestamp; - long avgBlockIndexCacheHit; - long avgBloomFilterCacheHit; + double avgBlockIndexCacheHit; + double avgBloomFilterCacheHit; double sumElapsedTime; - long avgReturnRows; + double avgReturnRows; long failCount; double avgPartitionCount; std::string dbName; @@ -83,7 +83,7 @@ namespace AlibabaCloud double weakConsistencyPercentage; double avgDecodeTime; std::string sQLId; - long avgRpcCount; + double avgRpcCount; double avgNetWaitTime; double maxDiskReads; double avgDbTime; @@ -99,7 +99,7 @@ namespace AlibabaCloud double maxConcurrencyWaitTime; double missPlanPercentage; std::string waitEvent; - double retCode4012Count; + long retCode4012Count; double avgElapsedTime; double failPercentage; double maxReturnRows; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSlowSQLListResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSlowSQLListResult.h index 1921e6434..22613f923 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSlowSQLListResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasSlowSQLListResult.h @@ -36,7 +36,7 @@ namespace AlibabaCloud { struct SqlListItem { - double executions; + long executions; double avgRowCacheHit; double maxApplicationWaitTime; std::string server; @@ -45,9 +45,9 @@ namespace AlibabaCloud std::string clientIp; bool inner; double avgUserIoWaitTime; - double retryCount; + long retryCount; long retCode6002Count; - double missPlans; + long missPlans; long retCode5167Count; std::string sqlType; double avgLogicalReads; @@ -83,7 +83,7 @@ namespace AlibabaCloud double avgBloomFilterCacheHit; double avgReturnRows; double avgPartitionCount; - double failCount; + long failCount; std::string dbName; double avgWaitTime; double weakConsistencyPercentage; @@ -94,7 +94,7 @@ namespace AlibabaCloud double avgDbTime; double avgExpectedWorkerCount; double distPlanPercentage; - double remotePlans; + long remotePlans; double avgWaitCount; std::string userName; double rpcCount; @@ -114,7 +114,7 @@ namespace AlibabaCloud double sumWaitTime; long serverPort; }; - double executions; + long executions; double avgRowCacheHit; double maxApplicationWaitTime; std::string server; @@ -123,16 +123,16 @@ namespace AlibabaCloud std::string clientIp; bool inner; double avgUserIoWaitTime; - double retryCount; - double retCode6002Count; - double missPlans; - double retCode5167Count; + long retryCount; + long retCode6002Count; + long missPlans; + long retCode5167Count; std::string sqlType; double avgLogicalReads; double execPs; double avgBlockCacheHit; double tableScanPercentage; - double retCode5217Count; + long retCode5217Count; double avgUsedWorkerCount; double maxElapsedTime; double localPlanPercentage; @@ -148,8 +148,8 @@ namespace AlibabaCloud double avgQueueTime; double maxCpuTime; double avgDiskReads; - double retCode5001Count; - double retCode5024Count; + long retCode5001Count; + long retCode5024Count; double sumLogicalReads; double avgCpuTime; double sumDbTime; @@ -161,7 +161,7 @@ namespace AlibabaCloud double avgBloomFilterCacheHit; double avgReturnRows; double avgPartitionCount; - double failCount; + long failCount; std::string dbName; double avgWaitTime; double weakConsistencyPercentage; @@ -174,7 +174,7 @@ namespace AlibabaCloud double distPlanPercentage; bool dynamicSql; std::vector sqlList; - double remotePlans; + long remotePlans; double avgWaitCount; std::string userName; double rpcCount; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasTopSQLListResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasTopSQLListResult.h index 01d2cc521..8acd3f9c6 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasTopSQLListResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeOasTopSQLListResult.h @@ -50,9 +50,9 @@ namespace AlibabaCloud std::string clientIp; bool inner; double avgUserIoWaitTime; - double retryCount; + long retryCount; long retCode6002Count; - double missPlans; + long missPlans; long retCode5167Count; std::string sqlType; double avgLogicalReads; @@ -89,7 +89,7 @@ namespace AlibabaCloud double avgBloomFilterCacheHit; double avgReturnRows; double avgPartitionCount; - double failCount; + long failCount; std::string dbName; double avgWaitTime; double weakConsistencyPercentage; @@ -100,7 +100,7 @@ namespace AlibabaCloud double avgDbTime; double avgExpectedWorkerCount; double distPlanPercentage; - double remotePlans; + long remotePlans; double avgWaitCount; std::string userName; double rpcCount; @@ -129,10 +129,10 @@ namespace AlibabaCloud std::string clientIp; bool inner; double avgUserIoWaitTime; - double retryCount; + long retryCount; long retCode6002Count; - std::string obDbId; - double missPlans; + long obDbId; + long missPlans; long retCode5167Count; std::string sqlType; double avgLogicalReads; @@ -170,7 +170,7 @@ namespace AlibabaCloud CustomColumns customColumns; double avgReturnRows; double avgPartitionCount; - double failCount; + long failCount; std::string dbName; double avgWaitTime; double weakConsistencyPercentage; @@ -183,7 +183,7 @@ namespace AlibabaCloud double distPlanPercentage; bool dynamicSql; std::vector sqlList; - double remotePlans; + long remotePlans; double avgWaitCount; std::string userName; double rpcCount; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeProcessStatsCompositionResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeProcessStatsCompositionResult.h index a55e8164a..4c4e18efd 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeProcessStatsCompositionResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeProcessStatsCompositionResult.h @@ -68,7 +68,7 @@ namespace AlibabaCloud struct ProcessSqlListItem { std::string status; - std::string dynamicSql; + bool dynamicSql; std::string user; long executeTime; std::string proxySessId; @@ -85,7 +85,7 @@ namespace AlibabaCloud long sessionId; }; std::string status; - std::string dynamicSql; + bool dynamicSql; std::string user; long executeTime; std::string proxySessId; @@ -103,7 +103,7 @@ namespace AlibabaCloud long sessionId; }; std::string status; - std::string dynamicSql; + bool dynamicSql; std::string user; long executeTime; std::string proxySessId; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLSamplesResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLSamplesResult.h index 4ac0382af..5d4efe378 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLSamplesResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLSamplesResult.h @@ -35,39 +35,39 @@ namespace AlibabaCloud struct DataItem { std::string server; - std::string clientPort; + int clientPort; std::string clientIp; double cpuTime; bool inner; std::string consistencyLevel; - double retryCount; + long retryCount; std::string transHash; - double retCode; + int retCode; std::string planType; - double obDbId; + long obDbId; std::string sqlType; double queueTime; double blockIndexCacheHit; bool tableScan; - double waitCount; - std::string requestId; + long waitCount; + long requestId; std::string requestTime; std::string paramsValue; - double ssstoreReadRows; + long ssstoreReadRows; double scheduleTime; - double obUserId; + long obUserId; std::string traceId; double bloomFilterCacheHit; - double obServerId; - double expectedWorkerCount; + long obServerId; + long expectedWorkerCount; double decodeTime; double concurrencyWaitTime; double executeTime; - double memstoreReadRows; + long memstoreReadRows; double getPlanTime; double elapsedTime; bool hitPlan; - double returnRows; + long returnRows; bool executorRpc; double blockCacheHit; std::string dbName; @@ -75,19 +75,19 @@ namespace AlibabaCloud double diskReads; std::string userName; double netTime; - double rpcCount; + long rpcCount; std::string fullSqlText; std::string statement; - double planId; + long planId; double rowCacheHit; - double affectedRows; - double usedWorkerCount; + long affectedRows; + long usedWorkerCount; std::string sqlText; double applicationWaitTime; std::string waitEvent; double userIoWaitTime; double waitTime; - double partitionCount; + long partitionCount; }; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLTuningAdvicesResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLTuningAdvicesResult.h index 049cc8ea9..a9e7b2882 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLTuningAdvicesResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSQLTuningAdvicesResult.h @@ -72,7 +72,7 @@ namespace AlibabaCloud struct ColumnsItem { std::string columnName; - float ndv; + double ndv; std::string minValue; std::string maxValue; }; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSampleSqlRawTextsRequest.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSampleSqlRawTextsRequest.h index cf7449c87..6fe225911 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSampleSqlRawTextsRequest.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSampleSqlRawTextsRequest.h @@ -38,8 +38,8 @@ public: void setDynamicSql(bool dynamicSql); std::string getTenantId() const; void setTenantId(const std::string &tenantId); - std::string getLimit() const; - void setLimit(const std::string &limit); + int getLimit() const; + void setLimit(int limit); std::string getSqlId() const; void setSqlId(const std::string &sqlId); std::string getEndTime() const; @@ -54,7 +54,7 @@ private: std::string startTime_; bool dynamicSql_; std::string tenantId_; - std::string limit_; + int limit_; std::string sqlId_; std::string endTime_; std::string instanceId_; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatRequest.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatRequest.h index 161773239..d79fc1735 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatRequest.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatRequest.h @@ -32,6 +32,8 @@ public: ~DescribeSqlAuditStatRequest(); std::string getStartTime() const; void setStartTime(const std::string &startTime); + std::string getOperatorType() const; + void setOperatorType(const std::string &operatorType); int getPageNumber() const; void setPageNumber(int pageNumber); std::string getTenantId() const; @@ -45,6 +47,7 @@ public: private: std::string startTime_; + std::string operatorType_; int pageNumber_; std::string tenantId_; int pageSize_; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatResult.h index 1dd1662df..2088944bc 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeSqlAuditStatResult.h @@ -57,11 +57,13 @@ namespace AlibabaCloud DescribeSqlAuditStatResult(); explicit DescribeSqlAuditStatResult(const std::string &payload); ~DescribeSqlAuditStatResult(); + long getTotalCount()const; std::vector getData()const; protected: void parse(const std::string &payload); private: + long totalCount_; std::vector data_; }; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantResult.h index 21738ae2e..d32ce9732 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantResult.h @@ -182,6 +182,7 @@ namespace AlibabaCloud std::string charset; std::string payType; std::string odpVersion; + int iops; std::string collation; bool enableInternetAddressService; bool enableReadWriteSplit; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantsResult.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantsResult.h index 4ced7b434..6e19d8f29 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantsResult.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/DescribeTenantsResult.h @@ -46,6 +46,7 @@ namespace AlibabaCloud int cpu; std::string charset; bool enableReadOnlyReplica; + int iops; std::string collation; std::string tenantId; std::string vpcId; diff --git a/oceanbasepro/include/alibabacloud/oceanbasepro/model/ModifyTenantResourceRequest.h b/oceanbasepro/include/alibabacloud/oceanbasepro/model/ModifyTenantResourceRequest.h index 557cf8c6a..c60b5046b 100644 --- a/oceanbasepro/include/alibabacloud/oceanbasepro/model/ModifyTenantResourceRequest.h +++ b/oceanbasepro/include/alibabacloud/oceanbasepro/model/ModifyTenantResourceRequest.h @@ -40,6 +40,8 @@ public: void setInstanceId(const std::string &instanceId); std::string getTenantId() const; void setTenantId(const std::string &tenantId); + std::string getIops() const; + void setIops(const std::string &iops); std::string getReadOnlyZoneList() const; void setReadOnlyZoneList(const std::string &readOnlyZoneList); @@ -49,6 +51,7 @@ private: int cpu_; std::string instanceId_; std::string tenantId_; + std::string iops_; std::string readOnlyZoneList_; }; } // namespace Model diff --git a/oceanbasepro/src/model/DescribeInstanceResult.cc b/oceanbasepro/src/model/DescribeInstanceResult.cc index 2cea4ff1e..980fd2719 100644 --- a/oceanbasepro/src/model/DescribeInstanceResult.cc +++ b/oceanbasepro/src/model/DescribeInstanceResult.cc @@ -122,6 +122,8 @@ void DescribeInstanceResult::parse(const std::string &payload) instance_.allowModifyInternetAddressConnectionLimit = instanceNode["AllowModifyInternetAddressConnectionLimit"].asString() == "true"; if(!instanceNode["AllowCreateProxySqlFirewallRule"].isNull()) instance_.allowCreateProxySqlFirewallRule = instanceNode["AllowCreateProxySqlFirewallRule"].asString() == "true"; + if(!instanceNode["Iops"].isNull()) + instance_.iops = std::stoi(instanceNode["Iops"].asString()); auto resourceNode = instanceNode["Resource"]; if(!resourceNode["UnitCount"].isNull()) instance_.resource.unitCount = std::stol(resourceNode["UnitCount"].asString()); diff --git a/oceanbasepro/src/model/DescribeInstancesResult.cc b/oceanbasepro/src/model/DescribeInstancesResult.cc index fcf413662..d00061559 100644 --- a/oceanbasepro/src/model/DescribeInstancesResult.cc +++ b/oceanbasepro/src/model/DescribeInstancesResult.cc @@ -105,6 +105,8 @@ void DescribeInstancesResult::parse(const std::string &payload) instancesObject.replicaMode = valueInstancesData["ReplicaMode"].asString(); if(!valueInstancesData["Migratable"].isNull()) instancesObject.migratable = valueInstancesData["Migratable"].asString() == "true"; + if(!valueInstancesData["Iops"].isNull()) + instancesObject.iops = std::stoi(valueInstancesData["Iops"].asString()); auto resourceNode = value["Resource"]; if(!resourceNode["UnitCount"].isNull()) instancesObject.resource.unitCount = std::stol(resourceNode["UnitCount"].asString()); diff --git a/oceanbasepro/src/model/DescribeMetricsDataRequest.cc b/oceanbasepro/src/model/DescribeMetricsDataRequest.cc index 742594676..3e15a07f2 100644 --- a/oceanbasepro/src/model/DescribeMetricsDataRequest.cc +++ b/oceanbasepro/src/model/DescribeMetricsDataRequest.cc @@ -79,6 +79,15 @@ void DescribeMetricsDataRequest::setReplicaType(const std::string &replicaType) setBodyParameter(std::string("ReplicaType"), replicaType); } +std::string DescribeMetricsDataRequest::getMetricScope() const { + return metricScope_; +} + +void DescribeMetricsDataRequest::setMetricScope(const std::string &metricScope) { + metricScope_ = metricScope; + setBodyParameter(std::string("MetricScope"), metricScope); +} + std::string DescribeMetricsDataRequest::getEndTime() const { return endTime_; } diff --git a/oceanbasepro/src/model/DescribeOasSQLHistoryListResult.cc b/oceanbasepro/src/model/DescribeOasSQLHistoryListResult.cc index d5e04ea3a..4f34c3132 100644 --- a/oceanbasepro/src/model/DescribeOasSQLHistoryListResult.cc +++ b/oceanbasepro/src/model/DescribeOasSQLHistoryListResult.cc @@ -48,37 +48,37 @@ void DescribeOasSQLHistoryListResult::parse(const std::string &payload) if(!valueDataDataItem["DbName"].isNull()) dataObject.dbName = valueDataDataItem["DbName"].asString(); if(!valueDataDataItem["AvgAffectedRows"].isNull()) - dataObject.avgAffectedRows = std::stol(valueDataDataItem["AvgAffectedRows"].asString()); + dataObject.avgAffectedRows = valueDataDataItem["AvgAffectedRows"].asString(); if(!valueDataDataItem["AvgBlockCacheHit"].isNull()) - dataObject.avgBlockCacheHit = std::stol(valueDataDataItem["AvgBlockCacheHit"].asString()); + dataObject.avgBlockCacheHit = valueDataDataItem["AvgBlockCacheHit"].asString(); if(!valueDataDataItem["AvgBlockIndexCacheHit"].isNull()) - dataObject.avgBlockIndexCacheHit = std::stol(valueDataDataItem["AvgBlockIndexCacheHit"].asString()); + dataObject.avgBlockIndexCacheHit = valueDataDataItem["AvgBlockIndexCacheHit"].asString(); if(!valueDataDataItem["AvgBloomFilterCacheHit"].isNull()) - dataObject.avgBloomFilterCacheHit = std::stol(valueDataDataItem["AvgBloomFilterCacheHit"].asString()); + dataObject.avgBloomFilterCacheHit = valueDataDataItem["AvgBloomFilterCacheHit"].asString(); if(!valueDataDataItem["Executions"].isNull()) dataObject.executions = std::stol(valueDataDataItem["Executions"].asString()); if(!valueDataDataItem["FailCount"].isNull()) dataObject.failCount = std::stol(valueDataDataItem["FailCount"].asString()); if(!valueDataDataItem["AvgRpcCount"].isNull()) - dataObject.avgRpcCount = std::stol(valueDataDataItem["AvgRpcCount"].asString()); + dataObject.avgRpcCount = valueDataDataItem["AvgRpcCount"].asString(); if(!valueDataDataItem["RemotePlans"].isNull()) dataObject.remotePlans = std::stol(valueDataDataItem["RemotePlans"].asString()); if(!valueDataDataItem["MissPlans"].isNull()) dataObject.missPlans = std::stol(valueDataDataItem["MissPlans"].asString()); if(!valueDataDataItem["AvgReturnRows"].isNull()) - dataObject.avgReturnRows = std::stol(valueDataDataItem["AvgReturnRows"].asString()); + dataObject.avgReturnRows = valueDataDataItem["AvgReturnRows"].asString(); if(!valueDataDataItem["AvgLogicalReads"].isNull()) - dataObject.avgLogicalReads = std::stol(valueDataDataItem["AvgLogicalReads"].asString()); + dataObject.avgLogicalReads = valueDataDataItem["AvgLogicalReads"].asString(); if(!valueDataDataItem["RetryCount"].isNull()) dataObject.retryCount = std::stol(valueDataDataItem["RetryCount"].asString()); if(!valueDataDataItem["AvgRowCacheHit"].isNull()) - dataObject.avgRowCacheHit = std::stol(valueDataDataItem["AvgRowCacheHit"].asString()); + dataObject.avgRowCacheHit = valueDataDataItem["AvgRowCacheHit"].asString(); if(!valueDataDataItem["AvgDiskReads"].isNull()) - dataObject.avgDiskReads = std::stol(valueDataDataItem["AvgDiskReads"].asString()); + dataObject.avgDiskReads = valueDataDataItem["AvgDiskReads"].asString(); if(!valueDataDataItem["AvgMemstoreReadRows"].isNull()) - dataObject.avgMemstoreReadRows = std::stol(valueDataDataItem["AvgMemstoreReadRows"].asString()); + dataObject.avgMemstoreReadRows = valueDataDataItem["AvgMemstoreReadRows"].asString(); if(!valueDataDataItem["AvgSsstoreReadRows"].isNull()) - dataObject.avgSsstoreReadRows = std::stol(valueDataDataItem["AvgSsstoreReadRows"].asString()); + dataObject.avgSsstoreReadRows = valueDataDataItem["AvgSsstoreReadRows"].asString(); if(!valueDataDataItem["AvgApplicationWaitTime"].isNull()) dataObject.avgApplicationWaitTime = valueDataDataItem["AvgApplicationWaitTime"].asString(); if(!valueDataDataItem["AvgElapsedTime"].isNull()) @@ -120,19 +120,19 @@ void DescribeOasSQLHistoryListResult::parse(const std::string &payload) if(!valueDataDataItem["FailPercentage"].isNull()) dataObject.failPercentage = valueDataDataItem["FailPercentage"].asString(); if(!valueDataDataItem["RetCode4012Count"].isNull()) - dataObject.retCode4012Count = valueDataDataItem["RetCode4012Count"].asString(); + dataObject.retCode4012Count = std::stol(valueDataDataItem["RetCode4012Count"].asString()); if(!valueDataDataItem["RetCode4013Count"].isNull()) - dataObject.retCode4013Count = valueDataDataItem["RetCode4013Count"].asString(); + dataObject.retCode4013Count = std::stol(valueDataDataItem["RetCode4013Count"].asString()); if(!valueDataDataItem["RetCode5001Count"].isNull()) - dataObject.retCode5001Count = valueDataDataItem["RetCode5001Count"].asString(); + dataObject.retCode5001Count = std::stol(valueDataDataItem["RetCode5001Count"].asString()); if(!valueDataDataItem["RetCode5024Count"].isNull()) - dataObject.retCode5024Count = valueDataDataItem["RetCode5024Count"].asString(); + dataObject.retCode5024Count = std::stol(valueDataDataItem["RetCode5024Count"].asString()); if(!valueDataDataItem["RetCode5167Count"].isNull()) - dataObject.retCode5167Count = valueDataDataItem["RetCode5167Count"].asString(); + dataObject.retCode5167Count = std::stol(valueDataDataItem["RetCode5167Count"].asString()); if(!valueDataDataItem["RetCode5217Count"].isNull()) - dataObject.retCode5217Count = valueDataDataItem["RetCode5217Count"].asString(); + dataObject.retCode5217Count = std::stol(valueDataDataItem["RetCode5217Count"].asString()); if(!valueDataDataItem["RetCode6002Count"].isNull()) - dataObject.retCode6002Count = valueDataDataItem["RetCode6002Count"].asString(); + dataObject.retCode6002Count = std::stol(valueDataDataItem["RetCode6002Count"].asString()); if(!valueDataDataItem["AvgWaitTime"].isNull()) dataObject.avgWaitTime = valueDataDataItem["AvgWaitTime"].asString(); if(!valueDataDataItem["AvgWaitCount"].isNull()) diff --git a/oceanbasepro/src/model/DescribeOasSlowSQLListResult.cc b/oceanbasepro/src/model/DescribeOasSlowSQLListResult.cc index 59d64fe26..ca3c78f31 100644 --- a/oceanbasepro/src/model/DescribeOasSlowSQLListResult.cc +++ b/oceanbasepro/src/model/DescribeOasSlowSQLListResult.cc @@ -44,13 +44,13 @@ void DescribeOasSlowSQLListResult::parse(const std::string &payload) { DataItem dataObject; if(!valueDataDataItem["Executions"].isNull()) - dataObject.executions = valueDataDataItem["Executions"].asString(); + dataObject.executions = std::stol(valueDataDataItem["Executions"].asString()); if(!valueDataDataItem["RpcCount"].isNull()) dataObject.rpcCount = valueDataDataItem["RpcCount"].asString(); if(!valueDataDataItem["RemotePlans"].isNull()) - dataObject.remotePlans = valueDataDataItem["RemotePlans"].asString(); + dataObject.remotePlans = std::stol(valueDataDataItem["RemotePlans"].asString()); if(!valueDataDataItem["MissPlans"].isNull()) - dataObject.missPlans = valueDataDataItem["MissPlans"].asString(); + dataObject.missPlans = std::stol(valueDataDataItem["MissPlans"].asString()); if(!valueDataDataItem["MaxElapsedTime"].isNull()) dataObject.maxElapsedTime = valueDataDataItem["MaxElapsedTime"].asString(); if(!valueDataDataItem["TotalWaitTime"].isNull()) @@ -70,15 +70,15 @@ void DescribeOasSlowSQLListResult::parse(const std::string &payload) if(!valueDataDataItem["RetCode4013Count"].isNull()) dataObject.retCode4013Count = std::stol(valueDataDataItem["RetCode4013Count"].asString()); if(!valueDataDataItem["RetCode5001Count"].isNull()) - dataObject.retCode5001Count = valueDataDataItem["RetCode5001Count"].asString(); + dataObject.retCode5001Count = std::stol(valueDataDataItem["RetCode5001Count"].asString()); if(!valueDataDataItem["RetCode5024Count"].isNull()) - dataObject.retCode5024Count = valueDataDataItem["RetCode5024Count"].asString(); + dataObject.retCode5024Count = std::stol(valueDataDataItem["RetCode5024Count"].asString()); if(!valueDataDataItem["RetCode5167Count"].isNull()) - dataObject.retCode5167Count = valueDataDataItem["RetCode5167Count"].asString(); + dataObject.retCode5167Count = std::stol(valueDataDataItem["RetCode5167Count"].asString()); if(!valueDataDataItem["RetCode5217Count"].isNull()) - dataObject.retCode5217Count = valueDataDataItem["RetCode5217Count"].asString(); + dataObject.retCode5217Count = std::stol(valueDataDataItem["RetCode5217Count"].asString()); if(!valueDataDataItem["RetCode6002Count"].isNull()) - dataObject.retCode6002Count = valueDataDataItem["RetCode6002Count"].asString(); + dataObject.retCode6002Count = std::stol(valueDataDataItem["RetCode6002Count"].asString()); if(!valueDataDataItem["FailPercentage"].isNull()) dataObject.failPercentage = valueDataDataItem["FailPercentage"].asString(); if(!valueDataDataItem["SumWaitTime"].isNull()) @@ -150,7 +150,7 @@ void DescribeOasSlowSQLListResult::parse(const std::string &payload) if(!valueDataDataItem["AvgPartitionCount"].isNull()) dataObject.avgPartitionCount = valueDataDataItem["AvgPartitionCount"].asString(); if(!valueDataDataItem["FailCount"].isNull()) - dataObject.failCount = valueDataDataItem["FailCount"].asString(); + dataObject.failCount = std::stol(valueDataDataItem["FailCount"].asString()); if(!valueDataDataItem["AvgWaitTime"].isNull()) dataObject.avgWaitTime = valueDataDataItem["AvgWaitTime"].asString(); if(!valueDataDataItem["AvgElapsedTime"].isNull()) @@ -186,7 +186,7 @@ void DescribeOasSlowSQLListResult::parse(const std::string &payload) if(!valueDataDataItem["AvgDiskReads"].isNull()) dataObject.avgDiskReads = valueDataDataItem["AvgDiskReads"].asString(); if(!valueDataDataItem["RetryCount"].isNull()) - dataObject.retryCount = valueDataDataItem["RetryCount"].asString(); + dataObject.retryCount = std::stol(valueDataDataItem["RetryCount"].asString()); if(!valueDataDataItem["AvgMemstoreReadRows"].isNull()) dataObject.avgMemstoreReadRows = valueDataDataItem["AvgMemstoreReadRows"].asString(); if(!valueDataDataItem["AvgSsstoreReadRows"].isNull()) @@ -204,13 +204,13 @@ void DescribeOasSlowSQLListResult::parse(const std::string &payload) { DataItem::SqlListItem sqlListObject; if(!valueDataDataItemSqlListSqlListItem["Executions"].isNull()) - sqlListObject.executions = valueDataDataItemSqlListSqlListItem["Executions"].asString(); + sqlListObject.executions = std::stol(valueDataDataItemSqlListSqlListItem["Executions"].asString()); if(!valueDataDataItemSqlListSqlListItem["RpcCount"].isNull()) sqlListObject.rpcCount = valueDataDataItemSqlListSqlListItem["RpcCount"].asString(); if(!valueDataDataItemSqlListSqlListItem["RemotePlans"].isNull()) - sqlListObject.remotePlans = valueDataDataItemSqlListSqlListItem["RemotePlans"].asString(); + sqlListObject.remotePlans = std::stol(valueDataDataItemSqlListSqlListItem["RemotePlans"].asString()); if(!valueDataDataItemSqlListSqlListItem["MissPlans"].isNull()) - sqlListObject.missPlans = valueDataDataItemSqlListSqlListItem["MissPlans"].asString(); + sqlListObject.missPlans = std::stol(valueDataDataItemSqlListSqlListItem["MissPlans"].asString()); if(!valueDataDataItemSqlListSqlListItem["MaxElapsedTime"].isNull()) sqlListObject.maxElapsedTime = valueDataDataItemSqlListSqlListItem["MaxElapsedTime"].asString(); if(!valueDataDataItemSqlListSqlListItem["TotalWaitTime"].isNull()) @@ -310,7 +310,7 @@ void DescribeOasSlowSQLListResult::parse(const std::string &payload) if(!valueDataDataItemSqlListSqlListItem["AvgPartitionCount"].isNull()) sqlListObject.avgPartitionCount = valueDataDataItemSqlListSqlListItem["AvgPartitionCount"].asString(); if(!valueDataDataItemSqlListSqlListItem["FailCount"].isNull()) - sqlListObject.failCount = valueDataDataItemSqlListSqlListItem["FailCount"].asString(); + sqlListObject.failCount = std::stol(valueDataDataItemSqlListSqlListItem["FailCount"].asString()); if(!valueDataDataItemSqlListSqlListItem["AvgWaitTime"].isNull()) sqlListObject.avgWaitTime = valueDataDataItemSqlListSqlListItem["AvgWaitTime"].asString(); if(!valueDataDataItemSqlListSqlListItem["AvgElapsedTime"].isNull()) @@ -346,7 +346,7 @@ void DescribeOasSlowSQLListResult::parse(const std::string &payload) if(!valueDataDataItemSqlListSqlListItem["AvgDiskReads"].isNull()) sqlListObject.avgDiskReads = valueDataDataItemSqlListSqlListItem["AvgDiskReads"].asString(); if(!valueDataDataItemSqlListSqlListItem["RetryCount"].isNull()) - sqlListObject.retryCount = valueDataDataItemSqlListSqlListItem["RetryCount"].asString(); + sqlListObject.retryCount = std::stol(valueDataDataItemSqlListSqlListItem["RetryCount"].asString()); if(!valueDataDataItemSqlListSqlListItem["AvgMemstoreReadRows"].isNull()) sqlListObject.avgMemstoreReadRows = valueDataDataItemSqlListSqlListItem["AvgMemstoreReadRows"].asString(); if(!valueDataDataItemSqlListSqlListItem["AvgSsstoreReadRows"].isNull()) diff --git a/oceanbasepro/src/model/DescribeOasTopSQLListResult.cc b/oceanbasepro/src/model/DescribeOasTopSQLListResult.cc index de99b5922..a5f34baf6 100644 --- a/oceanbasepro/src/model/DescribeOasTopSQLListResult.cc +++ b/oceanbasepro/src/model/DescribeOasTopSQLListResult.cc @@ -48,9 +48,9 @@ void DescribeOasTopSQLListResult::parse(const std::string &payload) if(!valueDataDataItem["RpcCount"].isNull()) dataObject.rpcCount = valueDataDataItem["RpcCount"].asString(); if(!valueDataDataItem["RemotePlans"].isNull()) - dataObject.remotePlans = valueDataDataItem["RemotePlans"].asString(); + dataObject.remotePlans = std::stol(valueDataDataItem["RemotePlans"].asString()); if(!valueDataDataItem["MissPlans"].isNull()) - dataObject.missPlans = valueDataDataItem["MissPlans"].asString(); + dataObject.missPlans = std::stol(valueDataDataItem["MissPlans"].asString()); if(!valueDataDataItem["MaxElapsedTime"].isNull()) dataObject.maxElapsedTime = valueDataDataItem["MaxElapsedTime"].asString(); if(!valueDataDataItem["TotalWaitTime"].isNull()) @@ -152,7 +152,7 @@ void DescribeOasTopSQLListResult::parse(const std::string &payload) if(!valueDataDataItem["AvgPartitionCount"].isNull()) dataObject.avgPartitionCount = valueDataDataItem["AvgPartitionCount"].asString(); if(!valueDataDataItem["FailCount"].isNull()) - dataObject.failCount = valueDataDataItem["FailCount"].asString(); + dataObject.failCount = std::stol(valueDataDataItem["FailCount"].asString()); if(!valueDataDataItem["AvgWaitTime"].isNull()) dataObject.avgWaitTime = valueDataDataItem["AvgWaitTime"].asString(); if(!valueDataDataItem["AvgElapsedTime"].isNull()) @@ -188,7 +188,7 @@ void DescribeOasTopSQLListResult::parse(const std::string &payload) if(!valueDataDataItem["AvgDiskReads"].isNull()) dataObject.avgDiskReads = valueDataDataItem["AvgDiskReads"].asString(); if(!valueDataDataItem["RetryCount"].isNull()) - dataObject.retryCount = valueDataDataItem["RetryCount"].asString(); + dataObject.retryCount = std::stol(valueDataDataItem["RetryCount"].asString()); if(!valueDataDataItem["AvgMemstoreReadRows"].isNull()) dataObject.avgMemstoreReadRows = valueDataDataItem["AvgMemstoreReadRows"].asString(); if(!valueDataDataItem["AvgSsstoreReadRows"].isNull()) @@ -204,7 +204,7 @@ void DescribeOasTopSQLListResult::parse(const std::string &payload) if(!valueDataDataItem["SumDbTime"].isNull()) dataObject.sumDbTime = valueDataDataItem["SumDbTime"].asString(); if(!valueDataDataItem["ObDbId"].isNull()) - dataObject.obDbId = valueDataDataItem["ObDbId"].asString(); + dataObject.obDbId = std::stol(valueDataDataItem["ObDbId"].asString()); auto allSqlListNode = valueDataDataItem["SqlList"]["SqlListItem"]; for (auto valueDataDataItemSqlListSqlListItem : allSqlListNode) { @@ -214,9 +214,9 @@ void DescribeOasTopSQLListResult::parse(const std::string &payload) if(!valueDataDataItemSqlListSqlListItem["RpcCount"].isNull()) sqlListObject.rpcCount = valueDataDataItemSqlListSqlListItem["RpcCount"].asString(); if(!valueDataDataItemSqlListSqlListItem["RemotePlans"].isNull()) - sqlListObject.remotePlans = valueDataDataItemSqlListSqlListItem["RemotePlans"].asString(); + sqlListObject.remotePlans = std::stol(valueDataDataItemSqlListSqlListItem["RemotePlans"].asString()); if(!valueDataDataItemSqlListSqlListItem["MissPlans"].isNull()) - sqlListObject.missPlans = valueDataDataItemSqlListSqlListItem["MissPlans"].asString(); + sqlListObject.missPlans = std::stol(valueDataDataItemSqlListSqlListItem["MissPlans"].asString()); if(!valueDataDataItemSqlListSqlListItem["MaxElapsedTime"].isNull()) sqlListObject.maxElapsedTime = valueDataDataItemSqlListSqlListItem["MaxElapsedTime"].asString(); if(!valueDataDataItemSqlListSqlListItem["TotalWaitTime"].isNull()) @@ -318,7 +318,7 @@ void DescribeOasTopSQLListResult::parse(const std::string &payload) if(!valueDataDataItemSqlListSqlListItem["AvgPartitionCount"].isNull()) sqlListObject.avgPartitionCount = valueDataDataItemSqlListSqlListItem["AvgPartitionCount"].asString(); if(!valueDataDataItemSqlListSqlListItem["FailCount"].isNull()) - sqlListObject.failCount = valueDataDataItemSqlListSqlListItem["FailCount"].asString(); + sqlListObject.failCount = std::stol(valueDataDataItemSqlListSqlListItem["FailCount"].asString()); if(!valueDataDataItemSqlListSqlListItem["AvgWaitTime"].isNull()) sqlListObject.avgWaitTime = valueDataDataItemSqlListSqlListItem["AvgWaitTime"].asString(); if(!valueDataDataItemSqlListSqlListItem["AvgElapsedTime"].isNull()) @@ -354,7 +354,7 @@ void DescribeOasTopSQLListResult::parse(const std::string &payload) if(!valueDataDataItemSqlListSqlListItem["AvgDiskReads"].isNull()) sqlListObject.avgDiskReads = valueDataDataItemSqlListSqlListItem["AvgDiskReads"].asString(); if(!valueDataDataItemSqlListSqlListItem["RetryCount"].isNull()) - sqlListObject.retryCount = valueDataDataItemSqlListSqlListItem["RetryCount"].asString(); + sqlListObject.retryCount = std::stol(valueDataDataItemSqlListSqlListItem["RetryCount"].asString()); if(!valueDataDataItemSqlListSqlListItem["AvgMemstoreReadRows"].isNull()) sqlListObject.avgMemstoreReadRows = valueDataDataItemSqlListSqlListItem["AvgMemstoreReadRows"].asString(); if(!valueDataDataItemSqlListSqlListItem["AvgSsstoreReadRows"].isNull()) diff --git a/oceanbasepro/src/model/DescribeProcessStatsCompositionResult.cc b/oceanbasepro/src/model/DescribeProcessStatsCompositionResult.cc index 6cf232802..dca4f2406 100644 --- a/oceanbasepro/src/model/DescribeProcessStatsCompositionResult.cc +++ b/oceanbasepro/src/model/DescribeProcessStatsCompositionResult.cc @@ -83,7 +83,7 @@ void DescribeProcessStatsCompositionResult::parse(const std::string &payload) if(!dataNodeAllProcessListAllProcessListItem["PlanId"].isNull()) allProcessListItemObject.planId = dataNodeAllProcessListAllProcessListItem["PlanId"].asString(); if(!dataNodeAllProcessListAllProcessListItem["DynamicSql"].isNull()) - allProcessListItemObject.dynamicSql = dataNodeAllProcessListAllProcessListItem["DynamicSql"].asString(); + allProcessListItemObject.dynamicSql = dataNodeAllProcessListAllProcessListItem["DynamicSql"].asString() == "true"; if(!dataNodeAllProcessListAllProcessListItem["ServerSn"].isNull()) allProcessListItemObject.serverSn = dataNodeAllProcessListAllProcessListItem["ServerSn"].asString(); auto allProcessSqlListsNode = dataNodeAllProcessListAllProcessListItem["ProcessSqlLists"]["ProcessSqlListsItem"]; @@ -121,7 +121,7 @@ void DescribeProcessStatsCompositionResult::parse(const std::string &payload) if(!dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItem["PlanId"].isNull()) processSqlListsObject.planId = dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItem["PlanId"].asString(); if(!dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItem["DynamicSql"].isNull()) - processSqlListsObject.dynamicSql = dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItem["DynamicSql"].asString(); + processSqlListsObject.dynamicSql = dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItem["DynamicSql"].asString() == "true"; auto allProcessSqlListNode = dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItem["ProcessSqlList"]["ProcessSqlListItem"]; for (auto dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItemProcessSqlListProcessSqlListItem : allProcessSqlListNode) { @@ -157,7 +157,7 @@ void DescribeProcessStatsCompositionResult::parse(const std::string &payload) if(!dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItemProcessSqlListProcessSqlListItem["PlanId"].isNull()) processSqlListObject.planId = dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItemProcessSqlListProcessSqlListItem["PlanId"].asString(); if(!dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItemProcessSqlListProcessSqlListItem["DynamicSql"].isNull()) - processSqlListObject.dynamicSql = dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItemProcessSqlListProcessSqlListItem["DynamicSql"].asString(); + processSqlListObject.dynamicSql = dataNodeAllProcessListAllProcessListItemProcessSqlListsProcessSqlListsItemProcessSqlListProcessSqlListItem["DynamicSql"].asString() == "true"; processSqlListsObject.processSqlList.push_back(processSqlListObject); } allProcessListItemObject.processSqlLists.push_back(processSqlListsObject); diff --git a/oceanbasepro/src/model/DescribeSQLSamplesResult.cc b/oceanbasepro/src/model/DescribeSQLSamplesResult.cc index 5cbb376fd..416a53c67 100644 --- a/oceanbasepro/src/model/DescribeSQLSamplesResult.cc +++ b/oceanbasepro/src/model/DescribeSQLSamplesResult.cc @@ -44,7 +44,7 @@ void DescribeSQLSamplesResult::parse(const std::string &payload) { DataItem dataObject; if(!valueDataDataItem["RequestId"].isNull()) - dataObject.requestId = valueDataDataItem["RequestId"].asString(); + dataObject.requestId = std::stol(valueDataDataItem["RequestId"].asString()); if(!valueDataDataItem["TraceId"].isNull()) dataObject.traceId = valueDataDataItem["TraceId"].asString(); if(!valueDataDataItem["RequestTime"].isNull()) @@ -54,7 +54,7 @@ void DescribeSQLSamplesResult::parse(const std::string &payload) if(!valueDataDataItem["ClientIp"].isNull()) dataObject.clientIp = valueDataDataItem["ClientIp"].asString(); if(!valueDataDataItem["ClientPort"].isNull()) - dataObject.clientPort = valueDataDataItem["ClientPort"].asString(); + dataObject.clientPort = std::stoi(valueDataDataItem["ClientPort"].asString()); if(!valueDataDataItem["DbName"].isNull()) dataObject.dbName = valueDataDataItem["DbName"].asString(); if(!valueDataDataItem["UserName"].isNull()) @@ -62,23 +62,23 @@ void DescribeSQLSamplesResult::parse(const std::string &payload) if(!valueDataDataItem["SqlType"].isNull()) dataObject.sqlType = valueDataDataItem["SqlType"].asString(); if(!valueDataDataItem["PlanId"].isNull()) - dataObject.planId = valueDataDataItem["PlanId"].asString(); + dataObject.planId = std::stol(valueDataDataItem["PlanId"].asString()); if(!valueDataDataItem["AffectedRows"].isNull()) - dataObject.affectedRows = valueDataDataItem["AffectedRows"].asString(); + dataObject.affectedRows = std::stol(valueDataDataItem["AffectedRows"].asString()); if(!valueDataDataItem["ReturnRows"].isNull()) - dataObject.returnRows = valueDataDataItem["ReturnRows"].asString(); + dataObject.returnRows = std::stol(valueDataDataItem["ReturnRows"].asString()); if(!valueDataDataItem["PartitionCount"].isNull()) - dataObject.partitionCount = valueDataDataItem["PartitionCount"].asString(); + dataObject.partitionCount = std::stol(valueDataDataItem["PartitionCount"].asString()); if(!valueDataDataItem["RetCode"].isNull()) - dataObject.retCode = valueDataDataItem["RetCode"].asString(); + dataObject.retCode = std::stoi(valueDataDataItem["RetCode"].asString()); if(!valueDataDataItem["WaitEvent"].isNull()) dataObject.waitEvent = valueDataDataItem["WaitEvent"].asString(); if(!valueDataDataItem["WaitTime"].isNull()) dataObject.waitTime = valueDataDataItem["WaitTime"].asString(); if(!valueDataDataItem["WaitCount"].isNull()) - dataObject.waitCount = valueDataDataItem["WaitCount"].asString(); + dataObject.waitCount = std::stol(valueDataDataItem["WaitCount"].asString()); if(!valueDataDataItem["RpcCount"].isNull()) - dataObject.rpcCount = valueDataDataItem["RpcCount"].asString(); + dataObject.rpcCount = std::stol(valueDataDataItem["RpcCount"].asString()); if(!valueDataDataItem["PlanType"].isNull()) dataObject.planType = valueDataDataItem["PlanType"].asString(); if(!valueDataDataItem["Inner"].isNull()) @@ -122,25 +122,25 @@ void DescribeSQLSamplesResult::parse(const std::string &payload) if(!valueDataDataItem["DiskReads"].isNull()) dataObject.diskReads = valueDataDataItem["DiskReads"].asString(); if(!valueDataDataItem["RetryCount"].isNull()) - dataObject.retryCount = valueDataDataItem["RetryCount"].asString(); + dataObject.retryCount = std::stol(valueDataDataItem["RetryCount"].asString()); if(!valueDataDataItem["TableScan"].isNull()) dataObject.tableScan = valueDataDataItem["TableScan"].asString() == "true"; if(!valueDataDataItem["ConsistencyLevel"].isNull()) dataObject.consistencyLevel = valueDataDataItem["ConsistencyLevel"].asString(); if(!valueDataDataItem["MemstoreReadRows"].isNull()) - dataObject.memstoreReadRows = valueDataDataItem["MemstoreReadRows"].asString(); + dataObject.memstoreReadRows = std::stol(valueDataDataItem["MemstoreReadRows"].asString()); if(!valueDataDataItem["ExpectedWorkerCount"].isNull()) - dataObject.expectedWorkerCount = valueDataDataItem["ExpectedWorkerCount"].asString(); + dataObject.expectedWorkerCount = std::stol(valueDataDataItem["ExpectedWorkerCount"].asString()); if(!valueDataDataItem["UsedWorkerCount"].isNull()) - dataObject.usedWorkerCount = valueDataDataItem["UsedWorkerCount"].asString(); + dataObject.usedWorkerCount = std::stol(valueDataDataItem["UsedWorkerCount"].asString()); if(!valueDataDataItem["SsstoreReadRows"].isNull()) - dataObject.ssstoreReadRows = valueDataDataItem["SsstoreReadRows"].asString(); + dataObject.ssstoreReadRows = std::stol(valueDataDataItem["SsstoreReadRows"].asString()); if(!valueDataDataItem["ObServerId"].isNull()) - dataObject.obServerId = valueDataDataItem["ObServerId"].asString(); + dataObject.obServerId = std::stol(valueDataDataItem["ObServerId"].asString()); if(!valueDataDataItem["ObUserId"].isNull()) - dataObject.obUserId = valueDataDataItem["ObUserId"].asString(); + dataObject.obUserId = std::stol(valueDataDataItem["ObUserId"].asString()); if(!valueDataDataItem["ObDbId"].isNull()) - dataObject.obDbId = valueDataDataItem["ObDbId"].asString(); + dataObject.obDbId = std::stol(valueDataDataItem["ObDbId"].asString()); if(!valueDataDataItem["Statement"].isNull()) dataObject.statement = valueDataDataItem["Statement"].asString(); if(!valueDataDataItem["TransHash"].isNull()) diff --git a/oceanbasepro/src/model/DescribeSQLTuningAdvicesResult.cc b/oceanbasepro/src/model/DescribeSQLTuningAdvicesResult.cc index 07681b5bc..e86198b6d 100644 --- a/oceanbasepro/src/model/DescribeSQLTuningAdvicesResult.cc +++ b/oceanbasepro/src/model/DescribeSQLTuningAdvicesResult.cc @@ -60,7 +60,7 @@ void DescribeSQLTuningAdvicesResult::parse(const std::string &payload) if(!valueDataDataItemColumnsColumnsItem["ColumnName"].isNull()) columnsObject.columnName = valueDataDataItemColumnsColumnsItem["ColumnName"].asString(); if(!valueDataDataItemColumnsColumnsItem["Ndv"].isNull()) - columnsObject.ndv = std::stof(valueDataDataItemColumnsColumnsItem["Ndv"].asString()); + columnsObject.ndv = valueDataDataItemColumnsColumnsItem["Ndv"].asString(); if(!valueDataDataItemColumnsColumnsItem["MinValue"].isNull()) columnsObject.minValue = valueDataDataItemColumnsColumnsItem["MinValue"].asString(); if(!valueDataDataItemColumnsColumnsItem["MaxValue"].isNull()) diff --git a/oceanbasepro/src/model/DescribeSampleSqlRawTextsRequest.cc b/oceanbasepro/src/model/DescribeSampleSqlRawTextsRequest.cc index 454dbcb59..d9ca528b7 100644 --- a/oceanbasepro/src/model/DescribeSampleSqlRawTextsRequest.cc +++ b/oceanbasepro/src/model/DescribeSampleSqlRawTextsRequest.cc @@ -61,13 +61,13 @@ void DescribeSampleSqlRawTextsRequest::setTenantId(const std::string &tenantId) setBodyParameter(std::string("TenantId"), tenantId); } -std::string DescribeSampleSqlRawTextsRequest::getLimit() const { +int DescribeSampleSqlRawTextsRequest::getLimit() const { return limit_; } -void DescribeSampleSqlRawTextsRequest::setLimit(const std::string &limit) { +void DescribeSampleSqlRawTextsRequest::setLimit(int limit) { limit_ = limit; - setBodyParameter(std::string("Limit"), limit); + setBodyParameter(std::string("Limit"), std::to_string(limit)); } std::string DescribeSampleSqlRawTextsRequest::getSqlId() const { diff --git a/oceanbasepro/src/model/DescribeSqlAuditStatRequest.cc b/oceanbasepro/src/model/DescribeSqlAuditStatRequest.cc index 8d9778c35..9bdca7ca3 100644 --- a/oceanbasepro/src/model/DescribeSqlAuditStatRequest.cc +++ b/oceanbasepro/src/model/DescribeSqlAuditStatRequest.cc @@ -34,6 +34,15 @@ void DescribeSqlAuditStatRequest::setStartTime(const std::string &startTime) { setBodyParameter(std::string("StartTime"), startTime); } +std::string DescribeSqlAuditStatRequest::getOperatorType() const { + return operatorType_; +} + +void DescribeSqlAuditStatRequest::setOperatorType(const std::string &operatorType) { + operatorType_ = operatorType; + setBodyParameter(std::string("OperatorType"), operatorType); +} + int DescribeSqlAuditStatRequest::getPageNumber() const { return pageNumber_; } diff --git a/oceanbasepro/src/model/DescribeSqlAuditStatResult.cc b/oceanbasepro/src/model/DescribeSqlAuditStatResult.cc index f8847782b..0c5d8d457 100644 --- a/oceanbasepro/src/model/DescribeSqlAuditStatResult.cc +++ b/oceanbasepro/src/model/DescribeSqlAuditStatResult.cc @@ -79,9 +79,16 @@ void DescribeSqlAuditStatResult::parse(const std::string &payload) dataObject.operatorType = valueDataDataItem["OperatorType"].asString(); data_.push_back(dataObject); } + if(!value["TotalCount"].isNull()) + totalCount_ = std::stol(value["TotalCount"].asString()); } +long DescribeSqlAuditStatResult::getTotalCount()const +{ + return totalCount_; +} + std::vector DescribeSqlAuditStatResult::getData()const { return data_; diff --git a/oceanbasepro/src/model/DescribeTenantResult.cc b/oceanbasepro/src/model/DescribeTenantResult.cc index ac4c1d6ff..710bff0fb 100644 --- a/oceanbasepro/src/model/DescribeTenantResult.cc +++ b/oceanbasepro/src/model/DescribeTenantResult.cc @@ -108,6 +108,8 @@ void DescribeTenantResult::parse(const std::string &payload) tenant_.tenantMaxConnections = tenantNode["TenantMaxConnections"].asString(); if(!tenantNode["ParameterTemplate"].isNull()) tenant_.parameterTemplate = tenantNode["ParameterTemplate"].asString(); + if(!tenantNode["Iops"].isNull()) + tenant_.iops = std::stoi(tenantNode["Iops"].asString()); auto allTenantConnectionsNode = tenantNode["TenantConnections"]["TenantConnectionsItem"]; for (auto tenantNodeTenantConnectionsTenantConnectionsItem : allTenantConnectionsNode) { diff --git a/oceanbasepro/src/model/DescribeTenantsResult.cc b/oceanbasepro/src/model/DescribeTenantsResult.cc index 87f08bd9a..7c2d874fb 100644 --- a/oceanbasepro/src/model/DescribeTenantsResult.cc +++ b/oceanbasepro/src/model/DescribeTenantsResult.cc @@ -83,6 +83,8 @@ void DescribeTenantsResult::parse(const std::string &payload) tenantsObject.enableReadOnlyReplica = valueTenantsData["EnableReadOnlyReplica"].asString() == "true"; if(!valueTenantsData["ParameterTemplate"].isNull()) tenantsObject.parameterTemplate = valueTenantsData["ParameterTemplate"].asString(); + if(!valueTenantsData["Iops"].isNull()) + tenantsObject.iops = std::stoi(valueTenantsData["Iops"].asString()); tenants_.push_back(tenantsObject); } if(!value["TotalCount"].isNull()) diff --git a/oceanbasepro/src/model/ModifyTenantResourceRequest.cc b/oceanbasepro/src/model/ModifyTenantResourceRequest.cc index f9299f594..4ba33682f 100644 --- a/oceanbasepro/src/model/ModifyTenantResourceRequest.cc +++ b/oceanbasepro/src/model/ModifyTenantResourceRequest.cc @@ -70,6 +70,15 @@ void ModifyTenantResourceRequest::setTenantId(const std::string &tenantId) { setBodyParameter(std::string("TenantId"), tenantId); } +std::string ModifyTenantResourceRequest::getIops() const { + return iops_; +} + +void ModifyTenantResourceRequest::setIops(const std::string &iops) { + iops_ = iops; + setBodyParameter(std::string("Iops"), iops); +} + std::string ModifyTenantResourceRequest::getReadOnlyZoneList() const { return readOnlyZoneList_; }