changing scalar function signature

src/core/functions/scalar/encrypt_vectorized.cpp

@@ -98,7 +98,7 @@
   uint64_t buffer_offset;
 
   // TODO: for strings this all works slighly different
   for(int i = 0; i + 128; i < (DEFAULT_STANDARD_VECTOR_SIZE / 128)){
 
     buffer_offset = batch_nr * sizeof(T) * 128;
     // Allocate space in the dictionary vector (i.e. blob_child)
@@ -107,8 +107,8 @@
     memcpy(batch_data.GetDataWriteable(), lstate.buffer_p, batch_size);
 
     // set index in selection vector
     for (int j = 0; j++; j < 128){
         cipher = j % step;
         counter += (cipher == 0 && index != 0) ? 1 : 0;
         cipher_vec->SetValue(index, Value::TINYINT(cipher));
         counter_vec->SetValue(index, Value::UINTEGER(counter));
@@ -266,7 +266,9 @@
         ScalarFunction({type, LogicalType::VARCHAR},
                        LogicalType::STRUCT({{"nonce_hi", LogicalType::UBIGINT},
                                             {"nonce_lo", LogicalType::UBIGINT},
-                                            {"value", type}}),
+                                            {"counter", LogicalType::UINTEGER},
+                                            {"cipher", LogicalType::UINTEGER},
+                                            {"value", LogicalType::BLOB}}),
                        EncryptDataVectorized, EncryptFunctionData::EncryptBind, nullptr, nullptr, SimpleEncryptionFunctionLocalState::Init));
   }
 

test/sql/vectorized/vectorized_encrypt.test

@@ -17,10 +17,10 @@ CREATE SECRET key_1 (
 );
 
 statement ok
-CREATE TABLE test_1 AS SELECT 1 AS value FROM range(10000);
+CREATE TABLE test_1 AS SELECT 1 AS value FROM range(1000);
 
 statement ok
-ALTER TABLE test_1 ADD COLUMN encrypted_values STRUCT(nonce_hi UBIGINT, nonce_lo UBIGINT, counter UINTEGER, cipher UINTEGER, value BLOB) DEFAULT (STRUCT_PACK(nonce_hi := 0, nonce_lo := 0, counter := 0, cipher := 0, BLOB := 0));
+ALTER TABLE test_1 ADD COLUMN encrypted_values STRUCT(nonce_hi UBIGINT, nonce_lo UBIGINT, counter UINTEGER, cipher UINTEGER, value BLOB);
 
 statement ok
 UPDATE test_1 SET encrypted_values = encrypt_vectorized(value, 'key_1');