Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[57889] firebird/trunk
|
From: <ma...@us...> - 2013-04-01 17:54:07
|
Revision: 57889
http://sourceforge.net/p/firebird/code/57889
Author: mapopa
Date: 2013-04-01 17:54:03 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
FLINT_CACHE was never used , dead leftover from ib 4.0 product years http://sourceforge.net/mailarchive/message.php?msg_id=5975155 (FLINSTONE is gone)
Modified Paths:
--------------
firebird/trunk/doc/emacros-cross_ref.html
firebird/trunk/src/gpre/gpre.h
firebird/trunk/src/gpre/sql.cpp
Modified: firebird/trunk/doc/emacros-cross_ref.html
===================================================================
--- firebird/trunk/doc/emacros-cross_ref.html 2013-04-01 16:04:52 UTC (rev 57888)
+++ firebird/trunk/doc/emacros-cross_ref.html 2013-04-01 17:54:03 UTC (rev 57889)
@@ -83,22 +83,6 @@
used in jrd\pcmet.epp(200) with #ifdef <br>
</td></tr>
<tr><td valign="top">
-(5) FLINT_CACHE</td><td>Unknown.</td></tr>
-<tr><td> </td><td>
-used in dudley\parse.cpp(53) with #ifdef <br>
-used in dudley\parse.cpp(101) with #ifdef <br>
-used in dudley\parse.cpp(640) with #ifdef <br>
-used in dudley\parse.cpp(743) with #ifdef <br>
-used in dudley\parse.cpp(808) with #ifdef <br>
-used in gpre\sql.cpp(56) with #ifdef <br>
-used in gpre\sql.cpp(115) with #ifdef <br>
-used in gpre\sql.cpp(1087) with #ifdef <br>
-used in gpre\sql.cpp(1135) with #ifdef <br>
-used in gpre\sql.cpp(4849) with #ifdef <br>
-used in gpre\sql.cpp(6293) with #ifdef <br>
-used in gpre\sql.cpp(6370) with #ifdef <br>
-</td></tr>
-<tr><td valign="top">
(6) GDS32</td><td>Build with GDS Compatibility.</td></tr>
<tr><td> </td><td>
used in jrd\ibinitdll.cpp(29) with #ifdef <br>
Modified: firebird/trunk/src/gpre/gpre.h
===================================================================
--- firebird/trunk/src/gpre/gpre.h 2013-04-01 16:04:52 UTC (rev 57888)
+++ firebird/trunk/src/gpre/gpre.h 2013-04-01 17:54:03 UTC (rev 57889)
@@ -837,9 +837,6 @@
int dbb_buffercount;
ULONG dbb_length; // Length of database in pages, if known
gpre_file* dbb_logfiles;
-#ifdef FLINT_CACHE // In practice, never used.
- gpre_file* dbb_cache_file;
-#endif
gpre_file* dbb_files;
};
Modified: firebird/trunk/src/gpre/sql.cpp
===================================================================
--- firebird/trunk/src/gpre/sql.cpp 2013-04-01 16:04:52 UTC (rev 57888)
+++ firebird/trunk/src/gpre/sql.cpp 2013-04-01 17:54:03 UTC (rev 57889)
@@ -47,10 +47,6 @@
#include "../common/utils_proto.h"
-#ifdef FLINT_CACHE
-const int MIN_CACHE_BUFFERS = 250;
-const int DEF_CACHE_BUFFERS = 1000;
-#endif
const int DEFAULT_BLOB_SEGMENT_LENGTH = 80; // bytes
static act* act_alter();
@@ -103,9 +99,6 @@
static bool check_filename(const TEXT *);
static void connect_opts(const TEXT**, const TEXT**, const TEXT**, const TEXT**, USHORT*);
-#ifdef FLINT_CACHE
-static gpre_file* define_cache();
-#endif
static gpre_file* define_file();
static gpre_file* define_log_file();
static gpre_dbb* dup_dbb(const gpre_dbb*);
@@ -1133,15 +1126,8 @@
; // ignore DROP LOG database->dbb_flags |= DBB_drop_log;
else if (MSC_match(KW_CASCADE))
; // ignore DROP CASCADE database->dbb_flags |= DBB_cascade;
-#ifdef FLINT_CACHE
- else if (MSC_match(KW_CACHE))
- ; // ignore DROP CACHE database->dbb_flags |= DBB_drop_cache;
else
- PAR_error("only log or cache can be dropped");
-#else
- else
PAR_error("only log file can be dropped");
-#endif // FLINT_CACHE
}
else if (MSC_match(KW_ADD))
{
@@ -1184,10 +1170,6 @@
database->dbb_logfiles = define_log_file();
}
}
-#ifdef FLINT_CACHE
- else if (MSC_match(KW_CACHE))
- database->dbb_cache_file = define_cache();
-#endif // FLINT_CACHE
}
else if (MSC_match(KW_SET))
{
@@ -4848,48 +4830,8 @@
}
}
-
-#ifdef FLINT_CACHE
//____________________________________________________________
//
-// Add a shared cache to an existing database.
-//
-
-static gpre_file* define_cache()
-{
- gpre_file* file = (gpre_file*) MSC_alloc(FIL_LEN);
- if (isQuoted(gpreGlob.token_global.tok_type))
- {
- TEXT* string = (TEXT*) MSC_alloc(gpreGlob.token_global.tok_length + 1);
- file->fil_name = string;
- MSC_copy(gpreGlob.token_global.tok_string, gpreGlob.token_global.tok_length, string);
- PAR_get_token();
- }
- else
- CPR_s_error("<quoted filename>");
- if (!check_filename(file->fil_name))
- PAR_error("node name not permitted"); // a node name is not permitted in a shared cache file name
-
- if (MSC_match(KW_LENGTH))
- {
- file->fil_length = EXP_ULONG_ordinal(true);
- if (file->fil_length < MIN_CACHE_BUFFERS)
- {
- TEXT err_string[ERROR_LENGTH];
- sprintf(err_string, "Minimum of %d cache pages required", MIN_CACHE_BUFFERS);
- PAR_error(err_string);
- }
- MSC_match(KW_PAGES);
- }
- else
- file->fil_length = DEF_CACHE_BUFFERS; // default cache buffers
-
- return file;
-}
-#endif
-
-//____________________________________________________________
-//
// Add a new file to an existing database.
//
@@ -6304,15 +6246,8 @@
; // Ignore DROP LOG database->dbb_flags |= DBB_drop_log;
else if (MSC_match(KW_CASCADE))
; // ignore DROP CASCADE database->dbb_flags |= DBB_cascade;
-#ifdef FLINT_CACHE
- else if (MSC_match(KW_CACHE))
- ; // ignore DROP CACHE database->dbb_flags |= DBB_drop_cache;
else
- PAR_error("only log files or shared cache can be dropped"); // msg 121 only SECURITY_CLASS, DESCRIPTION and CACHE can be dropped
-#else
- else
PAR_error("only log files can be dropped"); // msg 121 only SECURITY_CLASS, DESCRIPTION and CACHE can be dropped
-#endif // FLINT_CACHE
//else if (MSC_match (KW_DESCRIP))
// database->dbb_flags |= DBB_null_description;
@@ -6387,10 +6322,6 @@
database->dbb_logfiles = define_log_file();
}
}
-#ifdef FLINT_CACHE
- else if (MSC_match(KW_CACHE))
- database->dbb_cache_file = define_cache();
-#endif // FLINT_CACHE
else
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|