feat: opentsdb support (#274)

* feat: opentsdb support

* fix: tests

* fix: resolve CR comments

* fix: resolve CR comments

* fix: resolve CR comments

* fix: resolve CR comments

* refactor: remove feature flags for opentsdb and pg

* fix: resolve CR comments

* fix: resolve CR comments

Co-authored-by: luofucong <luofucong@greptime.com>

src/datanode/Cargo.toml

@@ -4,17 +4,16 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = ["python", "postgres"]
+default = ["python"]
 python = [
   "dep:script"
 ]
-postgres = ["servers/postgres"]
 
 [dependencies]
 api = { path = "../api" }
 async-trait = "0.1"
-axum = "0.5"
-axum-macros = "0.2"
+axum = "0.6.0-rc.2"
+axum-macros = "0.3.0-rc.1"
 catalog = { path = "../catalog" }
 common-base = { path = "../common/base" }
 common-error = { path = "../common/error" }

src/datanode/src/datanode.rs

@@ -26,9 +26,7 @@ pub struct DatanodeOptions {
     pub rpc_addr: String,
     pub mysql_addr: String,
     pub mysql_runtime_size: u32,
-    #[cfg(feature = "postgres")]
     pub postgres_addr: String,
-    #[cfg(feature = "postgres")]
     pub postgres_runtime_size: u32,
     pub wal_dir: String,
     pub storage: ObjectStoreConfig,
@@ -41,9 +39,7 @@ impl Default for DatanodeOptions {
             rpc_addr: "0.0.0.0:3001".to_string(),
             mysql_addr: "0.0.0.0:3306".to_string(),
             mysql_runtime_size: 2,
-            #[cfg(feature = "postgres")]
             postgres_addr: "0.0.0.0:5432".to_string(),
-            #[cfg(feature = "postgres")]
             postgres_runtime_size: 2,
             wal_dir: "/tmp/greptimedb/wal".to_string(),
             storage: ObjectStoreConfig::default(),

src/datanode/src/instance.rs

@@ -220,10 +220,9 @@ impl Instance {
     pub fn catalog_manager(&self) -> &CatalogManagerRef {
         &self.catalog_manager
     }
-}
 
-#[cfg(test)]
-impl Instance {
+    // This method is used in other crate's testing codes, so move it out of "cfg(test)".
+    // TODO(LFC): Delete it when callers no longer need it.
     pub async fn new_mock() -> Result<Self> {
         use table_engine::table::test_util::new_test_object_store;
         use table_engine::table::test_util::MockEngine;

src/datanode/src/server.rs

@@ -21,7 +21,6 @@ pub struct Services {
     http_server: HttpServer,
     grpc_server: GrpcServer,
     mysql_server: Box<dyn Server>,
-    #[cfg(feature = "postgres")]
     postgres_server: Box<dyn Server>,
 }
 
@@ -34,7 +33,6 @@ impl Services {
                 .build()
                 .context(error::RuntimeResourceSnafu)?,
         );
-        #[cfg(feature = "postgres")]
         let postgres_io_runtime = Arc::new(
             RuntimeBuilder::default()
                 .worker_threads(opts.postgres_runtime_size as usize)
@@ -46,7 +44,6 @@ impl Services {
             http_server: HttpServer::new(instance.clone()),
             grpc_server: GrpcServer::new(instance.clone(), instance.clone()),
             mysql_server: MysqlServer::create_server(instance.clone(), mysql_io_runtime),
-            #[cfg(feature = "postgres")]
             postgres_server: Box::new(PostgresServer::new(instance, postgres_io_runtime)),
         })
     }
@@ -65,7 +62,6 @@ impl Services {
             addr: &opts.mysql_addr,
         })?;
 
-        #[cfg(feature = "postgres")]
         let postgres_addr: SocketAddr =
             opts.postgres_addr.parse().context(error::ParseAddrSnafu {
                 addr: &opts.postgres_addr,
@@ -75,7 +71,6 @@ impl Services {
             self.http_server.start(http_addr),
             self.grpc_server.start(grpc_addr),
             self.mysql_server.start(mysql_addr),
-            #[cfg(feature = "postgres")]
             self.postgres_server.start(postgres_addr),
         )
         .context(error::StartServerSnafu)?;

src/datanode/src/tests/instance_test.rs

@@ -193,8 +193,6 @@ pub async fn test_create_table_illegal_timestamp_type() {
 
 #[tokio::test]
 async fn test_alter_table() {
-    common_telemetry::init_default_ut_logging();
-
     // TODO(LFC) Use real Mito engine when we can alter its region schema,
     //   and delete the `new_mock` method.
     let instance = Instance::new_mock().await.unwrap();
@@ -237,13 +235,13 @@ async fn test_alter_table() {
             let pretty_print = arrow_print::write(&recordbatch);
             let pretty_print = pretty_print.lines().collect::<Vec<&str>>();
             let expected = vec![
-                "+-------+---------------------+-----+--------+--------+",
-                "| host  | ts                  | cpu | memory | my_tag |",
-                "+-------+---------------------+-----+--------+--------+",
-                "| host1 | 1970-01-01 00:00:01 | 1.1 | 100    |        |",
-                "| host2 | 1970-01-01 00:00:02 | 2.2 | 200    | hello  |",
-                "| host3 | 1970-01-01 00:00:03 | 3.3 | 300    |        |",
-                "+-------+---------------------+-----+--------+--------+",
+                "+-------+-----+--------+---------------------+--------+",
+                "| host  | cpu | memory | ts                  | my_tag |",
+                "+-------+-----+--------+---------------------+--------+",
+                "| host1 | 1.1 | 100    | 1970-01-01 00:00:01 |        |",
+                "| host2 | 2.2 | 200    | 1970-01-01 00:00:02 | hello  |",
+                "| host3 | 3.3 | 300    | 1970-01-01 00:00:03 |        |",
+                "+-------+-----+--------+---------------------+--------+",
             ];
             assert_eq!(pretty_print, expected);
         }