Remove carriage return

3 files changed, 315 insertions, 315 deletions

diff --git a/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java b/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java
index 0e3e80b2542..c49109762e6 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java
@@ -1,205 +1,205 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vdslib;

-

-import com.yahoo.document.BucketId;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class BucketDistribution {

-

-    // A logger object to enable proper logging.

-    private static Logger log = Logger.getLogger(BucketDistribution.class.getName());

-

-    // A map from bucket id to column index.

-    private int[] bucketToColumn;

-

-    // The number of columns to distribute to.

-    private int numColumns;

-

-    // The number of bits to use for bucket identification.

-    private int numBucketBits;

-

-    /**

-     * Constructs a new bucket distribution object with a given number of columns and buckets.

-     *

-     * @param numColumns    The number of columns to distribute to.

-     * @param numBucketBits The number of bits to use for bucket id.

-     */

-    public BucketDistribution(int numColumns, int numBucketBits) {

-        this.numBucketBits = numBucketBits;

-        bucketToColumn = new int[getNumBuckets()];

-        reset();

-        setNumColumns(numColumns);

-    }

-

-    /**

-     * Constructs a new bucket distribution object as a copy of another.

-     *

-     * @param other The distribution object to copy.

-     */

-    public BucketDistribution(BucketDistribution other) {

-        bucketToColumn = other.bucketToColumn.clone();

-        numColumns = other.numColumns;

-        numBucketBits = other.numBucketBits;

-    }

-

-    /**

-     * Returns the number of buckets that the given number of bucket bits will allow.

-     *

-     * @param numBucketBits The number of bits to use for bucket id.

-     * @return The number of buckets allowed.

-     */

-    private static int getNumBuckets(int numBucketBits) {

-        return 1 << numBucketBits;

-    }

-

-    /**

-     * This method returns a list that contains the distributions of the given number of buckets over the given number

-     * of columns.

-     *

-     * @param numColumns    The number of columns to distribute to.

-     * @param numBucketBits The number of bits to use for bucket id.

-     * @return The bucket distribution.

-     */

-    private static List<Integer> getBucketCount(int numColumns, int numBucketBits) {

-        List<Integer> ret = new ArrayList<Integer>(numColumns);

-        int cnt = getNumBuckets(numBucketBits) / numColumns;

-        int rst = getNumBuckets(numBucketBits) % numColumns;

-        for (int i = 0; i < numColumns; ++i) {

-            ret.add(cnt + (i < rst ? 1 : 0));

-        }

-        return ret;

-    }

-

-    /**

-     * This method returns a list similar to {@link com.yahoo.vdslib.BucketDistribution#getBucketCount(int, int)}, except that the returned list

-     * contains the number of buckets that will have to be migrated from each column if an additional column was added.

-     *

-     * @param numColumns    The original number of columns.

-     * @param numBucketBits The number of bits to use for bucket id.

-     * @return The number of buckets to migrate, one value per column.

-     */

-    private static List<Integer> getBucketMigrateCount(int numColumns, int numBucketBits) {

-        List<Integer> ret = getBucketCount(numColumns++, numBucketBits);

-        int cnt = getNumBuckets(numBucketBits) / numColumns;

-        int rst = getNumBuckets(numBucketBits) % numColumns;

-        for (int i = 0; i < numColumns - 1; ++i) {

-            ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0)));

-        }

-        return ret;

-    }

-

-    /**

-     * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so

-     * that it all buckets point to that single column.

-     */

-    public void reset() {

-        for (int i = 0; i < bucketToColumn.length; ++i) {

-            bucketToColumn[i] = 0;

-        }

-        numColumns = 1;

-    }

-

-    /**

-     * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so

-     * that it takes into account the new column.

-     */

