From 1ccc4e3f0edd1a0b6cdd1af7d18b8cc814af5d39 Mon Sep 17 00:00:00 2001 From: Bo Du Date: Tue, 24 Nov 2020 00:10:31 -0500 Subject: [PATCH 1/2] Update type name. --- src/dbnode/persist/types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dbnode/persist/types.go b/src/dbnode/persist/types.go index 052161d0fc..0002a8f0a6 100644 --- a/src/dbnode/persist/types.go +++ b/src/dbnode/persist/types.go @@ -327,9 +327,9 @@ const ( // SeriesMetadataLifeTimeLong means the underlying memory's life time is long lived and exceeds // the execution duration of the series metadata receiver. SeriesMetadataLifeTimeLong SeriesMetadataLifeTime = iota - // SeriesMetadataLifeTimeShortLived means that the underlying memory is only valid for the duration + // SeriesMetadataLifeTimeShort means that the underlying memory is only valid for the duration // of the OnFlushNewSeries call. Must clone the underlying bytes in order to extend the life time. - SeriesMetadataLifeTimeShortLived + SeriesMetadataLifeTimeShort ) // SeriesMetadataType describes the type of series metadata. From 731bf24c7f3a0ec588b9c6eca288392d3c3a3003 Mon Sep 17 00:00:00 2001 From: Bo Du Date: Tue, 24 Nov 2020 00:19:17 -0500 Subject: [PATCH 2/2] Update names. --- src/dbnode/persist/fs/merger.go | 2 +- src/dbnode/persist/types.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dbnode/persist/fs/merger.go b/src/dbnode/persist/fs/merger.go index c014af9753..a6e78dc496 100644 --- a/src/dbnode/persist/fs/merger.go +++ b/src/dbnode/persist/fs/merger.go @@ -256,7 +256,7 @@ func (m *merger) Merge( Type: persist.SeriesDocumentType, Document: seriesMetadata, // The lifetime of the shard series metadata is longly lived. - LifeTime: persist.SeriesMetadataLifeTimeLong, + LifeTime: persist.SeriesLifeTimeLong, }, }) } diff --git a/src/dbnode/persist/types.go b/src/dbnode/persist/types.go index 0002a8f0a6..c01b4aa8ca 100644 --- a/src/dbnode/persist/types.go +++ b/src/dbnode/persist/types.go @@ -324,12 +324,12 @@ const ( type SeriesMetadataLifeTime uint8 const ( - // SeriesMetadataLifeTimeLong means the underlying memory's life time is long lived and exceeds + // SeriesLifeTimeLong means the underlying memory's life time is long lived and exceeds // the execution duration of the series metadata receiver. - SeriesMetadataLifeTimeLong SeriesMetadataLifeTime = iota - // SeriesMetadataLifeTimeShort means that the underlying memory is only valid for the duration + SeriesLifeTimeLong SeriesMetadataLifeTime = iota + // SeriesLifeTimeShort means that the underlying memory is only valid for the duration // of the OnFlushNewSeries call. Must clone the underlying bytes in order to extend the life time. - SeriesMetadataLifeTimeShort + SeriesLifeTimeShort ) // SeriesMetadataType describes the type of series metadata.