code changes in CycleStorage and TableBlockStorage

Utilities/JrnTests/JrnTest.cc

@@ -153,7 +153,7 @@ void testJournal1(void)
 	printf("\nfirst 30 elements:\n");
 	for(i=0;i<30;i++)
 	{
-		if(j->ViewRow(i,str))
+		if(j->ReadRow(i,str))
 			printf("%s\n",str);
 	}
 
@@ -173,7 +173,7 @@ void testJournal1(void)
 	}
 	for(i=0;i<30;i++)
 	{
-		if(j->ViewRow(i,str))
+		if(j->ReadRow(i,str))
 			printf("%s\n",str);
 	}
 	printf("\nfirst 20 after adding 10 elements\n");
@@ -184,7 +184,7 @@ void testJournal1(void)
 	}
 	for(i=0;i<20;i++)
 	{
-		if(j->ViewRow(i,str))
+		if(j->ReadRow(i,str))
 			printf("%s\n",str);
 	}
 	printf("\nthe same after reopen:\n");
@@ -193,11 +193,10 @@ void testJournal1(void)
 	j->Open("big_file.test",30,1000000,20000);
 	for(i=0;i<20;i++)
 	{
-		if(j->ViewRow(i,str))
+		if(j->ReadRow(i,str))
 			printf("%s\n",str);
 	}
 	printf("\n");
-	j->ExportToXML("Xml.xml");
 	delete t;
 	delete j;
 }

include/Storages.h

@@ -32,7 +32,8 @@
 #include <string.h>
 #include <string>
 
-#include "UniXML.h"
+#define EMPTY_BLOCK -5
+#define EMPTY_ELEM -1
 
 #define key_size 20
 
@@ -153,10 +154,10 @@ class CycleStorage
 		bool DelAllRows(void);
 
 		/*!        num */
-		void* ViewRow(int num, void* str);
+		void* ReadRow(int num, void* str);
 
 		/*!   Xml-   name */
-		bool ExportToXML(const char* name);
+		//bool ExportToXML(const char* name);
 
 		/*!  -    /  (  ) */
 		int GetIter(void);
@@ -169,6 +170,7 @@ class CycleStorage
 		int full_size;
 		void filewrite(CycleStorageElem* jrn,int seek, bool needflush=true);
 		void* ValPointer(void* pnt);
+		void FindHead();
 };
 
 #endif

src/Various/CycleStorage.cc

@@ -64,44 +64,17 @@ void CycleStorage::filewrite(CycleStorageElem* jrn,int seek,bool needflush)
 	if(needflush) fflush(file);
 }
 
-bool CycleStorage::Open(const char* name, int inf_sz, int sz, int seek)
+/*! 	      jrn->status: 0 - , 1 - , 2,4 -    
+	( 2    - 4 ,  ), 3 -  2, 5 -  4, 6 -  1.
+	  |   
+*/
+void CycleStorage::FindHead()
 {
-	/*! 	        ,     
-	*/
-
-	if(file!=NULL) fclose(file);
-	file = fopen(name, "r+");
-	if(file==NULL) return false;
-
-	seekpos=seek;
-	if(fseek(file,seekpos,0)==-1) return false;
-
-	CycleStorageAttr *csa = new CycleStorageAttr();
-	fread(csa,sizeof(CycleStorageAttr),1,file);
-
-	if((csa->size!=((sz-sizeof(CycleStorageAttr))/(sizeof(CycleStorageElem)+inf_sz)))||(csa->inf_size!=inf_sz)||(csa->seekpos!=seek))
-	{
-		delete csa;
-		return false;
-	}
-	delete csa;
-
-	inf_size=inf_sz;
-	full_size=sizeof(CycleStorageElem)+inf_size;
-	size=(sz-sizeof(CycleStorageAttr))/full_size;
-	seekpos=seek;
-
 	CycleStorageElem *jrn = (CycleStorageElem*)new char[full_size];
 	int l=-1,r=size,mid;
 	iter=0;
 	seekpos+=sizeof(CycleStorageAttr);
 	fread(jrn,full_size,1,file);
-
-	/*! 	      jrn->status: 0 - , 1 - , 2,4 -    
-		( 2    - 4 ,  ), 3 -  2, 5 -  4, 6 -  1.
-		  |   
-	*/
-
 	if(jrn->status==0)
 	{
 		head=-1;
@@ -154,6 +127,39 @@ bool CycleStorage::Open(const char* name, int inf_sz, int sz, int seek)
 		if(tail<0) tail=size-1;
 	}
 	delete jrn;
+}
+
+bool CycleStorage::Open(const char* name, int inf_sz, int sz, int seek)
+{
+	/*! 	        ,     
+	*/
+
+	if(file!=NULL) fclose(file);
+	file = fopen(name, "r+");
+	if(file==NULL) return false;
+
+	seekpos=seek;
+	if(fseek(file,seekpos,0)==-1) return false;
+
+	CycleStorageAttr *csa = new CycleStorageAttr();
+	fread(csa,sizeof(CycleStorageAttr),1,file);
+
+	if((csa->size!=((sz-sizeof(CycleStorageAttr))/(sizeof(CycleStorageElem)+inf_sz)))||(csa->inf_size!=inf_sz)||(csa->seekpos!=seek))
+	{
+		delete csa;
+		return false;
+	}
+	delete csa;
+
+	inf_size=inf_sz;
+	full_size=sizeof(CycleStorageElem)+inf_size;
+	size=(sz-sizeof(CycleStorageAttr))/full_size;
+	seekpos=seek;
+
+	seekpos+=sizeof(CycleStorageAttr);
+
+	FindHead();
+
 	return true;
 }
 
