Skip to content

api: add SqlInfoKey and Iterator enumerations #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package iproto
//go:generate stringer -type=Error
//go:generate stringer -type=Feature
//go:generate stringer -type=Flag
//go:generate stringer -type=Iterator
//go:generate stringer -type=Type
//go:generate stringer -type=Key,MetadataKey,BallotKey,RaftKey -output=keys_string.go
//go:generate stringer -type=Key,MetadataKey,BallotKey,RaftKey,SqlInfoKey -output=keys_string.go
//go:generate goimports -w .
34 changes: 34 additions & 0 deletions generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@ cd ..

SRC_CONST=${TT_DIR}/src/box/iproto_constants.h
SRC_ERRORS=${TT_DIR}/src/box/errcode.h
SRC_EXECUTE=${TT_DIR}/src/box/execute.h
SRC_FEATURES=${TT_DIR}/src/box/iproto_features.h
SRC_ITERATORS=${TT_DIR}/src/box/iterator_type.h
DST_DOC=doc.go
DST_ERRORS=error.go
DST_ERRORS_TEST=error_test.go
DST_FEATURES=feature.go
DST_FEATURES_TEST=feature_test.go
DST_FLAGS=flag.go
DST_FLAGS_TEST=flag_test.go
DST_ITERATORS=iterator.go
DST_ITERATORS_TEST=iterator_test.go
DST_TYPES=type.go
DST_TYPES_TEST=type_test.go
DST_KEYS=keys.go
Expand Down Expand Up @@ -235,6 +239,24 @@ echo "${FOOTER_TEST}" > ${DST_FLAGS_TEST}
grep -PB 1 "[\t ]*IPROTO_FLAG_[A-Z_]+ =" ${SRC_CONST} | \
generate_test Flag >> ${DST_FLAGS_TEST}

#
# Iterators.
#

echo "${FOOTER}" > ${DST_ITERATORS}
cat << EOF >> ${DST_ITERATORS}
// IPROTO iterators constants, generated from
// ${SRC_ITERATORS}
EOF

read_enum iterator_type ${SRC_ITERATORS} | \
generate_enum Iterator >> ${DST_ITERATORS}

echo "${FOOTER_TEST}" > ${DST_ITERATORS_TEST}

read_enum iterator_type ${SRC_ITERATORS} | \
generate_test Iterator >> ${DST_ITERATORS_TEST}

#
# Types.
#
Expand Down Expand Up @@ -293,6 +315,15 @@ EOF
read_enum iproto_raft_keys ${SRC_CONST} | \
generate_enum RaftKey >> ${DST_KEYS}

cat << EOF >> ${DST_KEYS}

// IPROTO SQL info key constants, generated from
// ${SRC_EXECUTE}
EOF

read_enum sql_info_key ${SRC_EXECUTE} | \
generate_enum SqlInfoKey >> ${DST_KEYS}

echo "${FOOTER_TEST}" > ${DST_KEYS_TEST}

read_enum iproto_key ${SRC_CONST} | \
Expand All @@ -307,6 +338,9 @@ read_enum iproto_ballot_key ${SRC_CONST} | \
read_enum iproto_raft_keys ${SRC_CONST} | \
generate_test RaftKey >> ${DST_KEYS_TEST}

read_enum sql_info_key ${SRC_EXECUTE} | \
generate_test SqlInfoKey >> ${DST_KEYS_TEST}

#
# Cleanup.
#
Expand Down
23 changes: 23 additions & 0 deletions iterator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions iterator_string.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions iterator_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions keys.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion keys_string.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions keys_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.