@k3000/store 1.4.2 → 1.4.4

package/architect.mjs

@@ -103,25 +103,6 @@ export const TypeLen = {
     string: 12
 }
 
-/**
- * @param {Buffer} a
- * @param {Buffer} b
- * @returns {-1 | 0 | 1}
- */
-export const compareBuffer = (a, b) => {
-
-    if (a.length > b.length) return 1
-    if (a.length < b.length) return -1
-
-    for (let i = 0; i < a.length; i++) {
-
-        if (a[i] > b[i]) return 1
-        if (a[i] < b[i]) return -1
-    }
-
-    return 0
-}
-
 /**
  * 加解密的类
  */
@@ -242,18 +223,18 @@ export class Entity {
 
         if (e < s) return s
 
-        let result = compareBuffer(buffer, this.#storage.getValue(index[s], length))
+        let result = buffer.compare(this.#storage.getValue(index[s], length))
 
         if (s === e) return result < 0 ? s : s + 1
         if (result <= 0) return s
 
-        result = compareBuffer(buffer, this.#storage.getValue(index[e], length))
+        result = buffer.compare(this.#storage.getValue(index[e], length))
 
         if (result >= 0) return e + 1
 
         let m = Math.floor((s + e) / 2)
 
-        result = compareBuffer(buffer, this.#storage.getValue(index[m], length))
+        result = buffer.compare(this.#storage.getValue(index[m], length))
 
         if (result < 0) return this.#indexPosition(index, buffer, length, s + 1, m - 1)
         if (result > 0) return this.#indexPosition(index, buffer, length, m + 1, e - 1)
@@ -284,7 +265,7 @@ export class Entity {
 
                 index.splice(i, 1)
 
-                if (buf > buffer) {
+                if (buf.compare(buffer) > 0) {
 
                     e = i - 1
 
@@ -722,7 +703,7 @@ export class Entities extends Array {
 
         let m = Math.floor((s + e) / 2)
 
-        let result = compareBuffer(buffer, this.#storage.getValue(index[m], length))
+        let result = buffer.compare(this.#storage.getValue(index[m], length))
 
         if (result < 0) return this.#findByValue(index, buffer, length, s, m - 1)
         if (result > 0) return this.#findByValue(index, buffer, length, m + 1, e)
@@ -746,6 +727,16 @@ export class Entities extends Array {
         return result
     }
 
+    findByValue2(name, value, value2) {
+
+        if (value.compare(value2) > 0) {
+
+            [value, value2] = [value2, value]
+        }
+
+
+    }
+
     findByValue(name, value) {
 
         const index = this.#index[name]
@@ -761,21 +752,21 @@ export class Entities extends Array {
 
         let m = Math.floor((s + e) / 2), buffer = this.#storage.getValue(index[m], length)
 
-        if (compareBuffer(before, buffer) < 0) return this.#findByTime(index, after, before, length, s, m - 1)
-        if (compareBuffer(after, buffer) > 0) return this.#findByTime(index, after, before, length, m + 1, e)
+        if (before.compare(buffer) < 0) return this.#findByTime(index, after, before, length, s, m - 1)
+        if (after.compare(buffer) > 0) return this.#findByTime(index, after, before, length, m + 1, e)
 
         let result = [index[m]], i
 
         for (i = m - 1; i >= 0; i--) {
 
-            if (this.#storage.getValue(index[i], length) < after) break
+            if (this.#storage.getValue(index[i], length).compare(after) < 0) break
 
             result.unshift(index[i])
         }
 
         for (i = m + 1; i < index.length; i++) {
 
-            if (this.#storage.getValue(index[i], length) > before) break
+            if (this.#storage.getValue(index[i], length).compare(before) > 0) break
 
             result.push(index[i])
         }

package/generator.mjs

@@ -1,5 +1,5 @@
 import {copyFileSync, existsSync, mkdirSync, readdirSync, statSync, writeFileSync} from "node:fs";
-import {buffer, string, Storage, TypeLen, readInt24BE, readUint24BE, compareBuffer} from './architect.mjs'
+import {buffer, string, Storage, TypeLen, readInt24BE, readUint24BE} from './architect.mjs'
 import {resolve} from 'node:path'
 
 const modulePath = import.meta.url.endsWith('?test=true') ? '../../architect.mjs' : '@k3000/store/architect.mjs'
@@ -874,15 +874,12 @@ const updateIndex2 = function (store, record, struct) {
 
         case typeMap.string:
 
-            return record.sort((a, b) => compareBuffer(store.getValue(a, struct.length)
-                , store.getValue(b, struct.length)))
+            return record.sort((a, b) => store.getValue(a, struct.length).compare(store.getValue(b, struct.length)))
     }
 }
 
 const updateIndex = function (name, set) {
 
-    console.log(this.curr.record.index)
-
     const struct = this.curr.struct.base[name]
     const index = this.curr.record.index[name]
 
@@ -902,6 +899,8 @@ const updateIndex = function (name, set) {
 
                     struct[key].index = true
                     index[key] = indexList
+
+                    console.log(`add ${name} index ${key}`)
                 }
             }
 
@@ -909,6 +908,8 @@ const updateIndex = function (name, set) {
 
             delete struct[key].index
             delete index[key]
+
+            console.log(`remove ${name} index ${key}`)
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k3000/store",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "storage",
   "main": "generator.mjs",
   "scripts": {