Skip to content

Commit 4405959

Browse files
committed
Resolve conflicts and update file_json.cc
1 parent ddc4bde commit 4405959

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ dependency-reduced-pom.xml
3333
MANIFEST
3434
compile_commands.json
3535
build.ninja
36+
build_debug/
37+
build_release/
3638

3739
# Generated Visual Studio files
3840
*.vcxproj

cpp/src/arrow/dataset/file_json.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,11 @@ Result<Future<ReaderPtr>> DoOpenReader(
301301
std::move(state->stream), state->read_options, state->parse_options);
302302
});
303303
ARROW_ASSIGN_OR_RAISE(auto future, maybe_future);
304-
return future.Then([](const ReaderPtr& reader) -> Result<ReaderPtr> { return reader; },
305-
[path = source.path()](const Status& error) -> Result<ReaderPtr> {
306-
return error.WithMessage("Could not open JSON input source '",
307-
path, "': ", error);
308-
});
304+
return future.Then([](const ReaderPtr& reader) -> Result<ReaderPtr> {
305+
return reader;
306+
}, [path = source.path()](const Status& error) -> Result<ReaderPtr> {
307+
return error.WithMessage("Could not open JSON input source '", path, "': ", error);
308+
});
309309
}
310310

311311
Future<ReaderPtr> OpenReaderAsync(

0 commit comments

Comments
 (0)