Skip to content

Commit 38fb8c0

Browse files
author
Darshan M N
committed
WL#13543 InnoDB: Provide partitioning information to RAPID during load
Post-push fix - Fix build issue in 32-bit platforms and a doygen issue. Approved-by : Kuba Lopuszanski <jakub.lopuszanski@oracle.com>
1 parent 5497a41 commit 38fb8c0

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

storage/innobase/include/row0pread-adapter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ class Parallel_reader_adapter {
103103

104104
/** Send a batch of records.
105105
@param[in] ctx Parallel read context.
106-
@param[in] thread_id ID of the thread.
107106
@param[in] n_recs Number of records to send.
108107
@return DB_SUCCESS or error code. */
109108
dberr_t send_batch(const Parallel_reader::Ctx *ctx, uint64_t n_recs)

storage/innobase/include/row0pread.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class Parallel_reader {
160160
*/
161161
Config(const Scan_range &scan_range, dict_index_t *index,
162162
size_t read_level = 0,
163-
size_t partition_id = std::numeric_limits<uint64_t>::max(),
163+
size_t partition_id = std::numeric_limits<size_t>::max(),
164164
bool read_ahead = false)
165165
: m_scan_range(scan_range),
166166
m_index(index),
@@ -197,8 +197,8 @@ class Parallel_reader {
197197
size_t m_read_level{0};
198198

199199
/** Partition id if the index to be scanned belongs to a partitioned table,
200-
else std::numeric_limits<uint64_t>::max(). */
201-
size_t m_partition_id{std::numeric_limits<uint64_t>::max()};
200+
else std::numeric_limits<size_t>::max(). */
201+
size_t m_partition_id{std::numeric_limits<size_t>::max()};
202202

203203
/** if true then enable separate read ahead threads. */
204204
bool m_read_ahead{false};
@@ -709,7 +709,7 @@ class Parallel_reader::Ctx {
709709
}
710710

711711
/** @return the partition id of the index.
712-
@note this is std::numeric_limits<uint64_t>::max() if the index does not
712+
@note this is std::numeric_limits<size_t>::max() if the index does not
713713
belong to a partition. */
714714
size_t partition_id() const MY_ATTRIBUTE((warn_unused_result)) {
715715
return m_scan_ctx->m_config.m_partition_id;

0 commit comments

Comments
 (0)