Revert "Workaround mariadb crazy slow query when using fulltext key."

This reverts commit 1159063c.

product/ZSQLCatalog/SearchKey/MroongaBooleanFullTextKey.py

@@ -35,6 +35,6 @@ class MroongaBooleanFullTextKey(MroongaFullTextKey):
     This SearchKey generates SQL fulltext comparisons for Mroonga whose
     default comparison operator is mroonga_boolean.
   """
-  default_fulltext_comparison_operator = 'mroonga_boolean'
+  default_comparison_operator = 'mroonga_boolean'
 
 verifyClass(ISearchKey, MroongaBooleanFullTextKey)

product/ZSQLCatalog/SearchKey/MroongaFullTextKey.py

@@ -26,14 +26,14 @@
 #
 ##############################################################################
 
-from KeywordKey import KeywordKey
+from DefaultKey import DefaultKey
 from Products.ZSQLCatalog.Query.SimpleQuery import SimpleQuery
 from Products.ZSQLCatalog.interfaces.search_key import ISearchKey
 from Products.ZSQLCatalog.SearchText import dequote
 from zope.interface.verify import verifyClass
 
-class MroongaFullTextKey(KeywordKey):
-  default_fulltext_comparison_operator = 'mroonga'
+class MroongaFullTextKey(DefaultKey):
+  default_comparison_operator = 'mroonga'
 
   def dequoteParsedText(self):
     return False
@@ -45,14 +45,6 @@ class MroongaFullTextKey(KeywordKey):
     # from fulltext='a b' that means fulltext search with (a AND b).
     return '(%s)' % (value, )
 
-  def _guessComparisonOperator(self, value):
-    if isinstance(value, basestring) and value[:1] in ('+', '-'):
-      operator = self.default_fulltext_comparison_operator
-    else:
-      operator = super(MroongaFullTextKey,
-                       self)._guessComparisonOperator(value)
-    return operator
-
   def _processSearchValue(self, search_value, logical_operator,
                           comparison_operator):
     operator_value_dict, logical_operator, parsed = \