Skip to content

Commit e7e07c2

Browse files
gfphoenix78my-ship-it
authored andcommitted
Fix compile issue for higher version of gcc/g++
1. return std::move(temp_value) will report error in high version of g++, keep the behavior align with higher version of g++. 2. remove some maybe uninitialized varible. 3. add -Wno-error=array-bounds, so protobuf header will not report errors.
1 parent a447003 commit e7e07c2

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

contrib/pax_storage/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(CMAKE_CXX_STANDARD 17)
2121
set(TOP_DIR ${PROJECT_SOURCE_DIR}/../..)
2222
set(CBDB_INCLUDE_DIR ${TOP_DIR}/src/include)
2323
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
24-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-unused-function -Wno-error=ignored-qualifiers -Wuninitialized -Winit-self -Wstrict-aliasing -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered -Wno-sized-deallocation -g")
24+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Werror=pessimizing-move -Wno-unused-function -Wno-error=ignored-qualifiers -Wno-error=array-bounds -Wuninitialized -Winit-self -Wstrict-aliasing -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered -Wno-sized-deallocation -g")
2525
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-parameter -Wno-parameter-name")
2626

2727
option(USE_MANIFEST_API "Use manifest API" OFF)

contrib/pax_storage/src/cpp/storage/micro_partition_iterator.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ MicroPartitionMetadata MicroPartitionInfoIterator::Next() {
164164
Assert(tuple);
165165

166166
tuple_ = nullptr;
167-
return std::move(ToValue(tuple));
167+
return ToValue(tuple);
168168
}
169169

170170
void MicroPartitionInfoIterator::Rewind() {
@@ -375,7 +375,7 @@ MicroPartitionMetadata MicroPartitionInfoParallelIterator::Next() {
375375
Assert(tuple);
376376

377377
tuple_ = nullptr;
378-
return std::move(ToValue(tuple));
378+
return ToValue(tuple);
379379
}
380380

381381
void MicroPartitionInfoParallelIterator::Rewind() {

contrib/pax_storage/src/cpp/storage/micro_partition_stats.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ static bool PrepareStatisticsInfoCombine(
173173

174174
auto attr = TupleDescAttr(desc, i);
175175
auto collation = attr->attcollation;
176-
FmgrInfo finfo;
177176
bool get_pg_oper_succ = false;
178177

179178
funcs.emplace_back(std::make_pair(nullptr, nullptr));
@@ -207,7 +206,6 @@ static bool PrepareStatisticsInfoCombine(
207206

208207
GetStrategyProcinfo(attr->atttypid, attr->atttypid, funcs[i]);
209208
if (allow_fallback_to_pg) {
210-
finfos[i] = {finfo, finfo};
211209
get_pg_oper_succ =
212210
GetStrategyProcinfo(attr->atttypid, attr->atttypid, finfos[i]);
213211
}

contrib/pax_storage/src/cpp/storage/toast/pax_toast.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ static std::pair<Datum, std::shared_ptr<MemoryObject>> pax_make_external_toast(
331331
std::pair<Datum, std::shared_ptr<MemoryObject>> pax_make_toast(
332332
Datum d, char storage_type) {
333333
std::shared_ptr<MemoryObject> mobj;
334-
Datum result;
334+
Datum result = d;
335335

336336
if (!pax_enable_toast) {
337337
return {d, nullptr};

0 commit comments

Comments
 (0)