May 19, 2021 · May 14, 2021 · May 14, 2021 · May 15, 2021
diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
    }
 }

 struct State {
 /// A cache of type info and prepared statements for fetching type info
 /// (corresponding to the queries in the [prepare](prepare) module).
 #[derive(Default)]
 struct CachedTypeInfo {
    /// A statement for basic information for a type from its
    /// OID. Corresponds to [TYPEINFO_QUERY](prepare::TYPEINFO_QUERY) (or its
    /// fallback).
    typeinfo: Option<Statement>,
    /// A statement for getting information for a composite type from its OID.
    /// Corresponds to [TYPEINFO_QUERY](prepare::TYPEINFO_COMPOSITE_QUERY).
    typeinfo_composite: Option<Statement>,
    /// A statement for getting information for a composite type from its OID.
    /// Corresponds to [TYPEINFO_QUERY](prepare::TYPEINFO_COMPOSITE_QUERY) (or
    /// its fallback).
    typeinfo_enum: Option<Statement>,

    /// Cache of types already looked up.
    types: HashMap<Oid, Type>,
    buf: BytesMut,
 }

 pub struct InnerClient {
    sender: mpsc::UnboundedSender<Request>,
    state: Mutex<State>,
    cached_typeinfo: Mutex<CachedTypeInfo>,

    /// A buffer to use when writing out postgres commands.
    buffer: Mutex<BytesMut>,
 }

 impl InnerClient {
    }

    pub fn typeinfo(&self) -> Option<Statement> {
        self.state.lock().typeinfo.clone()
        self.cached_typeinfo.lock().typeinfo.clone()
    }

    pub fn set_typeinfo(&self, statement: &Statement) {
        self.state.lock().typeinfo = Some(statement.clone());
        self.cached_typeinfo.lock().typeinfo = Some(statement.clone());
    }

    pub fn typeinfo_composite(&self) -> Option<Statement> {
        self.state.lock().typeinfo_composite.clone()
        self.cached_typeinfo.lock().typeinfo_composite.clone()
    }

    pub fn set_typeinfo_composite(&self, statement: &Statement) {
        self.state.lock().typeinfo_composite = Some(statement.clone());
        self.cached_typeinfo.lock().typeinfo_composite = Some(statement.clone());
    }

    pub fn typeinfo_enum(&self) -> Option<Statement> {
        self.state.lock().typeinfo_enum.clone()
        self.cached_typeinfo.lock().typeinfo_enum.clone()
    }

    pub fn set_typeinfo_enum(&self, statement: &Statement) {
        self.state.lock().typeinfo_enum = Some(statement.clone());
        self.cached_typeinfo.lock().typeinfo_enum = Some(statement.clone());
    }

    pub fn type_(&self, oid: Oid) -> Option<Type> {
        self.state.lock().types.get(&oid).cloned()
        self.cached_typeinfo.lock().types.get(&oid).cloned()
    }

    pub fn set_type(&self, oid: Oid, type_: &Type) {
        self.state.lock().types.insert(oid, type_.clone());
        self.cached_typeinfo.lock().types.insert(oid, type_.clone());
    }

    pub fn clear_type_cache(&self) {
        self.state.lock().types.clear();
        self.cached_typeinfo.lock().types.clear();
    }

    /// Call the given function with a buffer to be used when writing out
    /// postgres commands.
    pub fn with_buf<F, R>(&self, f: F) -> R
    where
        F: FnOnce(&mut BytesMut) -> R,
    {
        let mutstate = self.state.lock();
        let r = f(&mutstate.buf);
 state.buf.clear();
        let mutbuffer = self.buffer.lock();
        let r = f(&mutbuffer);
 buffer.clear();
        r
    }
 }
        Client {
            inner: Arc::new(InnerClient {
                sender,
                state: Mutex::new(State {
                    typeinfo: None,
                    typeinfo_composite: None,
                    typeinfo_enum: None,
                    types: HashMap::new(),
                    buf: BytesMut::new(),
                }),
                cached_typeinfo: Default::default(),
                buffer: Default::default(),
            }),
            #[cfg(feature = "runtime")]
            socket_config: None,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,17 +54,32 @@ impl Responses {
		}
		}

		struct State {
		/// A cache of type info and prepared statements for fetching type info
		/// (corresponding to the queries in the [prepare](prepare) module).
		#[derive(Default)]
		struct CachedTypeInfo {
		/// A statement for basic information for a type from its
		/// OID. Corresponds to [TYPEINFO_QUERY](prepare::TYPEINFO_QUERY) (or its
		/// fallback).
		typeinfo: Option<Statement>,
		/// A statement for getting information for a composite type from its OID.
		/// Corresponds to [TYPEINFO_QUERY](prepare::TYPEINFO_COMPOSITE_QUERY).
		typeinfo_composite: Option<Statement>,
		/// A statement for getting information for a composite type from its OID.
		/// Corresponds to [TYPEINFO_QUERY](prepare::TYPEINFO_COMPOSITE_QUERY) (or
		/// its fallback).
		typeinfo_enum: Option<Statement>,

		/// Cache of types already looked up.
		types: HashMap<Oid, Type>,
		buf: BytesMut,
		}

		pub struct InnerClient {
		sender: mpsc::UnboundedSender<Request>,
		state: Mutex<State>,
		cached_typeinfo: Mutex<CachedTypeInfo>,

		/// A buffer to use when writing out postgres commands.
		buffer: Mutex<BytesMut>,
erikjohnston marked this conversation as resolved. Show resolvedHide resolved
		}

		impl InnerClient {
Expand All		@@ -82,48 +97,50 @@ impl InnerClient {
		}

		pub fn typeinfo(&self) -> Option<Statement> {
		self.state.lock().typeinfo.clone()
		self.cached_typeinfo.lock().typeinfo.clone()
		}

		pub fn set_typeinfo(&self, statement: &Statement) {
		self.state.lock().typeinfo = Some(statement.clone());
		self.cached_typeinfo.lock().typeinfo = Some(statement.clone());
		}

		pub fn typeinfo_composite(&self) -> Option<Statement> {
		self.state.lock().typeinfo_composite.clone()
		self.cached_typeinfo.lock().typeinfo_composite.clone()
		}

		pub fn set_typeinfo_composite(&self, statement: &Statement) {
		self.state.lock().typeinfo_composite = Some(statement.clone());
		self.cached_typeinfo.lock().typeinfo_composite = Some(statement.clone());
		}

		pub fn typeinfo_enum(&self) -> Option<Statement> {
		self.state.lock().typeinfo_enum.clone()
		self.cached_typeinfo.lock().typeinfo_enum.clone()
		}

		pub fn set_typeinfo_enum(&self, statement: &Statement) {
		self.state.lock().typeinfo_enum = Some(statement.clone());
		self.cached_typeinfo.lock().typeinfo_enum = Some(statement.clone());
		}

		pub fn type_(&self, oid: Oid) -> Option<Type> {
		self.state.lock().types.get(&oid).cloned()
		self.cached_typeinfo.lock().types.get(&oid).cloned()
		}

		pub fn set_type(&self, oid: Oid, type_: &Type) {
		self.state.lock().types.insert(oid, type_.clone());
		self.cached_typeinfo.lock().types.insert(oid, type_.clone());
		}

		pub fn clear_type_cache(&self) {
		self.state.lock().types.clear();
		self.cached_typeinfo.lock().types.clear();
		}

		/// Call the given function with a buffer to be used when writing out
		/// postgres commands.
		pub fn with_buf<F, R>(&self, f: F) -> R
		where
		F: FnOnce(&mut BytesMut) -> R,
		{
		let mutstate = self.state.lock();
		let r = f(&mutstate.buf);
		state.buf.clear();
		let mutbuffer = self.buffer.lock();
		let r = f(&mutbuffer);
		buffer.clear();
		r
		}
		}
Expand DownExpand Up		@@ -160,13 +177,8 @@ impl Client {
		Client {
		inner: Arc::new(InnerClient {
		sender,
		state: Mutex::new(State {
		typeinfo: None,
		typeinfo_composite: None,
		typeinfo_enum: None,
		types: HashMap::new(),
		buf: BytesMut::new(),
		}),
		cached_typeinfo: Default::default(),
		buffer: Default::default(),
		}),
		#[cfg(feature = "runtime")]
		socket_config: None,
Expand Down