[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356480959 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ Review comment: ```suggestion WritableBatch batch) { ``` 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: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356511447 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/BatchValidator.java ## @@ -320,6 +321,19 @@ private void validateNullableVector(String name, NullableVector vector) { "Outer value count = %d, but inner value count = %d", outerCount, valueCount)); } +if (vector instanceof NullableVarCharVector) { Review comment: Could you please add these checks for other nullable `VariableWidthVector` implementations: `NullableVarBinaryVector`, `NullableVar16CharVector` and `NullableVarDecimalVector`. 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: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356482355 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, +new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); } - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), +batch.getBuffers()); } - private FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentId, final RecordBatchDef def, final ByteBuf... buffers){ + private FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentId, + RecordBatchDef def, ByteBuf... buffers){ this.buffers = buffers; -final FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() +FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() .setIsLastBatch(isLast) .setDef(def) .setQueryId(queryId) .setReceivingMajorFragmentId(receiveMajorFragmentId) .setSendingMajorFragmentId(sendMajorFragmentId) .setSendingMinorFragmentId(sendMinorFragmentId); -for(final int i : receiveMinorFragmentId){ +for(int i : receiveMinorFragmentId){ builder.addReceivingMinorFragmentId(i); } this.header = builder.build(); } - - public static FragmentWritableBatch getEmptyLast(final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId){ -return getEmptyLast(queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}); + public static FragmentWritableBatch getEmptyLast(QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId){ +return getEmptyLast(queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, new int[]{receiveMinorFragmentId}); } - public static FragmentWritableBatch getEmptyLast(final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds){ -return new FragmentWritableBatch(true, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, EMPTY_DEF); + public static FragmentWritableBatch getEmptyLast(QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds){ +return new FragmentWritableBatch(true, queryId, sendMajorFragmentId, +sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, +EMPTY_DEF); } - -
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356482206 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, +new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); } - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), +batch.getBuffers()); } - private FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentId, final RecordBatchDef def, final ByteBuf... buffers){ + private FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentId, + RecordBatchDef def, ByteBuf... buffers){ this.buffers = buffers; -final FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() +FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() .setIsLastBatch(isLast) .setDef(def) .setQueryId(queryId) .setReceivingMajorFragmentId(receiveMajorFragmentId) .setSendingMajorFragmentId(sendMajorFragmentId) .setSendingMinorFragmentId(sendMinorFragmentId); -for(final int i : receiveMinorFragmentId){ +for(int i : receiveMinorFragmentId){ builder.addReceivingMinorFragmentId(i); } this.header = builder.build(); } - - public static FragmentWritableBatch getEmptyLast(final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId){ -return getEmptyLast(queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}); + public static FragmentWritableBatch getEmptyLast(QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId){ +return getEmptyLast(queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, new int[]{receiveMinorFragmentId}); } - public static FragmentWritableBatch getEmptyLast(final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds){ -return new FragmentWritableBatch(true, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, EMPTY_DEF); + public static FragmentWritableBatch getEmptyLast(QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds){ Review comment: ```suggestion int receiveMajorFragmentId, int[] receiveMinorFragmentIds) { ``` This is an
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356481177 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, +new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); } - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds, + WritableBatch batch){ Review comment: ```suggestion WritableBatch batch) { ``` 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: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356482122 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, +new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); } - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), +batch.getBuffers()); } - private FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentId, final RecordBatchDef def, final ByteBuf... buffers){ + private FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentId, + RecordBatchDef def, ByteBuf... buffers){ this.buffers = buffers; -final FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() +FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() .setIsLastBatch(isLast) .setDef(def) .setQueryId(queryId) .setReceivingMajorFragmentId(receiveMajorFragmentId) .setSendingMajorFragmentId(sendMajorFragmentId) .setSendingMinorFragmentId(sendMinorFragmentId); -for(final int i : receiveMinorFragmentId){ +for(int i : receiveMinorFragmentId){ builder.addReceivingMinorFragmentId(i); } this.header = builder.build(); } - - public static FragmentWritableBatch getEmptyLast(final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId){ -return getEmptyLast(queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}); + public static FragmentWritableBatch getEmptyLast(QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId){ Review comment: ```suggestion int receiveMajorFragmentId, int receiveMinorFragmentId) { ``` 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: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356481536 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, +new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); } - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), +batch.getBuffers()); } - private FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentId, final RecordBatchDef def, final ByteBuf... buffers){ + private FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentId, + RecordBatchDef def, ByteBuf... buffers){ Review comment: ```suggestion RecordBatchDef def, ByteBuf... buffers) { ``` 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: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356482276 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, +new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); } - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), +batch.getBuffers()); } - private FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentId, final RecordBatchDef def, final ByteBuf... buffers){ + private FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentId, + RecordBatchDef def, ByteBuf... buffers){ this.buffers = buffers; -final FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() +FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() .setIsLastBatch(isLast) .setDef(def) .setQueryId(queryId) .setReceivingMajorFragmentId(receiveMajorFragmentId) .setSendingMajorFragmentId(sendMajorFragmentId) .setSendingMinorFragmentId(sendMinorFragmentId); -for(final int i : receiveMinorFragmentId){ +for(int i : receiveMinorFragmentId){ builder.addReceivingMinorFragmentId(i); } this.header = builder.build(); } - - public static FragmentWritableBatch getEmptyLast(final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId){ -return getEmptyLast(queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}); + public static FragmentWritableBatch getEmptyLast(QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId){ +return getEmptyLast(queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, new int[]{receiveMinorFragmentId}); } - public static FragmentWritableBatch getEmptyLast(final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds){ -return new FragmentWritableBatch(true, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, EMPTY_DEF); + public static FragmentWritableBatch getEmptyLast(QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds){ +return new FragmentWritableBatch(true, queryId, sendMajorFragmentId, +sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, +EMPTY_DEF); } - -
[GitHub] [drill] vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies
vvysotskyi commented on a change in pull request #1922: DRILL-7476: Set lastSet on TransferPair copies URL: https://github.com/apache/drill/pull/1922#discussion_r356481944 ## File path: exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java ## @@ -23,65 +23,87 @@ import org.apache.drill.exec.proto.UserBitShared.QueryId; import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef; -public class FragmentWritableBatch{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentWritableBatch.class); +public class FragmentWritableBatch { private static RecordBatchDef EMPTY_DEF = RecordBatchDef.newBuilder().setRecordCount(0).build(); private final ByteBuf[] buffers; private final FragmentRecordBatch header; - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int receiveMinorFragmentId, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int receiveMinorFragmentId, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, +new int[]{receiveMinorFragmentId}, batch.getDef(), batch.getBuffers()); } - public FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentIds, final WritableBatch batch){ -this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), batch.getBuffers()); + public FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentIds, + WritableBatch batch){ +this(isLast, queryId, sendMajorFragmentId, sendMinorFragmentId, +receiveMajorFragmentId, receiveMinorFragmentIds, batch.getDef(), +batch.getBuffers()); } - private FragmentWritableBatch(final boolean isLast, final QueryId queryId, final int sendMajorFragmentId, final int sendMinorFragmentId, final int receiveMajorFragmentId, final int[] receiveMinorFragmentId, final RecordBatchDef def, final ByteBuf... buffers){ + private FragmentWritableBatch(boolean isLast, QueryId queryId, + int sendMajorFragmentId, int sendMinorFragmentId, + int receiveMajorFragmentId, int[] receiveMinorFragmentId, + RecordBatchDef def, ByteBuf... buffers){ this.buffers = buffers; -final FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() +FragmentRecordBatch.Builder builder = FragmentRecordBatch.newBuilder() .setIsLastBatch(isLast) .setDef(def) .setQueryId(queryId) .setReceivingMajorFragmentId(receiveMajorFragmentId) .setSendingMajorFragmentId(sendMajorFragmentId) .setSendingMinorFragmentId(sendMinorFragmentId); -for(final int i : receiveMinorFragmentId){ +for(int i : receiveMinorFragmentId){ Review comment: ```suggestion for (int fragmentId : receiveMinorFragmentId) { ``` 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: us...@infra.apache.org With regards, Apache Git Services