-
Notifications
You must be signed in to change notification settings - Fork 304
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19184 from ghalliday/issue32765
HPCC-32765 Report the compressed offset when reporting an error about an invalid compressed file Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
- Loading branch information
Showing
6 changed files
with
238 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| /*############################################################################## | ||
| HPCC SYSTEMS software Copyright (C) 2024 HPCC Systems®. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| ############################################################################## */ | ||
|
|
||
| /* | ||
| * File regression tests | ||
| * | ||
| */ | ||
|
|
||
| #ifdef _USE_CPPUNIT | ||
| #include <memory> | ||
| #include <chrono> | ||
| #include <algorithm> | ||
| #include "jsem.hpp" | ||
| #include "jfile.hpp" | ||
| #include "jdebug.hpp" | ||
| #include "jset.hpp" | ||
| #include "rmtfile.hpp" | ||
| #include "jlzw.hpp" | ||
| #include "jqueue.hpp" | ||
| #include "jregexp.hpp" | ||
| #include "jsecrets.hpp" | ||
| #include "jutil.hpp" | ||
| #include "junicode.hpp" | ||
|
|
||
| #include "opentelemetry/sdk/common/attribute_utils.h" | ||
| #include "opentelemetry/sdk/resource/resource.h" | ||
|
|
||
| #include "unittests.hpp" | ||
|
|
||
| #define CPPUNIT_ASSERT_EQUAL_STR(x, y) CPPUNIT_ASSERT_EQUAL(std::string(x ? x : ""),std::string(y ? y : "")) | ||
|
|
||
| class JlibFileTest : public CppUnit::TestFixture | ||
| { | ||
| public: | ||
| CPPUNIT_TEST_SUITE(JlibFileTest); | ||
| CPPUNIT_TEST(testCompressed); | ||
| CPPUNIT_TEST(cleanup); | ||
| CPPUNIT_TEST_SUITE_END(); | ||
|
|
||
| static constexpr const char * testFilename = "unittests_compressfile"; | ||
| void createCompressed() | ||
| { | ||
| Owned<IFile> file(createIFile(testFilename)); | ||
| Owned<ICompressedFileIO> io(createCompressedFileWriter(file, 0, false, false, nullptr)); | ||
|
|
||
| constexpr size_t cnt = 10000; | ||
| constexpr size_t size = 1000; | ||
| offset_t pos = 0; | ||
| for (unsigned i = 0; i < cnt; i++) | ||
| { | ||
| byte temp[size]; | ||
|
|
||
| for (unsigned j = 0; j < size; j += 4) | ||
| { | ||
| temp[j] = (byte)j; | ||
| temp[j+1] = (byte)j+1; | ||
| temp[j+2] = (byte)j+2; | ||
| temp[j+3] = (byte)random(); | ||
| } | ||
|
|
||
| io->write(pos, size, temp); | ||
| pos += size; | ||
| } | ||
| } | ||
| void readCompressed(bool errorExpected) | ||
| { | ||
| bool success = false; | ||
| try | ||
| { | ||
| Owned<IFile> file(createIFile(testFilename)); | ||
| Owned<ICompressedFileIO> io(createCompressedFileReader(file)); | ||
|
|
||
| constexpr size_t cnt = 10000; | ||
| constexpr size_t size = 1000; | ||
| offset_t pos = 0; | ||
| for (unsigned i = 0; i < cnt; i++) | ||
| { | ||
| byte temp[size]; | ||
|
|
||
| io->read(pos, size, temp); | ||
|
|
||
| for (unsigned j = 0; j < size; j += 4) | ||
| { | ||
| CPPUNIT_ASSERT_EQUAL(temp[j], (byte)j); | ||
| CPPUNIT_ASSERT_EQUAL(temp[j+1], (byte)(j+1)); | ||
| } | ||
|
|
||
| pos += size; | ||
| } | ||
|
|
||
| success = true; | ||
| } | ||
| catch (IException *e) | ||
| { | ||
| if (errorExpected) | ||
| { | ||
| DBGLOG(e, "Expected error reading compressed file:"); | ||
| } | ||
| else | ||
| { | ||
| StringBuffer msg("Unexpected error reading compressed file:"); | ||
| e->errorMessage(msg); | ||
| CPPUNIT_FAIL(msg.str()); | ||
| } | ||
| e->Release(); | ||
| } | ||
| if (success && errorExpected) | ||
| CPPUNIT_FAIL("Expected error reading compressed file"); | ||
| } | ||
| void read(offset_t offset, size32_t size, void * data) | ||
| { | ||
| Owned<IFile> file(createIFile(testFilename)); | ||
| Owned<IFileIO> io(file->open(IFOread)); | ||
| io->read(offset, size, data); | ||
| } | ||
| void write(offset_t offset, size32_t size, void * data) | ||
| { | ||
| Owned<IFile> file(createIFile(testFilename)); | ||
| Owned<IFileIO> io(file->open(IFOwrite)); | ||
| io->write(offset, size, data); | ||
| } | ||
| void testCompressed() | ||
| { | ||
| //patch the first block with zeros | ||
| constexpr byte zeros[0x100000] = { 0 }; | ||
|
|
||
| createCompressed(); | ||
| readCompressed(false); | ||
|
|
||
| write(0, sizeof(zeros), (void *)zeros); | ||
| readCompressed(true); | ||
|
|
||
| createCompressed(); | ||
| write(0x10000, sizeof(zeros), (void *)zeros); | ||
| readCompressed(true); | ||
|
|
||
| createCompressed(); | ||
| write(0x9000, sizeof(zeros), (void *)zeros); | ||
| readCompressed(true); | ||
|
|
||
| //Test the second block being corrupted with zeros | ||
| size32_t firstBlockSize = 0; | ||
| createCompressed(); | ||
| read(4, sizeof(firstBlockSize), &firstBlockSize); | ||
| write(8+firstBlockSize, sizeof(zeros), (void *)zeros); | ||
| readCompressed(true); | ||
|
|
||
| //Test the data after the second block being corrupted with zeros | ||
| createCompressed(); | ||
| read(4, sizeof(firstBlockSize), &firstBlockSize); | ||
| write(8+4+firstBlockSize, sizeof(zeros), (void *)zeros); | ||
| readCompressed(true); | ||
|
|
||
| //Test the second block being corrupted to an invalid size | ||
| size32_t newSize = 1; | ||
| createCompressed(); | ||
| read(4, sizeof(firstBlockSize), &firstBlockSize); | ||
| write(8+firstBlockSize, sizeof(newSize), &newSize); | ||
| readCompressed(true); | ||
| } | ||
| void cleanup() | ||
| { | ||
| Owned<IFile> file(createIFile(testFilename)); | ||
| file->remove(); | ||
| } | ||
| }; | ||
|
|
||
| CPPUNIT_TEST_SUITE_REGISTRATION( JlibFileTest ); | ||
| CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( JlibFileTest, "JlibFileTest" ); | ||
|
|
||
| #endif |