Skip to content

Fix AlphaRowsetWriter double flush problem #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaoyli merged 1 commit into from
Apr 2, 2019
Merged

Fix AlphaRowsetWriter double flush problem #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions be/src/olap/memtable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,16 @@ void MemTable::insert(Tuple* tuple) {

OLAPStatus MemTable::flush(RowsetWriterSharedPtr rowset_writer) {
Table::Iterator it(_skip_list);
bool need_flush = false;
for (it.SeekToFirst(); it.Valid(); it.Next()) {
const char* row = it.key();
_schema->finalize(row);
RETURN_NOT_OK(rowset_writer->add_row(row, _schema));
need_flush = true;
}
if (need_flush) {
RETURN_NOT_OK(rowset_writer->flush());
}

RETURN_NOT_OK(rowset_writer->flush());
return OLAP_SUCCESS;
}

Expand Down
20 changes: 12 additions & 8 deletions be/src/olap/rowset/alpha_rowset_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,16 @@ AlphaRowsetWriter::~AlphaRowsetWriter() {
if (!_rowset_build) {
garbage_collection();
}
for (auto& segment_group : _segment_groups) {
segment_group->release();
delete segment_group;
}
_segment_groups.clear();
}

OLAPStatus AlphaRowsetWriter::init(const RowsetWriterContext& rowset_writer_context) {
_rowset_writer_context = rowset_writer_context;
_current_rowset_meta.reset(new AlphaRowsetMeta());
_current_rowset_meta.reset(new(std::nothrow) AlphaRowsetMeta());
_current_rowset_meta->set_rowset_id(_rowset_writer_context.rowset_id);
_current_rowset_meta->set_tablet_id(_rowset_writer_context.tablet_id);
_current_rowset_meta->set_tablet_schema_hash(_rowset_writer_context.tablet_schema_hash);
Expand Down Expand Up @@ -180,7 +184,7 @@ RowsetSharedPtr AlphaRowsetWriter::build() {

_current_rowset_meta->set_empty(_num_rows_written == 0);
_current_rowset_meta->set_num_rows(_num_rows_written);
_current_rowset_meta->set_creation_time(time(NULL));
_current_rowset_meta->set_creation_time(time(nullptr));

RowsetSharedPtr rowset(new(std::nothrow) AlphaRowset(_rowset_writer_context.tablet_schema,
_rowset_writer_context.rowset_path_prefix,
Expand Down Expand Up @@ -213,7 +217,7 @@ int32_t AlphaRowsetWriter::num_rows() {
}

OLAPStatus AlphaRowsetWriter::garbage_collection() {
for (auto segment_group : _segment_groups) {
for (auto& segment_group : _segment_groups) {
bool ret = segment_group->delete_all_files();
if (!ret) {
LOG(WARNING) << "delete segment group files failed."
Expand All @@ -231,29 +235,29 @@ DataDir* AlphaRowsetWriter::data_dir() {

void AlphaRowsetWriter::_init() {
if (_is_pending_rowset) {
_cur_segment_group.reset(new SegmentGroup(
_cur_segment_group = new(std::nothrow) SegmentGroup(
_rowset_writer_context.tablet_id,
_rowset_writer_context.rowset_id,
_rowset_writer_context.tablet_schema,
_rowset_writer_context.rowset_path_prefix,
false, _segment_group_id, 0, true,
_rowset_writer_context.partition_id, _rowset_writer_context.txn_id));
_rowset_writer_context.partition_id, _rowset_writer_context.txn_id);
} else {
_cur_segment_group.reset(new SegmentGroup(
_cur_segment_group = new(std::nothrow) SegmentGroup(
_rowset_writer_context.tablet_id,
_rowset_writer_context.rowset_id,
_rowset_writer_context.tablet_schema,
_rowset_writer_context.rowset_path_prefix,
_rowset_writer_context.version,
_rowset_writer_context.version_hash,
false, _segment_group_id, 0));
false, _segment_group_id, 0);
}
DCHECK(_cur_segment_group != nullptr) << "failed to malloc SegmentGroup";
_cur_segment_group->acquire();
//_cur_segment_group->set_load_id(_rowset_writer_context.load_id);
_segment_groups.push_back(_cur_segment_group);

_column_data_writer = ColumnDataWriter::create(_cur_segment_group.get(), true,
_column_data_writer = ColumnDataWriter::create(_cur_segment_group, true,
_rowset_writer_context.tablet_schema->compress_kind(),
_rowset_writer_context.tablet_schema->bloom_filter_fpp());
DCHECK(_column_data_writer != nullptr) << "memory error occurs when creating writer";
Expand Down
4 changes: 2 additions & 2 deletions be/src/olap/rowset/alpha_rowset_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ class AlphaRowsetWriter : public RowsetWriter {

private:
int32_t _segment_group_id;
std::shared_ptr<SegmentGroup> _cur_segment_group;
SegmentGroup* _cur_segment_group;
ColumnDataWriter* _column_data_writer;
std::shared_ptr<RowsetMeta> _current_rowset_meta;
bool _is_pending_rowset;
int _num_rows_written;
bool _is_inited;
RowsetWriterContext _rowset_writer_context;
std::vector<std::shared_ptr<SegmentGroup>> _segment_groups;
std::vector<SegmentGroup*> _segment_groups;
bool _rowset_build;
};

Expand Down