Skip to content

Commit d75a13b

Browse files
tobyhedetobyhede
committed
feat: rename ore_64_8_v2 to ore_block_u64_8_256
1 parent bef9712 commit d75a13b

28 files changed

+630
-222
lines changed

‎DEVELOPMENT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,11 @@ These are transient runtime types, used internally by EQL functions and operator
319319

320320
- `eql_v2.blake3`
321321
- `eql_v2.unique_index`
322-
- `eql_v2.match`
322+
- `eql_v2.bloom_filter`
323323
- `eql_v2.ore_cllw_u64_8`
324324
- `eql_v2.ore_cllw_var_8`
325-
- `eql_v2.ore_64_8_v2`
326-
- `eql_v2.ore_64_8_v2_term`
325+
- `eql_v2.ore_block_u64_8_256`
326+
- `eql_v2.ore_block_u64_8_256_term`
327327

328328
The data in the column is converted into these types, when any operations are being performed on that encrypted data.
329329

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Data is stored in the PostgreSQL database as:
149149
},
150150
"k": "ct",
151151
"m": null,
152-
"o": null,
152+
"ob": null,
153153
"u": null,
154154
"v": 1
155155
}
@@ -261,7 +261,7 @@ SELECT * FROM users WHERE email = 'test@example.com';
261261

262262
### Full-text search
263263

264-
Enables basic full-text search on encrypted data using the `eql_v2.match` function.
264+
Enables basic full-text search on encrypted data using the `eql_v2.bloom_filter` function.
265265

266266
**Index configuration example:**
267267

@@ -279,7 +279,7 @@ SELECT eql_v2.add_search_config(
279279

280280
```sql
281281
SELECT * FROM users
282-
WHERE eql_v2.match(encrypted_email) @> eql_v2.match(
282+
WHERE eql_v2.bloom_filter(encrypted_email) @> eql_v2.bloom_filter(
283283
'{"v":1,"k":"pt","p":"test","i":{"t":"users","c":"encrypted_email"},"q":"match"}'
284284
);
285285
```
@@ -292,7 +292,7 @@ SELECT * FROM users WHERE email LIKE '%test%';
292292

293293
### Range queries
294294

295-
Enable range queries on encrypted data using the `eql_v2.ore_64_8_v2`, `eql_v2.ore_cllw_u64_8`, or `eql_v2.ore_cllw_var_8` functions. Supports:
295+
Enable range queries on encrypted data using the `eql_v2.ore_block_u64_8_256`, `eql_v2.ore_cllw_u64_8`, or `eql_v2.ore_cllw_var_8` functions. Supports:
296296

297297
- `ORDER BY`
298298
- `WHERE`
@@ -301,7 +301,7 @@ Enable range queries on encrypted data using the `eql_v2.ore_64_8_v2`, `eql_v2.o
301301

302302
```sql
303303
SELECT * FROM users
304-
WHERE eql_v2.ore_64_8_v2(encrypted_date) < eql_v2.ore_64_8_v2(
304+
WHERE eql_v2.ore_block_u64_8_256(encrypted_date) < eql_v2.ore_block_u64_8_256(
305305
'{"v":1,"k":"pt","p":"2023-10-05","i":{"t":"users","c":"encrypted_date"},"q":"ore"}'
306306
);
307307
```
@@ -316,7 +316,7 @@ SELECT * FROM users WHERE date < '2023-10-05';
316316

317317
```sql
318318
SELECT id FROM users
319-
ORDER BY eql_v2.ore_64_8_v2(encrypted_field) DESC;
319+
ORDER BY eql_v2.ore_block_u64_8_256(encrypted_field) DESC;
320320
```
321321

322322
Equivalent plaintext query:

‎SUPABASE.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ In EQL, PostgreSQL operators are an alias for a function, so the implementation
2424

2525
### Core Functions
2626

27-
| Function | Description | Example |
28-
| ---------------------------- | ---------------------------------------------------- | ----------------------------------------------- |
29-
| `eql_v2.ciphertext(val)` | Extract ciphertext from encrypted value | `SELECT eql_v2.ciphertext(encrypted_field)` |
30-
| `eql_v2.blake3(val)` | Extract blake3 hash from encrypted value | `SELECT eql_v2.blake3(encrypted_field)` |
31-
| `eql_v2.unique(val)` | Extract unique index from encrypted value | `SELECT eql_v2.unique(encrypted_field)` |
32-
| `eql_v2.match(val)` | Extract match index from encrypted value | `SELECT eql_v2.match(encrypted_field)` |
33-
| `eql_v2.ore_64_8_v2(val)` | Extract ORE index from encrypted value | `SELECT eql_v2.ore_64_8_v2(encrypted_field)` |
34-
| `eql_v2.ore_cllw_u64_8(val)` | Extract CLLW ORE index from encrypted value | `SELECT eql_v2.ore_cllw_u64_8(encrypted_field)` |
35-
| `eql_v2.ore_cllw_var_8(val)` | Extract variable CLLW ORE index from encrypted value | `SELECT eql_v2.ore_cllw_var_8(encrypted_field)` |
27+
| Function | Description | Exa mple |
28+
| --------------------------------- | --------------------------------------------------------- | ----------------------------------------------- |
29+
| `eql_v2.ciphertext(val)` | Extract ciphertext from encrypted value | `SELECT eql_v2.ciphertext (encrypted_field)` |
30+
| `eql_v2.blake3(val)` | Extract blake3 hash from encrypted value | `SELECT eql_v2.blake3( encrypted_field)` |
31+
| `eql_v2.unique(val)` | Extract unique index from encrypted value | `SELECT eql_v2.unique(encrypted_fie ld)` |
32+
| `eql_v2.bloom_filter(val)` | Extract match index from encrypted value | `SELECT eql_v2.bloom_filter(encrypted_field)` |
33+
| `eql_v2.ore_block_u64_8_256(val)` | Extract ORE index from encrypted value | `SELECT eql_v2.ore_block_u64_8_256(encrypted_field)` |
34+
| `eql_v2.ore_cllw_u64_8(val)` | Extract CLLW ORE index from encrypted value | `SELECT eql_v2.ore_cllw_u64_8(encrypted_fie ld)` |
35+
| `eql_v2.ore_cllw_var_8(val)` | Extract variable CLLW ORE index from encrypted value | `SELECT eql_v2.ore_cllw_var_8( encrypted_field)` |
3636

3737
### Aggregate Functions
3838

@@ -90,19 +90,17 @@ The behaviour of EQL's encrypted `LIKE` operators is slightly different to the b
9090
In EQL, the `LIKE` operator can be used on `match` indexes.
9191
Case sensitivity is determined by the [index term configuration](./docs/reference/INDEX.md#options-for-match-indexes-opts) of `match` indexes.
9292
A `match` index term can be configured to enable case sensitive searches with token filters (for example, `downcase` and `upcase`).
93-
The data is encrypted based on the index term configuration.
94-
The `LIKE` operation is always the same, even if the data is tokenised differently.
95-
The different operators are kept to preserve the semantics of SQL statements in client applications.
93+
The data is encrypted based on the index term configurat ion.
94+
The `LIKE` operation is always the same, even if the data is----- tokenised differently.
95+
The different operators are kept to preserve the semantics of SQL statements in client applications.
9696

97-
### `ORDER BY`
97+
### `ORDER BY`
9898

99-
Ordering requires wrapping the ordered column in the `eql_v2.order_by` function, like this:
99+
Ordering requires wrapping the ordered column in the `eql_v2.order_by` function, lik e this:
100100

101101
```sql
102102
SELECT * FROM users ORDER BY eql_v2.order_by(encrypted_created_at) DESC
103-
```
104-
105-
PostgreSQL uses operators when handling `ORDER BY` operations. The `eql_v2.order_by` function behaves in the same way as the comparison operators, using the appropriate index type (ore_64_8_v2, ore_cllw_u64_8, or ore_cllw_var_8) to determine the ordering.
103+
`` ` PostgreSQL uses operators when handling `ORDER BY` operations. The `eql_v2.order_by` function behaves in the same way as the comparison operators, using the appropriate index type (ore_block_u64_8_256 , ore_cllw_u64_8, or ore_cllw_var_8) to determine the ordering.
106104
107105
### JSONB Support
108106

‎docs/tutorials/GETTINGSTARTED.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ It creates an EQL payload that looks similar to this and inserts this into the e
327327
},
328328
"m": [42], // The ciphertext used for free text queries i.e match index
329329
"u": "unique ciphertext", // The ciphertext used for unique queries. i.e unique index
330-
"o": ["a", "b", "c"], // The ciphertext used for order or comparison queries. i.e ore index
330+
"ob": ["a", "b", "c"], // The ciphertext used for order or comparison queries. i.e ore index
331331
"v": 1
332332
}
333333
```
@@ -388,7 +388,7 @@ The json stored in the database looks similar to this:
388388
},
389389
"m": [42], // The ciphertext used for free text queries i.e match index
390390
"u": "unique ciphertext", // The ciphertext used for unique queries. i.e unique index
391-
"o": ["a", "b", "c"], // The ciphertext used for order or comparison queries. i.e ore index
391+
"ob": ["a", "b", "c"], // The ciphertext used for order or comparison queries. i.e ore index
392392
"v": 1
393393
}
394394
```

