Skip to content

Commit fcf5260

Browse files
committed
Remove a level of indirection to access compatible index version
Should fix cygwin
1 parent 922e269 commit fcf5260

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/linclust/LinsearchIndexReader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#define SIZE_T_MAX ((size_t) -1)
1616
#endif
1717

18+
extern const char* index_version_compatible;
1819

1920
template <int TYPE>
2021
size_t LinsearchIndexReader::pickCenterKmer(KmerPosition<short> *hashSeqPair, size_t splitKmerCount) {
@@ -241,7 +242,7 @@ bool LinsearchIndexReader::checkIfIndexFile(DBReader<unsigned int> *pReader) {
241242
if(version == NULL){
242243
return false;
243244
}
244-
return (strncmp(version, PrefilteringIndexReader::CURRENT_VERSION, strlen(PrefilteringIndexReader::CURRENT_VERSION)) == 0 ) ? true : false;
245+
return (strncmp(version, index_version_compatible, strlen(index_version_compatible)) == 0 ) ? true : false;
245246
}
246247

247248
void LinsearchIndexReader::writeKmerIndexToDisk(std::string fileName, KmerPosition<short> *kmers, size_t kmerCnt){

src/linclust/kmerindexdb.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#endif
1515

1616
extern const char* version;
17+
extern const char* index_version_compatible;
1718

1819
int kmerindexdb(int argc, const char **argv, const Command &command) {
1920
MMseqsMPI::init(argc, argv);
@@ -169,7 +170,7 @@ int kmerindexdb(int argc, const char **argv, const Command &command) {
169170
dbw.open();
170171

171172
Debug(Debug::INFO) << "Write VERSION (" << PrefilteringIndexReader::VERSION << ")\n";
172-
dbw.writeData((char *) PrefilteringIndexReader::CURRENT_VERSION, strlen(PrefilteringIndexReader::CURRENT_VERSION) * sizeof(char), PrefilteringIndexReader::VERSION, 0);
173+
dbw.writeData((char *) index_version_compatible, strlen(index_version_compatible) * sizeof(char), PrefilteringIndexReader::VERSION, 0);
173174
dbw.alignToPageSize();
174175

175176
Debug(Debug::INFO) << "Write META (" << PrefilteringIndexReader::META << ")\n";

src/prefiltering/PrefilteringIndexReader.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "Parameters.h"
88

99
extern const char* index_version_compatible;
10-
const char* PrefilteringIndexReader::CURRENT_VERSION = index_version_compatible;
1110
unsigned int PrefilteringIndexReader::VERSION = 0;
1211
unsigned int PrefilteringIndexReader::META = 1;
1312
unsigned int PrefilteringIndexReader::SCOREMATRIXNAME = 2;
@@ -41,7 +40,7 @@ bool PrefilteringIndexReader::checkIfIndexFile(DBReader<unsigned int>* reader) {
4140
if(version == NULL){
4241
return false;
4342
}
44-
return (strncmp(version, CURRENT_VERSION, strlen(CURRENT_VERSION)) == 0 ) ? true : false;
43+
return (strncmp(version, index_version_compatible, strlen(index_version_compatible)) == 0 ) ? true : false;
4544
}
4645

4746
std::string PrefilteringIndexReader::indexName(const std::string &outDB) {
@@ -67,7 +66,7 @@ void PrefilteringIndexReader::createIndexFile(const std::string &outDB,
6766
writer.open();
6867

6968
Debug(Debug::INFO) << "Write VERSION (" << VERSION << ")\n";
70-
writer.writeData((char *) CURRENT_VERSION, strlen(CURRENT_VERSION) * sizeof(char), VERSION, SPLIT_META);
69+
writer.writeData((char *) index_version_compatible, strlen(index_version_compatible) * sizeof(char), VERSION, SPLIT_META);
7170
writer.alignToPageSize(SPLIT_META);
7271

7372
Debug(Debug::INFO) << "Write META (" << META << ")\n";

src/prefiltering/PrefilteringIndexReader.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ struct PrefilteringIndexData {
2424

2525
class PrefilteringIndexReader {
2626
public:
27-
static const char* CURRENT_VERSION;
2827
static unsigned int VERSION;
2928
static unsigned int ENTRIES;
3029
static unsigned int ENTRIESOFFSETS;

0 commit comments

Comments
 (0)