-    private void addColumn() {

-        int newColumns = numColumns + 1;

-        List<Integer> migrate = getBucketMigrateCount(numColumns, numBucketBits);

-        int numBuckets = getNumBuckets(numBucketBits);

-        for (int i = 0; i < numBuckets; ++i) {

-            int old = bucketToColumn[i];

-            if (migrate.get(old) > 0) {

-                bucketToColumn[i] = numColumns; // move this bucket to the new column

-                migrate.set(old, migrate.get(old) - 1);

-            }

-        }

-        numColumns = newColumns;

-    }

-

-    /**

-     * Sets the number of columns to use for this document distribution object. This will reset and setup this object

-     * from scratch. The original number of buckets is maintained.

-     *

-     * @param numColumns The new number of columns to distribute to.

-     */

-    public synchronized void setNumColumns(int numColumns) {

-        if (numColumns < this.numColumns) {

-            reset();

-        }

-        if (numColumns == this.numColumns) {

-            return;

-        }

-        for (int i = numColumns - this.numColumns; --i >= 0; ) {

-            addColumn();

-        }

-    }

-

-    /**

-     * Returns the number of columns to distribute to.

-     *

-     * @return The number of columns.

-     */

-    public int getNumColumns() {

-        return numColumns;

-    }

-

-    /**

-     * Sets the number of buckets to use for this document distribution object. This will reset and setup this object

-     * from scratch. The original number of columns is maintained.

-     *

-     * @param numBucketBits The new number of bits to use for bucket id.

-     */

-    public synchronized void setNumBucketBits(int numBucketBits) {

-        if (numBucketBits == this.numBucketBits) {

-            return;

-        }

-        this.numBucketBits = numBucketBits;

-        bucketToColumn = new int[getNumBuckets(numBucketBits)];

-        int numColumns = this.numColumns;

-        reset();

-        setNumColumns(numColumns);

-    }

-

-    /**

-     * Returns the number of bits used for bucket identifiers.

-     *

-     * @return The number of bits.

-     */

-    public int getNumBucketBits() {

-        return numBucketBits;

-    }

-

-    /**

-     * Returns the number of buckets available using the configured number of bucket bits.

-     *

-     * @return The number of buckets.

-     */

-    public int getNumBuckets() {

-        return getNumBuckets(numBucketBits);

-    }

-

-    /**

-     * This method maps the given bucket id to its corresponding column.

-     *

-     * @param bucketId The bucket whose column to lookup.

-     * @return The column to distribute the bucket to.

-     */

-    public int getColumn(BucketId bucketId) {

-        int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1));

-        if (ret >= bucketToColumn.length) {

-            log.log(Level.SEVERE,

-                    "The bucket distribution map is not in sync with the number of bucket bits. " +

-                    "This should never happen! Distribution is broken!!");

-            return 0;

-        }

-        return bucketToColumn[ret];

-    }

-}

