Skip to content

Commit b94789f

Browse files
committed
Del unless file in vec/common logger_useful.h defines.h (apache#73)
* 1. Remove the unless cast 2. Add some profile in vaggregation_node * Del unless file in vec/common logger_useful.h defines.h
1 parent cd4d412 commit b94789f

21 files changed

Lines changed: 281 additions & 416 deletions

File tree

‎be/src/common/compiler_util.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@
4545
#ifdef ALWAYS_INLINE
4646
#undef ALWAYS_INLINE
4747
#endif
48-
4948
#define ALWAYS_INLINE __attribute__((always_inline))
49+
#define NO_INLINE __attribute__((__noinline__))
50+
#define MAY_ALIAS __attribute__((__may_alias__))
5051

5152
#define ALIGN_CACHE_LINE __attribute__((aligned(CACHE_LINE_SIZE)))
5253

‎be/src/vec/aggregate_functions/aggregate_function_avg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct AggregateFunctionAvgData {
1818
UInt64 count = 0;
1919

2020
template <typename ResultT>
21-
ResultT NO_SANITIZE_UNDEFINED result() const {
21+
ResultT result() const {
2222
if constexpr (std::is_floating_point_v<ResultT>)
2323
if constexpr (std::numeric_limits<ResultT>::is_iec559)
2424
return static_cast<ResultT>(sum) / count; /// allow division by zero

‎be/src/vec/common/allocator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <algorithm>
4141
#include <cstdlib>
4242

43-
#include "vec/core/defines.h"
43+
#include "common/compiler_util.h"
4444
#ifdef THREAD_SANITIZER
4545
/// Thread sanitizer does not intercept mremap. The usage of mremap will lead to false positives.
4646
#define DISABLE_MREMAP 1

‎be/src/vec/common/arena.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#endif
2929
#include "vec/common/allocator.h"
3030
#include "vec/common/memcpy_small.h"
31-
#include "vec/core/defines.h"
3231

3332
//namespace ProfileEvents
3433
//{

‎be/src/vec/common/hash_table/hash_table.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
#include <math.h>
44
#include <string.h>
5-
#include <vec/common/exception.h>
6-
#include <vec/common/hash_table/hash_table_allocator.h>
7-
#include <vec/common/hash_table/hash_table_key_holder.h>
8-
#include <vec/core/defines.h>
9-
#include <vec/core/types.h>
105

116
#include <boost/noncopyable.hpp>
127
#include <utility>
138

9+
#include "vec/common/exception.h"
10+
#include "vec/common/hash_table/hash_table_allocator.h"
11+
#include "vec/common/hash_table/hash_table_key_holder.h"
12+
#include "vec/core/types.h"
1413
#include "vec/io/io_helper.h"
1514

1615
#ifdef DBMS_HASH_MAP_DEBUG_RESIZES

‎be/src/vec/common/int_exp.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
#include <cstdint>
2121
#include <limits>
2222

23-
#include "vec/core/defines.h"
24-
2523
/// On overlow, the function returns unspecified value.
2624

27-
inline NO_SANITIZE_UNDEFINED uint64_t intExp2(int x) {
25+
inline uint64_t intExp2(int x) {
2826
return 1ULL << x;
2927
}
3028

‎be/src/vec/common/logger_useful.h‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎be/src/vec/common/memcmp_small.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include <algorithm>
2121
#include <cstdint>
2222

23-
#include "vec/core/defines.h"
24-
2523
namespace detail {
2624

2725
template <typename T>

‎be/src/vec/common/sip_hash.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
#include <string>
3434
#include <type_traits>
3535

36+
#include "common/compiler_util.h"
3637
#include "vec/common/unaligned.h"
37-
#include "vec/core/defines.h"
3838
#include "vec/core/types.h"
3939

4040
#define ROTL(x, b) static_cast<doris::vectorized::UInt64>(((x) << (b)) | ((x) >> (64 - (b))))

‎be/src/vec/core/accurate_comparison.h‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include "vec/common/nan_utils.h"
2424
#include "vec/common/uint128.h"
25-
#include "vec/core/defines.h"
2625
#include "vec/core/types.h"
2726

2827
/** Preceptually-correct number comparisons.
@@ -282,63 +281,63 @@ inline bool_if_safe_conversion<A, B> equalsOp(A a, B b) {
282281
}
283282

284283
template <>
285-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::Float64, doris::vectorized::UInt64>(
284+
inline bool equalsOp<doris::vectorized::Float64, doris::vectorized::UInt64>(
286285
doris::vectorized::Float64 f, doris::vectorized::UInt64 u) {
287286
return static_cast<doris::vectorized::UInt64>(f) == u &&
288287
f == static_cast<doris::vectorized::Float64>(u);
289288
}
290289

291290
template <>
292-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::UInt64, doris::vectorized::Float64>(
291+
inline bool equalsOp<doris::vectorized::UInt64, doris::vectorized::Float64>(
293292
doris::vectorized::UInt64 u, doris::vectorized::Float64 f) {
294293
return u == static_cast<doris::vectorized::UInt64>(f) &&
295294
static_cast<doris::vectorized::Float64>(u) == f;
296295
}
297296

298297
template <>
299-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::Float64, doris::vectorized::Int64>(
298+
inline bool equalsOp<doris::vectorized::Float64, doris::vectorized::Int64>(
300299
doris::vectorized::Float64 f, doris::vectorized::Int64 u) {
301300
return static_cast<doris::vectorized::Int64>(f) == u &&
302301
f == static_cast<doris::vectorized::Float64>(u);
303302
}
304303

305304
template <>
306-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::Int64, doris::vectorized::Float64>(
305+
inline bool equalsOp<doris::vectorized::Int64, doris::vectorized::Float64>(
307306
doris::vectorized::Int64 u, doris::vectorized::Float64 f) {
308307
return u == static_cast<doris::vectorized::Int64>(f) &&
309308
static_cast<doris::vectorized::Float64>(u) == f;
310309
}
311310

312311
template <>
313-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::Float32, doris::vectorized::UInt64>(
312+
inline bool equalsOp<doris::vectorized::Float32, doris::vectorized::UInt64>(
314313
doris::vectorized::Float32 f, doris::vectorized::UInt64 u) {
315314
return static_cast<doris::vectorized::UInt64>(f) == u &&
316315
f == static_cast<doris::vectorized::Float32>(u);
317316
}
318317

319318
template <>
320-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::UInt64, doris::vectorized::Float32>(
319+
inline bool equalsOp<doris::vectorized::UInt64, doris::vectorized::Float32>(
321320
doris::vectorized::UInt64 u, doris::vectorized::Float32 f) {
322321
return u == static_cast<doris::vectorized::UInt64>(f) &&
323322
static_cast<doris::vectorized::Float32>(u) == f;
324323
}
325324

326325
template <>
327-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::Float32, doris::vectorized::Int64>(
326+
inline bool equalsOp<doris::vectorized::Float32, doris::vectorized::Int64>(
328327
doris::vectorized::Float32 f, doris::vectorized::Int64 u) {
329328
return static_cast<doris::vectorized::Int64>(f) == u &&
330329
f == static_cast<doris::vectorized::Float32>(u);
331330
}
332331

333332
template <>
334-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::Int64, doris::vectorized::Float32>(
333+
inline bool equalsOp<doris::vectorized::Int64, doris::vectorized::Float32>(
335334
doris::vectorized::Int64 u, doris::vectorized::Float32 f) {
336335
return u == static_cast<doris::vectorized::Int64>(f) &&
337336
static_cast<doris::vectorized::Float32>(u) == f;
338337
}
339338

340339
template <>
341-
inline bool NO_SANITIZE_UNDEFINED equalsOp<doris::vectorized::UInt128, doris::vectorized::Float64>(
340+
inline bool equalsOp<doris::vectorized::UInt128, doris::vectorized::Float64>(
342341
doris::vectorized::UInt128 u, doris::vectorized::Float64 f) {
343342
return u.low == 0 && equalsOp(static_cast<doris::vectorized::UInt64>(u.high), f);
344343
}
@@ -361,8 +360,7 @@ inline bool equalsOp<doris::vectorized::Float32, doris::vectorized::UInt128>(
361360
return equalsOp(static_cast<doris::vectorized::Float64>(f), u);
362361
}
363362

364-
inline bool NO_SANITIZE_UNDEFINED greaterOp(doris::vectorized::Int128 i,
365-
doris::vectorized::Float64 f) {
363+
inline bool greaterOp(doris::vectorized::Int128 i, doris::vectorized::Float64 f) {
366364
static constexpr __int128 min_int128 = __int128(0x8000000000000000ll) << 64;
367365
static constexpr __int128 max_int128 =
368366
(__int128(0x7fffffffffffffffll) << 64) + 0xffffffffffffffffll;
@@ -375,8 +373,7 @@ inline bool NO_SANITIZE_UNDEFINED greaterOp(doris::vectorized::Int128 i,
375373
i > static_cast<doris::vectorized::Int128>(f));
376374
}
377375

378-
inline bool NO_SANITIZE_UNDEFINED greaterOp(doris::vectorized::Float64 f,
379-
doris::vectorized::Int128 i) {
376+
inline bool greaterOp(doris::vectorized::Float64 f, doris::vectorized::Int128 i) {
380377
static constexpr __int128 min_int128 = __int128(0x8000000000000000ll) << 64;
381378
static constexpr __int128 max_int128 =
382379
(__int128(0x7fffffffffffffffll) << 64) + 0xffffffffffffffffll;
@@ -396,13 +393,11 @@ inline bool greaterOp(doris::vectorized::Float32 f, doris::vectorized::Int128 i)
396393
return greaterOp(static_cast<doris::vectorized::Float64>(f), i);
397394
}
398395

399-
inline bool NO_SANITIZE_UNDEFINED equalsOp(doris::vectorized::Int128 i,
400-
doris::vectorized::Float64 f) {
396+
inline bool equalsOp(doris::vectorized::Int128 i, doris::vectorized::Float64 f) {
401397
return i == static_cast<doris::vectorized::Int128>(f) &&
402398
static_cast<doris::vectorized::Float64>(i) == f;
403399
}
404-
inline bool NO_SANITIZE_UNDEFINED equalsOp(doris::vectorized::Int128 i,
405-
doris::vectorized::Float32 f) {
400+
inline bool equalsOp(doris::vectorized::Int128 i, doris::vectorized::Float32 f) {
406401
return i == static_cast<doris::vectorized::Int128>(f) &&
407402
static_cast<doris::vectorized::Float32>(i) == f;
408403
}
@@ -457,7 +452,7 @@ inline bool_if_safe_conversion<A, B> greaterOrEqualsOp(A a, B b) {
457452

458453
/// Converts numeric to an equal numeric of other type.
459454
template <typename From, typename To>
460-
inline bool NO_SANITIZE_UNDEFINED convertNumeric(From value, To& result) {
455+
inline bool convertNumeric(From value, To& result) {
461456
/// If the type is actually the same it's not necessary to do any checks.
462457
if constexpr (std::is_same_v<From, To>) {
463458
result = value;

0 commit comments

Comments
 (0)