fix distinction between global/environment, use raw api

PeerDB-io · Mar 12, 2024 · dae2af6 · dae2af6
1 parent 10906e9
commit dae2af6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/flow/connectors/kafka/kafka.go b/flow/connectors/kafka/kafka.go
@@ -169,9 +169,11 @@ func (c *KafkaConnector) SyncRecords(ctx context.Context, req *model.SyncRecords
 		if err != nil {
 			return nil, fmt.Errorf("error executing script %s: %w", req.Script, err)
 		}
+		// discard results, for now rely on globals instead of script returning anything
+		ls.SetTop(0)
 
 		var ok bool
-		fn, ok = ls.GetGlobal("onRecord").(*lua.LFunction)
+		fn, ok = ls.Env.RawGetString("onRecord").(*lua.LFunction)
 		if !ok {
 			return nil, errors.New("script should define `onRecord` function")
 		}

diff --git a/flow/pua/peerdb.go b/flow/pua/peerdb.go
@@ -24,25 +24,25 @@ var (
 func RegisterTypes(ls *lua.LState) {
 	// gopher-lua provides 2 loaders {preload, file}
 	// overwrite file loader with one retrieving scripts from database
-	loaders := ls.GetField(ls.Get(lua.RegistryIndex), "_LOADERS").(*lua.LTable)
-	ls.RawSetInt(loaders, 2, ls.NewFunction(LoadPeerdbScript))
+	loaders := ls.G.Registry.RawGetString("_LOADERS").(*lua.LTable)
+	loaders.RawSetInt(2, ls.NewFunction(LoadPeerdbScript))
 
 	mt := LuaRecord.NewMetatable(ls)
-	ls.SetField(mt, "__index", ls.NewFunction(LuaRecordIndex))
+	mt.RawSetString("__index", ls.NewFunction(LuaRecordIndex))
 
 	mt = LuaRow.NewMetatable(ls)
-	ls.SetField(mt, "__index", ls.NewFunction(LuaRowIndex))
-	ls.SetField(mt, "__len", ls.NewFunction(LuaRowLen))
+	mt.RawSetString("__index", ls.NewFunction(LuaRowIndex))
+	mt.RawSetString("__len", ls.NewFunction(LuaRowLen))
 
 	mt = LuaQValue.NewMetatable(ls)
-	ls.SetField(mt, "__index", ls.NewFunction(LuaQValueIndex))
-	ls.SetField(mt, "__len", ls.NewFunction(LuaQValueLen))
+	mt.RawSetString("__index", ls.NewFunction(LuaQValueIndex))
+	mt.RawSetString("__len", ls.NewFunction(LuaQValueLen))
 
 	peerdb := ls.NewTable()
-	ls.SetField(peerdb, "RowToJSON", ls.NewFunction(LuaRowToJSON))
-	ls.SetField(peerdb, "RowColumns", ls.NewFunction(LuaRowColumns))
-	ls.SetField(peerdb, "UnixNow", ls.NewFunction(LuaUnixNow))
-	ls.SetGlobal("peerdb", peerdb)
+	peerdb.RawSetString("RowToJSON", ls.NewFunction(LuaRowToJSON))
+	peerdb.RawSetString("RowColumns", ls.NewFunction(LuaRowColumns))
+	peerdb.RawSetString("UnixNow", ls.NewFunction(LuaUnixNow))
+	ls.Env.RawSetString("peerdb", peerdb)
 }
 
 func LoadPeerdbScript(ls *lua.LState) int {
@@ -107,7 +107,7 @@ func LuaRowColumns(ls *lua.LState) int {
 	_, row := LuaRow.Check(ls, 1)
 	tbl := ls.CreateTable(len(row.ColToValIdx), 0)
 	for col, idx := range row.ColToValIdx {
-		ls.RawSetInt(tbl, idx, lua.LString(col))
+		tbl.RawSetInt(idx, lua.LString(col))
 	}
 	ls.Push(tbl)
 	return 1