rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-10 15:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade rust toolchain to latest nightly (#2049)

Browse Source 
* chore: upgrade rust toolchain to latest nightly

* rebase develop

* update rust toolchain in ci
This commit is contained in:
LFC
2023-08-08 15:17:51 +08:00
committed by GitHub
parent 7d0d8dc6e3
commit 46fa3eb629
127 changed files with 551 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests-integration/src/grpc.rs
View File

@@ -138,7 +138,9 @@ mod test {
)),
});
let output = query(instance, request).await;
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let expected = "\
+---------------------+---+---+
@@ -498,7 +500,9 @@ CREATE TABLE {table_name} (
))),
});
let output = query(instance, request.clone()).await;
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let expected = "\
+---------------------+----+-------------------+
@@ -574,7 +578,9 @@ CREATE TABLE {table_name} (
assert!(matches!(output, Output::AffectedRows(4)));
let output = query(instance, request).await;
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let expected = "\
+---------------------+----+-------------------+
@@ -638,7 +644,9 @@ CREATE TABLE {table_name} (
.await
.unwrap();
let output = engine.execute(plan, QueryContext::arc()).await.unwrap();
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let actual = recordbatches.pretty_print().unwrap();
@@ -724,7 +732,9 @@ CREATE TABLE {table_name} (
)),
});
let output = query(instance, request.clone()).await;
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let expected = "\
+---------------------+---+---+
@@ -759,7 +769,9 @@ CREATE TABLE {table_name} (
assert!(matches!(output, Output::AffectedRows(2)));
let output = query(instance, request).await;
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let expected = "\
+---------------------+---+---+
@@ -855,7 +867,9 @@ CREATE TABLE {table_name} (
})),
});
let output = query(instance, request).await;
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let expected = "\
+---+------+---------------------+

8
tests-integration/src/influxdb.rs
View File

@@ -73,7 +73,9 @@ monitor1,host=host2 memory=1027";
)
.await;
let output = output.remove(0).unwrap();
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let recordbatches: Vec<_> = recordbatches.iter().collect();
@@ -100,7 +102,9 @@ monitor1,host=host2 memory=1027 1663840496400340001";
)
.await;
let output = output.remove(0).unwrap();
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
assert_eq!(
recordbatches.pretty_print().unwrap(),

22
tests-integration/src/instance.rs
View File

@@ -141,7 +141,9 @@ mod tests {
async fn create_table(instance: &Instance, sql: &str) {
let output = query(instance, sql).await;
let Output::AffectedRows(x) = output else { unreachable!() };
let Output::AffectedRows(x) = output else {
unreachable!()
};
assert_eq!(x, 0);
}
@@ -153,12 +155,16 @@ mod tests {
('MOSS', 100000000, 10000000000, 2335190400000)
"#;
let output = query(instance, sql).await;
let Output::AffectedRows(x) = output else { unreachable!() };
let Output::AffectedRows(x) = output else {
unreachable!()
};
assert_eq!(x, 4);
let sql = "SELECT * FROM demo WHERE ts > cast(1000000000 as timestamp) ORDER BY host"; // use nanoseconds as where condition
let output = query(instance, sql).await;
let Output::Stream(s) = output else { unreachable!() };
let Output::Stream(s) = output else {
unreachable!()
};
let batches = common_recordbatch::util::collect_batches(s).await.unwrap();
let pretty_print = batches.pretty_print().unwrap();
let expected = "\
@@ -213,7 +219,9 @@ mod tests {
.await
.unwrap();
let output = engine.execute(plan, QueryContext::arc()).await.unwrap();
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
let actual = recordbatches.pretty_print().unwrap();
@@ -225,7 +233,9 @@ mod tests {
async fn drop_table(instance: &Instance) {
let sql = "DROP TABLE demo";
let output = query(instance, sql).await;
let Output::AffectedRows(x) = output else { unreachable!() };
let Output::AffectedRows(x) = output else {
unreachable!()
};
assert_eq!(x, 1);
}
@@ -362,7 +372,7 @@ mod tests {
let mut instance = standalone.instance;
let plugins = Plugins::new();
let hook = Arc::new(DisableDBOpHook::default());
let hook = Arc::new(DisableDBOpHook);
plugins.insert::<SqlQueryInterceptorRef<Error>>(hook.clone());
Arc::make_mut(&mut instance).set_plugins(Arc::new(plugins));

4
tests-integration/src/otlp.rs
View File

@@ -72,7 +72,9 @@ mod test {
)
.await;
let output = output.remove(0).unwrap();
let Output::Stream(stream) = output else { unreachable!() };
let Output::Stream(stream) = output else {
unreachable!()
};
let recordbatches = RecordBatches::try_collect(stream).await.unwrap();
assert_eq!(
recordbatches.pretty_print().unwrap(),

8
tests-integration/src/tests.rs
View File

@@ -37,7 +37,9 @@ impl MockDistributedInstance {
.storage_guards
.iter()
.map(|g| {
let TempDirGuard::File(dir) = &g.0 else { unreachable!() };
let TempDirGuard::File(dir) = &g.0 else {
unreachable!()
};
dir
})
.collect()
@@ -63,7 +65,9 @@ pub struct MockStandaloneInstance {
impl MockStandaloneInstance {
pub fn data_tmp_dir(&self) -> &TempDir {
let TempDirGuard::File(dir) = &self._guard.storage_guard.0 else { unreachable!() };
let TempDirGuard::File(dir) = &self._guard.storage_guard.0 else {
unreachable!()
};
dir
}
}

5
tests-integration/src/tests/promql_test.rs
View File

@@ -44,7 +44,10 @@ async fn create_insert_query_assert(
query: promql.to_string(),
..PromQuery::default()
};
let QueryStatement::Promql(mut eval_stmt) = QueryLanguageParser::parse_promql(&query).unwrap() else { unreachable!() };
let QueryStatement::Promql(mut eval_stmt) = QueryLanguageParser::parse_promql(&query).unwrap()
else {
unreachable!()
};
eval_stmt.start = start;
eval_stmt.end = end;
eval_stmt.interval = interval;