From b14aabb9b1160cbbadef994db5778a45a13f5533 Mon Sep 17 00:00:00 2001 From: jsimomaa Date: Wed, 29 Aug 2018 15:09:46 +0300 Subject: [PATCH] Replace instantiations of DatabaseException in indexing gitlab #92 Change-Id: I95d64ec2c6bcda5fbc5a338fcb4d0ecc6a962f15 --- .../simantics/db/indexing/IndexSchema.java | 8 +- .../org/simantics/db/indexing/IndexUtils.java | 27 ++- .../db/indexing/IndexedRelationsImpl.java | 15 +- .../db/indexing/IndexedRelationsSearcher.java | 15 +- .../IndexedRelationsSearcherBase.java | 160 ++++++++++-------- .../exception/IndexCorruptedException.java | 28 +++ .../indexing/exception/IndexingException.java | 40 +++++ .../db/indexing/internal/IndexingJob.java | 7 +- 8 files changed, 207 insertions(+), 93 deletions(-) create mode 100644 bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexCorruptedException.java create mode 100644 bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexingException.java diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexSchema.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexSchema.java index a11c90df8..d1d2dd267 100644 --- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexSchema.java +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexSchema.java @@ -11,8 +11,6 @@ *******************************************************************************/ package org.simantics.db.indexing; -import gnu.trove.map.hash.THashMap; - import java.util.Collections; import java.util.EnumSet; import java.util.Map; @@ -23,9 +21,12 @@ import org.simantics.db.Resource; import org.simantics.db.common.request.UniqueRead; import org.simantics.db.exception.DatabaseException; import org.simantics.db.exception.RuntimeDatabaseException; +import org.simantics.db.indexing.exception.IndexingException; import org.simantics.db.layer0.adapter.GenericRelation; import org.simantics.utils.datastructures.Pair; +import gnu.trove.map.hash.THashMap; + /** * @author Tuukka Lehtonen * @since 1.20.0, 1.18.4 @@ -97,8 +98,7 @@ class IndexSchema { GenericRelation r = graph.adapt(relation, GenericRelation.class); return new IndexSchema( r.getFields() ); } catch (IllegalArgumentException e) { - throw new DatabaseException( - "Failed to read index schema for relation " + relation + ". See cause for reason.", e); + throw new IndexingException("Failed to read index schema for relation " + relation + ". See cause for reason.", e); } } diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java index 23e93ea1c..8b1a928b3 100644 --- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java @@ -1,5 +1,6 @@ package org.simantics.db.indexing; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -11,6 +12,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; @@ -18,14 +20,20 @@ import org.simantics.db.Session; import org.simantics.db.common.procedure.adapter.TransientCacheListener; import org.simantics.db.common.request.ObjectsWithType; import org.simantics.db.exception.DatabaseException; +import org.simantics.db.indexing.exception.IndexCorruptedException; import org.simantics.db.layer0.genericrelation.IndexQueries; +import org.simantics.db.layer0.genericrelation.IndexedRelations; import org.simantics.db.layer0.util.Layer0Utils; import org.simantics.db.service.CollectionSupport; import org.simantics.layer0.Layer0; import org.simantics.operation.Layer0X; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class IndexUtils { + private static final Logger LOGGER = LoggerFactory.getLogger(IndexUtils.class); + public static Collection> find(ReadGraph graph, Resource index, String filter) throws DatabaseException { Collection> indexResult = graph.syncRequest(new QueryIndex(index, filter), TransientCacheListener.>>instance()); @@ -139,10 +147,25 @@ public class IndexUtils { mem.flush(progress); IndexedRelationsSearcher searcher = mem.get(session, L0X.DependenciesRelation, indexRoot); - return searcher.doList(progress, session); - + List results; + try { + results = searcher.doList(progress, session); + } catch (IndexCorruptedException e) { + LOGGER.error("Index is corrupted for indexRoot {}", indexRoot, e); + rebuild(session, progress); + // if this fails then no can do + searcher = mem.get(session, L0X.DependenciesRelation, indexRoot); + results = searcher.doList(progress, session); + } + return results; } + private static void rebuild(Session session, IProgressMonitor monitor) throws Exception { + LOGGER.error("Trying to rebuild index"); + DatabaseIndexing.deleteAllIndexes(); + session.getService(IndexedRelations.class).fullRebuild(SubMonitor.convert(monitor, 100), session); + } + public static Term longTerm(String key, Long value) { BytesRef ref = new BytesRef(); NumericUtils.longToPrefixCoded( value, 0, ref ); diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsImpl.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsImpl.java index 60e824cad..b2b65a67f 100644 --- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsImpl.java +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsImpl.java @@ -38,6 +38,7 @@ import org.simantics.db.common.utils.NameUtils; import org.simantics.db.exception.DatabaseException; import org.simantics.db.exception.InvalidResourceReferenceException; import org.simantics.db.indexing.IndexedRelationsSearcherBase.State; +import org.simantics.db.indexing.exception.IndexingException; import org.simantics.db.layer0.adapter.GenericRelation; import org.simantics.db.layer0.genericrelation.IndexException; import org.simantics.db.layer0.genericrelation.IndexedRelations; @@ -230,16 +231,18 @@ public class IndexedRelationsImpl implements IndexedRelations { searcher.startAccess(null, graph.getSession(), false); // At this point we have three options: // 1. we have access - if(searcher.hasAccess(false)) loaded = true; + if(searcher.hasAccess(false)) + loaded = true; // 2. something is wrong and the index cannot be cleaned - if(searcher.checkState(State.PROBLEM)) throw new DatabaseException("Searcher is in problematic state", searcher.getException()); + if(searcher.checkState(State.PROBLEM)) + throw new IndexingException("Searcher is in problematic state", searcher.getException()); // 3. something was wrong, but the index has been successfully cleaned } if(!loaded) { if(!searcher.checkState(State.NONE)) - throw new DatabaseException("Illegal searcher state " + searcher.state()); + throw new IndexingException("Illegal searcher state " + searcher.state()); try { SerialisationSupport ss = graph.getService(SerialisationSupport.class); @@ -247,7 +250,7 @@ public class IndexedRelationsImpl implements IndexedRelations { searcher.setReady(); } catch (IOException e) { searcher.setProblem(e); - throw new DatabaseException(e); + throw new IndexingException(e); } } @@ -558,7 +561,7 @@ public class IndexedRelationsImpl implements IndexedRelations { try { fullRebuild(monitor, graph); } catch (IOException e) { - throw new DatabaseException(e); + throw new IndexingException(e); } } }); @@ -582,7 +585,7 @@ public class IndexedRelationsImpl implements IndexedRelations { GenericRelation r = graph.adapt(relation, GenericRelation.class); if (r == null) - throw new DatabaseException("Given resource " + relation + "could not be adapted to GenericRelation."); + throw new IndexingException("Given resource " + relation + "could not be adapted to GenericRelation."); Object[] bound = new Object[] { ss.getRandomAccessId(indexRoot) }; GenericRelation selection = r.select(IndexedRelationsSearcherBase.getPattern(r, bound.length), bound); diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java index a535183f2..2e714b09a 100644 --- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcher.java @@ -25,6 +25,7 @@ import org.simantics.db.RequestProcessor; import org.simantics.db.Resource; import org.simantics.db.Session; import org.simantics.db.exception.DatabaseException; +import org.simantics.db.indexing.exception.IndexingException; import org.simantics.db.layer0.adapter.GenericRelation; import org.simantics.utils.datastructures.Pair; import org.slf4j.Logger; @@ -102,7 +103,7 @@ public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase { } else if ("String".equals(fieldClass) || "Text".equals(fieldClass)) { data[index++] = ""; } else { - throw new DatabaseException("Can only index Long and String fields, encountered class " + fieldClass); + throw new IndexingException("Can only index Long and String fields, encountered class " + fieldClass); } } } @@ -126,7 +127,7 @@ public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase { } List> persistentCachedSearch(IProgressMonitor monitor, RequestProcessor processor, String search, - int maxResultCount) throws ParseException, IOException, DatabaseException { + int maxResultCount) throws ParseException, IOException, IndexingException { MemoryIndexing mem = MemoryIndexing.getInstance(session.getSession()); @@ -154,7 +155,7 @@ public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase { } List persistentCachedSearchResources(IProgressMonitor monitor, RequestProcessor processor, String search, - int maxResultCount) throws ParseException, IOException, DatabaseException { + int maxResultCount) throws ParseException, IOException, IndexingException { MemoryIndexing mem = MemoryIndexing.getInstance(session.getSession()); @@ -181,7 +182,7 @@ public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase { } - List persistentCachedList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, DatabaseException { + List persistentCachedList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, IndexingException { startAccess(monitor, processor.getSession(), false); @@ -193,7 +194,7 @@ public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase { @Override List> doSearch(IProgressMonitor monitor, RequestProcessor processor, String search, - int maxResultCount) throws ParseException, IOException, DatabaseException { + int maxResultCount) throws ParseException, IOException, IndexingException { List> persistent = persistentCachedSearch(monitor, processor, search, maxResultCount); List> cached = cache.doSearch(monitor, processor, search, maxResultCount); @@ -213,7 +214,7 @@ public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase { @Override List doSearchResources(IProgressMonitor monitor, RequestProcessor processor, String search, - int maxResultCount) throws ParseException, IOException, DatabaseException { + int maxResultCount) throws ParseException, IOException, IndexingException { List persistent = persistentCachedSearchResources(monitor, processor, search, maxResultCount); List cached = cache.doSearchResources(monitor, processor, search, maxResultCount); @@ -229,7 +230,7 @@ public class IndexedRelationsSearcher extends IndexedRelationsSearcherBase { } - List doList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, DatabaseException { + List doList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, IndexingException { List persistent = persistentCachedList(monitor, processor); diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java index 82f4abdd9..afcaafd51 100644 --- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java @@ -62,6 +62,8 @@ import org.simantics.db.Session; import org.simantics.db.common.request.SafeName; import org.simantics.db.common.utils.NameUtils; import org.simantics.db.exception.DatabaseException; +import org.simantics.db.indexing.exception.IndexCorruptedException; +import org.simantics.db.indexing.exception.IndexingException; import org.simantics.db.indexing.internal.IndexingJob; import org.simantics.db.layer0.adapter.GenericRelation; import org.simantics.db.layer0.genericrelation.IndexException; @@ -269,13 +271,13 @@ abstract public class IndexedRelationsSearcherBase { STRING_TYPE.freeze(); } - protected static Field makeField(String fieldName, String fieldClass) throws DatabaseException { + protected static Field makeField(String fieldName, String fieldClass) throws IndexingException { switch (fieldClass) { case "Long": return new LongField(fieldName, 0L, Field.Store.YES); case "String": return new Field (fieldName, "", STRING_TYPE); case "Text": return new TextField(fieldName, "", Field.Store.YES); default: - throw new DatabaseException("Can only index Long, String and Text fields, encountered field type " + fieldClass); + throw new IndexingException("Can only index Long, String and Text fields, encountered field type " + fieldClass); } } @@ -601,7 +603,7 @@ abstract public class IndexedRelationsSearcherBase { try { GenericRelation r = graph.adapt(relation, GenericRelation.class); if (r == null) - throw new DatabaseException("Given resource " + relation + "could not be adapted to GenericRelation."); + throw new IndexingException("Given resource " + relation + "could not be adapted to GenericRelation."); GenericRelation selection = r.select(getPattern(r, bound.length), bound); @@ -609,7 +611,7 @@ abstract public class IndexedRelationsSearcherBase { initializeIndexImpl(new CompletableFuture<>(), mon, r, results, bound, overwrite); } catch (IOException e) { getLogger().error("Index is in problematic state! {}", this, e); - throw new DatabaseException(e); + throw new IndexingException(e); } }); } @@ -732,7 +734,7 @@ abstract public class IndexedRelationsSearcherBase { } - public List debugDocs(IProgressMonitor monitor) throws ParseException, IOException, DatabaseException { + public List debugDocs(IProgressMonitor monitor) throws ParseException, IOException, IndexingException { Query query = new MatchAllDocsQuery(); @@ -756,10 +758,10 @@ abstract public class IndexedRelationsSearcherBase { } catch (CorruptIndexException e) { getLogger().error("Index is corrupted! {}", this, e); - throw new DatabaseException(e); + throw new IndexCorruptedException("Index is corrupted! " + this, e); } catch (IOException e) { getLogger().error("Index is in problematic state! {}", this, e); - throw new DatabaseException(e); + throw new IndexingException(e); } } @@ -770,7 +772,7 @@ abstract public class IndexedRelationsSearcherBase { List> doSearch(IProgressMonitor monitor, RequestProcessor processor, String search, int maxResultCount) throws ParseException, IOException, - DatabaseException { + IndexingException { // An empty search string will crash QueryParser // Just return no results for empty queries. @@ -803,54 +805,62 @@ abstract public class IndexedRelationsSearcherBase { return Collections.emptyList(); } - return processor.syncRequest(new Read>>() { + try { + return processor.syncRequest(new Read>>() { - @Override - public List> perform(ReadGraph graph) throws DatabaseException { + @Override + public List> perform(ReadGraph graph) throws DatabaseException { - GenericRelation r = graph.adapt(relation, GenericRelation.class); - if (r == null) - throw new DatabaseException("Given resource " + graph.syncRequest(new SafeName(relation)) - + "could not be adapted to GenericRelation."); + GenericRelation r = graph.adapt(relation, GenericRelation.class); + if (r == null) + throw new IndexingException("Given resource " + graph.syncRequest(new SafeName(relation)) + + "could not be adapted to GenericRelation."); - SerialisationSupport support = graph.getService(SerialisationSupport.class); + SerialisationSupport support = graph.getService(SerialisationSupport.class); - List> result = new ArrayList>(docs.scoreDocs.length); - - final DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(); - - for (ScoreDoc scoreDoc : docs.scoreDocs) { + List> result = new ArrayList>(docs.scoreDocs.length); + + final DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(); + + for (ScoreDoc scoreDoc : docs.scoreDocs) { - try { + try { - reader.document(scoreDoc.doc, visitor); - - Document doc = visitor.getDocument(); - - List fs = doc.getFields(); - Map entry = new THashMap(fs.size()); - for (IndexableField f : fs) { - IndexSchema.Type type = schema.typeMap.get(f.name()); - if (type == IndexSchema.Type.LONG) { - entry.put(f.name(), support.getResource(f.numericValue().longValue())); - } else { - entry.put(f.name(), f.stringValue()); + reader.document(scoreDoc.doc, visitor); + + Document doc = visitor.getDocument(); + + List fs = doc.getFields(); + Map entry = new THashMap(fs.size()); + for (IndexableField f : fs) { + IndexSchema.Type type = schema.typeMap.get(f.name()); + if (type == IndexSchema.Type.LONG) { + entry.put(f.name(), support.getResource(f.numericValue().longValue())); + } else { + entry.put(f.name(), f.stringValue()); + } } + + result.add(entry); + + } catch (CorruptIndexException e) { + getLogger().error("Index is corrupted! {}", this, e); + throw new IndexCorruptedException("Index is corrupted! " + " " + this + " " + scoreDoc, e); + } catch (IOException e) { + getLogger().error("Index is in problematic state! {}", this, e); + throw new IndexingException(e); } - - result.add(entry); - - } catch (CorruptIndexException e) { - getLogger().error("Index is corrupted! {}", this, e); - throw new DatabaseException(e); - } catch (IOException e) { - getLogger().error("Index is in problematic state! {}", this, e); - throw new DatabaseException(e); } + return result; } - return result; + }); + } catch (DatabaseException e) { + if (e instanceof IndexingException) { + throw (IndexingException) e; + } else { + throw new IndexingException(e); } - }); + } } static class ResourceVisitor extends StoredFieldVisitor { @@ -896,7 +906,7 @@ abstract public class IndexedRelationsSearcherBase { } List doSearchResources(IProgressMonitor monitor, RequestProcessor processor, String search, int maxResultCount) throws ParseException, IOException, - DatabaseException { + IndexingException { // An empty search string will crash QueryParser // Just return no results for empty queries. @@ -929,37 +939,45 @@ abstract public class IndexedRelationsSearcherBase { return Collections.emptyList(); } - return processor.syncRequest(new Read>() { + try { + return processor.syncRequest(new Read>() { - @Override - public List perform(ReadGraph graph) throws DatabaseException { + @Override + public List perform(ReadGraph graph) throws DatabaseException { - CollectionSupport cs = graph.getService(CollectionSupport.class); - SerialisationSupport support = graph.getService(SerialisationSupport.class); - - List result = cs.createList(); - - ResourceVisitor visitor = new ResourceVisitor(); - - for (ScoreDoc scoreDoc : docs.scoreDocs) { - try { - reader.document(scoreDoc.doc, visitor); - result.add(support.getResource(visitor.id)); - } catch (CorruptIndexException e) { - getLogger().error("Index is corrupted! {}", this, e); - throw new DatabaseException(e); - } catch (IOException e) { - getLogger().error("Index is in problematic state! {}", this, e); - throw new DatabaseException(e); + CollectionSupport cs = graph.getService(CollectionSupport.class); + SerialisationSupport support = graph.getService(SerialisationSupport.class); + + List result = cs.createList(); + + ResourceVisitor visitor = new ResourceVisitor(); + + for (ScoreDoc scoreDoc : docs.scoreDocs) { + try { + reader.document(scoreDoc.doc, visitor); + result.add(support.getResource(visitor.id)); + } catch (CorruptIndexException e) { + getLogger().error("Index is corrupted! {}", this, e); + throw new IndexCorruptedException("Index is corrupted! " + " " + this + " " + scoreDoc, e); + } catch (IOException e) { + getLogger().error("Index is in problematic state! {}", this, e); + throw new IndexingException(e); + } } + return result; } - return result; + }); + } catch (DatabaseException e) { + if (e instanceof IndexingException) { + throw (IndexingException) e; + } else { + throw new IndexingException(e); } - }); + } } List doList(IProgressMonitor monitor, RequestProcessor processor) throws ParseException, IOException, - DatabaseException { + IndexingException { assertAccessOpen(false); @@ -979,10 +997,10 @@ abstract public class IndexedRelationsSearcherBase { } catch (CorruptIndexException e) { getLogger().error("Index is corrupted! {}", this, e); - throw new DatabaseException(e); + throw new IndexCorruptedException("Index is corrupted! " + " " + this + " " + scoreDoc, e); } catch (IOException e) { getLogger().error("Index is in problematic state! {}", this, e); - throw new DatabaseException(e); + throw new IndexingException(e); } } diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexCorruptedException.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexCorruptedException.java new file mode 100644 index 000000000..2e2324990 --- /dev/null +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexCorruptedException.java @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2018 Association for Decentralized Information Management + * in Industry THTH ry. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Semantum Oy - initial API and implementation + *******************************************************************************/ +package org.simantics.db.indexing.exception; + +import org.apache.lucene.index.CorruptIndexException; + +/** + * @author Jani Simomaa + * @since 1.36.0 + */ +public class IndexCorruptedException extends IndexingException { + + private static final long serialVersionUID = 6371395124643556058L; + + public IndexCorruptedException(String message, CorruptIndexException cause) { + super(message, cause); + } + +} diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexingException.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexingException.java new file mode 100644 index 000000000..82e2a4b24 --- /dev/null +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/exception/IndexingException.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2018 Association for Decentralized Information Management + * in Industry THTH ry. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Semantum Oy - initial API and implementation + *******************************************************************************/ +package org.simantics.db.indexing.exception; + +import org.simantics.db.exception.ServiceException; + +/** + * @author Jani Simomaa + * @since 1.36.0 + */ +public class IndexingException extends ServiceException { + + private static final long serialVersionUID = 8682389500759734302L; + + public IndexingException(ServiceException cause) { + super(cause); + } + + public IndexingException(Throwable cause) { + super(cause); + } + + public IndexingException(String message) { + super(message); + } + + public IndexingException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/internal/IndexingJob.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/internal/IndexingJob.java index 55cd56cfa..dc8deb297 100644 --- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/internal/IndexingJob.java +++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/internal/IndexingJob.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; import org.simantics.db.exception.DatabaseException; import org.simantics.db.function.DbConsumer; +import org.simantics.db.indexing.exception.IndexingException; /** * @author Tuukka Lehtonen @@ -80,12 +81,12 @@ public abstract class IndexingJob extends Job { try { barrier.acquire(); if (err[0] != null) { - if (err[0] instanceof DatabaseException) + if (err[0] instanceof IndexingException) throw (DatabaseException) err[0]; - throw new DatabaseException(err[0]); + throw new IndexingException(err[0]); } } catch (InterruptedException e) { - throw new DatabaseException(e); + throw new IndexingException(e); } } -- 2.47.1