8000 slightly reorder boolean members to reduce struct sizes by jsteemann · Pull Request #9762 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

slightly reorder boolean members to reduce struct sizes #9762

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Aug 20, 2019
Merged

slightly reorder boolean members to reduce struct sizes #9762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcd5233
slightly reorder boolean members to reduce struct sizes
jsteemann Aug 19, 2019
9b46916
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/reo…
jsteemann Aug 20, 2019
474336c
pacify @dothebart
jsteemann Aug 20, 2019
9ad90da
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/reo…
jsteemann Aug 20, 2019
ef05912
apply suggestions by @mpoeter as well
jsteemann Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
apply suggestions by @mpoeter as well
  • Loading branch information
@jsteemann
jsteemann committed Aug 20, 2019
commit ef059128e37bd003fc3f2a0cf376e3811d72ae26
4 changes: 2 additions & 2 deletions arangod/Aql/DocumentProducingHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ struct DocumentProducingFunctionContext {
bool checkUniqueness)
: _inputRow(inputRow),
_outputRow(outputRow),
_outputRegister(outputRegister),
_trxPtr(trxPtr),
_projections(projections),
_coveringIndexAttributePositions(coveringIndexAttributePositions),
_numScanned(0),
_outputRegister(outputRegister),
_produceResult(produceResult),
_useRawDocumentPointers(useRawDocumentPointers),
_allowCoveringIndexOptimization(allowCoveringIndexOptimization),
Expand Down Expand Up @@ -176,7 +176,6 @@ struct DocumentProducingFunctionContext {
private:
InputAqlItemRow const& _inputRow;
OutputAqlItemRow* _outputRow;
RegisterId const _outputRegister;
transaction::Methods* const _trxPtr;
std::vector<std::string> const& _projections;
std::vector<size_t> const& _coveringIndexAttributePositions;
Expand All @@ -185,6 +184,7 @@ struct DocumentProducingFunctionContext {
/// @brief set of already returned documents. Used to make the result distinct
std::unordered_set<TRI_voc_rid_t> _alreadyReturned;

RegisterId const _outputRegister;
bool const _produceResult;
bool const _useRawDocumentPointers;
bool _allowCoveringIndexOptimization;
Expand Down
2 changes: 1 addition & 1 deletion arangod/Aql/EnumerateCollectionExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ EnumerateCollectionExecutorInfos::EnumerateCollectionExecutorInfos(
make_shared_unordered_set({outputRegister}),
nrInputRegisters, nrOutputRegisters,
std::move(registersToClear), std::move(registersToKeep)),
_outputRegisterId(outputRegister),
_engine(engine),
_collection(collection),
_outVariable(outVariable),
_trxPtr(trxPtr),
_projections(projections),
_coveringIndexAttributePositions(coveringIndexAttributePositions),
_outputRegisterId(outputRegister),
_useRawDocumentPointers(useRawDocumentPointers),
_produceResult(produceResult),
_random(random) {}
Expand Down
2 changes: 1 addition & 1 deletion arangod/Aql/EnumerateCollectionExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ class EnumerateCollectionExecutorInfos : public ExecutorInfos {
RegisterId getOutputRegisterId() const { return _outputRegisterId; }

private:
RegisterId _outputRegisterId;
ExecutionEngine* _engine;
Collection const* _collection;
Variable const* _outVariable;
transaction::Methods* _trxPtr;
std::vector<std::string> const& _projections;
std::vector<size_t> const& _coveringIndexAttributePositions;
RegisterId _outputRegisterId;
bool _useRawDocumentPointers;
bool _produceResult;
bool _random;
Expand Down
2 changes: 1 addition & 1 deletion arangod/Aql/IndexExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ IndexExecutorInfos::IndexExecutorInfos(
_condition(condition),
_ast(ast),
_options(options),
_outputRegisterId(outputRegister),
_engine(engine),
_collection(collection),
_outVariable(outVariable),
Expand All @@ -106,6 +105,7 @@ IndexExecutorInfos::IndexExecutorInfos(
_expInVars(std::move(expInVars)),
_expInRegs(std::move(expInRegs)),
_nonConstExpression(std::move(nonConstExpression)),
_outputRegisterId(outputRegister),
_hasMultipleExpansions(false),
_useRawDocumentPointers(useRawDocumentPointers),
_produceResult(produceResult),
Expand Down
3 changes: 2 additions & 1 deletion arangod/Aql/IndexExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ class IndexExecutorInfos : public ExecutorInfos {
/// @brief the index sort order - this is the same order for all indexes
IndexIteratorOptions _options;

RegisterId _outputRegisterId;
ExecutionEngine* _engine;
Collection const* _collection;
Variable const* _outVariable;
Expand All @@ -140,6 +139,8 @@ class IndexExecutorInfos : public ExecutorInfos {
std::vector<RegisterId> _expInRegs; // input registers for expression

std::vector<std::unique_ptr<NonConstExpression>> _nonConstExpression;

RegisterId _outputRegisterId;
/// @brief true if one of the indexes uses more than one expanded attribute,
Copy link
Contributor

Choose a reason for hiding this comment

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

Line 132 contains another RegisterId that should be moved here.

/// e.g. the index is on values[*].name and values[*].type
bool _hasMultipleExpansions;
Expand Down
0