Reuse the unused 'dataset' feature.

2 files changed, 8 insertions, 26 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/QueryResultPacket.java b/container-search/src/main/java/com/yahoo/fs4/QueryResultPacket.java
index a7d5de751b9..45a06f6b4f3 100644
--- a/container-search/src/main/java/com/yahoo/fs4/QueryResultPacket.java
+++ b/container-search/src/main/java/com/yahoo/fs4/QueryResultPacket.java
@@ -23,9 +23,6 @@ public class QueryResultPacket extends Packet {
     /** Whether mld stuff, whatever that is, is included in this result */
     private boolean mldFeature=false;
 
-    /** A feature of no apparent utility */
-    private boolean datasetFeature=false;
-
     /** Whether coverage information is included in this result */
     private boolean coverageNodes = false;
     private long  coverageDocs = 0;
@@ -47,8 +44,6 @@ public class QueryResultPacket extends Packet {
 
     private int docstamp;
 
-    private int dataset=-1;
-
     private byte[] groupData = null;
 
     private List<DocumentInfo> documents=new ArrayList<>(10);
@@ -70,9 +65,6 @@ public class QueryResultPacket extends Packet {
     /** Returns whether this has the mysterious mld feature */
     public boolean getMldFeature() { return mldFeature; }
 
-    /** Returns whether this result has the dataset feature */
-    public boolean getDatasetFeature() { return datasetFeature; }
-
     public boolean getCoverageFeature() { return true; }
 
     public long getCoverageDocs() { return coverageDocs; }
@@ -108,8 +100,11 @@ public class QueryResultPacket extends Packet {
         maxRank = decodeMaxRank(buffer);
         ints = buffer.asIntBuffer();
         docstamp=ints.get();
-        if (datasetFeature) dataset=ints.get();
         buffer.position(buffer.position() + ints.position()*4);
+        if (coverageNodes) {
+            nodesQueried = buffer.getShort();
+            nodesReplied = buffer.getShort();
+        }
         if (groupDataFeature) {
             int len = buffer.getInt();
             groupData = new byte[len];
@@ -120,10 +115,6 @@ public class QueryResultPacket extends Packet {
         activeDocs = buffer.getLong();
         soonActiveDocs = buffer.getLong();
         degradedReason = buffer.getInt();
-        if (coverageNodes) {
-            nodesQueried = buffer.getShort();
-            nodesReplied = buffer.getShort();
-        }
 
         decodeDocuments(buffer,documentCount);
         if (propsFeature) {
@@ -144,8 +135,7 @@ public class QueryResultPacket extends Packet {
      * feature bits
      */
     public static final int QRF_MLD             = 0x00000001;
-    public static final int QRF_DATASETS        = 0x00000002;
-    public static final int QRF_COVERAGE_NODES  = 0x00000004;
+    public static final int QRF_COVERAGE_NODES  = 0x00000002;
     public static final int QRF_SORTDATA        = 0x00000010;
     public static final int QRF_UNUSED_1        = 0x00000020;
     public static final int QRF_UNUSED_2        = 0x00000040;
@@ -162,7 +152,6 @@ public class QueryResultPacket extends Packet {
         case 217:
                 int features=buffer.get();
                 mldFeature       = (QRF_MLD & features) != 0;
-                datasetFeature   = (QRF_DATASETS & features) != 0;
                 // Data given by sortFeature not currently used by QRS:
                 // sortFeature   = (QRF_SORTDATA & features) != 0;
                 coverageNodes    = (QRF_COVERAGE_NODES & features) != 0;
@@ -214,8 +203,6 @@ public class QueryResultPacket extends Packet {
     // TODO: Handle new maxRank intelligently
     public int getMaxRank() { return maxRank.intValue(); }
 
-    public int getDataset() { return dataset; }
-
     public short getNodesQueried() { return nodesQueried; }
     public short getNodesReplied() { return nodesReplied; }
 
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
index 1a72216bf49..a5712f625e1 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
@@ -28,13 +28,12 @@ public class QueryResultTestCase extends junit.framework.TestCase {
                  0,0,0,100,
                  0,0,0,217-256,
                  0,0,0,1,
-                 0,0,0,3,
+                 0,0,0,1,
                  0,0,0,0,
                  0,0,0,2,
                  0,0,0,0,0,0,0,5,
                  0x40,0x39,0,0,0,0,0,0,
                  0,0,0,111,
-                 0,0,0,97,
                  0,0,0,0,0,0,0,89,
                  0,0,0,0,0,0,0,90,
                  0,0,0,0,0,0,0,91,
@@ -50,12 +49,10 @@ public class QueryResultTestCase extends junit.framework.TestCase {
         QueryResultPacket result=(QueryResultPacket)packet;
 
         assertTrue(result.getMldFeature());
-        assertTrue(result.getDatasetFeature());
 
         assertEquals(5,result.getTotalDocumentCount());
         assertEquals(25,result.getMaxRank());
         assertEquals(111,result.getDocstamp());
-        assertEquals(97,result.getDataset());
         assertEquals(89, result.getCoverageDocs());
         assertEquals(90, result.getActiveDocs());
         assertEquals(91, result.getSoonActiveDocs());
@@ -79,19 +76,17 @@ public class QueryResultTestCase extends junit.framework.TestCase {
                  0,0,0,100,
                  0,0,0,217-256,
                  0,0,0,1,
-                 0,0,0,7,
+                 0,0,0,3,
                  0,0,0,0,
                  0,0,0,2,
                  0,0,0,0,0,0,0,5,
                  0x40,0x39,0,0,0,0,0,0,
                  0,0,0,111,
-                 0,0,0,97,
+                 0,6,0,5,
                  0,0,0,0,0,0,0,89,
                  0,0,0,0,0,0,0,90,
                  0,0,0,0,0,0,0,91,
                  0,0,0,1,
-                 0,6,
-                 0,5,
                  1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0, 0,0,0,7, 0,0,0,36,
                  2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0, 0,0,0,8, 0,0,0,37
          };