[Arianne-commits] stendhal/src/games/stendhal/server/core/engine/db StendhalSearchIndexDAO.java, 1.3, 1.4

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/db
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17999/src/games/stendhal/server/core/engine/db

Modified Files:
	StendhalSearchIndexDAO.java 
Log Message:
don't try to execute an empty delete statement which will result in an sql syntax error

Index: StendhalSearchIndexDAO.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/db/StendhalSearchIndexDAO.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StendhalSearchIndexDAO.java	12 Feb 2014 23:07:42 -0000	1.3
--- StendhalSearchIndexDAO.java	13 Feb 2014 23:14:01 -0000	1.4
***************
*** 20,26 ****
  
  import marauroa.server.db.DBTransaction;
- import marauroa.server.db.TransactionPool;
- 
- import org.apache.log4j.Logger;
  
  import com.google.common.collect.Sets;
--- 20,23 ----
***************
*** 32,36 ****
   */
  public class StendhalSearchIndexDAO {
- 	private static Logger logger = Logger.getLogger(StendhalSearchIndexDAO.class);
  
  	/**
--- 29,32 ----
***************
*** 53,57 ****
  	/**
  	 * writes an entry to the search index table
! 	 * 
  	 * @param stmt PreparedStatement in batch mode
  	 * @param entry SearchEntry
--- 49,53 ----
  	/**
  	 * writes an entry to the search index table
! 	 *
  	 * @param stmt PreparedStatement in batch mode
  	 * @param entry SearchEntry
***************
*** 86,90 ****
  		}
  		sql.append(")");
! 		transaction.execute(sql.toString(), null);
  	}
  
--- 82,90 ----
  		}
  		sql.append(")");
! 
! 		// if there is at least one entry to delete
! 		if (!first) {
! 			transaction.execute(sql.toString(), null);
! 		}
  	}
  
***************
*** 113,119 ****
  	 * @throws SQLException in case of an database error
  	 */
! 	public void dumpSearchIndex(DBTransaction transaction, Set<SearchIndexEntry> entries) throws SQLException {
! 		long start = System.currentTimeMillis();
! 
  		Set<SearchIndexEntry> oldEntries = readExistingEntries(transaction);
  
--- 113,117 ----
  	 * @throws SQLException in case of an database error
  	 */
! 	public void updateSearchIndex(DBTransaction transaction, Set<SearchIndexEntry> entries) throws SQLException {
  		Set<SearchIndexEntry> oldEntries = readExistingEntries(transaction);
  
***************
*** 123,144 ****
  		deleteObsoleteEntries(transaction, toDelete);
  		addNewEntries(transaction, toAdd);
- 
- 		logger.info("Completed dumping of search index in " + (System.currentTimeMillis() - start) + " milliseconds.");
  	}
  
- 	/**
- 	 * dumps the search index
- 	 *
- 	 * @param entries required entries
- 	 */
- 	public void dumpSearchIndex(Set<SearchIndexEntry> entries) {
- 		DBTransaction transaction = TransactionPool.get().beginWork();
- 		try {
- 			dumpSearchIndex(transaction, entries);
- 			TransactionPool.get().commit(transaction);
- 		} catch (SQLException e) {
- 			logger.error(e, e);
- 			TransactionPool.get().rollback(transaction);
- 		}
- 	}
  }
--- 121,125 ----