diff --git a/scripts/format_files.sh b/scripts/format_files.sh index f2efa90889c524b9609f4db4f1664acc50cc94f4..5571297bf22243fc33a67f6a3f210529b8123087 100755 --- a/scripts/format_files.sh +++ b/scripts/format_files.sh @@ -9,11 +9,14 @@ sds=./src/shell/sds if [ $# -eq 0 ]; then echo "formating all .h/.cpp files in $root_dir ..." - find . -type f -not \( -wholename "$linenoise/*" -o -wholename "$sds/*" -o -wholename "./rocksdb/*" \) -regextype posix-egrep -regex ".*\.(cpp|h)" | xargs clang-format -i -style=file + find . -type f -not \( -wholename "$linenoise/*" -o -wholename "$sds/*" -o -wholename "./rocksdb/*" -o -wholename "./rdsn/*" \) \ + -regextype posix-egrep -regex ".*\.(cpp|h)" | xargs clang-format -i -style=file elif [ $1 = "-h" ]; then echo "USAGE: ./format-files.sh [] -- format .h/.cpp files in $root_dir/relative_path" echo " ./format-files.sh means format all .h/.cpp files in $root_dir" else echo "formating all .h/.cpp files in $root_dir/$1 ..." - find ./$1 -type f -not \( -wholename "$linenoise/*" -o -wholename "$sds/*" -o -wholename "./rocksdb/*" \) -regextype posix-egrep -regex ".*\.(cpp|h)" | xargs clang-format -i -style=file + find ./$1 -type f -not \( -wholename "$linenoise/*" -o -wholename "$sds/*" -o -wholename "./rocksdb/*" -o -wholename "./rdsn/*" \) \ + -regextype posix-egrep -regex ".*\.(cpp|h)" | xargs clang-format -i -style=file fi + diff --git a/src/server/key_ttl_compaction_filter.h b/src/server/key_ttl_compaction_filter.h index d7e6373fc9e6b5a4c7a71ae7f0610633be383381..83aa4ae534bb513127320f15522229fc4e25ab09 100644 --- a/src/server/key_ttl_compaction_filter.h +++ b/src/server/key_ttl_compaction_filter.h @@ -38,7 +38,8 @@ public: if (_default_ttl != 0 && expire_ts == 0) { // should update ttl *new_value = existing_value.ToString(); - pegasus_update_expire_ts(_value_schema_version, *new_value, utils::epoch_now() + _default_ttl); + pegasus_update_expire_ts( + _value_schema_version, *new_value, utils::epoch_now() + _default_ttl); *value_changed = true; return false; } diff --git a/src/server/pegasus_server_write.cpp b/src/server/pegasus_server_write.cpp index 52b58189867680829515e916cd940f6cbb6bc14e..be398e8b278936da7705bf6d4e3cdf7567e21f15 100644 --- a/src/server/pegasus_server_write.cpp +++ b/src/server/pegasus_server_write.cpp @@ -63,10 +63,7 @@ int pegasus_server_write::on_batched_write_requests(dsn::message_ex **requests, return on_batched_writes(requests, count); } -void pegasus_server_write::set_default_ttl(uint32_t ttl) -{ - _write_svc->set_default_ttl(ttl); -} +void pegasus_server_write::set_default_ttl(uint32_t ttl) { _write_svc->set_default_ttl(ttl); } int pegasus_server_write::on_batched_writes(dsn::message_ex **requests, int count) { diff --git a/src/server/pegasus_write_service.cpp b/src/server/pegasus_write_service.cpp index 75bd0490c06e2e3d5eb3b6e76951ed8333feb253..283a8852c97fe9987517c02f9ca1d99efe3019e4 100644 --- a/src/server/pegasus_write_service.cpp +++ b/src/server/pegasus_write_service.cpp @@ -202,10 +202,7 @@ void pegasus_write_service::batch_abort(int64_t decree, int err) clear_up_batch_states(); } -void pegasus_write_service::set_default_ttl(uint32_t ttl) -{ - _impl->set_default_ttl(ttl); -} +void pegasus_write_service::set_default_ttl(uint32_t ttl) { _impl->set_default_ttl(ttl); } void pegasus_write_service::clear_up_batch_states() {