Libcolumbus

Merge lp:~jpakkane/libcolumbus/symbol-versioning into lp:libcolumbus

  1. symbol-versioning
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Approved by: Pete Woods
Approved revision: 475
Merged at revision: 463
Proposed branch: lp:~jpakkane/libcolumbus/symbol-versioning
Merge into: lp:libcolumbus
Diff against target: 465 lines (+329/-14)
11 files modified
CMakeLists.txt (+1/-1)
debian/libcolumbus1.symbols (+189/-0)
debian/rules (+0/-4)
include/ErrorValues.hh (+1/-1)
include/Matcher.hh (+1/-1)
include/Trie.hh (+1/-1)
src/CMakeLists.txt (+4/-1)
src/ErrorValues.cc (+2/-2)
src/Matcher.cc (+3/-2)
src/libcolumbus.map (+122/-0)
test/CMakeLists.txt (+5/-1)
To merge this branch: bzr merge lp:~jpakkane/libcolumbus/symbol-versioning
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Pete Woods (community) Approve
Mathieu Trudel-Lapierre Pending
Review via email: mp+181301@code.launchpad.net

Commit message

Add symbol versioning.

Description of the change

Libcolumbus is now stable so let's add symbol version file. Currently just removes the regenerate-before-check step. What else do we need to do to get it going?

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:454
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libcolumbus-ci/21/rebuild

