hyperledger-labs / fabric-smart-client / 36695387394

91%

Build Type

push

github

Committed by web-flow

Commit Message

refactor!: consolidate composite key helpers in pkg/utils/compose (#1958)

Composite key creation, range keys, splitting and attribute validation
were implemented five times in production code (compose, kvs,
services/rwset, core/generic/rwset, services/state) and three more times
in test helpers. The copies had drifted:

- services/rwset.CreateRangeKeysForPartialCompositeKey built its end key
  with fmt.Sprint(utf8.MaxRune), which appends the text "1114111"
  instead of U+10FFFF. A range scan over that range misses every key
  whose next byte sorts after '1', letters included.
- The SQL TTestCompositeKeys helpers (view and fabric) used
  fmt.Sprint(0), i.e. "0", as the separator, so they never stored or
  scanned real composite keys.

pkg/utils/compose now holds the only implementation and gains
CreateRangeKeysForPartialCompositeKey, SplitCompositeKey and
IsCompositeKey. kvs and services/rwset keep their exported functions as
one-line calls into compose. services/rwset.SplitCompositeKey keeps its
lenient contract (a plain key comes back unchanged, with no attributes)
because state certification and field-mapping keys depend on it; a key
without the composite namespace prefix is now always treated as plain.

The test helpers use compose directly. TTestCompositeKeys also stores a
key outside the scanned prefix and asserts it is excluded. In the kvs
tests, scanIterator duplicated resultIterator and is removed, and
mockIterator is replaced by iterators.Slice.

BREAKING CHANGE: the composite key functions in
platform/fabric/core/generic/rwset (CreateCompositeKey,
CreateRangeKeysForPartialCompositeKey, SplitCompositeKey) and in
platform/fabric/services/state (CreateCompositeKey,
CreateRangeKeysForPartialCompositeKey, MaxUnicodeRuneValue) are removed.
Use platform/fabric/services/rwset or pkg/utils/compose instead.

Fixes #1957

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Coverage Stats

36 of 37 new or added lines in 6 files covered. (97.3%)

12 existing lines in 5 files now uncovered.

28463 of 32130 relevant lines covered (88.59%)

2350.48 hits per line