Commit 2c1a7417 authored by Ivan Donchevskiy's avatar Ivan Donchevskiy Committed by Ivan Donchevskiy

/src/Various /Utilities/JrnTests TableBlockStorage.cc now can work with keys of…

/src/Various /Utilities/JrnTests TableBlockStorage.cc now can work with keys of any type, test for it is also corrected (eterbug 4115)
parent 7cc28edd
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#define Storages_H_ #define Storages_H_
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <UniXML.h> #include <UniXML.h>
...@@ -42,7 +43,7 @@ struct TableStorageElem ...@@ -42,7 +43,7 @@ struct TableStorageElem
struct TableBlockStorageElem struct TableBlockStorageElem
{ {
int count; int count;
char key[key_size]; //char key[key_size];
} __attribute__((__packed__)); } __attribute__((__packed__));
struct CycleStorageElem struct CycleStorageElem
...@@ -67,12 +68,15 @@ class TableStorage ...@@ -67,12 +68,15 @@ class TableStorage
class TableBlockStorage class TableBlockStorage
{ {
FILE *file; FILE *file;
int inf_size; int inf_size, k_size;
int max,lim; int max,lim;
TableBlockStorageElem** mem;
public: public:
int size,cur_block,block_size; int size,cur_block,block_size;
TableBlockStorage(const char* name, int inf_sz, int sz, int block_num, int block_lim); TableBlockStorage();
TableBlockStorage(const char* name, int key_sz, int inf_sz, int sz, int block_num, int block_lim);
~TableBlockStorage(); ~TableBlockStorage();
int Open(const char* name, int inf_sz, int key_sz, int sz, int block_num, int block_lim);
int AddRow(char* key, char* val); int AddRow(char* key, char* val);
int DelRow(char* key); int DelRow(char* key);
char* FindKeyValue(char* key, char* val); char* FindKeyValue(char* key, char* val);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment