(HyperSQL DataBase) is a SQL relational database engine written in Java. It supports nearly full ANSI-92 SQL (BNF format) and full core SQL:2008.
| Logger.java (hsqldb-2.6.0) | : | Logger.java (hsqldb-2.6.1) |
|---|
| | |
| skipping to change at line 87 | | skipping to change at line 87 |
|---|
| | |
| /** | | /** |
| * The public interface of persistence and logging classes.<p> | | * The public interface of persistence and logging classes.<p> |
| * | | * |
| * Implements a storage manager wrapper that provides a consistent, | | * Implements a storage manager wrapper that provides a consistent, |
| * always available interface to storage management for the Database | | * always available interface to storage management for the Database |
| * class, despite the fact not all Database objects actually use file | | * class, despite the fact not all Database objects actually use file |
| * storage.<p> | | * storage.<p> |
| * | | * |
| * @author Fred Toussi (fredt@users dot sourceforge.net) | | * @author Fred Toussi (fredt@users dot sourceforge.net) |
|
| * @version 2.6.0 | | * @version 2.6.1 |
| * @since 1.7.0 | | * @since 1.7.0 |
| */ | | */ |
| public class Logger implements EventLogInterface { | | public class Logger implements EventLogInterface { |
| | |
| public SimpleLog appLog; | | public SimpleLog appLog; |
| public SimpleLog sqlLog; | | public SimpleLog sqlLog; |
| | |
| // | | // |
| FrameworkLogger fwLogger; | | FrameworkLogger fwLogger; |
| FrameworkLogger sqlLogger; | | FrameworkLogger sqlLogger; |
| | |
| skipping to change at line 109 | | skipping to change at line 109 |
|---|
| // | | // |
| private Database database; | | private Database database; |
| private boolean logsStatements; // false indicates Log is being opened | | private boolean logsStatements; // false indicates Log is being opened |
| private boolean loggingEnabled; | | private boolean loggingEnabled; |
| | |
| // | | // |
| private boolean propIsFileDatabase; | | private boolean propIsFileDatabase; |
| boolean propNioDataFile; | | boolean propNioDataFile; |
| long propNioMaxSize = 256 * 1024 * 1024L; | | long propNioMaxSize = 256 * 1024 * 1024L; |
| int propMaxFreeBlocks = 512; | | int propMaxFreeBlocks = 512; |
|
| int propMinReuse = 0; | | |
| private int propCacheMaxRows; | | private int propCacheMaxRows; |
| private long propCacheMaxSize; | | private long propCacheMaxSize; |
| int propDataFileDefragLimit; | | int propDataFileDefragLimit; |
| private int propDataFileScale; | | private int propDataFileScale; |
| int propDataFileSpace; | | int propDataFileSpace; |
| String propTextSourceDefault = ""; | | String propTextSourceDefault = ""; |
| boolean propTextAllowFullPath; | | boolean propTextAllowFullPath; |
| private int propWriteDelay; | | private int propWriteDelay; |
| private int propLogSize; | | private int propLogSize; |
| private boolean propLogData = true; | | private boolean propLogData = true; |
| | |
| skipping to change at line 534 | | skipping to change at line 533 |
|---|
| database.sqlSyntaxMss = database.databaseProperties.isPropertyTrue( | | database.sqlSyntaxMss = database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.sql_syntax_mss); | | HsqlDatabaseProperties.sql_syntax_mss); |
| database.sqlSyntaxMys = database.databaseProperties.isPropertyTrue( | | database.sqlSyntaxMys = database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.sql_syntax_mys); | | HsqlDatabaseProperties.sql_syntax_mys); |
| database.sqlSyntaxOra = database.databaseProperties.isPropertyTrue( | | database.sqlSyntaxOra = database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.sql_syntax_ora); | | HsqlDatabaseProperties.sql_syntax_ora); |
| database.sqlSyntaxPgs = database.databaseProperties.isPropertyTrue( | | database.sqlSyntaxPgs = database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.sql_syntax_pgs); | | HsqlDatabaseProperties.sql_syntax_pgs); |
| database.sqlSysIndexNames = database.databaseProperties.isPropertyTrue( | | database.sqlSysIndexNames = database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.sql_sys_index_names); | | HsqlDatabaseProperties.sql_sys_index_names); |
|
| | database.sqlLowerCaseIdentifier = |
| | database.databaseProperties.isPropertyTrue( |
| | HsqlDatabaseProperties.sql_lowercase_ident); |
| | |
| if (database.databaseProperties.isPropertyTrue( | | if (database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.sql_compare_in_locale)) { | | HsqlDatabaseProperties.sql_compare_in_locale)) { |
| database.collation.setCollationAsLocale(); | | database.collation.setCollationAsLocale(); |
| } | | } |
| | |
| propEventLogLevel = database.databaseProperties.getIntegerProperty( | | propEventLogLevel = database.databaseProperties.getIntegerProperty( |
| HsqlDatabaseProperties.hsqldb_applog); | | HsqlDatabaseProperties.hsqldb_applog); |
| propSqlLogLevel = database.databaseProperties.getIntegerProperty( | | propSqlLogLevel = database.databaseProperties.getIntegerProperty( |
| HsqlDatabaseProperties.hsqldb_sqllog); | | HsqlDatabaseProperties.hsqldb_sqllog); |
| | |
| skipping to change at line 605 | | skipping to change at line 607 |
|---|
| setLogSize( | | setLogSize( |
| database.databaseProperties.getIntegerProperty( | | database.databaseProperties.getIntegerProperty( |
| HsqlDatabaseProperties.hsqldb_log_size)); | | HsqlDatabaseProperties.hsqldb_log_size)); |
| | |
| propLogData = database.databaseProperties.isPropertyTrue( | | propLogData = database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.hsqldb_log_data); | | HsqlDatabaseProperties.hsqldb_log_data); |
| propGC = database.databaseProperties.getIntegerProperty( | | propGC = database.databaseProperties.getIntegerProperty( |
| HsqlDatabaseProperties.runtime_gc_interval); | | HsqlDatabaseProperties.runtime_gc_interval); |
| propRefIntegrity = database.databaseProperties.isPropertyTrue( | | propRefIntegrity = database.databaseProperties.isPropertyTrue( |
| HsqlDatabaseProperties.sql_ref_integrity); | | HsqlDatabaseProperties.sql_ref_integrity); |
|
| | | |
| setCacheMinReuseSize( | | |
| database.databaseProperties.getIntegerProperty( | | |
| HsqlDatabaseProperties.hsqldb_min_reuse)); | | |
| } | | } |
| | |
| // fredt@users 20020130 - patch 495484 by campbell-burnet@users | | // fredt@users 20020130 - patch 495484 by campbell-burnet@users |
| | |
| /** | | /** |
| * Shuts down the logging process using the specified mode. <p> | | * Shuts down the logging process using the specified mode. <p> |
| * | | * |
| * @param closemode The mode in which to shut down the logging | | * @param closemode The mode in which to shut down the logging |
| * process | | * process |
| * <OL> | | * <OL> |
| | |
| skipping to change at line 1121 | | skipping to change at line 1119 |
|---|
| } | | } |
| | |
| public void setCacheSize(int value) { | | public void setCacheSize(int value) { |
| propCacheMaxSize = value * 1024L; | | propCacheMaxSize = value * 1024L; |
| } | | } |
| | |
| public long getCacheSize() { | | public long getCacheSize() { |
| return propCacheMaxSize; | | return propCacheMaxSize; |
| } | | } |
| | |
|
| public void setCacheMinReuseSize(int value) { | | |
| propMinReuse = ArrayUtil.getTwoPowerFloor(value); | | |
| } | | |
| | | |
| public void setDataFileScale(int value) { | | public void setDataFileScale(int value) { |
| | |
| if (value < 16) { | | if (value < 16) { |
| throw Error.error(ErrorCode.X_42556); | | throw Error.error(ErrorCode.X_42556); |
| } | | } |
| | |
| setDataFileScaleNoCheck(value); | | setDataFileScaleNoCheck(value); |
| } | | } |
| | |
| public void setDataFileScaleNoCheck(int value) { | | public void setDataFileScaleNoCheck(int value) { |
| | |
| skipping to change at line 1671 | | skipping to change at line 1665 |
|---|
| } | | } |
| | |
| if (HsqlDatabaseProperties.sql_live_object.equals(name)) { | | if (HsqlDatabaseProperties.sql_live_object.equals(name)) { |
| return String.valueOf(database.sqlLiveObject); | | return String.valueOf(database.sqlLiveObject); |
| } | | } |
| | |
| if (HsqlDatabaseProperties.jdbc_translate_tti_types.equals(name)) { | | if (HsqlDatabaseProperties.jdbc_translate_tti_types.equals(name)) { |
| return String.valueOf(database.sqlTranslateTTI); | | return String.valueOf(database.sqlTranslateTTI); |
| } | | } |
| | |
|
| if (HsqlDatabaseProperties.hsqldb_min_reuse.equals(name)) { | | |
| return String.valueOf(propMinReuse); | | |
| } | | |
| | |
| if (HsqlDatabaseProperties.sql_sys_index_names.equals(name)) { | | |
| return String.valueOf(database.sqlSysIndexNames); | | |
| } | | |
| | | |
| /* | | /* |
| if (HsqlDatabaseProperties.textdb_all_quoted.equals(name)) { | | if (HsqlDatabaseProperties.textdb_all_quoted.equals(name)) { |
| return null; | | return null; |
| } | | } |
| | |
| if (HsqlDatabaseProperties.textdb_allow_full_path.equals(name)) { | | if (HsqlDatabaseProperties.textdb_allow_full_path.equals(name)) { |
| return null; | | return null; |
| } | | } |
| | |
| if (HsqlDatabaseProperties.textdb_encoding.equals(name)) { | | if (HsqlDatabaseProperties.textdb_encoding.equals(name)) { |
| | |
| skipping to change at line 2002 | | skipping to change at line 1988 |
|---|
| | |
| if (database.sqlIgnoreCase) { | | if (database.sqlIgnoreCase) { |
| sb.append("SET DATABASE ").append(Tokens.T_SQL).append(' '); | | sb.append("SET DATABASE ").append(Tokens.T_SQL).append(' '); |
| sb.append(Tokens.T_IGNORECASE).append(' '); | | sb.append(Tokens.T_IGNORECASE).append(' '); |
| sb.append(database.sqlIgnoreCase ? Tokens.T_TRUE | | sb.append(database.sqlIgnoreCase ? Tokens.T_TRUE |
| : Tokens.T_FALSE); | | : Tokens.T_FALSE); |
| list.add(sb.toString()); | | list.add(sb.toString()); |
| sb.setLength(0); | | sb.setLength(0); |
| } | | } |
| | |
|
| | if (database.sqlLowerCaseIdentifier) { |
| | sb.append("SET DATABASE ").append(Tokens.T_SQL).append(' '); |
| | sb.append(Tokens.T_LOWER).append(' '); |
| | sb.append(Tokens.T_CASE).append(' '); |
| | sb.append(Tokens.T_IDENTIFIER).append(' '); |
| | sb.append(database.sqlLowerCaseIdentifier ? Tokens.T_TRUE |
| | : Tokens.T_FALSE); |
| | list.add(sb.toString()); |
| | sb.setLength(0); |
| | } |
| | |
| if (database.sqlSyntaxDb2) { | | if (database.sqlSyntaxDb2) { |
| sb.append("SET DATABASE ").append(Tokens.T_SQL).append(' '); | | sb.append("SET DATABASE ").append(Tokens.T_SQL).append(' '); |
| sb.append(Tokens.T_SYNTAX).append(' '); | | sb.append(Tokens.T_SYNTAX).append(' '); |
| sb.append(Tokens.T_DB2).append(' '); | | sb.append(Tokens.T_DB2).append(' '); |
| sb.append(database.sqlSyntaxDb2 ? Tokens.T_TRUE | | sb.append(database.sqlSyntaxDb2 ? Tokens.T_TRUE |
| : Tokens.T_FALSE); | | : Tokens.T_FALSE); |
| list.add(sb.toString()); | | list.add(sb.toString()); |
| sb.setLength(0); | | sb.setLength(0); |
| } | | } |
| | |
| | | |
| End of changes. 7 change blocks. |
|---|
| 18 lines changed or deleted | | 15 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 