Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
Practical-Cryptdb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhaozhen
Practical-Cryptdb
Commits
90c255d8
Commit
90c255d8
authored
Mar 02, 2018
by
yiwenshao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
able to call ashe sumfunction
parent
d595569b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
+13
-4
CURRENT.conf
conf/CURRENT.conf
+1
-1
Analysis.cc
main/Analysis.cc
+2
-1
rewrite_ds.hh
main/rewrite_ds.hh
+1
-0
rewrite_sum.cc
main/rewrite_sum.cc
+9
-2
No files found.
conf/CURRENT.conf
View file @
90c255d8
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
[
onions
for
num
]
[
onions
for
num
]
oDET
:
DET
oDET
:
DET
oOPE
:
OPE
oOPE
:
OPE
oAGG
:
HOM
#
oAGG: HOM
oASHE
:
ASHE
oASHE
:
ASHE
[
end
]
[
end
]
...
...
main/Analysis.cc
View file @
90c255d8
...
@@ -196,7 +196,8 @@ OLK EncSet::extract_singleton() const
...
@@ -196,7 +196,8 @@ OLK EncSet::extract_singleton() const
static
bool
static
bool
needsSalt
(
SECLEVEL
l
)
needsSalt
(
SECLEVEL
l
)
{
{
return
l
==
SECLEVEL
::
RND
||
l
==
SECLEVEL
::
ASHE
;
// return l == SECLEVEL::RND||l==SECLEVEL::ASHE;
return
l
==
SECLEVEL
::
RND
;
}
}
bool
bool
...
...
main/rewrite_ds.hh
View file @
90c255d8
...
@@ -147,6 +147,7 @@ const EncSet ADD_EncSet = {
...
@@ -147,6 +147,7 @@ const EncSet ADD_EncSet = {
{
{
{
oPLAIN
,
LevelFieldPair
(
SECLEVEL
::
PLAINVAL
,
NULL
)},
{
oPLAIN
,
LevelFieldPair
(
SECLEVEL
::
PLAINVAL
,
NULL
)},
{
oAGG
,
LevelFieldPair
(
SECLEVEL
::
HOM
,
NULL
)},
{
oAGG
,
LevelFieldPair
(
SECLEVEL
::
HOM
,
NULL
)},
{
oASHE
,
LevelFieldPair
(
SECLEVEL
::
ASHE
,
NULL
)}
}
}
};
};
...
...
main/rewrite_sum.cc
View file @
90c255d8
...
@@ -200,10 +200,17 @@ class CItemSum : public CItemSubtypeST<Item_sum_sum, SFT> {
...
@@ -200,10 +200,17 @@ class CItemSum : public CItemSubtypeST<Item_sum_sum, SFT> {
TEST_UnexpectedSecurityLevel
(
oAGG
,
SECLEVEL
::
HOM
,
TEST_UnexpectedSecurityLevel
(
oAGG
,
SECLEVEL
::
HOM
,
el
.
level
());
el
.
level
());
return
static_cast
<
const
HOM
&>
(
el
).
sumUDA
(
new_child
);
return
static_cast
<
const
HOM
&>
(
el
).
sumUDA
(
new_child
);
}
else
if
(
oASHE
==
constr
.
o
)
{
OnionMeta
*
const
om
=
constr
.
key
->
getOnionMeta
(
oASHE
);
assert
(
om
);
EncLayer
const
&
el
=
a
.
getBackEncLayer
(
*
om
);
TEST_UnexpectedSecurityLevel
(
oASHE
,
SECLEVEL
::
ASHE
,
el
.
level
());
return
static_cast
<
const
ASHE
&>
(
el
).
sumUDA
(
new_child
);
}
else
{
}
else
{
TEST_UnexpectedSecurityLevel
(
constr
.
o
,
SECLEVEL
::
PLAINVAL
,
TEST_UnexpectedSecurityLevel
(
constr
.
o
,
SECLEVEL
::
PLAINVAL
,
constr
.
l
);
constr
.
l
);
// FIXME: we cannot blindly return Item_sum_sum because we may
// FIXME: we cannot blindly return Item_sum_sum because we may
// have an AVG(...)
// have an AVG(...)
// > account for ``Item_sum_avg''
// > account for ``Item_sum_avg''
...
@@ -238,7 +245,7 @@ class CItemAvg : public CItemSubtypeST<Item_sum_sum, SFT> {
...
@@ -238,7 +245,7 @@ class CItemAvg : public CItemSubtypeST<Item_sum_sum, SFT> {
if
(
i
.
has_with_distinct
())
{
if
(
i
.
has_with_distinct
())
{
UNIMPLEMENTED
;
UNIMPLEMENTED
;
}
}
//agg or ashe
const
EncSet
&
my_es
=
ADD_EncSet
;
const
EncSet
&
my_es
=
ADD_EncSet
;
const
EncSet
&
solution
=
my_es
.
intersect
(
childr_rp
[
0
]
->
es_out
);
const
EncSet
&
solution
=
my_es
.
intersect
(
childr_rp
[
0
]
->
es_out
);
const
std
::
string
&
why
=
"summation"
;
const
std
::
string
&
why
=
"summation"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment