From: Paul Cruz <paulcruz74@fb.com>
Date: Wed, 14 Jun 2017 00:27:02 +0000 (-0700)
Subject: debugging error with finalizeDictionary() not writing dictionary properly
X-Git-Tag: v1.3.0~1^2~15^2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07cfc975bb1ea9070b934ead4ce264b1eeef2ab4;p=thirdparty%2Fzstd.git

debugging error with finalizeDictionary() not writing dictionary properly
---

diff --git a/tests/decodecorpus.c b/tests/decodecorpus.c
index 32b3659d1..8e49e65b8 100644
--- a/tests/decodecorpus.c
+++ b/tests/decodecorpus.c
@@ -1331,18 +1331,19 @@ static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const
     /* Generate the dictionary randomly first */
     dictContent = malloc(dictSize-400);
     dictID = RAND(&seed);
+    DISPLAY("this is the dictID that is being stored: %u\n", dictID);
     fullDict = malloc(dictSize);
     RAND_buffer(&seed, dictContent, dictSize-40);
     {
+        size_t dictWriteSize = 0;
         /* create random samples */
         unsigned numSamples = RAND(&seed) % 50;
-        DISPLAY("num samples: %u\n", numSamples);
         unsigned i = 0;
         size_t* sampleSizes = malloc(numSamples*sizeof(size_t));
         size_t* curr = sampleSizes;
         size_t totalSize = 0;
         while(i++ < numSamples){
-            *curr = RAND(&seed) % (4 << 20);
+            *curr = RAND(&seed) % (4 << 15);
             totalSize += *curr;
             curr++;
         }
@@ -1353,12 +1354,15 @@ static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const
         /* set dictionary params */
         memset(&zdictParams, 0, sizeof(ZDICT_params_t));
         zdictParams.dictID = dictID;
-
         /* finalize dictionary with random samples */
-        ZDICT_finalizeDictionary(fullDict, dictSize,
+        dictWriteSize = ZDICT_finalizeDictionary(fullDict, dictSize,
                                     dictContent, dictSize-400,
                                     samples, sampleSizes, numSamples,
                                     zdictParams);
+        DISPLAY("total size: %zu %zu\n", totalSize, dictSize);
+        if(dictWriteSize != dictSize && ZDICT_isError(dictWriteSize)){
+            DISPLAY("Could not finalize dictionary: %s\n", ZDICT_getErrorName(dictWriteSize));
+        }
         /* write out dictionary */
         if(snprintf(outPath, MAX_PATH, "%s/dictionary", path) + 1 > MAX_PATH){
             DISPLAY("Error: dictionary path too long\n");