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.

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

Jump to bottom

Merge upstream #26

Merged
merged 7 commits into from Apr 17, 2019
Merged

Merge upstream #26

merged 7 commits into from Apr 17, 2019

Conversation

jrolli
Copy link
Collaborator

@jrolli jrolli commented Apr 17, 2019

No description provided.

tli2 and others added 7 commits April 11, 2019 16:05
@tli2 @mbutrovich
Updates now retry on failure (cmu-db#345)
ae49a9c
@mbutrovich @tli2
Add std::string_view accessor for VarlenEntry (cmu-db#349)
00c7e9b
@tli2 @mbutrovich
Faster padding calculation (cmu-db#350)
4776b7a
@mbutrovich
BwTreeIndex::Scan and PRI accessor. (cmu-db#352)
57333d4
@GustavoAngulo @apavlo
Expression JSON (De)serialization (cmu-db#334)
ac328af 
* Abstract and Aggregate expression

* Remove unnecessary check

* Add expression types to switch statement

* Parameter Value Expression JSON (de)serialization

* Add JSON declaration macro to ParameterValueExpression

* Serialization for TupleValueExpression

* Fix tidy

* FunctionExpression, OperatorExpression

* TypeCastExpression

* case expr

* Change to use safer .at() json method

* ConstantValueExpression serialization (Wen)

* Fixes with ConstantValueExpression

* CompareExpression json (de)serialization

* Add ConjunctionExpression

* SubqueryExpression (needs fixing)

* Change AbstractExpression Copy to use shared_ptr

* Change Copy on expressions to use shared_ptr

* rename Parameter to BaseFunctionParameter

* Add Subquery Expression serialization and general fixes

* Improve test coverage
@tli2 @mbutrovich
Layout changes for Arrow (cmu-db#324)
eb102ad
@jrolli
Merge branch 'master' into schema_change
36adf88
@jrolli jrolli merged commit 7178975 into yashNaN:schema_change Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jrolli @tli2 @mbutrovich @GustavoAngulo