‎src/encrypted/aggregates.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ STRICT
1010
AS $$
1111
BEGIN
1212
PERFORM eql_v2.log('eql_v2.min');
13-
IF eql_v2.ore_64_8_v2(a) < eql_v2.ore_64_8_v2(b) THEN
13+
IF eql_v2.ore_block_u64_8_256(a) < eql_v2.ore_block_u64_8_256(b) THEN
1414
RETURN a;
1515
ELSE
1616
RETURN b;
@@ -32,7 +32,7 @@ STRICT
3232
AS $$
3333
BEGIN
3434
PERFORM eql_v2.log('eql_v2.max');
35-
IF eql_v2.ore_64_8_v2(a) > eql_v2.ore_64_8_v2(b) THEN
35+
IF eql_v2.ore_block_u64_8_256(a) > eql_v2.ore_block_u64_8_256(b) THEN
3636
RETURN a;
3737
ELSE
3838
RETURN b;

‎src/encrypted/aggregates_test.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ INSERT INTO agg_test (plain_int, enc_int) VALUES
1616
),
1717
(
1818
3,
19-
'{"c": "mBbJyWl%QyVQT_N?b~OpQj!$J7B7H2CK@gB#`36H312|)kY;SeM7R*dAl5{R*U)AI+$~k7(JPvj;hmQK^F_}g^7Zs^WuYa^B(7y{V{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "o": ["ccccccccb06565ebd23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384e9e378f4f5890c31ca9d115965a0e8fbf13ad8d1d33f88d360d5e2f9680fb158f98158443ffc769cd9aac94380f05e3226b785f58006e5b9da6b8d86a7441a88fd848099a2400ef59b494b0c30013568dc1be9bba560565fccb49309ba2ec3edcff6f9d7a67b519b3754b37b0025dff7592a6117949a04043c100353289628884fe06cb2099e7b4b49abea9797a73ee0b85283a5b6f69bcf45f87e6cd6d45ecfd1633903270781173ed9d31a682bba0e54ff355f456bf0c468e378e41cb54fcc074ad40fb4448f6fec892c1ecda15a5efffb8dde3a3b282865ac436d7e43d48d4327c439956733697d3f5b02ead4805a7f905bdae24c1b35252e34939676a07ddb5454c3580c7d76d792a97988e35142f43667112432623eda5126e9af2592dd"], "v": 1}'::jsonb::eql_v2_encrypted
19+
'{"c": "mBbJyWl%QyVQT_N?b~OpQj!$J7B7H2CK@gB#`36H312|)kY;SeM7R*dAl5{R*U)AI+$~k7(JPvj;hmQK^F_}g^7Zs^WuYa^B(7y{V{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "ob": ["ccccccccb06565ebd23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384e9e378f4f5890c31ca9d115965a0e8fbf13ad8d1d33f88d360d5e2f9680fb158f98158443ffc769cd9aac94380f05e3226b785f58006e5b9da6b8d86a7441a88fd848099a2400ef59b494b0c30013568dc1be9bba560565fccb49309ba2ec3edcff6f9d7a67b519b3754b37b0025dff7592a6117949a04043c100353289628884fe06cb2099e7b4b49abea9797a73ee0b85283a5b6f69bcf45f87e6cd6d45ecfd1633903270781173ed9d31a682bba0e54ff355f456bf0c468e378e41cb54fcc074ad40fb4448f6fec892c1ecda15a5efffb8dde3a3b282865ac436d7e43d48d4327c439956733697d3f5b02ead4805a7f905bdae24c1b35252e34939676a07ddb5454c3580c7d76d792a97988e35142f43667112432623eda5126e9af2592dd"], "v": 1}'::jsonb::eql_v2_encrypted
2020
),
2121
(
2222
5,
23-
'{"c": "mBbKSqWLK6yl>o%G%&x+2$jdg7F`-R(^>R1Q^wGod8-FZ5C$xFI4dN?Ap114=77xPZ9!cKxE}qmyXrhx#K`4ztbUrysQrOFqON6bV{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "o": ["ccccccccb065659dd23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384bec7bfb23290d7559fd8637b85ca7510cca465570029734ef0319c77177913ad84f54852bed2e2a67b6dafcab3eb70d3a2592414a43acc03703083cf1fa1984dfc0719337d5de4eefd0d137588641a0d38c771b77ab07ebab3fc9bfd7469c4222e1a8edee71188eeb24bfffcd82f711156381d8068223e3d75f5ba8a958182bc46a0ab58c29872cd17e559ed0b935a445249dbac5b51438cebaf9d28d5c8b67cd99f990d5295c1e37470ce5b33fe01eaf31d84c9a08b267c0e9e1aadfcce7f9e2253ababa71eaf1fec309dc988e454717a3c2e3bffb1c546a7195ecf274eb7d691abcf46a61e34d4c63c45d48831dc23aa11f981de692926cd1d1d77a340c9e54baf62da61d5f88960a93e120d3828f4053577b93b536cc9b05c889dcf171865"], "v": 1}'::jsonb::eql_v2_encrypted
23+
'{"c": "mBbKSqWLK6yl>o%G%&x+2$jdg7F`-R(^>R1Q^wGod8-FZ5C$xFI4dN?Ap114=77xPZ9!cKxE}qmyXrhx#K`4ztbUrysQrOFqON6bV{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "ob": ["ccccccccb065659dd23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384bec7bfb23290d7559fd8637b85ca7510cca465570029734ef0319c77177913ad84f54852bed2e2a67b6dafcab3eb70d3a2592414a43acc03703083cf1fa1984dfc0719337d5de4eefd0d137588641a0d38c771b77ab07ebab3fc9bfd7469c4222e1a8edee71188eeb24bfffcd82f711156381d8068223e3d75f5ba8a958182bc46a0ab58c29872cd17e559ed0b935a445249dbac5b51438cebaf9d28d5c8b67cd99f990d5295c1e37470ce5b33fe01eaf31d84c9a08b267c0e9e1aadfcce7f9e2253ababa71eaf1fec309dc988e454717a3c2e3bffb1c546a7195ecf274eb7d691abcf46a61e34d4c63c45d48831dc23aa11f981de692926cd1d1d77a340c9e54baf62da61d5f88960a93e120d3828f4053577b93b536cc9b05c889dcf171865"], "v": 1}'::jsonb::eql_v2_encrypted
2424
),
2525
(
2626
1,
27-
'{"c": "mBbJSy$p0fHEK%aOAOYi4PTJN7B@a-j{+xl7tffjGTN<-Znt3Zge#lGAX^WHzU`7ml<4vRHLKxoB%}N<H3?J~gR*ISwBlJ)X0By!V{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "o": ["ccccccccb0656502d23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384250ca116ef329616ddb341917699b9ea48901124a15a4547be1ff7c672c0c1bc6bb17e2a141f46138fc314f4bf8a55068bf031bc48f038c379e54cfbb1c64eb223c18c87cd68a91fb031905e11d9478f158b561399b527038efc594bfd9fb19c963a2778b75215e1d8933b08df04d1c62742fd48a4de310792031a70ca4b157bc218ab3fbadc6dc14b939422023331c03bcf4b673c5d261a19c3d13155cbaa1b84e9e90e389fa6973dde07fba08c13847006707488e288ce780d59700197452ebc68d22032ab03f7b445e45ed7abb1af34955199440f7db2c969c60b1eb49cdcd75d5e8f7de37848ddebb40df8e14d4b92910e15fedac3f61f22ef430805ba1bbf5fccc9fe792e4c0353beee48ca03ef23c7d3fab19e9aa218aefb44e6c26d70"], "v": 1}'::jsonb::eql_v2_encrypted
27+
'{"c": "mBbJSy$p0fHEK%aOAOYi4PTJN7B@a-j{+xl7tffjGTN<-Znt3Zge#lGAX^WHzU`7ml<4vRHLKxoB%}N<H3?J~gR*ISwBlJ)X0By!V{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "ob": ["ccccccccb0656502d23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384250ca116ef329616ddb341917699b9ea48901124a15a4547be1ff7c672c0c1bc6bb17e2a141f46138fc314f4bf8a55068bf031bc48f038c379e54cfbb1c64eb223c18c87cd68a91fb031905e11d9478f158b561399b527038efc594bfd9fb19c963a2778b75215e1d8933b08df04d1c62742fd48a4de310792031a70ca4b157bc218ab3fbadc6dc14b939422023331c03bcf4b673c5d261a19c3d13155cbaa1b84e9e90e389fa6973dde07fba08c13847006707488e288ce780d59700197452ebc68d22032ab03f7b445e45ed7abb1af34955199440f7db2c969c60b1eb49cdcd75d5e8f7de37848ddebb40df8e14d4b92910e15fedac3f61f22ef430805ba1bbf5fccc9fe792e4c0353beee48ca03ef23c7d3fab19e9aa218aefb44e6c26d70"], "v": 1}'::jsonb::eql_v2_encrypted
2828
),
2929
(
3030
3,
31-
'{"c": "mBbLa7Cm?&jvpfcv1d3hep>s)76qzUbwUky&M&C<M-e2q^@e798gqWcAb{9a>3mjDG_os-_y0MRaMGl@&p#AOuusN|3Lu=mBCcg_V{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "o": ["ccccccccb06565ebd23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384e9e378f4f5890c31ca9d115965a0e8fb2c3c60ccce84ffc03bddb22b27a1ce278eec118496fd23f083ebb21bb4b83b89eda8c0bdea50debc5ec4f2b2d91b63a80d39386194ad9d129bee2f5168341cb41ed26dc03466cac5e2dbe7336fdb74c0d37d63b396033ce60002c9950f5ac2970dacf4caace2eef5b81544df88a7ef2a8d69550d25d39c678c8e43a3dcc2857018a2c979b45c6b19dabd28ae7388d62916e6742763d6484d1b45154e6c8e6a66e02b03f64b67ddef24747dded32e226e3a93d5d1a92d11e760403cad04a0dd07c14da336a409739e8bbeb3b3d6b92117fa2d2c941da4996ea61b29ca3fffb4594ddbeab7105a1b4c5e422ec5ab8154db545103d8c2889be2e4591198912446d8b33b8708a4cc959a1e0957dcae6a50c3"], "v": 1}'::jsonb::eql_v2_encrypted
31+
'{"c": "mBbLa7Cm?&jvpfcv1d3hep>s)76qzUbwUky&M&C<M-e2q^@e798gqWcAb{9a>3mjDG_os-_y0MRaMGl@&p#AOuusN|3Lu=mBCcg_V{&<LbY)~;X>N2hzy", "i": {"c": "encrypted_int4", "t": "encrypted"}, "k": "ct", "m": null, "ob": ["ccccccccb06565ebd23d6a4c3eee512713175e673c6d995ff5d9b1d3492fe8eb289c3eb95029025f5b71fc6e06632b4a1302980e433361c7999724dbdd052739258d9444b0fbd43cc61368e60f4b0d5aeca2aa85c1c89933b53afffcc4eb0632dca75f632bb9bc792d1dbd6bced6253291f0db134552d384e9e378f4f5890c31ca9d115965a0e8fb2c3c60ccce84ffc03bddb22b27a1ce278eec118496fd23f083ebb21bb4b83b89eda8c0bdea50debc5ec4f2b2d91b63a80d39386194ad9d129bee2f5168341cb41ed26dc03466cac5e2dbe7336fdb74c0d37d63b396033ce60002c9950f5ac2970dacf4caace2eef5b81544df88a7ef2a8d69550d25d39c678c8e43a3dcc2857018a2c979b45c6b19dabd28ae7388d62916e6742763d6484d1b45154e6c8e6a66e02b03f64b67ddef24747dded32e226e3a93d5d1a92d11e760403cad04a0dd07c14da336a409739e8bbeb3b3d6b92117fa2d2c941da4996ea61b29ca3fffb4594ddbeab7105a1b4c5e422ec5ab8154db545103d8c2889be2e4591198912446d8b33b8708a4cc959a1e0957dcae6a50c3"], "v": 1}'::jsonb::eql_v2_encrypted
3232
)
3333
;
3434

