diff options
Diffstat (limited to 'storage/innobase/fts/fts0que.cc')
| -rw-r--r-- | storage/innobase/fts/fts0que.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc index 47fd2a92331..4407224a24d 100644 --- a/storage/innobase/fts/fts0que.cc +++ b/storage/innobase/fts/fts0que.cc @@ -1146,7 +1146,7 @@ fts_query_difference( fts_cache_t* cache = table->fts->cache; dberr_t error; - rw_lock_x_lock(&cache->lock); + mysql_mutex_lock(&cache->lock); index_cache = fts_find_index_cache(cache, query->index); @@ -1172,7 +1172,7 @@ fts_query_difference( } } - rw_lock_x_unlock(&cache->lock); + mysql_mutex_unlock(&cache->lock); /* error is passed by 'query->error' */ if (query->error != DB_SUCCESS) { @@ -1194,7 +1194,7 @@ fts_query_difference( query->error = error; } - fts_que_graph_free(graph); + que_graph_free(graph); } /* The size can't increase. */ @@ -1279,7 +1279,7 @@ fts_query_intersect( /* Search the cache for a matching word first. */ - rw_lock_x_lock(&cache->lock); + mysql_mutex_lock(&cache->lock); /* Search for the index specific cache. */ index_cache = fts_find_index_cache(cache, query->index); @@ -1304,7 +1304,7 @@ fts_query_intersect( } } - rw_lock_x_unlock(&cache->lock); + mysql_mutex_unlock(&cache->lock); /* error is passed by 'query->error' */ if (query->error != DB_SUCCESS) { @@ -1327,7 +1327,7 @@ fts_query_intersect( query->error = error; } - fts_que_graph_free(graph); + que_graph_free(graph); if (query->error == DB_SUCCESS) { /* Make the intesection (rb tree) the current doc id @@ -1361,7 +1361,7 @@ fts_query_cache( fts_cache_t* cache = table->fts->cache; /* Search the cache for a matching word first. */ - rw_lock_x_lock(&cache->lock); + mysql_mutex_lock(&cache->lock); /* Search for the index specific cache. */ index_cache = fts_find_index_cache(cache, query->index); @@ -1391,7 +1391,7 @@ fts_query_cache( } } - rw_lock_x_unlock(&cache->lock); + mysql_mutex_unlock(&cache->lock); return(query->error); } @@ -1449,7 +1449,7 @@ fts_query_union( query->error = error; } - fts_que_graph_free(graph); + que_graph_free(graph); if (query->error == DB_SUCCESS) { @@ -2347,7 +2347,7 @@ fts_query_total_docs_containing_term( } } - fts_que_graph_free(graph); + que_graph_free(graph); return(error); } @@ -2429,7 +2429,7 @@ fts_query_terms_in_document( } } - fts_que_graph_free(graph); + que_graph_free(graph); return(error); } @@ -2496,9 +2496,9 @@ fts_query_is_in_proximity_range( memset(&get_doc, 0x0, sizeof(get_doc)); - rw_lock_x_lock(&cache->lock); + mysql_mutex_lock(&cache->lock); get_doc.index_cache = fts_find_index_cache(cache, query->index); - rw_lock_x_unlock(&cache->lock); + mysql_mutex_unlock(&cache->lock); ut_a(get_doc.index_cache != NULL); fts_phrase_t phrase(get_doc.index_cache->index->table); @@ -2520,7 +2520,7 @@ fts_query_is_in_proximity_range( /* Free the prepared statement. */ if (get_doc.get_document_graph) { - fts_que_graph_free(get_doc.get_document_graph); + que_graph_free(get_doc.get_document_graph); get_doc.get_document_graph = NULL; } @@ -2556,14 +2556,14 @@ fts_query_search_phrase( /* Setup the doc retrieval infrastructure. */ memset(&get_doc, 0x0, sizeof(get_doc)); - rw_lock_x_lock(&cache->lock); + mysql_mutex_lock(&cache->lock); get_doc.index_cache = fts_find_index_cache(cache, query->index); /* Must find the index cache */ ut_a(get_doc.index_cache != NULL); - rw_lock_x_unlock(&cache->lock); + mysql_mutex_unlock(&cache->lock); #ifdef FTS_INTERNAL_DIAG_PRINT ib::info() << "Start phrase search"; @@ -2610,7 +2610,7 @@ fts_query_search_phrase( func_exit: /* Free the prepared statement. */ if (get_doc.get_document_graph) { - fts_que_graph_free(get_doc.get_document_graph); + que_graph_free(get_doc.get_document_graph); get_doc.get_document_graph = NULL; } @@ -2825,7 +2825,7 @@ fts_query_phrase_search( query->error = error; } - fts_que_graph_free(graph); + que_graph_free(graph); graph = NULL; fts_query_cache(query, token); @@ -3802,7 +3802,7 @@ fts_query_free( { if (query->read_nodes_graph) { - fts_que_graph_free(query->read_nodes_graph); + que_graph_free(query->read_nodes_graph); } if (query->root) { @@ -4271,9 +4271,9 @@ fts_expand_query( /* Init "result_doc", to hold words from the first search pass */ fts_doc_init(&result_doc); - rw_lock_x_lock(&index->table->fts->cache->lock); + mysql_mutex_lock(&index->table->fts->cache->lock); index_cache = fts_find_index_cache(index->table->fts->cache, index); - rw_lock_x_unlock(&index->table->fts->cache->lock); + mysql_mutex_unlock(&index->table->fts->cache->lock); ut_a(index_cache); |