Skip to content
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

feat(python, rust): timestampNtz support #2236

Merged
merged 22 commits into from
Mar 5, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
clipppyy
  • Loading branch information
ion-elgreco committed Mar 5, 2024
commit b671d516b37d3366b166ee220914b100a149edb4
30 changes: 11 additions & 19 deletions crates/core/src/operations/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ use std::collections::{HashMap, HashSet};
use std::sync::Arc;

use futures::future::BoxFuture;
use futures::io::Read;
use maplit::hashset;
use serde_json::Value;

use super::transaction::{commit, PROTOCOL};
Expand Down Expand Up @@ -246,25 +244,19 @@ impl CreateBuilder {
// We set the lowest protocol we can, and if subsequent writes use newer features we update metadata?

let (min_reader_version, min_writer_version, writer_features, reader_features) =
if contains_timestampntz.clone() {
if *contains_timestampntz {
let mut converted_writer_features = self
.configuration
.iter()
.map(|(key, _)| key.clone().into())
.filter(|v| match v {
WriterFeatures::Other(_) => false,
_ => true,
})
.keys()
.map(|key| key.clone().into())
.filter(|v| !matches!(v, WriterFeatures::Other(_)))
.collect::<HashSet<WriterFeatures>>();

let mut converted_reader_features = self
.configuration
.iter()
.map(|(key, _)| key.clone().into())
.filter(|v| match v {
ReaderFeatures::Other(_) => false,
_ => true,
})
.keys()
.map(|key| key.clone().into())
.filter(|v| !matches!(v, ReaderFeatures::Other(_)))
.collect::<HashSet<ReaderFeatures>>();
converted_writer_features.insert(WriterFeatures::TimestampWithoutTimezone);
converted_reader_features.insert(ReaderFeatures::TimestampWithoutTimezone);
Expand All @@ -291,10 +283,10 @@ impl CreateBuilder {
_ => unreachable!(),
})
.unwrap_or_else(|| Protocol {
min_reader_version: min_reader_version,
min_writer_version: min_writer_version,
writer_features: writer_features,
reader_features: reader_features,
min_reader_version,
min_writer_version,
writer_features,
reader_features,
});

let mut metadata = Metadata::try_new(
Expand Down
Loading