remove sp assignment type check

emelialei88 · emelialei88 · commit 6f4381643644 · 2026-03-06T14:28:30.000-05:00
Signed-off-by: Emelia Lei &lt;wlei29@bloomberg.net&gt;
diff --git a/db/comdb2.c b/db/comdb2.c
@@ -228,7 +228,6 @@ int gbl_return_long_column_names = 1;
 int gbl_maxreclen;
 int gbl_penaltyincpercent = 20;
 int gbl_maxwthreadpenalty;
-int gbl_spstrictassignments = 0;
 int gbl_lock_conflict_trace = 0;
 int gbl_move_deadlk_max_attempt = 500;
 
diff --git a/db/db_tunables.c b/db/db_tunables.c
@@ -100,7 +100,6 @@ extern int gbl_debug_sleep_on_set_read_only;
 extern int gbl_debug_wait_on_verify_off;
 extern int gbl_debug_disttxn_trace;
 extern int gbl_sparse_lockerid_map;
-extern int gbl_spstrictassignments;
 extern int gbl_early;
 extern int gbl_exit_alarm_sec;
 extern int gbl_fdb_default_ver;
diff --git a/db/db_tunables.h b/db/db_tunables.h
@@ -501,9 +501,6 @@ REGISTER_TUNABLE("enable_sparse_lockerid_map",
                  "If set, allocates a sparse map of lockers for deadlock "
                  "resolution. (Default: on)",
                  TUNABLE_BOOLEAN, &gbl_sparse_lockerid_map, READONLY | NOARG, NULL, NULL, NULL, NULL);
-REGISTER_TUNABLE("enable_sp_strict_assignments", NULL, TUNABLE_INTEGER,
-                 &gbl_spstrictassignments, READONLY | NOARG, NULL, NULL, NULL,
-                 NULL);
 REGISTER_TUNABLE(
     "enable_sq_flattening_optimization",
     "Enable subquery flattening optimization for OUTER JOINS (Default: off)",
diff --git a/lua/ltypes.c b/lua/ltypes.c
@@ -891,12 +891,9 @@ void init_cmp(Lua lua)
     lua_setfield(lua, -2, "__le");
 }
 
-static int l_typed_assignment(Lua);
 static int l_concat(Lua);
 void init_common(Lua lua)
 {
-    lua_pushcfunction(lua, l_typed_assignment);
-    lua_setfield(lua, -2, "__type");       
     lua_pushcfunction(lua, l_column_cast);
     lua_setfield(lua, -2, "__cast");    
     lua_pushcfunction(lua, l_concat);
@@ -2080,7 +2077,6 @@ static void init_blob(Lua L)
     setup_method(L, "__lt", l_blob_lt);
     setup_method(L, "__le", l_blob_le);
     setup_method(L, "__cast", l_column_cast);
-    setup_method(L, "__type", l_typed_assignment);
     setup_method(L, "__gc", l_blob_free);
     setup_method(L, "__len", l_blob_length);
 
@@ -2179,16 +2175,6 @@ int luabb_isnull(lua_State *lua, int arg_index)
     return 0;
 }
 
