index fix

Author: Shubham8287

Cargo.lock

@@ -129,5 +129,7 @@ pub(crate) fn procedure_impl(_args: ProcedureArgs, original_function: &ItemFn) -
                 Some(<#ret_ty_for_info as spacetimedb::SpacetimeType>::make_type(ts))
             }
         }
+
+        #generate_explicit_names
     })
 }

crates/bindings-macro/src/procedure.rs

@@ -4,7 +4,7 @@ use crate::query_builder::Query;
 use crate::table::IndexAlgo;
 use crate::{sys, AnonymousViewContext, IterBuf, ReducerContext, ReducerResult, SpacetimeType, Table, ViewContext};
 use spacetimedb_lib::bsatn::EncodeError;
-use spacetimedb_lib::db::raw_def::v10::{ExplicitNameEntry, ExplicitNames as RawExplicitNames, RawModuleDefV10Builder};
+use spacetimedb_lib::db::raw_def::v10::{ExplicitNames as RawExplicitNames, RawModuleDefV10Builder};
 pub use spacetimedb_lib::db::raw_def::v9::Lifecycle as LifecycleReducer;
 use spacetimedb_lib::db::raw_def::v9::{RawIndexAlgorithm, TableType, ViewResultHeader};
 use spacetimedb_lib::de::{self, Deserialize, DeserializeOwned, Error as _, SeqProductAccess};

crates/bindings/src/rt.rs

@@ -7,8 +7,6 @@
 
 use crate::db::raw_def::v9::{Lifecycle, RawIndexAlgorithm, TableAccess, TableType};
 use core::fmt;
-use spacetimedb_data_structures::map::HashMap;
-use spacetimedb_data_structures::small_map::SmallHashMap;
 use spacetimedb_primitives::{ColId, ColList};
 use spacetimedb_sats::raw_identifier::RawIdentifier;
 use spacetimedb_sats::typespace::TypespaceBuilder;

crates/lib/src/db/raw_def/v10.rs

@@ -291,7 +291,7 @@ impl<'a> ModuleValidatorV10<'a> {
             .into_iter()
             .map(|index| {
                 table_validator
-                    .validate_index_def(index.into())
+                    .validate_index_def(index.into(), RawModuleDefVersion::V10)
                     .map(|index| (index.name.clone(), index))
             })
             .collect_all_errors::<StrMap<_>>();

crates/schema/src/def/validate/v10.rs

@@ -211,7 +211,7 @@ impl ModuleValidatorV9<'_> {
             .into_iter()
             .map(|index| {
                 table_in_progress
-                    .validate_index_def(index)
+                    .validate_index_def(index, RawModuleDefVersion::V9OrEarlier)
                     .map(|index| (index.name.clone(), index))
             })
             .collect_all_errors::<StrMap<_>>();
@@ -1047,16 +1047,20 @@ impl<'a, 'b> TableValidator<'a, 'b> {
     }
 
     /// Validate an index definition.
-    pub(crate) fn validate_index_def(&mut self, index: RawIndexDefV9) -> Result<IndexDef> {
+    pub(crate) fn validate_index_def(
+        &mut self,
+        index: RawIndexDefV9,
+        raw_def_version: RawModuleDefVersion,
+    ) -> Result<IndexDef> {
         let RawIndexDefV9 {
             name,
-            algorithm,
+            algorithm: algorithm_raw,
             accessor_name,
         } = index;
 
-        let name = name.unwrap_or_else(|| generate_index_name(&self.raw_name, self.product_type, &algorithm));
+        let name = name.unwrap_or_else(|| generate_index_name(&self.raw_name, self.product_type, &algorithm_raw));
 
-        let algorithm: Result<IndexAlgorithm> = match algorithm {
+        let algorithm: Result<IndexAlgorithm> = match algorithm_raw.clone() {
             RawIndexAlgorithm::BTree { columns } => self
                 .validate_col_ids(&name, columns)
                 .map(|columns| BTreeAlgorithm { columns }.into()),
@@ -1089,8 +1093,16 @@ impl<'a, 'b> TableValidator<'a, 'b> {
             }),
             algo => unreachable!("unknown algorithm {algo:?}"),
         };
+
+        let accessor_name = match raw_def_version {
+            // In V9, `name`field is used for database internals but `accessor_name` supplied by module is used for client codegen.
+            RawModuleDefVersion::V9OrEarlier => accessor_name.map(identifier).transpose(),
+
+            // In V10, `name` is used both for internal purpose and client codefen.
+            RawModuleDefVersion::V10 => identifier(name.clone()).map(Some),
+        };
+
         let name = self.add_to_global_namespace(name);
-        let accessor_name = accessor_name.map(identifier).transpose();
 
         let (name, accessor_name, algorithm) = (name, accessor_name, algorithm).combine_errors()?;