Merge pull request databendlabs#1172 from sundy-li/typo

[typo] JSONEachRaw => JSONEachRow
rahuahua · Jul 23, 2021 · f66beab · f66beab
2 parents 79e3a99 + 825b355
commit f66beab
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/common/planners/src/plan_display_test.rs b/common/planners/src/plan_display_test.rs
@@ -26,7 +26,7 @@ fn test_plan_display_indent() -> Result<()> {
         db: "foo".into(),
         table: "bar".into(),
         schema,
-        engine: TableEngineType::JsonEachRaw,
+        engine: TableEngineType::JSONEachRow,
         options,
     });
 

diff --git a/common/planners/src/plan_table_create.rs b/common/planners/src/plan_table_create.rs
@@ -10,7 +10,7 @@ use common_datavalues::DataSchemaRef;
 #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)]
 pub enum TableEngineType {
     /// Newline-delimited JSON
-    JsonEachRaw,
+    JSONEachRow,
     /// Apache Parquet columnar store
     Parquet,
     /// Comma separated values
@@ -23,7 +23,7 @@ pub enum TableEngineType {
 impl ToString for TableEngineType {
     fn to_string(&self) -> String {
         match self {
-            TableEngineType::JsonEachRaw => "JSON".into(),
+            TableEngineType::JSONEachRow => "JSON".into(),
             TableEngineType::Parquet => "Parquet".into(),
             TableEngineType::Csv => "CSV".into(),
             TableEngineType::Null => "Null".into(),

diff --git a/fusequery/query/src/sql/sql_parser.rs b/fusequery/query/src/sql/sql_parser.rs
@@ -448,17 +448,17 @@ impl<'a> DfParser<'a> {
         match self.parser.next_token() {
             Token::Word(w) => match &*w.value {
                 "Parquet" => Ok(TableEngineType::Parquet),
-                "JSONEachRaw" => Ok(TableEngineType::JsonEachRaw),
+                "JSONEachRow" => Ok(TableEngineType::JSONEachRow),
                 "CSV" => Ok(TableEngineType::Csv),
                 "Null" => Ok(TableEngineType::Null),
                 "Memory" => Ok(TableEngineType::Memory),
                 _ => self.expected(
-                    "Engine must one of Parquet, JSONEachRaw, Null or CSV",
+                    "Engine must be one of Parquet, JSONEachRow, Null, Memory or CSV",
                     Token::Word(w),
                 ),
             },
             unexpected => self.expected(
-                "Engine must one of Parquet, JSONEachRaw, Null or CSV",
+                "Engine must be one of Parquet, JSONEachRow, Null, Memory or CSV",
                 unexpected,
             ),
         }

diff --git a/fusequery/query/src/sql/sql_parser_test.rs b/fusequery/query/src/sql/sql_parser_test.rs
@@ -162,7 +162,7 @@ mod tests {
         let sql = "CREATE TABLE t(c1 int) ENGINE = XX location = 'foo.parquet' ";
         expect_parse_error(
             sql,
-            "Expected Engine must one of Parquet, JSONEachRaw, Null or CSV, found: XX",
+            "Expected Engine must be one of Parquet, JSONEachRow, Null, Memory or CSV, found: XX",
         )?;
 
         Ok(())

diff --git a/fusestore/store/src/api/rpc/flight_service_test.rs b/fusestore/store/src/api/rpc/flight_service_test.rs
@@ -141,7 +141,7 @@ async fn test_flight_create_get_table() -> anyhow::Result<()> {
             // TODO check get_table
             options: maplit::hashmap! {"opt‐1".into() => "val-1".into()},
             // TODO
-            engine: TableEngineType::JsonEachRaw,
+            engine: TableEngineType::JSONEachRow,
         };
 
         {

diff --git a/fusestore/store/src/executor/action_handler_test.rs b/fusestore/store/src/executor/action_handler_test.rs
@@ -353,7 +353,7 @@ async fn test_action_handler_create_table() -> anyhow::Result<()> {
             db: db_name.to_string(),
             table: table_name.to_string(),
             schema: schema.clone(),
-            engine: TableEngineType::JsonEachRaw,
+            engine: TableEngineType::JSONEachRow,
             options: Default::default(),
         };
         let want = match want {
@@ -498,7 +498,7 @@ async fn test_action_handler_get_table() -> anyhow::Result<()> {
                 db: "foo".to_string(),
                 table: "foo_t1".to_string(),
                 schema: schema.clone(),
-                engine: TableEngineType::JsonEachRaw,
+                engine: TableEngineType::JSONEachRow,
                 options: Default::default(),
             };
             let cta = CreateTableAction { plan };
@@ -608,7 +608,7 @@ async fn test_action_handler_drop_table() -> anyhow::Result<()> {
                 db: "foo".to_string(),
                 table: "foo_t1".to_string(),
                 schema: schema.clone(),
-                engine: TableEngineType::JsonEachRaw,
+                engine: TableEngineType::JSONEachRow,
                 options: Default::default(),
             };
             let cta = CreateTableAction { plan };

diff --git a/...ite/datafuse/docs/sqlstatement/data-definition-language-ddl/ddl-create-table.md b/...ite/datafuse/docs/sqlstatement/data-definition-language-ddl/ddl-create-table.md
@@ -17,7 +17,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name
 ```
 
 !!! note
-    Local engine is one of `Memory`, `Parquet`, `JSONEachRaw`, `Null` or `CSV`, data will be stored in the FuseQuery memory/disk locally.
+    Local engine is one of `Memory`, `Parquet`, `JSONEachRow`, `Null` or `CSV`, data will be stored in the FuseQuery memory/disk locally.
 
     Remote engine is `remote`, will be stored in the remote FuseStore cluster.