Skip to content

[fix](be) Move #include directives outside namespace blocks to avoid ODR violations #62871

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

Open
csun5285 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −9
Open

[fix](be) Move #include directives outside namespace blocks to avoid ODR violations #62871

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
3 changes: 1 addition & 2 deletions be/src/exec/common/sip_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
* (~ 700 MB/sec, 15 million strings per second)
*/

#include <cstddef>
#include <string>
#include <type_traits>

Expand Down Expand Up @@ -209,8 +210,6 @@ class SipHash {
#undef ROTL
#undef SIPROUND

#include <cstddef>

inline void sip_hash128(const char* data, const size_t size, char* out) {
SipHash hash;
hash.update(data, size);
Expand Down
3 changes: 1 addition & 2 deletions be/src/exprs/table_function/vexplode_v2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "core/column/column.h"
#include "core/column/column_array.h"
#include "core/column/column_nothing.h"
#include "core/column/column_struct.h"
#include "core/column/column_variant.h"
#include "core/data_type/data_type.h"
#include "core/data_type/data_type_array.h"
Expand All @@ -41,8 +42,6 @@

namespace doris {

#include "core/column/column_struct.h"

VExplodeV2TableFunction::VExplodeV2TableFunction() {
_fn_name = "vexplode";
}
Expand Down
4 changes: 2 additions & 2 deletions be/src/storage/segment/variant/variant_doc_snpashot_compact_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
// specific language governing permissions and limitations
// under the License.

namespace doris::segment_v2 {

#include "core/column/column_variant.h"
#include "storage/segment/column_reader.h"

namespace doris::segment_v2 {

class VariantDocValueCompactIterator : public ColumnIterator {
public:
VariantDocValueCompactIterator(ColumnIteratorUPtr&& column_iterator)
Expand Down
6 changes: 4 additions & 2 deletions be/src/util/hash/murmur_hash3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@

#include "util/hash/murmur_hash3.h"

#if defined(_MSC_VER)
#include <stdlib.h>
#endif

#include "util/unaligned.h"

namespace doris {
Expand All @@ -34,8 +38,6 @@ namespace doris {

#define FORCE_INLINE __forceinline

#include <stdlib.h>

#define ROTL32(x, y) _rotl(x, y)
#define ROTL64(x, y) _rotl64(x, y)

Expand Down
1 change: 0 additions & 1 deletion be/src/util/simd/vstring_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ inline bool validate_ascii_fast(const char* src, size_t len) {
}

#ifdef __AVX2__
#include <x86intrin.h>
// The function returns true (1) if all chars passed in src are
// 7-bit values (0x00..0x7F). Otherwise, it returns false (0).
inline bool validate_ascii_fast_avx(const char* src, size_t len) {
Expand Down
Loading