+package com.yahoo.vdslib;
+
+import com.yahoo.document.BucketId;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class BucketDistribution {
+
+    // A logger object to enable proper logging.
+    private static Logger log = Logger.getLogger(BucketDistribution.class.getName());
+
+    // A map from bucket id to column index.
+    private int[] bucketToColumn;
+
+    // The number of columns to distribute to.
+    private int numColumns;
+
+    // The number of bits to use for bucket identification.
+    private int numBucketBits;
+
+    /**
+     * Constructs a new bucket distribution object with a given number of columns and buckets.
+     *
+     * @param numColumns    The number of columns to distribute to.
+     * @param numBucketBits The number of bits to use for bucket id.
+     */
+    public BucketDistribution(int numColumns, int numBucketBits) {
+        this.numBucketBits = numBucketBits;
+        bucketToColumn = new int[getNumBuckets()];
+        reset();
+        setNumColumns(numColumns);
+    }
+
+    /**
+     * Constructs a new bucket distribution object as a copy of another.
+     *
+     * @param other The distribution object to copy.
+     */
+    public BucketDistribution(BucketDistribution other) {
+        bucketToColumn = other.bucketToColumn.clone();
+        numColumns = other.numColumns;
+        numBucketBits = other.numBucketBits;
+    }
+
+    /**
+     * Returns the number of buckets that the given number of bucket bits will allow.
+     *
+     * @param numBucketBits The number of bits to use for bucket id.
+     * @return The number of buckets allowed.
+     */
+    private static int getNumBuckets(int numBucketBits) {
+        return 1 << numBucketBits;
+    }
+
+    /**
+     * This method returns a list that contains the distributions of the given number of buckets over the given number
+     * of columns.
+     *
+     * @param numColumns    The number of columns to distribute to.
+     * @param numBucketBits The number of bits to use for bucket id.
+     * @return The bucket distribution.
+     */
+    private static List<Integer> getBucketCount(int numColumns, int numBucketBits) {
+        List<Integer> ret = new ArrayList<Integer>(numColumns);
+        int cnt = getNumBuckets(numBucketBits) / numColumns;
+        int rst = getNumBuckets(numBucketBits) % numColumns;
+        for (int i = 0; i < numColumns; ++i) {
+            ret.add(cnt + (i < rst ? 1 : 0));
+        }
+        return ret;
+    }
+
+    /**
+     * This method returns a list similar to {@link com.yahoo.vdslib.BucketDistribution#getBucketCount(int, int)}, except that the returned list
+     * contains the number of buckets that will have to be migrated from each column if an additional column was added.
+     *
+     * @param numColumns    The original number of columns.
+     * @param numBucketBits The number of bits to use for bucket id.
+     * @return The number of buckets to migrate, one value per column.
+     */
+    private static List<Integer> getBucketMigrateCount(int numColumns, int numBucketBits) {
+        List<Integer> ret = getBucketCount(numColumns++, numBucketBits);
+        int cnt = getNumBuckets(numBucketBits) / numColumns;
+        int rst = getNumBuckets(numBucketBits) % numColumns;
+        for (int i = 0; i < numColumns - 1; ++i) {
+            ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0)));
+        }
+        return ret;
+    }
+
+    /**
+     * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so
+     * that it all buckets point to that single column.
+     */
+    public void reset() {
+        for (int i = 0; i < bucketToColumn.length; ++i) {
+            bucketToColumn[i] = 0;
+        }
+        numColumns = 1;
+    }
+
+    /**
+     * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so
+     * that it takes into account the new column.
+     */
+    private void addColumn() {
+        int newColumns = numColumns + 1;
+        List<Integer> migrate = getBucketMigrateCount(numColumns, numBucketBits);
+        int numBuckets = getNumBuckets(numBucketBits);
+        for (int i = 0; i < numBuckets; ++i) {
+            int old = bucketToColumn[i];
+            if (migrate.get(old) > 0) {
+                bucketToColumn[i] = numColumns; // move this bucket to the new column
+                migrate.set(old, migrate.get(old) - 1);
+            }
+        }
+        numColumns = newColumns;
+    }
+
+    /**
+     * Sets the number of columns to use for this document distribution object. This will reset and setup this object
+     * from scratch. The original number of buckets is maintained.
+     *
+     * @param numColumns The new number of columns to distribute to.
+     */
+    public synchronized void setNumColumns(int numColumns) {
+        if (numColumns < this.numColumns) {
+            reset();
+        }
+        if (numColumns == this.numColumns) {
+            return;
+        }
+        for (int i = numColumns - this.numColumns; --i >= 0; ) {
+            addColumn();
+        }
+    }
+
+    /**
+     * Returns the number of columns to distribute to.
+     *
+     * @return The number of columns.
+     */
+    public int getNumColumns() {
+        return numColumns;
+    }
+
+    /**
+     * Sets the number of buckets to use for this document distribution object. This will reset and setup this object
+     * from scratch. The original number of columns is maintained.
+     *
+     * @param numBucketBits The new number of bits to use for bucket id.
+     */
+    public synchronized void setNumBucketBits(int numBucketBits) {
+        if (numBucketBits == this.numBucketBits) {
+            return;
+        }
+        this.numBucketBits = numBucketBits;
+        bucketToColumn = new int[getNumBuckets(numBucketBits)];
+        int numColumns = this.numColumns;
+        reset();
+        setNumColumns(numColumns);
+    }
+
+    /**
+     * Returns the number of bits used for bucket identifiers.
+     *
+     * @return The number of bits.
+     */
+    public int getNumBucketBits() {
+        return numBucketBits;
+    }
+
+    /**
+     * Returns the number of buckets available using the configured number of bucket bits.
+     *
+     * @return The number of buckets.
+     */
+    public int getNumBuckets() {
+        return getNumBuckets(numBucketBits);
+    }
+
+    /**
+     * This method maps the given bucket id to its corresponding column.
+     *
+     * @param bucketId The bucket whose column to lookup.
+     * @return The column to distribute the bucket to.
+     */
+    public int getColumn(BucketId bucketId) {
+        int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1));
+        if (ret >= bucketToColumn.length) {
+            log.log(Level.SEVERE,
+                    "The bucket distribution map is not in sync with the number of bucket bits. " +
+                    "This should never happen! Distribution is broken!!");
+            return 0;
+        }
+        return bucketToColumn[ret];
+    }
+}
diff --git a/vdslib/src/test/java/com/yahoo/vdslib/BucketDistributionTestCase.java b/vdslib/src/test/java/com/yahoo/vdslib/BucketDistributionTestCase.java
index 33b8dd39e55..1e9851a3788 100644
--- a/vdslib/src/test/java/com/yahoo/vdslib/BucketDistributionTestCase.java
+++ b/vdslib/src/test/java/com/yahoo/vdslib/BucketDistributionTestCase.java
@@ -1,111 +1,111 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vdslib;

