mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-29 00:56:31 +08:00
Code Activity

Fix indentation in crypto.h and crypto.cc

Browse Source
This commit is contained in:
Revital Sur authored and Gidon Gershinsky committed 2019-05-28 08:31:57 +03:00
1 parent 333045b79c
commit 73c8235eac
2 files changed
+20 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cpp/src/parquet/util/crypto.cc
+18 -11
View File
@@ -429,12 +429,13 @@ int Decrypt(std::shared_ptr<EncryptionProperties> encryption_props, bool metadat
}
std::string createModuleAAD(const std::string& fileAAD, int8_t module_type,
int16_t row_group_ordinal, int16_t column_ordinal,
int16_t page_ordinal) {
int16_t row_group_ordinal, int16_t column_ordinal,
int16_t page_ordinal) {
int8_t type_ordinal_bytes[1];
type_ordinal_bytes[0] = module_type;
std::string type_ordinal_bytes_str(reinterpret_cast<char const*>(type_ordinal_bytes), 1) ;
std::string type_ordinal_bytes_str(reinterpret_cast<char const*>
(type_ordinal_bytes), 1) ;
if (Footer == module_type) {
std::string result = fileAAD + type_ordinal_bytes_str;
return result;
@@ -442,25 +443,31 @@ std::string createModuleAAD(const std::string& fileAAD, int8_t module_type,
std::string row_group_ordinal_bytes = shortToBytesLE(row_group_ordinal);
std::string column_ordinal_bytes = shortToBytesLE(column_ordinal);
if (DataPage != module_type && DataPageHeader != module_type) {
std::string result = fileAAD + type_ordinal_bytes_str + row_group_ordinal_bytes
std::string result = fileAAD + type_ordinal_bytes_str
+ row_group_ordinal_bytes
+ column_ordinal_bytes;
return result;
}
std::string page_ordinal_bytes = shortToBytesLE(page_ordinal);
std::string result = fileAAD + type_ordinal_bytes_str + row_group_ordinal_bytes
std::string result = fileAAD + type_ordinal_bytes_str +
row_group_ordinal_bytes
+ column_ordinal_bytes + page_ordinal_bytes;;
return result;
}
std::string createFooterAAD(const std::string& aad_prefix_bytes) {
return createModuleAAD(aad_prefix_bytes, Footer, (int16_t) -1, (int16_t) -1, (int16_t) -1);
return createModuleAAD(aad_prefix_bytes, Footer, (int16_t) -1,
(int16_t) -1, (int16_t) -1);
}
// Update last two bytes with new page ordinal (instead of creating new page AAD from scratch)
// Update last two bytes with new page ordinal (instead of creating
// new page AAD from scratch)
void quickUpdatePageAAD(const std::string &AAD, int16_t new_page_ordinal) {
std::string page_ordinal_bytes = shortToBytesLE(new_page_ordinal);
int length = (int)AAD.size();
std::memcpy((int16_t*)(AAD.c_str()+length-2), (int16_t*)(page_ordinal_bytes.c_str()), 2);
std::memcpy((int16_t*)(AAD.c_str()+length-2),
(int16_t*)(page_ordinal_bytes.c_str()), 2);
}
} // namespace parquet_encryption
cpp/src/parquet/util/crypto.h
+2 -2
View File
@@ -57,8 +57,8 @@ int Decrypt(std::shared_ptr<EncryptionProperties> encryption_props, bool metadat
const uint8_t* ciphertext, int ciphertext_len, uint8_t* plaintext);
std::string createModuleAAD(const std::string& fileAAD, int8_t module_type,
int16_t row_group_ordinal, int16_t column_ordinal,
int16_t page_ordinal);
int16_t row_group_ordinal, int16_t column_ordinal,
int16_t page_ordinal);
std::string createFooterAAD(const std::string& aad_prefix_bytes);