Merge all storage tablessubmit/tizen/20191113.015717accepted/tizen/unified/20191114.042548

Change-Id: I9cacdf6fe6ca5bcbe28a7122e0c949ec270fe7c5
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

5 files changed, 17 insertions, 28 deletions

diff --git a/src/include/common/media-svc-db-utils.h b/src/include/common/media-svc-db-utils.h
index b25e57b..cb62307 100755
--- a/src/include/common/media-svc-db-utils.h
+++ b/src/include/common/media-svc-db-utils.h
@@ -32,8 +32,6 @@
 int _media_svc_make_table_query(const char *table_name, media_svc_table_slist_e list, uid_t uid);
 int _media_svc_init_table_query(const char *event_table_name);
 void _media_svc_destroy_table_query();
-int _media_svc_create_media_table_with_id(const char *table_id, uid_t uid);
-int _media_svc_update_media_view(sqlite3 *db_handle, uid_t uid);
 int _media_svc_sql_query(const char *sql_str, uid_t uid);
 int _media_svc_sql_query_direct(const char *sql_str, uid_t uid);
 int _media_svc_get_user_version(sqlite3 *db_handle, int *user_version);
diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h
index 3dfd52c..77440db 100755
--- a/src/include/common/media-svc-env.h
+++ b/src/include/common/media-svc-env.h
@@ -72,7 +72,7 @@ extern "C" {
 /**
  * View Name
  */
-#define MEDIA_SVC_DB_VIEW_MEDIA					"media_view"		/**< media_view*/
+#define MEDIA_SVC_DB_VIEW_MEDIA				"media_view"		/**< media_view(For upgrade func) */
 #define MEDIA_SVC_DB_VIEW_PLAYLIST				"playlist_view"		/**< playlist_view*/
 #define MEDIA_SVC_DB_VIEW_TAG					"tag_view"		/**< tag_view*/
 
@@ -115,12 +115,12 @@ extern "C" {
 #define MEDIA_SVC_DB_QUERY_VIEW_MEDIA			"CREATE VIEW IF NOT EXISTS %s AS SELECT * from %s;"
 #define MEDIA_SVC_DB_QUERY_VIEW_PLAYLIST		"CREATE VIEW IF NOT EXISTS %s AS SELECT %s FROM playlist \
 			LEFT OUTER JOIN playlist_map ON playlist.playlist_id = playlist_map.playlist_id \
-			LEFT OUTER JOIN media_view ON (playlist_map.media_id = media_view.media_id AND media_view.validity=1) \
-			LEFT OUTER JOIN (SELECT count(playlist_id) as playlist_media_count, playlist_id FROM playlist_map group by playlist_id) as cnt_tbl ON (cnt_tbl.playlist_id=playlist_map.playlist_id AND media_view.validity=1);"
+			LEFT OUTER JOIN media ON (playlist_map.media_id = media.media_id AND media.validity=1) \
+			LEFT OUTER JOIN (SELECT count(playlist_id) as playlist_media_count, playlist_id FROM playlist_map group by playlist_id) as cnt_tbl ON (cnt_tbl.playlist_id=playlist_map.playlist_id AND media.validity=1);"
 #define MEDIA_SVC_DB_QUERY_VIEW_TAG			"CREATE VIEW IF NOT EXISTS %s AS SELECT %s FROM tag \
 			LEFT OUTER JOIN tag_map ON tag.tag_id=tag_map.tag_id \
-			LEFT OUTER JOIN media_view ON (tag_map.media_id = media_view.media_id AND media_view.validity=1) \
-			LEFT OUTER JOIN (SELECT count(tag_id) as tag_media_count, tag_id FROM tag_map group by tag_id) as cnt_tbl ON (cnt_tbl.tag_id=tag_map.tag_id AND media_view.validity=1);"
+			LEFT OUTER JOIN media ON (tag_map.media_id = media.media_id AND media.validity=1) \
+			LEFT OUTER JOIN (SELECT count(tag_id) as tag_media_count, tag_id FROM tag_map group by tag_id) as cnt_tbl ON (cnt_tbl.tag_id=tag_map.tag_id AND media.validity=1);"
 #define MEDIA_SVC_DB_QUERY_ALTER_TABLE		"ALTER TABLE %s ADD COLUMN %s;"
 #define MEDIA_SVC_DB_QUERY_DROP_VIEW			"DROP VIEW IF EXISTS %s;"
 
diff --git a/src/include/common/media-svc-media.h b/src/include/common/media-svc-media.h
index 6b7d0cd..171f4b7 100755
--- a/src/include/common/media-svc-media.h
+++ b/src/include/common/media-svc-media.h
@@ -28,21 +28,20 @@
 #include "media-svc-noti.h"
 #include "media-svc-util.h"
 
-int _media_svc_count_record_with_path(sqlite3 *handle, const char *storage_id, const char *path, int *count);
-int _media_svc_get_modified_time(sqlite3 *handle, const char *storage_id, const char *path, int *modified_time);
-int _media_svc_insert_item_with_data(bool is_direct, const char *storage_id, media_svc_content_info_s *content_info, bool stack_query, uid_t uid);
-int _media_svc_update_item_with_data(bool is_direct, const char *storage_id, media_svc_content_info_s *content_info, uid_t uid);
+int _media_svc_count_record_with_path(sqlite3 *handle, const char *path, int *count);
+int _media_svc_get_modified_time(sqlite3 *handle, const char *path, int *modified_time);
+int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *content_info, bool stack_query, uid_t uid);
+int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *content_info, uid_t uid);
 int _media_svc_get_thumbnail_path_by_path(sqlite3 *handle, const char *path, char *thumbnail_path);
