Page MenuHomePhabricator
Differential D4490

[Services] Adjust tunnelbroker with CMake changes
AbandonedPublicDraft
Actions

Authored by • jon on Jul 8 2022, 10:30 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 19, 1:25 PM
Unknown Object (File)
Sat, Apr 19, 11:40 AM
Unknown Object (File)
Fri, Apr 18, 9:16 PM
Unknown Object (File)
Fri, Apr 18, 9:03 PM
Unknown Object (File)
Fri, Apr 18, 10:06 AM
Unknown Object (File)
Tue, Apr 8, 7:18 PM
Unknown Object (File)
Tue, Apr 8, 7:18 PM
Unknown Object (File)
Tue, Apr 8, 7:18 PM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• karol
tomek

Details

Reviewers
• max
• karol
atul
Summary

native/cpp can now be referenced directly, including
the generated protobuf files

DatabaseManager.h had the relevant include paths moved from the DatabaseEntitiesTools.h into it, as DatabaseEntitiesTools.h was moved to the shared directory

Depends on D4489

Test Plan
nix develop
cd services/tunnelbroker && mkdir build && cd build && cmake .. && make

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• jon created this revision.Jul 8 2022, 10:30 PM
Herald added subscribers: • abosh, • karol, atul and 3 others. · View Herald TranscriptJul 8 2022, 10:30 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Jul 8 2022, 10:30 PM
Harbormaster failed remote builds in B10431: Diff 14375!
• jon added a child revision: D4495: [Nix] Package tunnelbroker.Jul 9 2022, 12:34 AM
• jon updated this revision to Diff 14419.Jul 12 2022, 6:20 PM

Adjust usage of grpc cmake project with refactor

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 12 2022, 6:22 PM
Harbormaster failed remote builds in B10472: Diff 14419!
• jon edited the summary of this revision. (Show Details)Jul 13 2022, 12:22 PM
• jon added reviewers: • max, • karol, atul.
• jon updated this revision to Diff 14902.Jul 25 2022, 9:02 PM

Rebase

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 25 2022, 9:03 PM
Harbormaster failed remote builds in B10839: Diff 14902!
• jon mentioned this in D4624: [blob] Use `FetchContent_Declare` to pull in `glog`.Jul 25 2022, 9:07 PM
• jon added a child revision: D4493: [Services] Update blob CMake project.Jul 26 2022, 8:23 AM
• jon mentioned this in D4671: [Services] Update tunnelbroker Dockerfile & cmake.Jul 28 2022, 6:26 PM
• jon abandoned this revision.Jul 28 2022, 6:26 PM

Most of these fixes were moved into https://phab.comm.dev/D4671

• jon removed a child revision: D4493: [Services] Update blob CMake project.Jul 28 2022, 6:27 PM
• jon removed a parent revision: D4489: [Services] Export shared services cpp as CMake Project.

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
83 lines
src/
Database/
4 lines
Service/
4 lines

Diff 14375

View Options

services/tunnelbroker/CMakeLists.txt

