timoninmaxim commented on code in PR #11118:
URL: https://github.com/apache/ignite/pull/11118#discussion_r1466021767
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/WriteOnlyZipFileIOFactory.java:
##########
@@ -29,8 +32,20 @@ public class WriteOnlyZipFileIOFactory implements
FileIOFactory {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private final BufferedFileIOFactory factory;
Review Comment:
Just `FileIOFactory`
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/WriteOnlyZipFileIO.java:
##########
@@ -17,142 +17,57 @@
package org.apache.ignite.internal.processors.cache.persistence.snapshot.dump;
-import java.io.BufferedOutputStream;
-import java.io.File;
import java.io.IOException;
+import java.io.OutputStream;
import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.WritableByteChannel;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import
org.apache.ignite.internal.processors.cache.persistence.file.AbstractFileIO;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
-import org.apache.ignite.internal.util.typedef.internal.A;
+import
org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
import static java.util.zip.Deflater.BEST_COMPRESSION;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.ZIP_SUFFIX;
/**
* {@link FileIO} that allows to write ZIP compressed file.
* It doesn't support reading or random access.
* It is not designed for writing concurrently from several threads.
*/
-public class WriteOnlyZipFileIO extends AbstractFileIO {
+public class WriteOnlyZipFileIO extends FileIODecorator {
/** */
private final ZipOutputStream zos;
/** */
- private final WritableByteChannel ch;
+ public WriteOnlyZipFileIO(BufferedFileIO fileIO, String entryName) throws
IOException {
+ super(fileIO);
- /** */
- private long pos;
-
- /** */
- public WriteOnlyZipFileIO(File file) throws IOException {
- A.ensure(file.getName().endsWith(ZIP_SUFFIX), "File name should end
with " + ZIP_SUFFIX);
-
- String entryName = file.getName().substring(0, file.getName().length()
- ZIP_SUFFIX.length());
+ zos = new ZipOutputStream(new OutputStream() {
+ @Override public void write(byte[] b, int off, int len) throws
IOException {
+ fileIO.write(b, off, len);
+ }
- zos = new ZipOutputStream(new
BufferedOutputStream(Files.newOutputStream(Paths.get(file.getPath()))));
+ @Override public void write(int b) throws IOException {
+ fileIO.write((byte)b);
+ }
+ });
zos.setLevel(BEST_COMPRESSION);
zos.putNextEntry(new ZipEntry(entryName));
-
- ch = Channels.newChannel(zos);
- }
-
- /** {@inheritDoc} */
- @Override public long position() throws IOException {
- return pos;
- }
-
- /** {@inheritDoc} */
- @Override public void position(long newPosition) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- /** {@inheritDoc} */
- @Override public int read(ByteBuffer destBuf) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- /** {@inheritDoc} */
- @Override public int read(ByteBuffer destBuf, long position) throws
IOException {
- throw new UnsupportedOperationException();
- }
-
- /** {@inheritDoc} */
- @Override public int read(byte[] buf, int off, int len) throws IOException
{
- throw new UnsupportedOperationException();
}
/** {@inheritDoc} */
@Override public int write(ByteBuffer srcBuf) throws IOException {
- int written = ch.write(srcBuf);
-
- pos += written;
-
- return written;
- }
-
- /** {@inheritDoc} */
- @Override public int write(ByteBuffer srcBuf, long position) throws
IOException {
- throw new UnsupportedOperationException();
- }
+ int len = srcBuf.remaining();
- /** {@inheritDoc} */
- @Override public int write(byte[] buf, int off, int len) throws
IOException {
- throw new UnsupportedOperationException();
- }
+ zos.write(srcBuf.array(), srcBuf.position(), len);
- /** {@inheritDoc} */
- @Override public MappedByteBuffer map(int sizeBytes) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- /** {@inheritDoc} */
- @Override public void force(boolean withMetadata) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- /** {@inheritDoc} */
- @Override public void force() throws IOException {
- force(false);
- }
-
- /** {@inheritDoc} */
- @Override public long size() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- /** {@inheritDoc} */
- @Override public void clear() throws IOException {
- throw new UnsupportedOperationException();
+ return len;
Review Comment:
It looks dangerous. We must return _actual_ number of written bytes. ZOS
have `written` variable, looks we should to work with it, or receive the bytes
number by some other way (for example store the counter locally in this class).
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/WriteOnlyZipFileIO.java:
##########
@@ -17,142 +17,57 @@
package org.apache.ignite.internal.processors.cache.persistence.snapshot.dump;
-import java.io.BufferedOutputStream;
-import java.io.File;
import java.io.IOException;
+import java.io.OutputStream;
import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.WritableByteChannel;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import
org.apache.ignite.internal.processors.cache.persistence.file.AbstractFileIO;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
-import org.apache.ignite.internal.util.typedef.internal.A;
+import
org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
import static java.util.zip.Deflater.BEST_COMPRESSION;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.ZIP_SUFFIX;
/**
* {@link FileIO} that allows to write ZIP compressed file.
* It doesn't support reading or random access.
* It is not designed for writing concurrently from several threads.
*/
-public class WriteOnlyZipFileIO extends AbstractFileIO {
+public class WriteOnlyZipFileIO extends FileIODecorator {
/** */
private final ZipOutputStream zos;
/** */
- private final WritableByteChannel ch;
+ public WriteOnlyZipFileIO(BufferedFileIO fileIO, String entryName) throws
IOException {
Review Comment:
Just `FileIO`
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/BufferedFileIO.java:
##########
@@ -0,0 +1,130 @@
+/*
+ * 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.ignite.internal.processors.cache.persistence.snapshot.dump;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
+import
org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
+import org.apache.ignite.internal.util.typedef.internal.A;
+
+/**
+ * The class implements a {@link FileIO} that allows to write bytes to the
underlying {@link FileIO} without necessarily
+ * causing a call to the underlying system for each byte written.
+ * It doesn't support reading or random access. It is not designed for writing
concurrently from several threads.
+ */
+public class BufferedFileIO extends FileIODecorator {
+ /** */
+ private ByteBuffer buf;
+
+ /** */
+ public BufferedFileIO(FileIO fileIO, int bufSz) {
+ super(fileIO);
+
+ A.ensure(fileIO != null, "fileIO must not be null");
+ A.ensure(bufSz > 0, "bufSz must be positive");
+
+ buf = ByteBuffer.allocateDirect(bufSz);
+ }
+
+ /** {@inheritDoc} */
+ @Override public int write(ByteBuffer srcBuf) throws IOException {
+ if (buf == null)
+ throw new IOException("FileIO closed");
+
+ int bytesCnt = srcBuf.remaining();
+
+ int limit = srcBuf.limit();
+
+ while (srcBuf.hasRemaining()) {
+ if (srcBuf.remaining() > buf.remaining())
+ srcBuf.limit(srcBuf.position() + buf.remaining());
+
+ buf.put(srcBuf);
+
+ if (!buf.hasRemaining())
+ flush();
+
+ srcBuf.limit(limit);
+ }
+
+ return bytesCnt;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int write(byte[] srcBuf, int off, int len) throws
IOException {
+ if (buf == null)
+ throw new IOException("FileIO closed");
+
+ if ((len | off) < 0 || len > srcBuf.length - off)
+ throw new IndexOutOfBoundsException("Range [" + off + ", " + off +
" + " + len + ") out of bounds for length " + srcBuf.length);
+
+ int p = off;
+
+ while (p < off + len) {
+ int bytesCnt = Math.min(buf.remaining(), off + len - p);
+
+ buf.put(srcBuf, p, bytesCnt);
+
+ if (!buf.hasRemaining())
+ flush();
+
+ p += bytesCnt;
+ }
+
+ return len;
+ }
+
+ /**
+ * Writes one byte.
+ * @throws IOException If some I/O error occurs.
+ */
+ public void write(byte b) throws IOException {
+ if (buf == null)
+ throw new IOException("FileIO closed");
+
+ buf.put(b);
+
+ if (!buf.hasRemaining())
+ flush();
+ }
+
+ /** */
+ private void flush() throws IOException {
+ if (buf == null)
+ return;
+
+ buf.flip();
+
+ if (buf.hasRemaining()) {
Review Comment:
Do we need this check?
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/BufferedFileIO.java:
##########
@@ -0,0 +1,130 @@
+/*
+ * 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.ignite.internal.processors.cache.persistence.snapshot.dump;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
+import
org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
+import org.apache.ignite.internal.util.typedef.internal.A;
+
+/**
+ * The class implements a {@link FileIO} that allows to write bytes to the
underlying {@link FileIO} without necessarily
+ * causing a call to the underlying system for each byte written.
+ * It doesn't support reading or random access. It is not designed for writing
concurrently from several threads.
+ */
+public class BufferedFileIO extends FileIODecorator {
+ /** */
+ private ByteBuffer buf;
+
+ /** */
+ public BufferedFileIO(FileIO fileIO, int bufSz) {
+ super(fileIO);
+
+ A.ensure(fileIO != null, "fileIO must not be null");
+ A.ensure(bufSz > 0, "bufSz must be positive");
+
+ buf = ByteBuffer.allocateDirect(bufSz);
+ }
+
+ /** {@inheritDoc} */
+ @Override public int write(ByteBuffer srcBuf) throws IOException {
+ if (buf == null)
+ throw new IOException("FileIO closed");
+
+ int bytesCnt = srcBuf.remaining();
+
+ int limit = srcBuf.limit();
+
+ while (srcBuf.hasRemaining()) {
+ if (srcBuf.remaining() > buf.remaining())
+ srcBuf.limit(srcBuf.position() + buf.remaining());
+
+ buf.put(srcBuf);
+
+ if (!buf.hasRemaining())
+ flush();
+
+ srcBuf.limit(limit);
+ }
+
+ return bytesCnt;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int write(byte[] srcBuf, int off, int len) throws
IOException {
+ if (buf == null)
+ throw new IOException("FileIO closed");
+
+ if ((len | off) < 0 || len > srcBuf.length - off)
+ throw new IndexOutOfBoundsException("Range [" + off + ", " + off +
" + " + len + ") out of bounds for length " + srcBuf.length);
+
+ int p = off;
+
+ while (p < off + len) {
+ int bytesCnt = Math.min(buf.remaining(), off + len - p);
+
+ buf.put(srcBuf, p, bytesCnt);
+
+ if (!buf.hasRemaining())
+ flush();
+
+ p += bytesCnt;
+ }
+
+ return len;
+ }
+
+ /**
+ * Writes one byte.
+ * @throws IOException If some I/O error occurs.
+ */
+ public void write(byte b) throws IOException {
+ if (buf == null)
+ throw new IOException("FileIO closed");
+
+ buf.put(b);
+
+ if (!buf.hasRemaining())
+ flush();
+ }
+
+ /** */
+ private void flush() throws IOException {
+ if (buf == null)
+ return;
+
+ buf.flip();
+
+ if (buf.hasRemaining()) {
+ if (delegate.writeFully(buf) < 0)
+ throw new IOException("Couldn't write data");
+ }
+
+ buf.limit(buf.capacity()).position(0);
Review Comment:
`buf.clear();`
--
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]
