Implemented BatchCompletionState interface

Author: AlexPeshkoff

examples/interfaces/11.batch.cpp

@@ -58,13 +58,18 @@ int main()
 	IAttachment* att = NULL;
 	ITransaction* tra = NULL;
 	IBatch* batch = NULL;
+	IBatchCompletionState* cs = NULL;
 
 	try
 	{
 		// attach employee db
 		att = prov->attachDatabase(&status, "employee", 0, NULL);
 		tra = att->startTransaction(&status, 0, NULL);
 
+		// cleanup
+		att->execute(&status, tra, 0, "delete from country where currency='lim'", SAMPLES_DIALECT,
+			NULL, NULL, NULL, NULL);
+
 		// Message to store in a table
 		FB_MESSAGE(Msg, ThrowStatusWrapper,
 			(FB_VARCHAR(15), country)
@@ -81,8 +86,13 @@ int main()
 		msg->currency.set("lim");
 		batch->add(&status, 1, msg.getData());
 
+		msg->country.set("Banania");
+		msg->currency.set("lim");
+		batch->add(&status, 1, msg.getData());
+
 		// and execute it
-		batch->execute(&status, tra);
+		cs = batch->execute(&status, tra);
+		printf("upcount=%d\n", cs->getSize(&status));
 
 		// cleanup
 		batch->release();
@@ -100,6 +110,8 @@ int main()
 	}
 
 	// release interfaces after error caught
+	if (cs)
+		cs->dispose();
 	if (batch)
 		batch->release();
 	if (tra)

src/common/classes/vector.h

@@ -85,6 +85,14 @@ class Vector
 		return &data[index];
 	}
 
+	T* removeCount(const FB_SIZE_T index, const FB_SIZE_T n) throw()
+	{
+  		fb_assert(index + n <= count);
+  		memmove(data + index, data + index + n, sizeof(T) * (count - index - n));
+		count -= n;
+		return &data[index];
+	}
+
 	void shrink(FB_SIZE_T newCount) throw()
 	{
 		fb_assert(newCount <= count);
@@ -118,6 +126,20 @@ class Vector
 		return data[count];
 	}
 
+	void push(const T* items, const FB_SIZE_T itemsSize)
+	{
+		fb_assert(count <= FB_MAX_SIZEOF - itemsSize);
+		fb_assert(count + itemsSize <= Capacity);
+		memcpy(data + count, items, sizeof(T) * itemsSize);
+		count += itemsSize;
+	}
+
+	void append(const T* items, const FB_SIZE_T itemsSize)
+	{
+		push(items, itemsSize);
+	}
+
+
 	// This method only assigns "pos" if the element is found.
 	// Maybe we should modify it to iterate directy with "pos".
 	bool find(const T& item, FB_SIZE_T& pos) const

src/common/utils.cpp

@@ -1169,7 +1169,7 @@ unsigned int mergeStatus(ISC_STATUS* const dest, unsigned int space,
 	return copied;
 }
 
-void copyStatus(Firebird::CheckStatusWrapper* to, const Firebird::CheckStatusWrapper* from) throw()
+void copyStatus(Firebird::CheckStatusWrapper* to, const Firebird::IStatus* from) throw()
 {
 	to->init();
 

src/common/utils_proto.h

@@ -136,7 +136,7 @@ namespace fb_utils
 
 	unsigned int copyStatus(ISC_STATUS* const to, const unsigned int space,
 							const ISC_STATUS* const from, const unsigned int count) throw();
-	void copyStatus(Firebird::CheckStatusWrapper* to, const Firebird::CheckStatusWrapper* from) throw();
+	void copyStatus(Firebird::CheckStatusWrapper* to, const Firebird::IStatus* from) throw();
 	unsigned int mergeStatus(ISC_STATUS* const to, unsigned int space, const Firebird::IStatus* from) throw();
 	void setIStatus(Firebird::CheckStatusWrapper* to, const ISC_STATUS* from) throw();
 	unsigned int statusLength(const ISC_STATUS* const status) throw();