adoroszlai commented on code in PR #3242:
URL: https://github.com/apache/ozone/pull/3242#discussion_r852926617
##########
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/ContentGenerator.java:
##########
@@ -48,38 +49,125 @@ public class ContentGenerator {
private final byte[] buffer;
- ContentGenerator(long keySize, int bufferSize) {
- this(keySize, bufferSize, bufferSize);
+ /**
+ * Issue Hsync after every write ( Cannot be used with Hflush ).
+ */
+ private final boolean hSync;
+
+ /**
+ * Issue Hflush after every write ( Cannot be used with Hsync ).
+ */
+ private final boolean hFlush;
Review Comment:
Replacing these with a single instance of `Flags` would simplify the code.
##########
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/ContentGenerator.java:
##########
@@ -48,38 +49,125 @@ public class ContentGenerator {
private final byte[] buffer;
- ContentGenerator(long keySize, int bufferSize) {
- this(keySize, bufferSize, bufferSize);
+ /**
+ * Issue Hsync after every write ( Cannot be used with Hflush ).
+ */
+ private final boolean hSync;
+
+ /**
+ * Issue Hflush after every write ( Cannot be used with Hsync ).
+ */
+ private final boolean hFlush;
+
+ /**
+ * Type of flags.
+ */
+ public enum Flags {
+ hSync,
+ hFlush,
+ None,
}
- ContentGenerator(long keySize, int bufferSize, int copyBufferSize) {
- this.keySize = keySize;
- this.bufferSize = bufferSize;
- this.copyBufferSize = copyBufferSize;
+ ContentGenerator(Builder objectBuild) {
+ this.keySize = objectBuild.keySize;
+ this.bufferSize = objectBuild.bufferSize;
+ this.copyBufferSize = objectBuild.copyBufferSize;
+ this.hSync = objectBuild.hSync;
+ this.hFlush = objectBuild.hFlush;
buffer = RandomStringUtils.randomAscii(bufferSize)
.getBytes(StandardCharsets.UTF_8);
}
- /**
- * Write the required bytes to the output stream.
- */
+
public void write(OutputStream outputStream) throws IOException {
- for (long nrRemaining = keySize;
- nrRemaining > 0; nrRemaining -= bufferSize) {
+ for (long nrRemaining = keySize; nrRemaining > 0;
+ nrRemaining -= bufferSize) {
int curSize = (int) Math.min(bufferSize, nrRemaining);
if (copyBufferSize == 1) {
for (int i = 0; i < curSize; i++) {
outputStream.write(buffer[i]);
+ flushOrSync(outputStream);
}
} else {
+ /**
+ * Write the required bytes to the output stream.
+ */
for (int i = 0; i < curSize; i += copyBufferSize) {
- outputStream.write(buffer, i,
- Math.min(copyBufferSize, curSize - i));
+ outputStream.write(buffer, i, Math.min(copyBufferSize, curSize - i));
+ flushOrSync(outputStream);
}
}
}
}
+ private void flushOrSync(OutputStream outputStream) throws IOException {
+ if (outputStream instanceof FSDataOutputStream) {
+ if (hSync) {
+ ((FSDataOutputStream) outputStream).hsync();
+ } else if (hFlush) {
+ ((FSDataOutputStream) outputStream).hflush();
+ }
+ }
+ }
+
+ /**
+ * Builder Class for Content generator.
+ */
+ public static class Builder {
+
+ private long keySize = 1024;
+ private int bufferSize = 1024;
+ private int copyBufferSize = 1024;
+ private boolean hSync = false;
+ private boolean hFlush = false;
+ private String flushMode;
+
+ public Builder seyKeySize(long keysize) {
+ this.keySize = keysize;
+ return this;
+ }
+
+ public Builder setBufferSize(int buffersize) {
+ this.bufferSize = buffersize;
+ return this;
+ }
+
+ public Builder setCopyBufferSize(int copybuffersize) {
+ this.copyBufferSize = copybuffersize;
+ return this;
+ }
+
+ /**
+ * Type of flags permitted
+ * 1. hSync
+ * 2. hFlush
+ * 3. None.
+ */
+ public Builder setFlushMode(String flushmode) {
+ this.flushMode = flushmode;
+ Flags type = Flags.valueOf(flushmode);
Review Comment:
I think it would be better to pass an instance of the enum to this method,
enforcing type safety.
##########
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/ContentGenerator.java:
##########
@@ -48,38 +49,125 @@ public class ContentGenerator {
private final byte[] buffer;
- ContentGenerator(long keySize, int bufferSize) {
- this(keySize, bufferSize, bufferSize);
+ /**
+ * Issue Hsync after every write ( Cannot be used with Hflush ).
+ */
+ private final boolean hSync;
+
+ /**
+ * Issue Hflush after every write ( Cannot be used with Hsync ).
+ */
+ private final boolean hFlush;
+
+ /**
+ * Type of flags.
+ */
+ public enum Flags {
Review Comment:
I think `FlushMode` would be a better name.
##########
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/ContentGenerator.java:
##########
@@ -48,38 +49,125 @@ public class ContentGenerator {
private final byte[] buffer;
- ContentGenerator(long keySize, int bufferSize) {
- this(keySize, bufferSize, bufferSize);
+ /**
+ * Issue Hsync after every write ( Cannot be used with Hflush ).
+ */
+ private final boolean hSync;
+
+ /**
+ * Issue Hflush after every write ( Cannot be used with Hsync ).
+ */
+ private final boolean hFlush;
+
+ /**
+ * Type of flags.
+ */
+ public enum Flags {
+ hSync,
+ hFlush,
+ None,
Review Comment:
Constants are usually preferred in `CAPS`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
