-
Notifications
You must be signed in to change notification settings - Fork 37.3k
chat: store disk sessions using an 'append log' #286644
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
connor4312
wants to merge
3
commits into
main
Choose a base branch
from
connor4312/chat-append-log
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,761
−171
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ import { extUri, extUriIgnorePathCase, IExtUri, isAbsolutePath } from '../../../ | |
| import { consumeStream, isReadableBufferedStream, isReadableStream, listenStream, newWriteableStream, peekReadable, peekStream, transform } from '../../../base/common/stream.js'; | ||
| import { URI } from '../../../base/common/uri.js'; | ||
| import { localize } from '../../../nls.js'; | ||
| import { ensureFileSystemProviderError, etag, ETAG_DISABLED, FileChangesEvent, IFileDeleteOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, hasFileAtomicReadCapability, hasFileFolderCopyCapability, hasFileReadStreamCapability, hasOpenReadWriteCloseCapability, hasReadWriteCapability, ICreateFileOptions, IFileContent, IFileService, IFileStat, IFileStatWithMetadata, IFileStreamContent, IFileSystemProvider, IFileSystemProviderActivationEvent, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IReadFileOptions, IReadFileStreamOptions, IResolveFileOptions, IFileStatResult, IFileStatResultWithMetadata, IResolveMetadataFileOptions, IStat, IFileStatWithPartialMetadata, IWatchOptions, IWriteFileOptions, NotModifiedSinceFileOperationError, toFileOperationResult, toFileSystemProviderErrorCode, hasFileCloneCapability, TooLargeFileOperationError, hasFileAtomicDeleteCapability, hasFileAtomicWriteCapability, IWatchOptionsWithCorrelation, IFileSystemWatcher, IWatchOptionsWithoutCorrelation, hasFileRealpathCapability } from './files.js'; | ||
| import { ensureFileSystemProviderError, etag, ETAG_DISABLED, FileChangesEvent, IFileDeleteOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, hasFileAppendCapability, hasFileAtomicReadCapability, hasFileFolderCopyCapability, hasFileReadStreamCapability, hasOpenReadWriteCloseCapability, hasReadWriteCapability, ICreateFileOptions, IFileContent, IFileService, IFileStat, IFileStatWithMetadata, IFileStreamContent, IFileSystemProvider, IFileSystemProviderActivationEvent, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileWriteOptions, IReadFileOptions, IReadFileStreamOptions, IResolveFileOptions, IFileStatResult, IFileStatResultWithMetadata, IResolveMetadataFileOptions, IStat, IFileStatWithPartialMetadata, IWatchOptions, IWriteFileOptions, NotModifiedSinceFileOperationError, toFileOperationResult, toFileSystemProviderErrorCode, hasFileCloneCapability, TooLargeFileOperationError, hasFileAtomicDeleteCapability, hasFileAtomicWriteCapability, IWatchOptionsWithCorrelation, IFileSystemWatcher, IWatchOptionsWithoutCorrelation, hasFileRealpathCapability } from './files.js'; | ||
| import { readFileIntoStream } from './io.js'; | ||
| import { ILogService } from '../../log/common/log.js'; | ||
| import { ErrorNoTelemetry } from '../../../base/common/errors.js'; | ||
|
|
@@ -431,6 +431,60 @@ export class FileService extends Disposable implements IFileService { | |
| return this.resolve(resource, { resolveMetadata: true }); | ||
| } | ||
|
|
||
| async appendFile(resource: URI, bufferOrReadableOrStream: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: IWriteFileOptions): Promise<IFileStatWithMetadata> { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if it wouldn't be just easier to have another option in |
||
| const provider = this.throwIfFileSystemIsReadonly(await this.withWriteProvider(resource), resource); | ||
|
|
||
| try { | ||
| // if provider supports append, use it directly | ||
| if (hasFileAppendCapability(provider)) { | ||
| const buffer = bufferOrReadableOrStream instanceof VSBuffer | ||
| ? bufferOrReadableOrStream | ||
| : isReadableStream(bufferOrReadableOrStream) | ||
| ? await streamToBuffer(bufferOrReadableOrStream) | ||
| : readableToBuffer(bufferOrReadableOrStream); | ||
|
|
||
| const writeOptions: IFileWriteOptions = { | ||
| create: true, | ||
| overwrite: false, | ||
| unlock: options?.unlock ?? false, | ||
| atomic: options?.atomic ?? false | ||
| }; | ||
|
|
||
| await provider.appendFile(resource, buffer.buffer, writeOptions); | ||
|
|
||
| // events | ||
| this._onDidRunOperation.fire(new FileOperationEvent(resource, FileOperation.WRITE)); | ||
| } else { | ||
| // fallback: read existing content and write combined content | ||
| let existingContent: VSBuffer; | ||
| try { | ||
| const fileContent = await this.readFile(resource); | ||
| existingContent = fileContent.value; | ||
| } catch (error) { | ||
| // if file doesn't exist, start with empty content | ||
| if (toFileOperationResult(error) === FileOperationResult.FILE_NOT_FOUND) { | ||
| existingContent = VSBuffer.fromString(''); | ||
| } else { | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| const newContent = bufferOrReadableOrStream instanceof VSBuffer | ||
| ? bufferOrReadableOrStream | ||
| : isReadableStream(bufferOrReadableOrStream) | ||
| ? await streamToBuffer(bufferOrReadableOrStream) | ||
| : readableToBuffer(bufferOrReadableOrStream); | ||
|
|
||
| const combinedContent = VSBuffer.concat([existingContent, newContent]); | ||
| await this.writeFile(resource, combinedContent, options); | ||
connor4312 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } catch (error) { | ||
| throw new FileOperationError(localize('err.append', "Unable to append to file '{0}' ({1})", this.resourceForError(resource), ensureFileSystemProviderError(error).toString()), toFileOperationResult(error), options); | ||
| } | ||
|
|
||
| return this.resolve(resource, { resolveMetadata: true }); | ||
| } | ||
|
|
||
|
|
||
| private async peekBufferForWriting(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability, bufferOrReadableOrStream: VSBuffer | VSBufferReadable | VSBufferReadableStream): Promise<VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream> { | ||
| let peekResult: VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds like this method deserves a test.