rebase

velox/dwio/common/compression/Compression.cpp

@@ -38,7 +38,7 @@
 
 DEFINE_bool(
     VELOX_ENABLE_QAT_ZSTD_OT,
-    true,
+    false,
     "if to use qat for zstd compression");
 >>>>>>> c5224428f (flags):velox/dwio/dwrf/common/Compression.cpp
 
@@ -85,11 +85,8 @@ class ZstdQatCompressor : public Compressor {
     zc = ZSTD_createCCtx();
     QZSTD_startQatDevice();
     sequenceProducerState = QZSTD_createSeqProdState();
-<<<<<<< HEAD:velox/dwio/common/compression/Compression.cpp
-<<<<<<< HEAD:velox/dwio/common/compression/Compression.cpp
     ZSTD_registerSequenceProducer(
         zc, sequenceProducerState, qatSequenceProducer);
-<<<<<<< HEAD:velox/dwio/common/compression/Compression.cpp
     ZSTD_CCtx_setParameter(
         zc, ZSTD_c_enableSeqProducerFallback, FLAGS_ENABLE_QAT_ZSTD_FALLBACK);
     ZSTD_CCtx_setParameter(zc, ZSTD_c_compressionLevel, level);
@@ -100,21 +97,6 @@ class ZstdQatCompressor : public Compressor {
     if (sequenceProducerState) {
       QZSTD_freeSeqProdState(sequenceProducerState);
     }
-=======
-    ZSTD_registerSequenceProducer(zc, sequenceProducerState, qatSequenceProducer);
-=======
-    ZSTD_registerSequenceProducer(
-<<<<<<< HEAD:velox/dwio/common/compression/Compression.cpp
-      zc, sequenceProducerState, qatSequenceProducer);
->>>>>>> e1806c43f (fix benchmark build error):velox/dwio/dwrf/common/Compression.cpp
-=======
-        zc, sequenceProducerState, qatSequenceProducer);
->>>>>>> 61b3e358d (gen test data):velox/dwio/dwrf/common/Compression.cpp
-    ZSTD_CCtx_setParameter(zc, ZSTD_c_enableSeqProducerFallback, 1);
->>>>>>> 714f09ad8 (fix format):velox/dwio/dwrf/common/Compression.cpp
-=======
-    ZSTD_CCtx_setParameter(zc, ZSTD_c_enableSeqProducerFallback, level);
->>>>>>> c5224428f (flags):velox/dwio/dwrf/common/Compression.cpp
   }
 
   ZSTD_CCtx* zc;
@@ -128,24 +110,11 @@ ZstdQatCompressor::compress(const void* src, void* dest, uint64_t length) {
   XLOG_FIRST_N(INFO, 1) << fmt::format(
       "qat fallback {}", FLAGS_ENABLE_QAT_ZSTD_FALLBACK);
   size_t ret = ZSTD_compress2(zc, dest, length, src, length);
-<<<<<<< HEAD:velox/dwio/common/compression/Compression.cpp
-<<<<<<< HEAD:velox/dwio/common/compression/Compression.cpp
   if ((int)ret <= 0) {
     if (ZSTD_getErrorCode(ret) == ZSTD_ErrorCode::ZSTD_error_dstSize_tooSmall) {
       return length;
     }
-=======
-  if ((int)ret <= 0) {
->>>>>>> 61b3e358d (gen test data):velox/dwio/dwrf/common/Compression.cpp
-    DWIO_RAISE("ZSTD QAT returned an error: ", ZSTD_getErrorName(ret));
-=======
-  if ((int)ret <= 0) {        
-<<<<<<< HEAD:velox/dwio/common/compression/Compression.cpp
-      DWIO_RAISE("ZSTD QAT returned an error: ", ZSTD_getErrorName(ret));
->>>>>>> 714f09ad8 (fix format):velox/dwio/dwrf/common/Compression.cpp
-=======
     DWIO_RAISE("ZSTD QAT returned an error: ", ZSTD_getErrorName(ret));
->>>>>>> e1806c43f (fix benchmark build error):velox/dwio/dwrf/common/Compression.cpp
   }
   return ret;
 }