paul-rogers commented on a change in pull request #1987: DRILL-7589: Set
temporary tests folder for UDF_DIRECTORY_LOCAL, fix allocators closing in
BloomFilterTest, fix permissions issue for TestGracefulShutdown tests
URL: https://github.com/apache/drill/pull/1987#discussion_r381481104
##########
File path:
exec/java-exec/src/test/java/org/apache/drill/exec/cache/TestWriteToDisk.java
##########
@@ -18,95 +18,62 @@
package org.apache.drill.exec.cache;
import java.io.File;
-import java.util.List;
+import org.apache.drill.exec.physical.rowSet.RowSet;
+import org.apache.drill.exec.physical.rowSet.RowSets;
+import org.apache.drill.exec.record.metadata.SchemaBuilder;
+import org.apache.drill.exec.record.metadata.TupleMetadata;
import org.apache.drill.shaded.guava.com.google.common.io.Files;
-import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.types.TypeProtos;
-import org.apache.drill.common.types.Types;
-import org.apache.drill.test.TestTools;
+import org.apache.drill.test.SubOperatorTest;
import org.apache.drill.exec.ExecTest;
-import org.apache.drill.exec.expr.TypeHelper;
-import org.apache.drill.exec.record.MaterializedField;
import org.apache.drill.exec.record.VectorContainer;
import org.apache.drill.exec.record.WritableBatch;
-import org.apache.drill.exec.server.Drillbit;
-import org.apache.drill.exec.server.DrillbitContext;
-import org.apache.drill.exec.server.RemoteServiceSet;
-import org.apache.drill.exec.vector.AllocationHelper;
-import org.apache.drill.exec.vector.IntVector;
-import org.apache.drill.exec.vector.ValueVector;
-import org.apache.drill.exec.vector.VarBinaryVector;
+import org.apache.drill.test.rowSet.RowSetUtilities;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.junit.Rule;
import org.junit.Test;
-import org.apache.drill.shaded.guava.com.google.common.collect.Lists;
-import org.junit.rules.TestRule;
-
-public class TestWriteToDisk extends ExecTest {
- @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(90000); //
90secs
+public class TestWriteToDisk extends SubOperatorTest {
@Test
- @SuppressWarnings("static-method")
public void test() throws Exception {
- final List<ValueVector> vectorList = Lists.newArrayList();
- final DrillConfig config = DrillConfig.create();
- try (final RemoteServiceSet serviceSet = RemoteServiceSet
- .getLocalServiceSet();
- final Drillbit bit = new Drillbit(config, serviceSet)) {
- bit.run();
- final DrillbitContext context = bit.getContext();
-
- final MaterializedField intField = MaterializedField.create("int",
Types.required(TypeProtos.MinorType.INT));
- final MaterializedField binField = MaterializedField.create("binary",
Types.required(TypeProtos.MinorType.VARBINARY));
- try (final IntVector intVector = (IntVector)
TypeHelper.getNewVector(intField, context.getAllocator());
- final VarBinaryVector binVector =
- (VarBinaryVector) TypeHelper.getNewVector(binField,
context.getAllocator())) {
- AllocationHelper.allocate(intVector, 4, 4);
- AllocationHelper.allocate(binVector, 4, 5);
- vectorList.add(intVector);
- vectorList.add(binVector);
+ VectorContainer container = expectedRowSet().container();
- intVector.getMutator().setSafe(0, 0);
- binVector.getMutator().setSafe(0, "ZERO".getBytes());
- intVector.getMutator().setSafe(1, 1);
- binVector.getMutator().setSafe(1, "ONE".getBytes());
- intVector.getMutator().setSafe(2, 2);
- binVector.getMutator().setSafe(2, "TWO".getBytes());
- intVector.getMutator().setSafe(3, 3);
- binVector.getMutator().setSafe(3, "THREE".getBytes());
- intVector.getMutator().setValueCount(4);
- binVector.getMutator().setValueCount(4);
+ WritableBatch batch =
WritableBatch.getBatchNoHVWrap(container.getRecordCount(), container, false);
- VectorContainer container = new VectorContainer();
- container.addCollection(vectorList);
- container.setRecordCount(4);
- WritableBatch batch = WritableBatch.getBatchNoHVWrap(
- container.getRecordCount(), container, false);
- VectorAccessibleSerializable wrap = new VectorAccessibleSerializable(
- batch, context.getAllocator());
+ VectorAccessibleSerializable wrap = new
VectorAccessibleSerializable(batch, fixture.allocator());
- final VectorAccessibleSerializable newWrap = new
VectorAccessibleSerializable(
- context.getAllocator());
- try (final FileSystem fs = getLocalFileSystem()) {
- final File tempDir = Files.createTempDir();
- tempDir.deleteOnExit();
- final Path path = new Path(tempDir.getAbsolutePath(),
"drillSerializable");
- try (final FSDataOutputStream out = fs.create(path)) {
- wrap.writeToStream(out);
- }
-
- try (final FSDataInputStream in = fs.open(path)) {
- newWrap.readFromStream(in);
- }
- }
+ VectorAccessibleSerializable newWrap = new
VectorAccessibleSerializable(fixture.allocator());
+ try (FileSystem fs = ExecTest.getLocalFileSystem()) {
+ File tempDir = Files.createTempDir();
Review comment:
I think the idea of the `DirTestWatcher` is that it will provide you with a
temp dir and will ensure the directory is cleaned on exit. Also, the temp dir
will be in the `target` folder, so it is cleaned on the next build, even if the
code crashes. I think you want to use `BaseTestDirWatcher.getTmpDir()`, or a
variation.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
