since its working, remove old commented code

This commit is contained in:
Green Sky 2024-04-02 18:27:47 +02:00
parent 53ce292e82
commit 5767834f71
No known key found for this signature in database

View File

@ -381,65 +381,22 @@ bool FragmentStore::syncToStorage(FragmentID fid, std::function<write_to_storage
} }
// now data // now data
//if (data_comp == Compression::NONE) { // for zstd compression, chunk size is frame size. (no cross frame referencing)
// for zstd compression, chunk size is frame size. (no cross frame referencing) static constexpr int64_t chunk_size{1024*1024}; // 1MiB should be enough
static constexpr int64_t chunk_size{1024*1024*10}; std::vector<uint8_t> buffer(chunk_size);
std::vector<uint8_t> buffer(chunk_size); uint64_t buffer_actual_size {0};
uint64_t buffer_actual_size {0}; do {
do { buffer_actual_size = data_cb(buffer.data(), buffer.size());
buffer_actual_size = data_cb(buffer.data(), buffer.size()); if (buffer_actual_size == 0) {
if (buffer_actual_size == 0) { break;
break; }
} if (buffer_actual_size > buffer.size()) {
if (buffer_actual_size > buffer.size()) { // wtf
// wtf break;
break; }
}
data_file_stack.top()->write({buffer.data(), buffer_actual_size}); data_file_stack.top()->write({buffer.data(), buffer_actual_size});
} while (buffer_actual_size == buffer.size()); } while (buffer_actual_size == buffer.size());
//} else if (data_comp == Compression::ZSTD) {
//std::vector<uint8_t> buffer(ZSTD_CStreamInSize());
//std::vector<uint8_t> compressed_buffer(ZSTD_CStreamOutSize());
//uint64_t buffer_actual_size {0};
//std::unique_ptr<ZSTD_CCtx, decltype(&ZSTD_freeCCtx)> cctx{ZSTD_createCCtx(), &ZSTD_freeCCtx};
//ZSTD_CCtx_setParameter(cctx.get(), ZSTD_c_compressionLevel, 0); // default (3)
//ZSTD_CCtx_setParameter(cctx.get(), ZSTD_c_checksumFlag, 1); // add extra checksums (to frames?)
//do {
//buffer_actual_size = data_cb(buffer.data(), buffer.size());
////if (buffer_actual_size == 0) {
////break;
////}
//if (buffer_actual_size > buffer.size()) {
//// wtf
//break;
//}
//bool const lastChunk = (buffer_actual_size < buffer.size());
//ZSTD_EndDirective const mode = lastChunk ? ZSTD_e_end : ZSTD_e_continue;
//ZSTD_inBuffer input = { buffer.data(), buffer_actual_size, 0 };
//while (input.pos < input.size) {
//ZSTD_outBuffer output = { compressed_buffer.data(), compressed_buffer.size(), 0 };
//size_t const remaining = ZSTD_compressStream2(cctx.get(), &output , &input, mode);
//if (ZSTD_isError(remaining)) {
//std::cerr << "FS error: compressing data failed\n";
//break;
//}
//data_file.write(reinterpret_cast<const char*>(compressed_buffer.data()), output.pos);
//if (remaining == 0) {
//break;
//}
//}
//// same as if lastChunk break;
//} while (buffer_actual_size == buffer.size());
//} else {
//assert(false && "implement me");
//}
//meta_file.flush(); //meta_file.flush();
//meta_file.close(); //meta_file.close();