Improvement CORE-5647 - Increase number of formats/versions of views from 255 to 32K.

asfernandes · asfernandes · commit 3dd6a2f5366e · 2017-11-03T14:59:59.000Z
diff --git a/src/jrd/dfw.epp b/src/jrd/dfw.epp
@@ -5615,8 +5615,16 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
 			null_view = blob_id.isEmpty();
 			external_flag = REL.RDB$EXTERNAL_FILE[0];
 
-			if (REL.RDB$FORMAT == MAX_TABLE_VERSIONS)
-				raiseTooManyVersionsError(obj_relation, work->dfw_name);
+			if (REL.RDB$VIEW_BLR.NULL)
+			{
+				if (REL.RDB$FORMAT == MAX_TABLE_VERSIONS)
+					raiseTooManyVersionsError(obj_relation, work->dfw_name);
+			}
+			else
+			{
+				if (REL.RDB$FORMAT == MAX_VIEW_VERSIONS)
+					raiseTooManyVersionsError(obj_view, work->dfw_name);
+			}
 
 			MODIFY REL USING
 				blb* blob = blb::create(tdbb, transaction, &REL.RDB$RUNTIME);
diff --git a/src/jrd/ods.h b/src/jrd/ods.h
@@ -718,4 +718,7 @@ const USHORT RAW_HEADER_SIZE = 1024;	// ROUNDUP(HDR_SIZE, PAGE_ALIGNMENT);
 // max number of table formats (aka versions), limited by "UCHAR rhd_format"
 const int MAX_TABLE_VERSIONS = 255;
 
+// max number of view formats (aka versions), limited by "SSHORT RDB$FORMAT"
+const int MAX_VIEW_VERSIONS = MAX_SSHORT;
+
 #endif // JRD_ODS_H
