LibSQL: Clean up code style and remove unused includes

gmta · trflynn89 · commit a99c1297e0e5 · 2023-04-23T18:08:17.000-04:00
No functional changes.
diff --git a/Tests/LibSQL/TestSqlBtreeIndex.cpp b/Tests/LibSQL/TestSqlBtreeIndex.cpp
@@ -208,9 +208,8 @@ void insert_into_and_scan_btree(int num_keys)
         SQL::Tuple prev;
         for (auto iter = btree->begin(); !iter.is_end(); iter++, count++) {
             auto key = (*iter);
-            if (prev.size()) {
+            if (prev.size())
                 EXPECT(prev < key);
-            }
             auto key_value = key[0].to_int<i32>();
             for (auto ix = 0; ix < num_keys; ix++) {
                 if (keys[ix] == key_value) {
diff --git a/Userland/Libraries/LibSQL/BTreeIterator.cpp b/Userland/Libraries/LibSQL/BTreeIterator.cpp
@@ -133,9 +133,8 @@ BTreeIterator BTreeIterator::next() const
 // end (which is really the beginning) of the tree.
 BTreeIterator BTreeIterator::previous() const
 {
-    if (is_end()) {
+    if (is_end())
         return end();
-    }
 
     auto node = m_current;
     auto ix = m_index;
diff --git a/Userland/Libraries/LibSQL/Database.cpp b/Userland/Libraries/LibSQL/Database.cpp
@@ -6,8 +6,7 @@
  */
 
 #include <AK/DeprecatedString.h>
-#include <AK/RefPtr.h>
-
+#include <AK/NonnullRefPtr.h>
 #include <LibSQL/BTree.h>
 #include <LibSQL/Database.h>
 #include <LibSQL/Heap.h>
@@ -174,9 +173,8 @@ ErrorOr<Vector<Row>> Database::select_all(TableDef& table)
 {
     VERIFY(m_table_cache.get(table.key().hash()).has_value());
     Vector<Row> ret;
-    for (auto pointer = table.pointer(); pointer; pointer = ret.last().next_pointer()) {
+    for (auto pointer = table.pointer(); pointer; pointer = ret.last().next_pointer())
         ret.append(m_serializer.deserialize_block<Row>(pointer, table, pointer));
-    }
     return ret;
 }
 
diff --git a/Userland/Libraries/LibSQL/HashIndex.cpp b/Userland/Libraries/LibSQL/HashIndex.cpp
@@ -86,9 +86,8 @@ void HashBucket::serialize(Serializer& serializer) const
         pointer(), index(), local_depth(), size());
     serializer.serialize<u32>(local_depth());
     serializer.serialize<u32>(size());
-    for (auto& key : m_entries) {
+    for (auto& key : m_entries)
         serializer.serialize<Key>(key);
-    }
 }
 
 void HashBucket::deserialize(Serializer& serializer)
@@ -111,9 +110,8 @@ void HashBucket::deserialize(Serializer& serializer)
 size_t HashBucket::length() const
 {
     size_t len = 2 * sizeof(u32);
-    for (auto& key : m_entries) {
+    for (auto& key : m_entries)
         len += key.length();
-    }
     return len;
 }
 
@@ -132,9 +130,8 @@ bool HashBucket::insert(Key const& key)
 {
     if (!m_inflated)
         m_hash_index.serializer().deserialize_block_to(pointer(), *this);
-    if (find_key_in_bucket(key).has_value()) {
+    if (find_key_in_bucket(key).has_value())
         return false;
-    }
     if ((length() + key.length()) > BLOCKSIZE) {
         dbgln_if(SQL_DEBUG, "Adding key {} would make length exceed block size", key.to_deprecated_string());
         return false;
@@ -148,9 +145,8 @@ Optional<size_t> HashBucket::find_key_in_bucket(Key const& key)
 {
     for (auto ix = 0u; ix < size(); ix++) {
         auto& k = entries()[ix];
-        if (k == key) {
+        if (k == key)
             return ix;
-        }
     }
     return {};
 }
@@ -199,19 +195,17 @@ void HashBucket::list_bucket()
 {
     warnln("Bucket #{} size {} local depth {} pointer {}{}",
         index(), size(), local_depth(), pointer(), (pointer() ? "" : " (VIRTUAL)"));
-    for (auto& key : entries()) {
+    for (auto& key : entries())
         warnln("  {} hash {}", key.to_deprecated_string(), key.hash());
-    }
 }
 
 HashIndex::HashIndex(Serializer& serializer, NonnullRefPtr<TupleDescriptor> const& descriptor, u32 first_node)
     : Index(serializer, descriptor, true, first_node)
     , m_nodes()
     , m_buckets()
 {
-    if (!first_node) {
+    if (!first_node)
         set_pointer(new_record_pointer());
-    }
     if (serializer.has_block(first_node)) {
         u32 pointer = first_node;
         do {
@@ -272,9 +266,8 @@ HashBucket* HashIndex::get_bucket_for_insert(Key const& key)
                 auto moved = 0;
                 for (auto entry_index = (int)bucket->m_entries.size() - 1; entry_index >= 0; entry_index--) {
                     if (bucket->m_entries[entry_index].hash() % size() == ix) {
-                        if (!sub_bucket->pointer()) {
+                        if (!sub_bucket->pointer())
                             sub_bucket->set_pointer(new_record_pointer());
-                        }
                         sub_bucket->insert(bucket->m_entries.take(entry_index));
                         moved++;
                     }
@@ -389,18 +382,12 @@ void HashIndex::list_hash()
 {
     warnln("Number of buckets: {} (Global depth {})", size(), global_depth());
     warn("Directory pointer(s): ");
-    for (auto ptr : m_nodes) {
+    for (auto ptr : m_nodes)
         warn("{}, ", ptr);
-    }
     warnln();
 
-    bool first_bucket = true;
-    for (auto& bucket : m_buckets) {
-        if (first_bucket) {
-            first_bucket = false;
-        }
+    for (auto& bucket : m_buckets)
         bucket->list_bucket();
-    }
 }
 
 HashIndexIterator::HashIndexIterator(HashBucket const* bucket, size_t index)
diff --git a/Userland/Libraries/LibSQL/Heap.cpp b/Userland/Libraries/LibSQL/Heap.cpp
@@ -10,9 +10,7 @@
 #include <LibCore/IODevice.h>
 #include <LibCore/System.h>
 #include <LibSQL/Heap.h>
-#include <LibSQL/Serializer.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 namespace SQL {
 
@@ -169,9 +167,8 @@ ErrorOr<void> Heap::flush()
 {
     VERIFY(m_file);
     Vector<u32> blocks;
-    for (auto& wal_entry : m_write_ahead_log) {
+    for (auto& wal_entry : m_write_ahead_log)
         blocks.append(wal_entry.key);
-    }
     quick_sort(blocks);
     for (auto& block : blocks) {
         auto buffer_it = m_write_ahead_log.find(block);
@@ -221,9 +218,8 @@ ErrorOr<void> Heap::read_zero_block()
 
     memcpy(m_user_values.data(), buffer.offset_pointer(USER_VALUES_OFFSET), m_user_values.size() * sizeof(u32));
     for (auto ix = 0u; ix < m_user_values.size(); ix++) {
-        if (m_user_values[ix]) {
+        if (m_user_values[ix])
             dbgln_if(SQL_DEBUG, "User value {}: {}", ix, m_user_values[ix]);
-        }
     }
     return {};
 }
@@ -237,9 +233,8 @@ void Heap::update_zero_block()
     dbgln_if(SQL_DEBUG, "Table Columns root node: {}", m_table_columns_root);
     dbgln_if(SQL_DEBUG, "Free list: {}", m_free_list);
     for (auto ix = 0u; ix < m_user_values.size(); ix++) {
-        if (m_user_values[ix]) {
+        if (m_user_values[ix])
             dbgln_if(SQL_DEBUG, "User value {}: {}", ix, m_user_values[ix]);
-        }
     }
 
     // FIXME: Handle an OOM failure here.
@@ -263,9 +258,8 @@ void Heap::initialize_zero_block()
     m_table_columns_root = 0;
     m_next_block = 1;
     m_free_list = 0;
-    for (auto& user : m_user_values) {
+    for (auto& user : m_user_values)
         user = 0u;
-    }
     update_zero_block();
 }
 
diff --git a/Userland/Libraries/LibSQL/Heap.h b/Userland/Libraries/LibSQL/Heap.h
@@ -10,7 +10,6 @@
 #include <AK/Debug.h>
 #include <AK/DeprecatedString.h>
 #include <AK/HashMap.h>
-#include <AK/Vector.h>
 #include <LibCore/File.h>
 #include <LibCore/Object.h>
 
diff --git a/Userland/Libraries/LibSQL/Index.cpp b/Userland/Libraries/LibSQL/Index.cpp
@@ -6,7 +6,6 @@
 
 #include <LibSQL/Heap.h>
 #include <LibSQL/Index.h>
-#include <LibSQL/Meta.h>
 #include <LibSQL/TupleDescriptor.h>
 
 namespace SQL {
diff --git a/Userland/Libraries/LibSQL/Meta.h b/Userland/Libraries/LibSQL/Meta.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <AK/DeprecatedString.h>
-#include <AK/NonnullOwnPtr.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/Result.h>
 #include <AK/Vector.h>
diff --git a/Userland/Libraries/LibSQL/Serializer.cpp b/Userland/Libraries/LibSQL/Serializer.cpp
@@ -10,7 +10,7 @@ namespace SQL {
 
 void Serializer::serialize(DeprecatedString const& text)
 {
-    serialize<u32>((u32)text.length());
+    serialize<u32>(text.length());
     if (!text.is_empty())
         write((u8 const*)text.characters(), text.length());
 }
diff --git a/Userland/Libraries/LibSQL/Serializer.h b/Userland/Libraries/LibSQL/Serializer.h
@@ -10,7 +10,6 @@
 #include <AK/Debug.h>
 #include <AK/DeprecatedString.h>
 #include <AK/Format.h>
-#include <AK/ScopeGuard.h>
 #include <LibSQL/Forward.h>
 #include <LibSQL/Heap.h>
 #include <string.h>
@@ -155,9 +154,8 @@ class Serializer {
         StringBuilder builder;
         builder.appendff("{0} {1:04x} | ", prefix, sz);
         Vector<DeprecatedString> bytes;
-        for (auto ix = 0u; ix < sz; ++ix) {
+        for (auto ix = 0u; ix < sz; ++ix)
             bytes.append(DeprecatedString::formatted("{0:02x}", *(ptr + ix)));
-        }
         StringBuilder bytes_builder;
         bytes_builder.join(' ', bytes);
         builder.append(bytes_builder.to_deprecated_string());
diff --git a/Userland/Libraries/LibSQL/TreeNode.cpp b/Userland/Libraries/LibSQL/TreeNode.cpp
@@ -6,7 +6,6 @@
 
 #include <AK/Debug.h>
 #include <AK/Format.h>
-#include <AK/NonnullOwnPtr.h>
 #include <AK/StringBuilder.h>
 #include <LibSQL/BTree.h>
 #include <LibSQL/Serializer.h>
@@ -145,9 +144,8 @@ size_t TreeNode::length() const
     if (!size())
         return 0;
     size_t len = sizeof(u32);
-    for (auto& key : m_entries) {
+    for (auto& key : m_entries)
         len += sizeof(u32) + key.length();
-    }
     return len;
 }
 
@@ -315,9 +313,8 @@ void TreeNode::split()
         auto down = m_down.take(median_index);
 
         // Reparent to new right node:
-        if (down.m_node != nullptr) {
+        if (down.m_node != nullptr)
             down.m_node->m_up = new_node;
-        }
         new_node->m_entries.append(entry);
         new_node->m_down.append(move(down));
     }
@@ -354,38 +351,33 @@ void TreeNode::dump_if(int flag, DeprecatedString&& msg)
             VERIFY(m_down[ix].pointer() == 0);
         builder.appendff("'{}' ", (DeprecatedString)m_entries[ix]);
     }
-    if (!is_leaf()) {
+    if (!is_leaf())
         builder.appendff("[v{}]", m_down[size()].pointer());
-    } else {
+    else
         VERIFY(m_down[size()].pointer() == 0);
-    }
     builder.appendff(" (size {}", (int)size());
-    if (is_leaf()) {
+    if (is_leaf())
         builder.append(", leaf"sv);
-    }
     builder.append(')');
     dbgln(builder.to_deprecated_string());
 }
 
 void TreeNode::list_node(int indent)
 {
     auto do_indent = [&]() {
-        for (int i = 0; i < indent; ++i) {
+        for (int i = 0; i < indent; ++i)
             warn(" ");
-        }
     };
     do_indent();
     warnln("--> #{}", pointer());
     for (auto ix = 0u; ix < size(); ix++) {
-        if (!is_leaf()) {
+        if (!is_leaf())
             down_node(ix)->list_node(indent + 2);
-        }
         do_indent();
         warnln("{}", m_entries[ix].to_deprecated_string());
     }
-    if (!is_leaf()) {
+    if (!is_leaf())
         down_node(size())->list_node(indent + 2);
-    }
 }
 
 }
diff --git a/Userland/Libraries/LibSQL/Tuple.cpp b/Userland/Libraries/LibSQL/Tuple.cpp
diff --git a/Userland/Libraries/LibSQL/TupleDescriptor.h b/Userland/Libraries/LibSQL/TupleDescriptor.h
diff --git a/Userland/Libraries/LibSQL/Value.cpp b/Userland/Libraries/LibSQL/Value.cpp

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace SQL {`
`10`	`10`
`11`	`11`	`void Serializer::serialize(DeprecatedString const& text)`
`12`	`12`	`{`
`13`		`- serialize<u32>((u32)text.length());`
	`13`	`+ serialize<u32>(text.length());`
`14`	`14`	`if (!text.is_empty())`
`15`	`15`	`write((u8 const*)text.characters(), text.length());`
`16`	`16`	`}`