-

-import com.yahoo.document.BucketId;

-

-import java.util.Random;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class BucketDistributionTestCase extends junit.framework.TestCase {

-

-    private static final int NUM_COLUMNS = 16;

-    private static final int MIN_BUCKETBITS = 4;

-    private static final int MAX_BUCKETBITS = 9;

-

-    public void printExpected() {

-        System.out.println("        int[][] expected = new int[][] {");

-        for (int numBucketBits = MIN_BUCKETBITS; numBucketBits <= MAX_BUCKETBITS; ++numBucketBits) {

-            System.out.print("            new int[] {");

-            BucketDistribution bd = new BucketDistribution(NUM_COLUMNS, numBucketBits);

-            for (int i = 0; i < bd.getNumBuckets(); ++i) {

-                if (i % 32 == 0) {

-                    System.out.println("");

-                    System.out.print("                ");

-                }

-                System.out.print(bd.getColumn(new BucketId(16, i)));

-                if (i < bd.getNumBuckets() - 1) {

-                    System.out.print(", ");

-                }

-            }

-            System.out.print(" }");

-            if (numBucketBits < MAX_BUCKETBITS) {

-                System.out.print(",");

-            }

-            System.out.println("");

-        }

-        System.out.println("        };");

-    }

-

-    public void testDistribution() {

-        int[][] expected = new int[][] {

-            new int[] {

-                10, 11, 9, 6, 4, 8, 14, 1, 13, 2, 12, 3, 5, 7, 15, 0 },

-            new int[] {

-                11, 12, 11, 13, 8, 13, 8, 9, 4, 5, 6, 12, 10, 15, 1, 1, 7, 9, 14, 2, 2, 14, 3, 3, 4, 5, 6, 7, 10, 15, 0, 0 },

-            new int[] {

-                13, 13, 13, 13, 9, 11, 8, 9, 11, 14, 9, 11, 14, 14, 8, 10, 11, 14, 4, 5, 5, 6, 6, 7, 8, 10, 12, 15, 1, 1, 1, 1,

-                6, 7, 8, 10, 12, 15, 2, 2, 2, 2, 12, 15, 3, 3, 3, 3, 4, 4, 4, 5, 5, 6, 7, 7, 9, 10, 12, 15, 0, 0, 0, 0 },

-            new int[] {

-                14, 14, 14, 13, 11, 14, 14, 10, 13, 14, 10, 12, 8, 8, 9, 10, 9, 10, 11, 12, 13, 15, 11, 12, 13, 13, 15, 8, 8, 9, 10, 11,

-                11, 12, 13, 15, 4, 4, 5, 5, 5, 5, 15, 6, 6, 7, 7, 7, 8, 9, 9, 10, 11, 12, 14, 15, 1, 1, 1, 1, 1, 1, 1, 1,

-                6, 6, 6, 7, 7, 8, 8, 9, 10, 11, 12, 13, 15, 2, 2, 2, 2, 2, 2, 2, 2, 12, 13, 15, 3, 3, 3, 3, 3, 3, 3, 3,

-                4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 9, 9, 10, 11, 12, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0 },

-            new int[] {

-                15, 14, 15, 15, 12, 14, 15, 12, 12, 11, 12, 13, 14, 13, 13, 13, 14, 15, 15, 9, 14, 9, 15, 10, 11, 11, 12, 8, 8, 8, 8, 9,

-                9, 10, 10, 10, 11, 11, 12, 13, 13, 14, 10, 11, 11, 12, 13, 13, 14, 13, 13, 14, 15, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11,

-                10, 10, 11, 11, 12, 13, 13, 14, 15, 4, 4, 4, 4, 15, 5, 5, 5, 5, 5, 5, 5, 15, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,

-                8, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

-                6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 2, 2, 2, 2, 2, 2,

-                2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 12, 12, 13, 14, 14, 15, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

-                4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,

-                8, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },

-            new int[] {

-                15, 15, 15, 15, 14, 14, 15, 13, 13, 13, 13, 13, 14, 14, 15, 12, 14, 15, 15, 11, 11, 12, 13, 13, 13, 14, 14, 15, 15, 10, 12, 12,

-                12, 13, 13, 13, 14, 14, 15, 15, 9, 9, 9, 10, 10, 11, 11, 11, 12, 12, 12, 12, 13, 13, 14, 15, 15, 8, 8, 8, 8, 9, 9, 9,

-                9, 9, 9, 10, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 14, 14, 14, 10, 10, 10, 11, 11, 11, 12, 12, 12, 12,

-                13, 13, 14, 14, 14, 15, 15, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11,

-                10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 4, 4, 4, 4, 4, 4, 4, 15, 15, 5, 5, 5, 5, 5,

-                5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 14, 14, 14, 15, 15, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,

-                8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 15, 15, 15,

-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

-                6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,

-                9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,

-                2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15,

-                3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

-                4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5,

-                5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,

-                8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 15, 15, 15,

-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }

-        };

-

-        for (int numBucketBits = MIN_BUCKETBITS; numBucketBits <= MAX_BUCKETBITS; ++numBucketBits) {

-            BucketDistribution bd = new BucketDistribution(NUM_COLUMNS, numBucketBits);

-            assertEquals(NUM_COLUMNS, bd.getNumColumns());

-            assertEquals(1 << numBucketBits, bd.getNumBuckets());        

-            for (int i = 0; i < bd.getNumBuckets(); ++i) {

-                assertEquals(expected[numBucketBits - MIN_BUCKETBITS][i], bd.getColumn(new BucketId(16, i)));

-            }

-        }

-    }

-

-    public void testNumBucketBits() {

-        Random rnd = new Random();

-

-        BucketDistribution bd = new BucketDistribution(1, 4);

-        for (int i = 0; i <= 0xf; ++i) {

-            assertEquals(0, bd.getColumn(new BucketId(32, (rnd.nextLong() << 4) & i)));

-        }

-

-        bd = new BucketDistribution(1, 8);

-        for (int i = 0; i <= 0xff; ++i) {

-            assertEquals(0, bd.getColumn(new BucketId(32, (rnd.nextLong() << 8) & i)));

-        }

-

-        bd = new BucketDistribution(1, 16);

-        for (int i = 0; i <= 0xffff; ++i) {

-            assertEquals(0, bd.getColumn(new BucketId(32, (rnd.nextLong() << 16) & i)));

-        }

-    }

-}

+package com.yahoo.vdslib;
+
+import com.yahoo.document.BucketId;
+
+import java.util.Random;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class BucketDistributionTestCase extends junit.framework.TestCase {
+
+    private static final int NUM_COLUMNS = 16;
+    private static final int MIN_BUCKETBITS = 4;
+    private static final int MAX_BUCKETBITS = 9;
+
+    public void printExpected() {
+        System.out.println("        int[][] expected = new int[][] {");
+        for (int numBucketBits = MIN_BUCKETBITS; numBucketBits <= MAX_BUCKETBITS; ++numBucketBits) {
+            System.out.print("            new int[] {");
+            BucketDistribution bd = new BucketDistribution(NUM_COLUMNS, numBucketBits);
+            for (int i = 0; i < bd.getNumBuckets(); ++i) {
+                if (i % 32 == 0) {
+                    System.out.println("");
+                    System.out.print("                ");
+                }
+                System.out.print(bd.getColumn(new BucketId(16, i)));
+                if (i < bd.getNumBuckets() - 1) {
+                    System.out.print(", ");
+                }
+            }
+            System.out.print(" }");
+            if (numBucketBits < MAX_BUCKETBITS) {
+                System.out.print(",");
+            }
+            System.out.println("");
+        }
+        System.out.println("        };");
+    }
+
+    public void testDistribution() {
+        int[][] expected = new int[][] {
+            new int[] {
+                10, 11, 9, 6, 4, 8, 14, 1, 13, 2, 12, 3, 5, 7, 15, 0 },
+            new int[] {
+                11, 12, 11, 13, 8, 13, 8, 9, 4, 5, 6, 12, 10, 15, 1, 1, 7, 9, 14, 2, 2, 14, 3, 3, 4, 5, 6, 7, 10, 15, 0, 0 },
+            new int[] {
+                13, 13, 13, 13, 9, 11, 8, 9, 11, 14, 9, 11, 14, 14, 8, 10, 11, 14, 4, 5, 5, 6, 6, 7, 8, 10, 12, 15, 1, 1, 1, 1,
+                6, 7, 8, 10, 12, 15, 2, 2, 2, 2, 12, 15, 3, 3, 3, 3, 4, 4, 4, 5, 5, 6, 7, 7, 9, 10, 12, 15, 0, 0, 0, 0 },
+            new int[] {
+                14, 14, 14, 13, 11, 14, 14, 10, 13, 14, 10, 12, 8, 8, 9, 10, 9, 10, 11, 12, 13, 15, 11, 12, 13, 13, 15, 8, 8, 9, 10, 11,
+                11, 12, 13, 15, 4, 4, 5, 5, 5, 5, 15, 6, 6, 7, 7, 7, 8, 9, 9, 10, 11, 12, 14, 15, 1, 1, 1, 1, 1, 1, 1, 1,
+                6, 6, 6, 7, 7, 8, 8, 9, 10, 11, 12, 13, 15, 2, 2, 2, 2, 2, 2, 2, 2, 12, 13, 15, 3, 3, 3, 3, 3, 3, 3, 3,
+                4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 9, 9, 10, 11, 12, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0 },
+            new int[] {
+                15, 14, 15, 15, 12, 14, 15, 12, 12, 11, 12, 13, 14, 13, 13, 13, 14, 15, 15, 9, 14, 9, 15, 10, 11, 11, 12, 8, 8, 8, 8, 9,
+                9, 10, 10, 10, 11, 11, 12, 13, 13, 14, 10, 11, 11, 12, 13, 13, 14, 13, 13, 14, 15, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11,
+                10, 10, 11, 11, 12, 13, 13, 14, 15, 4, 4, 4, 4, 15, 5, 5, 5, 5, 5, 5, 5, 15, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,
+                8, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 2, 2, 2, 2, 2, 2,
+                2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 12, 12, 13, 14, 14, 15, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+                4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,
+                8, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+            new int[] {
+                15, 15, 15, 15, 14, 14, 15, 13, 13, 13, 13, 13, 14, 14, 15, 12, 14, 15, 15, 11, 11, 12, 13, 13, 13, 14, 14, 15, 15, 10, 12, 12,
+                12, 13, 13, 13, 14, 14, 15, 15, 9, 9, 9, 10, 10, 11, 11, 11, 12, 12, 12, 12, 13, 13, 14, 15, 15, 8, 8, 8, 8, 9, 9, 9,
+                9, 9, 9, 10, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 14, 14, 14, 10, 10, 10, 11, 11, 11, 12, 12, 12, 12,
+                13, 13, 14, 14, 14, 15, 15, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11,
+                10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 4, 4, 4, 4, 4, 4, 4, 15, 15, 5, 5, 5, 5, 5,
+                5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 14, 14, 14, 15, 15, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+                8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 15, 15, 15,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
+                9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+                2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15,
+                3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+                4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5,
+                5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+                8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 15, 15, 15,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+        };
+
+        for (int numBucketBits = MIN_BUCKETBITS; numBucketBits <= MAX_BUCKETBITS; ++numBucketBits) {
+            BucketDistribution bd = new BucketDistribution(NUM_COLUMNS, numBucketBits);
+            assertEquals(NUM_COLUMNS, bd.getNumColumns());
+            assertEquals(1 << numBucketBits, bd.getNumBuckets());        
+            for (int i = 0; i < bd.getNumBuckets(); ++i) {
+                assertEquals(expected[numBucketBits - MIN_BUCKETBITS][i], bd.getColumn(new BucketId(16, i)));
+            }
+        }
+    }
+
+    public void testNumBucketBits() {
+        Random rnd = new Random();
+
+        BucketDistribution bd = new BucketDistribution(1, 4);
+        for (int i = 0; i <= 0xf; ++i) {
+            assertEquals(0, bd.getColumn(new BucketId(32, (rnd.nextLong() << 4) & i)));
+        }
+
+        bd = new BucketDistribution(1, 8);
+        for (int i = 0; i <= 0xff; ++i) {
+            assertEquals(0, bd.getColumn(new BucketId(32, (rnd.nextLong() << 8) & i)));
+        }
+
+        bd = new BucketDistribution(1, 16);
+        for (int i = 0; i <= 0xffff; ++i) {
+            assertEquals(0, bd.getColumn(new BucketId(32, (rnd.nextLong() << 16) & i)));
+        }
+    }
+}
diff --git a/vdslib/src/vespa/vdslib/container/parameters.cpp b/vdslib/src/vespa/vdslib/container/parameters.cpp
index c685a9b884f..e490118370a 100644
--- a/vdslib/src/vespa/vdslib/container/parameters.cpp
+++ b/vdslib/src/vespa/vdslib/container/parameters.cpp
@@ -172,4 +172,4 @@ template uint64_t vdslib::Parameters::get(const vespalib::stringref &, uint64_t)
 template double vdslib::Parameters::get(const vespalib::stringref &, double) const;
 template std::string vdslib::Parameters::get(const vespalib::stringref &, std::string) const;
 
-VESPALIB_HASH_MAP_INSTANTIATE(vespalib::string, vdslib::Parameters::Value);
\ No newline at end of file
+VESPALIB_HASH_MAP_INSTANTIATE(vespalib::string, vdslib::Parameters::Value);