@@ -342,7 +348,7 @@ bool CycleStorage::DelAllRows()
 	return true;
 }
 
-void* CycleStorage::ViewRow(int num, void* str)
+void* CycleStorage::ReadRow(int num, void* str)
 {
 	int j=(head+num)%size;
 	if((file==NULL)||(num>=size)) return 0;
@@ -361,7 +367,7 @@ void* CycleStorage::ViewRow(int num, void* str)
 	return 0;
 }
 
-bool CycleStorage::ExportToXML(const char* name)
+/*bool CycleStorage::ExportToXML(const char* name)
 {
 	int i,j=head;
 	if(file==NULL) return false;
@@ -391,7 +397,7 @@ bool CycleStorage::ExportToXML(const char* name)
 	f->save(name);
 	delete jrn;
 	return true;
-}
+}*/
 
 int CycleStorage::GetIter()
 {

src/Various/TableBlockStorage.cc

@@ -30,9 +30,6 @@
 
 #include "Storages.h"
 
-#define block_begin -5
-#define empty_elem -1
-
 TableBlockStorage::TableBlockStorage()
 {
 	file=NULL;
@@ -85,33 +82,28 @@ void TableBlockStorage::filewrite(int seek, bool needflush)
 
 bool TableBlockStorage::CopyToNextBlock(void)
 {
-	int i;
-	TableBlockStorageElem *tbl = (TableBlockStorageElem*)new char[full_size];
-
-	if(max==lim-1)
+	if(cur_block<block_number-1)
 	{
-		if((cur_block+2)*block_size<=size)
+		int i;
+		max=-1;
+		
+		mem[0]->count=EMPTY_BLOCK;
+		filewrite(0,false);
+
+		cur_block++;
+		for(i=0;i<block_size;i++)
 		{
-			max=-1;;
-			for(i=0;i<block_size;i++)
+			if(mem[i]->count>=0)
 			{
-				if(mem[i]->count>=0)
-				{
-					mem[i]->count=++max;
-					cur_block++;
-					filewrite(i,false);
-					cur_block--;
-				}
+				mem[i]->count=++max;
+				filewrite(i,false);
 			}
-			tbl->count=block_begin;
-			fseek(file,seekpos+cur_block*block_size*full_size,0);
-			fwrite(tbl,full_size,1,file);
-			fflush(file);
-			cur_block++;
 		}
+		
+		fflush(file);
+		return true;
 	}
-	delete tbl;
-	return true;
+	return false;
 }
 
 bool TableBlockStorage::Open(const char* name, int key_sz, int inf_sz, int sz, int block_num, int block_lim, int seek)
@@ -229,9 +221,9 @@ bool TableBlockStorage::Create(const char* name, int key_sz, int inf_sz, int sz,
 		block_begin=(-5) -     ,    ,    , empty_elem=(-1) -    
 	*/
 
-	mem[0]->count=block_begin;
+	mem[0]->count=EMPTY_BLOCK;
 	for(i=1;i<block_size;i++)
-		mem[i]->count=empty_elem;
+		mem[i]->count=EMPTY_ELEM;
 
 	/*!	     */
 	for(i=0;i<size;i++) 
@@ -258,7 +250,7 @@ bool TableBlockStorage::AddRow(void* key, void* value)
 	int i=0,pos=-1,empty=-1;
 	if(file==NULL) return false;
 
-	CopyToNextBlock();
+	if(max==lim-1) CopyToNextBlock();
 	for(i=0;i<block_size;i++)
 	{
 		if(mem[i]->count>=0)
@@ -283,7 +275,7 @@ bool TableBlockStorage::DelRow(void* key)
 	/*!	     
 	*/
 
-	CopyToNextBlock();
+	if(max==lim-1) CopyToNextBlock();
 	for(i=0;i<block_size;i++)
 	{
 		if(mem[i]->count>=0)