review: Approve (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
455. By Jussi Pakkanen

Empty symbols file.

456. By Jussi Pakkanen

Some symbol verification going on.

457. By Jussi Pakkanen

Added symbol visibility map.

458. By Jussi Pakkanen

Fixed symbols file.

459. By Jussi Pakkanen

Merged trunk.

460. By Jussi Pakkanen

Hid trie as it is an internal implementation thingy.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:460
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/26/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
461. By Jussi Pakkanen

Remove trie symbols from symbols file too.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:461
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/27/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
462. By Jussi Pakkanen

Symbol file fix.

463. By Jussi Pakkanen

Final symbol tweaking.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:463
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/28/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
464. By Jussi Pakkanen

Experiment with arch-dependent symbols.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:464
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/29/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
465. By Jussi Pakkanen

Some more symbolification.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:465
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/30/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
466. By Jussi Pakkanen

Hopefully the last symbol fixes.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/9
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/31/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
467. By Jussi Pakkanen

Is this the final one?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:467
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/32/rebuild

review: Approve (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
468. By Jussi Pakkanen

Hid private methods of Matcher.

469. By Jussi Pakkanen

Removed private symbols of Word.

470. By Jussi Pakkanen

Hid private methods onf MatchResults.

471. By Jussi Pakkanen

Hid private symbols of ErrorValues.

472. By Jussi Pakkanen

Hid private symbols of IndexMatches.

473. By Jussi Pakkanen

Hid private symbols of LevenshteinIndex.

474. By Jussi Pakkanen

Fix issues reported by bzr bd.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/33/rebuild

review: Approve (continuous-integration)
Revision history for this message
Pete Woods (pete-woods) wrote :

The changes look good to me, after lengthy questioning on IRC :)

review: Approve
lp:~jpakkane/libcolumbus/symbol-versioning updated
475. By Jussi Pakkanen

Added missing include while we are at it.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-trusty-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libcolumbus-ci/34/rebuild

review: Approve (continuous-integration)
lp:~jpakkane/libcolumbus/symbol-versioning updated
476. By Jussi Pakkanen

Welcome to new world of multiple architectures.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-28 13:45:38 +0000
3+++ CMakeLists.txt 2014-03-25 09:59:29 +0000
4@@ -35,7 +35,7 @@
5 # Symbol visibility
6 add_definitions(-DBUILDING_COLUMBUS)
7 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
8-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
9+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
10
11 set(SO_VERSION_MAJOR "1")
12 set(SO_VERSION_MINOR "1")
13
14=== added file 'debian/libcolumbus1.symbols'
15--- debian/libcolumbus1.symbols 1970-01-01 00:00:00 +0000
16+++ debian/libcolumbus1.symbols 2014-03-25 09:59:29 +0000
17@@ -0,0 +1,189 @@
18+libcolumbus.so.1 libcolumbus1 #MINVER#
19+ (c++)"Columbus::ErrorValues::addAccents(Columbus::accentGroups)@Base" 0replaceme
20+ (c++)"Columbus::ErrorValues::clearErrors()@Base" 0replaceme
21+ (c++)"Columbus::ErrorValues::setGroupError(Columbus::Word const&, int)@Base" 0replaceme
22+ (c++)"Columbus::ErrorValues::setSubstringMode()@Base" 0replaceme
23+ (c++)"Columbus::ErrorValues::addKeyboardErrors()@Base" 0replaceme
24+ (c++)"Columbus::ErrorValues::addStandardErrors()@Base" 0replaceme
25+ (c++)"Columbus::ErrorValues::addNumberpadErrors()@Base" 0replaceme
26+ (c++)"Columbus::ErrorValues::setError(unsigned short, unsigned short, int)@Base" 0replaceme
27+ (c++)"Columbus::ErrorValues::isInGroup(unsigned short)@Base" 0replaceme
28+ (c++)"Columbus::ErrorValues::ErrorValues()@Base" 0replaceme
29+ (c++)"Columbus::ErrorValues::~ErrorValues()@Base" 0replaceme
30+ (c++)"Columbus::IndexMatches::clear()@Base" 0replaceme
31+ (c++)"Columbus::IndexMatches::IndexMatches()@Base" 0replaceme
32+ (c++)"Columbus::IndexMatches::~IndexMatches()@Base" 0replaceme
33+ (c++)"Columbus::IndexWeights::setWeight(Columbus::Word const&, double)@Base" 0replaceme
34+ (c++)"Columbus::IndexWeights::IndexWeights()@Base" 0replaceme
35+ (c++)"Columbus::IndexWeights::~IndexWeights()@Base" 0replaceme
36+ (c++)"Columbus::MatchResults::addResults(Columbus::MatchResults const&)@Base" 0replaceme
37+ (c++|arch=amd64 arm64 ppc64el)"Columbus::MatchResults::copyResult(Columbus::MatchResults const&, unsigned long)@Base" 0replaceme
38+ (c++|arch=i386 armhf powerpc)"Columbus::MatchResults::copyResult(Columbus::MatchResults const&, unsigned int)@Base" 0replaceme
39+ (c++|arch=amd64 arm64 ppc64el)"Columbus::MatchResults::addResult(unsigned long, double)@Base" 0replaceme
40+ (c++|arch=i386 armhf powerpc)"Columbus::MatchResults::addResult(unsigned int, double)@Base" 0replaceme
41+ (c++)"Columbus::MatchResults::MatchResults(Columbus::MatchResults&&)@Base" 0replaceme
42+ (c++)"Columbus::MatchResults::MatchResults(Columbus::MatchResults const&)@Base" 0replaceme
43+ (c++)"Columbus::MatchResults::MatchResults()@Base" 0replaceme
44+ (c++)"Columbus::MatchResults::MatchResults(Columbus::MatchResults&&)@Base" 0replaceme
45+ (c++)"Columbus::MatchResults::MatchResults(Columbus::MatchResults const&)@Base" 0replaceme
46+ (c++)"Columbus::MatchResults::MatchResults()@Base" 0replaceme
47+ (c++)"Columbus::MatchResults::~MatchResults()@Base" 0replaceme
48+ (c++)"Columbus::MatchResults::operator=(Columbus::MatchResults&&)@Base" 0replaceme
49+ (c++)"Columbus::MatchResults::operator=(Columbus::MatchResults const&)@Base" 0replaceme
50+ (c++)"Columbus::ResultFilter::addNewTerm()@Base" 0replaceme
51+ (c++)"Columbus::ResultFilter::addNewSubTerm(Columbus::Word const&, Columbus::Word const&)@Base" 0replaceme
52+ (c++)"Columbus::ResultFilter::ResultFilter()@Base" 0replaceme
53+ (c++)"Columbus::ResultFilter::~ResultFilter()@Base" 0replaceme
54+ (c++)"Columbus::splitToWords(char const*)@Base" 0replaceme
55+ (c++)"Columbus::hiresTimestamp()@Base" 0replaceme
56+ (c++)"Columbus::LevenshteinIndex::insertWord(Columbus::Word const&, unsigned int)@Base" 0replaceme
57+ (c++)"Columbus::LevenshteinIndex::getDefaultError()@Base" 0replaceme
58+ (c++)"Columbus::LevenshteinIndex::LevenshteinIndex()@Base" 0replaceme
59+ (c++)"Columbus::LevenshteinIndex::~LevenshteinIndex()@Base" 0replaceme
60+ (c++)"Columbus::SearchParameters::setDynamic(bool)@Base" 0replaceme
61+ (c++)"Columbus::SearchParameters::getResultFilter()@Base" 0replaceme
62+ (c++)"Columbus::SearchParameters::addNonsearchingField(Columbus::Word const&)@Base" 0replaceme
63+ (c++)"Columbus::SearchParameters::SearchParameters()@Base" 0replaceme
64+ (c++)"Columbus::SearchParameters::~SearchParameters()@Base" 0replaceme
65+ (c++)"Columbus::Word::Word(Columbus::Word&&)@Base" 0replaceme
66+ (c++)"Columbus::Word::Word(char const*)@Base" 0replaceme
67+ (c++|arch=amd64 arm64 ppc64el)"Columbus::Word::Word(unsigned short*, unsigned long)@Base" 0replaceme
68+ (c++|arch=i386 armhf powerpc)"Columbus::Word::Word(unsigned short*, unsigned int)@Base" 0replaceme
69+ (c++)"Columbus::Word::Word(Columbus::Word const&)@Base" 0replaceme
70+ (c++)"Columbus::Word::Word(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
71+ (c++)"Columbus::Word::Word()@Base" 0replaceme
72+ (c++)"Columbus::Word::Word(Columbus::Word&&)@Base" 0replaceme
73+ (c++)"Columbus::Word::Word(char const*)@Base" 0replaceme
74+ (c++|arch=amd64 arm64 ppc64el)"Columbus::Word::Word(unsigned short*, unsigned long)@Base" 0replaceme
75+ (c++|arch=i386 armhf powerpc)"Columbus::Word::Word(unsigned short*, unsigned int)@Base" 0replaceme
76+ (c++)"Columbus::Word::Word(Columbus::Word const&)@Base" 0replaceme
77+ (c++)"Columbus::Word::Word(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
78+ (c++)"Columbus::Word::Word()@Base" 0replaceme
79+ (c++)"Columbus::Word::~Word()@Base" 0replaceme
80+ (c++)"Columbus::Word::operator=(Columbus::Word&&)@Base" 0replaceme
81+ (c++)"Columbus::Word::operator=(char const*)@Base" 0replaceme
82+ (c++)"Columbus::Word::operator=(Columbus::Word const&)@Base" 0replaceme
83+ (c++)"Columbus::Word::operator=(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
84+ (c++)"Columbus::Corpus::addDocument(Columbus::Document const&)@Base" 0replaceme
85+ (c++)"Columbus::Corpus::Corpus()@Base" 0replaceme
86+ (c++)"Columbus::Corpus::~Corpus()@Base" 0replaceme
87+ (c++)"Columbus::Matcher::onlineMatch(Columbus::WordList const&, Columbus::Word const&)@Base" 0replaceme
88+ (c++)"Columbus::Matcher::getErrorValues()@Base" 0replaceme
89+ (c++)"Columbus::Matcher::getIndexWeights()@Base" 0replaceme
90+ (c++)"Columbus::Matcher::index(Columbus::Corpus const&)@Base" 0replaceme
91+ (c++)"Columbus::Matcher::match(char const*)@Base" 0replaceme
92+ (c++)"Columbus::Matcher::match(char const*, Columbus::SearchParameters const&)@Base" 0replaceme
93+ (c++)"Columbus::Matcher::match(Columbus::WordList const&)@Base" 0replaceme
94+ (c++)"Columbus::Matcher::match(Columbus::WordList const&, Columbus::SearchParameters const&)@Base" 0replaceme
95+ (c++)"Columbus::Matcher::match(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
96+ (c++)"Columbus::Matcher::Matcher()@Base" 0replaceme
97+ (c++)"Columbus::Matcher::~Matcher()@Base" 0replaceme
98+ (c++)"Columbus::Document::addText(Columbus::Word const&, char const*)@Base" 0replaceme
99+ (c++)"Columbus::Document::addText(Columbus::Word const&, Columbus::WordList const&)@Base" 0replaceme
100+ (c++)"Columbus::Document::addText(Columbus::Word const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
101+ (c++)"Columbus::Document::Document(Columbus::Document const&)@Base" 0replaceme
102+ (c++|arch=amd64 arm64 ppc64el)"Columbus::Document::Document(unsigned long)@Base" 0replaceme
103+ (c++|arch=i386 armhf powerpc)"Columbus::Document::Document(unsigned int)@Base" 0replaceme
104+ (c++)"Columbus::Document::Document(Columbus::Document const&)@Base" 0replaceme
105+ (c++)"Columbus::Document::~Document()@Base" 0replaceme
106+ (c++)"Columbus::Document::operator=(Columbus::Document const&)@Base" 0replaceme
107+ (c++)"Columbus::WordList::addWord(Columbus::Word const&)@Base" 0replaceme
108+ (c++)"Columbus::WordList::WordList(Columbus::WordList&&)@Base" 0replaceme
109+ (c++)"Columbus::WordList::WordList(Columbus::WordList const&)@Base" 0replaceme
110+ (c++)"Columbus::WordList::WordList()@Base" 0replaceme
111+ (c++)"Columbus::WordList::WordList(Columbus::WordList&&)@Base" 0replaceme
112+ (c++)"Columbus::WordList::WordList(Columbus::WordList const&)@Base" 0replaceme
113+ (c++)"Columbus::WordList::WordList()@Base" 0replaceme
114+ (c++)"Columbus::WordList::~WordList()@Base" 0replaceme
115+ (c++)"Columbus::WordList::operator=(Columbus::WordList&&)@Base" 0replaceme
116+ (c++)"Columbus::WordList::operator=(Columbus::WordList const&)@Base" 0replaceme
117+ (c++)"Columbus::WordStore::getID(Columbus::Word const&)@Base" 0replaceme
118+ (c++)"Columbus::WordStore::WordStore()@Base" 0replaceme
119+ (c++)"Columbus::WordStore::~WordStore()@Base" 0replaceme
120+ (c++)"Columbus::ErrorValues::getSubstituteError(unsigned short, unsigned short) const@Base" 0replaceme
121+ (c++|arch=amd64 arm64 ppc64el)"Columbus::IndexMatches::getMatchError(unsigned long) const@Base" 0replaceme
122+ (c++|arch=i386 armhf powerpc)"Columbus::IndexMatches::getMatchError(unsigned int) const@Base" 0replaceme
123+ (c++)"Columbus::IndexMatches::size() const@Base" 0replaceme
124+ (c++|arch=amd64 arm64 ppc64el)"Columbus::IndexMatches::getMatch(unsigned long) const@Base" 0replaceme
125+ (c++|arch=i386 armhf powerpc)"Columbus::IndexMatches::getMatch(unsigned int) const@Base" 0replaceme
126+ (c++|arch=amd64 arm64 ppc64el)"Columbus::IndexMatches::getQuery(unsigned long) const@Base" 0replaceme
127+ (c++|arch=i386 armhf powerpc)"Columbus::IndexMatches::getQuery(unsigned int) const@Base" 0replaceme
128+ (c++)"Columbus::IndexWeights::getWeight(Columbus::Word const&) const@Base" 0replaceme
129+ (c++|arch=amd64 arm64 ppc64el)"Columbus::MatchResults::getRelevancy(unsigned long) const@Base" 0replaceme
130+ (c++|arch=i386 armhf powerpc)"Columbus::MatchResults::getRelevancy(unsigned int) const@Base" 0replaceme
131+ (c++|arch=amd64 arm64 ppc64el)"Columbus::MatchResults::getDocumentID(unsigned long) const@Base" 0replaceme
132+ (c++|arch=i386 armhf powerpc)"Columbus::MatchResults::getDocumentID(unsigned int) const@Base" 0replaceme
133+ (c++)"Columbus::MatchResults::size() const@Base" 0replaceme
134+ (c++|arch=amd64 arm64 ppc64el)"Columbus::ResultFilter::numSubTerms(unsigned long) const@Base" 0replaceme
135+ (c++|arch=i386 armhf powerpc)"Columbus::ResultFilter::numSubTerms(unsigned int) const@Base" 0replaceme
136+ (c++|arch=amd64 arm64 ppc64el)"Columbus::ResultFilter::getWord(unsigned long, unsigned long) const@Base" 0replaceme
137+ (c++|arch=i386 armhf powerpc)"Columbus::ResultFilter::getWord(unsigned int, unsigned int) const@Base" 0replaceme
138+ (c++|arch=amd64 arm64 ppc64el)"Columbus::ResultFilter::getField(unsigned long, unsigned long) const@Base" 0replaceme
139+ (c++|arch=i386 armhf powerpc)"Columbus::ResultFilter::getField(unsigned int, unsigned int) const@Base" 0replaceme
140+ (c++)"Columbus::ResultFilter::numTerms() const@Base" 0replaceme
141+ (c++)"Columbus::LevenshteinIndex::hasWord(Columbus::Word const&) const@Base" 0replaceme
142+ (c++)"Columbus::LevenshteinIndex::maxCount() const@Base" 0replaceme
143+ (c++)"Columbus::LevenshteinIndex::numNodes() const@Base" 0replaceme
144+ (c++)"Columbus::LevenshteinIndex::numWords() const@Base" 0replaceme
145+ (c++)"Columbus::LevenshteinIndex::findWords(Columbus::Word const&, Columbus::ErrorValues const&, int, Columbus::IndexMatches&) const@Base" 0replaceme
146+ (c++)"Columbus::LevenshteinIndex::wordCount(unsigned int) const@Base" 0replaceme
147+ (c++)"Columbus::SearchParameters::getDynamicError(Columbus::Word const&) const@Base" 0replaceme
148+ (c++)"Columbus::SearchParameters::getResultFilter() const@Base" 0replaceme
149+ (c++)"Columbus::SearchParameters::isNonsearchingField(Columbus::Word const&) const@Base" 0replaceme
150+ (c++)"Columbus::SearchParameters::looseningIterations() const@Base" 0replaceme
151+ (c++)"Columbus::SearchParameters::isDynamic() const@Base" 0replaceme
152+ (c++)"Columbus::Word::hash() const@Base" 0replaceme
153+ (c++)"Columbus::Word::join(Columbus::Word const&) const@Base" 0replaceme
154+ (c++)"Columbus::Word::asUtf8() const@Base" 0replaceme
155+ (c++)"Columbus::Word::toUtf8(char*, unsigned int) const@Base" 0replaceme
156+ (c++)"Columbus::Word::operator==(char const*) const@Base" 0replaceme
157+ (c++)"Columbus::Word::operator==(Columbus::Word const&) const@Base" 0replaceme
158+ (c++)"Columbus::Word::operator==(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0replaceme
159+ (c++)"Columbus::Word::operator[](unsigned int) const@Base" 0replaceme
160+ (c++)"Columbus::Word::operator<(Columbus::Word const&) const@Base" 0replaceme
161+ (c++)"Columbus::Word::operator!=(char const*) const@Base" 0replaceme
162+ (c++)"Columbus::Word::operator!=(Columbus::Word const&) const@Base" 0replaceme
163+ (c++)"Columbus::Word::operator!=(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0replaceme
164+ (c++|arch=amd64 arm64 ppc64el)"Columbus::Corpus::getDocument(unsigned long) const@Base" 0replaceme
165+ (c++|arch=i386 armhf powerpc)"Columbus::Corpus::getDocument(unsigned int) const@Base" 0replaceme
166+ (c++)"Columbus::Corpus::size() const@Base" 0replaceme
167+ (c++)"Columbus::Document::fieldCount() const@Base" 0replaceme
168+ (c++)"Columbus::Document::getFieldNames(Columbus::WordList&) const@Base" 0replaceme
169+ (c++)"Columbus::Document::totalWordCount(Columbus::Word const&) const@Base" 0replaceme
170+ (c++)"Columbus::Document::getID() const@Base" 0replaceme
171+ (c++)"Columbus::Document::getText(Columbus::Word const&) const@Base" 0replaceme
172+ (c++)"Columbus::Document::wordCount(Columbus::Word const&, Columbus::Word) const@Base" 0replaceme
173+ (c++)"Columbus::WordList::size() const@Base" 0replaceme
174+ (c++)"Columbus::WordList::operator==(Columbus::WordList const&) const@Base" 0replaceme
175+ (c++|arch=amd64 arm64 ppc64el)"Columbus::WordList::operator[](unsigned long) const@Base" 0replaceme
176+ (c++|arch=i386 armhf powerpc)"Columbus::WordList::operator[](unsigned int) const@Base" 0replaceme
177+ (c++)"Columbus::WordList::operator!=(Columbus::WordList const&) const@Base" 0replaceme
178+ (c++)"Columbus::WordStore::getWord(unsigned int) const@Base" 0replaceme
179+ (c++)"Columbus::WordStore::hasWord(Columbus::Word const&) const@Base" 0replaceme
180+ (c++)"Columbus::WordStore::hasWord(unsigned int) const@Base" 0replaceme
181+ col_corpus_add_document@Base 0replaceme
182+ col_corpus_delete@Base 0replaceme
183+ col_corpus_new@Base 0replaceme
184+ col_document_add_text@Base 0replaceme
185+ col_document_delete@Base 0replaceme
186+ col_document_get_id@Base 0replaceme
187+ col_document_new@Base 0replaceme
188+ col_error_values_add_standard_errors@Base 0replaceme
189+ col_error_values_set_substring_mode@Base 0replaceme
190+ col_index_weights_get_weight@Base 0replaceme
191+ col_index_weights_set_weight@Base 0replaceme
192+ col_match_results_delete@Base 0replaceme
193+ col_match_results_get_id@Base 0replaceme
194+ col_match_results_get_relevancy@Base 0replaceme
195+ col_match_results_new@Base 0replaceme
196+ col_match_results_size@Base 0replaceme
197+ col_matcher_delete@Base 0replaceme
198+ col_matcher_get_error_values@Base 0replaceme
199+ col_matcher_get_index_weights@Base 0replaceme
200+ col_matcher_index@Base 0replaceme
201+ col_matcher_match@Base 0replaceme
202+ col_matcher_new@Base 0replaceme
203+ col_word_as_utf8@Base 0replaceme
204+ col_word_delete@Base 0replaceme
205+ col_word_length@Base 0replaceme
206+ col_word_new@Base 0replaceme
207
208=== modified file 'debian/rules'
209--- debian/rules 2013-08-08 06:46:54 +0000
210+++ debian/rules 2014-03-25 09:59:29 +0000
211@@ -20,7 +20,3 @@
212
213 override_dh_install:
214 dh_install --fail-missing
215-
216-# force always taking latest version as the lib isn't stable
217-override_dh_makeshlibs:
218- dh_makeshlibs -V
219
220=== modified file 'include/ErrorValues.hh'
221--- include/ErrorValues.hh 2013-08-09 12:23:06 +0000
222+++ include/ErrorValues.hh 2014-03-25 09:59:29 +0000
223@@ -54,7 +54,7 @@
224 void clearLUT();
225 void addToLUT(Letter l1, Letter l2, int value);
226 void addGroupErrorToLUT(const Word &groupLetters, const int error);
227- int getSubstituteErrorSlow(Letter l1, Letter l2) const;
228+ int substituteErrorSlow(Letter l1, Letter l2) const;
229 void setPadError(const Letter number, const char letters[4], int letterCount, int error);
230
231 public:
232
233=== modified file 'include/Matcher.hh'
234--- include/Matcher.hh 2014-02-28 13:30:08 +0000
235+++ include/Matcher.hh 2014-03-25 09:59:29 +0000
236@@ -42,7 +42,7 @@
237
238 void buildIndexes(const Corpus &c);
239 void addToIndex(const Word &word, const WordID wordID, const WordID indexID);
240- void matchWithRelevancy(const WordList &query, const SearchParameters &params, const int extraError, MatchResults &matchedDocuments);
241+ void relevancyMatch(const WordList &query, const SearchParameters &params, const int extraError, MatchResults &matchedDocuments);
242
243 public:
244 Matcher();
245
246=== modified file 'include/Trie.hh'
247--- include/Trie.hh 2013-06-14 12:26:10 +0000
248+++ include/Trie.hh 2014-03-25 09:59:29 +0000
249@@ -27,7 +27,7 @@
250 struct TriePrivate;
251 class Word;
252
253-class COL_PUBLIC Trie final {
254+class Trie final {
255 private:
256 TriePrivate *p;
257 void expand();
258
259=== modified file 'src/CMakeLists.txt'
260--- src/CMakeLists.txt 2013-06-14 12:23:15 +0000
261+++ src/CMakeLists.txt 2014-03-25 09:59:29 +0000
262@@ -25,8 +25,11 @@
263 endif()
264 target_link_libraries(${COL_LIB_BASENAME} ${ICU_LIBRARIES})
265
266+set(symbol_map "${CMAKE_CURRENT_SOURCE_DIR}/libcolumbus.map")
267 set_target_properties(${COL_LIB_BASENAME} PROPERTIES VERSION ${SO_VERSION} SOVERSION ${ABI_VERSION})
268-
269+set_target_properties(${COL_LIB_BASENAME} PROPERTIES
270+ LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}")
271+set_target_properties(${COL_LIB_BASENAME} PROPERTIES LINK_DEPENDS ${symbol_map})
272 add_pch(pch/columbus_pch.hh ${COL_LIB_BASENAME})
273
274 install(
275
276=== modified file 'src/ErrorValues.cc'
277--- src/ErrorValues.cc 2013-08-09 12:23:06 +0000
278+++ src/ErrorValues.cc 2014-03-25 09:59:29 +0000
279@@ -94,10 +94,10 @@
280 if(l1 < LUT_LETTERS && l2 < LUT_LETTERS) {
281 return p->lut[LUT_OFFSET(l1, l2)];
282 }
283- return getSubstituteErrorSlow(l1, l2);
284+ return substituteErrorSlow(l1, l2);
285 }
286
287-int ErrorValues::getSubstituteErrorSlow(Letter l1, Letter l2) const {
288+int ErrorValues::substituteErrorSlow(Letter l1, Letter l2) const {
289 if(l1 == l2)
290 return 0;
291 if(l1 > l2) {
292
293=== modified file 'src/Matcher.cc'
294--- src/Matcher.cc 2014-02-28 13:30:08 +0000
295+++ src/Matcher.cc 2014-03-25 09:59:29 +0000
296@@ -35,6 +35,7 @@
297 #include <cassert>
298 #include <stdexcept>
299 #include <map>
300+#include <set>
301 #include <vector>
302 #include <algorithm>
303
304@@ -308,7 +309,7 @@
305 }
306
307
308-void Matcher::matchWithRelevancy(const WordList &query, const SearchParameters &params, const int extraError, MatchResults &matchedDocuments) {
309+void Matcher::relevancyMatch(const WordList &query, const SearchParameters &params, const int extraError, MatchResults &matchedDocuments) {
310 map<DocumentID, double> docs;
311 BestIndexMatches bestIndexMatches;
312 double start, indexMatchEnd, gatherEnd, finish;
313@@ -340,7 +341,7 @@
314 // Try to search with ever growing error until we find enough matches.
315 for(int i=0; i<maxIterations; i++) {
316 MatchResults matches;
317- matchWithRelevancy(query, params, i*increment, matches);
318+ relevancyMatch(query, params, i*increment, matches);
319 if(matches.size() >= minMatches || i == maxIterations-1) {
320 allMatches.addResults(matches);
321 break;
322
323=== added file 'src/libcolumbus.map'
324--- src/libcolumbus.map 1970-01-01 00:00:00 +0000
325+++ src/libcolumbus.map 2014-03-25 09:59:29 +0000
326@@ -0,0 +1,122 @@
327+{
328+global:
329+ extern "C++" {
330+ "Columbus::Matcher::Matcher()";
331+ "Columbus::Matcher::~Matcher()";
332+ Columbus::Matcher::match*;
333+ Columbus::Matcher::onlineMatch*;
334+ Columbus::Matcher::get*;
335+ Columbus::Matcher::operator*;
336+ Columbus::Matcher::index*;
337+ Columbus::Word::Word*;
338+ "Columbus::Word::~Word()";
339+ "Columbs::Word::length()";
340+ "Columbus::Word::asUtf8() const";
341+ Columbus::Word::toUtf8*;
342+ Columbus::Word::join*;
343+ Columbus::Word::operator*;
344+ "Columbus::Word::hash() const";
345+ Columbus::WordStore*;
346+ Columbus::Corpus*;
347+ Columbus::WordList*;
348+ Columbus::Document*;
349+ Columbus::MatchResults::MatchResults*;
350+ "Columbus::MatchResults::~MatchResults()";
351+ Columbus::MatchResults::operator*;
352+ Columbus::MatchResults::add*;
353+ Columbus::MatchResults::copyResult*;
354+ "Columbus::MatchResults::size() const";
355+ Columbus::MatchResults::get*;
356+
357+ "Columbus::ErrorValues::ErrorValues()";
358+ "Columbus::ErrorValues::~ErrorValues()";
359+ "Columbus::ErrorValues::getInsertionError() const";
360+ "Columbus::ErrorValues::getDeletionError() const";
361+ "Columbus::ErrorValues::getEndDeletionError() const";
362+ Columbus::ErrorValues::getStartInsertionError*;
363+ "Columbus::ErrorValues::getTransposeError() const";
364+ "Columbus::ErrorValues::setInsertionError(const int)";
365+ "Columbus::ErrorValues::setDeletionError(const int)";
366+ "Columbus::ErrorValues::setEndDeletionError(const int)";
367+ "Columbus::ErrorValues::setStartInsertionError(const int)";
368+ "Columbus::ErrorValues::setTransposeError(const int)";
369+ Columbus::ErrorValues::setSubstringStartLimit*;
370+ Columbus::ErrorValues::getSubstituteError*;
371+ "Columbus::ErrorValues::getDefaultError()";
372+ "Columbus::ErrorValues::getDefaultGroupError()";
373+ "Columbus::ErrorValues::getDefaultTypoError()";
374+ "Columbus::ErrorValues::getSubstringDefaultEndDeletionError()";
375+ "Columbus::ErrorValues::getSubstringDefaultStartInsertionError()";
376+ Columbus::ErrorValues::setError*;
377+ Columbus::ErrorValues::setGroupError*;
378+ Columbus::ErrorValues::addAccents*;
379+ "Columbus::ErrorValues::addKeyboardErrors()";
380+ "Columbus::ErrorValues::addNumberpadErrors()";
381+ "Columbus::ErrorValues::addStandardErrors()";
382+ Columbus::ErrorValues::isInGroup*;
383+ "Columbus::ErrorValues::clearErrors()";
384+ "Columbus::ErrorValues::setSubstringMode()";
385+
386+ "Columbus::IndexMatches::IndexMatches()";
387+ "Columbus::IndexMatches::~IndexMatches()";
388+
389+ "Columbus::IndexMatches::size() const";
390+ Columbus::IndexMatches::getMatch*;
391+ Columbus::IndexMatches::getQuery*;
392+ Columbus::IndexMatches::getMatchError*;
393+ "Columbus::IndexMatches::clear()";
394+
395+ Columbus::IndexWeights*;
396+ "Columbus::LevenshteinIndex::LevenshteinIndex()";
397+ "Columbus::LevenshteinIndex::~LevenshteinIndex()";
398+ "Columbus::LevenshteinIndex::getDefaultError()";
399+ Columbus::LevenshteinIndex::insertWord*;
400+ Columbus::LevenshteinIndex::hasWord*;
401+ Columbus::LevenshteinIndex::findWords*;
402+ Columbus::LevenshteinIndex::wordCount*;
403+ "Columbus::LevenshteinIndex::maxCount() const";
404+ "Columbus::LevenshteinIndex::numNodes() const";
405+ "Columbus::LevenshteinIndex::numWords() const";
406+ Columbus::SearchParameters*;
407+ Columbus::ResultFilter*;
408+ "Columbus::hiresTimestamp()";
409+ "Columbus::splitToWords(char const*)";
410+ };
411+ col_word_new;
412+ col_word_delete;
413+ col_word_length;
414+ col_word_as_utf8;
415+
416+ col_document_new;
417+ col_document_delete;
418+ col_document_get_id;
419+ col_document_add_text;
420+
421+ col_matcher_new;
422+ col_matcher_delete;
423+ col_matcher_index;
424+ col_matcher_match;
425+ col_matcher_get_error_values;
426+ col_matcher_get_index_weights;
427+
428+ col_match_results_new;
429+ col_match_results_delete;
430+ col_match_results_size;
431+ col_match_results_get_id;
432+ col_match_results_get_relevancy;
433+
434+ col_corpus_new;
435+ col_corpus_delete;
436+ col_corpus_add_document;
437+
438+ col_index_weights_set_weight;
439+ col_index_weights_get_weight;
440+
441+ col_error_values_add_standard_errors;
442+ col_error_values_set_substring_mode;
443+
444+local:
445+ extern "C++" {
446+ *;
447+ };
448+};
449
450=== modified file 'test/CMakeLists.txt'
451--- test/CMakeLists.txt 2013-06-14 12:23:15 +0000
452+++ test/CMakeLists.txt 2014-03-25 09:59:29 +0000
453@@ -4,7 +4,11 @@
454 add_test(${tname} ${tname})
455 endmacro()
456
457-coltest(trie TrieTest.cc)
458+# Trie is an internal class whose symbols are hidden
459+# so we need to add the source manually.
460+add_executable(trie TrieTest.cc ../src/Trie.cc)
461+target_link_libraries(trie ${COL_LIB_BASENAME})
462+add_test(trie trie)
463 coltest(levtrie LevTrieTest.cc)
464 coltest(levindex LevIndexTest.cc)
465 coltest(custom_error CustomErrorTest.cc)

Subscribers

People subscribed via source and target branches

to all changes: