fix conflicts

Signed-off-by: guo-shaoge <[email protected]>
pingcap · Jun 25, 2021 · 36c36ee · 36c36ee
1 parent 95a0650
commit 36c36ee
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/expression/expression.go b/expression/expression.go
@@ -1023,9 +1023,7 @@ func canFuncBePushed(sf *ScalarFunction, storeType kv.StoreType) bool {
 		// json functions.
 		ast.JSONType,
 		ast.JSONExtract,
-		// FIXME: JSONUnquote is incompatible with Coprocessor
-<<<<<<< HEAD
-		// ast.JSONUnquote,
+		ast.JSONUnquote,
 		ast.JSONObject,
 		ast.JSONArray,
 		ast.JSONMerge,
@@ -1034,9 +1032,6 @@ func canFuncBePushed(sf *ScalarFunction, storeType kv.StoreType) bool {
 		// ast.JSONReplace,
 		ast.JSONRemove,
 		ast.JSONLength,
-=======
-		ast.JSONUnquote,
->>>>>>> bd8d3b1a8... expression: uncomment pushdown for JSONUnquote expression (#24504)
 
 		// date functions.
 		ast.DateFormat,