Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libdap-chain-global-db
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
cellframe
libdap-chain-global-db
Commits
aafbd933
Commit
aafbd933
authored
5 years ago
by
alexander.lysikov
Browse files
Options
Downloads
Patches
Plain Diff
fixed memory leaks in dap_db_history_add()
added support the table name containing '.' in sqlite_driver
parent
16f4c398
No related branches found
Branches containing commit
No related tags found
1 merge request
!3
Feature 2336
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dap_chain_global_db.c
+2
-2
2 additions, 2 deletions
dap_chain_global_db.c
dap_chain_global_db_driver_sqlite.c
+26
-4
26 additions, 4 deletions
dap_chain_global_db_driver_sqlite.c
dap_chain_global_db_hist.c
+1
-0
1 addition, 0 deletions
dap_chain_global_db_hist.c
with
29 additions
and
6 deletions
dap_chain_global_db.c
+
2
−
2
View file @
aafbd933
...
...
@@ -331,8 +331,8 @@ bool dap_chain_global_db_gr_del(const char *a_key, const char *a_group)
if
(
!
a_key
)
return
NULL
;
pdap_store_obj_t
store_data
=
DAP_NEW_Z_SIZE
(
dap_store_obj_t
,
sizeof
(
struct
dap_store_obj
));
store_data
->
key
=
dap_strdup
(
a_key
)
;
store_data
->
group
=
dap_strdup
(
a_group
)
;
store_data
->
key
=
a_key
;
store_data
->
group
=
a_group
;
lock
();
int
l_res
=
dap_chain_global_db_driver_delete
(
store_data
,
1
);
unlock
();
...
...
This diff is collapsed.
Click to expand it.
dap_chain_global_db_driver_sqlite.c
+
26
−
4
View file @
aafbd933
...
...
@@ -439,6 +439,22 @@ int dap_db_driver_sqlite_end_transaction(void)
return
-
1
;
}
char
*
dap_db_driver_sqlite_make_table_name
(
const
char
*
a_group_name
)
{
char
*
l_group_name
=
dap_strdup
(
a_group_name
);
ssize_t
l_group_name_len
=
dap_strlen
(
l_group_name
);
const
char
*
l_needle
=
"."
;
// replace '.' to '_'
while
(
1
){
char
*
l_str
=
dap_strstr_len
(
l_group_name
,
l_group_name_len
,
l_needle
);
if
(
l_str
)
*
l_str
=
'_'
;
else
break
;
}
return
l_group_name
;
}
/**
* Apply data (write or delete)
*
...
...
@@ -455,11 +471,13 @@ int dap_db_driver_sqlite_apply_store_obj(dap_store_obj_t *a_store_obj)
//dap_chain_hash_fast_t l_hash;
//dap_hash_fast(a_store_obj->value, a_store_obj->value_len, &l_hash);
char
*
l_blob_hash
=
""
;
//dap_db_driver_get_string_from_blob((uint8_t*) &l_hash, sizeof(dap_chain_hash_fast_t));
char
*
l_blob_hash
=
""
;
//dap_db_driver_get_string_from_blob((uint8_t*) &l_hash, sizeof(dap_chain_hash_fast_t));
char
*
l_blob_value
=
dap_db_driver_get_string_from_blob
(
a_store_obj
->
value
,
a_store_obj
->
value_len
);
//add one record
char
*
table_name
=
dap_db_driver_sqlite_make_table_name
(
a_store_obj
->
group
);
l_query
=
sqlite3_mprintf
(
"insert into '%s' values(NULL, '%s', x'%s', '%lld', x'%s')"
,
a_store_obj
->
group
,
a_store_obj
->
key
,
l_blob_hash
,
a_store_obj
->
timestamp
,
l_blob_value
);
table_name
,
a_store_obj
->
key
,
l_blob_hash
,
a_store_obj
->
timestamp
,
l_blob_value
);
DAP_DELETE
(
table_name
);
//dap_db_driver_sqlite_free(l_blob_hash);
dap_db_driver_sqlite_free
(
l_blob_value
);
}
...
...
@@ -482,7 +500,9 @@ int dap_db_driver_sqlite_apply_store_obj(dap_store_obj_t *a_store_obj)
dap_db_driver_sqlite_free
(
l_error_message
);
l_error_message
=
NULL
;
// create table
dap_db_driver_sqlite_create_group_table
(
a_store_obj
->
group
);
char
*
table_name
=
dap_db_driver_sqlite_make_table_name
(
a_store_obj
->
group
);
dap_db_driver_sqlite_create_group_table
(
table_name
);
DAP_DELETE
(
table_name
);
// repeat request
l_ret
=
dap_db_driver_sqlite_exec
(
s_db
,
l_query
,
&
l_error_message
);
...
...
@@ -491,9 +511,11 @@ int dap_db_driver_sqlite_apply_store_obj(dap_store_obj_t *a_store_obj)
if
(
l_ret
==
SQLITE_CONSTRAINT
)
{
dap_db_driver_sqlite_free
(
l_error_message
);
l_error_message
=
NULL
;
char
*
table_name
=
dap_db_driver_sqlite_make_table_name
(
a_store_obj
->
group
);
//delete exist record
char
*
l_query_del
=
sqlite3_mprintf
(
"delete from '%s' where key = '%s'"
,
a_store_obj
->
group
,
a_store_obj
->
key
);
char
*
l_query_del
=
sqlite3_mprintf
(
"delete from '%s' where key = '%s'"
,
table_name
,
a_store_obj
->
key
);
l_ret
=
dap_db_driver_sqlite_exec
(
s_db
,
l_query_del
,
&
l_error_message
);
DAP_DELETE
(
table_name
);
dap_db_driver_sqlite_free
(
l_query_del
);
if
(
l_ret
!=
SQLITE_OK
)
{
log_it
(
L_INFO
,
"Entry with the same key is already present and can't delete, %s"
,
l_error_message
);
...
...
This diff is collapsed.
Click to expand it.
dap_chain_global_db_hist.c
+
1
−
0
View file @
aafbd933
...
...
@@ -1103,6 +1103,7 @@ bool dap_db_history_add(char a_type, pdap_store_obj_t a_store_obj, size_t a_dap_
int
l_res
=
dap_chain_global_db_driver_add
(
&
l_store_data
,
1
);
if
(
l_rec
.
keys_count
>
1
)
DAP_DELETE
(
l_rec
.
keys
);
DAP_DELETE
(
l_store_data
.
value
);
DAP_DELETE
(
l_str
);
if
(
!
l_res
)
return
true
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment