Order-Preserving Encryption Revisited: Improved Security Analysis and Alternative Solutions