Make vespa-stat use bucketSpace.

3 files changed, 8 insertions, 8 deletions

diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsPrinter.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsPrinter.java
index c412ed48bb5..2b271af5289 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsPrinter.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsPrinter.java
@@ -23,19 +23,19 @@ public class BucketStatsPrinter {
         this.out = out;
     }
 
-    public void retrieveAndPrintBucketStats(ClientParameters.SelectionType type, String id, boolean dumpData) throws BucketStatsException {
+    public void retrieveAndPrintBucketStats(ClientParameters.SelectionType type, String id, boolean dumpData, String bucketSpace) throws BucketStatsException {
         BucketId bucketId = retriever.getBucketIdForType(type, id);
         if (type == ClientParameters.SelectionType.GROUP || type == ClientParameters.SelectionType.USER) {
             out.printf("Generated 32-bit bucket id: %s\n", bucketId);
         }
 
-        List<GetBucketListReply.BucketInfo> bucketList = retriever.retrieveBucketList(bucketId);
+        List<GetBucketListReply.BucketInfo> bucketList = retriever.retrieveBucketList(bucketId, bucketSpace);
         printBucketList(bucketList);
 
         if (dumpData) {
             for (GetBucketListReply.BucketInfo bucketInfo : bucketList) {
                 BucketId bucket = bucketInfo.getBucketId();
-                String bucketStats = retriever.retrieveBucketStats(type, id, bucket);
+                String bucketStats = retriever.retrieveBucketStats(type, id, bucket, bucketSpace);
                 printBucketStats(bucket, bucketStats);
             }
         }
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java
index f0d79e577c9..1c855455a37 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java
@@ -87,15 +87,15 @@ public class BucketStatsRetriever {
         }
     }
 
-    public String retrieveBucketStats(ClientParameters.SelectionType type, String id, BucketId bucketId) throws BucketStatsException {
+    public String retrieveBucketStats(ClientParameters.SelectionType type, String id, BucketId bucketId, String bucketSpace) throws BucketStatsException {
         String documentSelection = createDocumentSelection(type, id);
-        StatBucketMessage msg = new StatBucketMessage(bucketId, documentSelection);
+        StatBucketMessage msg = new StatBucketMessage(bucketId, bucketSpace, documentSelection);
         StatBucketReply statBucketReply = sendMessage(msg, StatBucketReply.class);
         return statBucketReply.getResults();
     }
 
-    public List<GetBucketListReply.BucketInfo> retrieveBucketList(BucketId bucketId) throws BucketStatsException {
-        GetBucketListMessage msg = new GetBucketListMessage(bucketId);
+    public List<GetBucketListReply.BucketInfo> retrieveBucketList(BucketId bucketId, String bucketSpace) throws BucketStatsException {
+        GetBucketListMessage msg = new GetBucketListMessage(bucketId, bucketSpace);
         GetBucketListReply bucketListReply = sendMessage(msg, GetBucketListReply.class);
         return bucketListReply.getBuckets();
     }
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java
index 4e53fdc6a97..57f3ab20186 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java
@@ -24,7 +24,7 @@ public class Main {
                     params.route,
                     createShutdownHookRegistrar());
             BucketStatsPrinter printer = new BucketStatsPrinter(retriever, System.out);
-            printer.retrieveAndPrintBucketStats(params.selectionType, params.id, params.dumpData);
+            printer.retrieveAndPrintBucketStats(params.selectionType, params.id, params.dumpData, params.bucketSpace);
         } catch (IllegalArgumentException e) {
             System.err.printf("Failed to parse command line arguments: %s.\n", e.getMessage());
         } catch (BucketStatsException e) {