From 91eade02cd0bd79435fcbc7ccbfc4dc0d71cbded Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Mon, 9 Nov 2020 15:29:26 +0300 Subject: [PATCH] [#191] v2/object: Rename `leaf` filter to `phy` Signed-off-by: Alex Vanin --- pkg/object/search.go | 18 +++++++++--------- pkg/object/search_test.go | 12 ++++++------ v2/object/filters.go | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/object/search.go b/pkg/object/search.go index 23eeb2c..2fdcd9e 100644 --- a/pkg/object/search.go +++ b/pkg/object/search.go @@ -70,7 +70,7 @@ const ( fKeyHomomorphicHash fKeyParent fKeyPropRoot - fKeyPropLeaf + fKeyPropPhy fKeyPropChildfree ) @@ -98,8 +98,8 @@ func (k filterKey) String() string { return v2object.FilterHeaderParent case fKeyPropRoot: return v2object.FilterPropertyRoot - case fKeyPropLeaf: - return v2object.FilterPropertyLeaf + case fKeyPropPhy: + return v2object.FilterPropertyPhy case fKeyPropChildfree: return v2object.FilterPropertyChildfree } @@ -211,16 +211,16 @@ func (f *SearchFilters) AddNonRootFilter() { f.addRootFilter(false) } -func (f *SearchFilters) addLeafFilter(val bool) { - f.addReservedFilter(MatchStringEqual, fKeyPropLeaf, boolStringer(val)) +func (f *SearchFilters) addPhyFilter(val bool) { + f.addReservedFilter(MatchStringEqual, fKeyPropPhy, boolStringer(val)) } -func (f *SearchFilters) AddLeafFilter() { - f.addLeafFilter(true) +func (f *SearchFilters) AddPhyFilter() { + f.addPhyFilter(true) } -func (f *SearchFilters) AddNonLeafFilter() { - f.addLeafFilter(false) +func (f *SearchFilters) AddNonPhyFilter() { + f.addPhyFilter(false) } func (f *SearchFilters) addChildFreeFilter(val bool) { diff --git a/pkg/object/search_test.go b/pkg/object/search_test.go index e126b5b..f6caae7 100644 --- a/pkg/object/search_test.go +++ b/pkg/object/search_test.go @@ -81,31 +81,31 @@ func TestSearchFilters_AddNonRootFilter(t *testing.T) { require.Equal(t, v2object.BooleanPropertyValueFalse, f.Value()) } -func TestSearchFilters_AddLeafFilter(t *testing.T) { +func TestSearchFilters_AddPhyFilter(t *testing.T) { fs := new(object.SearchFilters) - fs.AddLeafFilter() + fs.AddPhyFilter() require.Len(t, *fs, 1) f := (*fs)[0] require.Equal(t, object.MatchStringEqual, f.Operation()) - require.Equal(t, v2object.FilterPropertyLeaf, f.Header()) + require.Equal(t, v2object.FilterPropertyPhy, f.Header()) require.Equal(t, v2object.BooleanPropertyValueTrue, f.Value()) } -func TestSearchFilters_AddNonLeafFilter(t *testing.T) { +func TestSearchFilters_AddNonPhyFilter(t *testing.T) { fs := new(object.SearchFilters) - fs.AddNonLeafFilter() + fs.AddNonPhyFilter() require.Len(t, *fs, 1) f := (*fs)[0] require.Equal(t, object.MatchStringEqual, f.Operation()) - require.Equal(t, v2object.FilterPropertyLeaf, f.Header()) + require.Equal(t, v2object.FilterPropertyPhy, f.Header()) require.Equal(t, v2object.BooleanPropertyValueFalse, f.Value()) } diff --git a/v2/object/filters.go b/v2/object/filters.go index a9eecbe..a5f548f 100644 --- a/v2/object/filters.go +++ b/v2/object/filters.go @@ -33,11 +33,11 @@ const ( ) const ( - // FilterPropertyRoot is a filter key to check if an object is a top object in a split hierarchy. + // FilterPropertyRoot is a filter key to check if regular object is on top of split hierarchy. FilterPropertyRoot = ReservedFilterPrefix + "ROOT" - // FilterPropertyLeaf is a filter key to check if an object is a leaf in a split hierarchy. - FilterPropertyLeaf = ReservedFilterPrefix + "LEAF" + // FilterPropertyPhy is a filter key to check if an object physically stored on a node. + FilterPropertyPhy = ReservedFilterPrefix + "PHY" // FilterPropertyChildfree is a filter key to check if an object has empty children list in `Split` header. FilterPropertyChildfree = ReservedFilterPrefix + "CHILDFREE"