o2on svn commit
o2on-****@lists*****
2008年 7月 31日 (木) 13:24:24 JST
Revision: 113
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=113
Author: electrolysis
Date: 2008-07-31 13:24:24 +0900 (Thu, 31 Jul 2008)
Log Message:
-----------
divide_update廃止
Modified Paths:
--------------
branches/BRANCH_0043/o2on/src.o2on/O2DatDB.cpp
branches/BRANCH_0043/o2on/src.o2on/O2DatDB.h
Modified: branches/BRANCH_0043/o2on/src.o2on/O2DatDB.cpp
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/O2DatDB.cpp 2008-07-26 10:38:02 UTC (rev 112)
+++ branches/BRANCH_0043/o2on/src.o2on/O2DatDB.cpp 2008-07-31 04:24:24 UTC (rev 113)
@@ -17,7 +17,7 @@
#include <time.h>
#define UPDATE_THREAD_INTERVAL_S 15
-#define MAX_UPDATE_QUEUE_SIZE 1000
+#define MAX_INSERT_QUEUE_SIZE 1000
#if defined(_DEBUG)
#define TRACE_SQL_EXEC_TIME 1
@@ -178,7 +178,7 @@
O2DatDB::
check_queue_size(O2DatRecList &reclist)
{
- return (reclist.size() < MAX_UPDATE_QUEUE_SIZE ? true : false);
+ return (reclist.size() < MAX_INSERT_QUEUE_SIZE ? true : false);
}
@@ -1231,31 +1231,6 @@
-void
-O2DatDB::
-divide_update(O2DatRecList &in)
-{
- if (in.size() > MAX_UPDATE_QUEUE_SIZE) {
- O2DatRecListIt begin = in.begin();
- O2DatRecListIt end = in.begin();
- while (end != in.end()) {
- begin = end;
- if (std::distance(end, in.end()) < MAX_UPDATE_QUEUE_SIZE)
- end = in.end();
- else
- std::advance(end, MAX_UPDATE_QUEUE_SIZE);
-
- O2DatRecList tmp(begin, end);
- update(tmp);
- }
- }
- else
- update(in);
-}
-
-
-
-
bool
O2DatDB::
remove(const hashT &hash)
@@ -1361,7 +1336,7 @@
UpdateQueueLock.Lock();
if (!UpdateQueue.empty()) {
- divide_update(UpdateQueue);
+ update(UpdateQueue);
UpdateQueue.clear();
}
UpdateQueueLock.Unlock();
@@ -1395,7 +1370,7 @@
UpdateQueueLock.Unlock();
if (!reclist.empty())
- divide_update(reclist);
+ update(reclist);
t = time(NULL);
CLEAR_WORKSET;
//TRACEA("+++++ UPDATE +++++\n");
Modified: branches/BRANCH_0043/o2on/src.o2on/O2DatDB.h
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/O2DatDB.h 2008-07-26 10:38:02 UTC (rev 112)
+++ branches/BRANCH_0043/o2on/src.o2on/O2DatDB.h 2008-07-31 04:24:24 UTC (rev 113)
@@ -103,7 +103,6 @@
void insert(O2DatRecList &in, bool to_rebuild);
void update(O2DatRecList &in);
- void divide_update(O2DatRecList &in);
bool remove(const hashT &hash);