knguyen 2005/12/19 19:40:08 CET
Modified files:
core/src/java/org/jahia/hibernate/dao JahiaIndexingJobDAO.java
core/src/java/org/jahia/services/search/indexingscheduler
IndexingJobTools.java
Log:
- avoid too much update at insert of indexing job, we better do optimize
lately
Revision Changes Path
1.7 +3 -2
jahia/core/src/java/org/jahia/hibernate/dao/JahiaIndexingJobDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaIndexingJobDAO.java.diff?r1=1.6&r2=1.7&f=h
1.6 +13 -13
jahia/core/src/java/org/jahia/services/search/indexingscheduler/IndexingJobTools.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/indexingscheduler/IndexingJobTools.java.diff?r1=1.5&r2=1.6&f=h
Index: JahiaIndexingJobDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaIndexingJobDAO.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaIndexingJobDAO.java 19 Dec 2005 15:44:08 -0000 1.6
+++ JahiaIndexingJobDAO.java 19 Dec 2005 18:40:07 -0000 1.7
@@ -70,7 +70,7 @@
public void save(JahiaIndexingJob job) {
HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(false);
- template.setCheckWriteOperations(false);
+ /*
List old = null;
if ( job instanceof JahiaFieldIndexingJob ){
String query = "from JahiaFieldIndexingJob as indexingJob where
indexingJob.fieldId = ?";
@@ -91,8 +91,9 @@
if (old != null && !old.isEmpty()) {
job.setId(((JahiaIndexingJob)old.iterator().next()).getId());
- }
+ }*/
template.merge(job);
+
}
public void addProcessedServer(String indexJobId, JahiaIndexJobServer
jobServer) {
Index: IndexingJobTools.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/indexingscheduler/IndexingJobTools.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IndexingJobTools.java 16 Dec 2005 13:07:29 -0000 1.5
+++ IndexingJobTools.java 19 Dec 2005 18:40:07 -0000 1.6
@@ -66,10 +66,10 @@
map.put(key,lastJob);
} else if (
lastJob.getDate().longValue()>job.getDate().longValue() ){
map.put(key,lastJob);
- //deleteJobFromPersistence(job);
+ deleteJobFromPersistence(job);
bypassedIds.add(job.getId());
} else {
- //deleteJobFromPersistence(lastJob);
+ deleteJobFromPersistence(lastJob);
bypassedIds.add(lastJob.getId());
}
} else if ( lastJob instanceof JahiaContainerIndexingJob ) {
@@ -81,10 +81,10 @@
map.put(key,lastJob);
} else if (
lastJob.getDate().longValue()>job.getDate().longValue() ){
map.put(key,lastJob);
- //deleteJobFromPersistence(job);
+ deleteJobFromPersistence(job);
bypassedIds.add(job.getId());
} else {
- //deleteJobFromPersistence(lastJob);
+ deleteJobFromPersistence(lastJob);
bypassedIds.add(lastJob.getId());
}
} else if ( lastJob instanceof JahiaContainerListIndexingJob ) {
@@ -96,10 +96,10 @@
map.put(key,lastJob);
} else if (
lastJob.getDate().longValue()>job.getDate().longValue() ){
map.put(key,lastJob);
- //deleteJobFromPersistence(job);
+ deleteJobFromPersistence(job);
bypassedIds.add(job.getId());
} else {
- //deleteJobFromPersistence(lastJob);
+ deleteJobFromPersistence(lastJob);
bypassedIds.add(lastJob.getId());
}
} else if ( lastJob instanceof JahiaPageIndexingJob ) {
@@ -111,10 +111,10 @@
map.put(key,lastJob);
} else if (
lastJob.getDate().longValue()>job.getDate().longValue() ){
map.put(key,lastJob);
- //deleteJobFromPersistence(job);
+ deleteJobFromPersistence(job);
bypassedIds.add(job.getId());
} else {
- //deleteJobFromPersistence(lastJob);
+ deleteJobFromPersistence(lastJob);
bypassedIds.add(lastJob.getId());
}
} else if ( lastJob instanceof JahiaRemoveFromIndexJob ){
@@ -128,10 +128,10 @@
map.put(key,lastJob);
} else if (
lastJob.getDate().longValue()>job.getDate().longValue() ){
map.put(key,lastJob);
- //deleteJobFromPersistence(job);
+ deleteJobFromPersistence(job);
bypassedIds.add(job.getId());
} else {
- //deleteJobFromPersistence(lastJob);
+ deleteJobFromPersistence(lastJob);
bypassedIds.add(lastJob.getId());
}
} else if ( JahiaSearchConstant.OBJECT_KEY
@@ -141,7 +141,7 @@
key =
ContentObjectKey.getInstance(removeFromIndexJob.getKeyFieldValue()).getKey();
} catch ( Throwable t ){
// should not happens
- //deleteJobFromPersistence(lastJob);
+ deleteJobFromPersistence(lastJob);
bypassedIds.add(lastJob.getId());
continue;
}
@@ -150,10 +150,10 @@
map.put(key,lastJob);
} else if (
lastJob.getDate().longValue()>job.getDate().longValue() ){
map.put(key,lastJob);
- //deleteJobFromPersistence(job);
+ deleteJobFromPersistence(job);
bypassedIds.add(job.getId());
} else {
- //deleteJobFromPersistence(lastJob);
+ deleteJobFromPersistence(lastJob);
bypassedIds.add(lastJob.getId());
}
} else {
