Add PgBindIter for encoding and use it as the implementation encoding &[T] #3651
+119
−29
Conversation
This file contains 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
| // need ownership to iterate | ||
| mut iter: I, | ||
| buf: &mut PgArgumentBuffer, | ||
| ) -> Result<IsNull, Box<dyn std::error::Error + Send + Sync + 'static>> { |
There was a problem hiding this comment.
Suggested change
| ) -> Result<IsNull, Box<dyn std::error::Error + Send + Sync + 'static>> { | |
| ) -> Result<IsNull, BoxDynError> { |
| fn encode_by_ref( | ||
| &self, | ||
| buf: &mut PgArgumentBuffer, | ||
| ) -> Result<IsNull, Box<dyn std::error::Error + Send + Sync + 'static>> { |
There was a problem hiding this comment.
Suggested change
| ) -> Result<IsNull, Box<dyn std::error::Error + Send + Sync + 'static>> { | |
| ) -> Result<IsNull, BoxDynError> { |
| fn encode( | ||
| self, | ||
| buf: &mut PgArgumentBuffer, | ||
| ) -> Result<IsNull, Box<dyn std::error::Error + Send + Sync + 'static>> |
There was a problem hiding this comment.
Suggested change
| ) -> Result<IsNull, Box<dyn std::error::Error + Send + Sync + 'static>> | |
| ) -> Result<IsNull, BoxDynError> |
| } | ||
|
|
||
| // set the length now that we know what it is. | ||
| buf[len_start..(len_start + 4)].copy_from_slice(count.to_be_bytes().as_slice()); |
There was a problem hiding this comment.
Suggested change
| buf[len_start..(len_start + 4)].copy_from_slice(count.to_be_bytes().as_slice()); | |
| buf[len_start..(len_start + 4)].copy_from_slice(&count.to_be_bytes()); |
| } | ||
|
|
||
| let mut count = 1_i32; | ||
| const MAX: usize = i32::MAX as usize; |
There was a problem hiding this comment.
This looks like an oversight. We've already written 1 item at this point.
Suggested change
| const MAX: usize = i32::MAX as usize; | |
| const MAX: usize = i32::MAX as usize - 1; |
|
|
||
| const OVERFLOW: usize = MAX + 1; | ||
| if iter.next().is_some() { | ||
| return Err(format!("encoded iterator is too large for Postgres: {OVERFLOW}").into()); |
There was a problem hiding this comment.
I'm not sure if printing the Iterator::size_hint would be more interesting here
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Partial fix for postgres of #294
I've been using this implementation in several different projects and thought that I would see if it can be accepted upstream. I don't care about the name, but it is only useful when calling
.bind(PgBindIter(iter...)), so that's what I've been calling it.I use this for writing inserts using unnest in postgres and it can easily hit 100k rows/sec on any hardware I've run it on (my mac, ec2, gcp, etc.)
The only overhead this implementation has over the current one for
&[T]is thecount += 1in the encoding loop. Hopefully this gets optimized out for slices due to the check in the calling function before delegating the call.The existing tests for
&[T]should cover testing this since it is now the implementation.I have used a peeking iterator for the first stuff in the past, but that probably has some iteration overhead that is larger than just handling the first item separately.