Skip to content

Commit 6677d4a

Browse files
Sergey Pershinfacebook-github-bot
Sergey Pershin
authored and
facebook-github-bot
committed
Remove MemoryPoolImpl::cumulativeBytes_ (facebookincubator#12476)
Summary: It is not used. Differential Revision: D70353251
1 parent 3b9239b commit 6677d4a

File tree

6 files changed

+16
-58
lines changed

6 files changed

+16
-58
lines changed

‎velox/common/memory/MemoryPool.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,10 @@ std::string capacityToString(int64_t capacity) {
163163

164164
std::string MemoryPool::Stats::toString() const {
165165
return fmt::format(
166-
"usedBytes:{} reservedBytes:{} peakBytes:{} cumulativeBytes:{} numAllocs:{} numFrees:{} numReserves:{} numReleases:{} numShrinks:{} numReclaims:{} numCollisions:{} numCapacityGrowths:{}",
166+
"usedBytes:{} reservedBytes:{} peakBytes:{} numAllocs:{} numFrees:{} numReserves:{} numReleases:{} numShrinks:{} numReclaims:{} numCollisions:{} numCapacityGrowths:{}",
167167
succinctBytes(usedBytes),
168168
succinctBytes(reservedBytes),
169169
succinctBytes(peakBytes),
170-
succinctBytes(cumulativeBytes),
171170
numAllocs,
172171
numFrees,
173172
numReserves,
@@ -183,7 +182,6 @@ bool MemoryPool::Stats::operator==(const MemoryPool::Stats& other) const {
183182
usedBytes,
184183
reservedBytes,
185184
peakBytes,
186-
cumulativeBytes,
187185
numAllocs,
188186
numFrees,
189187
numReserves,
@@ -194,7 +192,6 @@ bool MemoryPool::Stats::operator==(const MemoryPool::Stats& other) const {
194192
other.usedBytes,
195193
other.reservedBytes,
196194
other.peakBytes,
197-
other.cumulativeBytes,
198195
other.numAllocs,
199196
other.numFrees,
200197
other.numReserves,
@@ -469,7 +466,6 @@ MemoryPool::Stats MemoryPoolImpl::statsLocked() const {
469466
stats.usedBytes = usedBytes();
470467
stats.reservedBytes = reservationBytes_;
471468
stats.peakBytes = peakBytes_;
472-
stats.cumulativeBytes = cumulativeBytes_;
473469
stats.numAllocs = numAllocs_;
474470
stats.numFrees = numFrees_;
475471
stats.numReserves = numReserves_;
@@ -780,7 +776,6 @@ void MemoryPoolImpl::reserveThreadSafe(uint64_t size, bool reserveOnly) {
780776
minReservationBytes_ = tsanAtomicValue(reservationBytes_);
781777
} else {
782778
usedReservationBytes_ += size;
783-
cumulativeBytes_ += size;
784779
maybeUpdatePeakBytesLocked(usedReservationBytes_);
785780
}
786781
sanityCheckLocked();
@@ -897,7 +892,6 @@ bool MemoryPoolImpl::maybeIncrementReservation(uint64_t size) {
897892
void MemoryPoolImpl::incrementReservationLocked(uint64_t bytes) {
898893
reservationBytes_ += bytes;
899894
if (!isLeaf()) {
900-
cumulativeBytes_ += bytes;
901895
maybeUpdatePeakBytesLocked(reservationBytes_);
902896
}
903897
}

‎velox/common/memory/MemoryPool.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,6 @@ class MemoryPool : public std::enable_shared_from_this<MemoryPool> {
410410
uint64_t reservedBytes{0};
411411
/// The peak memory usage.
412412
uint64_t peakBytes{0};
413-
/// The accumulative memory usage.
414-
uint64_t cumulativeBytes{0};
415413
/// The number of memory allocations.
416414
uint64_t numAllocs{0};
417415
/// The number of memory frees.
@@ -445,7 +443,7 @@ class MemoryPool : public std::enable_shared_from_this<MemoryPool> {
445443
std::string toString() const;
446444

447445
/// Returns true if the current and reserved bytes are zero.
448-
/// Note that peak or cumulative bytes might be non-zero and we are still
446+
/// Note that peak bytes might be non-zero and we are still
449447
/// empty at this moment.
450448
bool empty() const {
451449
return usedBytes == 0 && reservedBytes == 0;
@@ -795,7 +793,6 @@ class MemoryPoolImpl : public MemoryPool {
795793
minReservationBytes_ = tsanAtomicValue(reservationBytes_);
796794
} else {
797795
usedReservationBytes_ += size;
798-
cumulativeBytes_ += size;
799796
maybeUpdatePeakBytesLocked(usedReservationBytes_);
800797
}
801798
sanityCheckLocked();
@@ -1039,7 +1036,6 @@ class MemoryPoolImpl : public MemoryPool {
10391036
tsan_atomic<int64_t> minReservationBytes_{0};
10401037

10411038
tsan_atomic<int64_t> peakBytes_{0};
1042-
tsan_atomic<int64_t> cumulativeBytes_{0};
10431039

10441040
// Stats counters.
10451041
// The number of memory allocations.

‎velox/common/memory/tests/MemoryPoolTest.cpp

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,11 +2400,8 @@ TEST_P(MemoryPoolTest, concurrentUpdateToDifferentPools) {
24002400
ASSERT_EQ(child->reservedBytes(), 0);
24012401
ASSERT_EQ(child->availableReservation(), 0);
24022402
ASSERT_EQ(child->usedBytes(), 0);
2403-
ASSERT_LE(child->stats().peakBytes, child->stats().cumulativeBytes);
24042403
}
2405-
ASSERT_LE(root->stats().peakBytes, root->stats().cumulativeBytes);
24062404
childPools.clear();
2407-
ASSERT_LE(root->stats().peakBytes, root->stats().cumulativeBytes);
24082405
ASSERT_EQ(root->stats().usedBytes, 0);
24092406
}
24102407

@@ -2450,11 +2447,8 @@ TEST_P(MemoryPoolTest, concurrentUpdatesToTheSamePool) {
24502447
ASSERT_EQ(child->reservedBytes(), 0);
24512448
ASSERT_EQ(child->availableReservation(), 0);
24522449
ASSERT_EQ(child->usedBytes(), 0);
2453-
ASSERT_LE(child->stats().peakBytes, child->stats().cumulativeBytes);
24542450
}
2455-
ASSERT_LE(root->stats().peakBytes, root->stats().cumulativeBytes);
24562451
childPools.clear();
2457-
ASSERT_LE(root->stats().peakBytes, root->stats().cumulativeBytes);
24582452
ASSERT_EQ(root->stats().usedBytes, 0);
24592453
}
24602454

@@ -3071,7 +3065,7 @@ TEST_P(MemoryPoolTest, statsAndToString) {
30713065
void* buf1 = leafChild1->allocate(bufferSize);
30723066
ASSERT_EQ(
30733067
leafChild1->stats().toString(),
3074-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB cumulativeBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3068+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
30753069
ASSERT_EQ(
30763070
leafChild1->toString(),
30773071
fmt::format(
@@ -3080,7 +3074,7 @@ TEST_P(MemoryPoolTest, statsAndToString) {
30803074
isLeafThreadSafe_ ? "thread-safe" : "non-thread-safe"));
30813075
ASSERT_EQ(
30823076
leafChild2->stats().toString(),
3083-
"usedBytes:0B reservedBytes:0B peakBytes:0B cumulativeBytes:0B numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3077+
"usedBytes:0B reservedBytes:0B peakBytes:0B numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
30843078
ASSERT_EQ(
30853079
leafChild1->toString(),
30863080
fmt::format(
@@ -3089,36 +3083,36 @@ TEST_P(MemoryPoolTest, statsAndToString) {
30893083
isLeafThreadSafe_ ? "thread-safe" : "non-thread-safe"));
30903084
ASSERT_EQ(
30913085
aggregateChild->stats().toString(),
3092-
"usedBytes:0B reservedBytes:0B peakBytes:0B cumulativeBytes:0B numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3086+
"usedBytes:0B reservedBytes:0B peakBytes:0B numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
30933087
ASSERT_EQ(
30943088
root->stats().toString(),
3095-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00MB cumulativeBytes:1.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3089+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
30963090
void* buf2 = leafChild2->allocate(bufferSize);
30973091
ASSERT_EQ(
30983092
leafChild1->stats().toString(),
3099-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB cumulativeBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3093+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31003094
ASSERT_EQ(
31013095
leafChild2->stats().toString(),
3102-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB cumulativeBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3096+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31033097
ASSERT_EQ(
31043098
aggregateChild->stats().toString(),
3105-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00MB cumulativeBytes:1.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3099+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31063100
ASSERT_EQ(
31073101
root->stats().toString(),
3108-
"usedBytes:2.00KB reservedBytes:2.00MB peakBytes:2.00MB cumulativeBytes:2.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3102+
"usedBytes:2.00KB reservedBytes:2.00MB peakBytes:2.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31093103
leafChild1->free(buf1, bufferSize);
31103104
ASSERT_EQ(
31113105
leafChild1->stats().toString(),
3112-
"usedBytes:0B reservedBytes:0B peakBytes:1.00KB cumulativeBytes:1.00KB numAllocs:1 numFrees:1 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3106+
"usedBytes:0B reservedBytes:0B peakBytes:1.00KB numAllocs:1 numFrees:1 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31133107
ASSERT_EQ(
31143108
leafChild2->stats().toString(),
3115-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB cumulativeBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3109+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00KB numAllocs:1 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31163110
ASSERT_EQ(
31173111
aggregateChild->stats().toString(),
3118-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00MB cumulativeBytes:1.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3112+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:1.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31193113
ASSERT_EQ(
31203114
root->stats().toString(),
3121-
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:2.00MB cumulativeBytes:2.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
3115+
"usedBytes:1.00KB reservedBytes:1.00MB peakBytes:2.00MB numAllocs:0 numFrees:0 numReserves:0 numReleases:0 numShrinks:0 numReclaims:0 numCollisions:0 numCapacityGrowths:0");
31223116
leafChild2->free(buf2, bufferSize);
31233117
std::vector<void*> bufs;
31243118
for (int i = 0; i < 10; ++i) {
@@ -3130,14 +3124,12 @@ TEST_P(MemoryPoolTest, statsAndToString) {
31303124
ASSERT_EQ(root->stats().numReclaims, 0);
31313125
ASSERT_EQ(root->stats().peakBytes, 2097152);
31323126
ASSERT_EQ(root->peakBytes(), 2097152);
3133-
ASSERT_EQ(root->stats().cumulativeBytes, 3145728);
31343127
ASSERT_EQ(root->stats().usedBytes, 10240);
31353128
ASSERT_EQ(root->stats().numCapacityGrowths, 0);
31363129
ASSERT_EQ(leafChild1->stats().numAllocs, 11);
31373130
ASSERT_EQ(leafChild1->stats().numFrees, 1);
31383131
ASSERT_EQ(leafChild1->stats().usedBytes, 10240);
31393132
ASSERT_EQ(leafChild1->stats().peakBytes, 10240);
3140-
ASSERT_EQ(leafChild1->stats().cumulativeBytes, 11264);
31413133
ASSERT_EQ(leafChild1->stats().numReserves, 0);
31423134
ASSERT_EQ(leafChild1->stats().numReleases, 0);
31433135
ASSERT_EQ(leafChild1->stats().numCapacityGrowths, 0);
@@ -3150,14 +3142,12 @@ TEST_P(MemoryPoolTest, statsAndToString) {
31503142
ASSERT_EQ(root->stats().numReclaims, 0);
31513143
ASSERT_EQ(root->stats().peakBytes, 2097152);
31523144
ASSERT_EQ(root->peakBytes(), 2097152);
3153-
ASSERT_EQ(root->stats().cumulativeBytes, 3145728);
31543145
ASSERT_EQ(root->stats().usedBytes, 0);
31553146
ASSERT_EQ(root->stats().numCapacityGrowths, 0);
31563147
ASSERT_EQ(leafChild1->stats().numAllocs, 11);
31573148
ASSERT_EQ(leafChild1->stats().numFrees, 11);
31583149
ASSERT_EQ(leafChild1->stats().usedBytes, 0);
31593150
ASSERT_EQ(leafChild1->stats().peakBytes, 10240);
3160-
ASSERT_EQ(leafChild1->stats().cumulativeBytes, 11264);
31613151
ASSERT_EQ(leafChild1->stats().numReserves, 0);
31623152
ASSERT_EQ(leafChild1->stats().numReleases, 0);
31633153
ASSERT_EQ(leafChild1->stats().numCapacityGrowths, 0);
@@ -3167,15 +3157,13 @@ TEST_P(MemoryPoolTest, statsAndToString) {
31673157
ASSERT_EQ(leafChild1->stats().usedBytes, 0);
31683158
ASSERT_EQ(leafChild1->stats().peakBytes, 10240);
31693159
ASSERT_EQ(leafChild1->peakBytes(), 10240);
3170-
ASSERT_EQ(leafChild1->stats().cumulativeBytes, 11264);
31713160
ASSERT_EQ(leafChild1->stats().numReserves, 1);
31723161
ASSERT_EQ(leafChild1->stats().numReleases, 0);
31733162
ASSERT_EQ(leafChild1->stats().numCapacityGrowths, 0);
31743163
leafChild1->release();
31753164
ASSERT_EQ(leafChild1->stats().numAllocs, 11);
31763165
ASSERT_EQ(leafChild1->stats().numFrees, 11);
31773166
ASSERT_EQ(leafChild1->stats().usedBytes, 0);
3178-
ASSERT_EQ(leafChild1->stats().cumulativeBytes, 11264);
31793167
ASSERT_EQ(leafChild1->stats().peakBytes, 10240);
31803168
ASSERT_EQ(leafChild1->peakBytes(), 10240);
31813169
ASSERT_EQ(leafChild1->stats().numReserves, 1);
@@ -3209,7 +3197,6 @@ TEST_P(MemoryPoolTest, memoryUsageUpdateCheck) {
32093197

32103198
ASSERT_EQ(root->stats().usedBytes, 0);
32113199
ASSERT_EQ(root->stats().reservedBytes, 0);
3212-
ASSERT_EQ(root->stats().cumulativeBytes, 0);
32133200
ASSERT_EQ(root->reservedBytes(), 0);
32143201

32153202
std::vector<Buffer> buffers;
@@ -3220,9 +3207,7 @@ TEST_P(MemoryPoolTest, memoryUsageUpdateCheck) {
32203207
ASSERT_EQ(child1->usedBytes(), 1024);
32213208
ASSERT_EQ(child1->reservedBytes(), MB);
32223209
ASSERT_EQ(child1->stats().reservedBytes, MB);
3223-
ASSERT_EQ(child1->stats().cumulativeBytes, 1024);
32243210
ASSERT_EQ(root->reservedBytes(), MB);
3225-
ASSERT_EQ(root->stats().cumulativeBytes, MB);
32263211
ASSERT_EQ(MB - 1024, child1->availableReservation());
32273212

32283213
buffers.emplace_back(Buffer{child1->allocate(1000), 1000});
@@ -3231,7 +3216,6 @@ TEST_P(MemoryPoolTest, memoryUsageUpdateCheck) {
32313216
ASSERT_EQ(child1->stats().reservedBytes, MB);
32323217
ASSERT_EQ(root->reservedBytes(), MB);
32333218
ASSERT_EQ(root->stats().usedBytes, 2048);
3234-
ASSERT_EQ(root->stats().cumulativeBytes, MB);
32353219
ASSERT_EQ(root->stats().reservedBytes, MB);
32363220

32373221
buffers.emplace_back(Buffer{child1->allocate(MB), MB});
@@ -3240,7 +3224,6 @@ TEST_P(MemoryPoolTest, memoryUsageUpdateCheck) {
32403224
ASSERT_EQ(child1->usedBytes(), 2048 + MB);
32413225
ASSERT_EQ(root->reservedBytes(), 2 * MB);
32423226
ASSERT_EQ(root->stats().usedBytes, 2048 + MB);
3243-
ASSERT_EQ(root->stats().cumulativeBytes, 2 * MB);
32443227
ASSERT_EQ(root->stats().reservedBytes, 2 * MB);
32453228

32463229
buffers.emplace_back(Buffer{child1->allocate(100 * MB), 100 * MB});
@@ -3254,61 +3237,52 @@ TEST_P(MemoryPoolTest, memoryUsageUpdateCheck) {
32543237
// Larger sizes round up to next 8MB.
32553238
ASSERT_EQ(root->reservedBytes(), 104 * MB);
32563239
ASSERT_EQ(root->stats().usedBytes, 2048 + 101 * MB);
3257-
ASSERT_EQ(root->stats().cumulativeBytes, 104 * MB);
32583240
ASSERT_EQ(root->stats().reservedBytes, 104 * MB);
32593241
ASSERT_EQ(root->availableReservation(), 0);
32603242

32613243
child1->free(buffers[0].data, buffers[0].length);
32623244
ASSERT_EQ(child1->usedBytes(), 1024 + 101 * MB);
32633245
ASSERT_EQ(child1->stats().usedBytes, 1024 + 101 * MB);
3264-
ASSERT_EQ(child1->stats().cumulativeBytes, 2048 + 101 * MB);
32653246
ASSERT_EQ(child1->reservedBytes(), 104 * MB);
32663247
ASSERT_EQ(
32673248
child1->availableReservation(),
32683249
child1->reservedBytes() - child1->usedBytes());
32693250
ASSERT_EQ(root->reservedBytes(), 104 * MB);
32703251
ASSERT_EQ(root->stats().usedBytes, 1024 + 101 * MB);
3271-
ASSERT_EQ(root->stats().cumulativeBytes, 104 * MB);
32723252
ASSERT_EQ(root->stats().reservedBytes, 104 * MB);
32733253
ASSERT_EQ(root->availableReservation(), 0);
32743254

32753255
child1->free(buffers[2].data, buffers[2].length);
32763256
ASSERT_EQ(child1->usedBytes(), 1024 + 100 * MB);
32773257
ASSERT_EQ(child1->stats().usedBytes, 1024 + 100 * MB);
3278-
ASSERT_EQ(child1->stats().cumulativeBytes, 2048 + 101 * MB);
32793258
ASSERT_EQ(child1->reservedBytes(), 104 * MB);
32803259
ASSERT_EQ(
32813260
child1->availableReservation(),
32823261
child1->reservedBytes() - child1->usedBytes());
32833262
ASSERT_EQ(root->reservedBytes(), 104 * MB);
32843263
ASSERT_EQ(root->stats().usedBytes, 1024 + 100 * MB);
3285-
ASSERT_EQ(root->stats().cumulativeBytes, 104 * MB);
32863264
ASSERT_EQ(root->stats().reservedBytes, 104 * MB);
32873265
ASSERT_EQ(root->availableReservation(), 0);
32883266

32893267
child1->free(buffers[3].data, buffers[3].length);
32903268
ASSERT_EQ(child1->usedBytes(), 1024);
32913269
ASSERT_EQ(child1->stats().usedBytes, 1024);
3292-
ASSERT_EQ(child1->stats().cumulativeBytes, 2048 + 101 * MB);
32933270
ASSERT_EQ(child1->reservedBytes(), MB);
32943271
ASSERT_EQ(
32953272
child1->availableReservation(),
32963273
child1->reservedBytes() - child1->usedBytes());
32973274
ASSERT_EQ(root->reservedBytes(), MB);
32983275
ASSERT_EQ(root->stats().usedBytes, 1024);
3299-
ASSERT_EQ(root->stats().cumulativeBytes, 104 * MB);
33003276
ASSERT_EQ(root->stats().reservedBytes, MB);
33013277
ASSERT_EQ(root->availableReservation(), 0);
33023278

33033279
child1->free(buffers[1].data, buffers[1].length);
33043280
ASSERT_EQ(child1->usedBytes(), 0);
33053281
ASSERT_EQ(child1->stats().usedBytes, 0);
3306-
ASSERT_EQ(child1->stats().cumulativeBytes, 2048 + 101 * MB);
33073282
ASSERT_EQ(child1->reservedBytes(), 0);
33083283
ASSERT_EQ(child1->availableReservation(), 0);
33093284
ASSERT_EQ(root->reservedBytes(), 0);
33103285
ASSERT_EQ(root->stats().usedBytes, 0);
3311-
ASSERT_EQ(root->stats().cumulativeBytes, 104 * MB);
33123286
ASSERT_EQ(root->stats().reservedBytes, 0);
33133287
ASSERT_EQ(root->availableReservation(), 0);
33143288

@@ -3349,7 +3323,6 @@ TEST_P(MemoryPoolTest, maybeReserve) {
33493323
// allocation on the parent.
33503324
ASSERT_EQ(child->usedBytes(), 0);
33513325
ASSERT_EQ(child->stats().usedBytes, 0);
3352-
ASSERT_EQ(child->stats().cumulativeBytes, 0);
33533326
ASSERT_EQ(child->stats().reservedBytes, 104 * MB);
33543327
ASSERT_EQ(child->availableReservation(), 104 * MB);
33553328

‎velox/exec/tests/AggregateSpillBenchmarkBase.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ void AggregateSpillBenchmarkBase::printStats() const {
9090
LOG(INFO) << numInputVectors_ << " vectors each with " << inputVectorSize_
9191
<< " rows have been processed";
9292
const auto memStats = memory::spillMemoryPool()->stats();
93-
LOG(INFO) << "peak memory usage[" << succinctBytes(memStats.peakBytes)
94-
<< "] cumulative memory usage["
95-
<< succinctBytes(memStats.cumulativeBytes) << "]";
93+
LOG(INFO) << "peak memory usage[" << succinctBytes(memStats.peakBytes) << "]";
9694
LOG(INFO) << spiller_->stats().toString();
9795
// List files under file path.
9896
SpillPartitionSet partitionSet;

‎velox/exec/tests/HashJoinTest.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3257,7 +3257,6 @@ TEST_F(HashJoinTest, memory) {
32573257
params.queryCtx = core::QueryCtx::create(driverExecutor_.get());
32583258
auto [taskCursor, rows] = readCursor(params, [](Task*) {});
32593259
EXPECT_GT(3'500, params.queryCtx->pool()->stats().numAllocs);
3260-
EXPECT_GT(40'000'000, params.queryCtx->pool()->stats().cumulativeBytes);
32613260
}
32623261

32633262
TEST_F(HashJoinTest, lazyVectors) {

‎velox/exec/tests/SpillerBenchmarkBase.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ void SpillerBenchmarkBase::printStats() const {
123123
LOG(INFO) << numInputVectors_ << " vectors each with " << inputVectorSize_
124124
<< " rows have been processed";
125125
const auto memStats = pool_->stats();
126-
LOG(INFO) << "peak memory usage[" << succinctBytes(memStats.peakBytes)
127-
<< "] cumulative memory usage["
128-
<< succinctBytes(memStats.cumulativeBytes) << "]";
126+
LOG(INFO) << "peak memory usage[" << succinctBytes(memStats.peakBytes) << "]";
129127
LOG(INFO) << spiller_->stats().toString();
130128
// List files under file path.
131129
SpillPartitionSet partitionSet;

0 commit comments

Comments
 (0)