You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@doris.apache.org by GitBox <gi...@apache.org> on 2018/12/24 09:12:40 UTC
[GitHub] chaoyli closed pull request #463: Modify PB message name
chaoyli closed pull request #463: Modify PB message name
URL: https://github.com/apache/incubator-doris/pull/463
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/be/src/olap/rowset/alpha_rowset.cpp b/be/src/olap/rowset/alpha_rowset.cpp
index e387c6ff..84214455 100644
--- a/be/src/olap/rowset/alpha_rowset.cpp
+++ b/be/src/olap/rowset/alpha_rowset.cpp
@@ -74,7 +74,7 @@ void set_version(Version version) {
}
NewStatus AlphaRowset::_init_segment_groups() {
- std::vector<PSegmentGroup> segment_group_metas;
+ std::vector<SegmentGroupPB> segment_group_metas;
_rowset_meta.get_segment_groups(&segment_group_metas);
for (auot& segment_group_meta : segment_group_metas) {
Version version = _rowset_meta.get_version();
diff --git a/be/src/olap/rowset/alpha_rowset_meta.cpp b/be/src/olap/rowset/alpha_rowset_meta.cpp
index 95ca4e31..db4daf33 100644
--- a/be/src/olap/rowset/alpha_rowset_meta.cpp
+++ b/be/src/olap/rowset/alpha_rowset_meta.cpp
@@ -28,14 +28,14 @@ bool AlphaRowsetMeta::deserialize_extra_properties() {
return parsed;
}
-void AlphaRowsetMeta::get_segment_groups(std::vector<PSegmentGroup>* segment_groups) {
+void AlphaRowsetMeta::get_segment_groups(std::vector<SegmentGroupPB>* segment_groups) {
for (auto& segment_group : _extra_meta_pb.segment_groups()) {
segment_groups->push_back(segment_group);
}
}
-void AlphaRowsetMeta::add_segment_group(PSegmentGroup& segment_group) {
- PSegmentGroup* new_segment_group = _extra_meta_pb.mutable_segment_groups();
+void AlphaRowsetMeta::add_segment_group(SegmentGroupPB& segment_group) {
+ SegmentGroupPB* new_segment_group = _extra_meta_pb.mutable_segment_groups();
*new_segment_group = segment_group;
}
diff --git a/be/src/olap/rowset/alpha_rowset_meta.h b/be/src/olap/rowset/alpha_rowset_meta.h
index 3399b90b..663b79ac 100644
--- a/be/src/olap/rowset/alpha_rowset_meta.h
+++ b/be/src/olap/rowset/alpha_rowset_meta.h
@@ -30,15 +30,15 @@ class AlphaRowsetMeta : public RowsetMeta {
public:
virtual bool deserialize_extra_properties();
- void get_segment_groups(std::vector<PSegmentGroup>* segment_groups)
+ void get_segment_groups(std::vector<SegmentGroupPB>* segment_groups)
- void add_segment_group(const PSegmentGroup& segment_group);
+ void add_segment_group(const SegmentGroupPB& segment_group);
private:
void _serialize_extra_meta_pb();
private:
- AlphaRowsetExtraMetaPb _extra_meta_pb;
+ AlphaRowsetExtraMetaPB _extra_meta_pb;
};
}
diff --git a/be/src/olap/rowset/rowset_meta.h b/be/src/olap/rowset/rowset_meta.h
index 81355be3..3a09ea78 100644
--- a/be/src/olap/rowset/rowset_meta.h
+++ b/be/src/olap/rowset/rowset_meta.h
@@ -208,7 +208,7 @@ class RowsetMeta {
}
private:
- RowsetMetaPb _rowset_meta_pb;
+ RowsetMetaPB _rowset_meta_pb;
};
}
diff --git a/gensrc/proto/olap_file.proto b/gensrc/proto/olap_file.proto
index f79940e9..28f2cab5 100644
--- a/gensrc/proto/olap_file.proto
+++ b/gensrc/proto/olap_file.proto
@@ -54,28 +54,28 @@ message PDelta {
required int64 end_version = 2;
required int64 version_hash = 3;
required int64 creation_time = 4;
- repeated PSegmentGroup segment_group = 5;
+ repeated SegmentGroupPB segment_group = 5;
optional DeleteConditionMessage delete_condition = 6;
}
-enum RowsetType {
+enum RowsetTypePB {
ALPHA_ROWSET = 0; // doris原有的列存格式
BETA_ROWSET = 1; // 新列存
}
-enum RowsetState {
+enum RowsetStatePB {
PREPARING = 0; // 表示正在写入Rowset
COMMITTED = 1; // 表示rowset 写入完成，但是用户还不可见；这个状态下的rowset，BE不能自行判断是否删除，必须由FE的指令
VISIBLE = 2; // 表示rowset 已经对用户可见
}
-message RowsetMetaPb {
+message RowsetMetaPB {
required int64 rowset_id = 1;
optional int64 tablet_id = 2;
optional int64 txn_id = 3;
optional int32 tablet_schema_hash = 4;
- optional RowsetType rowset_type = 5;
- optional RowsetState rowset_state = 6;
+ optional RowsetTypePB rowset_type = 5;
+ optional RowsetStatePB rowset_state = 6;
optional int32 start_version = 7;
optional int32 end_version = 8;
optional int64 version_hash = 9;
@@ -92,11 +92,11 @@ message RowsetMetaPb {
optional bytes extra_properties = 50;
}
-message AlphaRowsetExtraMetaPb {
- repeated PSegmentGroup segment_groups = 1;
+message AlphaRowsetExtraMetaPB {
+ repeated SegmentGroupPB segment_groups = 1;
}
-message PSegmentGroup {
+message SegmentGroupPB {
required int32 segment_group_id = 1;
required int32 num_segments = 2;
required int64 index_size = 3;
@@ -110,11 +110,11 @@ message PPendingDelta {
required int64 partition_id = 1;
required int64 transaction_id = 2;
required int64 creation_time = 3;
- repeated PPendingSegmentGroup pending_segment_group = 4;
+ repeated PendingSegmentGroupPB pending_segment_group = 4;
optional DeleteConditionMessage delete_condition = 5;
}
-message PPendingSegmentGroup {
+message PendingSegmentGroupPB {
required int32 pending_segment_group_id = 1;
required int32 num_segments = 2;
required PUniqueId load_id = 3;
@@ -178,9 +178,9 @@ message OLAPHeaderMessage {
optional int64 tablet_id = 20;
optional int32 schema_hash = 21;
optional uint64 shard = 22;
- repeated RowsetMetaPb rowsets = 23;
- repeated RowsetMetaPb pending_rowsets = 24;
- repeated RowsetMetaPb incremental_rowsets = 25;
+ repeated RowsetMetaPB rowsets = 23;
+ repeated RowsetMetaPB pending_rowsets = 24;
+ repeated RowsetMetaPB incremental_rowsets = 25;
}
enum AlterTabletStatePB {
@@ -215,7 +215,7 @@ message TabletMetaPB {
optional int64 partition_id = 2;
optional int64 tablet_id = 3;
optional int64 schema_hash = 4;
- optional int16 shard_id = 5;
+ optional int32 shard_id = 5;
optional SchemaPB schema = 6;
repeated RowsetMetaPB rs_meta = 7;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@doris.apache.org
For additional commands, e-mail: dev-help@doris.apache.org