Skip to content

improve delete fixed records functionality #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mscasso-scanoss merged 2 commits into from
Jul 16, 2025
Merged

improve delete fixed records functionality #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
254effa
improve delete fixed records fucntionality
Jul 16, 2025
a8f202b
update version
Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 45 additions & 21 deletions src/collate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,35 +463,33 @@ static bool data_compare(char * a, char * b)
*/
bool key_in_delete_list(struct ldb_collate_data *collate, uint8_t *key, uint8_t *subkey, int subkey_ln, uint8_t * data, uint32_t size)
{
/* Position pointer to start of second byte in the sorted del_key array */
for (int i = 0; i < collate->del_tuples->tuples_number; i++)
{
/* Out if first byte doesnt match*/
{
/*The keys are sorted, if I'm in another sector a must out*/
if (collate->del_tuples->tuples[i]->key[0] > key[0])
return false;
else if (collate->del_tuples->tuples[i]->key[0] != key[0])
continue;


/* First byte is always the same, second too inside this loop. Compare bytes 3 and 4 */
int mainkey = memcmp(collate->del_tuples->tuples[i]->key + 1, key + 1, LDB_KEY_LN - 1);
if (mainkey > 0)
return false;

char key_hex1[MD5_LEN*2+1];
char key_hex2[MD5_LEN*2+1];
/* First byte is always the same, second too inside this loop. Compare bytes 2, 3 and 4 */
int mainkey = memcmp(collate->del_tuples->tuples[i]->key + 1, key + 1, LDB_KEY_LN -1);
if (mainkey != 0)
continue; //return false;

/*For fixed records there is no subkey, so key hex will be empty*/
char key_hex1[collate->in_table.key_ln * 2 + 1];
char key_hex2[collate->in_table.key_ln * 2 + 1];
ldb_bin_to_hex(subkey, subkey_ln, key_hex1);
ldb_bin_to_hex(&collate->del_tuples->tuples[i]->key[LDB_KEY_LN], subkey_ln, key_hex2);

//printf("\ncomparing: %s / %s\n", key_hex1, key_hex2);
/*Math the rest of the key*/
if (!memcmp(subkey, &collate->del_tuples->tuples[i]->key[LDB_KEY_LN], subkey_ln))
{
bool result = true;
if (collate->del_tuples->tuples[i]->data)
{
int char_to_skip = 0;
//printf("<<%s / %s - %d - %d>>\n", (char*)(data), collate->del_tuples->tuples[i]->data, collate->del_tuples->keys_number, collate->del_tuples->key_ln);
char * data_key_hex = collate->del_tuples->tuples[i]->data;
//compare secudary keys
for (int i =0; i < collate->del_tuples->keys_number-1; i++)
Expand All @@ -514,16 +512,14 @@ bool key_in_delete_list(struct ldb_collate_data *collate, uint8_t *key, uint8_t

ldb_bin_to_hex(sec_key, collate->del_tuples->key_ln, key_hex1);
ldb_bin_to_hex(data + collate->del_tuples->key_ln * i, collate->del_tuples->key_ln, key_hex2);
//printf("\n>>>comparing2: %s / %s\n", key_hex1, key_hex2);

result = !memcmp(data + collate->del_tuples->key_ln * i, sec_key, collate->del_tuples->key_ln);
if (!result)
if (result)
break;
}

if (result)
{
log_info("Key to remove found: %s\n", key_hex2);
log_debug("Match found: %s / %s\n", key_hex1, key_hex2);
if (collate->in_table.definitions & LDB_TABLE_DEFINITION_ENCRYPTED)
{
//if we are ignoring the data the record must be removed.
Expand All @@ -536,18 +532,46 @@ bool key_in_delete_list(struct ldb_collate_data *collate, uint8_t *key, uint8_t
return false;

int r_size = decode(DECODE_BASE64, NULL, NULL, collate->del_tuples->tuples[i]->data + char_to_skip, strlen(collate->del_tuples->tuples[i]->data) - char_to_skip, tuple_bin);
if (r_size > 0)
if (r_size > 0)
{
result = !memcmp(tuple_bin, data + (collate->del_tuples->keys_number - 1) * collate->del_tuples->key_ln, r_size);
log_info("Var record %s was found.\n", collate->del_tuples->tuples[i]->data);
}
else
result = false;
}
}
else
{
char * aux = strndup((char*)data + (collate->del_tuples->keys_number - 1) * collate->del_tuples->key_ln,
size - (collate->del_tuples->keys_number - 1) * collate->del_tuples->key_ln);
result = data_compare(collate->del_tuples->tuples[i]->data + char_to_skip, aux);
free(aux);
if (collate->in_table.rec_ln == 0) //variable record, string comparation
{
char * aux = strndup((char*)data + (collate->del_tuples->keys_number - 1) * collate->del_tuples->key_ln,
size - (collate->del_tuples->keys_number - 1) * collate->del_tuples->key_ln);
result = data_compare(collate->del_tuples->tuples[i]->data + char_to_skip, aux);
free(aux);
}
else //fixed record, hex comparation
{
int data_ln = strlen(collate->del_tuples->tuples[i]->data);
if (data_ln < LDB_KEY_LN * 2)
continue;

uint8_t * aux = calloc(1, collate->in_table.rec_ln);
ldb_hex_to_bin(collate->del_tuples->tuples[i]->data, data_ln, aux);
result = false; //we just want to remove a record inside data
for(int ptr = 0; ptr < size; ptr += collate->in_table.rec_ln)
{
char test[33];
ldb_bin_to_hex(data + ptr, 16, test);
if (memcmp(aux, data + ptr, data_ln/2) == 0)
{
log_info("Fixed record %s was found at %d\n", collate->del_tuples->tuples[i]->data, ptr);
memset(data + ptr, 0, collate->in_table.rec_ln);
collate->del_count++;
}
}
free(aux);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ldb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "./ldb/types.h"
#include "./ldb/mz.h"

#define LDB_VERSION "4.1.5"
#define LDB_VERSION "4.1.6"

#define LDB_TABLE_DEFINITION_UNDEFINED -1
#define LDB_TABLE_DEFINITION_STANDARD 0
Expand Down
Loading