Use transaction for scanner requests

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc-media.c

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 246b518..3092b0d 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -32,9 +32,7 @@
 
 #define MEDIA_SVC_MAX_COMMIT_SIZE 200
 
-static __thread GList *g_media_svc_item_validity_query_list = NULL;
-static __thread GList *g_media_svc_insert_item_query_list = NULL;
-static __thread GList *g_media_svc_update_item_query_list = NULL;
+static __thread GList *g_media_svc_scanner_query_list = NULL;
 static __thread GList *g_media_svc_update_list = NULL;
 
 int _media_svc_count_record_with_path(sqlite3 *handle, const char *path, int *count)
@@ -216,7 +214,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "failed to insert item");
        } else {
                media_svc_sec_debug("Query[%s]", sql);
-               _media_svc_sql_query_add(&g_media_svc_insert_item_query_list, &sql);
+               _media_svc_sql_query_add(&g_media_svc_scanner_query_list, &sql);
        }
 
        return MS_MEDIA_ERR_NONE;
@@ -246,7 +244,7 @@ int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info)
 
        if (sql != NULL) {
                media_svc_debug("query[%s]", sql);
-               _media_svc_sql_query_add(&g_media_svc_update_item_query_list, &sql);
+               _media_svc_sql_query_add(&g_media_svc_scanner_query_list, &sql);
        } else {
                media_svc_error("sqlite3_mprintf failed");
                ret = MS_MEDIA_ERR_OUT_OF_MEMORY;
@@ -327,7 +325,7 @@ int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *c
        /* Scanner use only batch insert */
        if (is_direct) {
                media_svc_sec_debug("Query [%s]", sql);
-               _media_svc_sql_query_add(&g_media_svc_insert_item_query_list, &sql);
+               _media_svc_sql_query_add(&g_media_svc_scanner_query_list, &sql);
        } else {
                ret = _media_svc_sql_query(sql, uid);
                SQLITE3_SAFE_FREE(sql);
@@ -394,7 +392,7 @@ int _media_svc_update_item_validity(const char *path, int validity, bool stack_q
                ret = _media_svc_sql_query_direct(sql, uid);
                SQLITE3_SAFE_FREE(sql);
        } else {
-               _media_svc_sql_query_add(&g_media_svc_item_validity_query_list, &sql);
+               _media_svc_sql_query_add(&g_media_svc_scanner_query_list, &sql);
        }
 
        return ret;
@@ -437,14 +435,8 @@ int _media_svc_list_query_do(media_svc_query_type_e query_type, uid_t uid)
 
                ret = _media_svc_sql_query_list(&g_media_svc_update_list, uid);
                break;
-       case MEDIA_SVC_QUERY_SET_ITEM_VALIDITY:
-               ret = _media_svc_sql_query_list_direct(&g_media_svc_item_validity_query_list, uid);
-               break;
-       case MEDIA_SVC_QUERY_INSERT_ITEM:
-               ret = _media_svc_sql_query_list_direct(&g_media_svc_insert_item_query_list, uid);
-               break;
-       case MEDIA_SVC_QUERY_UPDATE_ITEM:
-               ret = _media_svc_sql_query_list_direct(&g_media_svc_update_item_query_list, uid);
+       case MEDIA_SVC_QUERY_SCANNER:
+               ret = _media_svc_sql_query_list_direct(&g_media_svc_scanner_query_list, uid);
                break;
        default:
                media_svc_error("Wrong type[%d]", query_type);