Skip to content

Commit f5db573

Browse files
author
fn500i
committed
cleaning up interval
Signed-off-by: fn500i <[email protected]>
1 parent fbfc71a commit f5db573

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,8 @@ tremor-script/current_counterexample.eqc
5353
.vscode/configurationCache.log
5454
.vscode/dryrun.log
5555
tremor-script-nif/libpath
56+
.idea/.gitignore
57+
.idea/modules.xml
58+
.idea/tremor-runtime.iml
59+
.idea/vcs.xml
60+
tree.txt

src/connectors/impls/psql_repl.rs

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ use crate::{
1818
errors::already_created_error,
1919
};
2020
use crate::connectors::prelude::*;
21-
use tremor_common::time::nanotime;
22-
2321
use mz_postgres_util::{Config as MzConfig};
2422
use tokio::task;
2523
use tokio_postgres::config::Config as TokioPgConfig;
@@ -28,8 +26,6 @@ mod postgres_replication;
2826
#[derive(Deserialize, Debug, Clone)]
2927
#[serde(deny_unknown_fields)]
3028
pub(crate) struct Config {
31-
/// Interval in nanoseconds
32-
pub interval: u64,
3329
/// Host name
3430
pub host: String,
3531
/// Port number
@@ -63,19 +59,16 @@ impl ConnectorBuilder for Builder {
6359
let config = Config::new(raw)?;
6460
let origin_uri = EventOriginUri {
6561
scheme: "tremor-psql-repl".to_string(),
66-
host: config.host,
67-
port: Option::from(config.port),
68-
path: vec![config.interval.to_string()],
62+
host: config.host.clone(),
63+
port: Option::from(config.port.clone()),
64+
path: vec![config.host.to_string()],
6965
};
70-
let database = config.dbname;
71-
let username = config.username;
72-
let password = config.password;
73-
let pg_config= TokioPgConfig::from_str(&format!("host={} port=5432 user={} password={} dbname={}", origin_uri.host, username, password, database))?;
66+
67+
let pg_config= TokioPgConfig::from_str(&format!("host={} port={} user={} password={} dbname={}", config.host, config.port, config.username, config.password, config.dbname))?;
7468
let connection_config = MzConfig::new(pg_config, mz_postgres_util::TunnelConfig::Direct)?;
7569
let (tx,rx) = bounded(qsize());
7670

7771
Ok(Box::new(PostgresReplication {
78-
interval: config.interval,
7972
connection_config,
8073
origin_uri,
8174
rx: Some(rx),
@@ -86,7 +79,6 @@ impl ConnectorBuilder for Builder {
8679

8780
#[derive(Debug)]
8881
pub(crate) struct PostgresReplication {
89-
interval: u64,
9082
connection_config : MzConfig,
9183
origin_uri: EventOriginUri,
9284
rx : Option<Receiver<Value<'static>>>,
@@ -101,7 +93,6 @@ impl Connector for PostgresReplication {
10193
builder: SourceManagerBuilder,
10294
) -> Result<Option<SourceAddr>> {
10395
let source = PostgresReplicationSource::new(
104-
self.interval,
10596
self.connection_config.clone(),
10697
self.rx.take().ok_or_else(already_created_error)?,
10798
self.tx.clone(),
@@ -115,22 +106,18 @@ impl Connector for PostgresReplication {
115106
}
116107

117108
struct PostgresReplicationSource {
118-
interval_ns: u64,
119-
next: u64,
120109
connection_config : MzConfig,
121110
rx: Receiver<Value<'static>>,
122111
tx: Sender<Value<'static>>,
123112
origin_uri: EventOriginUri,
124113
}
125114

126115
impl PostgresReplicationSource {
127-
fn new(interval_ns: u64, connection_config: MzConfig, rx: Receiver<Value<'static>>, tx: Sender<Value<'static>>, origin_uri: EventOriginUri) -> Self {
116+
fn new(connection_config: MzConfig, rx: Receiver<Value<'static>>, tx: Sender<Value<'static>>, origin_uri: EventOriginUri) -> Self {
128117
Self {
129-
interval_ns,
130118
connection_config,
131119
rx,
132120
tx,
133-
next: nanotime() + interval_ns, // dummy placeholer
134121
origin_uri,
135122
}
136123
}
@@ -139,8 +126,6 @@ impl PostgresReplicationSource {
139126
#[async_trait::async_trait()]
140127
impl Source for PostgresReplicationSource {
141128
async fn connect(&mut self, _ctx: &SourceContext, _attempt: &Attempt) -> Result<bool> {
142-
self.next = nanotime() + self.interval_ns;
143-
// postgres_replication::replication(self.connection_config.clone(),self.tx.clone()).await?;
144129
let conn_config = self.connection_config.clone();
145130
let tx = self.tx.clone();
146131
task::spawn(async move {postgres_replication::replication(conn_config,tx).await.unwrap();});

0 commit comments

Comments
 (0)