Skip to content

H
h2database
提交 a2f52638 authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

Documentation

上级 060abfca
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 3225 行增加 和 3163 行删除
h2/src/docsrc/help/help.csv
浏览文件 @ a2f52638
......@@ -423,7 +423,7 @@ CREATE AGGREGATE MEDIAN FOR ""com.acme.db.Median""
"
"Commands (DDL)","CREATE ALIAS","
CREATE ALIAS [ IF NOT EXISTS ] newFunctionAliasName [ DETERMINISTIC ]
CREATE ALIAS [ IF NOT EXISTS ] newFunctionAliasName [ DETERMINISTIC ]
[ NOBUFFER ] { FOR classAndMethodName | AS sourceCodeString }
","
Creates a new function alias. If this is a ResultSet returning function,
......@@ -517,7 +517,7 @@ CREATE INDEX IDXNAME ON TEST(NAME)
"
"Commands (DDL)","CREATE LINKED TABLE","
CREATE [ FORCE ] [ [ GLOBAL | LOCAL ] TEMPORARY ]
CREATE [ FORCE ] [ [ GLOBAL | LOCAL ] TEMPORARY ]
LINKED TABLE [ IF NOT EXISTS ]
name ( driverString, urlString, userString, passwordString,
[ originalSchemaString, ] originalTableString ) [ EMIT UPDATES | READONLY ]
......
h2/src/docsrc/html/changelog.html
浏览文件 @ a2f52638
......@@ -18,7 +18,7 @@ Change Log
<h1>Change Log</h1>
<h2>Next Version (unreleased)</h2>
<ul><li>Issue 565: MVStore: concurrently adding LOB objects
<ul><li>Issue 565: MVStore: concurrently adding LOB objects
(with MULTI_THREADED option) resulted in a NullPointerException.
</li><li>MVStore: reduced dependencies to other H2 classes.
</li><li>There was a way to prevent a database from being re-opened,
......@@ -41,14 +41,14 @@ Change Log
Referential integrity constraints sometimes used the wrong index.
</li><li>MVStore: the ObjectDataType comparison method was incorrect if one
key was Serializable and the other was of a common class.
</li><li>Recursive queries with many result rows (more than the setting "max_memory_rows")
</li><li>Recursive queries with many result rows (more than the setting "max_memory_rows")
did not work correctly.
</li><li>The license has changed to MPL 2.0 + EPL 1.0.
</li><li>MVStore: temporary tables from result sets could survive re-opening a database,
which could result in a ClassCastException.
</li><li>Issue 566: MVStore: unique indexes that were created later on did not work correctly
if there were over 5000 rows in the table.
</li><li>MVStore: creating secondary indexes on large tables
</li><li>MVStore: creating secondary indexes on large tables
results in missing rows in the index.
</li><li>Metadata: the password of linked tables is now only visible for admin users.
</li><li>For Windows, database URLs of the form "jdbc:h2:/test" where considered
......@@ -58,7 +58,7 @@ Change Log
return type of procedure.
</li><li>Issue 531: IDENTITY ignored for added column.
</li><li>FileSystem: improve exception throwing compatibility with JDK
</li><li>Spatial Index: adjust costs so we do not use the spatial index if the
</li><li>Spatial Index: adjust costs so we do not use the spatial index if the
query does not contain an intersects operator.
</li><li>Fix multi-threaded deadlock when using a View that includes a TableFunction.
</li><li>Fix bug in dividing very-small BigDecimal numbers.
......
h2/src/docsrc/text/_docs_en.utf8.txt
浏览文件 @ a2f52638
This source diff could not be displayed because it is too large. You can view the blob instead.
h2/src/docsrc/text/_docs_ja.utf8.txt
浏览文件 @ a2f52638
This source diff could not be displayed because it is too large. You can view the blob instead.
h2/src/docsrc/textbase/_docs_en.properties
浏览文件 @ a2f52638
This source diff could not be displayed because it is too large. You can view the blob instead.
h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
浏览文件 @ a2f52638
......@@ -203,7 +203,7 @@ public class AlterTableAddConstraint extends SchemaCommand {
if (db.isStarting()) {
// before version 1.3.176, an existing index was used:
// must do the same to avoid
// Unique index or primary key violation:
// Unique index or primary key violation:
// "PRIMARY KEY ON """".PAGE_INDEX"
index = getIndex(table, indexColumns, true);
} else {
......@@ -358,8 +358,8 @@ public class AlterTableAddConstraint extends SchemaCommand {
for (IndexColumn col : cols) {
// all columns of the list must be part of the index,
// but not all columns of the index need to be part of the list
// holes are not allowed (index=a,b,c & list=a,b is ok; but list=a,c
// is not)
// holes are not allowed (index=a,b,c & list=a,b is ok;
// but list=a,c is not)
int idx = existingIndex.getColumnIndex(col.column);
if (idx < 0 || idx >= cols.length) {
return false;
......
h2/src/main/org/h2/command/ddl/CreateTable.java
浏览文件 @ a2f52638
......@@ -201,11 +201,11 @@ public class CreateTable extends SchemaCommand {
if (t.getId() > table.getId()) {
throw DbException.get(
ErrorCode.FEATURE_NOT_SUPPORTED_1,
"Table depends on another table " +
"with a higher ID: " + t +
", this is currently not supported, " +
"as it would prevent the database from " +
"beeing re-opened");
"Table depends on another table " +
"with a higher ID: " + t +
", this is currently not supported, " +
"as it would prevent the database from " +
"being re-opened");
}
}
}
......
h2/src/main/org/h2/engine/Engine.java
浏览文件 @ a2f52638
......@@ -34,7 +34,7 @@ public class Engine implements SessionFactory {
private boolean jmx;
private Engine() {}
public static Engine getInstance() {
return INSTANCE;
}
......
h2/src/main/org/h2/mvstore/Cursor.java
浏览文件 @ a2f52638
......@@ -69,7 +69,7 @@ public class Cursor<K, V> implements Iterator<K> {
public V getValue() {
return lastValue;
}
Page getPage() {
return lastPage;
}
......@@ -153,5 +153,5 @@ public class Cursor<K, V> implements Iterator<K> {
}
current = null;
}
}
h2/src/main/org/h2/mvstore/FreeSpaceBitSet.java
浏览文件 @ a2f52638
......@@ -14,7 +14,7 @@ import org.h2.util.MathUtils;
* A free space bit set.
*/
public class FreeSpaceBitSet {
private static final boolean DETAILED_INFO = false;
/**
......@@ -178,7 +178,7 @@ public class FreeSpaceBitSet {
int onCount = 0, offCount = 0;
int on = 0;
for (int i = 0; i < set.length(); i++) {
if (set.get(i)) {
if (set.get(i)) {
onCount++;
on++;
} else {
......@@ -210,5 +210,5 @@ public class FreeSpaceBitSet {
buff.append(']');
return buff.toString();
}
}
\ No newline at end of file
h2/src/main/org/h2/mvstore/MVMap.java
浏览文件 @ a2f52638
......@@ -772,10 +772,10 @@ public class MVMap<K, V> extends AbstractMap<K, V>
public Iterator<K> keyIterator(K from) {
return new Cursor<K, V>(this, root, from);
}
/**
* Re-write any pages that belong to one of the chunks in the given set.
*
*
* @param set the set of chunk ids
*/
public void rewrite(Set<Integer> set) {
......
h2/src/main/org/h2/mvstore/MVStore.java
浏览文件 @ a2f52638
......@@ -1308,7 +1308,7 @@ public class MVStore {
ByteBuffer buff = fileStore.readFully(p, Chunk.MAX_HEADER_LENGTH);
return Chunk.readChunkHeader(buff, p);
}
/**
* Compact the store by moving all live pages to new chunks.
*
......@@ -1340,11 +1340,16 @@ public class MVStore {
commitAndSave();
return true;
}
/**
* Compact by moving all chunks next to each other.
*
* @return if anything was written
*/
public synchronized boolean compactMoveChunks() {
return compactMoveChunks(Long.MAX_VALUE);
}
/**
* Compact the store by moving all chunks next to each other, if there is
* free space between chunks. This might temporarily double the file size.
......@@ -1378,7 +1383,7 @@ public class MVStore {
}
return true;
}
private ArrayList<Chunk> compactGetMoveBlocks(long startBlock, long moveSize) {
ArrayList<Chunk> move = New.arrayList();
for (Chunk c : chunks.values()) {
......@@ -1403,16 +1408,16 @@ public class MVStore {
}
size += chunkSize;
count++;
}
}
// move the first block (so the first gap is moved),
// and the one at the end (so the file shrinks)
while (move.size() > count && move.size() > 1) {
move.remove(1);
}
return move;
}
private void compactFreeUnusedChunks() {
long time = getTime();
ArrayList<Chunk> free = New.arrayList();
......@@ -1510,7 +1515,7 @@ public class MVStore {
public void sync() {
fileStore.sync();
}
/**
* Try to increase the fill rate by re-writing partially full chunks. Chunks
* with a low number of live items are re-written.
......@@ -2459,7 +2464,7 @@ public class MVStore {
/**
* Get the maximum memory (in bytes) used for unsaved pages. If this number
* is exceeded, unsaved changes are stored to disk.
*
*
* @return the memory in bytes
*/
public int getAutoCommitMemory() {
......@@ -2467,8 +2472,8 @@ public class MVStore {
}
/**
* Get the estimated memory (in bytes) of unsaved data. If the value exceeds the
* auto-commit memory, the changes are committed.
* Get the estimated memory (in bytes) of unsaved data. If the value exceeds
* the auto-commit memory, the changes are committed.
* <p>
* The returned value is an estimation only.
*
......@@ -2597,7 +2602,7 @@ public class MVStore {
* <p>
* When the value is set to 0 or lower, data is not automatically
* stored.
*
*
* @param kb the write buffer size, in kilobytes
* @return this
*/
......
h2/src/main/org/h2/mvstore/MVStoreTool.java
浏览文件 @ a2f52638
......@@ -292,7 +292,7 @@ public class MVStoreTool {
String x = new Timestamp(t).toString();
return x.substring(0, 19);
}
/**
* A data type that can read any data that is persisted, and converts it to
* a byte array.
......@@ -340,7 +340,7 @@ public class MVStoreTool {
obj[i] = read(buff);
}
}
}
}
h2/src/main/org/h2/mvstore/Page.java
浏览文件 @ a2f52638
......@@ -221,7 +221,13 @@ public class Page {
Page p = childrenPages[index];
return p != null ? p : map.readPage(children[index]);
}
/**
* Get the position of the child.
*
* @param index the index
* @return the position
*/
public long getChildPagePos(int index) {
return children[index];
}
......
h2/src/main/org/h2/mvstore/db/MVTableEngine.java
浏览文件 @ a2f52638
......@@ -226,6 +226,8 @@ public class MVTableEngine implements TableEngine {
/**
* Remove all temporary maps.
*
* @param objectIds the ids of the objects to keep
*/
public void removeTemporaryMaps(BitField objectIds) {
for (String mapName : store.getMapNames()) {
......
h2/src/main/org/h2/mvstore/db/ValueDataType.java
浏览文件 @ a2f52638
......@@ -80,7 +80,7 @@ public class ValueDataType implements DataType {
this.handler = handler;
this.sortTypes = sortTypes;
}
private SpatialDataType getSpatialDataType() {
if (spatialType == null) {
spatialType = new SpatialDataType(2);
......
h2/src/main/org/h2/res/help.csv
浏览文件 @ a2f52638
......@@ -155,8 +155,8 @@ CREATE AGGREGATE [ IF NOT EXISTS ] newAggregateName FOR className
","
Creates a new user-defined aggregate function."
"Commands (DDL)","CREATE ALIAS","
CREATE ALIAS [ IF NOT EXISTS ] newFunctionAliasName [ DETERMINISTIC ] [ NOBUFFER ]
{ FOR classAndMethodName | AS sourceCodeString }
CREATE ALIAS [ IF NOT EXISTS ] newFunctionAliasName [ DETERMINISTIC ]
[ NOBUFFER ] { FOR classAndMethodName | AS sourceCodeString }
","
Creates a new function alias."
"Commands (DDL)","CREATE CONSTANT","
......@@ -171,13 +171,14 @@ CREATE DOMAIN [ IF NOT EXISTS ] newDomainName AS dataType
Creates a new data type (domain)."
"Commands (DDL)","CREATE INDEX","
CREATE
{ [ UNIQUE ] [ HASH ] [ SPATIAL] INDEX [ [ IF NOT EXISTS ] newIndexName ]
{ [ UNIQUE ] [ HASH | SPATIAL] INDEX [ [ IF NOT EXISTS ] newIndexName ]
| PRIMARY KEY [ HASH ] }
ON tableName ( indexColumn [,...] )
","
Creates a new index."
"Commands (DDL)","CREATE LINKED TABLE","
CREATE [ FORCE ] [ [ GLOBAL | LOCAL ] TEMPORARY ] LINKED TABLE [ IF NOT EXISTS ]
CREATE [ FORCE ] [ [ GLOBAL | LOCAL ] TEMPORARY ]
LINKED TABLE [ IF NOT EXISTS ]
name ( driverString, urlString, userString, passwordString,
[ originalSchemaString, ] originalTableString ) [ EMIT UPDATES | READONLY ]
","
......
h2/src/main/org/h2/result/LocalResult.java
浏览文件 @ a2f52638
......@@ -76,7 +76,7 @@ public class LocalResult implements ResultInterface, ResultTarget {
rowId = -1;
this.expressions = expressions;
}
public void setMaxMemoryRows(int maxValue) {
this.maxMemoryRows = maxValue;
}
......
h2/src/main/org/h2/result/ResultTempTable.java
浏览文件 @ a2f52638
......@@ -28,7 +28,7 @@ import org.h2.value.ValueNull;
* This class implements the temp table buffer for the LocalResult class.
*/
public class ResultTempTable implements ResultExternal {
private static final String COLUMN_NAME = "DATA";
private final boolean distinct;
private final SortOrder sort;
......@@ -73,7 +73,7 @@ public class ResultTempTable implements ResultExternal {
}
parent = null;
}
private ResultTempTable(ResultTempTable parent) {
this.parent = parent;
this.columnCount = parent.columnCount;
......@@ -86,15 +86,15 @@ public class ResultTempTable implements ResultExternal {
this.containsLob = parent.containsLob;
reset();
}
private void createIndex() {
IndexColumn[] indexCols = null;
if (sort != null) {
int[] colInd = sort.getQueryColumnIndexes();
indexCols = new IndexColumn[colInd.length];
for (int i = 0; i < colInd.length; i++) {
int[] colIndex = sort.getQueryColumnIndexes();
indexCols = new IndexColumn[colIndex.length];
for (int i = 0; i < colIndex.length; i++) {
IndexColumn indexColumn = new IndexColumn();
indexColumn.column = table.getColumn(colInd[i]);
indexColumn.column = table.getColumn(colIndex[i]);
indexColumn.sortType = sort.getSortTypes()[i];
indexColumn.columnName = COLUMN_NAME + i;
indexCols[i] = indexColumn;
......@@ -222,7 +222,7 @@ public class ResultTempTable implements ResultExternal {
Session sysSession = database.getSystemSession();
table.removeChildrenAndResources(sysSession);
if (index != null) {
// need to explicitly do this,
// need to explicitly do this,
// as it's not registered in the system session
session.removeLocalTempTableIndex(index);
}
......
h2/src/main/org/h2/store/LobStorageMap.java
浏览文件 @ a2f52638
......@@ -40,7 +40,7 @@ public class LobStorageMap implements LobStorageInterface {
private final Database database;
private boolean init;
private Object nextLobIdSync = new Object();
private long nextLobId;
......
h2/src/main/org/h2/store/PageStore.java
浏览文件 @ a2f52638
......@@ -1548,7 +1548,7 @@ public class PageStore implements CacheWriter {
PageDataIndex scan = (PageDataIndex) index;
Row row = scan.getRowWithKey(key);
if (row == null || row.getKey() != key) {
trace.error(null, "Entry not found: " + key +
trace.error(null, "Entry not found: " + key +
" found instead: " + row + " - ignoring");
return;
}
......
h2/src/main/org/h2/store/fs/FilePath.java
浏览文件 @ a2f52638
......@@ -320,5 +320,5 @@ public abstract class FilePath {
public FilePath unwrap() {
return this;
}
}
h2/src/main/org/h2/store/fs/FilePathNioMapped.java
浏览文件 @ a2f52638
......@@ -204,7 +204,7 @@ class FileNioMapped extends FileBase {
@Override
public synchronized FileChannel truncate(long newLength) throws IOException {
// compatibility with JDK FileChannel#truncate
// compatibility with JDK FileChannel#truncate
if (mode == MapMode.READ_ONLY) {
throw new NonWritableChannelException();
}
......
h2/src/main/org/h2/table/TableView.java
浏览文件 @ a2f52638
......@@ -44,7 +44,7 @@ import org.h2.value.Value;
public class TableView extends Table {
private static final long ROW_COUNT_APPROXIMATION = 100;
private String querySQL;
private ArrayList<Table> tables;
private String[] columnNames;
......@@ -230,7 +230,7 @@ public class TableView extends Table {
PlanItem item = new PlanItem();
item.cost = index.getCost(session, masks, filter, sortOrder);
final CacheKey cacheKey = new CacheKey(masks, session);
synchronized (this) {
SynchronizedVerifier.check(indexCache);
ViewIndex i2 = indexCache.get(cacheKey);
......@@ -239,8 +239,9 @@ public class TableView extends Table {
return item;
}
}
// We cannot hold the lock during the ViewIndex creation or we risk ABBA deadlocks
// if the view creation calls back into H2 via something like a FunctionTable.
// We cannot hold the lock during the ViewIndex creation or we risk ABBA
// deadlocks if the view creation calls back into H2 via something like
// a FunctionTable.
ViewIndex i2 = new ViewIndex(this, index, session, masks);
synchronized (this) {
// have to check again in case another session has beat us to it
......@@ -559,15 +560,15 @@ public class TableView extends Table {
}
}
}
/**
* The key of the index cache for views.
*/
private static final class CacheKey {
private final int[] masks;
private final Session session;
public CacheKey(int[] masks, Session session) {
this.masks = masks;
this.session = session;
......
h2/src/main/org/h2/tools/Console.java
浏览文件 @ a2f52638
......@@ -5,7 +5,7 @@
* Initial Developer: H2 Group
*/
/*
* Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
* Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
* and the EPL 1.0 (http://h2database.com/html/license.html).
* Initial Developer: H2 Group
*/
......
h2/src/main/org/h2/util/AbbaDetector.java
浏览文件 @ a2f52638
......@@ -17,9 +17,9 @@ import java.util.WeakHashMap;
* Utility to detect AB-BA deadlocks.
*/
public class AbbaDetector {
private static final boolean TRACE = false;
private static final ThreadLocal<Deque<Object>> STACK =
new ThreadLocal<Deque<Object>>() {
@Override protected Deque<Object> initialValue() {
......@@ -28,13 +28,22 @@ public class AbbaDetector {
};
/**
* Map of (object A) -> ( map of (object locked before object A) -> (stacktrace where locked) )
* Map of (object A) -> (
* map of (object locked before object A) ->
* (stack trace where locked) )
*/
private static final Map<Object, Map<Object, Exception>> LOCK_ORDERING =
private static final Map<Object, Map<Object, Exception>> LOCK_ORDERING =
new WeakHashMap<Object, Map<Object, Exception>>();
private static final Set<String> KNOWN_DEADLOCKS = new HashSet<String>();
/**
* This method is called just before or just after an object is
* synchronized.
*
* @param o the object, or null for the current class
* @return the object that was passed
*/
public static Object begin(Object o) {
if (o == null) {
o = new SecurityManager() {
......@@ -57,10 +66,10 @@ public class AbbaDetector {
stack.pop();
}
}
if (TRACE) {
if (TRACE) {
String thread = "[thread " + Thread.currentThread().getId() + "]";
String ident = new String(new char[stack.size() * 2]).replace((char) 0, ' ');
System.out.println(thread + " " + ident +
String indent = new String(new char[stack.size() * 2]).replace((char) 0, ' ');
System.out.println(thread + " " + indent +
"sync " + getObjectName(o));
}
if (stack.size() > 0) {
......@@ -69,17 +78,17 @@ public class AbbaDetector {
stack.push(o);
return o;
}
private static Object getTest(Object o) {
// return o.getClass();
return o;
}
private static String getObjectName(Object o) {
return o.getClass().getSimpleName() + "@" + System.identityHashCode(o);
}
public static synchronized void markHigher(Object o, Deque<Object> older) {
private static synchronized void markHigher(Object o, Deque<Object> older) {
Object test = getTest(o);
Map<Object, Exception> map = LOCK_ORDERING.get(test);
if (map == null) {
......@@ -117,20 +126,5 @@ public class AbbaDetector {
}
}
}
public static void main(String... args) {
Integer a = 1;
Float b = 2.0f;
synchronized (a) {
synchronized (b) {
System.out.println("a, then b");
}
}
synchronized (b) {
synchronized (a) {
System.out.println("b, then a");
}
}
}
}
h2/src/main/org/h2/util/AbbaLockingDetector.java
浏览文件 @ a2f52638
......@@ -23,22 +23,24 @@ import java.util.WeakHashMap;
*/
public class AbbaLockingDetector implements Runnable {
private int tickInterval_ms = 2;
private int tickIntervalMs = 2;
private volatile boolean stop;
private final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
private final ThreadMXBean threadMXBean =
ManagementFactory.getThreadMXBean();
private Thread thread;
/**
* Map of (object A) -> ( map of (object locked before object A) ->
* (stacktrace where locked) )
* (stack trace where locked) )
*/
private final Map<String, Map<String, String>> LOCK_ORDERING = new WeakHashMap<String, Map<String, String>>();
private final Set<String> KNOWN_DEADLOCKS = new HashSet<String>();
private final Map<String, Map<String, String>> lockOrdering =
new WeakHashMap<String, Map<String, String>>();
private final Set<String> knownDeadlocks = new HashSet<String>();
/**
* Start collecting locking data.
*
*
* @return this
*/
public AbbaLockingDetector startCollecting() {
......@@ -48,14 +50,17 @@ public class AbbaLockingDetector implements Runnable {
return this;
}
/**
* Reset the state.
*/
public synchronized void reset() {
LOCK_ORDERING.clear();
KNOWN_DEADLOCKS.clear();
lockOrdering.clear();
knownDeadlocks.clear();
}
/**
* Stop collecting.
*
*
* @return this
*/
public AbbaLockingDetector stopCollecting() {
......@@ -83,15 +88,19 @@ public class AbbaLockingDetector implements Runnable {
}
private void tick() {
if (tickInterval_ms > 0) {
if (tickIntervalMs > 0) {
try {
Thread.sleep(tickInterval_ms);
Thread.sleep(tickIntervalMs);
} catch (InterruptedException ex) {
// ignore
}
}
ThreadInfo[] list = threadMXBean.dumpAllThreads(true/* lockedMonitors */, false/* lockedSynchronizers */);
ThreadInfo[] list = threadMXBean.dumpAllThreads(
// lockedMonitors
true,
// lockedSynchronizers
false);
processThreadList(list);
}
......@@ -110,13 +119,14 @@ public class AbbaLockingDetector implements Runnable {
* We cannot simply call getLockedMonitors because it is not guaranteed to
* return the locks in the correct order.
*/
private static void generateOrdering(final List<String> lockOrder, ThreadInfo info) {
private static void generateOrdering(final List<String> lockOrder,
ThreadInfo info) {
final MonitorInfo[] lockedMonitors = info.getLockedMonitors();
Arrays.sort(lockedMonitors, new Comparator<MonitorInfo>() {
@Override
public int compare(MonitorInfo a, MonitorInfo b) {
return b.getLockedStackDepth() - a.getLockedStackDepth();
}
@Override
public int compare(MonitorInfo a, MonitorInfo b) {
return b.getLockedStackDepth() - a.getLockedStackDepth();
}
});
for (MonitorInfo mi : lockedMonitors) {
String lockName = getObjectName(mi);
......@@ -132,28 +142,30 @@ public class AbbaLockingDetector implements Runnable {
}
}
private synchronized void markHigher(List<String> lockOrder, ThreadInfo threadInfo) {
private synchronized void markHigher(List<String> lockOrder,
ThreadInfo threadInfo) {
String topLock = lockOrder.get(lockOrder.size() - 1);
Map<String, String> map = LOCK_ORDERING.get(topLock);
Map<String, String> map = lockOrdering.get(topLock);
if (map == null) {
map = new WeakHashMap<String, String>();
LOCK_ORDERING.put(topLock, map);
lockOrdering.put(topLock, map);
}
String oldException = null;
for (int i = 0; i < lockOrder.size() - 1; i++) {
String olderLock = lockOrder.get(i);
Map<String, String> oldMap = LOCK_ORDERING.get(olderLock);
Map<String, String> oldMap = lockOrdering.get(olderLock);
boolean foundDeadLock = false;
if (oldMap != null) {
String e = oldMap.get(topLock);
if (e != null) {
foundDeadLock = true;
String deadlockType = topLock + " " + olderLock;
if (!KNOWN_DEADLOCKS.contains(deadlockType)) {
if (!knownDeadlocks.contains(deadlockType)) {
System.out.println(topLock + " synchronized after \n " + olderLock
+ ", but in the past before\n" + "AFTER\n" + getStackTraceForThread(threadInfo)
+ ", but in the past before\n" + "AFTER\n" +
getStackTraceForThread(threadInfo)
+ "BEFORE\n" + e);
KNOWN_DEADLOCKS.add(deadlockType);
knownDeadlocks.add(deadlockType);
}
}
}
......@@ -172,13 +184,15 @@ public class AbbaLockingDetector implements Runnable {
* stack frames)
*/
private static String getStackTraceForThread(ThreadInfo info) {
StringBuilder sb = new StringBuilder("\"" + info.getThreadName() + "\"" + " Id=" + info.getThreadId() + " "
+ info.getThreadState());
StringBuilder sb = new StringBuilder("\"" +
info.getThreadName() + "\"" + " Id=" +
info.getThreadId() + " " + info.getThreadState());
if (info.getLockName() != null) {
sb.append(" on " + info.getLockName());
}
if (info.getLockOwnerName() != null) {
sb.append(" owned by \"" + info.getLockOwnerName() + "\" Id=" + info.getLockOwnerId());
sb.append(" owned by \"" + info.getLockOwnerName() +
"\" Id=" + info.getLockOwnerId());
}
if (info.isSuspended()) {
sb.append(" (suspended)");
......@@ -191,9 +205,9 @@ public class AbbaLockingDetector implements Runnable {
final MonitorInfo[] lockedMonitors = info.getLockedMonitors();
boolean startDumping = false;
for (int i = 0; i < stackTrace.length; i++) {
StackTraceElement ste = stackTrace[i];
StackTraceElement e = stackTrace[i];
if (startDumping) {
dumpStackTraceElement(info, sb, i, ste);
dumpStackTraceElement(info, sb, i, e);
}
for (MonitorInfo mi : lockedMonitors) {
......@@ -202,7 +216,7 @@ public class AbbaLockingDetector implements Runnable {
// something.
// Removes a lot of unnecessary noise from the output.
if (!startDumping) {
dumpStackTraceElement(info, sb, i, ste);
dumpStackTraceElement(info, sb, i, e);
startDumping = true;
}
sb.append("\t- locked " + mi);
......@@ -213,8 +227,9 @@ public class AbbaLockingDetector implements Runnable {
return sb.toString();
}
private static void dumpStackTraceElement(ThreadInfo info, StringBuilder sb, int i, StackTraceElement ste) {
sb.append("\tat " + ste.toString());
private static void dumpStackTraceElement(ThreadInfo info,
StringBuilder sb, int i, StackTraceElement e) {
sb.append('\t').append("at ").append(e.toString());
sb.append('\n');
if (i == 0 && info.getLockInfo() != null) {
Thread.State ts = info.getThreadState();
......@@ -237,7 +252,8 @@ public class AbbaLockingDetector implements Runnable {
}
private static String getObjectName(MonitorInfo info) {
return info.getClassName() + "@" + Integer.toHexString(info.getIdentityHashCode());
return info.getClassName() + "@" +
Integer.toHexString(info.getIdentityHashCode());
}
}
h2/src/main/org/h2/util/DateTimeUtils.java
浏览文件 @ a2f52638
......@@ -52,11 +52,12 @@ public class DateTimeUtils {
private static final int[] DAYS_OFFSET = { 0, 31, 61, 92, 122, 153, 184,
214, 245, 275, 306, 337, 366 };
private static final ThreadLocal<Calendar> cachedCalendar = new ThreadLocal<Calendar>() {
@Override
protected Calendar initialValue() {
private static final ThreadLocal<Calendar> CACHED_CALENDAR =
new ThreadLocal<Calendar>() {
@Override
protected Calendar initialValue() {
return Calendar.getInstance();
}
}
};
private DateTimeUtils() {
......@@ -67,7 +68,7 @@ public class DateTimeUtils {
* Reset the calendar, for example after changing the default timezone.
*/
public static void resetCalendar() {
cachedCalendar.remove();
CACHED_CALENDAR.remove();
}
/**
......@@ -379,7 +380,7 @@ public class DateTimeUtils {
int millis) {
Calendar c;
if (tz == TimeZone.getDefault()) {
c = cachedCalendar.get();
c = CACHED_CALENDAR.get();
} else {
c = Calendar.getInstance(tz);
}
......@@ -416,7 +417,7 @@ public class DateTimeUtils {
* @return the value
*/
public static int getDatePart(java.util.Date d, int field) {
Calendar c = cachedCalendar.get();
Calendar c = CACHED_CALENDAR.get();
c.setTime(d);
if (field == Calendar.YEAR) {
return getYear(c);
......@@ -450,7 +451,7 @@ public class DateTimeUtils {
* @return the milliseconds
*/
public static long getTimeLocalWithoutDst(java.util.Date d) {
return d.getTime() + cachedCalendar.get().get(Calendar.ZONE_OFFSET);
return d.getTime() + CACHED_CALENDAR.get().get(Calendar.ZONE_OFFSET);
}
/**
......@@ -461,7 +462,7 @@ public class DateTimeUtils {
* @return the number of milliseconds in UTC
*/
public static long getTimeUTCWithoutDst(long millis) {
return millis - cachedCalendar.get().get(Calendar.ZONE_OFFSET);
return millis - CACHED_CALENDAR.get().get(Calendar.ZONE_OFFSET);
}
/**
......@@ -731,7 +732,7 @@ public class DateTimeUtils {
* @return the date value
*/
public static long dateValueFromDate(long ms) {
Calendar cal = cachedCalendar.get();
Calendar cal = CACHED_CALENDAR.get();
cal.clear();
cal.setTimeInMillis(ms);
return dateValueFromCalendar(cal);
......@@ -759,7 +760,7 @@ public class DateTimeUtils {
* @return the nanoseconds
*/
public static long nanosFromDate(long ms) {
Calendar cal = cachedCalendar.get();
Calendar cal = CACHED_CALENDAR.get();
cal.clear();
cal.setTimeInMillis(ms);
return nanosFromCalendar(cal);
......
h2/src/main/org/h2/util/JdbcUtils.java
浏览文件 @ a2f52638
......@@ -35,12 +35,12 @@ import org.h2.util.Utils.ClassFactory;
* This is a utility class with JDBC helper functions.
*/
public class JdbcUtils {
/**
* The serializer to use.
*/
public static JavaObjectSerializer serializer;
private static final String[] DRIVERS = {
"h2:", "org.h2.Driver",
"Cache:", "com.intersys.jdbc.CacheDriver",
......@@ -68,7 +68,7 @@ public class JdbcUtils {
"sqlserver:", "com.microsoft.sqlserver.jdbc.SQLServerDriver",
"teradata:", "com.ncr.teradata.TeraDriver",
};
private static boolean allowAllClasses;
private static HashSet<String> allowedClassNames;
......@@ -79,7 +79,7 @@ public class JdbcUtils {
new ArrayList<ClassFactory>();
private static String[] allowedClassNamePrefixes;
private JdbcUtils() {
// utility class
}
......@@ -121,7 +121,7 @@ public class JdbcUtils {
}
}
}
/**
* Load a class, but check if it is allowed to load this class first. To
* perform access rights checking, the system property h2.allowedClasses
......@@ -334,7 +334,7 @@ public class JdbcUtils {
loadUserClass(driver);
}
}
/**
* Serialize the object to a byte array, using the serializer specified by
* the connection info if set, or the default serializer.
......
h2/src/main/org/h2/util/Task.java
浏览文件 @ a2f52638
......@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* exception, it is wrapped in a RuntimeException.
*/
public abstract class Task implements Runnable {
private static AtomicInteger counter = new AtomicInteger();
/**
......
h2/src/main/org/h2/util/Utils.java
浏览文件 @ a2f52638
......@@ -47,7 +47,7 @@ public class Utils {
private Utils() {
// utility class
}
private static int readInt(byte[] buff, int pos) {
return (buff[pos++] << 24) +
((buff[pos++] & 0xff) << 16) +
......
h2/src/main/org/h2/value/Transfer.java
浏览文件 @ a2f52638
......@@ -568,7 +568,7 @@ public class Transfer {
DateTimeUtils.getTimeUTCWithoutDst(readLong()),
readInt() % 1000000);
}
return ValueTimestamp.fromMillisNanos(readLong(),
return ValueTimestamp.fromMillisNanos(readLong(),
readInt() % 1000000);
}
case Value.DECIMAL:
......
h2/src/main/org/h2/value/ValueDate.java
浏览文件 @ a2f52638
......@@ -68,7 +68,7 @@ public class ValueDate extends Value {
public static ValueDate fromMillis(long ms) {
return fromDateValue(DateTimeUtils.dateValueFromDate(ms));
}
/**
* Parse a string to a ValueDate.
*
......
h2/src/main/org/h2/value/ValueTime.java
浏览文件 @ a2f52638
......@@ -68,7 +68,7 @@ public class ValueTime extends Value {
public static ValueTime fromMillis(long ms) {
return fromNanos(DateTimeUtils.nanosFromDate(ms));
}
/**
* Parse a string to a ValueTime.
*
......
h2/src/main/org/h2/value/ValueTimestamp.java
浏览文件 @ a2f52638
......@@ -40,7 +40,8 @@ public class ValueTimestamp extends Value {
static final int DEFAULT_SCALE = 10;
/**
* A bit field with bits for the year, month, and day (see DateTimeUtils for encoding)
* A bit field with bits for the year, month, and day (see DateTimeUtils for
* encoding)
*/
private final long dateValue;
/**
......@@ -56,7 +57,8 @@ public class ValueTimestamp extends Value {
/**
* Get or create a date value for the given date.
*
* @param dateValue the date value, a bit field with bits for the year, month, and day
* @param dateValue the date value, a bit field with bits for the year,
* month, and day
* @param timeNanos the nanoseconds since midnight
* @return the value
*/
......@@ -81,6 +83,8 @@ public class ValueTimestamp extends Value {
/**
* Get or create a timestamp value for the given date/time in millis.
*
* @param ms the milliseconds
* @param nanos the nanoseconds
* @return the value
*/
public static ValueTimestamp fromMillisNanos(long ms, int nanos) {
......@@ -88,10 +92,11 @@ public class ValueTimestamp extends Value {
long timeNanos = nanos + DateTimeUtils.nanosFromDate(ms);
return fromDateValueAndNanos(dateValue, timeNanos);
}
/**
* Get or create a timestamp value for the given date/time in millis.
*
* @param ms the milliseconds
* @return the value
*/
public static ValueTimestamp fromMillis(long ms) {
......@@ -99,7 +104,7 @@ public class ValueTimestamp extends Value {
long nanos = DateTimeUtils.nanosFromDate(ms);
return fromDateValueAndNanos(dateValue, nanos);
}
/**
* Parse a string to a ValueTimestamp. This method supports the format
* +/-year-month-day hour:minute:seconds.fractional and an optional timezone
......@@ -193,7 +198,10 @@ public class ValueTimestamp extends Value {
}
/**
* A bit field with bits for the year, month, and day (see DateTimeUtils for encoding)
* A bit field with bits for the year, month, and day (see DateTimeUtils for
* encoding).
*
* @return the data value
*/
public long getDateValue() {
return dateValue;
......@@ -201,6 +209,8 @@ public class ValueTimestamp extends Value {
/**
* The nanoseconds since midnight.
*
* @return the nanoseconds
*/
public long getTimeNanos() {
return timeNanos;
......
h2/src/test/org/h2/test/TestAll.java
浏览文件 @ a2f52638
......@@ -362,8 +362,11 @@ java org.h2.test.TestAll timer
*/
String cacheType;
/**
* The AB-BA locking detector.
*/
AbbaLockingDetector abbaLockingDetector;
private Server server;
/**
......@@ -382,12 +385,12 @@ java org.h2.test.TestAll timer
SelfDestructor.startCountdown(4 * 60);
long time = System.currentTimeMillis();
printSystemInfo();
// use lower values, to better test those cases,
// and (for delays) to speed up the tests
System.setProperty("h2.maxMemoryRows", "100");
System.setProperty("h2.check2", "true");
System.setProperty("h2.delayWrongPasswordMin", "0");
System.setProperty("h2.delayWrongPasswordMax", "0");
......@@ -517,7 +520,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
if (Boolean.getBoolean("abba")) {
abbaLockingDetector = new AbbaLockingDetector().startCollecting();
}
coverage = isCoverage();
smallLog = big = networked = memory = ssl = false;
......
h2/src/test/org/h2/test/db/TestAlter.java
浏览文件 @ a2f52638
......@@ -168,7 +168,7 @@ public class TestAlter extends TestBase {
assertFalse(rs.next());
stat.execute("drop table t");
}
private void testAlterTableAddColumnIfNotExists() throws SQLException {
stat.execute("create table t(x varchar) as select 'x'");
stat.execute("alter table t add if not exists x int");
......
h2/src/test/org/h2/test/db/TestCases.java
浏览文件 @ a2f52638
......@@ -107,7 +107,7 @@ public class TestCases extends TestBase {
testBinaryCollation();
deleteDb("cases");
}
private void testReferenceLaterTable() throws SQLException {
deleteDb("cases");
Connection conn = getConnection("cases");
......
h2/src/test/org/h2/test/db/TestMultiThread.java
浏览文件 @ a2f52638
......@@ -60,7 +60,7 @@ public class TestMultiThread extends TestBase implements Runnable {
testConcurrentAnalyze();
testConcurrentInsertUpdateSelect();
}
private void testConcurrentLobAdd() throws Exception {
String db = "concurrentLobAdd";
deleteDb(db);
......
h2/src/test/org/h2/test/db/TestRights.java
浏览文件 @ a2f52638
......@@ -48,20 +48,20 @@ public class TestRights extends TestBase {
testSchemaAdminRole();
deleteDb("rights");
}
private void testLinkedTableMeta() throws SQLException {
deleteDb("rights");
Connection conn = getConnection("rights");
stat = conn.createStatement();
stat.execute("create user test password 'test'");
stat.execute("create linked table test" +
stat.execute("create linked table test" +
"(null, 'jdbc:h2:mem:', 'sa', 'sa', 'DUAL')");
// password is invisible to non-admin
Connection conn2 = getConnection(
"rights", "test", getPassword("test"));
Statement stat2 = conn2.createStatement();
ResultSet rs = stat2.executeQuery(
"select * from information_schema.tables " +
"select * from information_schema.tables " +
"where table_name = 'TEST'");
assertTrue(rs.next());
ResultSetMetaData meta = rs.getMetaData();
......@@ -72,7 +72,7 @@ public class TestRights extends TestBase {
conn2.close();
// password is visible to admin
rs = stat.executeQuery(
"select * from information_schema.tables " +
"select * from information_schema.tables " +
"where table_name = 'TEST'");
assertTrue(rs.next());
meta = rs.getMetaData();
......@@ -85,7 +85,7 @@ public class TestRights extends TestBase {
}
assertTrue(foundPassword);
conn2.close();
stat.execute("drop table test");
conn.close();
}
......
h2/src/test/org/h2/test/db/TestSpatial.java
浏览文件 @ a2f52638
......@@ -840,7 +840,8 @@ public class TestSpatial extends TestBase {
try {
Statement stat = conn.createStatement();
stat.execute("drop table if exists test");
stat.execute("create table test(id serial primary key, value double, the_geom geometry)");
stat.execute("create table test(id serial primary key, " +
"value double, the_geom geometry)");
stat.execute("create spatial index spatial on test(the_geom)");
ResultSet rs = stat.executeQuery("explain select * from test where _ROWID_ = 5");
assertTrue(rs.next());
......
h2/src/test/org/h2/test/store/TestMVTableEngine.java
浏览文件 @ a2f52638
......@@ -79,15 +79,15 @@ public class TestMVTableEngine extends TestBase {
testLocking();
testSimple();
}
private void testOldAndNew() throws SQLException {
FileUtils.deleteRecursive(getBaseDir(), true);
Connection conn;
String urlOld = getURL("mvstore;MV_STORE=FALSE", true);
String urlNew = getURL("mvstore;MV_STORE=TRUE", true);
String url = getURL("mvstore", true);
conn = getConnection(urlOld);
conn.createStatement().execute("create table test_old(id int)");
conn.close();
......@@ -107,7 +107,7 @@ public class TestMVTableEngine extends TestBase {
conn.createStatement().execute("select * from test_new");
conn.close();
}
private void testTemporaryTables() throws SQLException {
FileUtils.deleteRecursive(getBaseDir(), true);
Connection conn;
......@@ -135,7 +135,7 @@ public class TestMVTableEngine extends TestBase {
}
conn.close();
}
private void testUniqueIndex() throws SQLException {
FileUtils.deleteRecursive(getBaseDir(), true);
Connection conn;
......@@ -151,7 +151,7 @@ public class TestMVTableEngine extends TestBase {
assertFalse(rs.next());
conn.close();
}
private void testSecondaryIndex() throws SQLException {
FileUtils.deleteRecursive(getBaseDir(), true);
Connection conn;
......@@ -162,12 +162,12 @@ public class TestMVTableEngine extends TestBase {
stat = conn.createStatement();
stat.execute("create table test(id int)");
int size = 8 * 1024;
stat.execute("insert into test select mod(x * 111, " + size + ") " +
stat.execute("insert into test select mod(x * 111, " + size + ") " +
"from system_range(1, " + size + ")");
stat.execute("create index on test(id)");
ResultSet rs = stat.executeQuery(
"select count(*) from test inner join " +
"system_range(1, " + size + ") where " +
"system_range(1, " + size + ") where " +
"id = mod(x * 111, " + size + ")");
rs.next();
assertEquals(size, rs.getInt(1));
......
h2/src/tools/org/h2/build/code/AbbaDetect.java
浏览文件 @ a2f52638
......@@ -49,7 +49,7 @@ public class AbbaDetect {
in.close();
String source = new String(data, "UTF-8");
String original = source;
source = disable(source);
if (enable) {
String s2 = enable(source);
......@@ -66,13 +66,13 @@ public class AbbaDetect {
RandomAccessFile out = new RandomAccessFile(newFile, "rw");
out.write(source.getBytes("UTF-8"));
out.close();
File oldFile = new File(file + ".old");
file.renameTo(oldFile);
newFile.renameTo(file);
oldFile.delete();
}
private static String disable(String source) {
source = source.replaceAll("\\{org.h2.util.AbbaDetector.begin\\(.*\\);", "{");
source = source.replaceAll("org.h2.util.AbbaDetector.begin\\((.*\\(\\))\\)", "$1");
......@@ -80,17 +80,21 @@ public class AbbaDetect {
source = source.replaceAll("synchronized ", "synchronized ");
return source;
}
private static String enable(String source) {
// the word synchronized within single line comments comments
source = source.replaceAll("(// .* synchronized )([^ ])", "$1 $2");
source = source.replaceAll("synchronized \\((.*)\\(\\)\\)", "synchronized \\(org.h2.util.AbbaDetector.begin\\($1\\(\\)\\)\\)");
source = source.replaceAll("synchronized \\((.*)\\)", "synchronized \\(org.h2.util.AbbaDetector.begin\\($1\\)\\)");
source = source.replaceAll("static synchronized ([^ (].*)\\{", "static synchronized $1{org.h2.util.AbbaDetector.begin\\(null\\);");
source = source.replaceAll("synchronized ([^ (].*)\\{", "synchronized $1{org.h2.util.AbbaDetector.begin\\(this\\);");
source = source.replaceAll("synchronized \\((.*)\\(\\)\\)",
"synchronized \\(org.h2.util.AbbaDetector.begin\\($1\\(\\)\\)\\)");
source = source.replaceAll("synchronized \\((.*)\\)",
"synchronized \\(org.h2.util.AbbaDetector.begin\\($1\\)\\)");
source = source.replaceAll("static synchronized ([^ (].*)\\{",
"static synchronized $1{org.h2.util.AbbaDetector.begin\\(null\\);");
source = source.replaceAll("synchronized ([^ (].*)\\{",
"synchronized $1{org.h2.util.AbbaDetector.begin\\(this\\);");
return source;
}
......
h2/src/tools/org/h2/build/doc/dictionary.txt
浏览文件 @ a2f52638
......@@ -755,4 +755,8 @@ predicted prediction wojtek hops jurczyk cbtree predict vast assumption upside
adjusted lastly sgtatham cleaning gillet prevented
angus bernd chatellier macdonald eckenfels granting moreover exponential transferring
dedup megabyte breadth traversal affine tucc jentsch yyyymmdd vertica graf
mutate shard shards
mutate shard shards succession recipients provisionally contributor statutory
inaccuracies detector logos launcher rewrite monitors equivalents trademarks
reinstated uninteresting dead defendant doctrines beat factual fair suspended
exploit noise ongoing disclaimers shrinks remedy party desirable timely construe
deque synchronizers affero
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论