This is an automated email from the ASF dual-hosted git repository.
isapego pushed a commit to branch ignite-19216
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 5ef82b9346b0e4c555aad1e60e80c82150268885
Author: Igor Sapego <isap...@apache.org>
AuthorDate: Tue Sep 19 02:20:54 2023 +0400
IGNITE-19216 Fix style
---
.../cpp/ignite/odbc/query/table_metadata_query.h | 20 +++++-----
.../cpp/ignite/odbc/query/type_info_query.cpp | 44 +++++++++++-----------
.../cpp/ignite/odbc/query/type_info_query.h | 24 ++++++------
3 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/modules/platforms/cpp/ignite/odbc/query/table_metadata_query.h
b/modules/platforms/cpp/ignite/odbc/query/table_metadata_query.h
index b9b0b57f10..9ed65d83ab 100644
--- a/modules/platforms/cpp/ignite/odbc/query/table_metadata_query.h
+++ b/modules/platforms/cpp/ignite/odbc/query/table_metadata_query.h
@@ -46,28 +46,28 @@ public:
/**
* Destructor.
*/
- virtual ~table_metadata_query() = default;
+ ~table_metadata_query() override = default;
/**
* Execute query.
*
* @return True on success.
*/
- virtual sql_result execute();
+ sql_result execute() override;
/**
* Get column metadata.
*
* @return Column metadata.
*/
- virtual const column_meta_vector *get_meta();
+ const column_meta_vector *get_meta() override;
/**
* Fetch next result row to application buffers.
*
* @return Operation result.
*/
- virtual sql_result fetch_next_row(column_binding_map &column_bindings);
+ sql_result fetch_next_row(column_binding_map &column_bindings) override;
/**
* Get data of the specified column in the result set.
@@ -76,39 +76,39 @@ public:
* @param buffer Buffer to put column data to.
* @return Operation result.
*/
- virtual sql_result get_column(std::uint16_t column_idx,
application_data_buffer &buffer);
+ sql_result get_column(std::uint16_t column_idx, application_data_buffer
&buffer) override;
/**
* Close query.
*
* @return True on success.
*/
- virtual sql_result close();
+ sql_result close() override;
/**
* Check if data is available.
*
* @return True if data is available.
*/
- virtual bool is_data_available() const;
+ bool is_data_available() const override;
/**
* Get number of rows affected by the statement.
*
* @return Number of rows affected by the statement.
*/
- virtual std::int64_t affected_rows() const;
+ std::int64_t affected_rows() const override;
/**
* Move to the next result set.
*
* @return Operation result.
*/
- virtual sql_result next_result_set();
+ sql_result next_result_set() override;
private:
/**
- * Make get columns metadata requets and use response to set internal
state.
+ * Make get columns metadata requests and use response to set internal
state.
*
* @return True on success.
*/
diff --git a/modules/platforms/cpp/ignite/odbc/query/type_info_query.cpp
b/modules/platforms/cpp/ignite/odbc/query/type_info_query.cpp
index 2ac8611fb2..5f6276af67 100644
--- a/modules/platforms/cpp/ignite/odbc/query/type_info_query.cpp
+++ b/modules/platforms/cpp/ignite/odbc/query/type_info_query.cpp
@@ -1,10 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -119,25 +119,25 @@ type_info_query::type_info_query(diagnosable_adapter
&diag, std::int16_t sql_typ
const std::string sch;
const std::string tbl;
- m_columns_meta.push_back(column_meta(sch, tbl, "TYPE_NAME",
ignite_type::STRING));
- m_columns_meta.push_back(column_meta(sch, tbl, "DATA_TYPE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "COLUMN_SIZE",
ignite_type::INT32));
- m_columns_meta.push_back(column_meta(sch, tbl, "LITERAL_PREFIX",
ignite_type::STRING));
- m_columns_meta.push_back(column_meta(sch, tbl, "LITERAL_SUFFIX",
ignite_type::STRING));
- m_columns_meta.push_back(column_meta(sch, tbl, "CREATE_PARAMS",
ignite_type::STRING));
- m_columns_meta.push_back(column_meta(sch, tbl, "NULLABLE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "CASE_SENSITIVE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "SEARCHABLE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "UNSIGNED_ATTRIBUTE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "FIXED_PREC_SCALE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "AUTO_UNIQUE_VALUE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "LOCAL_TYPE_NAME",
ignite_type::STRING));
- m_columns_meta.push_back(column_meta(sch, tbl, "MINIMUM_SCALE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "MAXIMUM_SCALE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "SQL_DATA_TYPE",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "SQL_DATETIME_SUB",
ignite_type::INT16));
- m_columns_meta.push_back(column_meta(sch, tbl, "NUM_PREC_RADIX",
ignite_type::INT32));
- m_columns_meta.push_back(column_meta(sch, tbl, "INTERVAL_PRECISION",
ignite_type::INT16));
+ m_columns_meta.emplace_back(sch, tbl, "TYPE_NAME",
ignite_type::STRING);
+ m_columns_meta.emplace_back(sch, tbl, "DATA_TYPE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "COLUMN_SIZE",
ignite_type::INT32);
+ m_columns_meta.emplace_back(sch, tbl, "LITERAL_PREFIX",
ignite_type::STRING);
+ m_columns_meta.emplace_back(sch, tbl, "LITERAL_SUFFIX",
ignite_type::STRING);
+ m_columns_meta.emplace_back(sch, tbl, "CREATE_PARAMS",
ignite_type::STRING);
+ m_columns_meta.emplace_back(sch, tbl, "NULLABLE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "CASE_SENSITIVE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "SEARCHABLE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "UNSIGNED_ATTRIBUTE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "FIXED_PREC_SCALE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "AUTO_UNIQUE_VALUE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "LOCAL_TYPE_NAME",
ignite_type::STRING);
+ m_columns_meta.emplace_back(sch, tbl, "MINIMUM_SCALE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "MAXIMUM_SCALE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "SQL_DATA_TYPE",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "SQL_DATETIME_SUB",
ignite_type::INT16);
+ m_columns_meta.emplace_back(sch, tbl, "NUM_PREC_RADIX",
ignite_type::INT32);
+ m_columns_meta.emplace_back(sch, tbl, "INTERVAL_PRECISION",
ignite_type::INT16);
assert(is_sql_type_supported(sql_type) || sql_type == SQL_ALL_TYPES);
@@ -319,7 +319,7 @@ sql_result type_info_query::get_column(std::uint16_t
column_idx, application_dat
case result_column::MINIMUM_SCALE:
case result_column::MAXIMUM_SCALE:
{
- buffer.put_int16(ignite_type_decimal_digits(current_type));
+
buffer.put_int16(std::int16_t(ignite_type_decimal_digits(current_type)));
break;
}
diff --git a/modules/platforms/cpp/ignite/odbc/query/type_info_query.h
b/modules/platforms/cpp/ignite/odbc/query/type_info_query.h
index 4cb75227ac..bfe273a068 100644
--- a/modules/platforms/cpp/ignite/odbc/query/type_info_query.h
+++ b/modules/platforms/cpp/ignite/odbc/query/type_info_query.h
@@ -38,28 +38,28 @@ public:
/**
* Destructor.
*/
- virtual ~type_info_query() = default;
+ ~type_info_query() override = default;
/**
* Execute query.
*
* @return True on success.
*/
- virtual sql_result execute();
+ sql_result execute() override;
/**
* Get column metadata.
*
* @return Column metadata.
*/
- virtual const column_meta_vector* get_meta();
+ const column_meta_vector* get_meta() override;
/**
* Fetch next result row to application buffers.
*
* @return Operation result.
*/
- virtual sql_result fetch_next_row(column_binding_map& column_bindings);
+ sql_result fetch_next_row(column_binding_map& column_bindings) override;
/**
* Get data of the specified column in the result set.
@@ -68,51 +68,51 @@ public:
* @param buffer Buffer to put column data to.
* @return Operation result.
*/
- virtual sql_result get_column(std::uint16_t column_idx,
application_data_buffer& buffer);
+ sql_result get_column(std::uint16_t column_idx, application_data_buffer&
buffer) override;
/**
* Close query.
*
* @return True on success.
*/
- virtual sql_result close();
+ sql_result close() override;
/**
* Check if data is available.
*
* @return True if data is available.
*/
- virtual bool is_data_available() const;
+ bool is_data_available() const override;
/**
* Get number of rows affected by the statement.
*
* @return Number of rows affected by the statement.
*/
- virtual std::int64_t affected_rows() const;
+ std::int64_t affected_rows() const override;
/**
* Move to the next result set.
*
* @return Operation result.
*/
- virtual sql_result next_result_set();
+ sql_result next_result_set() override;
private:
/** Columns metadata. */
column_meta_vector m_columns_meta;
/** Executed flag. */
- bool m_executed = false;
+ bool m_executed{false};
/** Fetched flag. */
- bool m_fetched = false;
+ bool m_fetched{false};
/** Requested types. */
std::vector<ignite_type> m_types;
/** Query cursor. */
- std::vector<ignite_type>::const_iterator m_cursor = m_types.end();
+ std::vector<ignite_type>::const_iterator m_cursor{m_types.end()};
};
}
