boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

serialized some database access methods

Browse Source
pull/1/head
Michael Peter Christen 13 years ago
parent 9727015213
commit e3bb73c3d6
2 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File

43
source/net/yacy/kelondro/table/SplitTable.java
Unescape View File

@ -320,7 +320,9 @@ public class SplitTable implements Index, Iterable<Row.Entry> {
public Row.Entry get(final byte[] key, final boolean forcecopy) throws IOException { public Row.Entry get(final byte[] key, final boolean forcecopy) throws IOException {
final Index keeper = keeperOf(key); final Index keeper = keeperOf(key);
if (keeper == null) return null; if (keeper == null) return null;
return keeper.get(key, forcecopy); synchronized (this) { // avoid concurrent IO from different methods
return keeper.get(key, forcecopy);
}
} }
@Override @Override
@ -376,8 +378,10 @@ public class SplitTable implements Index, Iterable<Row.Entry> {
public Row.Entry replace(final Row.Entry row) throws IOException, RowSpaceExceededException { public Row.Entry replace(final Row.Entry row) throws IOException, RowSpaceExceededException {
assert row.objectsize() <= this.rowdef.objectsize; assert row.objectsize() <= this.rowdef.objectsize;
Index keeper = keeperOf(row.getPrimaryKeyBytes()); Index keeper = keeperOf(row.getPrimaryKeyBytes());
if (keeper != null) return keeper.replace(row); if (keeper != null) synchronized (this) { // avoid concurrent IO from different methods
synchronized (this.tables) { return keeper.replace(row);
}
synchronized (this) {
assert this.current == null || this.tables.get(this.current) != null : "this.current = " + this.current; assert this.current == null || this.tables.get(this.current) != null : "this.current = " + this.current;
keeper = (this.current == null) ? newTable() : checkTable(this.tables.get(this.current)); keeper = (this.current == null) ? newTable() : checkTable(this.tables.get(this.current));
} }
@ -397,12 +401,11 @@ public class SplitTable implements Index, Iterable<Row.Entry> {
assert row.objectsize() <= this.rowdef.objectsize; assert row.objectsize() <= this.rowdef.objectsize;
final byte[] key = row.getPrimaryKeyBytes(); final byte[] key = row.getPrimaryKeyBytes();
if (this.tables == null) return true; if (this.tables == null) return true;
Index keeper = null; Index keeper = keeperOf(key);
synchronized (this.tables) { if (keeper != null) synchronized (this) { // avoid concurrent IO from different methods
keeper = keeperOf(key); return keeper.put(row);
} }
if (keeper != null) return keeper.put(row); synchronized (this) {
synchronized (this.tables) {
keeper = keeperOf(key); // we must check that again because it could have changed in between keeper = keeperOf(key); // we must check that again because it could have changed in between
if (keeper != null) return keeper.put(row); if (keeper != null) return keeper.put(row);
assert this.current == null || this.tables.get(this.current) != null : "this.current = " + this.current; assert this.current == null || this.tables.get(this.current) != null : "this.current = " + this.current;
@ -425,12 +428,12 @@ public class SplitTable implements Index, Iterable<Row.Entry> {
@Override @Override
public void addUnique(final Row.Entry row) throws IOException, RowSpaceExceededException { public void addUnique(final Row.Entry row) throws IOException, RowSpaceExceededException {
assert row.objectsize() <= this.rowdef.objectsize; assert row.objectsize() <= this.rowdef.objectsize;
Index table = (this.current == null) ? null : this.tables.get(this.current); Index keeper = (this.current == null) ? null : this.tables.get(this.current);
synchronized (this.tables) { synchronized (this) {
assert this.current == null || this.tables.get(this.current) != null : "this.current = " + this.current; assert this.current == null || this.tables.get(this.current) != null : "this.current = " + this.current;
if (table == null) table = newTable(); else table = checkTable(table); if (keeper == null) keeper = newTable(); else keeper = checkTable(keeper);
} }
table.addUnique(row); keeper.addUnique(row);
} }
@Override @Override
@ -447,14 +450,18 @@ public class SplitTable implements Index, Iterable<Row.Entry> {
public boolean delete(final byte[] key) throws IOException { public boolean delete(final byte[] key) throws IOException {
final Index table = keeperOf(key); final Index table = keeperOf(key);
if (table == null) return false; if (table == null) return false;
return table.delete(key); synchronized (this) { // avoid concurrent IO from different methods
return table.delete(key);
}
} }
@Override @Override
public Row.Entry remove(final byte[] key) throws IOException { public Row.Entry remove(final byte[] key) throws IOException {
final Index table = keeperOf(key); final Index table = keeperOf(key);
if (table == null) return null; if (table == null) return null;
return table.remove(key); synchronized (this) { // avoid concurrent IO from different methods
return table.remove(key);
}
} }
@Override @Override
@ -472,7 +479,9 @@ public class SplitTable implements Index, Iterable<Row.Entry> {
if (maxtable == null) { if (maxtable == null) {
return null; return null;
} }
return maxtable.removeOne(); synchronized (this) { // avoid concurrent IO from different methods
return maxtable.removeOne();
}
} }
@Override @Override
@ -490,7 +499,9 @@ public class SplitTable implements Index, Iterable<Row.Entry> {
if (maxtable == null) { if (maxtable == null) {
return null; return null;
} }
return maxtable.top(count); synchronized (this) { // avoid concurrent IO from different methods
return maxtable.top(count);
}
} }
@Override @Override

40
source/net/yacy/search/index/MetadataRepository.java
Unescape View File

@ -599,19 +599,21 @@ public final class MetadataRepository implements Iterable<byte[]> {
public Map<String, URLHashCounter> domainSampleCollector() throws IOException { public Map<String, URLHashCounter> domainSampleCollector() throws IOException {
final Map<String, URLHashCounter> map = new HashMap<String, URLHashCounter>(); final Map<String, URLHashCounter> map = new HashMap<String, URLHashCounter>();
// first collect all domains and calculate statistics about it // first collect all domains and calculate statistics about it
final CloneableIterator<byte[]> i = this.urlIndexFile.keys(true, null); synchronized (this) {
String hosthash; final CloneableIterator<byte[]> i = this.urlIndexFile.keys(true, null);
byte[] urlhashb; String hosthash;
URLHashCounter ds; byte[] urlhashb;
if (i != null) while (i.hasNext()) { URLHashCounter ds;
urlhashb = i.next(); if (i != null) while (i.hasNext()) {
hosthash = ASCII.String(urlhashb, 6, 6); urlhashb = i.next();
ds = map.get(hosthash); hosthash = ASCII.String(urlhashb, 6, 6);
if (ds == null) { ds = map.get(hosthash);
ds = new URLHashCounter(urlhashb); if (ds == null) {
map.put(hosthash, ds); ds = new URLHashCounter(urlhashb);
} else { map.put(hosthash, ds);
ds.count++; } else {
ds.count++;
}
} }
} }
return map; return map;
@ -739,11 +741,13 @@ public final class MetadataRepository implements Iterable<byte[]> {
// first collect all url hashes that belong to the domain // first collect all url hashes that belong to the domain
assert hosthash.length() == 6; assert hosthash.length() == 6;
final ArrayList<String> l = new ArrayList<String>(); final ArrayList<String> l = new ArrayList<String>();
final CloneableIterator<byte[]> i = this.urlIndexFile.keys(true, null); synchronized (this) {
String hash; final CloneableIterator<byte[]> i = this.urlIndexFile.keys(true, null);
while (i != null && i.hasNext()) { String hash;
hash = ASCII.String(i.next()); while (i != null && i.hasNext()) {
if (hosthash.equals(hash.substring(6))) l.add(hash); hash = ASCII.String(i.next());
if (hosthash.equals(hash.substring(6))) l.add(hash);
}
} }
// then delete the urls using this list // then delete the urls using this list

Write Preview
Loading…
Cancel
Save