From 9999ab8dec056a7325449cde40fbfc9ac98c5dc6 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Tue, 19 Mar 2024 15:50:13 +0900 Subject: [PATCH] Remove bundle insert bundle insert was added for media-scanner. However, media-scanner is using _media_svc_sql_query_list_direct(). playlist, and tag do not need quick insertion. So remove it. Change-Id: Ic3c61d37fb5333133c63da801ccb0d4aba893eec Signed-off-by: Minje Ahn --- src/common/media-svc-db-utils.c | 44 ++++---------------------------------- src/include/common/media-svc-env.h | 1 - 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c index 954cc4f..12529a7 100755 --- a/src/common/media-svc-db-utils.c +++ b/src/common/media-svc-db-utils.c @@ -623,54 +623,18 @@ int _media_svc_sql_query_list(GList **query_list, uid_t uid) int idx = 0; int length = g_list_length(*query_list); char *sql = NULL; - char query_bundle[MEDIA_SVC_QUERY_LEN_MAX] = {0, }; - unsigned int query_len = 0; - unsigned int total_len = 0; media_svc_debug("query list length : [%d]", length); - memset(query_bundle, 0, sizeof(query_bundle)); - for (idx = 0; idx < length; idx++) { sql = (char *)g_list_nth_data(*query_list, idx); if (STRING_VALID(sql)) { - query_len = strlen(sql); - - if (query_len >= (sizeof(query_bundle) - 1)) { - media_svc_error("NEED TO CHECK FILE : A single query size exceeds 8k [%u]", query_len); - SQLITE3_SAFE_FREE(sql); - continue; - } - - if ((total_len + query_len) >= (sizeof(query_bundle) - 1)) { - ret = media_db_request_update_db(query_bundle, uid); - if (ret != MS_MEDIA_ERR_NONE) - media_svc_error("media_db_request_update_db failed : %d", ret); - - memset(query_bundle, 0, sizeof(query_bundle)); - total_len = 0; - /* NEED TO CHECK : If a single query size is over 8K, drop it. */ - /* Consider inserting the basic information without metadata */ - /* Refer : SQLITE3 spec In Tizen 3.0 */ - /* Single query limit size = 1 billion bytes(1GiB) */ - /* DB limit size = 1 billion bytes(1GiB) */ - /* column limit = 2000 */ - } - - g_strlcat(query_bundle, sql, sizeof(query_bundle)); - total_len += query_len; - - SQLITE3_SAFE_FREE(sql); + ret = media_db_request_update_db(sql, uid); + if (ret != MS_MEDIA_ERR_NONE) + media_svc_error("media_db_request_update_db failed : %d", ret); } - } - - if (total_len > 0) { - ret = media_db_request_update_db(query_bundle, uid); - if (ret != MS_MEDIA_ERR_NONE) - media_svc_error("media_db_request_update_db failed : %d", ret); - memset(query_bundle, 0, sizeof(query_bundle)); - total_len = 0; + SQLITE3_SAFE_FREE(sql); } _media_svc_sql_query_release(query_list); diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h index 36409c9..0ea3629 100755 --- a/src/include/common/media-svc-env.h +++ b/src/include/common/media-svc-env.h @@ -97,7 +97,6 @@ extern "C" { #define MEDIA_SVC_METADATA_LEN_MAX 512 /**< Length of metadata*/ #define MEDIA_SVC_PATHNAME_SIZE 4096 /**< Length of Path name. */ #define MEDIA_SVC_UUID_SIZE 36 /**< Length of UUID*/ -#define MEDIA_SVC_QUERY_LEN_MAX 8192 /**< Max Query length*/ #define MEDIA_SVC_TAG_UNKNOWN "" -- 2.7.4