From e928a6838cf78900ea28eb7bcfbf57c3c58fe033 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Sun, 15 Jan 2023 11:46:48 +0000 Subject: remove whitespace at end of lines --- vespalib/src/vespa/vespalib/btree/btreeaggregator.h | 2 +- vespalib/src/vespa/vespalib/btree/btreeinserter.h | 2 +- vespalib/src/vespa/vespalib/btree/btreeiterator.h | 20 ++++++++++---------- .../src/vespa/vespalib/btree/btreenodeallocator.h | 2 +- vespalib/src/vespa/vespalib/btree/btreenodestore.h | 2 +- vespalib/src/vespa/vespalib/btree/btreeremover.h | 4 ++-- vespalib/src/vespa/vespalib/btree/btreerootbase.h | 2 +- vespalib/src/vespa/vespalib/btree/btreestore.h | 6 +++--- vespalib/src/vespa/vespalib/btree/minmaxaggregated.h | 2 +- .../src/vespa/vespalib/coro/async_crypto_socket.h | 2 +- vespalib/src/vespa/vespalib/coro/async_io.h | 6 +++--- vespalib/src/vespa/vespalib/coro/generator.h | 6 +++--- .../src/vespa/vespalib/data/slime/external_memory.h | 2 +- vespalib/src/vespa/vespalib/data/smart_buffer.h | 2 +- .../unique_store_btree_dictionary_read_snapshot.h | 2 +- .../vespalib/datastore/unique_store_comparator.h | 4 ++-- .../datastore/unique_store_string_allocator.h | 2 +- .../vespalib/datastore/unique_store_value_filter.h | 2 +- vespalib/src/vespa/vespalib/geo/zcurve.h | 6 +++--- vespalib/src/vespa/vespalib/net/selector.h | 4 ++-- vespalib/src/vespa/vespalib/stllike/hashtable.h | 2 +- .../src/vespa/vespalib/test/datastore/buffer_stats.h | 4 ++-- vespalib/src/vespa/vespalib/util/benchmark_timer.h | 6 +++--- .../vespa/vespalib/util/binary_hamming_distance.h | 2 +- vespalib/src/vespa/vespalib/util/exceptions.h | 2 +- .../src/vespa/vespalib/util/mmap_file_allocator.h | 2 +- .../vespalib/util/mmap_file_allocator_factory.h | 2 +- vespalib/src/vespa/vespalib/util/thread_bundle.h | 2 +- 28 files changed, 51 insertions(+), 51 deletions(-) (limited to 'vespalib') diff --git a/vespalib/src/vespa/vespalib/btree/btreeaggregator.h b/vespalib/src/vespa/vespalib/btree/btreeaggregator.h index 8a15d1ca34f..13109f5ffae 100644 --- a/vespalib/src/vespa/vespalib/btree/btreeaggregator.h +++ b/vespalib/src/vespa/vespalib/btree/btreeaggregator.h @@ -34,7 +34,7 @@ public: static void recalc(InternalNodeType &node, const NodeAllocatorType &allocator, const AggrCalcT &aggrCalc); static AggregatedType recalc(LeafNodeType &node, LeafNodeType &splitNode, const AggrCalcT &aggrCalc); - + static AggregatedType recalc(InternalNodeType &node, InternalNodeType &splitNode, const NodeAllocatorType &allocator, const AggrCalcT &aggrCalc); }; diff --git a/vespalib/src/vespa/vespalib/btree/btreeinserter.h b/vespalib/src/vespa/vespalib/btree/btreeinserter.h index 2a4985b04b8..947213ab7e6 100644 --- a/vespalib/src/vespa/vespalib/btree/btreeinserter.h +++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.h @@ -8,7 +8,7 @@ #include "btreeaggregator.h" #include "noaggrcalc.h" #include "minmaxaggrcalc.h" -#include "btreeiterator.h" +#include "btreeiterator.h" namespace vespalib::btree { diff --git a/vespalib/src/vespa/vespalib/btree/btreeiterator.h b/vespalib/src/vespa/vespalib/btree/btreeiterator.h index 15061a536ef..4b99edf592a 100644 --- a/vespalib/src/vespa/vespalib/btree/btreeiterator.h +++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.h @@ -297,7 +297,7 @@ protected: BTreeIteratorBase(const BTreeIteratorBase &other); BTreeIteratorBase &operator=(const BTreeIteratorBase &other); - + /** * Set new tree height and clear portions of path that are now * beyond new tree height. For internal use only. @@ -414,7 +414,7 @@ public: size_t size() const; - + /** * Return the current position in the tree. */ @@ -485,7 +485,7 @@ public: rbegin(); /* - * Get aggregated values for the current tree. + * Get aggregated values for the current tree. */ const AggrT & getAggregated() const; @@ -697,7 +697,7 @@ public: * Step iterator forwards until it is at a position with a key * that is greater than or equal to the key argument. Original * position must be valid with a key that is less than the key argument. - * + * * Tree traits determine if binary or linear search is performed within * each tree node. * @@ -711,7 +711,7 @@ public: * Step iterator forwards until it is at a position with a key * that is greater than or equal to the key argument. Original * position must be valid with a key that is less than the key argument. - * + * * Binary search is performed within each tree node. * * @param key Key to search for @@ -724,7 +724,7 @@ public: * Step iterator forwards until it is at a position with a key * that is greater than or equal to the key argument. Original * position must be valid with a key that is less than the key argument. - * + * * Linear search is performed within each tree node. * * @param key Key to search for @@ -737,7 +737,7 @@ public: * Step iterator forwards until it is at a position with a key * that is greater than the key argument. Original position must * be valid with a key that is less than or equal to the key argument. - * + * * Tree traits determine if binary or linear search is performed within * each tree node. * @@ -751,7 +751,7 @@ public: * Step iterator forwards until it is at a position with a key * that is greater than the key argument. Original position must * be valid with a key that is less than or equal to the key argument. - * + * * Binary search is performed within each tree node. * * @param key Key to search for @@ -764,7 +764,7 @@ public: * Step iterator forwards until it is at a position with a key * that is greater than the key argument. Original position must * be valid with a key that is less than or equal to the key argument. - * + * * Linear search is performed within each tree node. * * @param key Key to search for @@ -868,7 +868,7 @@ public: { return const_cast(*_allocator); } - + BTreeNode::Ref moveFirstLeafNode(BTreeNode::Ref rootRef); diff --git a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h index 38739f03798..3fa5f1188cd 100644 --- a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h +++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h @@ -42,7 +42,7 @@ private: using RefVector = vespalib::Array; using BTreeRootBaseTypeVector = vespalib::Array; - + // Nodes that might not be frozen. RefVector _internalToFreeze; RefVector _leafToFreeze; diff --git a/vespalib/src/vespa/vespalib/btree/btreenodestore.h b/vespalib/src/vespa/vespalib/btree/btreenodestore.h index 3b37be33924..8fef0185674 100644 --- a/vespalib/src/vespa/vespalib/btree/btreenodestore.h +++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.h @@ -189,7 +189,7 @@ public: bool has_held_buffers() const { return _store.has_held_buffers(); } - + template void foreach_key(EntryRef ref, FunctionType func) const { if (!ref.valid()) diff --git a/vespalib/src/vespa/vespalib/btree/btreeremover.h b/vespalib/src/vespa/vespalib/btree/btreeremover.h index 33ecc0be88b..852a8aa2104 100644 --- a/vespalib/src/vespa/vespalib/btree/btreeremover.h +++ b/vespalib/src/vespa/vespalib/btree/btreeremover.h @@ -8,7 +8,7 @@ #include "btreeaggregator.h" #include "noaggrcalc.h" #include "minmaxaggrcalc.h" -#include "btreeiterator.h" +#include "btreeiterator.h" namespace vespalib::btree { @@ -56,7 +56,7 @@ class BTreeRemover : public BTreeRemoverBase - + { public: using ParentType = BTreeRemoverBase::max()), diff --git a/vespalib/src/vespa/vespalib/coro/async_crypto_socket.h b/vespalib/src/vespa/vespalib/coro/async_crypto_socket.h index 2fcf4efe9b4..7d792994a80 100644 --- a/vespalib/src/vespa/vespalib/coro/async_crypto_socket.h +++ b/vespalib/src/vespa/vespalib/coro/async_crypto_socket.h @@ -21,7 +21,7 @@ struct AsyncCryptoSocket { virtual Lazy read(char *buf, size_t len) = 0; virtual Lazy write(const char *buf, size_t len) = 0; virtual ~AsyncCryptoSocket(); - + static Lazy accept(AsyncIo &async, CryptoEngine &crypto, SocketHandle handle); static Lazy connect(AsyncIo &async, CryptoEngine &crypto, diff --git a/vespalib/src/vespa/vespalib/coro/async_io.h b/vespalib/src/vespa/vespalib/coro/async_io.h index 72e2ef3a312..56d2aae7fdf 100644 --- a/vespalib/src/vespa/vespalib/coro/async_io.h +++ b/vespalib/src/vespa/vespalib/coro/async_io.h @@ -25,7 +25,7 @@ struct AsyncIo : std::enable_shared_from_this { AsyncIo &operator=(AsyncIo &&) = delete; virtual ~AsyncIo(); using SP = std::shared_ptr; - + // thin wrapper used by the owner to handle lifetime class Owner { private: @@ -44,13 +44,13 @@ struct AsyncIo : std::enable_shared_from_this { void fini_shutdown(); ~Owner(); }; - + // create an async_io 'runtime' static Owner create(); // implementation tag virtual vespalib::string get_impl_spec() = 0; - + // api for async io used by coroutines virtual Lazy accept(ServerSocket &server_socket) = 0; virtual Lazy connect(const SocketAddress &addr) = 0; diff --git a/vespalib/src/vespa/vespalib/coro/generator.h b/vespalib/src/vespa/vespalib/coro/generator.h index 1f1468d1d19..a28cba47e53 100644 --- a/vespalib/src/vespa/vespalib/coro/generator.h +++ b/vespalib/src/vespa/vespalib/coro/generator.h @@ -53,7 +53,7 @@ public: copy_awaiter(const copy_awaiter&) = delete; cpy_type value_cpy; }; - + public: promise_type(promise_type &&) = delete; promise_type(const promise_type &) = delete; @@ -105,10 +105,10 @@ public: return _handle.promise().result(); } }; - + private: Handle _handle; - + public: Generator(const Generator &) = delete; Generator &operator=(const Generator &) = delete; diff --git a/vespalib/src/vespa/vespalib/data/slime/external_memory.h b/vespalib/src/vespa/vespalib/data/slime/external_memory.h index 1a7dd85d15b..25b5c2765d7 100644 --- a/vespalib/src/vespa/vespalib/data/slime/external_memory.h +++ b/vespalib/src/vespa/vespalib/data/slime/external_memory.h @@ -15,7 +15,7 @@ namespace vespalib::slime { **/ struct ExternalMemory { using UP = std::unique_ptr; - virtual Memory get() const = 0; + virtual Memory get() const = 0; virtual ~ExternalMemory() = default; }; diff --git a/vespalib/src/vespa/vespalib/data/smart_buffer.h b/vespalib/src/vespa/vespalib/data/smart_buffer.h index fc7042c5eea..5266e0f1c75 100644 --- a/vespalib/src/vespa/vespalib/data/smart_buffer.h +++ b/vespalib/src/vespa/vespalib/data/smart_buffer.h @@ -22,7 +22,7 @@ private: size_t _write_pos; const char *read_ptr() const { return (const char *)(_data.get()) + _read_pos; } - size_t read_len() const { return (_write_pos - _read_pos); } + size_t read_len() const { return (_write_pos - _read_pos); } char *write_ptr() { return (char *)(_data.get()) + _write_pos; } size_t write_len() const { return (_data.size() - _write_pos); } size_t unused() const { return (_data.size() - read_len()); } diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_btree_dictionary_read_snapshot.h b/vespalib/src/vespa/vespalib/datastore/unique_store_btree_dictionary_read_snapshot.h index b38c49ccab4..fc91c6fa292 100644 --- a/vespalib/src/vespa/vespalib/datastore/unique_store_btree_dictionary_read_snapshot.h +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_btree_dictionary_read_snapshot.h @@ -17,7 +17,7 @@ private: using BTreeDictionaryType = BTreeDictionaryT; using FrozenView = typename BTreeDictionaryType::FrozenView; FrozenView _frozen_view; - + public: UniqueStoreBTreeDictionaryReadSnapshot(FrozenView frozen_view); void fill() override; diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_comparator.h b/vespalib/src/vespa/vespalib/datastore/unique_store_comparator.h index f91ebf64257..fa0e5630b74 100644 --- a/vespalib/src/vespa/vespalib/datastore/unique_store_comparator.h +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_comparator.h @@ -11,7 +11,7 @@ namespace vespalib::datastore { /** - * Helper class for comparing elements in unique store. + * Helper class for comparing elements in unique store. */ template class UniqueStoreComparatorHelper { @@ -81,7 +81,7 @@ class UniqueStoreComparatorHelper : public UniqueStoreFloatingPointCompar template <> class UniqueStoreComparatorHelper : public UniqueStoreFloatingPointComparatorHelper { }; - + /** * Compare two entries based on entry refs. * diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.h b/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.h index 8977fd1cce8..265478fbaf5 100644 --- a/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.h +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.h @@ -36,7 +36,7 @@ public: : UniqueStoreEntryBase(), _value() { } - + UniqueStoreSmallStringEntry(const char *value, size_t value_len, size_t array_size) : UniqueStoreEntryBase() { diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_value_filter.h b/vespalib/src/vespa/vespalib/datastore/unique_store_value_filter.h index 28c7a5ff001..5b4c078ab48 100644 --- a/vespalib/src/vespa/vespalib/datastore/unique_store_value_filter.h +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_value_filter.h @@ -30,7 +30,7 @@ public: }; template -const EntryT UniqueStoreFloatingPointValueFilter::normalized_nan = -std::numeric_limits::quiet_NaN(); +const EntryT UniqueStoreFloatingPointValueFilter::normalized_nan = -std::numeric_limits::quiet_NaN(); /* * Specialized helper class for normalizing float values inserted into unique store. diff --git a/vespalib/src/vespa/vespalib/geo/zcurve.h b/vespalib/src/vespa/vespalib/geo/zcurve.h index 2efcc50d1ed..2f92b3a019b 100644 --- a/vespalib/src/vespa/vespalib/geo/zcurve.h +++ b/vespalib/src/vespa/vespalib/geo/zcurve.h @@ -32,9 +32,9 @@ public: ~BoundingBox() = default; - int64_t getzMinx() const { return _zMinx; } - int64_t getzMaxx() const { return _zMaxx; } - int64_t getzMiny() const { return _zMiny; } + int64_t getzMinx() const { return _zMinx; } + int64_t getzMaxx() const { return _zMaxx; } + int64_t getzMiny() const { return _zMiny; } int64_t getzMaxy() const { return _zMaxy; } /** diff --git a/vespalib/src/vespa/vespalib/net/selector.h b/vespalib/src/vespa/vespalib/net/selector.h index 9b278189215..6b40053abe1 100644 --- a/vespalib/src/vespa/vespalib/net/selector.h +++ b/vespalib/src/vespa/vespalib/net/selector.h @@ -13,7 +13,7 @@ namespace vespalib { /** - * Simple class used to hold events extracted from a call to epoll_wait. + * Simple class used to hold events extracted from a call to epoll_wait. **/ class EpollEvents { @@ -44,7 +44,7 @@ public: Selector() : _epoll(), _wakeup_pipe(), _events(4096) { - _epoll.add(_wakeup_pipe.get_read_fd(), nullptr, true, false); + _epoll.add(_wakeup_pipe.get_read_fd(), nullptr, true, false); } ~Selector() { _epoll.remove(_wakeup_pipe.get_read_fd()); diff --git a/vespalib/src/vespa/vespalib/stllike/hashtable.h b/vespalib/src/vespa/vespalib/stllike/hashtable.h index 55b055cddaf..4dbb138f63d 100644 --- a/vespalib/src/vespa/vespalib/stllike/hashtable.h +++ b/vespalib/src/vespa/vespalib/stllike/hashtable.h @@ -306,7 +306,7 @@ public: // This will insert unconditionally, without checking presence, and might cause duplicates. // Use at you own risk. void force_insert(Value && value); - + /// This gives faster iteration than can be achieved by the iterators. template void for_each(Func func) const; diff --git a/vespalib/src/vespa/vespalib/test/datastore/buffer_stats.h b/vespalib/src/vespa/vespalib/test/datastore/buffer_stats.h index 110d2354bd5..9fe77a853a8 100644 --- a/vespalib/src/vespa/vespalib/test/datastore/buffer_stats.h +++ b/vespalib/src/vespa/vespalib/test/datastore/buffer_stats.h @@ -12,7 +12,7 @@ namespace vespalib::datastore::test { */ struct BufferStats { - // elements + // elements size_t _used; size_t _hold; size_t _dead; @@ -25,7 +25,7 @@ struct BufferStats BufferStats &dead(size_t val) { _dead += val; return *this; } BufferStats &extra_used(size_t val) { _extra_used += val; return *this; } BufferStats &extra_hold(size_t val) { _extra_hold += val; return *this; } - + BufferStats &hold_to_dead(size_t val) { dec_hold(val); _dead += val; diff --git a/vespalib/src/vespa/vespalib/util/benchmark_timer.h b/vespalib/src/vespa/vespalib/util/benchmark_timer.h index d91d58069fa..b49b03a7787 100644 --- a/vespalib/src/vespa/vespalib/util/benchmark_timer.h +++ b/vespalib/src/vespa/vespalib/util/benchmark_timer.h @@ -81,7 +81,7 @@ private: for (size_t i = 0; i < 3; ++i) { timer.before(); loop.perform(loop_cnt); - timer.after(); + timer.after(); } if (timer.min_time() > 0.010) { return loop_cnt; @@ -89,12 +89,12 @@ private: } } - static double do_benchmark(const Loop &loop, size_t loop_cnt, double budget) { + static double do_benchmark(const Loop &loop, size_t loop_cnt, double budget) { vespalib::BenchmarkTimer timer(budget); while (timer.has_budget()) { timer.before(); loop.perform(loop_cnt); - timer.after(); + timer.after(); } return (timer.min_time() / double(loop_cnt)); } diff --git a/vespalib/src/vespa/vespalib/util/binary_hamming_distance.h b/vespalib/src/vespa/vespalib/util/binary_hamming_distance.h index ce8c8dacdf9..89e8e58ca1c 100644 --- a/vespalib/src/vespa/vespalib/util/binary_hamming_distance.h +++ b/vespalib/src/vespa/vespalib/util/binary_hamming_distance.h @@ -4,7 +4,7 @@ namespace vespalib { /** * Compute Hamming distance between two binary blobs - * + * * @param lhs a blob (to interpret as a bitvector with sz*8 bits) * @param rhs a blob (to interpret as a bitvector with sz*8 bits) * @param sz number of bytes in each blob diff --git a/vespalib/src/vespa/vespalib/util/exceptions.h b/vespalib/src/vespa/vespalib/util/exceptions.h index 8c470d25a5b..5d880ccf0ac 100644 --- a/vespalib/src/vespa/vespalib/util/exceptions.h +++ b/vespalib/src/vespa/vespalib/util/exceptions.h @@ -157,7 +157,7 @@ private: /** * NOTE: This function must only be called from within a catch block, * and the parameter must reference the caught exception. - * + * * Based on the run-time type of the exception, determine if it is * safe to handle this exception and continue normal program * operation. If the exception is considered safe, no additional diff --git a/vespalib/src/vespa/vespalib/util/mmap_file_allocator.h b/vespalib/src/vespa/vespalib/util/mmap_file_allocator.h index 0a83bfb4e60..9d6eb096162 100644 --- a/vespalib/src/vespa/vespalib/util/mmap_file_allocator.h +++ b/vespalib/src/vespa/vespalib/util/mmap_file_allocator.h @@ -42,7 +42,7 @@ public: PtrAndSize alloc(size_t sz) const override; void free(PtrAndSize alloc) const override; size_t resize_inplace(PtrAndSize, size_t) const override; - + // For unit test size_t get_end_offset() const noexcept { return _end_offset; } }; diff --git a/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h b/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h index ffa2b0929ca..3f4180fc7b9 100644 --- a/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h +++ b/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h @@ -24,7 +24,7 @@ class MmapFileAllocatorFactory { public: void setup(const vespalib::string &dir_name); std::unique_ptr make_memory_allocator(const vespalib::string& name); - + static MmapFileAllocatorFactory& instance(); }; diff --git a/vespalib/src/vespa/vespalib/util/thread_bundle.h b/vespalib/src/vespa/vespalib/util/thread_bundle.h index 252e8976544..1a78b82c1f3 100644 --- a/vespalib/src/vespa/vespalib/util/thread_bundle.h +++ b/vespalib/src/vespa/vespalib/util/thread_bundle.h @@ -68,7 +68,7 @@ struct ThreadBundle { // a thread bundle that can only run things in the current thread. static ThreadBundle &trivial(); - + private: Runnable *resolve(Runnable *target) { return target; } Runnable *resolve(Runnable &target) { return ⌖ } -- cgit v1.2.3