From a3a347fab424bcea6371a0854a270f7fde4dd7a2 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 12 Sep 2014 09:13:25 +0200
Subject: [PATCH] Add optional null bit to CDB leafs

--HG--
branch : cdb-packed
---
 code/nel/include/nel/misc/cdb_leaf.h          |   4 +
 code/nel/src/misc/cdb_leaf.cpp                |  57 ++++--
 code/ryzom/common/data_common/database.xml    | 187 ++++++++++++------
 .../player_manager/cdb_leaf.cpp               |  12 ++
 .../player_manager/cdb_leaf.h                 |   8 +-
 .../player_manager/cdb_synchronised.cpp       |  48 +++--
 6 files changed, 229 insertions(+), 87 deletions(-)

diff --git a/code/nel/include/nel/misc/cdb_leaf.h b/code/nel/include/nel/misc/cdb_leaf.h
index e3df6f8b3..aa6055de6 100644
--- a/code/nel/include/nel/misc/cdb_leaf.h
+++ b/code/nel/include/nel/misc/cdb_leaf.h
@@ -93,6 +93,7 @@ public:
 		_Property = 0;
 		_oldProperty = 0;
 		_Type = UNKNOWN;
+		_Nullable = false;
 		_Changed = false;
 		_LastChangeGC = 0;
 	}
@@ -232,6 +233,9 @@ private:
 	/// property type
 	EPropType			_Type;
 
+	/// nullable
+	bool				_Nullable;
+
 	/// true if this value has changed
 	bool				_Changed;
 
