wip

GreptimeTeam · Dec 1, 2024 · 7a59359 · 7a59359
1 parent c049ce6
commit 7a59359
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 9 deletions.
diff --git a/src/common/meta/src/ddl/alter_table/update_metadata.rs b/src/common/meta/src/ddl/alter_table/update_metadata.rs
@@ -56,7 +56,9 @@ impl AlterTableProcedure {
             | AlterKind::SetTableOptions { .. }
             | AlterKind::UnsetTableOptions { .. }
             | AlterKind::SetColumnFulltext { .. }
-            | AlterKind::UnsetColumnFulltext { .. } => {}
+            | AlterKind::UnsetColumnFulltext { .. }
+            | AlterKind::SetColumnInvertedIndex { .. }
+            | AlterKind::UnsetColumnInvertedIndex { .. } => {}
         }
 
         Ok(new_info)

diff --git a/src/operator/src/expr_factory.rs b/src/operator/src/expr_factory.rs
@@ -552,6 +552,22 @@ pub(crate) fn to_alter_table_expr(
             },
             case_sensitive: options.case_sensitive,
         }),
+        AlterTableOperation::UnsetColumnFulltext { column_name } => {
+            AlterTableKind::UnsetColumnFulltext(UnsetColumnFulltext {
+                column_name: column_name.value,
+            })
+        },
+        AlterTableOperation::SetColumnInvertedIndex {
+            column_name,
+        } => AlterTableKind::SetColumnFulltext(SetColumnFulltext {
+            column_name: column_name.value,
+            enable: options.enable,
+            analyzer: match options.analyzer {
+                FulltextAnalyzer::English => Analyzer::English.into(),
+                FulltextAnalyzer::Chinese => Analyzer::Chinese.into(),
+            },
+            case_sensitive: options.case_sensitive,
+        }),
         AlterTableOperation::UnsetColumnFulltext { column_name } => {
             AlterTableKind::UnsetColumnFulltext(UnsetColumnFulltext {
                 column_name: column_name.value,

diff --git a/src/sql/src/parsers/alter_parser.rs b/src/sql/src/parsers/alter_parser.rs
@@ -20,7 +20,7 @@ use snafu::{ensure, ResultExt};
 use sqlparser::ast::Ident;
 use sqlparser::keywords::Keyword;
 use sqlparser::parser::{Parser, ParserError};
-use sqlparser::tokenizer::Token;
+use sqlparser::tokenizer::{Token, TokenWithLocation};
 
 use crate::error::{self, InvalidColumnOptionSnafu, Result, SetFulltextOptionSnafu};
 use crate::parser::ParserContext;
@@ -31,6 +31,8 @@ use crate::statements::alter::{
 use crate::statements::statement::Statement;
 use crate::util::parse_option_string;
 
+use super::create_parser::INVERTED;
+
 impl ParserContext<'_> {
     pub(crate) fn parse_alter(&mut self) -> Result<Statement> {
         let _ = self.parser.expect_keyword(Keyword::ALTER);
@@ -226,13 +228,25 @@ impl ParserContext<'_> {
         match self.parser.peek_token().token {
             Token::Word(w) => {
                 if w.value.eq_ignore_ascii_case("UNSET") {
-                    let _ = self.parser.next_token();
-
-                    self.parser
-                        .expect_keyword(Keyword::FULLTEXT)
-                        .context(error::SyntaxSnafu)?;
-
-                    Ok(AlterTableOperation::UnsetColumnFulltext { column_name })
+                    match self.parser.next_token() {
+                        TokenWithLocation {
+                            token: Token::Word(w),
+                            ..
+                        } if w.keyword == Keyword::FULLTEXT => {    
+                            Ok(AlterTableOperation::UnsetColumnFulltext { column_name })
+                        },
+
+                        TokenWithLocation {
+                            token: Token::Word(w),
+                            ..
+                        } if  w.value.eq_ignore_ascii_case(INVERTED)=> {
+                            self.parser.expect_keyword(Keyword::INDEX).context(error::SyntaxSnafu)?;
+                            Ok(AlterTableOperation::UnsetColumnInvertedIndex { column_name })
+                        },
+                        _ => {
+                            self.expected(format!("{:?}", Keyword::FULLTEXT).as_str(), self.parser.peek_token())
+                        }
+                    }
                 } else if w.keyword == Keyword::SET {
                     self.parse_alter_column_fulltext(column_name)
                 } else {

diff --git a/src/sql/src/statements/alter.rs b/src/sql/src/statements/alter.rs
@@ -94,6 +94,15 @@ pub enum AlterTableOperation {
     UnsetColumnFulltext {
         column_name: Ident,
     },
+    /// `MODIFY COLUMN <column_name> SET INVERTED INDEX`
+    SetColumnInvertedIndex {
+        column_name: Ident,
+    },
+    /// `MODIFY COLUMN <column_name> UNSET INVERTED INDEX`
+    UnsetColumnInvertedIndex {
+        column_name: Ident,
+    },
+
 }
 
 impl Display for AlterTableOperation {
@@ -147,6 +156,14 @@ impl Display for AlterTableOperation {
             AlterTableOperation::UnsetColumnFulltext { column_name } => {
                 write!(f, "MODIFY COLUMN {column_name} UNSET FULLTEXT")
             }
+            AlterTableOperation::SetColumnInvertedIndex {
+                column_name,
+            } => {
+                write!(f, "MODIFY COLUMN {column_name} SET INVERTED INDEX")
+            }
+            AlterTableOperation::UnsetColumnInvertedIndex { column_name } => {
+                write!(f, "MODIFY COLUMN {column_name} UNSET INVERTED INDEX")
+            }
         }
     }
 }

diff --git a/src/table/src/requests.rs b/src/table/src/requests.rs
@@ -226,6 +226,12 @@ pub enum AlterKind {
     UnsetColumnFulltext {
         column_name: String,
     },
+    SetColumnInvertedIndex {
+        column_name: String,
+    },
+    UnsetColumnInvertedIndex {
+        column_name: String,
+    },
 }
 
 #[derive(Debug)]