Skip to content

Commit 8c20d39

Browse files
Lorak-mmkLorak-mmk
authored
Merge pull request #846 from nsipplswezey/examples-fix-table-names
Explicit table naming in examples to prevent errors from shared tables across examples
2 parents e86823b + 86e42f6 commit 8c20d39

20 files changed

+229
-107
lines changed

‎examples/allocations.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ async fn main() -> Result<()> {
131131
let session: Session = SessionBuilder::new().known_node(args.node).build().await?;
132132
let session = Arc::new(session);
133133

134-
session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
134+
session.query("CREATE KEYSPACE IF NOT EXISTS examples_ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
135135
session.await_schema_agreement().await.unwrap();
136136

137137
session
138138
.query(
139-
"CREATE TABLE IF NOT EXISTS ks.alloc_test (a int, b int, c text, primary key (a, b))",
139+
"CREATE TABLE IF NOT EXISTS examples_ks.allocations (a int, b int, c text, primary key (a, b))",
140140
&[],
141141
)
142142
.await?;
@@ -145,13 +145,13 @@ async fn main() -> Result<()> {
145145

146146
let prepared_inserts = Arc::new(
147147
session
148-
.prepare("INSERT INTO ks.alloc_test (a, b, c) VALUES (?, ?, 'abc')")
148+
.prepare("INSERT INTO examples_ks.allocations (a, b, c) VALUES (?, ?, 'abc')")
149149
.await?,
150150
);
151151

152152
let prepared_selects = Arc::new(
153153
session
154-
.prepare("SELECT * FROM ks.alloc_test WHERE a = ? and b = ?")
154+
.prepare("SELECT * FROM examples_ks.allocations WHERE a = ? and b = ?")
155155
.await?,
156156
);
157157

‎examples/auth.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ async fn main() -> Result<()> {
1414
.await
1515
.unwrap();
1616

17-
session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await.unwrap();
17+
session.query("CREATE KEYSPACE IF NOT EXISTS examples_ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await.unwrap();
1818
session
19-
.query("DROP TABLE IF EXISTS ks.t;", &[])
19+
.query("DROP TABLE IF EXISTS examples_ks.auth;", &[])
2020
.await
2121
.unwrap();
2222

‎examples/basic.rs‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,31 @@ async fn main() -> Result<()> {
1212

1313
let session: Session = SessionBuilder::new().known_node(uri).build().await?;
1414

15-
session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
15+
session.query("CREATE KEYSPACE IF NOT EXISTS examples_ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
1616

1717
session
1818
.query(
19-
"CREATE TABLE IF NOT EXISTS ks.t (a int, b int, c text, primary key (a, b))",
19+
"CREATE TABLE IF NOT EXISTS examples_ks.basic (a int, b int, c text, primary key (a, b))",
2020
&[],
2121
)
2222
.await?;
2323

2424
session
25-
.query("INSERT INTO ks.t (a, b, c) VALUES (?, ?, ?)", (3, 4, "def"))
25+
.query(
26+
"INSERT INTO examples_ks.basic (a, b, c) VALUES (?, ?, ?)",
27+
(3, 4, "def"),
28+
)
2629
.await?;
2730

2831
session
29-
.query("INSERT INTO ks.t (a, b, c) VALUES (1, 2, 'abc')", &[])
32+
.query(
33+
"INSERT INTO examples_ks.basic (a, b, c) VALUES (1, 2, 'abc')",
34+
&[],
35+
)
3036
.await?;
3137

3238
let prepared = session
33-
.prepare("INSERT INTO ks.t (a, b, c) VALUES (?, 7, ?)")
39+
.prepare("INSERT INTO examples_ks.basic (a, b, c) VALUES (?, 7, ?)")
3440
.await?;
3541
session
3642
.execute(&prepared, (42_i32, "I'm prepared!"))
@@ -43,7 +49,11 @@ async fn main() -> Result<()> {
4349
.await?;
4450

4551
// Rows can be parsed as tuples
46-
if let Some(rows) = session.query("SELECT a, b, c FROM ks.t", &[]).await?.rows {
52+
if let Some(rows) = session
53+
.query("SELECT a, b, c FROM examples_ks.basic", &[])
54+
.await?
55+
.rows
56+
{
4757
for row in rows.into_typed::<(i32, i32, String)>() {
4858
let (a, b, c) = row?;
4959
println!("a, b, c: {}, {}, {}", a, b, c);
@@ -58,15 +68,23 @@ async fn main() -> Result<()> {
5868
_c: String,
5969
}
6070

61-
if let Some(rows) = session.query("SELECT a, b, c FROM ks.t", &[]).await?.rows {
71+
if let Some(rows) = session
72+
.query("SELECT a, b, c FROM examples_ks.basic", &[])
73+
.await?
74+
.rows
75+
{
6276
for row_data in rows.into_typed::<RowData>() {
6377
let row_data = row_data?;
6478
println!("row_data: {:?}", row_data);
6579
}
6680
}
6781

6882
// Or simply as untyped rows
69-
if let Some(rows) = session.query("SELECT a, b, c FROM ks.t", &[]).await?.rows {
83+
if let Some(rows) = session
84+
.query("SELECT a, b, c FROM examples_ks.basic", &[])
85+
.await?
86+
.rows
87+
{
7088
for row in rows {
7189
let a = row.columns[0].as_ref().unwrap().as_int().unwrap();
7290
let b = row.columns[1].as_ref().unwrap().as_int().unwrap();

‎examples/cloud.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ async fn main() -> Result<()> {
1616
.await
1717
.unwrap();
1818

19-
session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}",
19+
session.query("CREATE KEYSPACE IF NOT EXISTS examples_ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}",
2020
&[]).await.unwrap();
2121
session
22-
.query("DROP TABLE IF EXISTS ks.t;", &[])
22+
.query("DROP TABLE IF EXISTS examples_ks.cloud;", &[])
2323
.await
2424
.unwrap();
2525

‎examples/compare-tokens.rs‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,25 @@ async fn main() -> Result<()> {
1212

1313
let session: Session = SessionBuilder::new().known_node(uri).build().await?;
1414

15-
session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
15+
session.query("CREATE KEYSPACE IF NOT EXISTS examples_ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
1616

1717
session
1818
.query(
19-
"CREATE TABLE IF NOT EXISTS ks.t (pk bigint primary key)",
19+
"CREATE TABLE IF NOT EXISTS examples_ks.compare_tokens (pk bigint primary key)",
2020
&[],
2121
)
2222
.await?;
2323

24-
let prepared = session.prepare("INSERT INTO ks.t (pk) VALUES (?)").await?;
24+
let prepared = session
25+
.prepare("INSERT INTO examples_ks.compare_tokens (pk) VALUES (?)")
26+
.await?;
2527

2628
for pk in (0..100_i64).chain(99840..99936_i64) {
2729
session
28-
.query("INSERT INTO ks.t (pk) VALUES (?)", (pk,))
30+
.query(
31+
"INSERT INTO examples_ks.compare_tokens (pk) VALUES (?)",
32+
(pk,),
33+
)
2934
.await?;
3035

3136
let t = prepared.calculate_token(&(pk,))?.unwrap().value;
@@ -34,14 +39,20 @@ async fn main() -> Result<()> {
3439
"Token endpoints for query: {:?}",
3540
session
3641
.get_cluster_data()
37-
.get_token_endpoints("ks", Token { value: t })
42+
.get_token_endpoints("examples_ks", Token { value: t })
3843
.iter()
3944
.map(|n| n.address)
4045
.collect::<Vec<NodeAddr>>()
4146
);
4247

4348
let qt = session
44-
.query(format!("SELECT token(pk) FROM ks.t where pk = {}", pk), &[])
49+
.query(
50+
format!(
51+
"SELECT token(pk) FROM examples_ks.compare_tokens where pk = {}",
52+
pk
53+
),
54+
&[],
55+
)
4556
.await?
4657
.rows
4758
.unwrap()

‎examples/cql-time-types.rs‎

Lines changed: 61 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ async fn main() -> Result<()> {
1717

1818
let session: Session = SessionBuilder::new().known_node(uri).build().await?;
1919

20-
session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
20+
session.query("CREATE KEYSPACE IF NOT EXISTS examples_ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
2121

2222
// Date
2323
// Date is a year, month and day in the range -5877641-06-23 to -5877641-06-23
2424

2525
session
2626
.query(
27-
"CREATE TABLE IF NOT EXISTS ks.dates (d date primary key)",
27+
"CREATE TABLE IF NOT EXISTS examples_ks.dates (d date primary key)",
2828
&[],
2929
)
3030
.await?;
@@ -34,10 +34,17 @@ async fn main() -> Result<()> {
3434
let chrono_date = NaiveDate::from_ymd_opt(2020, 2, 20).unwrap();
3535

3636
session
37-
.query("INSERT INTO ks.dates (d) VALUES (?)", (chrono_date,))
37+
.query(
38+
"INSERT INTO examples_ks.dates (d) VALUES (?)",
39+
(chrono_date,),
40+
)
3841
.await?;
3942

40-
if let Some(rows) = session.query("SELECT d from ks.dates", &[]).await?.rows {
43+
if let Some(rows) = session
44+
.query("SELECT d from examples_ks.dates", &[])
45+
.await?
46+
.rows
47+
{
4148
for row in rows.into_typed::<(NaiveDate,)>() {
4249
let (read_date,): (NaiveDate,) = match row {
4350
Ok(read_date) => read_date,
@@ -54,10 +61,14 @@ async fn main() -> Result<()> {
5461
let time_date = time::Date::from_calendar_date(2020, time::Month::March, 21).unwrap();
5562

5663
session
57-
.query("INSERT INTO ks.dates (d) VALUES (?)", (time_date,))
64+
.query("INSERT INTO examples_ks.dates (d) VALUES (?)", (time_date,))
5865
.await?;
5966

60-
if let Some(rows) = session.query("SELECT d from ks.dates", &[]).await?.rows {
67+
if let Some(rows) = session
68+
.query("SELECT d from examples_ks.dates", &[])
69+
.await?
70+
.rows
71+
{
6172
for row in rows.into_typed::<(time::Date,)>() {
6273
let (read_date,) = match row {
6374
Ok(read_date) => read_date,
@@ -71,10 +82,17 @@ async fn main() -> Result<()> {
7182
// Dates outside this range must be represented in the raw form - an u32 describing days since -5877641-06-23
7283
let example_big_date: CqlDate = CqlDate(u32::MAX);
7384
session
74-
.query("INSERT INTO ks.dates (d) VALUES (?)", (example_big_date,))
85+
.query(
86+
"INSERT INTO examples_ks.dates (d) VALUES (?)",
87+
(example_big_date,),
88+
)
7589
.await?;
7690

77-
if let Some(rows) = session.query("SELECT d from ks.dates", &[]).await?.rows {
91+
if let Some(rows) = session
92+
.query("SELECT d from examples_ks.dates", &[])
93+
.await?
94+
.rows
95+
{
7896
for row in rows {
7997
let read_days: u32 = match row.columns[0] {
8098
Some(CqlValue::Date(CqlDate(days))) => days,
@@ -90,7 +108,7 @@ async fn main() -> Result<()> {
90108

91109
session
92110
.query(
93-
"CREATE TABLE IF NOT EXISTS ks.times (t time primary key)",
111+
"CREATE TABLE IF NOT EXISTS examples_ks.times (t time primary key)",
94112
&[],
95113
)
96114
.await?;
@@ -102,10 +120,17 @@ async fn main() -> Result<()> {
102120
let chrono_time = NaiveTime::from_hms_nano_opt(1, 2, 3, 456_789_012).unwrap();
103121

104122
session
105-
.query("INSERT INTO ks.times (t) VALUES (?)", (chrono_time,))
123+
.query(
124+
"INSERT INTO examples_ks.times (t) VALUES (?)",
125+
(chrono_time,),
126+
)
106127
.await?;
107128

108-
if let Some(rows) = session.query("SELECT t from ks.times", &[]).await?.rows {
129+
if let Some(rows) = session
130+
.query("SELECT t from examples_ks.times", &[])
131+
.await?
132+
.rows
133+
{
109134
for row in rows.into_typed::<(NaiveTime,)>() {
110135
let (read_time,) = row?;
111136

@@ -117,10 +142,14 @@ async fn main() -> Result<()> {
117142
let time_time = time::Time::from_hms_nano(2, 3, 4, 567_890_123).unwrap();
118143

119144
session
120-
.query("INSERT INTO ks.times (t) VALUES (?)", (time_time,))
145+
.query("INSERT INTO examples_ks.times (t) VALUES (?)", (time_time,))
121146
.await?;
122147

123-
if let Some(rows) = session.query("SELECT t from ks.times", &[]).await?.rows {
148+
if let Some(rows) = session
149+
.query("SELECT t from examples_ks.times", &[])
150+
.await?
151+
.rows
152+
{
124153
for row in rows.into_typed::<(time::Time,)>() {
125154
let (read_time,) = row?;
126155

@@ -132,10 +161,14 @@ async fn main() -> Result<()> {
132161
let time_time = CqlTime(((3 * 60 + 4) * 60 + 5) * 1_000_000_000 + 678_901_234);
133162

134163
session
135-
.query("INSERT INTO ks.times (t) VALUES (?)", (time_time,))
164+
.query("INSERT INTO examples_ks.times (t) VALUES (?)", (time_time,))
136165
.await?;
137166

138-
if let Some(rows) = session.query("SELECT t from ks.times", &[]).await?.rows {
167+
if let Some(rows) = session
168+
.query("SELECT t from examples_ks.times", &[])
169+
.await?
170+
.rows
171+
{
139172
for row in rows.into_typed::<(CqlTime,)>() {
140173
let (read_time,) = row?;
141174

@@ -148,7 +181,7 @@ async fn main() -> Result<()> {
148181

149182
session
150183
.query(
151-
"CREATE TABLE IF NOT EXISTS ks.timestamps (t timestamp primary key)",
184+
"CREATE TABLE IF NOT EXISTS examples_ks.timestamps (t timestamp primary key)",
152185
&[],
153186
)
154187
.await?;
@@ -161,13 +194,13 @@ async fn main() -> Result<()> {
161194

162195
session
163196
.query(
164-
"INSERT INTO ks.timestamps (t) VALUES (?)",
197+
"INSERT INTO examples_ks.timestamps (t) VALUES (?)",
165198
(chrono_datetime,),
166199
)
167200
.await?;
168201

169202
if let Some(rows) = session
170-
.query("SELECT t from ks.timestamps", &[])
203+
.query("SELECT t from examples_ks.timestamps", &[])
171204
.await?
172205
.rows
173206
{
@@ -185,11 +218,14 @@ async fn main() -> Result<()> {
185218
let time_datetime = time::OffsetDateTime::now_utc();
186219

187220
session
188-
.query("INSERT INTO ks.timestamps (t) VALUES (?)", (time_datetime,))
221+
.query(
222+
"INSERT INTO examples_ks.timestamps (t) VALUES (?)",
223+
(time_datetime,),
224+
)
189225
.await?;
190226

191227
if let Some(rows) = session
192-
.query("SELECT t from ks.timestamps", &[])
228+
.query("SELECT t from examples_ks.timestamps", &[])
193229
.await?
194230
.rows
195231
{
@@ -207,11 +243,14 @@ async fn main() -> Result<()> {
207243
let cql_datetime = CqlTimestamp(1 << 31);
208244

209245
session
210-
.query("INSERT INTO ks.timestamps (t) VALUES (?)", (cql_datetime,))
246+
.query(
247+
"INSERT INTO examples_ks.timestamps (t) VALUES (?)",
248+
(cql_datetime,),
249+
)
211250
.await?;
212251

213252
if let Some(rows) = session
214-
.query("SELECT t from ks.timestamps", &[])
253+
.query("SELECT t from examples_ks.timestamps", &[])
215254
.await?
216255
.rows
217256
{

0 commit comments

Comments
 (0)