rpms/openoffice.org/devel hsqldb.fix1.patch, NONE, 1.1 hsqldb.fix2.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 openoffice.org.spec, 1.245, 1.246 sources, 1.77, 1.78
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 22 14:59:45 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20825
Modified Files:
.cvsignore openoffice.org.spec sources
Added Files:
hsqldb.fix1.patch hsqldb.fix2.patch
Log Message:
hsqldb stuff
hsqldb.fix1.patch:
hsqldb_1_8_0 | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletion(-)
--- NEW FILE hsqldb.fix1.patch ---
Index: hsqldb_1_8_0
===================================================================
RCS file: /cvs/external/hsqldb/hsqldb_1_8_0,v
retrieving revision 1.4
diff -u -p -r1.4 hsqldb_1_8_0
--- openoffice.org.orig/hsqldb/hsqldb_1_8_0 6 Apr 2005 10:51:02 -0000 1.4
+++ openoffice.org/hsqldb/hsqldb_1_8_0 22 Jun 2005 14:38:16 -0000
@@ -4158,7 +4158,7 @@
sdfts.setCalendar(cal == null ? tempCalDefault
***************
*** 526,529 ****
---- 525,726 ----
+--- 525,728 ----
return tempCalDefault.get(part);
}
}
@@ -4313,7 +4313,9 @@
+ * @return
+ */
+ private boolean isZeroBit(int bit) {
-+ return (state & (1L << bit)) == 0;
++ if ((state & (1L << bit)) == 0)
++ return true;
++ return false;
+ }
+
+ /**
@@ -11244,3 +11246,22 @@
}
}
+diff -cr misc/hsqldb/build/build.xml misc/build/hsqldb/build/build.xml
+*** misc/hsqldb/build/build.xml 2005-06-22 15:23:19.000000000 +0100
+--- misc/build/hsqldb/build/build.xml 2005-06-22 15:29:05.000000000 +0100
+***************
+*** 227,235 ****
+--- 227,239 ----
+ </classpath>
+ <include name="*.java"/>
+ <include name="org/hsqldb/*.java"/>
++ <include name="org/hsqldb/index/*.java"/>
++ <include name="org/hsqldb/jdbc/*.java"/>
+ <include name="org/hsqldb/resources/*.java"/>
++ <include name="org/hsqldb/persist/*.java"/>
+ <include name="org/hsqldb/rowio/*.java"/>
+ <include name="org/hsqldb/scriptio/*.java"/>
++ <include name="org/hsqldb/types/*.java"/>
+ <exclude name="org/hsqldb/jmx/*.java"/>
+ <exclude name="org/hsqldb/lib/*.java"/>
+ <exclude name="org/hsqldb/test/*.java"/>
hsqldb.fix2.patch:
hsqldb_1_8_0 | 326 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 156 insertions(+), 170 deletions(-)
--- NEW FILE hsqldb.fix2.patch ---
--- openoffice.org.orig/hsqldb/SRC680_m110/hsqldb/hsqldb_1_8_0.post1 2005-06-22 15:40:46.000000000 +0100
+++ openoffice.org/hsqldb/SRC680_m110/hsqldb/hsqldb_1_8_0 2005-06-22 15:40:57.000000000 +0100
@@ -516,7 +516,7 @@
* @param type java.sql.Types int for a numeric type
* @return relative width
*/
-! private static int getNumTypeWidth(int type) {
+! public static int getNumTypeWidth(int type) {
switch (type) {
@@ -797,7 +797,7 @@
* table. Also returns true if any column covered by the foreign key
* constraint has a null value.
*/
-! private static boolean hasReferencedRow(Object[] rowdata,
+! public static boolean hasReferencedRow(Object[] rowdata,
! int[] rowColArray, Index mainIndex) throws HsqlException {
if (Index.isNull(rowdata, rowColArray)) {
@@ -813,7 +813,7 @@
* table. Also returns true if any column covered by the foreign key
* constraint has a null value.
*/
-! private static boolean hasReferencedRow(Session session,
+! public static boolean hasReferencedRow(Session session,
! Object[] rowdata, int[] rowColArray,
! Index mainIndex) throws HsqlException {
@@ -872,12 +872,12 @@
***************
*** 152,157 ****
--- 152,158 ----
- private HashMap hAlias;
- private boolean bIgnoreCase;
- private boolean bReferentialIntegrity;
+ public HashMap hAlias;
+ public boolean bIgnoreCase;
+ public boolean bReferentialIntegrity;
+ public TxManager txManager;
public SessionManager sessionManager;
- private HsqlDatabaseProperties databaseProperties;
+ public HsqlDatabaseProperties databaseProperties;
HsqlNameManager nameManager;
***************
*** 160,165 ****
@@ -905,7 +905,7 @@
// boucherb at users - 200403?? - patch 1.7.2 - metadata
//------------------------------------------------------------------------------
-- private String uri;
+- public String uri;
/**
* Retrieves the uri portion of this object's in-process JDBC url.
@@ -925,7 +925,7 @@
* @return a Column object with indicated attributes
* @throws HsqlException
*/
-! private Column processCreateColumn(Table t) throws HsqlException {
+! public Column processCreateColumn(Table t) throws HsqlException {
boolean isIdentity = false;
long identityStart = database.firstIdentity;
@@ -954,7 +954,7 @@
// --
}
-+ private Column processCreateColumn() throws HsqlException {
++ public Column processCreateColumn() throws HsqlException {
+
+ String token = tokenizer.getString();
+ String columnName = token;
@@ -973,7 +973,7 @@
* @return a Column object with indicated attributes
* @throws HsqlException
*/
-! private Column processCreateColumn(HsqlName hsqlName)
+! public Column processCreateColumn(HsqlName hsqlName)
! throws HsqlException {
boolean isIdentity = false;
@@ -1148,7 +1148,7 @@
}
}
-+ private void processAlterColumnType(Table table,
++ public void processAlterColumnType(Table table,
+ Column oldCol) throws HsqlException {
+
+ Column newCol = processCreateColumn(oldCol.columnName);
@@ -2678,43 +2678,43 @@
Function function;
***************
*** 242,261 ****
- private String schema;
- private String tableName;
- private String columnName;
-! private TableFilter tableFilter; // null if not yet resolved
+ public String schema;
+ public String tableName;
+ public String columnName;
+! public TableFilter tableFilter; // null if not yet resolved
! TableFilter outerFilter; // defined if this is part of an OUTER JOIN condition tree
//
- private int columnIndex;
- private boolean columnQuoted;
- private int precision;
- private int scale;
-! private String columnAlias; // if it is a column of a select column list
- private boolean aliasQuoted;
+ public int columnIndex;
+ public boolean columnQuoted;
+ public int precision;
+ public int scale;
+! public String columnAlias; // if it is a column of a select column list
+ public boolean aliasQuoted;
//
-! private boolean isDescending; // if it is a column in a order by
+! public boolean isDescending; // if it is a column in a order by
! int orderColumnIndex = -1; // >= 0 when it is used for order by
// rougier at users 20020522 - patch 552830 - COUNT(DISTINCT)
// {COUNT|SUM|MIN|MAX|AVG}(distinct ...)
--- 248,267 ----
- private String schema;
- private String tableName;
- private String columnName;
-! private TableFilter tableFilter; // null if not yet resolved
+ public String schema;
+ public String tableName;
+ public String columnName;
+! public TableFilter tableFilter; // null if not yet resolved
! TableFilter outerFilter; // defined if this is part of an OUTER JOIN condition tree
//
- private int columnIndex;
- private boolean columnQuoted;
- private int precision;
- private int scale;
-! private String columnAlias; // if it is a column of a select column list
- private boolean aliasQuoted;
+ public int columnIndex;
+ public boolean columnQuoted;
+ public int precision;
+ public int scale;
+! public String columnAlias; // if it is a column of a select column list
+ public boolean aliasQuoted;
//
-! private boolean isDescending; // if it is a column in a order by
+! public boolean isDescending; // if it is a column in a order by
! int joinedTableColumnIndex = -1; // >= 0 when it is used for order by
// rougier at users 20020522 - patch 552830 - COUNT(DISTINCT)
@@ -3794,7 +3794,7 @@
! : Boolean.FALSE;
}
-! private static boolean compareValues(Object o, Object o2, int valueType,
+! public static boolean compareValues(Object o, Object o2, int valueType,
int exprType) throws HsqlException {
! int result = Column.compare(o, o2, valueType);
@@ -3809,7 +3809,7 @@
! : Boolean.FALSE;
}
-! private static boolean compareValues(Session session, Object o,
+! public static boolean compareValues(Session session, Object o,
! Object o2, int valueType,
int exprType) throws HsqlException {
@@ -3880,7 +3880,7 @@
/**
+ *
+ */
-+ private Object getSingleValueFromQurey(Session session)
++ public Object getSingleValueFromQurey(Session session)
+ throws HsqlException {
+
+ if (exprType == QUERY) {
@@ -3919,7 +3919,7 @@
+ /**
+ * For ANY expressions. Todo
+ */
-+ private boolean compareValues(Session session, Object o,
++ public boolean compareValues(Session session, Object o,
+ int exprType) throws HsqlException {
+
+ int result = 0;
@@ -4038,18 +4038,18 @@
--- misc/build/hsqldb/src/org/hsqldb/HSQLClientConnection.java Thu Mar 31 10:35:27 2005
***************
*** 62,68 ****
- protected RowOutputBinary rowOut;
- protected RowInputBinary rowIn;
- private Result resultOut;
-! private final int sessionID;
+ public RowOutputBinary rowOut;
+ public RowInputBinary rowIn;
+ public Result resultOut;
+! public final int sessionID;
//
String host;
--- 62,68 ----
- protected RowOutputBinary rowOut;
- protected RowInputBinary rowIn;
- private Result resultOut;
-! private int sessionID;
+ public RowOutputBinary rowOut;
+ public RowInputBinary rowIn;
+ public Result resultOut;
+! public int sessionID;
//
String host;
@@ -4072,7 +4072,7 @@
- };
}
- protected void initConnection(String host, int port,
+ public void initConnection(String host, int port,
--- 112,120 ----
rowOut = new RowOutputBinary(mainBuffer);
@@ -4082,7 +4082,7 @@
resultOut.add(new Object[7]);
}
- protected void initConnection(String host, int port,
+ public void initConnection(String host, int port,
***************
*** 241,246 ****
--- 232,246 ----
@@ -4133,7 +4133,7 @@
+ databaseID = resultIn.databaseID;
+ }
+
- protected void write(Result r) throws IOException, HsqlException {
+ public void write(Result r) throws IOException, HsqlException {
Result.write(r, rowOut, dataOutput);
}
*** misc/hsqldb/src/org/hsqldb/HsqlDateTime.java Wed Mar 2 14:50:48 2005
@@ -4163,7 +4163,7 @@
}
}
+
-+ private final static char[][] dateTokens = {
++ public final static char[][] dateTokens = {
+ {
+ 'R', 'R', 'R', 'R'
+ }, {
@@ -4212,7 +4212,7 @@
+ 'P', '.', 'M', '.'
+ }
+ };
-+ private final static String[] javaDateTokens = {
++ public final static String[] javaDateTokens = {
+ "yyyy", "yyyy", "yyyy", "yy", "yy", "G", "G", "G", "G", "MMM",
+ "MMMMM", "E", "w", "dd", "D", "k", "K", "K", "mm", "ss", "aaa", "aaa",
+ "aaa", "aaa"
@@ -4263,10 +4263,10 @@
+ */
+ static class Tokenizer {
+
-+ private int last;
-+ private int offset;
-+ private long state;
-+ private boolean consumed;
++ public int last;
++ public int offset;
++ public long state;
++ public boolean consumed;
+
+ public Tokenizer() {
+ reset();
@@ -4312,7 +4312,7 @@
+ * @param bit
+ * @return
+ */
-+ private boolean isZeroBit(int bit) {
++ public boolean isZeroBit(int bit) {
+ if ((state & (1L << bit)) == 0)
+ return true;
+ return false;
@@ -4322,7 +4322,7 @@
+ * Sets the specified bit.
+ * @param bit
+ */
-+ private void setBit(int bit) {
++ public void setBit(int bit) {
+ state |= (1L << bit);
+ }
+
@@ -4369,17 +4369,17 @@
*** 62,68 ****
class HsqlNameManager {
- private static HsqlNameManager staticManager = new HsqlNameManager();
-! private static int serialNumber = 0;
- private int sysNumber = 0;
+ public static HsqlNameManager staticManager = new HsqlNameManager();
+! public static int serialNumber = 0;
+ public int sysNumber = 0;
static HsqlName newHsqlSystemTableName(String name) {
--- 62,68 ----
class HsqlNameManager {
- private static HsqlNameManager staticManager = new HsqlNameManager();
-! private int serialNumber = 1; // 0 is reserved in lookups
- private int sysNumber = 0;
+ public static HsqlNameManager staticManager = new HsqlNameManager();
+! public int serialNumber = 1; // 0 is reserved in lookups
+ public int sysNumber = 0;
static HsqlName newHsqlSystemTableName(String name) {
***************
@@ -4395,20 +4395,20 @@
***************
*** 133,139 ****
- private HsqlName(HsqlNameManager man) {
+ public HsqlName(HsqlNameManager man) {
manager = man;
! hashCode = HsqlNameManager.serialNumber++;
}
- private HsqlName(HsqlNameManager man, String name,
+ public HsqlName(HsqlNameManager man, String name,
--- 132,138 ----
- private HsqlName(HsqlNameManager man) {
+ public HsqlName(HsqlNameManager man) {
manager = man;
! hashCode = manager.serialNumber++;
}
- private HsqlName(HsqlNameManager man, String name,
+ public HsqlName(HsqlNameManager man, String name,
*** misc/hsqldb/src/org/hsqldb/Index.java Wed Mar 2 14:50:48 2005
--- misc/build/hsqldb/src/org/hsqldb/Index.java Thu Mar 31 10:35:27 2005
***************
@@ -4518,7 +4518,7 @@
* @return matching node or null
* @throws HsqlException
*/
-! private Node findNotNull(Object[] rowdata, int[] rowColMap,
+! public Node findNotNull(Object[] rowdata, int[] rowColMap,
boolean first) throws HsqlException {
Node x = root, n;
@@ -4526,7 +4526,7 @@
* @return matching node or null
* @throws HsqlException
*/
-! private Node findNotNull(Session session, Object[] rowdata,
+! public Node findNotNull(Session session, Object[] rowdata,
! int[] rowColMap,
boolean first) throws HsqlException {
@@ -4751,7 +4751,7 @@
*
* @throws HsqlException
*/
-! private int compareRowUnique(Row left, Row right) throws HsqlException {
+! public int compareRowUnique(Row left, Row right) throws HsqlException {
Object[] a = left.getData();
Object[] b = right.getData();
@@ -4759,7 +4759,7 @@
*
* @throws HsqlException
*/
-! private int compareRowUnique(Session session, Row left,
+! public int compareRowUnique(Session session, Row left,
! Row right) throws HsqlException {
Object[] a = left.getData();
@@ -4809,7 +4809,7 @@
+ Session session;
Index index;
Node nextnode;
- protected IndexRowIterator last;
+ public IndexRowIterator last;
***************
*** 1172,1177 ****
--- 1187,1193 ----
@@ -4911,8 +4911,8 @@
--- misc/build/hsqldb/src/org/hsqldb/Like.java Thu Mar 31 10:35:27 2005
***************
*** 85,96 ****
- private int iFirstWildCard;
- private boolean isNull;
+ public int iFirstWildCard;
+ public boolean isNull;
Character escapeChar;
boolean optimised;
static final int UNDERSCORE_CHAR = 1;
@@ -4924,8 +4924,8 @@
/**
--- 85,98 ----
- private int iFirstWildCard;
- private boolean isNull;
+ public int iFirstWildCard;
+ public boolean isNull;
Character escapeChar;
+ boolean hasCollation;
boolean optimised;
@@ -5278,7 +5278,7 @@
// in other RDBMS's
// "SELECT LIMIT n 0" discards the first n rows and returns the remaining rows
// fredt at users 20020225 - patch 456679 by hiep256 - TOP keyword
-! private void parseLimit(Select select) throws HsqlException {
+! public void parseLimit(Select select) throws HsqlException {
! String token = tokenizer.getString();
! Expression e1;
@@ -5293,7 +5293,7 @@
// in other RDBMS's
// "SELECT LIMIT n 0" discards the first n rows and returns the remaining rows
// fredt at users 20020225 - patch 456679 by hiep256 - TOP keyword
-! private void parseLimit(String token, Select select,
+! public void parseLimit(String token, Select select,
! boolean isEnd) throws HsqlException {
! if (select.limitCondition != null) {
@@ -5404,7 +5404,7 @@
select.iOrderLen = len;
}
-! private static void resolveSelectTableFilter(Select select,
+! public static void resolveSelectTableFilter(Select select,
! HsqlArrayList vcolumn,
! HsqlArrayList vfilter) throws HsqlException {
@@ -5414,7 +5414,7 @@
select.iOrderLen = len;
}
-! private void resolveSelectTableFilter(Select select,
+! public void resolveSelectTableFilter(Select select,
! HsqlArrayList vcolumn,
! HsqlArrayList vfilter)
! throws HsqlException {
@@ -5460,7 +5460,7 @@
* @throws HsqlException if an ambiguous reference to an alias or
* non-integer column index is encountered
*/
-! private static Expression resolveOrderByColumnAlias(Expression e,
+! public static Expression resolveOrderByColumnAlias(Expression e,
! HsqlArrayList vcolumn, int visiblecols,
! boolean union) throws HsqlException {
@@ -5470,7 +5470,7 @@
* @throws HsqlException if an ambiguous reference to an alias or
* non-integer column index is encountered
*/
-! private static Expression resolveOrderByExpression(Expression e,
+! public static Expression resolveOrderByExpression(Expression e,
! Select select, HsqlArrayList vcolumn) throws HsqlException {
!
! int visiblecols = select.iResultLen;
@@ -5545,7 +5545,7 @@
! return found;
}
- private static Expression resolveOrderByColumnIndex(Expression e,
+ public static Expression resolveOrderByColumnIndex(Expression e,
--- 902,931 ----
return e;
}
@@ -5576,7 +5576,7 @@
! return e;
}
- private static Expression resolveOrderByColumnIndex(Expression e,
+ public static Expression resolveOrderByColumnIndex(Expression e,
***************
*** 887,893 ****
if (0 < i && i <= visiblecols) {
@@ -5619,7 +5619,7 @@
return new Expression(type, a, b);
}
-+ private Expression parseAllAnyPredicate() throws HsqlException {
++ public Expression parseAllAnyPredicate() throws HsqlException {
+
+ int type = iToken;
+
@@ -6087,7 +6087,7 @@
* @return -1, 0, +1
* @throws HsqlException
*/
-! private int compareRecord(Object[] a, final Object[] b,
+! public int compareRecord(Object[] a, final Object[] b,
final int[] order,
int[] way) throws HsqlException {
@@ -6105,7 +6105,7 @@
* @return -1, 0, +1
* @throws HsqlException
*/
-! private int compareRecord(Session session, Object[] a, final Object[] b,
+! public int compareRecord(Session session, Object[] a, final Object[] b,
final int[] order,
int[] way) throws HsqlException {
@@ -6124,7 +6124,7 @@
* @return -1, 0, +1
* @throws HsqlException
*/
-! private int compareRecord(Object[] a, Object[] b,
+! public int compareRecord(Object[] a, Object[] b,
int len) throws HsqlException {
for (int j = 0; j < len; j++) {
@@ -6136,7 +6136,7 @@
* @return -1, 0, +1
* @throws HsqlException
*/
-! private int compareRecord(Session session, Object[] a, Object[] b,
+! public int compareRecord(Session session, Object[] a, Object[] b,
int len) throws HsqlException {
for (int j = 0; j < len; j++) {
@@ -6200,8 +6200,8 @@
+ int tableId;
int iPos;
- protected Object[] oData;
- protected Node nPrimaryNode;
+ public Object[] oData;
+ public Node nPrimaryNode;
***************
*** 110,116 ****
n = n.nNext;
@@ -6237,7 +6237,7 @@
--- misc/build/hsqldb/src/org/hsqldb/Select.java Thu Mar 31 10:35:27 2005
***************
*** 101,122 ****
- private HashSet groupColumnNames;
+ public HashSet groupColumnNames;
TableFilter[] tFilter;
Expression limitCondition;
! Expression queryCondition; // null means no condition
@@ -6260,7 +6260,7 @@
int unionDepth;
static final int NOUNION = 0,
--- 101,121 ----
- private HashSet groupColumnNames;
+ public HashSet groupColumnNames;
TableFilter[] tFilter;
Expression limitCondition;
! Expression queryCondition; // null means no condition
@@ -6286,8 +6286,8 @@
UNIONALL = 2,
INTERSECT = 3,
EXCEPT = 4;
-! private int limitStart; // set only by the LIMIT keyword
-! private int limitCount; // set only by the LIMIT keyword
+! public int limitStart; // set only by the LIMIT keyword
+! public int limitCount; // set only by the LIMIT keyword
Result.ResultMetaData resultMetaData;
/**
@@ -6295,9 +6295,9 @@
UNIONALL = 2,
INTERSECT = 3,
EXCEPT = 4;
-! private int limitStart; // set only by the LIMIT keyword
-! private int limitCount; // set only by the LIMIT keyword
-! private boolean simpleLimit; // true if maxrows can be uses as is
+! public int limitStart; // set only by the LIMIT keyword
+! public int limitCount; // set only by the LIMIT keyword
+! public boolean simpleLimit; // true if maxrows can be uses as is
Result.ResultMetaData resultMetaData;
/**
@@ -6526,7 +6526,7 @@
* not to individual SELECT statements in the set.
*
*/
-! private int getLimitCount(int maxrows) throws HsqlException {
+! public int getLimitCount(int maxrows) throws HsqlException {
limitStart = limitCondition == null ? 0
: ((Integer) limitCondition
@@ -6534,7 +6534,7 @@
* not to individual SELECT statements in the set.
*
*/
-! private void setLimitCounts() throws HsqlException {
+! public void setLimitCounts() throws HsqlException {
limitStart = limitCondition == null ? 0
: ((Integer) limitCondition
@@ -6581,7 +6581,7 @@
+ * not to individual SELECT statements in the set.
+ *
+ */
-+ private int getLimitCount(int maxrows) throws HsqlException {
++ public int getLimitCount(int maxrows) throws HsqlException {
if (maxrows == 0) {
! return limitCount;
@@ -6661,7 +6661,7 @@
* Merges the second result into the first using the unionMode
* set operation.
*/
-! private void mergeResults(Result first,
+! public void mergeResults(Result first,
Result second) throws HsqlException {
switch (unionType) {
@@ -6676,7 +6676,7 @@
* Merges the second result into the first using the unionMode
* set operation.
*/
-! private void mergeResults(Session session, Result first,
+! public void mergeResults(Session session, Result first,
Result second) throws HsqlException {
switch (unionType) {
@@ -6801,7 +6801,7 @@
}
}
-! private void sortResult(Result r) throws HsqlException {
+! public void sortResult(Result r) throws HsqlException {
if (iOrderLen == 0) {
return;
@@ -6815,7 +6815,7 @@
}
}
-! private void sortResult(Session session, Result r) throws HsqlException {
+! public void sortResult(Session session, Result r) throws HsqlException {
if (iOrderLen == 0) {
return;
@@ -6970,12 +6970,12 @@
class ServerConnection implements Runnable {
boolean keepAlive;
- private String user;
+ public String user;
int dbID;
-! private Session session;
- private Socket socket;
- private Server server;
- private DataInputStream dataInput;
+! public Session session;
+ public Socket socket;
+ public Server server;
+ public DataInputStream dataInput;
--- 93,107 ----
* the client.
* (fredt at users)<p>
@@ -6985,13 +6985,13 @@
class ServerConnection implements Runnable {
boolean keepAlive;
- private String user;
-+ private String password;
+ public String user;
++ public String password;
int dbID;
-! private volatile Session session;
- private Socket socket;
- private Server server;
- private DataInputStream dataInput;
+! public volatile Session session;
+ public Socket socket;
+ public Server server;
+ public DataInputStream dataInput;
***************
*** 191,198 ****
int dbIndex = ArrayUtil.find(server.dbAlias,
@@ -7044,7 +7044,7 @@
+ * Used by pooled connections to close the existing SQL session and open
+ * a new one.
+ */
-+ private Result resetSession() {
++ public Result resetSession() {
+
+ Result resultOut;
+
@@ -7076,43 +7076,43 @@
--- misc/build/hsqldb/src/org/hsqldb/Session.java Thu Mar 31 10:35:27 2005
***************
*** 107,115 ****
- private volatile boolean isAutoCommit;
- private volatile boolean isReadOnly;
- private volatile boolean isClosed;
+ public volatile boolean isAutoCommit;
+ public volatile boolean isReadOnly;
+ public volatile boolean isClosed;
//
-! private Database database;
- private User user;
+! public Database database;
+ public User user;
HsqlArrayList transactionList;
- private boolean isNestedTransaction;
+ public boolean isNestedTransaction;
--- 107,116 ----
- private volatile boolean isAutoCommit;
- private volatile boolean isReadOnly;
- private volatile boolean isClosed;
+ public volatile boolean isAutoCommit;
+ public volatile boolean isReadOnly;
+ public volatile boolean isClosed;
+ int isolation;
//
! Database database;
- private User user;
+ public User user;
HsqlArrayList transactionList;
- private boolean isNestedTransaction;
+ public boolean isNestedTransaction;
***************
*** 118,124 ****
- private int sessionMaxRows;
- private Number lastIdentity = ValuePool.getInt(0);
- private final int sessionId;
-! private HashMappedList savepoints;
- private boolean script;
- private jdbcConnection intConnection;
- private Tokenizer tokenizer;
+ public int sessionMaxRows;
+ public Number lastIdentity = ValuePool.getInt(0);
+ public final int sessionId;
+! public HashMappedList savepoints;
+ public boolean script;
+ public jdbcConnection intConnection;
+ public Tokenizer tokenizer;
--- 119,125 ----
- private int sessionMaxRows;
- private Number lastIdentity = ValuePool.getInt(0);
- private final int sessionId;
+ public int sessionMaxRows;
+ public Number lastIdentity = ValuePool.getInt(0);
+ public final int sessionId;
! HashMappedList savepoints;
- private boolean script;
- private jdbcConnection intConnection;
- private Tokenizer tokenizer;
+ public boolean script;
+ public jdbcConnection intConnection;
+ public Tokenizer tokenizer;
***************
*** 214,219 ****
--- 215,228 ----
@@ -7261,7 +7261,7 @@
} catch (HsqlException e) {}
- }
-
-- private void rollbackToSavepoint(int index,
+- public void rollbackToSavepoint(int index,
- boolean log) throws HsqlException {
! int i = transactionList.size() - 1;
@@ -7630,7 +7630,7 @@
+ /**
* Used for rename column.
*/
- private void renameColumnInCheckConstraints(String oldname,
+ public void renameColumnInCheckConstraints(String oldname,
***************
*** 1327,1341 ****
@@ -7968,7 +7968,7 @@
***************
*** 1875,1886 ****
*/
- protected void insertNoChange(CachedRow row) throws HsqlException {
+ public void insertNoChange(CachedRow row) throws HsqlException {
! Object[] data = row.getData();
@@ -7981,7 +7981,7 @@
/**
--- 1918,1930 ----
*/
- protected void insertNoChange(CachedRow row) throws HsqlException {
+ public void insertNoChange(CachedRow row) throws HsqlException {
! Session session = database.sessionManager.getSysSession();
! Object[] data = row.getData();
@@ -9040,9 +9040,9 @@
*/
class Transaction {
-! private boolean isDelete;
-! private Table tTable;
-! private Row row;
+! public boolean isDelete;
+! public Table tTable;
+! public Row row;
! long SCN;
/**
@@ -9522,7 +9522,7 @@
! boolean isClosed;
/** Is escape processing enabled? */
- private boolean isEscapeProcessing = true;
+ public boolean isEscapeProcessing = true;
--- 133,139 ----
* object now explicitly closes all of its open jdbcXXXStatement objects
* when it is closed.
@@ -9530,7 +9530,7 @@
! volatile boolean isClosed;
/** Is escape processing enabled? */
- private boolean isEscapeProcessing = true;
+ public boolean isEscapeProcessing = true;
***************
*** 258,264 ****
*
@@ -9702,8 +9702,8 @@
! */
! public class LongKeyIntValueHashMap extends BaseHashMap {
!
-! private Set keySet;
-! private Collection values;
+! public Set keySet;
+! public Collection values;
!
! public LongKeyIntValueHashMap() {
! this(16, 0.75f);
@@ -9923,7 +9923,7 @@
***************
*** 262,268 ****
- private void setSystemVariables() {
+ public void setSystemVariables() {
! Column.setCompareInLocal(isPropertyTrue("sql.compare_in_locale"));
@@ -9931,7 +9931,7 @@
}
--- 260,269 ----
- private void setSystemVariables() {
+ public void setSystemVariables() {
! if (isPropertyTrue("sql.compare_in_locale")) {
! stringProps.remove("sql.compare_in_locale");
@@ -10018,7 +10018,7 @@
static final int DATA_FILE_NIO = 1;
+ static final int DATA_FILE_JAR = 2;
final RandomAccessFile file;
- private final boolean readOnly;
+ public final boolean readOnly;
final String fileName;
***************
*** 101,107 ****
@@ -10149,7 +10149,7 @@
! return seekPosition;
! }
!
-! private void readIntoBuffer() throws IOException {
+! public void readIntoBuffer() throws IOException {
!
! long filePos = seekPosition;
!
@@ -10263,7 +10263,7 @@
! return false;
! }
!
-! private void resetStream() throws IOException {
+! public void resetStream() throws IOException {
!
! if (file != null) {
! file.close();
@@ -10274,7 +10274,7 @@
! file = new DataInputStream(fis);
! }
!
-! private void fileSeek(long position) throws IOException {
+! public void fileSeek(long position) throws IOException {
!
! long skipPosition = realPosition;
!
@@ -10303,7 +10303,7 @@
import org.hsqldb.types.Binary;
***************
*** 188,194 ****
- protected void writeTimestamp(Timestamp o) {
+ public void writeTimestamp(Timestamp o) {
write('\'');
! this.writeBytes(o.toString());
@@ -10311,7 +10311,7 @@
}
--- 189,195 ----
- protected void writeTimestamp(Timestamp o) {
+ public void writeTimestamp(Timestamp o) {
write('\'');
! this.writeBytes(HsqlDateTime.getTimestampString(o, null));
@@ -10366,7 +10366,7 @@
***************
*** 219,225 ****
- protected void openFile() throws HsqlException {
+ public void openFile() throws HsqlException {
try {
! FileAccess fa = db.getFileAccess();
@@ -10374,7 +10374,7 @@
outDescriptor = fa.getFileSync(fos);
--- 220,226 ----
- protected void openFile() throws HsqlException {
+ public void openFile() throws HsqlException {
try {
! FileAccess fa = database.getFileAccess();
@@ -10384,14 +10384,14 @@
***************
*** 240,253 ****
- protected void writeDDL() throws IOException, HsqlException {
+ public void writeDDL() throws IOException, HsqlException {
! Result ddlPart = DatabaseScript.getScript(db, !includeCachedData);
writeSingleColumnResult(ddlPart);
}
- protected void writeExistingData() throws HsqlException, IOException {
+ public void writeExistingData() throws HsqlException, IOException {
! HsqlArrayList tables = db.getTables();
@@ -10399,7 +10399,7 @@
Table t = (Table) tables.get(i);
--- 241,256 ----
- protected void writeDDL() throws IOException, HsqlException {
+ public void writeDDL() throws IOException, HsqlException {
! Result ddlPart = DatabaseScript.getScript(database,
! !includeCachedData);
@@ -10407,7 +10407,7 @@
writeSingleColumnResult(ddlPart);
}
- protected void writeExistingData() throws HsqlException, IOException {
+ public void writeExistingData() throws HsqlException, IOException {
! HsqlArrayList tables = database.getTables();
! Session session = database.sessionManager.getSysSession();
@@ -10435,7 +10435,7 @@
--- misc/build/hsqldb/src/org/hsqldb/scriptio/ScriptWriterZipped.java Thu Mar 31 10:35:28 2005
***************
*** 63,69 ****
- protected void openFile() throws HsqlException {
+ public void openFile() throws HsqlException {
try {
! FileAccess fa = db.getFileAccess();
@@ -10443,7 +10443,7 @@
outDescriptor = fa.getFileSync(fos);
--- 63,69 ----
- protected void openFile() throws HsqlException {
+ public void openFile() throws HsqlException {
try {
! FileAccess fa = database.getFileAccess();
@@ -10589,7 +10589,7 @@
! super.isNetwork = false;
! }
!
-! protected void setUp() {
+! public void setUp() {
!
! super.setUp();
!
@@ -10603,7 +10603,7 @@
! localeIterator = collation.getLocalesIterator();
! }
!
-! protected void tearDown() {
+! public void tearDown() {
!
! try {
! statement = connection.createStatement();
@@ -10727,7 +10727,7 @@
! /**
! * returns an SQL statement to set the database collation
! */
-! protected final String getSetCollationStmt(String collationName) {
+! public final String getSetCollationStmt(String collationName) {
!
! final String setCollationStmtPre = "SET DATABASE COLLATION \"";
! final String setCollationStmtPost = "\"";
@@ -10738,7 +10738,7 @@
! /**
! * checks sorting a table with according to a given collation
! */
-! protected String checkSorting(String collationName) {
+! public String checkSorting(String collationName) {
!
! String prepareStmt =
! "DROP TABLE WORDLIST IF EXISTS;"
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore 21 Jun 2005 17:12:06 -0000 1.54
+++ .cvsignore 22 Jun 2005 14:59:43 -0000 1.55
@@ -112,3 +112,4 @@
openoffice.org-simple-crash_report.sh
SRC680_m110.tar.bz2
SRC680_m111.tar.bz2
+hsqldb_1_8_0.zip
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- openoffice.org.spec 22 Jun 2005 10:17:50 -0000 1.245
+++ openoffice.org.spec 22 Jun 2005 14:59:43 -0000 1.246
@@ -49,6 +49,7 @@
Source8: GSI_ru.sdf
Source9: GSI_bn.sdf
Source10: openoffice.org-simple-crash_report.sh
+Source11: hsqldb_1_8_0.zip
BuildRequires: perl, sed, zip, bzip2, unzip, tar, findutils
BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
BuildRequires: gcc >= %{gccver}, gcc-c++ >= %{gccver}, binutils
@@ -111,6 +112,8 @@
Patch42: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
Patch43: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
Patch44: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
+Patch45: hsqldb.fix1.patch
+Patch46: hsqldb.fix2.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -734,6 +737,8 @@
%patch42 -p1 -b .ooo9290.goodies.epstoepdf.patch
%patch43 -p1 -b .oooXXXXX.psprintfriend.patch
%patch44 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
+%patch45 -p1 -b hsqldb.fix1.patch
+%patch46 -p1 -b hsqldb.fix2.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
@@ -795,6 +800,9 @@
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
+#gcj accessor problem
+cp -f %{SOURCE11} hsqldb/download
+
%if !%{gcc_is_gcc4}
#this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
@@ -2576,6 +2584,7 @@
- drop integrated openoffice.org-1.9.87.ooo50575.fragments.patch
- add openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
to export differently named symbols under gcj
+- try to workaround hsqldb problems with itself and with gcj
* Thu Jun 16 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.110-1
- bump to next version
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources 21 Jun 2005 17:12:06 -0000 1.77
+++ sources 22 Jun 2005 14:59:43 -0000 1.78
@@ -9,3 +9,4 @@
972402c03afa0b20ea2529caab702663 GSI_bn.sdf
11c0541fa373a327d1c134887ce511e7 openoffice.org-simple-crash_report.sh
c846f06ee022178536908f09b5229a81 SRC680_m111.tar.bz2
+ebe1771041b7cbfd0e4c8f2cece2bd69 hsqldb_1_8_0.zip
More information about the fedora-cvs-commits
mailing list