Release 21.1.1

Release notes are available at: https://docs.dremio.com/release-notes/

Change-Id: If2972d18d9c65b5580eeadb3cea722ccdf81d4fe

README.md

@@ -10,14 +10,43 @@ Documentation is available at https://docs.dremio.com.
 
 ### (a) Prerequisites
 
-* JDK 8 (OpenJDK or Oracle)
+* JDK 8 or 11 (OpenJDK or Oracle) as the default JDK (`JAVA_HOME` set to it)
+* JDK 8 (OpenJDK or Oracle) in Maven toolchain, required to run certain integration tests
 * (Optional) Maven 3.3.9 or later (using Homebrew: `brew install maven`)
 
 Run the following commands to verify that you have the correct versions of Maven and JDK installed:
 
     java -version
     mvn --version
 
+Add JDK 8 to the Maven toolchain, easiest to use `${HOME}/.m2/toolchains.xml`. Example:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<toolchains>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.8</version>
+      <vendor>sun</vendor>
+    </provides>
+    <configuration>
+      <jdkHome>FULL_PATH_TO_YOUR_JAVA_8_HOME</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>11</version>
+      <vendor>sun</vendor>
+    </provides>
+    <configuration>
+      <jdkHome>FULL_PATH_TO_YOUR_JAVA_11_HOME</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>
+```
+
 ### (b) Clone the Repository
 
     git clone https://github.com/dremio/dremio-oss.git dremio
@@ -69,4 +98,3 @@ The distribution directory will be `distribution/server/target/dremio-oss-{DREMI
 ## Questions?
 
 If you have questions, please post them on https://community.dremio.com.
-

client/base/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.dremio.client</groupId>
     <artifactId>dremio-client-parent</artifactId>
-    <version>20.1.0-202202061055110045-36733c65</version>
+    <version>21.1.1-202204292111390812-57b1832f</version>
   </parent>
 
   <artifactId>dremio-client-base</artifactId>
@@ -87,11 +87,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -107,6 +102,12 @@
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 

client/base/src/main/java/com/dremio/sabot/rpc/user/BaseBackwardsCompatibilityHandler.java

@@ -112,7 +112,7 @@ protected ByteBuf[] sliceIfNecessary(QueryBatch batch) {
       }
       vc.buildSchema();
       vc.setAllCount(batch.getHeader().getRowCount());
-      buf.release();
+      buf.close();
       return WritableBatch.get(vc).getBuffers();
     }
   }

client/base/src/main/java/com/dremio/sabot/rpc/user/QueryDataBatch.java

@@ -33,7 +33,7 @@ public QueryDataBatch(QueryData header, ArrowBuf data) {
     this.header = header;
     this.data = data;
     if (this.data != null) {
-      data.retain(1);
+      data.getReferenceManager().retain(1);
     }
   }
 
@@ -55,7 +55,7 @@ public void release() {
     }
 
     if (data != null) {
-      data.release(1);
+      data.getReferenceManager().release(1);
     }
   }
 

client/base/src/test/java/com/dremio/sabot/rpc/user/TestBackwardsCompatibilityHandler.java

@@ -146,7 +146,7 @@ public void testConvertBitsToBytes() {
       bits.setValueCount(count);
 
       ArrowBuf oldBuf = bits.getDataBuffer();
-      oldBuf.retain();
+      oldBuf.getReferenceManager().retain();
       SerializedField.Builder fieldBuilder = TypeHelper.getMetadataBuilder(bits);
       ArrowBuf newBuf = convertBitsToBytes(allocator, fieldBuilder, NettyArrowBuf.unwrapBuffer(oldBuf)).arrowBuf();
       bytes.setValueCount(count);
@@ -155,7 +155,7 @@ public void testConvertBitsToBytes() {
       for (int i = 0; i < count ; i++) {
         assertEquals(i % 2, bytes.get(i));
       }
-      newBuf.release();
+      newBuf.close();
     }
   }
 
@@ -232,7 +232,7 @@ public void testPatchDecimal() {
     assertEquals(bd, decimal8);
 
     final ArrowBuf validityBuffer = decimalVector.getValidityBuffer();
-    validityBuffer.release();
+    validityBuffer.close();
     newBuffer.release();
   }
 
@@ -251,7 +251,7 @@ public void testPadValues() {
       bytes.setValueCount(count * 8);
 
       ArrowBuf oldBuf = bytes.getDataBuffer();
-      oldBuf.retain();
+      oldBuf.getReferenceManager().retain();
       SerializedField.Builder fieldBuilder = TypeHelper.getMetadataBuilder(bytes);
       ArrowBuf newBuf = padValues(allocator, fieldBuilder, NettyArrowBuf.unwrapBuffer(oldBuf), originalTypeByteWidth,
         targetTypeByteWidth).arrowBuf();
@@ -264,7 +264,7 @@ public void testPadValues() {
           assertEquals((i * 8 + byteIndex) % 8, bytes.get(i * 12 + byteIndex));
         }
       }
-      newBuf.release();
+      newBuf.close();
     }
   }
 }

client/jdbc/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.dremio.client</groupId>
     <artifactId>dremio-client-parent</artifactId>
-    <version>20.1.0-202202061055110045-36733c65</version>
+    <version>21.1.1-202204292111390812-57b1832f</version>
   </parent>
   <artifactId>dremio-client-jdbc</artifactId>
   <name>Client - JDBC Driver</name>
@@ -107,6 +107,11 @@
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

client/jdbc/src/main/java/com/dremio/jdbc/impl/DremioCursor.java

@@ -299,7 +299,7 @@ void close() {
         QueryDataBatch qdb = batchQueue.poll();
         // This correctly skips over the END_OF_STREAM_MESSAGE as it has null data.
         if (qdb != null && qdb.getData() != null) {
-          qdb.getData().release();
+          qdb.getData().close();
         }
       }
 

client/jdbc/src/test/java/com/dremio/exec/vector/accessor/GenericAccessorTest.java

@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;