database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](auto inc) db_id and table_id should be int64_t instead of int32_t (#34912)

Browse Source
This commit is contained in:
abmdocrt
2024-05-15 23:00:34 +08:00
committed by yiguolei
parent 4b96f9834f
commit dff6171546
9 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
be/src/olap/iterators.h
View File

@ -115,7 +115,7 @@ public:
RuntimeState* runtime_state = nullptr;
RowsetId rowset_id;
Version version;
int32_t tablet_id = 0;
int64_t tablet_id = 0;
// slots that cast may be eliminated in storage layer
std::map<std::string, PrimitiveType> target_cast_type_for_variants;
RowRanges row_ranges;

2
be/src/olap/rowset/segment_v2/column_reader.h
View File

@ -599,7 +599,7 @@ public:
private:
rowid_t _current_rowid = 0;
int32_t _tablet_id = 0;
int64_t _tablet_id = 0;
RowsetId _rowset_id;
int32_t _segment_id = 0;
};

4
be/src/olap/rowset/segment_v2/segment_iterator.h
View File

@ -124,7 +124,7 @@ public:
bool is_lazy_materialization_read() const override { return _lazy_materialization_read; }
uint64_t data_id() const override { return _segment->id(); }
RowsetId rowset_id() const { return _segment->rowset_id(); }
int32_t tablet_id() const { return _tablet_id; }
int64_t tablet_id() const { return _tablet_id; }
bool update_profile(RuntimeProfile* profile) override {
bool updated = false;
@ -486,7 +486,7 @@ private:
// used to collect filter information.
std::vector<ColumnPredicate*> _filter_info_id;
bool _record_rowids = false;
int32_t _tablet_id = 0;
int64_t _tablet_id = 0;
std::set<int32_t> _output_columns;
std::unique_ptr<HierarchicalDataReader> _path_reader;

4
be/src/olap/schema_cache.cpp
View File

@ -40,7 +40,7 @@ SchemaCache* SchemaCache::instance() {
}
// format: tabletId-unique_id1-uniqueid2...-version-type
std::string SchemaCache::get_schema_key(int32_t tablet_id, const TabletSchemaSPtr& schema,
std::string SchemaCache::get_schema_key(int64_t tablet_id, const TabletSchemaSPtr& schema,
const std::vector<uint32_t>& column_ids, int32_t version,
Type type) {
if (column_ids.empty() || schema->column(column_ids[0]).unique_id() < 0) {
@ -57,7 +57,7 @@ std::string SchemaCache::get_schema_key(int32_t tablet_id, const TabletSchemaSPt
}
// format: tabletId-unique_id1-uniqueid2...-version-type
std::string SchemaCache::get_schema_key(int32_t tablet_id, const std::vector<TColumn>& columns,
std::string SchemaCache::get_schema_key(int64_t tablet_id, const std::vector<TColumn>& columns,
int32_t version, Type type) {
if (columns.empty() || columns[0].col_unique_id < 0) {
return "";

4
be/src/olap/schema_cache.h
View File

@ -53,10 +53,10 @@ public:
static void create_global_instance(size_t capacity);
// get cache schema key, delimiter with SCHEMA_DELIMITER
static std::string get_schema_key(int32_t tablet_id, const TabletSchemaSPtr& schema,
static std::string get_schema_key(int64_t tablet_id, const TabletSchemaSPtr& schema,
const std::vector<uint32_t>& column_ids, int32_t version,
Type type);
static std::string get_schema_key(int32_t tablet_id, const std::vector<TColumn>& columns,
static std::string get_schema_key(int64_t tablet_id, const std::vector<TColumn>& columns,
int32_t version, Type type);
// Get a shared cached schema from cache, schema_key is a subset of column unique ids

12
be/src/olap/tablet_schema.h
View File

@ -368,10 +368,10 @@ public:
}
std::string auto_increment_column() const { return _auto_increment_column; }
void set_table_id(int32_t table_id) { _table_id = table_id; }
int32_t table_id() const { return _table_id; }
void set_db_id(int32_t db_id) { _db_id = db_id; }
int32_t db_id() const { return _db_id; }
void set_table_id(int64_t table_id) { _table_id = table_id; }
int64_t table_id() const { return _table_id; }
void set_db_id(int64_t db_id) { _db_id = db_id; }
int64_t db_id() const { return _db_id; }
void build_current_tablet_schema(int64_t index_id, int32_t version,
const OlapTableIndexSchema* index,
const TabletSchema& out_tablet_schema);
@ -485,8 +485,8 @@ private:
int32_t _sequence_col_idx = -1;
int32_t _version_col_idx = -1;
int32_t _schema_version = -1;
int32_t _table_id = -1;
int32_t _db_id = -1;
int64_t _table_id = -1;
int64_t _db_id = -1;
bool _disable_auto_compaction = false;
bool _enable_single_replica_compaction = false;
int64_t _mem_size = 0;

4
be/src/olap/utils.h
View File

@ -296,9 +296,9 @@ struct RowLocation {
};
struct GlobalRowLoacation {
GlobalRowLoacation(uint32_t tid, RowsetId rsid, uint32_t sid, uint32_t rid)
GlobalRowLoacation(int64_t tid, RowsetId rsid, uint32_t sid, uint32_t rid)
: tablet_id(tid), row_location(rsid, sid, rid) {}
uint32_t tablet_id;
int64_t tablet_id;
RowLocation row_location;
bool operator==(const GlobalRowLoacation& rhs) const {

4
be/src/runtime/descriptors.h
View File

@ -146,13 +146,13 @@ public:
::doris::TTableType::type table_type() const { return _table_type; }
const std::string& name() const { return _name; }
const std::string& database() const { return _database; }
int32_t table_id() const { return _table_id; }
int64_t table_id() const { return _table_id; }
private:
::doris::TTableType::type _table_type;
std::string _name;
std::string _database;
int32_t _table_id;
int64_t _table_id;
int _num_cols;
int _num_clustering_cols;
};

7
be/src/vec/sink/autoinc_buffer.cpp
View File

@ -19,6 +19,8 @@
#include <gen_cpp/HeartbeatService_types.h>
#include <string>
#include "common/status.h"
#include "runtime/client_cache.h"
#include "runtime/exec_env.h"
@ -69,6 +71,11 @@ Status AutoIncIDBuffer::sync_request_ids(size_t length,
}
DCHECK_LE(length, _front_buffer.second);
if (length > _front_buffer.second) {
return Status::RpcError("auto inc sync result length > front buffer. " +
std::to_string(length) + " vs " +
std::to_string(_front_buffer.second));
}
result->emplace_back(_front_buffer.first, length);
_front_buffer.first += length;
_front_buffer.second -= length;