Merge pull request databendlabs#2285 from drmingdrmer/rm-db-engine

[query] refactor: remove ExampleDatabase and ExampleDatabaseEngine
liyiiiiil · Oct 17, 2021 · 98e0774 · 98e0774
2 parents a3c33e2 + a9fd281
commit 98e0774
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 171 deletions.
diff --git a/query/src/datasources/database/example/example_database.rs b/query/src/datasources/database/example/example_database.rs
diff --git a/query/src/datasources/database/example/example_databases.rs b/query/src/datasources/database/example/example_databases.rs
diff --git a/query/src/datasources/database/example/mod.rs b/query/src/datasources/database/example/mod.rs
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod example_database;
-mod example_databases;
 mod example_table;
 
-pub use example_database::ExampleDatabase;
-pub use example_databases::ExampleDatabaseEngine;
 pub use example_table::ExampleTable;
diff --git a/query/src/datasources/database/system/engines_table_test.rs b/query/src/datasources/database/system/engines_table_test.rs
@@ -41,14 +41,13 @@ async fn test_engines_table() -> Result<()> {
     let result = stream.try_collect::<Vec<_>>().await?;
     let block = &result[0];
     assert_eq!(block.num_columns(), 2);
-    assert_eq!(block.num_rows(), 3);
+    assert_eq!(block.num_rows(), 2);
     // TODO rename to databend after merge
     let expected = vec![
     "+---------+-----------------------------------------------------------------------------------------------+",
     "| name    | description                                                                                   |",
     "+---------+-----------------------------------------------------------------------------------------------+",
     "| DEFAULT | default database engine, with embedded metastore backend                                      |",
-    "| EXAMPLE | The example engine is used by example databases and tables.                                   |",
     "| SYSTEM  | The system engine is used by tables in the system database, which store Databend information. |",
     "+---------+-----------------------------------------------------------------------------------------------+",
     ];

diff --git a/query/src/sessions/sessions.rs b/query/src/sessions/sessions.rs
@@ -28,11 +28,9 @@ use futures::future::Either;
 use metrics::counter;
 
 use crate::catalogs::impls::DatabaseCatalog;
-use crate::catalogs::Catalog;
 use crate::clusters::ClusterDiscovery;
 use crate::clusters::ClusterDiscoveryRef;
 use crate::configs::Config;
-use crate::datasources::database::example::ExampleDatabaseEngine;
 use crate::sessions::session::Session;
 use crate::sessions::session_ref::SessionRef;
 use crate::users::UserManager;
@@ -53,7 +51,7 @@ pub type SessionManagerRef = Arc<SessionManager>;
 impl SessionManager {
     pub async fn from_conf(conf: Config) -> Result<SessionManagerRef> {
         let catalog = Arc::new(DatabaseCatalog::try_create_with_config(conf.clone())?);
-        catalog.register_db_engine("example", Arc::new(ExampleDatabaseEngine::create()))?;
+        // catalog.register_db_engine("example", Arc::new(ExampleDatabaseEngine::create()))?;
 
         // Cluster discovery.
         let discovery = ClusterDiscovery::create_global(conf.clone()).await?;