提交 b3d6a60b authored 作者: Thomas Mueller's avatar Thomas Mueller

Spelling.

上级 02f6aad5
......@@ -34,7 +34,7 @@ Change Log
</li><li>Sequences with cache size smaller than 0 did not work correctly.
</li><li>Issue 356: for Blob objects, InputStream.skip() returned 0,
causing EOFException in Blob.getBytes(.., ..).
</li><li>Updateable result sets: if the value is not set when inserting a new row,
</li><li>Updatable result sets: if the value is not set when inserting a new row,
the default value is now used (the same behavior as MySQL, PostgreSQL, and Apache Derby)
instead of NULL.
</li><li>Conditions of the form IN(SELECT ...) where slow and increased the database size
......
......@@ -29,6 +29,8 @@ public class PageFreeList extends Page {
private Data data;
private PageFreeList(PageStore store, int pageId) {
int todoKeptInTwoPlaces;
// kept in cache, and array list in page store
setPos(pageId);
this.store = store;
pageCount = (store.getPageSize() - DATA_START) * 8;
......
......@@ -143,7 +143,7 @@ public class PageStore implements CacheWriter {
private boolean recoveryRunning;
/**
* The index to the first freelist page that potentially has free space.
* The index to the first free-list page that potentially has free space.
*/
private int firstFreeListIndex;
......
......@@ -151,9 +151,9 @@ public class ValueTimestamp extends Value {
minute -= hour * 60;
long millis = DateTimeUtils.getMillis(tz, year, month, day, hour, minute, (int) second, (int) ms);
ms = DateTimeUtils.convertToLocal(new Date(millis), Calendar.getInstance(TimeZone.getTimeZone("UTC")));
long mpd = DateTimeUtils.MILLIS_PER_DAY;
long absoluteDay = (ms >= 0 ? ms : ms - mpd + 1) / mpd;
ms -= absoluteDay * mpd;
long md = DateTimeUtils.MILLIS_PER_DAY;
long absoluteDay = (ms >= 0 ? ms : ms - md + 1) / md;
ms -= absoluteDay * md;
nanos += ms * 1000000;
}
}
......
......@@ -56,7 +56,7 @@ public class TestResultSet extends TestBase {
stat = conn.createStatement();
testAmbiguousColumnNames();
testInsertRowWithUpdateableResultSetDefault();
testInsertRowWithUpdatableResultSetDefault();
testBeforeFirstAfterLast();
testParseSpecialValues();
testSpecialLocale();
......@@ -101,7 +101,7 @@ public class TestResultSet extends TestBase {
stat.execute("drop table test");
}
private void testInsertRowWithUpdateableResultSetDefault() throws SQLException {
private void testInsertRowWithUpdatableResultSetDefault() throws SQLException {
stat.execute("create table test(id int primary key, data varchar(255) default 'Hello')");
PreparedStatement prep = conn.prepareStatement("select * from test",
ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
......
......@@ -907,11 +907,11 @@ public class TestTools extends TestBase {
return data.length();
}
public long position(String searchstr, long start) throws SQLException {
public long position(String search, long start) throws SQLException {
throw new UnsupportedOperationException();
}
public long position(Clob searchstr, long start) throws SQLException {
public long position(Clob search, long start) throws SQLException {
throw new UnsupportedOperationException();
}
......
......@@ -692,5 +692,6 @@ unusual apfel caught overcareful tricky nodep junit eventually concrete
enhancer banana nit cglib challenging intercepted banane assertthrows
objenesis prepend detecting overridable eater forgetting tear
fork tester jaspa redirection johnny brings gone jooq iciql offline pdo mappings largely
pst patadia summertime jalpesh scheme compilable
pst patadia summertime jalpesh scheme compilable ski takanori dsts kawashima
kokoci seldom jaros ciphers srcs
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论