Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit e3390ed

Browse files
tcm-marceltcm-marcel
authored
Merge branch 'master' into junit
2 parents 642d027 + 19dcdfe commit e3390ed

33 files changed

+782
-819
lines changed

‎script/installation/create_certificates_test.sh

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎src/include/optimizer/memo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Memo {
5454
GroupExpression* InsertExpression(std::shared_ptr<GroupExpression> gexpr,
5555
GroupID target_group, bool enforced);
5656

57-
const std::vector<std::unique_ptr<Group>>& Groups() const;
57+
std::vector<std::unique_ptr<Group>>& Groups();
5858

5959
Group* GetGroupByID(GroupID id);
6060

‎src/include/optimizer/optimizer.h

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// Identification: src/include/optimizer/optimizer.h
88
//
9-
// Copyright (c) 2015-16, Carnegie Mellon University Database Group
9+
// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
1010
//
1111
//===----------------------------------------------------------------------===//
1212

@@ -81,6 +81,19 @@ class Optimizer : public AbstractOptimizer {
8181

8282
void Reset() override;
8383

84+
OptimizerMetadata &GetMetadata() { return metadata_; }
85+
86+
/* For test purposes only */
87+
std::shared_ptr<GroupExpression> TestInsertQueryTree(parser::SQLStatement *tree,
88+
concurrency::TransactionContext *txn) {
89+
return InsertQueryTree(tree, txn);
90+
}
91+
/* For test purposes only */
92+
void TestExecuteTaskStack(OptimizerTaskStack &task_stack, int root_group_id,
93+
std::shared_ptr<OptimizeContext> root_context) {
94+
return ExecuteTaskStack(task_stack, root_group_id, root_context);
95+
}
96+
8497
private:
8598
/* HandleDDLStatement - Check and handle DDL statment (currently only support
8699
*CREATE), set

‎src/include/optimizer/rule.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// Identification: src/include/optimizer/rule.h
88
//
9-
// Copyright (c) 2015-16, Carnegie Mellon University Database Group
9+
// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
1010
//
1111
//===----------------------------------------------------------------------===//
1212

@@ -146,6 +146,10 @@ class RuleSet {
146146
return rewrite_rules_map_[static_cast<uint32_t>(set)];
147147
}
148148

149+
std::unordered_map<uint32_t, std::vector<std::unique_ptr<Rule>>> &GetRewriteRulesMap() { return rewrite_rules_map_; }
150+
151+
std::vector<std::unique_ptr<Rule>> &GetPredicatePushDownRules() { return predicate_push_down_rules_; }
152+
149153
private:
150154
std::vector<std::unique_ptr<Rule>> transformation_rules_;
151155
std::vector<std::unique_ptr<Rule>> implementation_rules_;

‎src/network/peloton_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void PelotonServer::SSLInit() {
118118
}
119119
// TODO(Yuchen): change this.
120120
// load trusted CA certificates (peer authentication)
121-
if (SSL_CTX_load_verify_locations(ssl_context, certificate_file_.c_str(),
121+
if (SSL_CTX_load_verify_locations(ssl_context, root_cert_file_.c_str(),
122122
nullptr) != 1) {
123123
LOG_WARN("Exception when loading root_crt!");
124124
SetSSLLevel(SSLLevel::SSL_PREFER);

‎src/optimizer/memo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ GroupExpression *Memo::InsertExpression(std::shared_ptr<GroupExpression> gexpr,
6363
}
6464
}
6565

66-
const std::vector<std::unique_ptr<Group>> &Memo::Groups() const {
66+
std::vector<std::unique_ptr<Group>> &Memo::Groups() {
6767
return groups_;
6868
}
6969

‎test/network/ssl/root.crt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDDzCCAfegAwIBAgIJALnYXsYu6xTqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
3+
BAMME3Jvb3QueW91cmRvbWFpbi5jb20wHhcNMTgwMzI3MjAwNTM5WhcNMjgwMzI0
4+
MjAwNTM5WjAeMRwwGgYDVQQDDBNyb290LnlvdXJkb21haW4uY29tMIIBIjANBgkq
5+
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+bP/zPanodNjwRT07JHxeXGhUQGdWbgM
6+
lXa30aYqM3JYsMyumXukNhAI0ErEwX+CkXBsK3/+nuATm18s8FipIWuUeh19Sokh
7+
qeLaZiSrZEHHjsiLreVsoKI9bAuohPay2XI3hkLEeQ1Mo4yxRjU1BpktY4lhzvvf
8+
cTE1G/zRtGMAGKeng/S0aadjJbmFxEQB14x68FQg6UsfpukIizmZmgJ5uRnmhDgL
9+
xiMfYrGjSl+sH9+Pmi5D6jcYIC1P1qcVDB7q1xd+cktrfNCXVo8zaYlDOuAqhPoD
10+
TpTf0eK9aPXoiFtP30Ys8S3CjQA3ChuxX96oyNOxG87VNGVFRiyvfQIDAQABo1Aw
11+
TjAdBgNVHQ4EFgQUcHPnzTFlIDQL7qO4hWpr4c3g0fEwHwYDVR0jBBgwFoAUcHPn
12+
zTFlIDQL7qO4hWpr4c3g0fEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
13+
AQEA4ghpPKmNeSlFEwkfaqeum9DuvORlhrdBA/l64QlB3VwmeyA2O/bpTGuad3E6
14+
BsrR2DXH0k4lpoK/uzBGgUas5R0Tg2eiUD/uhHff/thU/yvoCD3o2K0cQXKCTYgq
15+
ct25OLMNxf2sHN8VD64AJnvF6yIv0ptBkF2Iqcn5486f5pJgs48MhJcSjFZYpjvo
16+
T54vh+U6DLT0dPIa5JJOhBQIe6LYuJDwZH84Fh3lGKip5OWT1RfuTHKViz5fL+lX
17+
eQqzL9kA9zm593Z6ltvVdSTxndBW1JYgL9opMB7wrvuEdGUECXzZJWioO9EP/yV2
18+
ekprwI05kJhh2fqrduTuIq30HQ==
19+
-----END CERTIFICATE-----

‎test/network/ssl/root.key

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD5s//M9qeh02PB
3+
FPTskfF5caFRAZ1ZuAyVdrfRpiozcliwzK6Ze6Q2EAjQSsTBf4KRcGwrf/6e4BOb
4+
XyzwWKkha5R6HX1KiSGp4tpmJKtkQceOyIut5Wygoj1sC6iE9rLZcjeGQsR5DUyj
5+
jLFGNTUGmS1jiWHO+99xMTUb/NG0YwAYp6eD9LRpp2MluYXERAHXjHrwVCDpSx+m
6+
6QiLOZmaAnm5GeaEOAvGIx9isaNKX6wf34+aLkPqNxggLU/WpxUMHurXF35yS2t8
7+
0JdWjzNpiUM64CqE+gNOlN/R4r1o9eiIW0/fRizxLcKNADcKG7Ff3qjI07EbztU0
8+
ZUVGLK99AgMBAAECggEBAKukQEyqq9YAEczyU92eAGfjZOji/D9k1TmUTozM9KtC
9+
iZaWS9py9BC5euV6z77WoHDK34ATTnn1O2UMyj44I6I2aex7AtnOY5Z8unWF9U5I
10+
LR2H2wPg9YeBnkj7xo4Hai8wZNxkXtt6+dheaKkC//0WI+4MzG/UEOak1YX0hk3A
11+
eAOldQdPAKs4tMiTaj47bXRkXTNvKertmk7mrQewI2GHs8T3jJuHInIXv4tbyMCo
12+
Y9PGqufFw+PmcYy10h0RRgwqQOdcuopSArtIP9OoG7jiM/yFSFG83z7bQ3a8aDoo
13+
lrJsk3IcW+XVDOoTwDpgNdJtQ3671VYc30N5r+pJHMECgYEA/em3T7zJoJI4maFK
14+
vuFq5e2sBJdKz+iMBx5ZSOOP9J0O3iWykbE0r7H4GPBFM8P2wnqlZeQM7iFmFTAR
15+
PJT+u8rucfR1Y3HrVgFtWEG17YyRs9yn+sEW+Rwnc0RociuFL0xJlJNvkbhWVKSg
16+
1SopWdJ/x7nTIWfLcjgSyJtihq0CgYEA+8FswZAUej+LHBdOgvUF8oQhCvaDabX1
17+
i89SlgzAVFXc11NaI3bBhSKPreMcE3CmYqhYHNIReI2YWjZEJRtB5QMzYxU77OW+
18+
OSaP5oRfQenpo132VKbHbAgrALe8KYy7avYHRrS/bTJehRqQaTL2dflKUc8gc8dY
19+
N0RCgryGdhECgYBoAL9RLeb4mmwMoYBYR0TeAUggaUf/eSVCFTBFJtDkRSC95XsL
20+
KiaGgMM6k9AEsBP2/P2aipqxP4Ts0M9+nRjqGukoTBV5MkRO6i67o869CoLzxUIY
21+
99ZNGzcdg7u0aBcZlInfDbT5XyQdb4FhTu+5Fvu392l/mWA/3K/085Cb0QKBgQDS
22+
RKYiMMV5qTL1vl2bsSxLdqHmdyghFZHFON7AZlwI1EIEMiDZ9+j/2nLoiAQ+FFtT
23+
kUkuoSFob9LsneBioZZywS6dNfH8FZLARv3vSWYKNmUmRmdkInvzNgs8qTjl9x3d
24+
4ykGnBY6DNS3FQ3CX4dL12+ETpvLN5btafynFvCzEQKBgQCxTA32yitkjHs6qlZL
25+
Nhhs5bisM5upzbgHs3CuI83OnbdW9X9Wx1jVTEf4wFAvOUmwdVPvdrghZ0Dsd2mI
26+
/WKkWDYHnLqDw0CSmSz6w1N+9BwOI2LzPiWcqMo795DZCwkuKnDyuv79UmuH3ta5
27+
X/DANwRv0KqMTYddWJD56/59KA==
28+
-----END PRIVATE KEY-----

‎test/network/ssl/root_test.crt

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎test/network/ssl/server.crt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIICujCCAaICCQCGyfkOWMMn2jANBgkqhkiG9w0BAQsFADAeMRwwGgYDVQQDDBNy
3+
b290LnlvdXJkb21haW4uY29tMB4XDTE4MDMyNzIwMDU0OFoXDTE5MDMyNzIwMDU0
4+
OFowIDEeMBwGA1UEAwwVZGJob3N0LnlvdXJkb21haW4uY29tMIIBIjANBgkqhkiG
5+
9w0BAQEFAAOCAQ8AMIIBCgKCAQEA75NjtSRgvXgreFG5Ud0UjMMPkkBUcPcHDTuR
6+
SqMkTld+TNw22mCadSVvYtbECwmbbBRvQ4PGaIvyeVH2+s5kUqrB6GHdy3pslhoG
7+
I5QTgMZHlJDDlL/dDKzMRnjAcf33wUnxB0ZgHZiQ1w6DCe8q59BoFc1lqb0jq64x
8+
TtBdmU/KdQT2Bk/3K3hHWhfLDIZnHPxptBBVm2sq7B+lpcAHbw7OGjv7AUyonzWC
9+
U1rvQpzbIs3vqEzNRu1KR6muuf5vNFY5DXchKitZiIwvj6El3Irkk9Of6NrOlSeI
10+
diSh2DS3i3z/mHCvbJc2d7Pbp0Hy0Jb27Ym9TtGJ68675lYTMQIDAQABMA0GCSqG
11+
SIb3DQEBCwUAA4IBAQBc5SNlFnyQLhJSF8iEVw3qevIEjhcgjSUazfNVMNKD+edN
12+
Q5v2w1yEp8sdFJVR9KYfpqj+h9BABG7toY1+COGjdbNM/0dVrwBle14s9ALmj5nR
13+
tAR13jyRsdbGR7C8P7n1KessHi/RBokLZjMkfiPlimWQjMeRsLsQVjf2XGk+ywOO
14+
57O0GktuEnN17MYa/D393+AL6fMFcmmuE4e7Hf6mN77ztWcWo/BAyc1tQXsQm4CQ
15+
KDk43LAUEA+ml12PuRjDVDeTDPrIte6YDM9Dxbr0vXj+NPZ4rVvPM5b+wxnZr7kQ
16+
2G7oYEHfI5QRpIw5fvVwRoNo0NhLHK6SlAKnzn3i
17+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)