197 Commits

Author SHA1 Message Date
ea6b2b0c56 Fix compilation error in previous commit 2017-07-21 12:07:05 +02:00
2e262b19ca We should only filter positive keys. It shouldn't matter for Linkdb but for Tagdb, we will be reading invalid recSize.
So to keep things consistent, we'll only filter positive records. Negative records should go away when it's merged to file  anyway
2017-07-21 11:59:04 +02:00
b691937dd4 Cater for newly dumped file in a different way while merging list 2017-05-31 16:33:23 +02:00
356895efc5 Rename startFileNum to startFileIndex. Check only up to files that are being merged when verifying RbdIndex. We should have newly dump files that could have the docId, but not in global index yet 2017-05-31 14:21:04 +02:00
9f9b3f08e3 More validation around RdbIndexQuery and make sure we don't return the default m_numFiles when we're merging. We want to catch out of sync dat & index files 2017-05-17 14:04:09 +02:00
138997b428 Remove unused function 2017-05-11 15:52:32 +02:00
50b656f93a Merge branch 'master' into nomerge2 2017-04-10 12:38:13 +02:00
299a021ad8 Add TDF_DEPRECATED & don't print on UI if it's not selected & it's deprecated. Remove comment from being deprecated 2017-04-04 15:18:52 +02:00
7a21587ca6 Merge branch 'master' into nomerge2 2017-03-27 15:03:19 +02:00
2a705fb1a6 RdbList: more const 2017-03-27 14:40:46 +02:00
9cc555af2b Merge branch 'master' into nomerge2 2017-03-25 19:55:51 +01:00
339f1a78ff More fixes for verify index 2017-03-25 19:55:05 +01:00
2cee927c6e Merge branch 'master' into nomerge2 2017-03-25 19:16:52 +01:00
be45454d0e Only verify index when it's a file merge 2017-03-25 19:13:58 +01:00
024a0dac4a Merge branch 'master' into nomerge2 2017-03-25 17:17:05 +01:00
77d8106362 Only use base->getIndex if it's readable 2017-03-25 17:16:32 +01:00
30c88bebae Merge branch 'master' into nomerge2 2017-03-25 16:57:55 +01:00
ea2b286871 Fix verify index for the scenario that we're in the middle of a dump 2017-03-25 16:57:18 +01:00
c417e592bb Merge branch 'master' into nomerge2 2017-03-25 15:23:31 +01:00
a5a09790cc Fix verifyIndex so cater for more scenarios 2017-03-25 15:22:39 +01:00
de61d1b76a Merge branch 'master' into nomerge2 2017-03-23 17:50:34 +01:00
dd48809831 Add more trace log & log for shardByTermId 2017-03-23 17:33:12 +01:00
033959513a Merge branch 'master' into nomerge2 2017-03-22 15:48:53 +01:00
cb8e24b0b1 Check pending docIds as well when verifying index 2017-03-22 15:20:18 +01:00
88b9fbee55 Merge branch 'master' into nomerge2 2017-03-21 12:29:05 +01:00
f5453544a7 Fix some timing issue with generate index. It wouldn't cause any data error, but when verifyIndex is enabled, the global index may not include recently dumped file and it assumes the global index is corrupted. This is now fixed 2017-03-21 12:27:13 +01:00
1e2ecd1e92 Merge branch 'master' into nomerge2 2017-03-21 11:30:38 +01:00
60a3b5a242 Add verify index 2017-03-21 11:30:13 +01:00
57e3ef3c1d Merge branch 'master' into nomerge2 2017-03-17 12:56:40 +01:00
d7b9411659 Fix buffer overflow for RdbList when trace log is enabled 2017-03-17 12:56:03 +01:00
60914d1ea5 Merge branch 'master' into nomerge2 2017-03-13 12:13:22 +01:00
d232d58c04 Use m_endKey instead of endKey. We have manipulated m_endKey 2017-03-13 12:12:47 +01:00
56a3a78ac9 Rename endKey to newEndKey to avoid shadowing another parameter 2017-03-13 12:12:47 +01:00
27546ffc76 Reintroduce comment accidently removed 2017-03-10 17:02:21 +01:00
fcb874d022 Merge branch 'master' into nomerge2
Conflicts:
	Msg2.cpp
	Msg40.cpp
	XmlDoc.cpp
2016-12-12 14:04:46 +01:00
bdd8cb5338 #include clean up Query.h 2016-12-08 16:56:09 +01:00
43fa4e4ce2 Merge branch 'master' into nomerge2 2016-11-17 11:45:44 +01:00
8b684c9215 Use Spiderdb instead of g_spiderdb for static functions 2016-11-15 15:13:21 +01:00
dab892fc05 Merge branch 'master' into nomerge2
Conflicts:
	JobScheduler.cpp
	JobScheduler.h
	Msg2.cpp
	Msg39.cpp
	Msg40.cpp
	UdpServer.cpp
	main.cpp
2016-11-15 12:13:43 +01:00
aba937780d Stop #including Conf.h from header files 2016-11-12 20:24:20 +01:00
0430d94078 Merge branch 'master' into nomerge2 2016-11-10 14:22:42 +01:00
c437c54d06 Do not insert lost links anymore in linkdb & cleanup existing linkdb records 2016-11-08 16:49:40 +01:00
5a06b25687 Merge branch 'master' into nomerge2
Conflicts:
	Msg2.cpp
	Msg3.cpp
	Msg39.cpp
	Msg51.cpp
	RdbList.cpp
2016-11-03 17:36:50 +01:00
7b3af9b542 Cater for secondary rdb during rebuild 2016-11-03 11:18:13 +01:00
5bad84aa52 Merge branch 'master' into nomerge2
Conflicts:
	Msg3.cpp
	Msg39.cpp
	Rdb.cpp
	RdbCache.h
	XmlDoc.cpp
2016-10-31 11:31:03 +01:00
7a69c24d93 members init in RdbList 2016-10-23 09:56:05 +02:00
4be287316a use rdbid_t in getDbnameFromId() 2016-10-20 18:30:14 +02:00
ae79291465 wrongly initialized int32_t m_fixedDataSize to false in RdbList 2016-10-19 20:34:06 +02:00
b9a9a4562c Merge branch 'master' into nomerge2
Conflicts:
	Msg5.cpp
	RdbList.cpp
2016-10-17 14:53:20 +02:00
da26adaa9a Shut down if RdbList:.set sees startkey>endkey (most likely corrupt map or a logic error) 2016-10-14 14:05:51 +02:00