@@ -49,7 +49,7 @@ DO $$
4949
END;
5050
$$ LANGUAGE plpgsql;
5151

52-
-- insert data without "o" (ore index value)
52+
-- insert data without "ob" (ore index value)
5353
INSERT INTO agg_test (plain_int, enc_int) VALUES
5454
(
5555
3,

‎src/operators/<.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ AS $$
4040
END;
4141

4242
BEGIN
43-
RETURN eql_v2.ore_64_8_v2(a) < eql_v2.ore_64_8_v2(b);
43+
RETURN eql_v2.ore_block_u64_8_256(a) < eql_v2.ore_block_u64_8_256(b);
4444
EXCEPTION WHEN OTHERS THEN
4545
-- PERFORM eql_v2.log('eql_v2.lt no ore_64_8_v2 index');
4646
END;

‎src/operators/<=.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ AS $$
3939
END;
4040

4141
BEGIN
42-
RETURN eql_v2.ore_64_8_v2(a) <= eql_v2.ore_64_8_v2(b);
42+
RETURN eql_v2.ore_block_u64_8_256(a) <= eql_v2.ore_block_u64_8_256(b);
4343
EXCEPTION WHEN OTHERS THEN
4444
-- PERFORM eql_v2.log('eql_v2.lte no ore_64_8_v2 index');
4545
END;

‎src/operators/=.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ AS $$
5959
END;
6060

6161
BEGIN
62-
RETURN eql_v2.ore_64_8_v2(a) = eql_v2.ore_64_8_v2(b);
62+
RETURN eql_v2.ore_block_u64_8_256(a) = eql_v2.ore_block_u64_8_256(b);
6363
EXCEPTION WHEN OTHERS THEN
6464
-- PERFORM eql_v2.log('No ore_64_8_v2 index');
6565
END;

‎src/operators/=_test.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ DECLARE
4141
BEGIN
4242

4343
for i in 1..3 loop
44-
e := create_encrypted_json(i)::jsonb-'o';
44+
e := create_encrypted_json(i)::jsonb-'ob';
4545

4646
PERFORM assert_result(
4747
format('eql_v2.eq(eql_v2_encrypted, eql_v2_encrypted) with unique index term %s of 3', i),
4848
format('SELECT e FROM encrypted WHERE eql_v2.eq(e, %L);', e));
4949
end loop;
5050

5151
-- remove the ore index term
52-
e := create_encrypted_json(91347)::jsonb-'o';
52+
e := create_encrypted_json(91347)::jsonb-'ob';
5353

5454
PERFORM assert_no_result(
5555
'eql_v2.eq(eql_v2_encrypted, eql_v2_encrypted) with no matching record',
@@ -69,7 +69,7 @@ DECLARE
6969
for i in 1..3 loop
7070

7171
-- remove the default
72-
e := create_encrypted_json(i)::jsonb-'o';
72+
e := create_encrypted_json(i)::jsonb-'ob';
7373

7474
PERFORM assert_result(
7575
format('eql_v2_encrypted = jsonb with unique index term %s of 3', i),
@@ -80,7 +80,7 @@ DECLARE
8080
format('SELECT e FROM encrypted WHERE %L::jsonb = e', e));
8181
end loop;
8282

83-
e := create_encrypted_json(91347)::jsonb-'o';
83+
e := create_encrypted_json(91347)::jsonb-'ob';
8484

8585
PERFORM assert_no_result(
8686
'eql_v2_encrypted = jsonb with no matching record',

0 commit comments

Comments
 (0)