-
Notifications
You must be signed in to change notification settings - Fork 3
Initial HDFS Readers and Writers implementation. #12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 8 commits
e4e6f93
f6d3a9d
c6ffa46
ea6f1b4
faff282
46e03ab
a810b0a
fc53eac
9dfbd66
d86a518
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
| package org.apache.spark.streaming.storage | ||
|
|
||
| private[streaming] case class FileSegment (path: String, offset: Long, length: Int) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
| package org.apache.spark.streaming.storage | ||
|
|
||
| import org.apache.hadoop.conf.Configuration | ||
| import org.apache.hadoop.fs.{FSDataInputStream, FSDataOutputStream, Path} | ||
|
|
||
| private[streaming] object HdfsUtils { | ||
|
|
||
| def getOutputStream(path: String): FSDataOutputStream = { | ||
| // HDFS is not thread-safe when getFileSystem is called, so synchronize on that | ||
|
|
||
| val dfsPath = new Path(path) | ||
| val conf = new Configuration() | ||
| val dfs = | ||
| this.synchronized { | ||
| dfsPath.getFileSystem(conf) | ||
| } | ||
| // If the file exists and we have append support, append instead of creating a new file | ||
| val stream: FSDataOutputStream = { | ||
| if (dfs.isFile(dfsPath)) { | ||
| if (conf.getBoolean("hdfs.append.support", false)) { | ||
| dfs.append(dfsPath) | ||
| } else { | ||
| throw new IllegalStateException("File exists and there is no append support!") | ||
| } | ||
| } else { | ||
| dfs.create(dfsPath) | ||
| } | ||
| } | ||
| stream | ||
| } | ||
|
|
||
| def getInputStream(path: String): FSDataInputStream = { | ||
| val dfsPath = new Path(path) | ||
| val dfs = this.synchronized { | ||
| dfsPath.getFileSystem(new Configuration()) | ||
| } | ||
| val instream = dfs.open(dfsPath) | ||
| instream | ||
| } | ||
|
|
||
| def checkState(state: Boolean, errorMsg: => String) { | ||
| if(!state) { | ||
| throw new IllegalStateException(errorMsg) | ||
| } | ||
| } | ||
|
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
| package org.apache.spark.streaming.storage | ||
|
|
||
| import java.io.Closeable | ||
|
|
||
| private[streaming] class WriteAheadLogRandomReader(val path: String) extends Closeable { | ||
|
|
||
| val instream = HdfsUtils.getInputStream(path) | ||
| var closed = false | ||
|
|
||
| def read(segment: FileSegment): Array[Byte] = synchronized { | ||
| assertOpen() | ||
| instream.seek(segment.offset) | ||
| val nextLength = instream.readInt() | ||
| HdfsUtils.checkState(nextLength == segment.length, | ||
| "Expected message length to be " + segment.length + ", " + "but was " + nextLength) | ||
| val buffer = new Array[Byte](nextLength) | ||
| instream.readFully(buffer) | ||
| buffer | ||
| } | ||
|
|
||
| override def close() = synchronized { | ||
| closed = true | ||
| instream.close() | ||
| } | ||
|
|
||
| private def assertOpen() { | ||
| HdfsUtils.checkState(!closed, "Stream is closed. Create a new Reader to read from the file.") | ||
| } | ||
| } | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
| package org.apache.spark.streaming.storage | ||
|
|
||
| import java.io.Closeable | ||
|
|
||
| private[streaming] class WriteAheadLogReader(val path: String) | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any need for path to be public? |
||
| extends Iterator[Array[Byte]] with Closeable { | ||
|
|
||
| val instream = HdfsUtils.getInputStream(path) | ||
| var closed = false | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Both of these should be private! |
||
| private var nextItem: Option[Array[Byte]] = None | ||
|
|
||
| override def hasNext: Boolean = synchronized { | ||
| assertOpen() | ||
| if (nextItem.isDefined) { // handle the case where hasNext is called without calling next | ||
| true | ||
| } else { | ||
| val available = instream.available() | ||
| if (available < 4) { // Length of next block (which is an Int = 4 bytes) of data is unavailable! | ||
| false | ||
| } | ||
| val length = instream.readInt() | ||
| if (instream.available() < length) { | ||
| false | ||
| } | ||
| val buffer = new Array[Byte](length) | ||
| instream.readFully(buffer) | ||
| nextItem = Some(buffer) | ||
| true | ||
| } | ||
| } | ||
|
|
||
| override def next(): Array[Byte] = synchronized { | ||
| // TODO: Possible error case where there are not enough bytes in the stream | ||
| // TODO: How to handle that? | ||
| val data = nextItem.getOrElse { | ||
| throw new IllegalStateException("next called without calling hasNext or after hasNext " + | ||
| "returned false") | ||
| } | ||
| nextItem = None // Ensure the next hasNext call loads new data. | ||
| data | ||
| } | ||
|
|
||
| override def close() = synchronized { | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| closed = true | ||
| instream.close() | ||
| } | ||
|
|
||
| private def assertOpen() { | ||
| HdfsUtils.checkState(!closed, "Stream is closed. Create a new Reader to read from the " + | ||
| "file.") | ||
| } | ||
|
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
| package org.apache.spark.streaming.storage | ||
|
|
||
| import java.io.Closeable | ||
|
|
||
| private[streaming] class WriteAheadLogWriter(val path: String) extends Closeable { | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there a need for path to be public? |
||
| val stream = HdfsUtils.getOutputStream(path) | ||
| var nextOffset = stream.getPos | ||
| var closed = false | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. All these variables should be prviate. |
||
|
|
||
| // Data is always written as: | ||
| // - Length - Long | ||
| // - Data - of length = Length | ||
| def write(data: Array[Byte]): FileSegment = synchronized { | ||
| assertOpen() | ||
| val segment = new FileSegment(path, nextOffset, data.length) | ||
| stream.writeInt(data.length) | ||
| stream.write(data) | ||
| stream.hflush() | ||
| nextOffset = stream.getPos | ||
| segment | ||
| } | ||
|
|
||
| override private[streaming] def close(): Unit = synchronized { | ||
| closed = true | ||
| stream.close() | ||
| } | ||
|
|
||
| private def assertOpen() { | ||
| HdfsUtils.checkState(!closed, "Stream is closed. Create a new Writer to write to file.") | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this really need to be a separate function?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to avoid the String concat cost. This accomplishes the same thing as Preconditions.checkArgument in Guava, but that being Java does not have pass by name.