Show All 20 Linesclass SearchIndex {
partialTextIndex: { [token: string]: Set<string> }; partialTextIndex: { [token: string]: Set<string> };
constructor() { constructor() {
this.tokenize = new Tokenizer().words(); this.tokenize = new Tokenizer().words();
this.fullTextIndex = {}; this.fullTextIndex = {};
this.partialTextIndex = {}; this.partialTextIndex = {};
} }
addEntry(id: string, rawText: string) { addAllPrefixes(id: string, value: string): void {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
if (this.fullTextIndex[value] === undefined) { if (this.fullTextIndex[value] === undefined) {
this.fullTextIndex[value] = new Set(); this.fullTextIndex[value] = new Set();
} }
this.fullTextIndex[value].add(id); this.fullTextIndex[value].add(id);
let partialString = ''; let partialString = '';
for (let i = 0; i < value.length; i++) { for (let i = 0; i < value.length; i++) {
const char = value[i]; const char = value[i];
partialString += char; partialString += char;
// TODO probably should do some stopwords here // TODO probably should do some stopwords here
if (this.partialTextIndex[partialString] === undefined) { if (this.partialTextIndex[partialString] === undefined) {
this.partialTextIndex[partialString] = new Set(); this.partialTextIndex[partialString] = new Set();
} }
this.partialTextIndex[partialString].add(id); this.partialTextIndex[partialString].add(id);
} }
} }
addEntry(id: string, rawText: string) {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
this.addAllPrefixes(id, value);
}
} }
getSearchResults(query: string): string[] { getSearchResults(query: string): string[] {
const keywords = this.tokenize(query); const keywords = this.tokenize(query);
if (keywords.length === 0) { if (keywords.length === 0) {
return []; return [];
} }
Show All 27 Lines
View Options

services/tunnelbroker/src/Database/DatabaseEntitiesTools.h

Show All 20 Linesclass SearchIndex {
partialTextIndex: { [token: string]: Set<string> }; partialTextIndex: { [token: string]: Set<string> };
constructor() { constructor() {
this.tokenize = new Tokenizer().words(); this.tokenize = new Tokenizer().words();
this.fullTextIndex = {}; this.fullTextIndex = {};
this.partialTextIndex = {}; this.partialTextIndex = {};
} }
addEntry(id: string, rawText: string) { addAllPrefixes(id: string, value: string): void {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
if (this.fullTextIndex[value] === undefined) { if (this.fullTextIndex[value] === undefined) {
this.fullTextIndex[value] = new Set(); this.fullTextIndex[value] = new Set();
} }
this.fullTextIndex[value].add(id); this.fullTextIndex[value].add(id);
let partialString = ''; let partialString = '';
for (let i = 0; i < value.length; i++) { for (let i = 0; i < value.length; i++) {
const char = value[i]; const char = value[i];
partialString += char; partialString += char;
// TODO probably should do some stopwords here // TODO probably should do some stopwords here
if (this.partialTextIndex[partialString] === undefined) { if (this.partialTextIndex[partialString] === undefined) {
this.partialTextIndex[partialString] = new Set(); this.partialTextIndex[partialString] = new Set();
} }
this.partialTextIndex[partialString].add(id); this.partialTextIndex[partialString].add(id);
} }
} }
addEntry(id: string, rawText: string) {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
this.addAllPrefixes(id, value);
}
} }
getSearchResults(query: string): string[] { getSearchResults(query: string): string[] {
const keywords = this.tokenize(query); const keywords = this.tokenize(query);
if (keywords.length === 0) { if (keywords.length === 0) {
return []; return [];
} }
Show All 27 Lines
View Options

services/tunnelbroker/src/Database/DatabaseManager.h

Show All 20 Linesclass SearchIndex {
partialTextIndex: { [token: string]: Set<string> }; partialTextIndex: { [token: string]: Set<string> };
constructor() { constructor() {
this.tokenize = new Tokenizer().words(); this.tokenize = new Tokenizer().words();
this.fullTextIndex = {}; this.fullTextIndex = {};
this.partialTextIndex = {}; this.partialTextIndex = {};
} }
addEntry(id: string, rawText: string) { addAllPrefixes(id: string, value: string): void {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
if (this.fullTextIndex[value] === undefined) { if (this.fullTextIndex[value] === undefined) {
this.fullTextIndex[value] = new Set(); this.fullTextIndex[value] = new Set();
} }
this.fullTextIndex[value].add(id); this.fullTextIndex[value].add(id);
let partialString = ''; let partialString = '';
for (let i = 0; i < value.length; i++) { for (let i = 0; i < value.length; i++) {
const char = value[i]; const char = value[i];
partialString += char; partialString += char;
// TODO probably should do some stopwords here // TODO probably should do some stopwords here
if (this.partialTextIndex[partialString] === undefined) { if (this.partialTextIndex[partialString] === undefined) {
this.partialTextIndex[partialString] = new Set(); this.partialTextIndex[partialString] = new Set();
} }
this.partialTextIndex[partialString].add(id); this.partialTextIndex[partialString].add(id);
} }
} }
addEntry(id: string, rawText: string) {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
this.addAllPrefixes(id, value);
}
} }
getSearchResults(query: string): string[] { getSearchResults(query: string): string[] {
const keywords = this.tokenize(query); const keywords = this.tokenize(query);
if (keywords.length === 0) { if (keywords.length === 0) {
return []; return [];
} }
Show All 27 Lines
View Options

services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h

Show All 20 Linesclass SearchIndex {
partialTextIndex: { [token: string]: Set<string> }; partialTextIndex: { [token: string]: Set<string> };
constructor() { constructor() {
this.tokenize = new Tokenizer().words(); this.tokenize = new Tokenizer().words();
this.fullTextIndex = {}; this.fullTextIndex = {};
this.partialTextIndex = {}; this.partialTextIndex = {};
} }
addEntry(id: string, rawText: string) { addAllPrefixes(id: string, value: string): void {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
if (this.fullTextIndex[value] === undefined) { if (this.fullTextIndex[value] === undefined) {
this.fullTextIndex[value] = new Set(); this.fullTextIndex[value] = new Set();
} }
this.fullTextIndex[value].add(id); this.fullTextIndex[value].add(id);
let partialString = ''; let partialString = '';
for (let i = 0; i < value.length; i++) { for (let i = 0; i < value.length; i++) {
const char = value[i]; const char = value[i];
partialString += char; partialString += char;
// TODO probably should do some stopwords here // TODO probably should do some stopwords here
if (this.partialTextIndex[partialString] === undefined) { if (this.partialTextIndex[partialString] === undefined) {
this.partialTextIndex[partialString] = new Set(); this.partialTextIndex[partialString] = new Set();
} }
this.partialTextIndex[partialString].add(id); this.partialTextIndex[partialString].add(id);
} }
} }
addEntry(id: string, rawText: string) {
const keywords = this.tokenize(rawText);
for (const keyword of keywords) {
const value = keyword.value.toLowerCase();
this.addAllPrefixes(id, value);
}
} }
getSearchResults(query: string): string[] { getSearchResults(query: string): string[] {
const keywords = this.tokenize(query); const keywords = this.tokenize(query);
if (keywords.length === 0) { if (keywords.length === 0) {
return []; return [];
} }
Show All 27 Lines