sati-open/sati.n-api.index-file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize bug fix

Browse Source
This commit is contained in:
Eli-Class
2026-02-04 08:01:29 +00:00
parent 339e2d37e3
commit 132189da48
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/dat/reader.ts
View File

@@ -163,32 +163,24 @@ export class DataReader<T> {
return results; return results;
} }
/*
getAllData(): DataEntry<T>[] { getAllData(): DataEntry<T>[] {
if (this.fd === null) throw new Error('Data file not opened'); if (this.fd === null) throw new Error('Data file not opened');
const entries = this.indexReader.getAllEntries();
const results: DataEntry<T>[] = []; const results: DataEntry<T>[] = [];
let first = this.getByIndex(0);
if (first == null) {
return [];
}
results.push(first);
for (const entry of entries) { do {
const buf = this.readRecordAt(this.fd, entry.offset, entry.length); const entry = this.readNext();
const result = DataProtocol.deserializeRecord( if (!entry) break;
buf, results.push(entry);
0, } while (true);
this.serializer
);
if (result) {
results.push({
sequence: entry.sequence,
timestamp: entry.timestamp,
data: result.data,
});
}
}
return results; return results;
} }
*/
getRecordCount(): number { getRecordCount(): number {
return this.indexReader.getHeader().writtenCnt; return this.indexReader.getHeader().writtenCnt;

48
lib/idx/reader.ts
View File

@@ -11,8 +11,8 @@ export class IndexReader {
private path: string | null = null; private path: string | null = null;
// Sequential read state // Sequential read state
private currentIndex: number = 0; private currentIndex: number = -1;
private currentSequence: number = 0; private currentSequence: number = -1;
// Reusable buffer for reading entries // Reusable buffer for reading entries
private entryBuffer: Buffer = Buffer.alloc(INDEX_ENTRY_SIZE); private entryBuffer: Buffer = Buffer.alloc(INDEX_ENTRY_SIZE);
@@ -49,22 +49,6 @@ export class IndexReader {
return this.readEntryAt(this.fd, index); return this.readEntryAt(this.fd, index);
} }
findBySequenceRange(startSeq: number, endSeq: number): { index: number; entry: IndexEntry }[] {
if (this.fd === null || !this.header) throw new Error('Index file not opened');
const results: { index: number; entry: IndexEntry }[] = [];
const first = this.searchSequenceLowerBound(this.fd, this.header.writtenCnt, startSeq);
if (first == null) return [];
results.push(first);
for (let i = this.currentIndex; i < this.header.writtenCnt; i++) {
const entry = this.readNextEntry(this.fd);
if (entry == null || entry.sequence > endSeq) break;
results.push({ index: this.currentIndex, entry });
}
return results;
}
/* /*
getAllEntries(): IndexEntry[] { getAllEntries(): IndexEntry[] {
if (this.fd === null || !this.header) throw new Error('Index file not opened'); if (this.fd === null || !this.header) throw new Error('Index file not opened');
@@ -78,15 +62,39 @@ export class IndexReader {
} }
*/ */
findBySequenceRange(startSeq: number, endSeq: number): { index: number; entry: IndexEntry }[] {
if (this.fd === null || !this.header) throw new Error('Index file not opened');
const results: { index: number; entry: IndexEntry }[] = [];
const currIdx = this.currentIndex;
const first = this.searchSequenceLowerBound(this.fd, this.header.writtenCnt, startSeq);
if (first === null) {
this.currentIndex = currIdx;
return [];
}
results.push(first);
while (this.currentIndex < this.header.writtenCnt - 1) {
const entry = this.readNextEntry(this.fd);
if (entry == null || entry.sequence > endSeq) break;
results.push({ index: this.currentIndex, entry });
}
return results;
}
findByTimeRange(startTs: bigint, endTs: bigint): { index: number; entry: IndexEntry }[] { findByTimeRange(startTs: bigint, endTs: bigint): { index: number; entry: IndexEntry }[] {
if (this.fd === null || !this.header) throw new Error('Index file not opened'); if (this.fd === null || !this.header) throw new Error('Index file not opened');
const results: { index: number; entry: IndexEntry }[] = []; const results: { index: number; entry: IndexEntry }[] = [];
const currIdx = this.currentIndex;
const first = this.searchTimestampLowerBound(this.fd, this.header.writtenCnt, startTs); const first = this.searchTimestampLowerBound(this.fd, this.header.writtenCnt, startTs);
if (first === null) return []; if (first === null) {
this.currentIndex = currIdx;
return [];
}
results.push(first); results.push(first);
for (let i = this.currentIndex; i < this.header.writtenCnt; i++) { while (this.currentIndex < this.header.writtenCnt - 1) {
const entry = this.readNextEntry(this.fd); const entry = this.readNextEntry(this.fd);
if (entry == null || entry.timestamp > endTs) break; if (entry == null || entry.timestamp > endTs) break;
results.push({ index: this.currentIndex, entry }); results.push({ index: this.currentIndex, entry });