MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

rollback

Browse Source
This commit is contained in:
Dmitry Avdeev
2010-10-08 18:09:25 +04:00
parent c00892910f
commit 132c2eed78
2 changed files with 27 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
+13 -41
View File
@@ -28,7 +28,9 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.IntArrayList;
import com.intellij.util.io.*;
import com.intellij.util.io.PagedFileStorage;
import com.intellij.util.io.PersistentStringEnumerator;
import com.intellij.util.io.ResizeableMappedFile;
import com.intellij.util.io.storage.AbstractStorage;
import com.intellij.util.io.storage.HeavyProcessLatch;
import com.intellij.util.io.storage.RefCountingStorage;
@@ -69,8 +71,6 @@ public class FSRecords implements Disposable, Forceable {
private static final int RECORD_SIZE = LENGTH_OFFSET + LENGTH_SIZE;
private final byte[] myRecordBuffer = new byte[RECORD_SIZE];
private static final byte[] ZEROES = new byte[RECORD_SIZE];
private static final int HEADER_VERSION_OFFSET = 0;
@@ -98,20 +98,20 @@ public class FSRecords implements Disposable, Forceable {
}
private static class DbConnection {
private static int refCount = 0;
private static final Object LOCK = new Object();
private static final TObjectIntHashMap<String> myAttributeIds = new TObjectIntHashMap<String>();
private static PersistentStringEnumerator myNames;
private static PersistentStringEnumerator myNames;
private static Storage myAttributes;
private static RefCountingStorage myContents;
private static ResizeableMappedFile myRecords;
private static final TIntArrayList myFreeRecords = new TIntArrayList();
private static boolean myDirty = false;
private static boolean myDirty = false;
private static ScheduledFuture<?> myFlushingFuture;
private static boolean myCorrupted = false;
public static DbConnection connect() {
synchronized (LOCK) {
if (refCount == 0) {
@@ -334,6 +334,7 @@ public class FSRecords implements Disposable, Forceable {
return myDirty || myNames.isDirty() || myAttributes.isDirty() || myContents.isDirty() || myRecords.isDirty();
}
private static int getVersion() throws IOException {
final int recordsVersion = myRecords.getInt(HEADER_VERSION_OFFSET);
if (myAttributes.getVersion() != recordsVersion || myContents.getVersion() != recordsVersion) return -1;
@@ -341,7 +342,6 @@ public class FSRecords implements Disposable, Forceable {
return recordsVersion;
}
public static long getTimestamp() {
return myRecords.getLong(HEADER_TIMESTAMP_OFFSET);
}
@@ -434,8 +434,8 @@ public class FSRecords implements Disposable, Forceable {
public static void addFreeRecord(final int id) {
myFreeRecords.add(id);
}
}
public FSRecords() {
}
@@ -465,7 +465,7 @@ public class FSRecords implements Disposable, Forceable {
return DbConnection.getNames();
}
public static int createRecord(boolean clean) {
public static int createRecord() {
synchronized (lock) {
try {
DbConnection.markDirty();
@@ -475,16 +475,12 @@ public class FSRecords implements Disposable, Forceable {
final int filelength = (int)getRecords().length();
LOG.assertTrue(filelength % RECORD_SIZE == 0);
int newrecord = filelength / RECORD_SIZE;
if (clean) {
DbConnection.cleanRecord(newrecord);
assert filelength + RECORD_SIZE == getRecords().length();
}
DbConnection.cleanRecord(newrecord);
assert filelength + RECORD_SIZE == getRecords().length();
return newrecord;
}
else {
if (clean) {
DbConnection.cleanRecord(free);
}
DbConnection.cleanRecord(free);
return free;
}
}
@@ -618,7 +614,7 @@ public class FSRecords implements Disposable, Forceable {
final DataOutputStream output = writeAttribute(1, CHILDREN_ATT);
int id;
try {
id = createRecord(true);
id = createRecord();
output.writeInt(names.length + 1);
for (int i = 0; i < names.length; i++) {
output.writeInt(names[i]);
@@ -787,30 +783,6 @@ public class FSRecords implements Disposable, Forceable {
}
}
public void saveRecord(int id, int parent, String name, long timeStamp, int flags, long length) {
if (id == parent) {
LOG.error("Cyclic parent/child relations");
return;
}
synchronized (lock) {
try {
DbConnection.markDirty();
incModCount(id);
Bits.putInt(myRecordBuffer, PARENT_OFFSET, parent);
Bits.putInt(myRecordBuffer, NAME_OFFSET, getNames().enumerate(name));
Bits.putInt(myRecordBuffer, FLAGS_OFFSET, flags);
Bits.putLong(myRecordBuffer, TIMESTAMP_OFFSET, timeStamp);
Bits.putLong(myRecordBuffer, LENGTH_OFFSET, length);
getRecords().put(getOffset(id, PARENT_OFFSET), myRecordBuffer, 0, RECORD_SIZE);
}
catch (Throwable e) {
throw DbConnection.handleError(e);
}
}
}
public static String getName(int id) {
synchronized (lock) {
try {
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java
+14 -12
View File
@@ -170,7 +170,7 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent {
childrenIds[i] = currentIds[idx];
}
else {
int childId = FSRecords.createRecord(false);
int childId = FSRecords.createRecord();
copyRecordFromDelegateFS(childId, id, new FakeVirtualFile(file, name), delegate);
childrenIds[i] = childId;
}
@@ -247,15 +247,21 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent {
}
String name = file.getName();
if (name.length() > 0 && namesEqual(delegate, name, FSRecords.getName(id))) return; // TODO: Handle root attributes change.
if (name.length() == 0) { // TODO: hack
if (areChildrenLoaded(id)) return;
}
boolean isDirectory = delegate.isDirectory(file);
int flags = (isDirectory ? IS_DIRECTORY_FLAG : 0) | (delegate.isWritable(file) ? 0 : IS_READ_ONLY);
myRecords.setParent(id, parentId);
myRecords.setName(id, name);
myRecords.setTimestamp(id, delegate.getTimeStamp(file));
myRecords.setFlags(id, (delegate.isDirectory(file) ? IS_DIRECTORY_FLAG : 0) | (delegate.isWritable(file) ? 0 : IS_READ_ONLY), true);
myRecords.setLength(id, -1L);
myRecords.saveRecord(id, parentId, name, delegate.getTimeStamp(file), flags, isDirectory ? -1L : delegate.getLength(file));
//
// TODO!!!: More attributes?
}
@@ -324,7 +330,7 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent {
VirtualFile fake = new FakeVirtualFile(parent, childName);
if (delegate.exists(fake)) {
int child = FSRecords.createRecord(false);
int child = FSRecords.createRecord();
copyRecordFromDelegateFS(child, parentId, fake, delegate);
myRecords.updateList(parentId, ArrayUtil.append(children, child));
return child;
@@ -639,11 +645,7 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent {
}
if (!fs.exists(root)) return null;
String name = root.getName();
if (name.length() == 0 || !namesEqual(fs, name, FSRecords.getName(rootId))) {
copyRecordFromDelegateFS(rootId, 0, root, fs);
}
copyRecordFromDelegateFS(rootId, 0, root, fs);
}
catch (IOException e) {
throw new RuntimeException(e);
@@ -808,7 +810,7 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent {
VirtualFile fakeFile = new FakeVirtualFile(parent, name);
if (delegate.exists(fakeFile)) {
final int parentId = getFileId(parent);
int childId = FSRecords.createRecord(false);
int childId = FSRecords.createRecord();
copyRecordFromDelegateFS(childId, parentId, fakeFile, delegate);
appendIdToParentList(parentId, childId);