Skip to content

Commit 1282f39

Browse files
lerouxblerouxb
authored
Revert "feat(database-collections): add uncompressed data stat field COMPASS-7691 (#7357)" (#7426)
This reverts commit e8c45e5.
1 parent 6147765 commit 1282f39

File tree

10 files changed

+22
-94
lines changed

10 files changed

+22
-94
lines changed

‎packages/compass-components/src/components/inline-definition.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable react/prop-types */
22
import React from 'react';
3-
import { css, cx } from '@leafygreen-ui/emotion';
3+
import { css } from '@leafygreen-ui/emotion';
44
import { Body, Tooltip } from './leafygreen';
55

66
const underline = css({
@@ -15,10 +15,6 @@ const maxWidth = css({
1515
maxWidth: '360px',
1616
});
1717

18-
const breakSpaces = css({
19-
whiteSpace: 'break-spaces',
20-
});
21-
2218
const InlineDefinition: React.FunctionComponent<
2319
React.HTMLProps<HTMLSpanElement> & {
2420
definition: React.ReactNode;
@@ -38,7 +34,7 @@ const InlineDefinition: React.FunctionComponent<
3834
}
3935
{...tooltipProps}
4036
>
41-
<Body className={cx(maxWidth, breakSpaces)}>{definition}</Body>
37+
<Body className={maxWidth}>{definition}</Body>
4238
</Tooltip>
4339
);
4440
};

‎packages/compass-workspaces/src/index.spec.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ describe('WorkspacesPlugin', function () {
103103
document_count: 0,
104104
index_count: 0,
105105
storage_size: 0,
106-
free_storage_size: 0,
107106
data_size: 0,
108107
index_size: 0,
109108
},

‎packages/data-service/src/data-service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2808,7 +2808,7 @@ class DataServiceImpl extends WithLogContext implements DataService {
28082808
const db = this._database(name, 'META');
28092809
const stats = await runCommand(
28102810
db,
2811-
{ dbStats: 1, freeStorage: 1 },
2811+
{ dbStats: 1 },
28122812
{
28132813
enableUtf8Validation: false,
28142814
...maybeOverrideReadPreference(

‎packages/data-service/src/instance-detail-helper.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ export type DatabaseDetails = {
8585
collection_count: number;
8686
document_count: number;
8787
storage_size: number;
88-
free_storage_size: number;
8988
data_size: number;
9089
index_count: number;
9190
index_size: number;
@@ -374,7 +373,6 @@ export function adaptDatabaseInfo(
374373
storage_size: databaseStats.storageSize ?? 0,
375374
data_size: databaseStats.dataSize ?? 0,
376375
index_size: databaseStats.indexSize ?? 0,
377-
free_storage_size: databaseStats.freeStorageSize ?? 0,
378376
};
379377
}
380378

‎packages/data-service/src/run-command.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,9 @@ export type DbStats = {
9696
avgObjSize: number;
9797
dataSize: number;
9898
storageSize: number;
99-
freeStorageSize?: number;
10099
numExtents: number;
101100
indexes: number;
102101
indexSize: number;
103-
indexFreeStorageSize?: number;
104-
totalSize?: number;
105-
totalFreeStorageSize?: number;
106102
scaleFactor: number;
107103
fsUsedSize: number;
108104
fsTotalSize: number;
@@ -139,7 +135,7 @@ interface RunDiagnosticsCommand {
139135
): Promise<BuildInfo>;
140136
(
141137
db: Db,
142-
spec: { dbStats: 1; scale?: number; freeStorage?: 1 },
138+
spec: { dbStats: 1; scale?: number },
143139
options?: RunCommandOptions
144140
): Promise<DbStats>;
145141
(

‎packages/database-model/index.d.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ interface DatabaseProps {
1010
collectionsStatusError: string | null;
1111
collection_count: number | undefined;
1212
document_count: number | undefined;
13-
calculated_storage_size: number | undefined;
1413
storage_size: number | undefined;
15-
free_storage_size: number | undefined;
1614
data_size: number | undefined;
1715
index_count: number | undefined;
1816
index_size: number | undefined;

‎packages/database-model/lib/model.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ const DatabaseModel = AmpersandModel.extend(
112112
data_size: 'number',
113113
index_count: 'number',
114114
index_size: 'number',
115-
free_storage_size: 'number',
116115
},
117116
derived: {
118117
// Either returns a collection count from database stats or from real
@@ -127,18 +126,6 @@ const DatabaseModel = AmpersandModel.extend(
127126
: this.collection_count ?? 0;
128127
},
129128
},
130-
calculated_storage_size: {
131-
deps: ['storage_size', 'free_storage_size'],
132-
fn() {
133-
if (
134-
this.storage_size === undefined ||
135-
this.free_storage_size === undefined
136-
) {
137-
return undefined;
138-
}
139-
return this.storage_size - this.free_storage_size;
140-
},
141-
},
142129
},
143130
collections: {
144131
collections: MongoDbCollectionCollection,

‎packages/databases-collections-list/src/collections.tsx‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -126,50 +126,30 @@ const CollectionsList: React.FunctionComponent<{
126126
: coll.type === 'timeseries'
127127
? [
128128
{
129-
label: 'Storage',
129+
label: 'Storage size',
130130
value:
131131
coll.calculated_storage_size !== undefined
132132
? compactBytes(coll.calculated_storage_size)
133133
: 'N/A',
134-
hint:
135-
coll.calculated_storage_size !== undefined &&
136-
coll.storage_size !== undefined &&
137-
coll.free_storage_size !== undefined &&
138-
'Storage Data: Disk space allocated to this collection for document storage.\n' +
139-
`Total storage: ${compactBytes(coll.storage_size)}\n` +
140-
`Free storage: ${compactBytes(coll.free_storage_size)}`,
141-
},
142-
{
143-
label: 'Uncompressed data',
144-
value:
145-
coll.document_size !== undefined
146-
? compactBytes(coll.document_size)
147-
: 'N/A',
148134
hint:
149135
coll.document_size !== undefined &&
150-
'Uncompressed Data Size: Total size of the uncompressed data held in this collection.',
136+
`Uncompressed data size: ${compactBytes(
137+
coll.document_size
138+
)}`,
151139
},
152140
]
153141
: [
154142
{
155-
label: 'Storage',
143+
label: 'Storage size',
156144
value:
157145
coll.calculated_storage_size !== undefined
158146
? compactBytes(coll.calculated_storage_size)
159147
: 'N/A',
160-
hint:
161-
coll.calculated_storage_size !== undefined &&
162-
'Storage Data: Disk space allocated to this collection for document storage.',
163-
},
164-
{
165-
label: 'Uncompressed data',
166-
value:
167-
coll.document_size !== undefined
168-
? compactBytes(coll.document_size)
169-
: 'N/A',
170148
hint:
171149
coll.document_size !== undefined &&
172-
'Uncompressed Data Size: Total size of the uncompressed data held in this collection.',
150+
`Uncompressed data size: ${compactBytes(
151+
coll.document_size
152+
)}`,
173153
},
174154
{
175155
label: 'Documents',

‎packages/databases-collections-list/src/databases.tsx‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,29 +74,15 @@ const DatabasesList: React.FunctionComponent<{
7474
inferredFromPrivileges={db.inferred_from_privileges}
7575
data={[
7676
{
77-
label: 'Storage',
77+
label: 'Storage size',
7878
value:
79-
enableDbAndCollStats &&
80-
db.calculated_storage_size !== undefined
81-
? compactBytes(db.calculated_storage_size)
82-
: 'N/A',
83-
hint:
84-
enableDbAndCollStats &&
85-
db.storage_size !== undefined &&
86-
db.free_storage_size !== undefined &&
87-
'Storage Data: Disk space allocated to all collections in the database for document storage.\n' +
88-
`Total storage: ${compactBytes(db.storage_size)}\n` +
89-
`Free storage: ${compactBytes(db.free_storage_size)}`,
90-
},
91-
{
92-
label: 'Uncompressed data',
93-
value:
94-
enableDbAndCollStats && db.data_size !== undefined
95-
? compactBytes(db.data_size)
79+
enableDbAndCollStats && db.storage_size !== undefined
80+
? compactBytes(db.storage_size)
9681
: 'N/A',
9782
hint:
9883
enableDbAndCollStats &&
99-
'Uncompressed Data Size: Total size of the uncompressed data held in the database.',
84+
db.data_size !== undefined &&
85+
`Uncompressed data size: ${compactBytes(db.data_size)}`,
10086
},
10187
{
10288
label: 'Collections',

‎packages/databases-collections-list/src/index.spec.tsx‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,11 @@ function createDatabase(name: string): DatabaseProps {
3030
inferred_from_privileges: false,
3131
// dbStats
3232
document_count: 10,
33-
storage_size: 2500,
34-
free_storage_size: 1000,
33+
storage_size: 1500,
3534
data_size: 1000,
3635
index_count: 25,
3736
index_size: 100,
38-
calculated_storage_size: undefined,
3937
};
40-
41-
if (db.storage_size !== undefined && db.free_storage_size !== undefined) {
42-
db.calculated_storage_size = db.storage_size - db.free_storage_size;
43-
}
44-
4538
return db;
4639
}
4740

@@ -174,10 +167,8 @@ describe('databases and collections list', function () {
174167
expect(screen.getAllByTestId('database-grid-item')).to.have.lengthOf(1);
175168
expect(screen.getByText('foo')).to.exist;
176169

177-
expect(screen.getByText(/Storage/)).to.exist;
170+
expect(screen.getByText(/Storage size/)).to.exist;
178171
expect(screen.getByText('1.50 kB')).to.exist;
179-
expect(screen.getByText(/Uncompressed data/)).to.exist;
180-
expect(screen.getByText('1.00 kB')).to.exist;
181172
expect(screen.getByText(/Collections/)).to.exist;
182173
expect(screen.getByText('35')).to.exist;
183174
expect(screen.getByText(/Indexes/)).to.exist;
@@ -281,7 +272,7 @@ describe('databases and collections list', function () {
281272
]);
282273
});
283274

284-
it('should not display statistics (except storage and uncompressed data size) on timeseries collection card', function () {
275+
it('should not display statistics (except storage size) on timeseries collection card', function () {
285276
renderCollectionsList({
286277
namespace: 'db',
287278
collections: colls,
@@ -292,8 +283,7 @@ describe('databases and collections list', function () {
292283
.getByText('bat.bat')
293284
.closest('[data-testid="collection-grid-item"]');
294285
expect(timeseriesCard).to.exist;
295-
expect(timeseriesCard).to.contain.text('Storage:');
296-
expect(timeseriesCard).to.contain.text('Uncompressed data:');
286+
expect(timeseriesCard).to.contain.text('Storage size:');
297287
expect(timeseriesCard).to.not.contain.text('Documents:');
298288
expect(timeseriesCard).to.not.contain.text('Avg. document size::');
299289
expect(timeseriesCard).to.not.contain.text('Indexes:');
@@ -311,10 +301,8 @@ describe('databases and collections list', function () {
311301
onCollectionClick: () => {},
312302
});
313303

314-
expect(screen.getByText(/Storage/)).to.exist;
304+
expect(screen.getByText(/Storage size/)).to.exist;
315305
expect(screen.getByText('1.50 kB')).to.exist;
316-
expect(screen.getByText(/Uncompressed data/)).to.exist;
317-
expect(screen.getByText('11.00 B')).to.exist;
318306
expect(screen.getByText(/Documents/)).to.exist;
319307
expect(screen.getByText('10')).to.exist;
320308
expect(screen.getByText(/Avg. document size/)).to.exist;

0 commit comments

Comments
 (0)