Implementation of the where api

.github/workflows/release.yml

@@ -267,8 +267,6 @@ jobs:
           target: arm64
           build-contexts: |
             artifacts=artifacts
-          # cache-from: type=gha
-          # cache-to: type=gha,mode=max
 
   docker-build-and-push-linux-amd64:
     name: Build and push linux-amd64 docker image
@@ -305,5 +303,3 @@ jobs:
           tags: ghcr.io/${{ github.repository }}:latest,ghcr.io/${{ github.repository }}:${{ needs.prepare.outputs.tag_name }}
           platforms: linux/amd64
           target: amd64
-          # cache-from: type=gha
-          # cache-to: type=gha,mode=max

Cargo.toml

@@ -21,7 +21,7 @@ edition = "2021"
 license = "Apache-2.0"
 license-file = "LICENSE"
 repository = "https://github.com/dojoengine/dojo/"
-version = "0.3.12"
+version = "0.3.13"
 
 [profile.performance]
 codegen-units = 1

crates/dojo-core/Scarb.lock

@@ -3,12 +3,12 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.3.12"
+version = "0.3.13"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_plugin"
-version = "0.3.12"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.3.12#12d58f29ec53454317f1f6d265007a053d279288"
+version = "0.3.11"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7d8aa29a92062fcb9e6659"

crates/dojo-core/Scarb.toml

@@ -2,8 +2,8 @@
 cairo-version = "2.3.1"
 description = "The Dojo Core library for autonomous worlds."
 name = "dojo"
-version = "0.3.12"
+version = "0.3.13"
 
 [dependencies]
-dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.12" }
+dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.11" }
 starknet = "2.3.1"

crates/dojo-core/src/benchmarks.cairo

@@ -8,7 +8,8 @@ use starknet::SyscallResultTrait;
 use starknet::{contract_address_const, ContractAddress, ClassHash, get_caller_address};
 
 use dojo::database;
-use dojo::database::{storage, index};
+use dojo::database::{storage, index, Clause};
+use dojo::packing::{shl, shr};
 use dojo::model::Model;
 use dojo::world_test::Foo;
 use dojo::test_utils::end;
@@ -113,30 +114,30 @@ fn bench_native_storage_offset() {
 fn bench_index() {
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    let no_query = index::query(0, 69, Option::None(()));
+    let no_query = index::get(0, 69, 0);
     end(gas, 'idx empty');
     assert(no_query.len() == 0, 'entity indexed');
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    index::create(0, 69, 420);
+    index::create(0, 69, 420, 0);
     end(gas, 'idx create 1st');
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    let query = index::query(0, 69, Option::None(()));
+    let query = index::get(0, 69, 0);
     end(gas, 'idx query one');
     assert(query.len() == 1, 'entity not indexed');
     assert(*query.at(0) == 420, 'entity value incorrect');
-    
+
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    index::create(0, 69, 1337);
+    index::create(0, 69, 1337, 0);
     end(gas, 'idx query 2nd');
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    let two_query = index::query(0, 69, Option::None(()));
+    let two_query = index::get(0, 69, 0);
     end(gas, 'idx query two');
     assert(two_query.len() == 2, 'index should have two query');
     assert(*two_query.at(1) == 1337, 'entity value incorrect');
@@ -171,18 +172,18 @@ fn bench_big_index() {
         if i == 1000 {
             break;
         }
-        index::create(0, 69, i);
+        index::create(0, 69, i, 0);
         i += 1;
     };
     end(gas, 'idx create 1000');
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    let query = index::query(0, 69, Option::None(()));
+    let query = index::get(0, 69, 0);
     end(gas, 'idx query 1000');
     assert(query.len() == 1000, 'entity not indexed');
     assert(*query.at(420) == 420, 'entity value incorrect');
-    
+
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
     index::exists(0, 69, 999);
@@ -249,27 +250,25 @@ fn bench_indexed_database_array() {
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    database::set_with_index('table', 'even', 0, even, layout);
+    database::set_with_index('table', 'even', array![].span(), 0, even, layout);
     end(gas, 'dbi set arr 1st');
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    let (keys, values) = database::scan('table', Option::None(()), 2, layout);
+    let values = database::scan(Clause::All('table'), 2, layout);
     end(gas, 'dbi scan arr 1');
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    database::set_with_index('table', 'odd', 0, odd, layout);
+    database::set_with_index('table', 'odd', array![].span(), 0, odd, layout);
     end(gas, 'dbi set arr 2nd');
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    let (keys, values) = database::scan('table', Option::None(()), 2, layout);
+    let values = database::scan(Clause::All('table'), 2, layout);
     end(gas, 'dbi scan arr 2');
 
-    assert(keys.len() == 2, 'Wrong number of keys!');
     assert(values.len() == 2, 'Wrong number of values!');
-    assert(*keys.at(0) == 'even', 'Wrong key at index 0!');
     assert(*(*values.at(0)).at(0) == 2, 'Wrong value at index 0!');
     assert(*(*values.at(0)).at(1) == 4, 'Wrong value at index 1!');
 }
@@ -282,11 +281,7 @@ fn bench_simple_struct() {
 
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
-    let mut foo = Foo {
-        caller,
-        a: 0x123456789abcdef,
-        b: 0x123456789abcdef,
-    };
+    let mut foo = Foo { caller, a: 0x123456789abcdef, b: 0x123456789abcdef, };
     end(gas, 'foo init');
 
     let gas = testing::get_available_gas();
@@ -402,18 +397,12 @@ fn bench_nested_struct() {
     gas::withdraw_gas().unwrap();
 
     let mut case = Case {
-        owner: caller,
-        sword: Sword {
-            swordsmith: caller,
-            damage: 0x12345678,
-        },
-        material: 'wooden',
+        owner: caller, sword: Sword { swordsmith: caller, damage: 0x12345678, }, material: 'wooden',
     };
     end(gas, 'case init');
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
 
-
     let gas = testing::get_available_gas();
     gas::withdraw_gas().unwrap();
     let mut serialized = ArrayTrait::new();
@@ -516,16 +505,16 @@ fn bench_complex_struct() {
             finished: true,
             romances: 0x1234,
         },
-        weapon: Weapon::DualWield((
-            Sword {
-                swordsmith: starknet::contract_address_const::<0x69>(),
-                damage: 0x12345678,
-            },
-            Sword {
-                swordsmith: starknet::contract_address_const::<0x69>(),
-                damage: 0x12345678,
-            }
-        )),
+        weapon: Weapon::DualWield(
+            (
+                Sword {
+                    swordsmith: starknet::contract_address_const::<0x69>(), damage: 0x12345678,
+                },
+                Sword {
+                    swordsmith: starknet::contract_address_const::<0x69>(), damage: 0x12345678,
+                }
+            )
+        ),
         gold: 0x12345678,
     };
     end(gas, 'chars init');
@@ -566,4 +555,4 @@ fn bench_complex_struct() {
     gas::withdraw_gas().unwrap();
     database::get('chars', '42', 0, char.packed_size(), char.layout());
     end(gas, 'chars db get');
-}
+}