-int luabb_istyped(lua_State *lua, int arg_index)
-{
-    int type = lua_type(lua, arg_index);
-    if (type == LUA_TUSERDATA) {
-        const lua_dbtypes_t *n = lua_topointer(lua, arg_index);
-        return n->is_typed;
-    }
-    return 0;
-}
-
 void luabb_pushnull(Lua lua, int dbtype)
 {
     switch (dbtype) {
@@ -2256,39 +2242,6 @@ char *luabb_newblob(Lua lua, int len, void **blob)
     return (char *)b->val.data;
 }
 
-static int l_typed_assignment(lua_State *lua)
-{
-   const char *name1 = NULL;
-   const char *name2 = NULL;
-   if ((lua_type(lua, 1) == LUA_TUSERDATA)) {
-       if (luabb_istyped(lua,1)) {
-         lua_getmetatable(lua, 1); 
-         lua_pushstring(lua, "__metatable");
-         lua_gettable(lua, -2);
-         name1 = lua_tostring(lua, -1);
-         lua_getmetatable(lua, 2); 
-         lua_pushstring(lua, "__metatable");
-         lua_gettable(lua, -2);
-         name2 = lua_tostring(lua, -1);         
-         if (name1 && name2 && strcmp(name1, name2) == 0) { 
-           lua_pop(lua,4);
-           lua_remove(lua,1);
-         } else {
-           /* Remove everything and push nil. */  
-           lua_settop(lua, 0);
-           if (name1) {
-             luabb_error(lua, NULL, "Invalid assignment, invalid typed assignment for type %s", name1);
-           } else {
-             luabb_error(lua, NULL, "Invalid assignment, invalid typed assignment");
-           }
-         }
-       }
-   } else {
-         lua_remove(lua,1);
-   }
-   return 1;
-}
-
 int l_column_cast(Lua L)
 {
     if (lua_isnil(L, -2)) {
diff --git a/lua/ltypes.h b/lua/ltypes.h
@@ -21,8 +21,6 @@
 #include <lua.h>
 #include <comdb2.h>
 
-extern int gbl_spstrictassignments;
-
 // one switch to rule them all
 #define DBTYPES \
 XMACRO_DBTYPES(DBTYPES_LNIL,       "nil",        t0,         NULL)\
@@ -94,7 +92,6 @@ extern const char *dbtypes_str[];
 #define DBTYPES_COMMON		\
 	int magic;		\
 	dbtypes_enum dbtype;	\
-	int is_typed;		\
 	int is_null
 
 typedef struct {
@@ -150,7 +147,6 @@ typedef struct {
 #define init_new_t(n, DBTYPE) \
     (n)->magic = DBTYPES_MAGIC;\
     (n)->is_null = 0;\
-    (n)->is_typed = gbl_spstrictassignments;\
     (n)->dbtype = DBTYPE
 
 #define new_lua_t_sz(L, n, DBTYPE, sz) \
diff --git a/lua/sp.c b/lua/sp.c
@@ -4579,20 +4579,6 @@ static int db_setnull(Lua lua)
     return 0;
 }
 
-static int db_settyped(Lua lua)
-{
-    if (lua_type(lua, -1) != LUA_TUSERDATA) {
-        return luaL_error(lua, "bad argument to 'settyped'");
-    }
-
-    lua_dbtypes_t *t = (lua_dbtypes_t *)lua_topointer(lua, -1);
-    assert(t->magic == DBTYPES_MAGIC);
-    assert(t->dbtype > DBTYPES_MINTYPE);
-    assert(t->dbtype < DBTYPES_MAXTYPE);
-    t->is_typed = 1;
-    return 0;
-}
-
 static int db_setmaxinstructions(Lua L)
 {
     luaL_checkudata(L, 1, dbtypes.db);
@@ -5044,7 +5030,6 @@ static const luaL_Reg db_funcs[] = {
     {"setmaxinstructions", db_setmaxinstructions},
     {"setnull", db_setnull},
     {"settimezone", db_settimezone},
-    {"settyped", db_settyped},
     {"sp", db_sp},
     {"sqlerror", db_error}, // every error isn't from SQL -- deprecate
     {"table", db_table},
diff --git a/lua/sp_int.h b/lua/sp_int.h
@@ -117,7 +117,6 @@ void luabb_pushnull(Lua, int dbtype);
 void luabb_pushreal(Lua, double);
 
 int luabb_isnull(Lua, int index);
-int luabb_istyped(Lua, int index);
 
 /* must be called before any exposed functionality is available in lua */
 void init_dbtypes(Lua);
diff --git a/tests/tunables.test/t00_all_tunables.expected b/tests/tunables.test/t00_all_tunables.expected
@@ -344,7 +344,6 @@
 (name='enable_seqnum_generations', description='', type='BOOLEAN', value='OFF', read_only='N')
 (name='enable_serial_isolation', description='Enable to allow SERIALIZABLE level transactions to run against the database. (Default: off)', type='BOOLEAN', value='OFF', read_only='Y')
 (name='enable_snapshot_isolation', description='Enable to allow SNAPSHOT level transactions to run against the database. (Default: off)', type='BOOLEAN', value='OFF', read_only='Y')
-(name='enable_sp_strict_assignments', description='', type='INTEGER', value='0', read_only='Y')
 (name='enable_sparse_lockerid_map', description='If set, allocates a sparse map of lockers for deadlock resolution. (Default: on)', type='BOOLEAN', value='ON', read_only='Y')
 (name='enable_sql_stmt_caching', description='Enable caching of query plans. If followed by "all" will cache all queries, including those without parameters. (Default: on)', type='ENUM', value='ALL', read_only='Y')
 (name='enable_tagged_api', description='Enables tagged api requests. (Default: on)', type='BOOLEAN', value='OFF', read_only='N')
