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

sync #2

Merged
merged 517 commits into from
Apr 10, 2021
Merged

sync #2

merged 517 commits into from
Apr 10, 2021

Conversation

flyarong
Copy link
Owner

Scope & Purpose

(Please describe the changes in this PR for reviewers - mandatory)

  • 💩 Bugfix (requires CHANGELOG entry)
  • 🍕 New feature (requires CHANGELOG entry, feature documentation and release notes)
  • 🔥 Performance improvement
  • 🔨 Refactoring/simplification
  • 📖 CHANGELOG entry made

Backports:

  • No backports required
  • Backports required for: (Please specify versions and link PRs)

Related Information

(Please reference tickets / specification / other PRs etc)

  • Docs PR:
  • Enterprise PR:
  • GitHub issue / Jira ticket number:
  • Design document:

Testing & Verification

(Please pick either of the following options)

  • This change is a trivial rework / code cleanup without any test coverage.
  • The behavior in this PR was manually tested
  • This change is already covered by existing tests, such as (please describe tests).
  • This PR adds tests that were used to verify all changes:
    • Added new C++ Unit tests
    • Added new integration tests (e.g. in shell_server / shell_server_aql)
    • Added new resilience tests (only if the feature is impacted by failovers)
  • There are tests in an external testing repository:
  • I ensured this code runs with ASan / TSan or other static verification tools

Link to Jenkins PR run:

Documentation

All new features should be accompanied by corresponding documentation.
Bugs and features should furthermore be documented in the CHANGELOG so that
support, end users, and other developers have a concise overview.

  • Added entry to Release Notes
  • Added a new section in the Manual
  • Added a new section in the HTTP API
  • Added Swagger examples for the HTTP API
  • Updated license information in LICENSES-OTHER-COMPONENTS.md for 3rd party libraries

External contributors / CLA Note

Please note that for legal reasons we require you to sign the Contributor Agreement
before we can accept your pull requests.

jsteemann and others added 30 commits February 5, 2021 18:09
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
Co-authored-by: jsteemann <jan@arangodb.com>
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
Co-authored-by: Max Neunhöffer <max@arangodb.com>
Co-authored-by: Max Neunhoeffer <max@arangodb.com>
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
Co-authored-by: Ignacio Rodriguez <ignacio@fastmicroservices.com>
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
…led (#13536)

Co-authored-by: Max Neunhöffer <max@arangodb.com>
Co-authored-by: Wilfried Goesgens <willi@arangodb.com>
Co-authored-by: Tobias Gödderz <tobias@arangodb.com>
…it's treated similarly to "type<irs::encryption>" (#13548)
* fix a crash in FieldIterator::next()

FieldIterator::next() unconditionally subtracts a value of 2 from the
end of its `_stack` member, which can make the operation point before
the beginning of the `_stack` storage of `_stack` has less than 2
members.
There is a follow-up check to check if the subtracted value is at least
a big as `_stack.begin()`, but this may be too late.
Using a debug STL build (`_GLIBCXX_DEBUG`) already crashes when
subtracting 2 from the container's end:

```
2021-02-10T01:28:38.955Z [============] runInArangod: Trying tests/js/server/aql/aql-arangosearch-count-optimization.js ...
/usr/include/c++/10/debug/safe_iterator.h:924:
In function:
    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<arangodb::iresearch::FieldIterator::Level*,
    std::__cxx1998::vector<arangodb::iresearch::FieldIterator::Level,
    std::allocator<arangodb::iresearch::FieldIterator::Level> > >,
    std::__debug::vector<arangodb::iresearch::FieldIterator::Level>,
    std::random_access_iterator_tag>::_Self __gnu_debug::operator-(const
    _Self&,
    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<arangodb::iresearch::FieldIterator::Level*,
    std::__cxx1998::vector<arangodb::iresearch::FieldIterator::Level,
    std::allocator<arangodb::iresearch::FieldIterator::Level> > >,
    std::__debug::vector<arangodb::iresearch::FieldIterator::Level>,
    std::random_access_iterator_tag>::difference_type)

Error: attempt to retreat a past-the-end iterator 2 steps, which falls
outside its valid range.

Objects involved in the operation:
    iterator @ 0x0x7f09585f93e0 {
      type = __gnu_cxx::__normal_iterator<arangodb::iresearch::FieldIterator::Level*, std::__cxx1998::vector<arangodb::iresearch::FieldIterator::Level, std::allocator<arangodb::iresearch::FieldIterator::Level> > > (mutable iterator);
      state = past-the-end;
      references sequence with type 'std::__debug::vector<arangodb::iresearch::FieldIterator::Level, std::allocator<arangodb::iresearch::FieldIterator::Level> >' @ 0x0x7f09585f9850
    }
```

* added CHANGELOG entry

* use pointers instead of iterators

Co-authored-by: Andrey Abramov <andrey@arangodb.com>
jsteemann and others added 29 commits March 31, 2021 16:03
Co-authored-by: Andrei Lobov <andrei.lobov@arangodb.com>
* Fix logging of urls when using `--log.level requests=debug`. There was an
  issue since v3.7.7 with the wrong URL being logged in request logging if
  multiple requests were sent over the same connection. In this case, the
  request logging only reported the first URL requested in the connection,
Fixes a memleak when running into an out-of-memory situation while repurposing an existing AqlItemBlock.
* wip

* 1st impl with embedded substreams

* wip

* made arena member

* poc implementation

* add string and boolean tests

* wip

* cleanup

* add gtests

* fix build

* use functors for reset

* fix file name casing

* another fix

* adress review comments

* fix mac build warnings

* adress review comments
…on (#13463)

Co-authored-by: Jan <jsteemann@users.noreply.github.com>
* add tests for the issue

* fix and more tests

* Update arangod/IResearch/IResearchAnalyzerFeature.cpp

Co-authored-by: Simran <Simran-B@users.noreply.github.com>

* fix mac build

* fix test run

Co-authored-by: Simran <Simran-B@users.noreply.github.com>
@flyarong flyarong merged commit c62e525 into flyarong:devel Apr 10, 2021
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.