diff --git a/code/nel/src/misc/cdb_leaf.cpp b/code/nel/src/misc/cdb_leaf.cpp
index 79f36e5b0..590715091 100644
--- a/code/nel/src/misc/cdb_leaf.cpp
+++ b/code/nel/src/misc/cdb_leaf.cpp
@@ -43,6 +43,18 @@ namespace NLMISC{
 //-----------------------------------------------
 void CCDBNodeLeaf::init(  xmlNodePtr node, IProgressCallback &/* progressCallBack */, bool /* mapBanks */, CCDBBankHandler * /* bankHandler */ )
 {
+	// Read nullable
+	CXMLAutoPtr nullable((const char*)xmlGetProp (node, (xmlChar*)"nullable"));
+	if ((const char *) nullable != NULL)
+	{
+		_Nullable = (nullable.getDatas()[0] == '1');
+	}
+	else
+	{
+		_Nullable = false;
+	}
+
+	// Read type
 	CXMLAutoPtr type((const char*)xmlGetProp (node, (xmlChar*)"type"));
 	nlassert((const char *) type != NULL);
 
@@ -145,17 +157,26 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 	{
 		// Read the Property Value according to the Property Type.
 		uint64 recvd = 0;
-		uint bits;
-		if (_Type == TEXT)
-			bits = 32;
-		else if (_Type == PACKED)
-			bits = readPackedBitCount(f);
-		else if (_Type <= I64)
-			bits = _Type;
-		else
-			bits = _Type - 64;
-		f.serial(recvd, bits);
 
+		uint64 isNull = 0;
+		if (_Nullable)
+		{
+			f.serial(isNull, 1);
+		}
+
+		uint bits;
+		if (!isNull)
+		{
+			if (_Type == TEXT)
+				bits = 32;
+			else if (_Type == PACKED)
+				bits = readPackedBitCount(f);
+			else if (_Type <= I64)
+				bits = _Type;
+			else
+				bits = _Type - 64;
+			f.serial(recvd, bits);
+		}
 
 		// if the DB update is older than last DB update, abort (but after the read!!)
 		if(gc<_LastChangeGC)
@@ -170,16 +191,22 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 		// if signed
 		if (! ((_Type == TEXT) || (_Type == PACKED) || (_Type <= I64)))
 		{
-			// extend bit sign
-			sint64 mask = (((sint64)1)<<bits)-(sint64)1;
-			if( (_Property >> (bits-1))==1 )
+			if (!isNull)
 			{
-				_Property |= ~mask;
+				// extend bit sign
+				sint64 mask = (((sint64)1)<<bits)-(sint64)1;
+				if( (_Property >> (bits-1))==1 )
+				{
+					_Property |= ~mask;
+				}
 			}
 		}
 		if ( verboseDatabase )
 		{
-			nlinfo( "CDB: Read value (%u bits) %"NL_I64"d", bits, _Property );
+			if (!isNull)
+				nlinfo( "CDB: Read value (%u bits) %"NL_I64"d", bits, _Property );
+			else
+				nlinfo( "CDB: Read null value %"NL_I64"d", _Property );
 		}
 
 		// bkup the date of change
diff --git a/code/ryzom/common/data_common/database.xml b/code/ryzom/common/data_common/database.xml
index 620254daa..c40713731 100644
--- a/code/ryzom/common/data_common/database.xml
+++ b/code/ryzom/common/data_common/database.xml
@@ -1,4 +1,8 @@
 <database_description>
+  <!-- 2014-09-12: Now possible to use nullable="1" in leafs. This will
+  add 1 additional bit to the field, which will be the only bit sent
+  when the value of the field is 0. Use only for fields which are 
+  updated less frequently and which are often reset. -KAE -->
   <!-- Define bank superclass -->
   <bank_superclass>
     <bank name="PLR"
@@ -108,6 +112,7 @@
             bank="PLR">
       <leaf name="SHEET"
             type="I32"
+            nullable="1"
             cppType="NLMISC::CSheetId" />
       <leaf name="RUN"
             type="I32" />
@@ -149,7 +154,8 @@
       <branch name=""
               count="64">
         <leaf name="TICK_RANGE"
-              type="I64" />
+              type="I64"
+              nullable="1" />
         <!-- 32b for start tick and 32b for end tick -->
       </branch>
     </branch>
@@ -195,7 +201,8 @@
         <branch name=""
                 count="8">
           <leaf name="TITLE"
-                type="I32" />
+                type="I32"
+                nullable="1" />
           <!-- a text ID of 0 means there's no action. Text ID are reseted when a new character is targeted -->
           <leaf name="PLAYER_GIFT_NEEDED"
                 type="I1" />
@@ -207,13 +214,16 @@
       </branch>
       <!-- A NPC may offer to view a webpage -->
       <leaf name="WEB_PAGE_TITLE"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- a text ID of 0 means there's no WebPage -->
       <leaf name="WEB_PAGE_URL"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- the URL text ID of the web page -->
       <leaf name="OUTPOST"
             type="I32"
+            nullable="1"
             cppType="NLMISC::CSheetId" />
       <!-- outpost this bot give access to (sheet id inside) -->
       <!-- Mission rings -->
@@ -221,10 +231,12 @@
         <branch name=""
                 count="4">
           <leaf name="TITLE"
-                type="I32" />
+                type="I32"
+                nullable="1" />
           <!-- a text ID of 0 means there's no action. Text ID are reseted when a new character is targeted -->
           <leaf name="ID"
-                type="I32" />
+                type="I32"
+                nullable="1" />
           <!-- the id of the action if selected -->
         </branch>
       </branch>
@@ -275,18 +287,23 @@
               type="I2" />
         <leaf name="ICON"
               type="I32"
+              nullable="1"
               cppType="NLMISC::CSheetId" />
         <!-- sheet id of a .mission_icon sheet -->
         <leaf name="TITLE"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <leaf name="DETAIL_TEXT"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- begin date in tick -->
         <leaf name="BEGIN_DATE"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- end date in tick -->
         <leaf name="END_DATE"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- true if the step are "OR" -->
         <leaf name="OR_STEPS"
               type="I1" />
@@ -294,9 +311,11 @@
           <branch name=""
                   count="20">
             <leaf name="TEXT"
-                  type="I32" />
+                  type="I32"
+                  nullable="1" />
             <leaf name="NPC_ALIAS"
-                  type="I32" />
+                  type="I32"
+                  nullable="1" />
           </branch>
         </branch>
         <!-- Targets -->
@@ -304,11 +323,14 @@
                 count="8"
                 atom="1">
           <leaf name="TITLE"
-                type="I32" />
+                type="I32"
+                nullable="1" />
           <leaf name="X"
-                type="I32" />
+                type="I32"
+                nullable="1" />
           <leaf name="Y"
-                type="I32" />
+                type="I32"
+                nullable="1" />
         </branch>
         <!-- Indicate if the mission is finished (0-not 1-success 2-failed) -->
         <leaf name="FINISHED"
@@ -324,7 +346,8 @@
           <branch name=""
                   count="30">
             <leaf name="TEXT"
-                  type="I32" />
+                  type="I32"
+                  nullable="1" />
           </branch>
         </branch>
       </branch>
@@ -370,6 +393,7 @@
         <!-- Common Item Data -->
         <leaf name="SHEET"
               type="I32"
+              nullable="1"
               cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"
               type="I10" />
@@ -382,7 +406,8 @@
               type="I16" />
         <!-- weight. see DB_WEIGHT_SCALE -->
         <leaf name="NAMEID"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- 0 or special name of item -->
         <leaf name="INFO_VERSION"
               type="I8" />
@@ -402,6 +427,7 @@
         <!-- Common Item Data -->
         <leaf name="SHEET"
               type="I32"
+              nullable="1"
               cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"
               type="I10" />
@@ -414,7 +440,8 @@
               type="I16" />
         <!-- weight. see DB_WEIGHT_SCALE-->
         <leaf name="NAMEID"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- 0 or special name of item -->
         <leaf name="INFO_VERSION"
               type="I8" />
@@ -549,6 +576,7 @@
         <!-- Common Item Data -->
         <leaf name="SHEET"
               type="I32"
+              nullable="1"
               cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"
               type="I12" />
@@ -563,7 +591,8 @@
               type="I16" />
         <!-- weight. see DB_WEIGHT_SCALE-->
         <leaf name="NAMEID"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- 0 or special name of item -->
         <leaf name="INFO_VERSION"
               type="I8" />
@@ -591,6 +620,7 @@
         <!-- Common Item Data -->
         <leaf name="SHEET"
               type="I32"
+              nullable="1"
               cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"
               type="I10" />
@@ -602,7 +632,8 @@
               type="I16" />
         <!-- weight. see DB_WEIGHT_SCALE-->
         <leaf name="NAMEID"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- 0 or special name of item -->
         <leaf name="INFO_VERSION"
               type="I8" />
@@ -692,11 +723,13 @@
               count="12">
         <leaf name="SHEET"
               type="I32"
+              nullable="1"
               cppType="NLMISC::CSheetId" />
         <leaf name="DISABLED"
               type="I1" />
         <leaf name="DISABLED_TIME"
-              type="I32" />
+              type="I32"
+              nullable="1" />
       </branch>
     </branch>
     <branch name="MALUS">
@@ -704,11 +737,13 @@
               count="12">
         <leaf name="SHEET"
               type="I32"
+              nullable="1"
               cppType="NLMISC::CSheetId" />
         <leaf name="DISABLED"
               type="I1" />
         <leaf name="DISABLED_TIME"
-              type="I32" />
+              type="I32"
+              nullable="1" />
       </branch>
     </branch>
   </branch>
@@ -717,10 +752,12 @@
     <branch name=""
             count="12">
       <leaf name="FAMILY"
-            type="I16" />
+            type="I16"
+            nullable="1" />
       <!-- Disable consumablel family -->
       <leaf name="DISABLE_TIME"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- End date of diable time in tick -->
     </branch>
   </branch>
@@ -729,16 +766,20 @@
           bank="PLR">
     <!-- intro for player gift -->
     <leaf name="PLAYER_GIFT"
-          type="I32" />
+          type="I32"
+          nullable="1" />
     <!-- intro for guild creation -->
     <leaf name="CREATE_GUILD"
-          type="I32" />
+          type="I32"
+          nullable="1" />
     <!-- intro for trade window (pacts, action, item, or skills ..)-->
     <leaf name="TRADE"
-          type="I32" />
+          type="I32"
+          nullable="1" />
     <!-- intro for choose mission -->
     <leaf name="CHOOSE_MISSION"
-          type="I32" />
+          type="I32"
+          nullable="1" />
     <!-- intro before the reward of the mission -->
     <!-- <leaf name="MISSION_END_REWARD" type="I32"/> -->
     <!-- text of the mission end -->
@@ -749,19 +790,23 @@
     <branch name="DM_CHOICE"
             count="3">
       <leaf name="TITLE"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <branch name=""
               count="8">
         <leaf name="TEXT"
-              type="I32" />
+              type="I32"
+              nullable="1" />
       </branch>
     </branch>
     <!-- title of dynamic mission -->
     <leaf name="DM_TITLE"
-          type="I32" />
+          type="I32"
+          nullable="1" />
     <!-- description of dynamic mission -->
     <leaf name="DM_DESCRIPTION"
-          type="I32" />
+          type="I32"
+          nullable="1" />
     <!-- the rolemaster type on 2 bits -->
     <leaf name="ROLEMASTER_TYPE"
           type="I2" />
@@ -785,9 +830,11 @@
                         if high order bit == 1 : low order bits = entry in the LIFT_ICONS::TLiftIcon enum
                         -->
       <leaf name="ICON"
-            type="I64" />
+            type="I64"
+            nullable="1" />
       <leaf name="NAME"
-            type="I32" />
+            type="I32"
+            nullable="1" />
     </branch>
   </branch>
   <branch name="CHOOSE_MISSIONS"
@@ -805,12 +852,15 @@
             count="8">
       <leaf name="ICON"
             type="I32"
+            nullable="1"
             cppType="NLMISC::CSheetId" />
       <!-- sheet id of a .mission_icon sheet -->
       <leaf name="TEXT"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <leaf name="DETAIL_TEXT"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <leaf name="PREREQ_STATE"
             type="I8" />
       <!-- game_share/mission_desc.h/TPreReqState -->
@@ -854,6 +904,7 @@
       <!-- Common Item Data -->
       <leaf name="SHEET"
             type="I32"
+            nullable="1"
             cppType="NLMISC::CSheetId" />
       <leaf name="QUALITY"
             type="I10" />
@@ -866,7 +917,8 @@
             type="I16" />
       <!-- weight. see DB_WEIGHT_SCALE-->
       <leaf name="NAMEID"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- 0 or special name of item -->
       <leaf name="INFO_VERSION"
             type="I8" />
@@ -887,6 +939,7 @@
       <!-- For rrp curency, specify the rrp level -->
       <leaf name="MONEY_SHEET"
             type="I32"
+            nullable="1"
             cppType="NLMISC::CSheetId" />
       <!-- For item curency, specify the item sheet -->
       <leaf name="BASE_SKILL"
@@ -904,7 +957,8 @@
       <leaf name="RESALE_TIME_LEFT"
             type="I16" />
       <leaf name="VENDOR_NAMEID"
-            type="TEXT" />
+            type="TEXT"
+            nullable="1" />
       <!-- name id of player vendor -->
       <leaf name="FACTION_POINT_PRICE"
             type="I32" />
@@ -924,7 +978,8 @@
     <branch name=""
             count="1024">
       <leaf name="BRICKS"
-            type="PACKED" />
+            type="PACKED"
+            nullable="1" />
     </branch>
   </branch>
   <branch name="MISSIONS"
@@ -936,18 +991,23 @@
             type="I2" />
       <leaf name="ICON"
             type="I32"
+            nullable="1"
             cppType="NLMISC::CSheetId" />
       <!-- sheet id of a .mission_icon sheet -->
       <leaf name="TITLE"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <leaf name="DETAIL_TEXT"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- begin date in tick -->
       <leaf name="BEGIN_DATE"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- end date in tick -->
       <leaf name="END_DATE"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- true if the step are "OR" -->
       <leaf name="OR_STEPS"
             type="I1" />
@@ -955,9 +1015,11 @@
         <branch name=""
                 count="20">
           <leaf name="TEXT"
-                type="I32" />
+                type="I32"
+                nullable="1" />
           <leaf name="NPC_ALIAS"
-                type="I32" />
+                type="I32"
+                nullable="1" />
         </branch>
       </branch>
       <!-- Targets -->
@@ -965,11 +1027,14 @@
               count="8"
               atom="1">
         <leaf name="TITLE"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <leaf name="X"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <leaf name="Y"
-              type="I32" />
+              type="I32"
+              nullable="1" />
       </branch>
       <!-- Indicate if the mission is finished (0-not 1-success 2-failed) -->
       <leaf name="FINISHED"
@@ -985,7 +1050,8 @@
         <branch name=""
                 count="30">
           <leaf name="TEXT"
-                type="I32" />
+                type="I32"
+                nullable="1" />
         </branch>
       </branch>
     </branch>
@@ -999,6 +1065,7 @@
     <!-- If not a phrase in the speel book, give the associated brick sheet id -->
     <leaf name="SHEET"
           type="I32"
+          nullable="1"
           cppType="NLMISC::CSheetId" />
     <!-- When the NEXT_COUNTER reach the one on client, reset -->
     <leaf name="NEXT_COUNTER"
@@ -1025,7 +1092,8 @@
               type="I16" />
         <!-- Entity name -->
         <leaf name="TARGET_NAME"
-              type="TEXT" />
+              type="TEXT"
+              nullable="1" />
         <!-- Entity State -->
         <leaf name="TARGET_HP"
               type="I7" />
@@ -1093,7 +1161,8 @@
       <branch name=""
               count="256">
         <leaf name="NAME"
-              type="TEXT" />
+              type="TEXT"
+              nullable="1" />
         <!-- player name -->
         <leaf name="GRADE"
               type="I3" />
@@ -1103,7 +1172,8 @@
               cppType="TCharConnectionState" />
         <!-- enum TCharConnectionState -->
         <leaf name="ENTER_DATE"
-              type="I32" />
+              type="I32"
+              nullable="1" />
         <!-- tick when player entered the guild-->
       </branch>
     </branch>
@@ -1241,6 +1311,7 @@
                   count="16">
             <leaf name="SHEET"
                   type="I32"
+                  nullable="1"
                   cppType="NLMISC::CSheetId" />
           </branch>
         </branch>
@@ -1254,6 +1325,7 @@
             <!-- Spawned -->
             <leaf name="SHEET"
                   type="I32"
+                  nullable="1"
                   cppType="NLMISC::CSheetId" />
           </branch>
           <branch name="T"
@@ -1261,6 +1333,7 @@
             <!-- Training -->
             <leaf name="SHEET"
                   type="I32"
+                  nullable="1"
                   cppType="NLMISC::CSheetId" />
             <leaf name="SPAWN"
                   type="I4" />
@@ -1277,6 +1350,7 @@
                   count="4">
             <leaf name="SHEET"
                   type="I32"
+                  nullable="1"
                   cppType="NLMISC::CSheetId" />
           </branch>
         </branch>
@@ -1505,7 +1579,8 @@
       <leaf name="DESPAWN"
             type="I7" />
       <leaf name="NAME"
-            type="I32" />
+            type="I32"
+            nullable="1" />
     </branch>
   </branch>
   <branch name="DEBUG_INFO"
@@ -1616,10 +1691,12 @@
             count="8"
             atom="1">
       <leaf name="NAME"
-            type="I32" />
+            type="I32"
+            nullable="1" />
       <!-- channel not available if anme is 0 -->
       <leaf name="ID"
-            type="I64" />
+            type="I64"
+            nullable="1" />
       <!-- unique ID of channel (eid) -->
       <leaf name="WRITE_RIGHT"
             type="I1" />
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp
index 03616c460..34542d376 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp
@@ -45,6 +45,18 @@ using namespace std;
 //-----------------------------------------------
 void CCDBStructNodeLeaf::init( xmlNodePtr node, NLMISC::IProgressCallback &progressCallBack ) 
 {
+	// Read nullable
+	CXMLAutoPtr nullable((const char*)xmlGetProp (node, (xmlChar*)"nullable"));
+	if ((const char *) nullable != NULL)
+	{
+		_Nullable = (nullable.getDatas()[0] == '1');
+	}
+	else
+	{
+		_Nullable = false;
+	}
+
+	// Read type
 	CXMLAutoPtr type((const char*)xmlGetProp (node, (xmlChar*)"type"));
 	nlassert((const char *) type != NULL);
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.h
index 97fabde04..f7205f766 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.h
@@ -36,6 +36,9 @@ public:
 	/// Return the type of the property.
 	inline const EPropType &	type() const {return _Type;}
 
+	/// Return the type of the property.
+	inline bool					nullable() const {return _Nullable;}
+
 	/// The overridden version that is usable from ICDBStructNode
 	virtual EPropType			getType() const		{return _Type;}
 
@@ -46,7 +49,7 @@ public:
 	/**
 	 * Default constructor
 	 */
-	CCDBStructNodeLeaf() : ICDBStructNode(), _Parent( NULL ), _Type( UNKNOWN ) {}
+	CCDBStructNodeLeaf() : ICDBStructNode(), _Parent( NULL ), _Type( UNKNOWN ), _Nullable( false ) {}
 	
 	/**
 	 *	Build the structure of the database from a file
@@ -178,6 +181,9 @@ private:
 	/// property type
 	EPropType			_Type;
 
+	/// nullable
+	bool				_Nullable;
+
 	/// Binary property id of the leaf (precalculated & stored to avoid having to get back in the tree to build it)
 	CBinId				_LeafId;
 };
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp
index 823c3b070..3986e1044 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp
@@ -582,26 +582,42 @@ void	CCDBSynchronised::pushDelta( CBitMemStream& s, CCDBStructNodeLeaf *node, ui
 		value = (uint64)_DataContainer.getValue64( index );
 		//_DataContainer.archiveCurrentValue( index );
 
-		if ( node->type() == ICDBStructNode::TEXT )
+		if ( node->nullable() && value == 0 )
 		{
-			s.serialAndLog2( value, 32 );
-			bitsize += 32;
-			if ( VerboseDatabase )
-				nldebug( "CDB: Pushing value %"NL_I64"d (TEXT-32) for index %d prop %s", (sint64)value, index, node->buildTextId().toString().c_str() );
-		}
-		else if ( node->type() == ICDBStructNode::PACKED )
-		{
-			uint bits;
-			pushPackedValue( s, value, bitsize, bits );
-			if ( VerboseDatabase )
-				nldebug( "CDB: Pushing value %"NL_I64"d (PACKED %u bits) for index %d prop %s", (sint64)value, bits, index, node->buildTextId().toString().c_str() );
+			uint64 isNull = 1;
+			s.serialAndLog2( isNull, 1 );
+			bitsize += 1;
 		}
 		else
 		{
-			s.serialAndLog2( value, (uint)node->type() );
-			bitsize += (uint32)node->type();
-			if ( VerboseDatabase )
-				nldebug( "CDB: Pushing value %"NL_I64"d (%u bits) for index %d prop %s", (sint64)value, (uint32)node->type(), index, node->buildTextId().toString().c_str() );
+			if ( node->nullable() )
+			{
+				uint64 isNull = 0;
+				s.serialAndLog2( isNull, 1 );
+				bitsize += 1;
+			}
+
+			if ( node->type() == ICDBStructNode::TEXT )
+			{
+				s.serialAndLog2( value, 32 );
+				bitsize += 32;
+				if ( VerboseDatabase )
+					nldebug( "CDB: Pushing value %"NL_I64"d (TEXT-32) for index %d prop %s", (sint64)value, index, node->buildTextId().toString().c_str() );
+			}
+			else if ( node->type() == ICDBStructNode::PACKED )
+			{
+				uint bits;
+				pushPackedValue( s, value, bitsize, bits );
+				if ( VerboseDatabase )
+					nldebug( "CDB: Pushing value %"NL_I64"d (PACKED %u bits) for index %d prop %s", (sint64)value, bits, index, node->buildTextId().toString().c_str() );
+			}
+			else
+			{
+				s.serialAndLog2( value, (uint)node->type() );
+				bitsize += (uint32)node->type();
+				if ( VerboseDatabase )
+					nldebug( "CDB: Pushing value %"NL_I64"d (%u bits) for index %d prop %s", (sint64)value, (uint32)node->type(), index, node->buildTextId().toString().c_str() );
+			}
 		}
 	}
 	else