You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "berkaysynnada (via GitHub)" <gi...@apache.org> on 2023/04/27 20:35:12 UTC
[GitHub] [arrow-rs] berkaysynnada opened a new pull request, #4153: InMemory append API
berkaysynnada opened a new pull request, #4153:
URL: https://github.com/apache/arrow-rs/pull/4153
# Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->
Closes #4152.
# Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
InMemory implementation of ObjectStore can support append() now.
# What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
append() returns an InMemoryAppend object, having the fields of location (where the data is stored in BTree), data appended, and the storage of the InMemory object. poll_write() writes the buffer, poll_flush() append the data to storage. There is no need to use poll_shutdown().
# Are there any user-facing changes?
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!---
If there are any breaking changes to public APIs, please add the `breaking change` label.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold merged pull request #4153: InMemory append API
Posted by "tustvold (via GitHub)" <gi...@apache.org>.
tustvold merged PR #4153:
URL: https://github.com/apache/arrow-rs/pull/4153
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #4153: InMemory append API
Posted by "tustvold (via GitHub)" <gi...@apache.org>.
tustvold commented on code in PR #4153:
URL: https://github.com/apache/arrow-rs/pull/4153#discussion_r1180246497
##########
object_store/src/memory.rs:
##########
@@ -329,8 +340,59 @@ impl AsyncWrite for InMemoryUpload {
}
}
+struct InMemoryAppend {
+ location: Path,
+ data: Vec<u8>,
+ storage: StorageType,
+}
+
+impl AsyncWrite for InMemoryAppend {
+ fn poll_write(
+ mut self: Pin<&mut Self>,
+ _cx: &mut std::task::Context<'_>,
+ buf: &[u8],
+ ) -> std::task::Poll<Result<usize, io::Error>> {
+ self.data.extend_from_slice(buf);
+ Poll::Ready(Ok(buf.len()))
+ }
+
+ fn poll_flush(
+ mut self: Pin<&mut Self>,
+ _cx: &mut std::task::Context<'_>,
+ ) -> std::task::Poll<Result<(), io::Error>> {
+ let storage = StorageType::clone(&self.storage);
+
+ let mut writer = storage.write();
+
+ if let Some((bytes, _)) = writer.remove(&self.location) {
Review Comment:
It might be more idiomatic to use [`entry`](https://doc.rust-lang.org/std/collections/struct.BTreeMap.html#method.entry)
##########
object_store/src/memory.rs:
##########
@@ -329,8 +340,59 @@ impl AsyncWrite for InMemoryUpload {
}
}
+struct InMemoryAppend {
+ location: Path,
+ data: Vec<u8>,
+ storage: StorageType,
+}
+
+impl AsyncWrite for InMemoryAppend {
+ fn poll_write(
+ mut self: Pin<&mut Self>,
+ _cx: &mut std::task::Context<'_>,
+ buf: &[u8],
+ ) -> std::task::Poll<Result<usize, io::Error>> {
+ self.data.extend_from_slice(buf);
+ Poll::Ready(Ok(buf.len()))
+ }
+
+ fn poll_flush(
+ mut self: Pin<&mut Self>,
+ _cx: &mut std::task::Context<'_>,
+ ) -> std::task::Poll<Result<(), io::Error>> {
+ let storage = StorageType::clone(&self.storage);
+
+ let mut writer = storage.write();
+
+ if let Some((bytes, _)) = writer.remove(&self.location) {
+ let buf = std::mem::take(&mut self.data);
+ let concat = Bytes::from_iter(bytes.into_iter().chain(buf.into_iter()));
+ writer.insert(self.location.clone(), (concat, Utc::now()));
+ } else {
+ writer.insert(
+ self.location.clone(),
+ (Bytes::from(std::mem::take(&mut self.data)), Utc::now()),
+ );
+ };
+ Poll::Ready(Ok(()))
+ }
+
+ fn poll_shutdown(
+ self: Pin<&mut Self>,
+ _cx: &mut std::task::Context<'_>,
+ ) -> std::task::Poll<Result<(), io::Error>> {
+ // does nothing different than flush
+ match self.poll_flush(_cx) {
+ Poll::Ready(_) => Poll::Ready(Ok(())),
+ Poll::Pending => Poll::Pending,
+ }
Review Comment:
```suggestion
cx: &mut std::task::Context<'_>,
) -> std::task::Poll<Result<(), io::Error>> {
self.poll_flush(cx)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] berkaysynnada commented on a diff in pull request #4153: InMemory append API
Posted by "berkaysynnada (via GitHub)" <gi...@apache.org>.
berkaysynnada commented on code in PR #4153:
URL: https://github.com/apache/arrow-rs/pull/4153#discussion_r1180302744
##########
object_store/src/memory.rs:
##########
@@ -329,8 +340,59 @@ impl AsyncWrite for InMemoryUpload {
}
}
+struct InMemoryAppend {
+ location: Path,
+ data: Vec<u8>,
+ storage: StorageType,
+}
+
+impl AsyncWrite for InMemoryAppend {
+ fn poll_write(
+ mut self: Pin<&mut Self>,
+ _cx: &mut std::task::Context<'_>,
+ buf: &[u8],
+ ) -> std::task::Poll<Result<usize, io::Error>> {
+ self.data.extend_from_slice(buf);
+ Poll::Ready(Ok(buf.len()))
+ }
+
+ fn poll_flush(
+ mut self: Pin<&mut Self>,
+ _cx: &mut std::task::Context<'_>,
+ ) -> std::task::Poll<Result<(), io::Error>> {
+ let storage = StorageType::clone(&self.storage);
+
+ let mut writer = storage.write();
+
+ if let Some((bytes, _)) = writer.remove(&self.location) {
Review Comment:
Thank you for the review. I tried but I couldn't make it work. Since Bytes is not mutable, I can't change it with `and_modify()`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org