/**
 * 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.drill.exec.rpc.user;

import io.netty.buffer.DrillBuf;

import org.apache.drill.exec.proto.UserBitShared.QueryData;

public class QueryDataBatch {
  // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryDataBatch.class);

  private final QueryData header;
  private final DrillBuf data;

  public QueryDataBatch(QueryData header, DrillBuf data) {
    // logger.debug("New Result Batch with header {} and data {}", header, data);
    this.header = header;
    this.data = data;
    if (this.data != null) {
      data.retain(1);
    }
  }

  public QueryData getHeader() {
    return header;
  }

  public DrillBuf getData() {
    return data;
  }

  public boolean hasData() {
    return data != null;
  }

  public void release() {
    if (data != null) {
      data.release(1);
    }
  }

  @Override
  public String toString() {
    return "QueryResultBatch [header=" + header + ", data=" + data + "]";
  }
}

@@ -871,16 +871,67 @@
 llBuf;%0A%0A
+import java.util.concurrent.atomic.AtomicBoolean;%0A%0A
 import o
@@ -982,16 +982,16 @@
 ryData;%0A
-
 %0Apublic 
@@ -1187,16 +1187,83 @@
 uf data;
+%0A  private final AtomicBoolean released = new AtomicBoolean(false);
 %0A%0A  publ
@@ -1671,24 +1671,24 @@
  null;%0A  %7D%0A%0A
-
   public voi
@@ -1697,24 +1697,156 @@
 release() %7B%0A
+    if (!released.compareAndSet(false, true)) %7B%0A      throw new IllegalStateException(%22QueryDataBatch was released twice.%22);%0A    %7D%0A%0A
     if (data

Add assertion around QueryDataBatch release to ensure that we're not releasing the buffers twice.