-int _media_svc_get_media_type_by_path(sqlite3 *handle, const char *storage_id, const char *path, int *media_type);
-int _media_svc_delete_item_by_path(const char *storage_id, const char *path, uid_t uid);
-int _media_svc_update_item_validity(const char *storage_id, const char *path, int validity, bool stack_query, uid_t uid);
-int _media_svc_update_item_by_path(const char *org_storage_id, const char *src_path, const char *dst_storage_id, ms_user_storage_type_e dest_storage, const char *dest_path, const char *file_name, int modified_time, const char *folder_uuid, uid_t uid);
+int _media_svc_delete_item_by_path(const char *path, uid_t uid);
+int _media_svc_update_item_validity(const char *path, int validity, bool stack_query, uid_t uid);
+int _media_svc_update_item_by_path(const char *src_path, const char *dst_storage_id, ms_user_storage_type_e dest_storage, const char *dest_path, const char *file_name, int modified_time, const char *folder_uuid, uid_t uid);
 int _media_svc_list_query_do(media_svc_query_type_e query_type, uid_t uid);
-int _media_svc_update_thumbnail_path(const char *storage_id, const char *path, const char *thumb_path, uid_t uid);
-int _media_svc_get_noti_info(sqlite3 *handle, const char *storage_id, const char *path, media_svc_noti_item **item);
+int _media_svc_update_thumbnail_path(const char *path, const char *thumb_path, uid_t uid);
+int _media_svc_get_noti_info(sqlite3 *handle, const char *path, media_svc_noti_item **item);
 int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info);
 
 int _media_svc_append_query_list(const char *query, uid_t uid);
-int _media_svc_get_media(sqlite3 *handle, const char *sql, GArray **path_list);
+int _media_svc_get_media(sqlite3 *handle, const char *sql, GPtrArray **path_list);
 
 #endif /*_MEDIA_SVC_MEDIA_H_*/
diff --git a/src/include/common/media-svc-storage.h b/src/include/common/media-svc-storage.h
index 48f47a2..f46d3ee 100755
--- a/src/include/common/media-svc-storage.h
+++ b/src/include/common/media-svc-storage.h
@@ -24,7 +24,7 @@
 
 #include <sqlite3.h>
 
-int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid);
+int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity);
 int _media_svc_append_storage(const char *storage_id, const char *storage_path, ms_user_storage_type_e storage_type, uid_t uid);
 int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int _media_svc_delete_invalid_storage(sqlite3 *handle, uid_t uid);
diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h
index 2b69c46..56e0d49 100755
--- a/src/include/common/media-svc-util.h
+++ b/src/include/common/media-svc-util.h
@@ -112,14 +112,6 @@ typedef struct {
 } media_svc_content_info_s;
 
 /**
- * Media data information
- */
-typedef struct {
-	char storage_id[MEDIA_SVC_UUID_SIZE + 1];
-	char path[MEDIA_SVC_PATHNAME_SIZE];
-} media_svc_file_s;
-
-/**
  * Type definition for content type
  */
 typedef enum {
@@ -146,7 +138,7 @@ void _media_svc_destroy_content_info(media_svc_content_info_s *content_info);
 int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_media_type_e media_type, uid_t uid);
 int _media_svc_get_pinyin_str(const char *src_str, char **pinyin_str);
 bool _media_svc_check_pinyin_support(void);
-int _media_svc_extract_music_metadata_for_update(media_svc_content_info_s *content_info, const char *storage_id, const char *path);
+int _media_svc_extract_music_metadata_for_update(media_svc_content_info_s *content_info, const char *path);
 int _media_svc_get_media_type(const char *path, int *mediatype);
 bool _media_svc_is_valid_storage_type(ms_user_storage_type_e storage_type);