diff --git a/be/src/olap/rowset/segment_v2/segment.cpp b/be/src/olap/rowset/segment_v2/segment.cpp
index 5ba2d5a5078be2..86f5eecc39dfb9 100644
--- a/be/src/olap/rowset/segment_v2/segment.cpp
+++ b/be/src/olap/rowset/segment_v2/segment.cpp
@@ -469,8 +469,7 @@ Status Segment::lookup_row_key(const Slice& key, bool with_seq_col, bool with_ro
             return Status::Error<ErrorCode::KEY_ALREADY_EXISTS>(
                     "key with higher sequence id exists");
         }
-    }
-    if (!has_seq_col && has_rowid) {
+    } else if (has_rowid) {
         Slice sought_key_without_rowid =
                 Slice(sought_key.get_data(), sought_key.get_size() - rowid_length);
         // compare key
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup b/fe/fe-core/src/main/cup/sql_parser.cup
index 7aade2756f6948..5c0719cb6cad04 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -849,7 +849,6 @@ nonterminal DistributionDesc opt_distribution;
 nonterminal Integer opt_distribution_number;
 nonterminal Long opt_field_length;
 nonterminal KeysDesc opt_keys;
-nonterminal KeysDesc opt_mv_keys;
 nonterminal List<String> opt_cluster_keys;
 nonterminal Long opt_id;
 
diff --git a/regression-test/data/point_query_p0/test_point_query_cluster_key.out b/regression-test/data/point_query_p0/test_point_query_cluster_key.out
index 71a6c480d4b09c..d23a62474c3388 100644
--- a/regression-test/data/point_query_p0/test_point_query_cluster_key.out
+++ b/regression-test/data/point_query_p0/test_point_query_cluster_key.out
@@ -1,9 +1,9 @@
 -- This file is automatically generated. You should know what you did if you want to edit this
 -- !point_select --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, NULL]
+1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, null]
 
 -- !point_select --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, NULL]
+1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, null]
 
 -- !point_select --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01 12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]
@@ -63,7 +63,7 @@
 1235	120939.111300000	a    ddd	xxxxxx	2030-01-02	2020-01-01 12:36:38	22.822	7022-01-01	false	1929111.111	[119291.192910000]	["111", "222", "333"]	2	0
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
@@ -72,13 +72,13 @@
 6120202020646464	6C616F6F71	32.92200050354004
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
@@ -87,10 +87,10 @@
 0	1	2	3
 
 -- !point_select --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, NULL]
+1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, null]
 
 -- !point_select --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, NULL]
+1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, null]
 
 -- !point_select --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01 12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]
@@ -150,7 +150,7 @@
 1235	120939.111300000	a    ddd	xxxxxx	2030-01-02	2020-01-01 12:36:38	22.822	7022-01-01	false	1929111.111	[119291.192910000]	["111", "222", "333"]	2	0
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
@@ -159,13 +159,13 @@
 6120202020646464	6C616F6F71	32.92200050354004
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
@@ -174,10 +174,10 @@
 0	1	2	3
 
 -- !point_select --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, NULL]
+1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, null]
 
 -- !point_select --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, NULL]
+1231	119291.110000000	ddd	laooq	\N	2020-01-01 12:36:38	\N	1022-01-01	\N	1.111	\N	[119181.111100000, 819019.119100000, null]
 
 -- !point_select --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01 12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]
@@ -237,7 +237,7 @@
 1235	120939.111300000	a    ddd	xxxxxx	2030-01-02	2020-01-01 12:36:38	22.822	7022-01-01	false	1929111.111	[119291.192910000]	["111", "222", "333"]	2	0
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
@@ -246,13 +246,13 @@
 6120202020646464	6C616F6F71	32.92200050354004
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0
 
 -- !sql --
-1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, NULL]	\N	0	0
+1231	119291.110000000	ddd	laooq	\N	2020-01-01T12:36:38	\N	1022-01-01	\N	1.111	[119181.111100000, 819019.119100000, null]	\N	0	0
 
 -- !sql --
 1237	120939.111300000	a    ddd	laooq	2030-01-02	2020-01-01T12:36:38	22.822	7022-01-01	false	90696620686827832.374	[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]	[]	0	0