refactor: simplify

Author: ronag

binding.cc

@@ -1327,7 +1327,6 @@ NAPI_METHOD(iterator_nextv) {
           }
         };
 
-        auto status = rocksdb::Status::OK();
         while (true) {
           if (!iterator->first_) {
             iterator->Next();
@@ -1336,9 +1335,8 @@ NAPI_METHOD(iterator_nextv) {
           }
 
           if (!iterator->Valid() || !iterator->Increment()) {
-            status = iterator->Status();
             state.finished = true;
-            break;
+            return iterator->Status();
           }
 
           if (iterator->keys_ && iterator->values_) {
@@ -1353,13 +1351,10 @@ NAPI_METHOD(iterator_nextv) {
           }
 
           if (bytesRead > iterator->highWaterMarkBytes_ || state.sizes.size() / 2 >= count) {
-            status = rocksdb::Status::OK();
             state.finished = false;
-            break;
+            return rocksdb::Status::OK();
           }
         }
-
-        return status;
       },
       [=](auto& state, auto env, auto& argv) {
         argv.resize(4);

index.js

@@ -158,27 +158,28 @@ class RocksLevel extends AbstractLevel {
         } else {
           data ??= Buffer.alloc(0)
           sizes ??= Buffer.alloc(0)
-          const val = []
+
+          const rows = []
           let offset = 0
           const sizes32 = new Int32Array(sizes.buffer, sizes.byteOffset, sizes.byteLength / 4)
           for (const size of sizes32) {
             if (size < 0) {
-              val.push(undefined)
+              rows.push(undefined)
             } else {
               if (!valueEncoding || valueEncoding === 'buffer') {
-                val.push(data.subarray(offset, offset + size))
+                rows.push(data.subarray(offset, offset + size))
               } else if (valueEncoding === 'slice') {
-                val.push({ buffer: data, byteOffset: offset, byteLength: size })
+                rows.push({ buffer: data, byteOffset: offset, byteLength: size })
               } else {
-                val.push(data.toString(valueEncoding, offset, offset + size))
+                rows.push(data.toString(valueEncoding, offset, offset + size))
               }
               offset += size
               if (offset & 0x7) {
                 offset = (offset | 0x7) + 1
               }
             }
           }
-          callback(null, val)
+          callback(null, rows)
         }
         this[kUnref]()
       })

util.js

@@ -1,14 +1,14 @@
 'use strict'
 
 function handleNextv (err, sizes, buffer, finished, options, callback) {
+  const { keyEncoding, valueEncoding } = options ?? {}
+
   if (err) {
     callback(err)
   } else {
     buffer ??= Buffer.alloc(0)
     sizes ??= Buffer.alloc(0)
 
-    const { keyEncoding, valueEncoding } = options ?? {}
-
     const rows = []
     let offset = 0
     const sizes32 = new Int32Array(sizes.buffer, sizes.byteOffset, sizes.byteLength / 4)