Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CBL-4719: ReplicatorAPITest::options() Set proxy settings from _sg.proxy #1843

Merged
merged 2 commits into from
Jul 21, 2023

Conversation

callumbirks
Copy link
Contributor

I think I've set the proxy options appropriately, but I don't believe we have any proxy tests? So it might be good to add some alongside this PR, if possible.

@cbl-bot
Copy link

cbl-bot commented Jul 18, 2023

Code Coverage Results:

Type Percentage
branches 68.36
functions 79.53
instantiations 36.13
lines 79.16
regions 75.88

@jianminzhao
Copy link
Contributor

Where is this used? Do you put it up based on doc or current use in the code base? Adding a comment will be helpful.

proxyType = slice(kC4ProxyTypeHTTP);
case ProxyType::HTTPS:
proxyType = slice(kC4ProxyTypeHTTPS);
// TODO: Once SOCKS is implemented (CBL-4715)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not :D

@callumbirks
Copy link
Contributor Author

Where is this used? Do you put it up based on doc or current use in the code base? Adding a comment will be helpful.

It's not currently used, as it doesn't seem we have any tests for proxy. But if we do add any proxy tests, they should ™ just work, as this will set that up in ReplicatorAPITest constructor based on what's been put in _sg (SG connection settings).

@callumbirks callumbirks merged commit 4959378 into master Jul 21, 2023
8 checks passed
@callumbirks callumbirks deleted the CBL-4719 branch July 21, 2023 13:38
jianminzhao added a commit that referenced this pull request Jul 24, 2023
CBL-4621: Include LogFileConfiguration details in file logs (#1845)
CBL-4610: Missing some log files
CBL-4719: ReplicatorAPITest::options() Set proxy settings from _sg.proxy (#1843)
CBL-4412: Enhance checkpoint resolution algorithm when local and remote checkpoint are mismatched. (#1842)
CBL-4331: Remove C4QueryOptions parameter from c4query_run

⚠️ API changed for `c4query_run` -> `C4QueryOptions options` parameter has been removed. (CBL-4331)
jianminzhao added a commit that referenced this pull request Jul 30, 2023
CBL-4762: SQL++ column title for "*" to use collection name rather than collection path. (#1852)
- Updated replicator protocol docs to discuss version vectors
- Use C++ std::system_clock for RealClockSource
CBL-4639: Use FTS match() in the WHERE clause of LEFT OUTER JOINS not… (#1846)
- Updated version vector implementation

This one includes the fix, CBL-4762, of an issue discovered in the previously staged commit that goes to
Build 3.2.0-79:
CBL-4621: Include LogFileConfiguration details in file logs (#1845)
CBL-4610: Missing some log files
CBL-4719: ReplicatorAPITest::options() Set proxy settings from _sg.proxy (#1843)
CBL-4412: Enhance checkpoint resolution algorithm when local and remote checkpoint are mismatched. (#1842)
CBL-4331: Remove C4QueryOptions parameter from c4query_run
⚠️ API changed for `c4query_run` -> `C4QueryOptions options` parameter has been removed. (CBL-4331)
jianminzhao added a commit that referenced this pull request Aug 8, 2023
CBL-4762: SQL++ column title for "*" to use collection name rather than collection path. (#1852)
        - Updated replicator protocol docs to discuss version vectors
        - Use C++ std::system_clock for RealClockSource
CBL-4639: Use FTS match() in the WHERE clause of LEFT OUTER JOINS not… (#1846)
        - Updated version vector implementation
CBL-4621: Include LogFileConfiguration details in file logs (#1845)
CBL-4610: Missing some log files
CBL-4719: ReplicatorAPITest::options() Set proxy settings from _sg.proxy (#1843)
CBL-4412: Enhance checkpoint resolution algorithm when local and remote checkpoint are mismatched. (#1842)
CBL-4331: Remove C4QueryOptions parameter from c4query_run

⚠️ API changed for `c4query_run` -> `C4QueryOptions options` parameter has been removed. (CBL-4331)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants