[Firebird-checkins] SF.net SVN: firebird:[57247] firebird/trunk/src

[<asf...@us...>]

Revision: 57247
          http://firebird.svn.sourceforge.net/firebird/?rev=57247&view=rev
Author:   asfernandes
Date:     2012-10-16 00:51:42 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/src/dsql/BoolNodes.cpp
    firebird/trunk/src/dsql/ExprNodes.cpp
    firebird/trunk/src/dsql/StmtNodes.cpp
    firebird/trunk/src/jrd/vio.cpp

Modified: firebird/trunk/src/dsql/BoolNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/BoolNodes.cpp	2012-10-15 10:49:30 UTC (rev 57246)
+++ firebird/trunk/src/dsql/BoolNodes.cpp	2012-10-16 00:51:42 UTC (rev 57247)
@@ -1821,7 +1821,7 @@
 		}
 	}
 
-	StableCursorSavePoint savePoint(tdbb, request->req_transaction, 
+	StableCursorSavePoint savePoint(tdbb, request->req_transaction,
 		parentForNode == NULL);
 
 	rsb->open(tdbb);

Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp	2012-10-15 10:49:30 UTC (rev 57246)
+++ firebird/trunk/src/dsql/ExprNodes.cpp	2012-10-16 00:51:42 UTC (rev 57247)
@@ -8103,22 +8103,24 @@
 {
 	switch (blrOp)
 	{
-	case blr_dbkey:
-		desc->dsc_dtype = dtype_dbkey;
-		desc->dsc_length = type_lengths[dtype_dbkey];
-		desc->dsc_scale = 0;
-		desc->dsc_flags = 0;
-		break;
-	case blr_record_version:
-		desc->dsc_dtype = dtype_text;
-		desc->dsc_ttype() = ttype_binary;
-		desc->dsc_length = sizeof(SLONG);
-		desc->dsc_scale = 0;
-		desc->dsc_flags = 0;
-		break;
-	case blr_record_version2:
-		desc->makeLong(0);
-		break;
+		case blr_dbkey:
+			desc->dsc_dtype = dtype_dbkey;
+			desc->dsc_length = type_lengths[dtype_dbkey];
+			desc->dsc_scale = 0;
+			desc->dsc_flags = 0;
+			break;
+
+		case blr_record_version:
+			desc->dsc_dtype = dtype_text;
+			desc->dsc_ttype() = ttype_binary;
+			desc->dsc_length = sizeof(SLONG);
+			desc->dsc_scale = 0;
+			desc->dsc_flags = 0;
+			break;
+
+		case blr_record_version2:
+			desc->makeLong(0);
+			break;
 	}
 }
 
@@ -9390,7 +9392,7 @@
 
 	try
 	{
-		StableCursorSavePoint savePoint(tdbb, request->req_transaction, 
+		StableCursorSavePoint savePoint(tdbb, request->req_transaction,
 			blrOp == blr_via && parentForNode == NULL);
 
 		rsb->open(tdbb);

Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp	2012-10-15 10:49:30 UTC (rev 57246)
+++ firebird/trunk/src/dsql/StmtNodes.cpp	2012-10-16 00:51:42 UTC (rev 57247)
@@ -4243,8 +4243,7 @@
 	if (csb->csb_blr_reader.peekByte() == (UCHAR) blr_stall)
 		node->stall = PAR_parse_stmt(tdbb, csb);
 
-	ForNode* saveForNode = csb->csb_currentForNode;
-	csb->csb_currentForNode = node;
+	AutoSetRestore<ForNode*> autoCurrentForNode(&csb->csb_currentForNode, node);
 
 	if (csb->csb_blr_reader.peekByte() == (UCHAR) blr_rse ||
 		csb->csb_blr_reader.peekByte() == (UCHAR) blr_singular ||
@@ -4259,8 +4258,6 @@
 
 	node->statement = PAR_parse_stmt(tdbb, csb);
 
-	csb->csb_currentForNode = saveForNode;
-
 	return node;
 }
 

Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp	2012-10-15 10:49:30 UTC (rev 57246)
+++ firebird/trunk/src/jrd/vio.cpp	2012-10-16 00:51:42 UTC (rev 57247)
@@ -119,7 +119,7 @@
 	udNone			// record was not changed under current savepoint, use it as is
 };
 
-static UndoDataRet get_undo_data(thread_db* tdbb, jrd_tra* transaction, 
+static UndoDataRet get_undo_data(thread_db* tdbb, jrd_tra* transaction,
 	record_param* rpb, MemoryPool* pool);
 
 static void invalidate_cursor_records(jrd_tra*, record_param*);
@@ -4566,7 +4566,7 @@
 }
 
 
-static UndoDataRet get_undo_data(thread_db* tdbb, jrd_tra* transaction, 
+static UndoDataRet get_undo_data(thread_db* tdbb, jrd_tra* transaction,
 								 record_param* rpb, MemoryPool* pool)
 /**********************************************************
  *
@@ -4576,8 +4576,8 @@
  *
  * This is helper routine for the VIO_chase_record_version. It is used to make
  * cursor stable - i.e. cursor should ignore changes made to the record by the
- * inner code. Of course, it is called only when primary record version was 
- * created by current transaction: 
+ * inner code. Of course, it is called only when primary record version was
+ * created by current transaction:
  *	rpb->rpb_transaction_nr == transaction->tra_number.
  *
  * Possible cases and actions:
@@ -4585,24 +4585,24 @@
  * - If record was not changed under current savepoint, return udNone.
  *	 VIO_chase_record_version should continue own processing.
  *
- * If record was changed under current savepoint, we should read its previous 
+ * If record was changed under current savepoint, we should read its previous
  * version:
  *
- * - If previous version data is present at undo-log (after update_in_place, 
+ * - If previous version data is present at undo-log (after update_in_place,
  *	 for ex.), copy it into rpb and return udExists.
  *	 VIO_chase_record_version should return true.
  *
  * - If record was inserted or updated and then deleted under current savepoint
  *	 we should undo two last actions (delete and insert\update), therefore return
  *	 udForceTwice.
- *	 VIO_chase_record_version should continue and read second available back 
+ *	 VIO_chase_record_version should continue and read second available back
  *	 version from disk.
  *
  * - Else we need to undo just a last action, so return udForceBack.
- *	 VIO_chase_record_version should continue and read first available back 
+ *	 VIO_chase_record_version should continue and read first available back
  *	 version from disk.
  *
- * If record version was restored from undo log mark rpb with RPB_s_undo_data 
+ * If record version was restored from undo log mark rpb with RPB_s_undo_data
  * to let caller know that data page is already released.
  *
  **********************************************************/
@@ -4627,7 +4627,7 @@
 			if (!undo)
 				return udForceBack;
 
-			if (undo->getLength() == 0) 
+			if (undo->getLength() == 0)
 			{
 				if (undo->getFlags() & REC_new_version)
 					return udForceTwice;
@@ -5881,13 +5881,12 @@
 }
 
 
-
 /// class StableCursorSavePoint
 
-StableCursorSavePoint::StableCursorSavePoint(thread_db* tdbb, jrd_tra* transaction, bool start) :
-  m_tdbb(tdbb),
-  m_tran(transaction),
-  m_number(0)
+StableCursorSavePoint::StableCursorSavePoint(thread_db* tdbb, jrd_tra* transaction, bool start)
+	: m_tdbb(tdbb),
+	  m_tran(transaction),
+	  m_number(0)
 {
 	if (!start)
 		return;
@@ -5904,14 +5903,14 @@
 }
 
 
-  void StableCursorSavePoint::release()
+void StableCursorSavePoint::release()
 {
 	if (!m_number)
 		return;
 
 	for (const Savepoint* save_point = m_tran->tra_save_point;
-			save_point && m_number <= save_point->sav_number;
-			save_point = m_tran->tra_save_point)
+		 save_point && m_number <= save_point->sav_number;
+		 save_point = m_tran->tra_save_point)
 	{
 		VIO_verb_cleanup(m_tdbb, m_tran);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.