@@ -2021,12 +2021,9 @@ TEST_P(WriteAndReadInteTest, TestMapStorageLayoutDefaultToSharedShreddingPartial
20212021 arrow::field (" tags" , map_type),
20222022 };
20232023 std::map<std::string, std::string> options_v0 = {
2024- {Options::MANIFEST_FORMAT , " avro" },
2025- {Options::FILE_FORMAT , file_format},
2026- {Options::TARGET_FILE_SIZE , " 1024" },
2027- {Options::BUCKET , " -1" },
2028- {Options::FILE_SYSTEM , file_system},
2029- {" fields.tags.map.storage-layout" , " default" },
2024+ {Options::MANIFEST_FORMAT , " avro" }, {Options::FILE_FORMAT , file_format},
2025+ {Options::TARGET_FILE_SIZE , " 1024" }, {Options::BUCKET , " -1" },
2026+ {Options::FILE_SYSTEM , file_system}, {" fields.tags.map.storage-layout" , " default" },
20302027 };
20312028 if (file_system == " jindo" ) {
20322029 options_v0 = AddOptionsForJindo (options_v0);
@@ -2064,8 +2061,7 @@ TEST_P(WriteAndReadInteTest, TestMapStorageLayoutDefaultToSharedShreddingPartial
20642061 ASSERT_OK (helper->WriteAndCommit (std::move (batch_v1), /* commit_identifier=*/ 1 ,
20652062 /* expected_commit_messages=*/ std::nullopt ));
20662063
2067- auto selected_keys_meta =
2068- arrow::KeyValueMetadata::Make ({DataField::MAP_SELECTED_KEYS }, {" a" });
2064+ auto selected_keys_meta = arrow::KeyValueMetadata::Make ({DataField::MAP_SELECTED_KEYS }, {" a" });
20692065 auto read_schema = arrow::schema ({
20702066 arrow::field (" id" , arrow::int32 ()),
20712067 arrow::field (" tags" , map_type)->WithMetadata (selected_keys_meta),
@@ -2142,8 +2138,7 @@ TEST_P(WriteAndReadInteTest, TestMapStorageLayoutSharedShreddingToDefaultPartial
21422138 ASSERT_OK (helper->WriteAndCommit (std::move (batch_v1), /* commit_identifier=*/ 1 ,
21432139 /* expected_commit_messages=*/ std::nullopt ));
21442140
2145- auto selected_keys_meta =
2146- arrow::KeyValueMetadata::Make ({DataField::MAP_SELECTED_KEYS }, {" a" });
2141+ auto selected_keys_meta = arrow::KeyValueMetadata::Make ({DataField::MAP_SELECTED_KEYS }, {" a" });
21472142 auto read_schema = arrow::schema ({
21482143 arrow::field (" id" , arrow::int32 ()),
21492144 arrow::field (" tags" , map_type)->WithMetadata (selected_keys_meta),
@@ -2191,10 +2186,9 @@ TEST_P(WriteAndReadInteTest, TestSharedShreddingDuplicateSelectedKeys) {
21912186 TestHelper::Create (test_dir_, arrow::schema (fields),
21922187 /* partition_keys=*/ {}, /* primary_keys=*/ {}, options,
21932188 /* is_streaming_mode=*/ false ));
2194- ASSERT_OK_AND_ASSIGN (auto batch,
2195- TestHelper::MakeRecordBatch (arrow::struct_ (fields),
2196- R"( [[1, [["a", 10], ["b", 20]]]])" ,
2197- /* partition_map=*/ {}, /* bucket=*/ 0 , {}));
2189+ ASSERT_OK_AND_ASSIGN (auto batch, TestHelper::MakeRecordBatch (
2190+ arrow::struct_ (fields), R"( [[1, [["a", 10], ["b", 20]]]])" ,
2191+ /* partition_map=*/ {}, /* bucket=*/ 0 , {}));
21982192 ASSERT_OK (helper->WriteAndCommit (std::move (batch), /* commit_identifier=*/ 0 ,
21992193 /* expected_commit_messages=*/ std::nullopt ));
22002194
0 commit comments