One more change that will be necessary. In MetaDataEndPointImpl, to get the table key to lock on, you'll need to look for the Put that links a data table with an index table. If found, you'll want to use the schema + data table name for the row lock. That way, you'll universally be locking on the data table.