Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
01dcb74f
提交
01dcb74f
authored
1月 22, 2015
作者:
E. Schmidbauer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-7187 add switch_cache_db_create_schema() to test for SCF_AUTO_SCHEMAS flag
上级
608d3e24
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
54 行增加
和
31 行删除
+54
-31
switch_core.h
src/include/switch_core.h
+8
-0
mod_db.c
src/mod/applications/mod_db/mod_db.c
+2
-1
mod_voicemail.c
src/mod/applications/mod_voicemail/mod_voicemail.c
+1
-1
sofia_glue.c
src/mod/endpoints/mod_sofia/sofia_glue.c
+1
-1
switch_core_sqldb.c
src/switch_core_sqldb.c
+42
-28
没有找到文件。
src/include/switch_core.h
浏览文件 @
01dcb74f
...
...
@@ -26,6 +26,7 @@
* Anthony Minessale II <anthm@freeswitch.org>
* Luke Dashjr <luke@openmethods.com> (OpenMethods, LLC)
* Joseph Sullivan <jossulli@amazon.com>
* Emmanuel Schmidbauer <eschmidbauer@gmail.com>
*
* switch_core.h -- Core Library
*
...
...
@@ -2437,6 +2438,13 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle_dsn(switch_cache_
const
char
*
file
,
const
char
*
func
,
int
line
);
#define switch_cache_db_get_db_handle_dsn(_a, _b) _switch_cache_db_get_db_handle_dsn(_a, _b, __FILE__, __SWITCH_FUNC__, __LINE__)
/*!
\brief Executes the create schema sql
\param [in] dbh The handle
\param [in] sql - sql to run
\param [out] err - Error if it exists
*/
SWITCH_DECLARE
(
switch_status_t
)
switch_cache_db_create_schema
(
switch_cache_db_handle_t
*
dbh
,
char
*
sql
,
char
**
err
);
/*!
\brief Executes the sql and returns the result as a string
\param [in] dbh The handle
...
...
src/mod/applications/mod_db/mod_db.c
浏览文件 @
01dcb74f
...
...
@@ -28,6 +28,7 @@
* Mathieu Rene <mathieu.rene@gmail.com>
* Bret McDanel <trixter AT 0xdecafbad.com>
* Rupa Schomaker <rupa@rupa.com>
* Emmanuel Schmidbauer <eschmidbauer@gmail.com>
*
* mod_db.c -- Implements simple db API, group support, and limit db backend
*
...
...
@@ -325,7 +326,7 @@ static switch_status_t do_config()
switch_cache_db_test_reactive
(
dbh
,
"select * from group_data"
,
NULL
,
group_sql
);
for
(
x
=
0
;
indexes
[
x
];
x
++
)
{
switch_cache_db_
execute_sql
(
dbh
,
indexes
[
x
],
NULL
);
switch_cache_db_
create_schema
(
dbh
,
indexes
[
x
],
NULL
);
}
switch_cache_db_release_db_handle
(
&
dbh
);
...
...
src/mod/applications/mod_voicemail/mod_voicemail.c
浏览文件 @
01dcb74f
...
...
@@ -782,7 +782,7 @@ static vm_profile_t *load_profile(const char *profile_name)
for
(
x
=
0
;
vm_index_list
[
x
];
x
++
)
{
errmsg
=
NULL
;
switch_cache_db_
execute_sql
(
dbh
,
vm_index_list
[
x
],
&
errmsg
);
switch_cache_db_
create_schema
(
dbh
,
vm_index_list
[
x
],
&
errmsg
);
switch_safe_free
(
errmsg
);
}
...
...
src/mod/endpoints/mod_sofia/sofia_glue.c
浏览文件 @
01dcb74f
...
...
@@ -2271,7 +2271,7 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
free
(
test_sql
);
for
(
x
=
0
;
indexes
[
x
];
x
++
)
{
switch_cache_db_
execute_sql
(
dbh
,
indexes
[
x
],
NULL
);
switch_cache_db_
create_schema
(
dbh
,
indexes
[
x
],
NULL
);
}
switch_cache_db_release_db_handle
(
&
dbh
);
...
...
src/switch_core_sqldb.c
浏览文件 @
01dcb74f
...
...
@@ -26,6 +26,7 @@
* Anthony Minessale II <anthm@freeswitch.org>
* Michael Jerris <mike@jerris.com>
* Paul D. Tinsley <pdt at jackhammer.org>
* Emmanuel Schmidbauer <eschmidbauer@gmail.com>
*
*
* switch_core_sqldb.c -- Main Core Library (statistics tracker)
...
...
@@ -1267,6 +1268,19 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_callback_err(switch_
return
status
;
}
SWITCH_DECLARE
(
switch_status_t
)
switch_cache_db_create_schema
(
switch_cache_db_handle_t
*
dbh
,
char
*
sql
,
char
**
err
)
{
switch_status_t
r
=
SWITCH_STATUS_SUCCESS
;
switch_assert
(
sql
!=
NULL
);
if
(
switch_test_flag
((
&
runtime
),
SCF_AUTO_SCHEMAS
))
{
r
=
switch_cache_db_execute_sql
(
dbh
,
sql
,
err
);
}
return
r
;
}
/*!
* \brief Performs test_sql and if it fails performs drop_sql and reactive_sql.
*
...
...
@@ -3399,10 +3413,10 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
switch_cache_db_test_reactive
(
sql_manager
.
dbh
,
"select hostname from recovery"
,
"DROP TABLE recovery"
,
recovery_sql
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index recovery1 on recovery(technology)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index recovery2 on recovery(profile_name)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index recovery3 on recovery(uuid)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index recovery3 on recovery(runtime_uuid)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index recovery1 on recovery(technology)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index recovery2 on recovery(profile_name)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index recovery3 on recovery(uuid)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index recovery3 on recovery(runtime_uuid)"
,
NULL
);
...
...
@@ -3536,30 +3550,30 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
switch_cache_db_execute_sql
(
sql_manager
.
dbh
,
sql
,
NULL
);
}
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index alias1 on aliases (alias)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index tasks1 on tasks (hostname,task_id)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete1 on complete (a1,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete2 on complete (a2,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete3 on complete (a3,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete4 on complete (a4,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete5 on complete (a5,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete6 on complete (a6,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete7 on complete (a7,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete8 on complete (a8,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete9 on complete (a9,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete10 on complete (a10,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index complete11 on complete (a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index nat_map_port_proto on nat (port,proto,hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index channels1 on channels(hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index calls1 on calls(hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index chidx1 on channels (hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index uuindex on channels (uuid, hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index uuindex2 on channels (call_uuid)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index callsidx1 on calls (hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index eruuindex on calls (caller_uuid, hostname)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index eeuuindex on calls (callee_uuid)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index eeuuindex2 on calls (call_uuid)"
,
NULL
);
switch_cache_db_
execute_sql
(
sql_manager
.
dbh
,
"create index regindex1 on registrations (reg_user,realm,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index alias1 on aliases (alias)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index tasks1 on tasks (hostname,task_id)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete1 on complete (a1,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete2 on complete (a2,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete3 on complete (a3,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete4 on complete (a4,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete5 on complete (a5,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete6 on complete (a6,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete7 on complete (a7,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete8 on complete (a8,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete9 on complete (a9,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete10 on complete (a10,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index complete11 on complete (a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index nat_map_port_proto on nat (port,proto,hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index channels1 on channels(hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index calls1 on calls(hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index chidx1 on channels (hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index uuindex on channels (uuid, hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index uuindex2 on channels (call_uuid)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index callsidx1 on calls (hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index eruuindex on calls (caller_uuid, hostname)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index eeuuindex on calls (callee_uuid)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index eeuuindex2 on calls (call_uuid)"
,
NULL
);
switch_cache_db_
create_schema
(
sql_manager
.
dbh
,
"create index regindex1 on registrations (reg_user,realm,hostname)"
,
NULL
);
skip
:
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论