diff options
1119 files changed, 1584 insertions, 1920 deletions
diff --git a/application-deploy-plugin/OWNERS b/application-deploy-plugin/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/application-deploy-plugin/OWNERS +++ b/application-deploy-plugin/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java b/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java index 9743a5f2728..8ec182ba32c 100644 --- a/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java +++ b/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java @@ -16,7 +16,7 @@ import org.json.*; /** - * @author musum + * @author hmusum * @since 5.1.22 */ @org.apache.maven.plugins.annotations.Mojo(name = "deploy", defaultPhase = LifecyclePhase.GENERATE_SOURCES) diff --git a/application-preprocessor/OWNERS b/application-preprocessor/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/application-preprocessor/OWNERS +++ b/application-preprocessor/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/application/src/main/java/com/yahoo/application/content/ContentCluster.java b/application/src/main/java/com/yahoo/application/content/ContentCluster.java index 8d1d7530650..9fb025848e0 100644 --- a/application/src/main/java/com/yahoo/application/content/ContentCluster.java +++ b/application/src/main/java/com/yahoo/application/content/ContentCluster.java @@ -9,7 +9,7 @@ import java.util.Collections; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ContentCluster { diff --git a/application/src/test/java/com/yahoo/application/MockResultSearcher.java b/application/src/test/java/com/yahoo/application/MockResultSearcher.java index 2dd3a34a6ec..a429785640e 100644 --- a/application/src/test/java/com/yahoo/application/MockResultSearcher.java +++ b/application/src/test/java/com/yahoo/application/MockResultSearcher.java @@ -8,7 +8,7 @@ import com.yahoo.search.result.Hit; import com.yahoo.search.searchchain.Execution; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MockResultSearcher extends Searcher { diff --git a/clustercontroller-apps/OWNERS b/clustercontroller-apps/OWNERS index b3db17e22d8..de6ac0dd8f5 100644 --- a/clustercontroller-apps/OWNERS +++ b/clustercontroller-apps/OWNERS @@ -1,2 +1,2 @@ vekterli -hakon +hakonhall diff --git a/clustercontroller-apputil/OWNERS b/clustercontroller-apputil/OWNERS index b3db17e22d8..de6ac0dd8f5 100644 --- a/clustercontroller-apputil/OWNERS +++ b/clustercontroller-apputil/OWNERS @@ -1,2 +1,2 @@ vekterli -hakon +hakonhall diff --git a/clustercontroller-core/OWNERS b/clustercontroller-core/OWNERS index b5f3398d1a0..abe8e49c8d6 100644 --- a/clustercontroller-core/OWNERS +++ b/clustercontroller-core/OWNERS @@ -1,3 +1,3 @@ vekterli -hakon +hakonhall bratseth diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java index 19f8f81c628..4274b8098d1 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java @@ -17,7 +17,7 @@ import java.util.TreeMap; /** * Detail information about the current state of all the distributor and storage nodes of the cluster. * - * @author hakon + * @author hakonhall * @author bratseth */ public class ClusterInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java index 3444f4c2540..328acfb4dbe 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; * are mostly represented by the ClusterState. The dynamic parts include stats for tracking outstanding * merges before steady-state is reached. * - * @author hakon + * @author hakonhall * @since 5.33 */ public class ClusterStateView { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java index a52034d10a2..4c0b582c3d3 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java @@ -29,7 +29,7 @@ import com.yahoo.log.LogLevel; * for a given storage nodes. So we need to keep track of the latest info * from each distributor. * - * @author hakon + * @author hakonhall * @since 5.34 */ public class ClusterStatsAggregator { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java index 32c68aff083..1884dee5863 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.clustercontroller.core.hostinfo.StorageNodeStatsBridge; * Class encapsulating what the Cluster Controller knows about a distributor node. Most of the information is * common between Storage- and Distributor- nodes, and stored in the base class NodeInfo. * - * @author hakon + * @author hakonhall */ public class DistributorNodeInfo extends NodeInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java index 482bfbf6004..6cdbb50e1eb 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.clustercontroller.core; /** * LatencyStats handles adding latencies and counts. - * @author hakon + * @author hakonhall */ public class LatencyStats { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java index ce6686c3ad9..433df4c2249 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java @@ -81,11 +81,11 @@ public class MetricUpdater { } public void recordNewNodeEvent() { - // TODO(hakon): Replace add() with a persistent aggregate metric. + // TODO(hakonhall): Replace add() with a persistent aggregate metric. metricReporter.add("node-event", 1); } public void updateMergeOpMetrics(Map<String, NodeMergeStats> storageNodeStats) { - // TODO(hakon): Remove this method once we figure out how to propagate metrics to state HTTP API. + // TODO(hakonhall): Remove this method once we figure out how to propagate metrics to state HTTP API. } } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java index 67f11574c5b..22d9fc0cac8 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.clustercontroller.core; import com.yahoo.vespa.clustercontroller.core.hostinfo.StorageNode; /** - * @author hakon + * @author hakonhall * @since 5.33 */ public class NodeMergeStats { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java index f312194c15d..450ebf3b97a 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java @@ -13,7 +13,7 @@ import java.util.List; /** * Checks if a node can be upgraded. * - * @author dybdahl + * @author dybis */ public class NodeStateChangeChecker { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java index a7e34c7321f..186d78f35e4 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java @@ -8,7 +8,7 @@ import java.util.Map; * by Distributors from their getnodestate RPCs. The stats for a single storage node * is represented by the StorageNodeStats class. * - * @author hakon + * @author hakonhall */ public class StatsForStorageNodes { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java index 2c719f9fb3c..40f704922fe 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java @@ -9,7 +9,7 @@ import java.util.Set; /** * Class for storing the pending merge operation stats for all the storage nodes. * - * @author hakon + * @author hakonhall * @since 5.34 */ public class StorageMergeStats implements Iterable<NodeMergeStats> { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java index 86f8be36a9d..1cafdd1ed0f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java @@ -9,7 +9,7 @@ import com.yahoo.vdslib.state.NodeType; * Class encapsulating what the Cluster Controller knows about a storage node. Most of the information is * common between Storage- and Distributor- nodes, and stored in the base class NodeInfo. * - * @author hakon + * @author hakonhall */ public class StorageNodeInfo extends NodeInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java index c46e489453b..5b87b86bc0f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.clustercontroller.core; /** * Contains stats related to a single storage node. * - * @author hakon + * @author hakonhall */ public class StorageNodeStats { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java index bb01bf80d77..ca8fcfb97ea 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java @@ -9,7 +9,7 @@ import java.util.Map; * by Distributors from their getnodestate RPCs. The stats for a single storage node * is represented by the StorageNodeStats class. * - * @author hakon + * @author hakonhall */ public class StorageNodeStatsContainer { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java index c48c203a55c..28bb10c4a98 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java @@ -8,7 +8,7 @@ import java.util.List; /** * Class for handling Distributor part of HostInfo. - * @author dybdahl + * @author dybis */ public class Distributor { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java index fbc53128415..fd7c4db30b8 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java @@ -11,7 +11,7 @@ import java.util.logging.Logger; /** * Parsing and keeping of host info from nodes. - * @author dybdahl + * @author dybis */ public class HostInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java index 23c502063a6..b2924516f26 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java @@ -9,7 +9,7 @@ import java.util.List; /** * Keeper for Metrics for HostInfo. - * @author dybdahl + * @author dybis */ public class Metrics { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java index 4a8cff2d5bb..c208c0a3e19 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * Keeping information about a storage node seen from the distributor. - * @author dybdahl + * @author dybis */ public class StorageNode { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java index ed4664c5b44..980a8b4681f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java @@ -13,7 +13,7 @@ import java.util.Map; /** * Class used to create a StorageNodeStatsContainer from HostInfo. - * @author hakon + * @author hakonhall */ public class StorageNodeStatsBridge { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java index b4d445c1844..c18be1cea64 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * Class for handling version. - * @author dybdahl + * @author dybis */ public class Vtag { diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java index a62a8676096..8583f57935b 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; /** - * @author hakon + * @author hakonhall * @since 5.34 */ public class ClusterStateViewTest { diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java index e87cad135c8..eab5f3ac0da 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java @@ -14,7 +14,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; /** - * @author hakon + * @author hakonhall * @since 5.34 */ @RunWith(MockitoJUnitRunner.class) diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java index ddf0286b0fe..8cb62beda15 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; /** - * @author hakon + * @author hakonhall */ public class StatsForStorageNodeTest { @Test diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java index e2832c5b6b9..958218c3585 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; /** - * @author hakon + * @author hakonhall */ public class StorageNodeStatsContainerTest { @Test diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java index b905cd32979..d75fabbbb94 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * @author hakon + * @author hakonhall */ public class StorageNodeStatsTest { @Test diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java index 9d23031cd55..77e2c771f41 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** - * @author hakon + * @author hakonhall */ public class StorageNodeStatsBridgeTest { diff --git a/clustercontroller-standalone/OWNERS b/clustercontroller-standalone/OWNERS index b3db17e22d8..de6ac0dd8f5 100644 --- a/clustercontroller-standalone/OWNERS +++ b/clustercontroller-standalone/OWNERS @@ -1,2 +1,2 @@ vekterli -hakon +hakonhall diff --git a/clustercontroller-utils/OWNERS b/clustercontroller-utils/OWNERS index b3db17e22d8..de6ac0dd8f5 100644 --- a/clustercontroller-utils/OWNERS +++ b/clustercontroller-utils/OWNERS @@ -1,2 +1,2 @@ vekterli -hakon +hakonhall diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java index 4a0cb76f278..8b418d464d8 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.errors; /** - * @author hakon + * @author hakonhall */ public class MissingResourceException extends StateRestApiException { public MissingResourceException(String resource) { diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java index 9f4ecac84d4..38518a63d99 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; /** * The response of a set operation. - * @author dybdahl + * @author dybis */ public class SetResponse { private final String reason; diff --git a/component/src/main/java/com/yahoo/component/provider/Freezable.java b/component/src/main/java/com/yahoo/component/provider/Freezable.java index 36734c24e1b..2feca23dd20 100644 --- a/component/src/main/java/com/yahoo/component/provider/Freezable.java +++ b/component/src/main/java/com/yahoo/component/provider/Freezable.java @@ -5,7 +5,7 @@ package com.yahoo.component.provider; * A class which may be irreversibly frozen. Any attempt to change the state of this class after * freezing throws an IllegalStateException. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface Freezable { diff --git a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java index df819c8c463..c94c8a0bbac 100644 --- a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java +++ b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java @@ -4,7 +4,7 @@ package com.yahoo.component.provider; /** * Convenience superclass of non-component freezables * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FreezableClass implements Freezable { diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java index 3e1bbd4153a..326b044d007 100644 --- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java +++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java @@ -4,7 +4,7 @@ package com.yahoo.component.provider; /** * A freezable which supports listening * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.13 */ public interface ListenableFreezable extends Freezable { diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java index 6d876b1fb41..d1d82b2de79 100644 --- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java +++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java @@ -8,7 +8,7 @@ import java.util.concurrent.Executor; /** * A convenience superclass for listenable freezables. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.13 */ public class ListenableFreezableClass extends FreezableClass implements ListenableFreezable { diff --git a/config-application-package/OWNERS b/config-application-package/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/config-application-package/OWNERS +++ b/config-application-package/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java index dc8fd010e75..cd68d214d3d 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java @@ -18,7 +18,7 @@ import java.util.List; /** * Handles preprocess:include statements and returns a Document which has all the include statements resolved * - * @author musum + * @author hmusum * @since 5.22 */ class IncludeProcessor implements PreProcessor { diff --git a/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java index f8cb9819b61..3f6147d7f56 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java @@ -15,7 +15,7 @@ import java.util.logging.Logger; /** * Handles getting properties from services.xml and replacing references to properties with their real values * - * @author musum + * @author hmusum * @since 5.22 */ class PropertiesProcessor implements PreProcessor { diff --git a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java index 0a0216e80d9..62b0fee5344 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; /** * Utilities for XML. * - * @author musum + * @author hmusum */ public class Xml { private static final Logger log = Logger.getLogger(Xml.class.getPackage().toString()); diff --git a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java index 7c4ddb812c4..4e08e514504 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java @@ -21,7 +21,7 @@ import java.util.List; * A preprocessor for services.xml files that handles deploy:environment, deploy:region, preprocess:properties, preprocess:include * and create a new Document which is based on the supplied environment and region * - * @author musum + * @author hmusum * @since 5.22 */ public class XmlPreProcessor { diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java index 6e730ba8410..c1aaf3ab43e 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java @@ -9,7 +9,7 @@ import java.io.File; /** * Definitions of sub-directories of an application package. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class AppSubDirs { diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java index 16c3ef3e029..393bd1c2de7 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java @@ -19,7 +19,7 @@ import java.util.Optional; /** * Validation of xml files in application package against RELAX NG schemas. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ApplicationPackageXmlFilesValidator { diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java index 25aacdfd74b..201bd175cb0 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java @@ -4,7 +4,7 @@ package com.yahoo.config.model.application.provider; /** * A class for holding values generated or computed during deployment * - * @author musum + * @author hmusum * @since 5.1.11 */ public class DeployData { diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SimpleApplicationValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SimpleApplicationValidator.java index 80dc01be0b0..2d960f00d66 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SimpleApplicationValidator.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SimpleApplicationValidator.java @@ -7,7 +7,7 @@ import java.io.Reader; /** * Simple Validation of services.xml for unit tests against RELAX NG schemas. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class SimpleApplicationValidator { diff --git a/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java index c281bb28f17..594081acfe8 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum */ public class PropertiesProcessorTest { diff --git a/config-application-package/src/test/java/com/yahoo/config/application/TestBase.java b/config-application-package/src/test/java/com/yahoo/config/application/TestBase.java index 8967fe9afdf..61fa479045f 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/TestBase.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/TestBase.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertTrue; /** * Utilities for tests * - * @author musum + * @author hmusum */ public class TestBase { static { diff --git a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java index 93d218cd2c4..eecbb1e7313 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.io.StringReader; /** - * @author musum + * @author hmusum */ public class XmlPreprocessorTest { diff --git a/config-class-plugin/OWNERS b/config-class-plugin/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/config-class-plugin/OWNERS +++ b/config-class-plugin/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java b/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java index c0169a06559..c843b0024e1 100644 --- a/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java @@ -7,7 +7,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.7 */ public class StringNodeTest { diff --git a/config-model-api/OWNERS b/config-model-api/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/config-model-api/OWNERS +++ b/config-model-api/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java index 98d5fa92cac..a8e5dd264d5 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java @@ -10,7 +10,7 @@ import java.io.*; /** * Metadata about an application package. * - * @author musum + * @author hmusum * @since 5.0 */ public class ApplicationMetaData { diff --git a/config-model-fat/OWNERS b/config-model-fat/OWNERS index 5b341fc827f..d34761f1ba5 100644 --- a/config-model-fat/OWNERS +++ b/config-model-fat/OWNERS @@ -1,2 +1,2 @@ gjoranv -musum +hmusum diff --git a/config-model/OWNERS b/config-model/OWNERS index 03193c770cb..8223ccfb64e 100644 --- a/config-model/OWNERS +++ b/config-model/OWNERS @@ -1,2 +1,2 @@ -musum +hmusum bratseth diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java index fa46c33a97f..a36175accd0 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java @@ -236,8 +236,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter // TODO: Doctoring on the XML is the wrong level for this. We should be able to mark a model as default instead -Jon private static Element getImplicitAdmin(DeployState deployState) throws IOException, SAXException { - final boolean hostedVespa = deployState.isHostedVespa(); - String defaultAdminElement = hostedVespa ? getImplicitAdminV4() : getImplicitAdminV2(); + String defaultAdminElement = deployState.isHostedVespa() ? getImplicitAdminV4() : getImplicitAdminV2(); log.log(LogLevel.DEBUG, "No <admin> defined, using " + defaultAdminElement); return XmlHelper.getDocumentBuilder().parse(new InputSource(new StringReader(defaultAdminElement))).getDocumentElement(); } diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java index 924d888b0d0..8dd72561549 100644 --- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java +++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; /** * Static methods for helping dom building * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class XmlHelper { private static final Logger log = Logger.getLogger(XmlHelper.class.getPackage().toString()); diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java index 9d97308fc76..afe4de7ef0d 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java @@ -7,7 +7,7 @@ import java.util.List; /** * A hostname with zero or more aliases. * - * @author musum + * @author hmusum */ public class Host { diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java index ece781dd5bd..bfb77612d31 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; /** * TODO: What is this? * - * @author musum + * @author hmusum */ public class Hosts { diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java index 20dc190d8e7..bf630b74272 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java @@ -13,7 +13,7 @@ import java.util.List; * No state in this provisioner, i.e it does not know anything about the active * application if one exists. Pre-condition: A valid hosts file. * - * @author musum + * @author hmusum * @since 5.11 */ public class HostsXmlProvisioner implements HostProvisioner { diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java index c06efece329..b4488cef385 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java @@ -11,7 +11,7 @@ import java.util.*; /** * In memory host provisioner. NB! ATM cannot be reused after allocate has been called. * - * @author musum + * @author hmusum * @author bratseth */ public class InMemoryProvisioner implements HostProvisioner { diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java index 38ed728e4e8..67e80ec95d6 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java @@ -16,7 +16,7 @@ import java.net.UnknownHostException; * No state in this provisioner, i.e it does not know anything about the active * application if one exists. * - * @author musum + * @author hmusum * @since 5.11 */ public class SingleNodeProvisioner implements HostProvisioner { diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java index 822ddcd0da7..9c507d7be05 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java @@ -6,7 +6,7 @@ import com.yahoo.document.DataType; import java.util.Collection; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public interface DataTypeCollection { public DataType getDataType(String name); diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java index 6d332ba16fb..73f8d7f91c5 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java @@ -8,7 +8,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class DataTypeRepo implements DataTypeCollection { Map<Integer, DataType> typeById = new LinkedHashMap<>(); diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java index 6c71410c048..d71fc2d0541 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java @@ -4,7 +4,7 @@ package com.yahoo.documentmodel; import java.util.Collection; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public interface DocumentTypeCollection { public NewDocumentType getDocumentType(NewDocumentType.Name name); diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java index 3585a12ac2f..b71a400666a 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java @@ -6,7 +6,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class DocumentTypeRepo implements DocumentTypeCollection { final Map<Integer, NewDocumentType> typeById = new LinkedHashMap<>(); diff --git a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java index 51171e97704..ccf9bdec302 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java @@ -15,7 +15,7 @@ import java.util.*; /** * TODO: What is this and why? * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public final class NewDocumentType extends StructuredDataType implements DataTypeCollection { diff --git a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java index bf8ec8d3da7..793a5fcff6c 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java @@ -10,7 +10,7 @@ import com.yahoo.document.PositionDataType; * Remember that changes here must be compatible. Changes to types of fields can not be done here. * This must also match the mirroring class in c++. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class VespaDocumentType { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java index 98eb0a4b77c..01667841294 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java @@ -17,7 +17,7 @@ import java.util.Map; /** * Transforms named references to constant tensors with the rank feature 'constant'. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ class ConstantTensorTransformer extends ExpressionTransformer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java index c0dcf27c88d..dae3fc4e80a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java @@ -11,7 +11,7 @@ import java.util.Set; * The rank profile containing default settings. This is derived from the fields * whenever this is accessed. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DefaultRankProfile extends RankProfile { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java index 4fd7048159e..036e2058f75 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java @@ -20,7 +20,7 @@ import com.yahoo.vespa.documentmodel.SearchField; import java.util.*; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class DocumentModelBuilder { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java index 9ed7d8677b9..c14724a17d3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java @@ -16,7 +16,7 @@ import java.util.Set; * Two indices are equal if they have the same name and the same settings, except * alias settings (which are excluded). * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Index implements Cloneable, Serializable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java b/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java index a248ca30a8e..9b93975fd0b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java @@ -11,7 +11,7 @@ import java.util.Map; /** * Inlines macros in ranking expressions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class MacroInliner extends ExpressionTransformer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java index 3e943377611..0df495ac402 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -19,7 +19,7 @@ import java.util.*; /** * Represents a rank profile - a named set of ranking settings * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankProfile implements Serializable, Cloneable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java index 43c6bb4b441..71bce3d286e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; * index through indexing and how data from documents should be served at search time.</p> <p>The identity of this * class is its name.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ // TODO: Make a class owned by this, for each of these responsibilities: // Managing indexes, managing attributes, managing summary classes. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java index 1130e5630a3..15a00e155d7 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java @@ -16,9 +16,10 @@ import java.util.*; /** * The set of all attribute fields defined by a search definition * - * @author <a href="mailto:bratseth@overture.com">Jon S Bratseth</a> + * @author bratseth */ public class AttributeFields extends Derived implements AttributesConfig.Producer { + private Map<String, Attribute> attributes = new java.util.LinkedHashMap<>(); /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java index 643eeb23c87..520c743d341 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java @@ -19,7 +19,7 @@ import java.util.List; /** * Superclass of all derived configurations * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Derived implements Exportable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java index bcc295b91e0..20e94e9c177 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.derived; /** * Classes exportable to configurations * - * @author <a href="mailto:bratseth@overture.com">bratseth</a> + * @author bratseth */ public interface Exportable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldRankSettings.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldRankSettings.java index 9dfc1bc2af7..9117bdf91dc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldRankSettings.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldRankSettings.java @@ -9,7 +9,7 @@ import java.util.logging.Logger; /** * The rank settings of a field used for native rank features. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class FieldRankSettings { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java index d61e57a621e..d0f265ce2ff 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.documentmodel.SummaryTransform; /** * The result transformation of a named field * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class FieldResultTransform { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java index 05b8a1bf5e7..46cd0b59c1b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java @@ -13,7 +13,7 @@ import java.util.*; /** * Deriver of indexschema config containing information of all index fields with name and data type. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java index 94e4dec567f..e8890288a7f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java @@ -15,7 +15,7 @@ import java.util.*; * An indexing language script derived from a search definition. An indexing script contains a set of indexing * statements, organized in a composite structure of indexing code snippets. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public final class IndexingScript extends Derived implements IlscriptsConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinition.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinition.java index c1176807519..1d24bbb43c6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinition.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinition.java @@ -10,7 +10,7 @@ import java.util.List; /** * The definition of a rank type used for native rank features. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class NativeRankTypeDefinition { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionSet.java index 18856627b70..b9c6b87f4c1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionSet.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionSet.java @@ -9,7 +9,7 @@ import java.util.Map; /** * A set of rank type definitions used for native rank features. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class NativeRankTypeDefinitionSet { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeTable.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeTable.java index 512d4a37647..c69be6451b4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeTable.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeTable.java @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.derived; /** * A named rank table of a certain type. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class NativeTable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java index 183bfd6ddd4..cc7a123f5e0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java @@ -10,7 +10,7 @@ import java.util.Map; /** * The derived rank profiles of a search definition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RankProfileList extends Derived implements RankProfilesConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java index cf3b10ccadd..a40c73f3e9f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java @@ -14,7 +14,7 @@ import java.util.*; /** * A rank profile derived from a search definition, containing exactly the features available natively in the server * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RawRankProfile implements RankProfilesConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java index 69133e31fb3..17eeb069510 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java @@ -15,7 +15,7 @@ import java.util.*; * <p>This class is <b>not</b> multithread safe. Only one ordering must be done * at the time in any instance.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SearchOrderer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java index 357e0d40f49..9523c224394 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java @@ -10,7 +10,7 @@ import java.util.List; /** * A list of derived summaries * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Summaries extends Derived implements SummaryConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java index d21523caea2..99897d8a564 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java @@ -20,7 +20,7 @@ import java.util.logging.Level; * Each summary definition have at least one summary, the default * which has the same name as the search definition. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryClass extends Derived { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java index bb1dd87f314..3416b15cd63 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.documentmodel.SummaryTransform; /** * A summary field derived from a search definition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryClassField { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java index d59c671e6a5..be4c34028fc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java @@ -15,7 +15,7 @@ import java.util.Map; * A summary map (describing search-time summary field transformations) * derived from a search definition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryMap extends Derived implements SummarymapConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java index aaf376f5cd9..5b3b64ee686 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java @@ -14,7 +14,7 @@ import java.util.*; /** * Vertical streaming matcher summary specification * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class VsmSummary extends Derived implements VsmsummaryConfig.Producer { private Map<SummaryField, List<String>> summaryMap = new java.util.LinkedHashMap<>(1); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java index 35f6a41f0d8..950ec791368 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java @@ -14,7 +14,7 @@ import java.util.Set; * A search-time document attribute (per-document in-memory value). * This belongs to the field defining the attribute. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class Attribute implements Cloneable, Serializable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java index 040a798d3b3..a92b27d5cd8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java @@ -8,7 +8,7 @@ import java.util.TreeSet; /** * Searchable collection of fields. * - * @author balder + * @author baldersheim */ public class FieldSet { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java index f2b0b6a9164..3b9f5a55af0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java @@ -10,7 +10,7 @@ import java.util.Set; * The rank type of a field. For now this is just a container of a string name. * This class is immutable. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public enum RankType { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java index 6292dc9ef72..b8b577b7b40 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; any document, it will always inherit the document "document.0".</p> @author <a href="thomasg@yahoo-inc.com">Thomas Gundersen</a> - @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + @author bratseth */ public class SDDocumentType implements Cloneable, Serializable { public static final SDDocumentType VESPA_DOCUMENT; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java index a0511dec4b0..8c238c104fe 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java @@ -7,7 +7,7 @@ import java.io.Serializable; * A search-time document attribute sort specification(per-document in-memory value). * This belongs to the attribute or field(implicitt attribute). * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public final class Sorting implements Cloneable, Serializable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java index 193ec75acd0..c188df17c9d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.document; import com.yahoo.document.DataTypeName; /** - * @author balder + * @author baldersheim */ public class TemporarySDDocumentType extends SDDocumentType { public TemporarySDDocumentType(DataTypeName name) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributeProperties.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributeProperties.java index 9df77c09373..c5fb2d1a014 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributeProperties.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributeProperties.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Checks that attribute properties only are set for attributes that have data (are created by an indexing statement). * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class AttributeProperties extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Bolding.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Bolding.java index 2e2e665eb34..b922959598a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Bolding.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Bolding.java @@ -13,7 +13,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * Checks that bolding or dynamic summary is turned on only for text fields. Throws exception if it is turned on for any * other fields (otherwise will cause indexing failure) * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class Bolding extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java index 0aabd4dc192..e014adfb94f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java @@ -29,7 +29,7 @@ import java.util.logging.Level; /** * Adds a "fieldName.zcurve" long attribute and a "fieldName.distance" summary field to all position type fields. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CreatePositionZCurve extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java index 49701f3e443..bfc5b7b4ebe 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java @@ -9,7 +9,7 @@ import com.yahoo.searchdefinition.document.Attribute; import com.yahoo.vespa.model.container.search.QueryProfiles; /** - * Created by balder on 3/10/15. + * @author baldersheim */ public class DiversitySettingsValidator extends Processor { public DiversitySettingsValidator(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java index d53be4bd18d..fee09cc53cb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * The implementation of exact matching * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExactMatch extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java index fa7725843b1..45a1d18b928 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java @@ -17,7 +17,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Makes implicitly defined summaries into explicit summaries * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ImplicitSummaries extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java index 3148273ddc1..46e9d471484 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java @@ -8,7 +8,7 @@ import com.yahoo.searchdefinition.Search; import com.yahoo.vespa.model.container.search.QueryProfiles; /** - * @author balder + * @author baldersheim */ public class IndexTo2FieldSet extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java index a29896ce3e8..24ef60b6bb3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java @@ -21,7 +21,7 @@ import java.util.Set; /** * Replaces the 'index' statement of all numerical fields to 'attribute' because we no longer support numerical indexes. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class IntegerIndex2Attribute extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java index e4e96bb51ab..3f75f6ffa47 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java @@ -21,7 +21,7 @@ import java.util.Iterator; * of complete-boosted fields indexed to <i>indexname</i>. A search for indexname * will be rewritten to also search <i>indexname</i>_exaxt * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LiteralBoost extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java index a9f013daa98..7b88487495f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java @@ -25,7 +25,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * * <p>This must be done after other summary processors.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class MakeDefaultSummaryTheSuperSet extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidator.java index efceeca0af0..467db6daeeb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidator.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidator.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Validates the match phase settings for all registered rank profiles. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class MatchPhaseSettingsValidator extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java index 8e5122cc158..84a86d98b56 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * The implementation of "gram" matching - splitting the incoming text and the queries into * n-grams for matching. This will also validate the gram settings. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NGramMatch extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java index a3e0484b2fd..9ddbf77082d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java @@ -19,7 +19,7 @@ import java.util.logging.Level; /** * Abstract superclass of all search definition processors. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java index bc676b64a71..bca863dd033 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * All rank: filter fields should have rank type empty. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SetRankTypeEmptyOnFilters extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java index 20eeb5f0810..bb8d1f8a3fe 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * Ensure that summary field transforms for fields having the same name * are consistent across summary classes * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SummaryConsistency extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java index 0d76ada0d52..06207f5ed6e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java @@ -12,7 +12,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Verifies that the source fields actually refers to a valid field. * - * @author balder + * @author baldersheim * */ public class SummaryFieldsMustHaveValidSource extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java index 3e211f4f632..a5de99c7406 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java @@ -13,7 +13,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * The implementation of the tag datatype * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TagType extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java index eb4efbe377f..ae16f6cfed8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java @@ -12,7 +12,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Class that processes and validates tensor fields. * - * @author <a href="geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class TensorFieldProcessor extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java index 8f9b88b0268..b7c98bec964 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.List; /** - * @author balder + * @author baldersheim */ public class UriHack extends Processor { private static final List<String> URL_SUFFIX = diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java index a5c7d25532d..68ba7536c6b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java @@ -12,7 +12,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Check that fields with index settings actually creates an index or attribute * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ValidateFieldWithIndexSettingsCreatesIndex extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java index 24b811fc7fc..98775051ccd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java @@ -17,7 +17,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * be left as in the input document, and trivially written queries to work by default. However, this may easily lead to * data which cannot be matched at all as the indexing and query side does not agree. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class WordMatch extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java index d98dd97ff83..6803b6f3382 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; * * Currently, type settings are limited to the type of tensor attribute fields and tensor query features. * - * @author <a href="geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class RankProfileTypeSettingsProcessor extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java index 787a70862a9..aa0d06d5e83 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java @@ -14,7 +14,7 @@ import java.util.logging.Level; * index (typically in an index-to statement), and if they have * output a warning and use the first ranktype. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class RankTypeResolver extends MultiFieldResolver { diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java index 29c0c4e8136..3cdcf55b34e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.Set; /** - * @author balder + * @author baldersheim * @since 2010-02-19 */ public class DocumentManager { diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java index 92b3c13d383..2ba34def464 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java @@ -14,7 +14,7 @@ import com.yahoo.vespa.documentmodel.DocumentModel; import java.util.*; /** - * @author balder + * @author baldersheim */ public class DocumentTypes { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java index 6c8206d30f2..b0f75df5b74 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java @@ -9,7 +9,7 @@ import com.yahoo.documentmodel.DocumentTypeRepo; * It contains a search manager managing all specified search definitions. * It contains a storage manager managing all specified storage definitions. * - * @author balder + * @author baldersheim * @since 2010-02-19 */ public class DocumentModel { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java index 42fa7b04cf6..b959855b080 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java @@ -11,7 +11,7 @@ import java.util.List; /** * A document summary definition - a list of summary fields. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DocumentSummary extends FieldView { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java index dfb44aef917..d36e43bc691 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java @@ -9,7 +9,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * @author balder + * @author baldersheim * @since 2010-02-19 */ public class FieldView implements Serializable { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java index 07b7c973841..dc1bd99d1d9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.logging.Logger; /** - * @author balder + * @author baldersheim * @since 2010-02-19 */ public class SearchDef { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java index 2db81861955..9a0e3064682 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author balder + * @author baldersheim * @since 2010-02-19 */ public class SearchField extends Field { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java index 29a960f7e7b..dd8c9d227b6 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.documentmodel; import java.util.TreeMap; /** - * @author balder + * @author baldersheim * @since 2010-02-19 */ public class SearchManager { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java index 29508eda1eb..58d2137c2e5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model; /** * A provider of services (an entity which has its own top-level tag in the services.xml file). * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface ServiceProvider { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/AbstractMonitoringSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/AbstractMonitoringSystem.java index 155dcca03d9..ac2ce8fbe77 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/AbstractMonitoringSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/AbstractMonitoringSystem.java @@ -7,7 +7,7 @@ import java.util.Objects; * * Represents an abstract monitoring service * - * @author musum + * @author hmusum * @since 5.1.20 * */ diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java index 6082ca9f72d..c998307f3f0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java @@ -70,6 +70,7 @@ public class DefaultMetricConsumers { // transaction log metrics.add(new Metric("content.proton.transactionlog.entries.average")); + metrics.add(new Metric("content.proton.transactionlog.disk_usage.average")); // document store metrics.add(new Metric("content.proton.documentdb.ready.document_store.disk_usage.average")); @@ -154,7 +155,7 @@ public class DefaultMetricConsumers { metrics.add(new Metric("cluster-controller.cluster-state-change.count", "content.cluster-controller.cluster-state-change.count")); metrics.add(new Metric("cluster-controller.is-master.last")); - // TODO(hakon): Update this name once persistent "count" metrics has been implemented. + // TODO(hakonhall): Update this name once persistent "count" metrics has been implemented. // DO NOT RELY ON THIS METRIC YET. metrics.add(new Metric("cluster-controller.node-event.count")); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/ModelConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/ModelConfigProvider.java index 1e9b485a939..1b3adf750d0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/ModelConfigProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/ModelConfigProvider.java @@ -7,7 +7,7 @@ import com.yahoo.config.model.producer.AbstractConfigProducer; /** * A config provider for the model config. The ModelConfig is a common config and produced by {@link ApplicationConfigProducerRoot} , this config * producer exists to make the admin/model config id exist for legacy reasons. - * @author <a href="mailto:musum@yahoo-inc.com">musum</a> + * @author hmusum * @author gjoranv * @since 5.0.8 */ diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/MonitoringSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/MonitoringSystem.java index de95c9a8d9a..ae957e6f9cb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/MonitoringSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/MonitoringSystem.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model.admin; /** * Interface for different monitoring services * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public interface MonitoringSystem { /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Yamas.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Yamas.java index 43775fe0dec..2768e42747c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Yamas.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Yamas.java @@ -7,7 +7,7 @@ import java.util.Objects; /** * Properties for yamas monitoring service * - * @author musum + * @author hmusum * @since 5.1.20 */ public class Yamas extends AbstractMonitoringSystem implements Serializable { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java index 00553f681fe..8fa7784f93a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java @@ -21,7 +21,7 @@ import java.util.zip.ZipException; /** * A validator for bundles. Uses BND library for some of the validation (not active yet) * - * @author musum + * @author hmusum * @since 2010-11-11 */ public class ComponentValidator extends Validator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java index 9b62d66bc07..e692b053de5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; * Validates that deployment file (deployment.xml) has valid values (for now * only global-service-id is validated) * - * @author musum + * @author hmusum */ public class DeploymentFileValidator extends Validator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java index 0c74fddcc51..e58d69cbf78 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java @@ -27,7 +27,7 @@ import static java.util.stream.Collectors.toList; * Validators that must be run after search cluster search definition deriving are * defined in PostSdValidation. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 2010-01-29 */ public class Validation { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java index d92e15fea66..2f0d4879431 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java @@ -7,7 +7,7 @@ import com.yahoo.vespa.model.VespaModel; /** * Abstract superclass of all application package validators. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 2010-01-29 */ public abstract class Validator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ChangeValidator.java index f60b1871e59..3022cb28c0a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ChangeValidator.java @@ -10,7 +10,7 @@ import java.util.List; /** * Interface for validating changes between a current active and next config model. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-11-18 */ public interface ChangeValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java index ab6bc5a1cd7..5a045565129 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; /** * Validates the changes between all current and next indexed search clusters in a vespa model. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-11-18 */ public class IndexedSearchClusterChangeValidator implements ChangeValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java index 18683ce2411..07a1566a4cd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java @@ -16,7 +16,7 @@ import java.util.Optional; /** * Returns any change to the indexing mode of a cluster. * - * @author musum + * @author hmusum */ public class IndexingModeChangeValidator implements ChangeValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaConfigChangeAction.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaConfigChangeAction.java index a8a334448ff..e7118754010 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaConfigChangeAction.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaConfigChangeAction.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; * Class containing the action to be performed on the given services to handle a config change * between the current active vespa model and the next vespa model to prepare. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-11-18 */ public abstract class VespaConfigChangeAction implements ConfigChangeAction { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java index 9e057c6cd28..144741c1b3d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; /** * Validates the changes between the current and next set of attribute fields in a document database. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-12-04 */ public class AttributeChangeValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/ChangeMessageBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/ChangeMessageBuilder.java index 28b04d54307..7081812d037 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/ChangeMessageBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/ChangeMessageBuilder.java @@ -7,7 +7,7 @@ import java.util.List; /** * Class used to build a message describing the changes in a given field. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-12-09 */ public class ChangeMessageBuilder { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java index 862b6caf0ca..e6e43fd74f7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java @@ -12,7 +12,7 @@ import java.util.List; /** * Validates the changes between a current and next document database that is part of an indexed search cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-11-18 */ public class DocumentDatabaseChangeValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java index 5d8121b6ef8..2f31a58ec81 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java @@ -13,7 +13,7 @@ import com.yahoo.vespa.documentmodel.SummaryTransform; * Class used to build a message describing the usual field changes causing changes in the indexing script. * This message should be more descriptive for the end-user than just seeing the changed indexing script. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-12-09 */ public class IndexingScriptChangeMessageBuilder { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java index f1043f14fdc..1430582d062 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java @@ -18,7 +18,7 @@ import java.util.Optional; /** * Validates the indexing script changes in all fields in the current and next search model. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @since 2014-12-08 */ public class IndexingScriptChangeValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientsBuilder.java index 0e0c94abae1..876017e16bc 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientsBuilder.java @@ -12,7 +12,7 @@ import java.util.List; /** * Builds the Clients plugin * - * @author musum + * @author hmusum */ public class DomClientsBuilder extends LegacyConfigModelBuilder<Clients> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java index 930e7105c2f..aecd0f9efb5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.List; /** - * @author balder + * @author baldersheim */ public class DomContentBuilder extends ConfigModelBuilder<Content> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java index aa2dfd84eb5..fa5d46526f4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java @@ -9,7 +9,7 @@ import org.w3c.dom.Element; /** * Builder for the tuning config for a search cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Tuning> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java index 4533b078b28..be733596ed7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java @@ -17,7 +17,7 @@ import java.util.Map; /** * Root builder of the processing model * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class DomProcessingBuilder extends DomChainsBuilder<Processor, ProcessingChain, ProcessingChains> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java index a3cbff2910f..05cab73f7be 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class DomProcessingChainBuilder extends DomChainBuilderBase<Processor, ProcessingChain> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java index b48d3dcab2f..c2487974793 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java @@ -10,7 +10,7 @@ import org.w3c.dom.Element; /** * Builds a processor from XML. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class DomProcessorBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Processor> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java index 5806de9343e..57bec4f8a8f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java @@ -14,7 +14,7 @@ import java.util.*; /** * Creates all processing chains from xml. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class ProcessingChainsBuilder extends ChainsBuilder<Processor, ProcessingChain> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java index ae7bcb64f66..387af49df34 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java @@ -7,7 +7,7 @@ import com.yahoo.vespa.model.container.component.chain.Chain; /** * Represents a processing chain in the config model * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class ProcessingChain extends Chain<Processor> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java index 032aacccca8..6bea1e27ea3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java @@ -11,7 +11,7 @@ import java.util.List; /** * Root config producer for processing * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class ProcessingChains extends Chains<ProcessingChain> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java index b16243576f9..25f901fa691 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.model.container.component.chain.ChainedComponent; /** * Representation of a Processor in the configuration model * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class Processor extends ChainedComponent<ChainedComponentModel> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java index e09d47e7bc1..24cb1a16d08 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java @@ -73,7 +73,6 @@ public class BundleMapper { bundleFromClass.put("com.yahoo.prelude.searcher.FillSearcher", searchAndDocprocBundle); bundleFromClass.put("com.yahoo.prelude.searcher.JSONDebugSearcher", searchAndDocprocBundle); bundleFromClass.put("com.yahoo.prelude.searcher.JuniperSearcher", searchAndDocprocBundle); - bundleFromClass.put("com.yahoo.prelude.searcher.KeyValueSearcher", searchAndDocprocBundle); bundleFromClass.put("com.yahoo.prelude.searcher.MultipleResultsSearcher", searchAndDocprocBundle); bundleFromClass.put("com.yahoo.prelude.searcher.PosSearcher", searchAndDocprocBundle); bundleFromClass.put("com.yahoo.prelude.searcher.QuerySnapshotSearcher", searchAndDocprocBundle); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java index b9fe10e4873..4bb0144ed0c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java @@ -37,7 +37,7 @@ import java.util.logging.Logger; * The config model from a content tag in services. * This consists mostly of a ContentCluster. * - * @author balder + * @author baldersheim */ public class Content extends ConfigModel { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchSpec.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchSpec.java index ad69cced45b..569ebe3490e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchSpec.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchSpec.java @@ -6,10 +6,9 @@ import java.util.List; /** * Represents the dispatch setup for a content cluster. - * This EITHER has a number of dispatch groups OR a an explicit list of groups, - * for unknown reasons (talk to Geir). + * This EITHER has a number of dispatch groups OR a an explicit list of groups. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DispatchSpec { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionValidator.java index 861088a80f5..798cf1dc3fb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionValidator.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; * but is instead used in the context of com.yahoo.vespa.model.ConfigProducer.validate() such that it can be unit tested * without having to build the complete vespa model. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class IndexedHierarchicDistributionValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java index bb16d542c20..fde54eb4f7a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java @@ -9,7 +9,7 @@ import java.util.Optional; /** * Class tracking resource limits for a content cluster with engine proton. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class ResourceLimits implements ProtonConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java index 4796c8b1382..fd2c93b0317 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java @@ -11,7 +11,7 @@ import java.util.List; /** * Builder for the dispatch setup for a content cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DomDispatchBuilder { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java index 8c83957eb26..7b9ca803719 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java @@ -7,7 +7,7 @@ import com.yahoo.vespa.model.content.ResourceLimits; /** * Builder for resource limits for a content cluster with engine proton. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DomResourceLimitsBuilder { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java index d665df3d53c..e425c2decf9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java @@ -5,11 +5,7 @@ import com.yahoo.vespa.model.content.StorageNode; import com.yahoo.vespa.model.search.SearchNode; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 20.11.12 - * Time: 20:04 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class ProtonProvider extends RPCEngine { public ProtonProvider(StorageNode parent, SearchNode searchNode) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java index e9d01f50fb6..2d113a241c9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java @@ -10,7 +10,7 @@ import java.util.*; * * Each @link{Dispatch} has a reference to an instance of this class and use it when producing config. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class DispatchGroup { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroupBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroupBuilder.java index 9b1f63e813e..46e6ef2681a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroupBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroupBuilder.java @@ -13,7 +13,7 @@ import java.util.Map; /** * Class used to build the mid-level dispatch groups in an indexed content cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DispatchGroupBuilder { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java index d44f81d571b..98bb56c978f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.configdefinition.IlscriptsConfig; /** * Represents a document database and the backend configuration needed for this database. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DocumentDatabase extends AbstractConfigProducer implements IndexInfoConfig.Producer, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java index 88ebef9da86..75833805bac 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.Collections; /** - * @author balder + * @author baldersheim */ public class IndexedElasticSearchCluster extends IndexedSearchCluster { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index aa664264ba6..99e08f15007 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -28,7 +28,7 @@ import java.util.*; import java.util.logging.Logger; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public abstract class IndexedSearchCluster extends SearchCluster implements diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/MultilevelDispatchValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/search/MultilevelDispatchValidator.java index a068d173ad8..e07427277bb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/MultilevelDispatchValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/MultilevelDispatchValidator.java @@ -11,7 +11,7 @@ import java.util.Set; /** * Class used to validate that multilevel dispatch is correctly setup in an indexed content cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class MultilevelDispatchValidator { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java index e5759d8c2e5..eca702bd2c6 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeSpec.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model.search; /** * Represents the row id and partition id of a search interface node. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class NodeSpec { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java index bedc3684ea9..45da8198447 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java @@ -5,7 +5,7 @@ package com.yahoo.vespa.model.search; * This represents an interface for searching. * It can be both a backend search node or a dispatcher. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public interface SearchInterface { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java index 9bc968bfd1a..1304eded53a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java @@ -32,7 +32,7 @@ import java.util.Optional; * in the model. * * @author arnej27959 - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ @RestartConfigs({ProtonConfig.class, MetricsmanagerConfig.class, TranslogserverConfig.class, StorDevicesConfig.class, StorFilestorConfig.class, StorBucketmoverConfig.class, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java index 2d89eb59b58..a679c2dd5fd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java @@ -17,7 +17,7 @@ import java.util.List; /** * A search cluster of type streaming. * - * @author balder + * @author baldersheim * @author vegardh */ public class StreamingSearchCluster extends SearchCluster implements diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java b/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java index 08c9d0ff4ce..a364c129a07 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; import org.w3c.dom.Element; /** - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class TransactionLogServer extends AbstractService { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java index 8493f5414be..25a98353f74 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java @@ -12,7 +12,7 @@ import static com.yahoo.text.Lowercase.toLowerCase; * Class representing the tuning config used for a search cluster. * Take a look at proton.def and vespa doc for detailed explanations. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.Producer, ProtonConfig.Producer { diff --git a/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java b/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java index c462cde3fb2..84e8977a391 100644 --- a/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java +++ b/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java @@ -20,7 +20,7 @@ import java.util.Optional; import java.util.Set; /** -* @author musum +* @author hmusum */ public class MockModelContext implements ModelContext { private final ApplicationPackage applicationPackage; diff --git a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java index 28a2a163b66..4e28a6e1ebc 100644 --- a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertTrue; * Tests that qrserver is assigned port Defaults.getDefaults().vespaWebServicePort() even if there is a HTTP gateway configured earlier in * vespa-services.xml * - * @author musum + * @author hmusum */ public class QrserverAndGatewayPortAllocationTest { diff --git a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java index 63b51acfad5..ca4a2e70ee6 100644 --- a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java @@ -9,7 +9,7 @@ import java.io.IOException; import java.io.StringReader; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class SchemaValidatorTest { diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java index 2a0a0bf224b..6d047c66a5a 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; /** - * @author musum + * @author hmusum */ public class HostsXmlProvisionerTest { private static final String oneHost = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java index e48baaadfd0..c98b97c77f5 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; /** - * @author musum + * @author hmusum */ public class SingleNodeProvisionerTest { @Test diff --git a/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java b/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java index 1250ac45916..fb5b9360660 100644 --- a/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java +++ b/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java @@ -14,10 +14,8 @@ import java.util.Iterator; import static org.junit.Assert.*; /** - TODO: Document purpose - - @author <a href="thomasg@yahoo-inc.com>Thomas Gundersen</a> - @author <a href="bratseth@yahoo-inc.com>Jon S Bratseth</a> + * @author Thomas Gundersen + * @author bratseth */ public class SDDocumentTypeTestCase extends SearchDefinitionTestCase { @@ -34,7 +32,6 @@ public class SDDocumentTypeTestCase extends SearchDefinitionTestCase { } @Test public void testInheritance() { - SDDocumentType child=new SDDocumentType("child"); Iterator<SDDocumentType> inherited=child.getInheritedTypes().iterator(); assertTrue(inherited.hasNext()); @@ -100,30 +97,5 @@ public class SDDocumentTypeTestCase extends SearchDefinitionTestCase { // TODO: Test uninheriting } - /* What is this?.. DocumentTypeIds aren't used for anything as far as I can see, and is now ignored by document, H\u00F9kon - public void testId() { - Search search = new Search("cocacola"); - SDDocumentType sugar = new SDDocumentType("sugar", 3, true, new DocumentTypeId(5), search); - search.addDocument(sugar); - try { - SDDocumentType color = new SDDocumentType("color", 2, true, new DocumentTypeId(5), search); - fail(); - } catch (RuntimeException re) { - } - - SDDocumentType taste = new SDDocumentType("taste", 3, true, search); - search.addDocument(taste); - try { - SDDocumentType secondtaste = new SDDocumentType("taste", 3, true, search); - fail(); - } catch (RuntimeException re) { - } - - SDDocumentType goodtaste = new SDDocumentType("goodtaste", 3, true, search); - search.addDocument(taste); - SDDocumentType badtaste = new SDDocumentType("badtaste", 3, true, search); - search.addDocument(taste); - } - */ } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java index 210f2d92ac0..86626436b1b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue; /** * tests importing of document containing array type fields * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ArraysTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java index ddffe6d6f48..bfa768cfc79 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java @@ -14,7 +14,7 @@ import static org.junit.Assert.*; /** * Attribute settings * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class AttributeSettingsTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java index 26b6444ec3a..64f96930859 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; /** * Tests comment handling * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class CommentTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java index 6aebe765bc4..927a2955bb6 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java @@ -10,7 +10,7 @@ import static org.junit.Assert.fail; import static org.junit.Assert.assertEquals; /** - * Created by balder on 3/10/15. + * @author baldersheim */ public class DiversityTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java index 150a759ecf4..4115eb621de 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IncorrectRankingExpressionFileRefTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java index b6e3dc1b442..28b1288130e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java @@ -11,7 +11,7 @@ import static org.junit.Assert.fail; /** * Tests importing a search definition with conflicting summary types * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IncorrectSummaryTypesTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java index 250db2609e2..8cf1014d5e4 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * tests importing of document containing array type fields * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MultipleSummariesTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java index c71d089e4d4..cd688a1b159 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue; /** * Tests settings outside the document * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class OutsideTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java index 79ee2df03a0..93afbd184f2 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue; /** * Tests rank profiles * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RankProfileTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java index 05548e62c2b..697e3d6a265 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java @@ -14,7 +14,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankPropertiesTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java index fa20e2a5eaf..22c7e4d4c1e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java @@ -16,7 +16,7 @@ import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankingExpressionConstantsTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java index f15e5c06012..2a771044f42 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java @@ -14,7 +14,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankingExpressionInliningTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java index 0c7a75d5694..c04bdc968d7 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java @@ -9,7 +9,7 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankingExpressionValidationTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java index 4183ffe64e3..6c3b9925d24 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; import static org.junit.Assert.assertNotNull; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ReservedWordsAsFieldNamesTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java index ec4ef766745..dfac943e61e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java @@ -18,7 +18,7 @@ import static org.junit.Assert.*; * Tests that search definitions are parsed correctly and that correct line number is reported in * error message. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class SearchDefinitionsParsingTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java index 0b119ccbf0d..c33ebc95bd2 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.fail; /** * tests importing of document containing array type fields * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class StructTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java index ea18fcb5266..2903f7e1e04 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; /** * Tests deriving using the Deriver facade * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DeriverTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java index 57d62326fe3..b790d9e68e8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java @@ -16,7 +16,7 @@ import java.io.IOException; /** * Tests deriving rank for files from search definitions * - * @author <a href="mailto:Jon S Bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class EmptyRankProfileTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java index 06729b1e27b..d6bd0af51cf 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java @@ -7,7 +7,7 @@ import org.junit.Test; import java.io.IOException; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExactMatchTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java index ca5884accd5..add6d690249 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNull; /** * Tests that documents ids are treated as they should * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class IdTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java index cb35062e59e..cc87b3eef72 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java @@ -26,7 +26,7 @@ import static org.junit.Assert.*; /** * Tests inheritance * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class InheritanceTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java index 8538944c13c..20c932ed1c8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java @@ -10,7 +10,7 @@ import java.io.IOException; /** * Tests deriving a configuration with multiple summaries * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class MultipleSummariesTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionsTestCase.java index 2dc96901275..671a870a918 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionsTestCase.java @@ -11,7 +11,7 @@ import static org.junit.Assert.*; /** * Testing stuff related to native rank type definitions * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class NativeRankTypeDefinitionsTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java index 77cea993131..29f3053f12c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Tests deriving of various field types * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class PrefixExactAttributeTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java index 222871c78b7..018c9060fba 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Tests a search definition with various rank profiles having different settings * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankProfilesTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java index 084366ddcbb..5e01dad4396 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java @@ -11,7 +11,7 @@ import java.util.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SearchOrdererTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java index 15aa8e63220..fecba418e7f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Tests sort settings * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class SortingTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java index ee4ad4fcd8a..737086cda27 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java @@ -11,7 +11,7 @@ import java.util.Arrays; /** * Tests VSM configuration deriving for structs * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class StreamingStructTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java index 58316111c55..415f28d769c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; /** * Tests summary map extraction * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryMapTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java index ceac1186b6e..5fd2b9c6f95 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertEquals; /** * Tests summary extraction * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java index 7908bb3a9f3..01dccf2f17e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Tests deriving of various field types * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TypesTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java index 26d22908060..9c6ff281c7a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue; /** * Test AttributeIndex processor. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class AttributeIndexTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributePropertiesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributePropertiesTestCase.java index 1fa275bc505..651134377d6 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributePropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributePropertiesTestCase.java @@ -16,7 +16,7 @@ import static org.junit.Assert.fail; /** * Test AttributeProperties processor. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class AttributePropertiesTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java index 0b401866932..36a325b42eb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java @@ -16,7 +16,7 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class IntegerIndex2AttributeTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java index 6dccdc235b9..f6d40644145 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java @@ -15,7 +15,7 @@ import java.util.List; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NGramTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java index 45dc5b3dc78..722841a06a2 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java @@ -21,7 +21,7 @@ import static org.junit.Assert.*; /** * Test Position processor. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class PositionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java index f33106b32bd..19547c5039b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java @@ -15,7 +15,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class RankingExpressionWithTensorTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorFieldTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorFieldTestCase.java index ed29d086bb1..ecadf8e1b71 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorFieldTestCase.java @@ -8,7 +8,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; /** - * @author <a href="geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class TensorFieldTestCase { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java index c203efb3d94..462729a4014 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java @@ -13,7 +13,7 @@ import static junit.framework.TestCase.assertTrue; /** - * @author musum + * @author hmusum * @since 5.1 */ public class RecentLogFilterTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java index 086544ba6ef..51fdff7b1ac 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertThat; /** * Test fixture to setup current and next content clusters used for change validation. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public abstract class ContentClusterFixture { protected ContentCluster currentCluster; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java index 98c27098c3d..d19b5288692 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class DomAdminV2BuilderTest extends DomBuilderTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java index 60d9fce767e..e1fbcecdf49 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.*; /** - * @author balder + * @author baldersheim */ public class DomContentBuilderTest extends DomBuilderTest { private ContentCluster createContent(String xml) throws Exception { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java index 6a9450b3d4e..caa4a34d47c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DomSearchTuningBuilderTest extends DomBuilderTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java index bc7197b5408..1de2d6fa770 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java @@ -8,7 +8,7 @@ import org.w3c.dom.Element; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Federation2Test extends SearchChainsTestBase { @Override diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java index d866fd225b3..9d82e663ea6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java @@ -17,7 +17,7 @@ import static junit.framework.TestCase.assertEquals; /** * Unit tests for content search cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class ContentSearchClusterTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java index e9da8dd2376..e35e66778ef 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java @@ -31,7 +31,7 @@ import static com.yahoo.vespa.model.search.utils.DispatchUtils.getDataset; /** * Unit tests for hierarchic distribution in an indexed content cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class IndexedHierarchicDistributionTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java index 8593d4f01b5..f770c83cf37 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java @@ -15,7 +15,7 @@ import static junit.framework.TestCase.assertEquals; /** * Unit tests for the naming of search nodes base dir and config ids in an indexed content cluster. - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class IndexedSearchNodeNamingTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageNodeTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageNodeTest.java index b0f2214d058..80fbcc71559 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageNodeTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageNodeTest.java @@ -18,7 +18,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; /** - * @author hakon + * @author hakonhall */ public class StorageNodeTest { private StorDevicesConfig getConfig(boolean useVdsEngine) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ApplicationPackageBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ApplicationPackageBuilder.java index 0e8d3cbbff7..c84a7412df6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ApplicationPackageBuilder.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ApplicationPackageBuilder.java @@ -9,7 +9,7 @@ import java.util.List; /** * Class for building an application package with content clusters (used for testing only). * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class ApplicationPackageBuilder { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java index 580f4f648d6..7da263696c1 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; /** * Class for building a content cluster with indexed search (used for testing only). * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class ContentClusterBuilder { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java index e64a39198b4..c8b35bd0a37 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java @@ -18,7 +18,7 @@ import java.util.Optional; /** * For testing purposes only. - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class ContentClusterUtils { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SearchDefinitionBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SearchDefinitionBuilder.java index a0817bf7446..bad3fd868a7 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SearchDefinitionBuilder.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SearchDefinitionBuilder.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model.content.utils; /** * Class for building a search definition (used for testing only). * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class SearchDefinitionBuilder { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java index 135d5302aee..30ae737af69 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.containsString; /** * Unit tests for multi-level dispatchers in an indexed content cluster. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class MultilevelDispatchTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java index 68deb96e632..f62cbbd0963 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.*; * Unit tests for SearchCluster. Please use this instead of SearchModelTestCase if possible and * write _unit_ tests. Thanks. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class SearchClusterTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java index e9aa8f2267f..964d0bbe4e9 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java @@ -21,7 +21,7 @@ import static junit.framework.TestCase.assertTrue; /** * Unit tests for search node. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class SearchNodeTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelConfigProviderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelConfigProviderTest.java index 1e5a5255321..d78bbb6e586 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelConfigProviderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelConfigProviderTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; /** * Test HostSystem * - * @author musum + * @author hmusum */ public class ModelConfigProviderTest { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java index 387ab07a685..b746b14e6f3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java @@ -12,7 +12,7 @@ import java.util.List; /** * For testing purposes only. - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class ApplicationPackageUtils { diff --git a/config-provisioning/OWNERS b/config-provisioning/OWNERS index 03193c770cb..8223ccfb64e 100644 --- a/config-provisioning/OWNERS +++ b/config-provisioning/OWNERS @@ -1,2 +1,2 @@ -musum +hmusum bratseth diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java index dd8ef7c4943..b68139f3578 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java @@ -11,7 +11,7 @@ import java.util.Optional; * A specification of a host and its role. * The identity of a host is determined by its name. * - * @author musum + * @author hmusum */ public class HostSpec implements Comparable<HostSpec> { diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/OutOfCapacityException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/OutOfCapacityException.java index 4f37e54dca8..ee04f4a5615 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/OutOfCapacityException.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/OutOfCapacityException.java @@ -5,7 +5,7 @@ package com.yahoo.config.provision; * * Exception thrown when we are unable to fulfill the request due to * having too few nodes (of the specified flavor) - * @author musum + * @author hmusum * */ public class OutOfCapacityException extends RuntimeException { diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Quota.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Quota.java index d3a5e6b0b96..d09a401bfaa 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Quota.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Quota.java @@ -2,7 +2,7 @@ package com.yahoo.config.provision; /** - * @author musum + * @author hmusum */ public class Quota { diff --git a/config-proxy/OWNERS b/config-proxy/OWNERS index 7028eebe31a..b13f1e9a5a3 100644 --- a/config-proxy/OWNERS +++ b/config-proxy/OWNERS @@ -1,2 +1,2 @@ -musum +hmusum arnej27959 diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CacheManager.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CacheManager.java index 993edd2962f..680bb6b43ac 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CacheManager.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CacheManager.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.config.RawConfig; /** * Manages memory and disk caches. * - * @author musum + * @author hmusum */ public class CacheManager { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CheckDelayedResponses.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CheckDelayedResponses.java index e8a2f5455a1..c6a5d90fd2b 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CheckDelayedResponses.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/CheckDelayedResponses.java @@ -14,7 +14,7 @@ import java.util.logging.Logger; * The run method of this class is executed periodically to * return requests that are about to time out. * - * @author musum + * @author hmusum */ public class CheckDelayedResponses implements Runnable { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java index 133ecf4c94f..fbbc2071d30 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java @@ -12,7 +12,7 @@ import java.util.logging.Logger; * Updates clients subscribing to config when config changes or the * timeout they have specified has elapsed. * - * @author musum + * @author hmusum */ public class ClientUpdater { final static Logger log = Logger.getLogger(ClientUpdater.class.getName()); diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java index b1cf0c01165..30cc68b340b 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; /** * A proxy server that handles RPC config requests. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1 */ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java index 8e0543d7914..5ad521ef5f6 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java @@ -8,7 +8,7 @@ import com.yahoo.log.event.Event; * Statistics/metrics for config proxy. * //TODO Use metrics framework * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.7 */ class ConfigProxyStatistics implements Runnable { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java index 8ef63cff5c3..5424418b4cc 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java @@ -13,7 +13,7 @@ import java.util.List; * A client to a config source, which could be an RPC config server or some other backing for * getting config. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public abstract class ConfigSourceClient { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java index f3d303c840c..ad991b5dcdf 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java @@ -6,7 +6,7 @@ import java.util.concurrent.DelayQueue; /** * Queue for requests that have no corresponding config in cache and which we are awaiting response from server for * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.7 */ class DelayedResponses { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java index aa214ec0410..164b486334c 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java @@ -14,7 +14,7 @@ import java.util.List; * A simple class to be able to test config proxy without having an RPC config * source. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.10 */ public class MapBackedConfigSource extends ConfigSourceClient implements ConfigSource { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java index d5531aa0ee4..e5ef69cbe7a 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java @@ -18,7 +18,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class MemoryCache { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java index af3182dd919..cfe3836faa7 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.logging.Logger; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.10 */ public class MemoryCacheConfigClient extends ConfigSourceClient { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java index ccb92c491f0..04dc8356eec 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java @@ -12,7 +12,7 @@ import java.util.Set; * and no new config having been sent from server. When in 'memorycache' mode, there is no connection * to another config source, the proxy only serves from (memory) cache. * - * @author musum + * @author hmusum */ class Mode { private final ModeName mode; diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java index ab053f31ac9..50f9df9726d 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java @@ -27,7 +27,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; * 'default' and 'memorycache', where the last one will not get config from an upstream * config source, but will serve config only from memory cache. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ProxyServer implements Runnable { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java index 100de46901e..b174a1668c1 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java @@ -21,7 +21,7 @@ import java.util.logging.Logger; /** * An Rpc client to a config source * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class RpcConfigSourceClient extends ConfigSourceClient { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcServer.java index c4c31b315dc..4536de8b1a5 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcServer.java @@ -5,7 +5,7 @@ import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; /** - * @author musum + * @author hmusum */ interface RpcServer { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java index 49e2bb86a15..5bc3cadd058 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.config.proxy; /** * Interface for subscribing to config from upstream config sources. * - * @author musum + * @author hmusum * @since 5.5 */ public interface Subscriber extends Runnable { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java index 849eb3f7910..74bbcf1a406 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.logging.Logger; /** - * @author musum + * @author hmusum * @since 5.5 */ public class UpstreamConfigSubscriber implements Subscriber { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CacheTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CacheTest.java index e4ddee9da97..ffeb6a02e59 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CacheTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CacheTest.java @@ -15,7 +15,7 @@ import java.util.Optional; /** * Helper class for memory and disk cache unit tests * - * @author musum + * @author hmusum * @since 5.1.10 */ public class CacheTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CheckDelayedResponsesTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CheckDelayedResponsesTest.java index f96f584f257..a14f0a5954a 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CheckDelayedResponsesTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/CheckDelayedResponsesTest.java @@ -10,7 +10,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum */ public class CheckDelayedResponsesTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ClientUpdaterTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ClientUpdaterTest.java index 7aca5990a12..2b429ad9729 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ClientUpdaterTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ClientUpdaterTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum */ public class ClientUpdaterTest { private MockRpcServer rpcServer; diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java index fbef9cf1d17..0b5df24b09e 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class ConfigProxyRpcServerTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyStatisticsTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyStatisticsTest.java index 8f1529142af..a9ce5bf24f2 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyStatisticsTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyStatisticsTest.java @@ -7,7 +7,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class ConfigProxyStatisticsTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java index c81846d78d8..5100804666b 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.11 */ public class DelayedResponseTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java index 701ca959ee8..86b7dcad357 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java @@ -7,7 +7,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class DelayedResponsesTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/Helper.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/Helper.java index dc2b667f823..f837951e0f0 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/Helper.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/Helper.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Optional; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class Helper { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java index b59d8710f36..2e71b3b60e1 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java @@ -10,7 +10,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class MemoryCacheConfigClientTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java index 3707217b9c6..9ab96cc3535 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class MemoryCacheTest extends CacheTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConnection.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConnection.java index 15f00cea18a..c93a2e74258 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConnection.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConnection.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.config.util.ConfigUtils; /** * For unit testing * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.11 */ public class MockConnection extends com.yahoo.config.subscription.impl.MockConnection { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockRpcServer.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockRpcServer.java index ed41fbf0e26..6797072e200 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockRpcServer.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockRpcServer.java @@ -5,7 +5,7 @@ import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; /** - * @author musum + * @author hmusum */ public class MockRpcServer implements RpcServer { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ModeTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ModeTest.java index c068a531a80..26432f97741 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ModeTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ModeTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** - * @author musum + * @author hmusum */ public class ModeTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java index 3ed876d547f..1c2195cec51 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class ProxyServerTest { diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java index 695c4068155..15c7216bb70 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum */ public class UpstreamConfigSubscriberTest { private final ConfigSourceSet sourceSet = new ConfigSourceSet("tcp/foo:78"); diff --git a/config/OWNERS b/config/OWNERS index 7028eebe31a..b13f1e9a5a3 100644 --- a/config/OWNERS +++ b/config/OWNERS @@ -1,2 +1,2 @@ -musum +hmusum arnej27959 diff --git a/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java b/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java index 1216efcbec5..318a9a79546 100644 --- a/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java +++ b/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java @@ -13,7 +13,7 @@ import java.util.*; /** * Deserializes config payload (cfg format) to a ConfigPayload. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.6 */ public class CfgConfigPayloadBuilder { diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java index 3e9047b3bfa..7cd435d5c0f 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java @@ -13,7 +13,7 @@ import com.yahoo.vespa.config.util.ConfigUtils; /** * For unit testing * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.11 */ public class MockConnection implements ConnectionPool, com.yahoo.vespa.config.Connection { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java index 6e9f2de5a0d..934e5d6ca7f 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java @@ -9,7 +9,7 @@ import java.util.Arrays; /** * Builds a ConfigDefinition from a tree of CNodes. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigDefinitionBuilder { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java index 5e5f8db2711..0baa4b93a09 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java @@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * Class to hold config definitions and resolving requests for the correct definition * - * @author Harald Musum <musum@yahoo-inc.com> + * @author hmusum * @since 5.1 */ public class ConfigDefinitionSet { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java b/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java index 1e8ba43d649..175e5657f23 100755 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java @@ -10,7 +10,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; /** * Class for holding the key when doing cache look-ups and other management of config instances. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigKey<CONFIGCLASS extends ConfigInstance> implements Comparable<ConfigKey<?>> { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java index 2b17305252f..d25bf2f0b21 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; * * TODO: This can be refactored a lot, since many of the reflection methods are duplicated * - * @author lulf, musum, tonyv + * @author lulf, hmusum, tonyv * @since 5.1.6 */ public class ConfigPayloadApplier<T extends ConfigInstance.Builder> { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java b/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java index 3d15804e14a..9c9b276512d 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java @@ -11,7 +11,7 @@ import static com.yahoo.vespa.config.ConfigPayloadApplier.IdentityPathAcquirer; /** * A utility class that can be used to transform config from one format to another. * - * @author lulf, musum, tonyv + * @author lulf, hmusum, tonyv * @since 5.1.6 */ public class ConfigTransformer<T extends ConfigInstance> { diff --git a/config/src/main/java/com/yahoo/vespa/config/Connection.java b/config/src/main/java/com/yahoo/vespa/config/Connection.java index 5ba9f2b598b..7bbede51948 100644 --- a/config/src/main/java/com/yahoo/vespa/config/Connection.java +++ b/config/src/main/java/com/yahoo/vespa/config/Connection.java @@ -5,7 +5,7 @@ import com.yahoo.jrt.Request; import com.yahoo.jrt.RequestWaiter; /** - * @author musum + * @author hmusum */ public interface Connection { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java b/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java index db21acc3d6e..2613e152839 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.config; /** - * @author musum + * @author hmusum */ public interface ConnectionPool { diff --git a/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java b/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java index 50fbe2170a2..10724bb7b0d 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java +++ b/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.config; /** - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public final class ErrorCode { // Cannot find a config with this name, version and config md5sum diff --git a/config/src/main/java/com/yahoo/vespa/config/ErrorType.java b/config/src/main/java/com/yahoo/vespa/config/ErrorType.java index 1371f0e93cc..d509e143643 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ErrorType.java +++ b/config/src/main/java/com/yahoo/vespa/config/ErrorType.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.config; /** - * @author musum + * @author hmusum */ public enum ErrorType { TRANSIENT, FATAL; diff --git a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java index 5e52dfc5e2d..713da94e071 100644 --- a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java +++ b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; * When calling {@link #setError(Connection, int)}, {#link #setNewCurrentConnection} will always be called. * * @author <a href="mailto:gunnarga@yahoo-inc.com">Gunnar Gauslaa Bergem</a> - * @author musum + * @author hmusum */ public class JRTConnectionPool implements ConnectionPool { private static final Logger log = Logger.getLogger(JRTConnectionPool.class.getName()); diff --git a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java index a7c4f4bf788..581df40f8fb 100755 --- a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java +++ b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java @@ -18,7 +18,7 @@ import java.util.Optional; * Encapsulates config, usually associated with a {@link JRTConfigRequest}. An instance of this class can represent * either a config that is not yet resolved, a successfully resolved config, or an error. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class RawConfig { diff --git a/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java b/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java index 3f2cd9ae2fa..25b34725b18 100644 --- a/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java +++ b/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java @@ -13,7 +13,7 @@ import java.util.*; * Includes an RPC server interface for communicating * with test classes that implement the {@link Tester} interface. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.5 */ public class StressTester { diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/Payload.java b/config/src/main/java/com/yahoo/vespa/config/protocol/Payload.java index aa0bf374363..74b54d1e3e1 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/Payload.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/Payload.java @@ -11,7 +11,7 @@ import java.util.Objects; /** * An immutable config payload * - * @author musum + * @author hmusum * @author bratseth */ public class Payload { diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/VespaVersion.java b/config/src/main/java/com/yahoo/vespa/config/protocol/VespaVersion.java index 748cdce4e25..cb95efb920a 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/VespaVersion.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/VespaVersion.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.config.protocol; /** * A wrapper class for Vespa version * - * @author musum + * @author hmusum * @since 5.39 */ public class VespaVersion { diff --git a/config/src/test/java/com/yahoo/config/subscription/AppService.java b/config/src/test/java/com/yahoo/config/subscription/AppService.java index 1f0fc43ed4e..71798934220 100644 --- a/config/src/test/java/com/yahoo/config/subscription/AppService.java +++ b/config/src/test/java/com/yahoo/config/subscription/AppService.java @@ -5,7 +5,7 @@ import com.yahoo.foo.AppConfig; import com.yahoo.vespa.config.TimingValues; /** - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * * Application that subscribes to config defined in app.def and * generated code in AppConfig.java. diff --git a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java index 55d1e5774a5..7ad7144a1c8 100644 --- a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java @@ -16,7 +16,7 @@ import static com.yahoo.config.subscription.util.JsonHelper.inputJson; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @author Vegard Sjonfjell * @since 5.1 */ diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java index 9fa299aef83..d782b922eb2 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** - * @author musum, lulf + * @author hmusum, lulf * @since 5.1 */ public class ConfigSubscriptionTest { diff --git a/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java b/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java index 55b1eb97bee..b487729cad6 100644 --- a/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; * <li>Reference * </ul> * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class DefaultConfigTest { static final String CONFIG_ID = "raw:" + diff --git a/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java b/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java index 7d3b86db2fe..2b75c8d0fb6 100644 --- a/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.11 */ public class JRTConfigRequesterTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java index 5356acdfade..4263e03835c 100755 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.*; /** * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigCacheKeyTest { @Test diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java index cb1cccc0139..592bb7e4abf 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java @@ -16,7 +16,7 @@ import static org.junit.Assert.*; /** * Unit tests for ConfigDefinitionBuilder. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigDefinitionBuilderTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java index fbdca4af6df..193bf4caf25 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue; /** * Tests ConfigDefinitionKey * - * @author musum + * @author hmusum */ public class ConfigDefinitionKeyTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java index a00c013109e..cfedd733ea0 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue; /** * Class to hold config definitions and resolving requests for the correct definition * - * @author Harald Musum <musum@yahoo-inc.com> + * @author hmusum * @since 2011-11-18 */ public class ConfigDefinitionSetTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java index ce03d5f6823..9a7d9cad754 100755 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.*; /** * Unit tests for ConfigDefinition. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigDefinitionTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigHelperTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigHelperTest.java index ce625727491..6f0ee7be36f 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigHelperTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigHelperTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class ConfigHelperTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigKeyTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigKeyTest.java index e824571d9d1..e2ce3dda0e3 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigKeyTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigKeyTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.*; /** * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigKeyTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java b/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java index 249a5ab6123..6226c00e996 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java @@ -7,7 +7,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class ErrorCodeTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/JRTConnectionPoolTest.java b/config/src/test/java/com/yahoo/vespa/config/JRTConnectionPoolTest.java index 438d8edb430..5f47728ee76 100644 --- a/config/src/test/java/com/yahoo/vespa/config/JRTConnectionPoolTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/JRTConnectionPoolTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.*; * Tests for the JRTConnectionPool class. * * @author <a href="mailto:gunnarga@yahoo-inc.com">Gunnar Gauslaa Bergem</a> - * @author musum + * @author hmusum */ public class JRTConnectionPoolTest { private static final List<String> sources = new ArrayList<>((Arrays.asList("host0", "host1", "host2"))); diff --git a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java index 7a316838334..1c42d959eaa 100644 --- a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertFalse; /** - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1.9 */ public class RawConfigTest { diff --git a/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java b/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java index 1bae6c79ccb..780c7c802eb 100644 --- a/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java @@ -10,7 +10,7 @@ import static org.junit.Assert.assertThat; /** * Note: Most of the functionality is tested implicitly by other tests * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class TimingValuesTest { @Test diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java index ac3a7f16505..ec2ee479398 100644 --- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; /** - * @author musum + * @author hmusum */ public class JRTConfigRequestFactoryTest { private static VespaVersion defaultVespaVersion = JRTConfigRequestFactory.getCompiledVespaVersion(); diff --git a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java index d07c007c13f..d080d04b29d 100644 --- a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.fail; /** * Tests ConfigUtils. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigUtilsTest { diff --git a/config_test/OWNERS b/config_test/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/config_test/OWNERS +++ b/config_test/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/configd/src/apps/su/main.cpp b/configd/src/apps/su/main.cpp index 7baa726d630..4cce0b5ead0 100644 --- a/configd/src/apps/su/main.cpp +++ b/configd/src/apps/su/main.cpp @@ -7,18 +7,22 @@ /** * small utility to use instead of "su" when we want to just - * switch to the "yahoo" user without any more fuss + * switch to the vespa user without any more fuss **/ int main(int argc, char** argv) { if (argc < 2) { - fprintf(stderr, "missing arguments, usage: run-as-yahoo <cmd> [args ...]"); + fprintf(stderr, "missing arguments, usage: run-as-yahoo <cmd> [args ...]\n"); exit(1); } - struct passwd *p = getpwnam("yahoo"); + const char *username = getenv("VESPA_USER"); + if (username == NULL) { + username = "yahoo"; + } + struct passwd *p = getpwnam(username); if (p == NULL) { - perror("FATAL error: user 'yahoo' missing in passwd file"); + fprintf(stderr, "FATAL error: user '%s' missing in passwd file\n", username); exit(1); } gid_t g = p->pw_gid; diff --git a/configdefinitions/OWNERS b/configdefinitions/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/configdefinitions/OWNERS +++ b/configdefinitions/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/configgen/OWNERS b/configgen/OWNERS index b690845e701..fd4a2e9d996 100644 --- a/configgen/OWNERS +++ b/configgen/OWNERS @@ -1,2 +1,2 @@ -musum +hmusum gjoranv diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java index 0a6c225fa19..8abd9f3dcee 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; * This class generates a tree of CNodes from a .def file. * * @author gjoranv - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class DefParser { static final Pattern commentPattern = Pattern.compile("^\\s*#+\\s*(.*?)\\s*$"); diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java b/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java index 8518ff04573..e989e977609 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java @@ -4,7 +4,7 @@ package com.yahoo.config.codegen; /** * An immutable class representing a default value of a config variable * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DefaultValue { diff --git a/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java b/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java index f28549275ef..c7b0cc42289 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java @@ -77,7 +77,7 @@ public class MakeConfig { /** * Helper methods for handling exceptions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ static class Exceptions { diff --git a/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java b/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java index 1847150d86d..e553448457c 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java @@ -16,7 +16,7 @@ import java.nio.charset.Charset; * Does normalizing (removing comments, trimming whitespace etc.) and calculation of md5sum * of config definitions * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class NormalizedDefinition { /* Patterns used for finding ranges in config definitions */ diff --git a/configgen/src/main/java/com/yahoo/config/codegen/ReservedWords.java b/configgen/src/main/java/com/yahoo/config/codegen/ReservedWords.java index 145f2da3245..edf588a3c9d 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/ReservedWords.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/ReservedWords.java @@ -7,7 +7,7 @@ import java.util.regex.Pattern; /** * Reserved words that cannot be used as variable names in a config definition file. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 2009-06-24 */ diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java index 515f7838436..58f6b70d733 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java @@ -9,7 +9,7 @@ import org.junit.Test; /** * Tests parsing of a single line of a .def file * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author gjoranv */ public class DefLineParsingTest { diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java index 567d7419778..65a0826c355 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java @@ -15,7 +15,7 @@ import java.io.*; /** * Unit tests for DefParser. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @author <a href="gv@yahoo-inc.com">G. Voldengen</a> */ public class DefParserTest { diff --git a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java index f0713a090ec..21b28262b5f 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java @@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.is; /** - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class NormalizedDefinitionTest { diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index ce72c16b493..fcc011790b9 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -1,7 +1,9 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_install_script(src/main/sh/cloudconfig_server-remove-state bin) -vespa_install_script(src/main/sh/start-filedistribution start-file libexec) -vespa_install_script(src/main/sh/ping-configserver libexec) -vespa_install_script(src/main/sh/start-configserver libexec) -vespa_install_script(src/main/sh/start-logd libexec) -vespa_install_script(src/main/sh/stop-configserver libexec) +vespa_install_script(src/main/sh/start-filedistribution libexec/vespa) +vespa_install_script(src/main/sh/ping-configserver libexec/vespa) +vespa_install_script(src/main/sh/start-configserver libexec/vespa) +vespa_install_script(src/main/sh/start-logd libexec/vespa) +vespa_install_script(src/main/sh/stop-configserver libexec/vespa) +install(DIRECTORY src/main/resources/logd DESTINATION conf) +install(DIRECTORY src/main/resources/configserver-app DESTINATION conf) diff --git a/configserver/OWNERS b/configserver/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/configserver/OWNERS +++ b/configserver/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java index 1c6f75b62f0..204ab214199 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; * A delayed response is a response sent at request (server) timeout * for a config which has not changed since the request was initiated. * - * @author musum + * @author hmusum */ public class DelayedConfigResponses { private static final Logger log = Logger.getLogger(DelayedConfigResponses.class.getName()); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java index eb5fedf9a40..58020dd773c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java @@ -19,7 +19,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** -* @author musum +* @author hmusum * @since 5.1 */ class GetConfigProcessor implements Runnable { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java b/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java index dc411626b39..117f807c309 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java @@ -9,7 +9,7 @@ import java.util.HashMap; /** * Component to hold host registries. * - * @author musum + * @author hmusum */ public class HostRegistries { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java b/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java index 2a686e2dee3..b1a2988109d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; /** * Rotations for an application. Persisted in ZooKeeper. * - * @author musum + * @author hmusum */ public class RotationsCache { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java index f49268dd800..53c54045bf6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java @@ -47,7 +47,7 @@ import java.util.logging.Logger; * An RPC server class that handles the config protocol RPC method "getConfigV3". * Mandatory hooks need to be implemented by subclasses. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class RpcServer implements Runnable, ReloadListener, TenantListener { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/LogServerLogGrabber.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/LogServerLogGrabber.java index bd60527ca79..2ce95e016f4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/LogServerLogGrabber.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/LogServerLogGrabber.java @@ -23,7 +23,7 @@ import java.util.Optional; * Fetches log entries from logserver with level errors and fatal. The logserver only return * a log entry once over this API so doing repeated call will not give the same results. * - * @author dybdahl + * @author dybis */ public class LogServerLogGrabber extends AbstractComponent { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LogServerLogGrabber.class.getName()); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java index 9c6f21f3511..f055887c77a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java @@ -24,7 +24,7 @@ import java.util.*; /** * A class used for reading and writing application data to zookeeper. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum * @since 5.1 */ public class ZooKeeperClient { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java index 2af55c343a1..976ff661ed2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server.http; /** * Exception that will create a http response with BAD_REQUEST response code (400) * - * @author musum + * @author hmusum * @since 5.1.17 */ public class BadRequestException extends RuntimeException { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java index c2d255e1630..75788495fdf 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java @@ -15,7 +15,7 @@ import java.util.List; * Requests for content and content status, both for prepared and active sessions, * are handled by this class. * - * @author musum + * @author hmusum * @since 5.1.15 */ public class ContentHandler { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java index 7eb6f9c2271..5f01b1e1f49 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java @@ -18,7 +18,7 @@ import java.util.concurrent.Executor; * methods for a request. Handlers should subclass this method and * implement the handleMETHOD methods that it supports. * - * @author musum + * @author hmusum * @since 5.1.14 */ public class HttpHandler extends LoggingRequestHandler { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java index 240f5814652..6680e686d7e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java @@ -6,7 +6,7 @@ import java.io.IOException; /** * Exception that will create a http response with INTERNAL_SERVER_ERROR response code (500) * - * @author musum + * @author hmusum * @since 5.1.17 */ public class InternalServerException extends RuntimeException { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java index ba8f034777a..9fec1b0af99 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.config.server.http; /** - * @author musum + * @author hmusum */ public class InvalidApplicationException extends RuntimeException { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java index 327e792134a..6a49188a14c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server.http; /** * Exception that will create a http response with NOT_FOUND response code (404) * - * @author musum + * @author hmusum * @since 5.1.17 */ public class NotFoundException extends RuntimeException { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java index caf38517b6a..2ef99372fba 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java @@ -14,7 +14,7 @@ import java.util.*; /** * Status and md5sum for files within an application package. * - * @author musum + * @author hmusum * @since 5.1.15 */ class SessionContentStatusListResponse extends SessionResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java index 15c852b66c3..f8e3f4c10f1 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java @@ -9,7 +9,7 @@ import java.io.*; /** * Represents a response for a request to show the status and md5sum of a file in the application package. * - * @author musum + * @author hmusum * @since 5.1.15 */ public class SessionContentStatusResponse extends SessionResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java index 1526a5b4e0e..fdafd5a7b16 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java @@ -25,7 +25,7 @@ import java.io.IOException; * Handles /application/v2 requests * * @author lulf - * @author musum + * @author hmusum * @since 5.1.27 */ // TODO Rename class diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java index 72810ed394c..c3fc33bcbd6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java @@ -6,7 +6,7 @@ import com.yahoo.container.jdisc.HttpResponse; /** * Interface for creating responses for SessionCreateHandler. * - * @author musum + * @author hmusum * @since 5.1.27 */ public interface SessionCreateResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java index c8829cf9e4d..db1cb7dc202 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java @@ -21,7 +21,7 @@ import java.util.concurrent.Executor; * methods for a request. Session handlers should subclass this method and * implement the handleMETHOD methods that it supports. * - * @author musum + * @author hmusum * @since 5.1.14 */ public class SessionHandler extends HttpHandler { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java index 5054e1129d1..4c636fb91ec 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java @@ -15,7 +15,7 @@ import static com.yahoo.jdisc.http.HttpResponse.Status.OK; * Superclass for responses from session HTTP handlers. Implements the * render method. * - * @author musum + * @author hmusum * @since 5.1.14 */ public class SessionResponse extends HttpResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java index bfdbdd1d4b1..d320b1bfbbd 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.config.server.http; /** - * @author musum + * @author hmusum * @since 5.39 */ public class UnknownVespaVersionException extends RuntimeException { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java index 83f4c836d20..e1159ba8e64 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java @@ -13,7 +13,7 @@ import java.net.URI; /** * Utilities for handlers. * - * @author musum + * @author hmusum * @since 5.1.14 */ public class Utils { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java index 458a3899d4c..6f96e9c136d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java @@ -33,7 +33,7 @@ import java.util.concurrent.Executor; /** * Handler for deleting a currently active application for a tenant. * - * @author musum + * @author hmusum * @since 5.4 */ public class ApplicationHandler extends HttpHandler { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java index 086954c384f..03c0c7d7fc9 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java @@ -21,7 +21,7 @@ import java.util.concurrent.Executor; /** * Handler for getting tenant and application for a given hostname. * - * @author musum + * @author hmusum * @since 5.19 */ public class HostHandler extends HttpHandler { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java index 16d3fd6802a..1bdd37dd685 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java @@ -12,7 +12,7 @@ import com.yahoo.vespa.config.server.session.LocalSession; * Requests for content and content status (v2) * are handled by this class. * - * @author musum + * @author hmusum * @since 5.3 */ class SessionContentRequestV2 extends ContentRequest { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java index 90d8ba63892..c4f4a5139b5 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java @@ -32,7 +32,7 @@ import java.util.logging.Logger; * or create a new session from a previous session (with id or the "active" session). * Handles /application/v2/ requests * - * @author musum + * @author hmusum * @since 5.1 */ public class SessionCreateHandler extends SessionHandler { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java index 5fab4b97407..30c7e98e2da 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.config.server.http.SessionResponse; /** * Creates a response for SessionCreateHandler (v2). * - * @author musum + * @author hmusum * @since 5.1.27 */ public class SessionCreateResponseV2 extends SessionResponse implements SessionCreateResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java index 9a0cc7e6d16..cf2094933c1 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java @@ -31,7 +31,7 @@ import java.util.logging.Logger; /** * A handler that prepares a session given by an id in the request. v2 of application API * - * @author musum + * @author hmusum * @since 5.1.29 */ public class SessionPrepareHandler extends SessionHandler { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java index dbc36bbc948..c46d0e063b3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java @@ -12,7 +12,7 @@ import com.yahoo.vespa.config.server.session.Session; /** * Creates a response for SessionPrepareHandler. * - * @author musum + * @author hmusum * @since 5.1.28 */ class SessionPrepareResponse extends SessionResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java index 99393cd351a..bdaee44024d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.config.server.http.SessionResponse; /** * Response for tenant create * - * @author musum + * @author hmusum */ public class TenantGetResponse extends SessionResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java index 8eae14b9aac..da6616772d3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java @@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentHashMap; import static com.yahoo.vespa.config.server.monitoring.Metrics.getMetricName; /** - * @author musum + * @author hmusum */ // TODO javadoc, thread non-safeness maybe public class MetricUpdater { diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 4fafe1bdf88..754dd1715d3 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -94,8 +94,6 @@ rm -f $ZOOKEEPER_LOG_FILE*lck # common setup export VESPA_LOG_TARGET=file:${VESPA_HOME}logs/vespa/vespa.log export VESPA_LOG_CONTROL_DIR="${VESPA_HOME}var/db/vespa/logcontrol" -export VESPA_LOG_CONTROL_DIR=${VESPA_HOME}var/db/vespa/logcontrol -export VESPA_LOG_CONTROL_FILE=${VESPA_HOME}var/db/vespa/logcontrol/configserver.logcontrol export VESPA_LOG_CONTROL_FILE="${VESPA_HOME}var/db/vespa/logcontrol/configserver.logcontrol" export VESPA_SERVICE_NAME=configserver export LD_LIBRARY_PATH=${VESPA_HOME}lib64 @@ -130,6 +128,7 @@ jvmargs="$baseuserargs $serveruserargs" printenv > $cfpfile mkdir -p $bundlecachedir +chown -R yahoo $bundlecachedir run-as-yahoo vespa-runserver -s configserver -r 30 -p $pidfile -- \ java \ diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java index 03cb5ada8ad..1bd9249644b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java @@ -28,7 +28,7 @@ import static org.junit.Assert.*; /** * Unit tests for ZooKeeperClient. * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ZooKeeperClientTest extends TestWithCurator { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java index 22607e8fc26..6f4ca93fb07 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.*; /** * Base class for handler tests * - * @author musum + * @author hmusum * @since 5.1.14 */ public class HandlerTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java index 6a6a4097319..74211196174 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue; * Tests for session create handlers, to make it easier to have * similar tests for more than one version of the API. * - * @author musum + * @author hmusum * @since 5.1.28 */ public abstract class SessionCreateHandlerTestBase extends SessionHandlerTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java index 2d7e293fb3c..09cc00af45f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum * @since 5.1.14 */ public class SessionExampleHandlerTest { @@ -48,7 +48,7 @@ public class SessionExampleHandlerTest { /** * A handler that prepares a session given by an id in the request. * - * @author musum + * @author hmusum * @since 5.1.14 */ public static class SessionExampleHandler extends ThreadedHttpRequestHandler { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java index d38b7f9e586..da5283aeecd 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java @@ -23,7 +23,7 @@ import java.util.Optional; /** * Base class for session handler tests * - * @author musum + * @author hmusum * @since 5.1.14 */ public class SessionHandlerTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java index 885d4164196..85eae0c91cc 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum * @since 5.1.14 */ public abstract class SessionPrepareHandlerTestBase extends SessionHandlerTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java index 1eb38902e3f..5171277c873 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java @@ -50,7 +50,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** - * @author musum + * @author hmusum * @since 5.4 */ public class ApplicationHandlerTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java index 50ef9176771..894990a5c1b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum * @since 5.4 */ public class HostHandlerTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java index d31cdc1d1e1..e31d485f4df 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.*; import static com.yahoo.jdisc.http.HttpRequest.Method.*; /** - * @author musum + * @author hmusum * @since 5.1 */ public class SessionCreateHandlerTest extends SessionCreateHandlerTestBase { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java index 0a5d4a1843c..3307c016939 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java @@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum * * @since 5.1.14 */ diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java index 9faba599e3a..8ab57990bb2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** - * @author musum + * @author hmusum */ public class PrepareParamsTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java index 8549902faf0..96d0181161c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java @@ -10,7 +10,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; /** - * @author musum + * @author hmusum * @since 5.1.14 */ public class SessionRepoTest { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java index b370b148fe0..dc310fdd113 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java @@ -10,7 +10,7 @@ import static org.junit.Assert.*; /** * Tests the ZKFacade using a curator mock. * - * @author <a href="musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class ConfigCuratorTest { diff --git a/configutil/OWNERS b/configutil/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/configutil/OWNERS +++ b/configutil/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogSampler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogSampler.java index 987035bb0e9..f722511dd0c 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogSampler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogSampler.java @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicLong; * much less frequently to reduce CPU usage and latency impact. It only samples successful requests and requests * that starts with /search. * - * @author dybdahl + * @author dybis */ public class AccessLogSampler implements AccessLogInterface { diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java index 7a60eb2098c..fc458375d6a 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java @@ -9,7 +9,7 @@ import java.util.List; /** * This class keeps some information from the access log from the requests in memory. It is thread-safe. * - * @author dybdahl + * @author dybis */ public class CircularArrayAccessLogKeeper { public static final int SIZE = 1000; diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java index 5e86c55c294..2632c3d9aac 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java @@ -45,6 +45,7 @@ public class LogFileHandler extends StreamHandler { LogFileHandler logFileHandler; public LogThread(LogFileHandler logFile) { super("Logger"); + setDaemon(true); logFileHandler = logFile; } @Override diff --git a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java index 368a1f2cbf6..cc6ba83711d 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java @@ -16,7 +16,7 @@ import java.util.concurrent.Executor; /** * Exposes access log through http. * - * @author dybdahl + * @author dybis */ public class AccessLogRequestHandler extends ThreadedHttpRequestHandler { private final CircularArrayAccessLogKeeper circularArrayAccessLogKeeper; diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java index 351af7f2563..fd3c8ed4c49 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java @@ -6,7 +6,7 @@ package com.yahoo.container.handler; * The coverage report for a result set. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author balder + * @author baldersheim */ public class Coverage { diff --git a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java index 51e1c0c1d53..474c2f1a4a2 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java +++ b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java @@ -23,7 +23,7 @@ import com.yahoo.jdisc.Metric; * Request an Executor injected in your component constructor if you want to use it. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author bratseth */ public class ThreadPoolProvider extends AbstractComponent implements Provider<Executor> { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java index dadac8e8f16..7c114e0097b 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java @@ -33,7 +33,7 @@ import static com.yahoo.jdisc.http.HttpRequest.Method; * and are thus immutable. If you need mutable abstractions, use a higher level * framework, e.g. Processing. * - * @author musum + * @author hmusum * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @since 5.1 */ diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java index 1bd8e3089a7..cd91d2d914c 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java @@ -13,7 +13,7 @@ import java.util.Collections; /** * An HTTP response as an opaque payload with headers and content type. * - * @author musum + * @author hmusum * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @since 5.1 */ diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index e23104e484f..205dbcd9ce8 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; * {@link #handle(HttpRequest)} method in this class and the * {@link HttpResponse#render(java.io.OutputStream)} method. * - * @author musum + * @author hmusum * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @author bratseth * @since 5.1 diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java index a463cfa2ba1..5cbe590c030 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java @@ -47,7 +47,7 @@ import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry; * <p> * COMPONENT: The type of the processing components of which this executes a chain * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author tonyv * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @since 5.1.6 diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java index efca279cd38..2ce345ad355 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java @@ -30,7 +30,7 @@ import com.yahoo.processing.response.DataList; * A response from running a request through processing. This response is just a * wrapper of the knowhow needed to render the Response from processing. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @since 5.1.12 */ diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java index b02c0fcccdb..7f656c61db4 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java @@ -22,7 +22,7 @@ import java.util.concurrent.Executors; * A helper for making processing requests and rendering their responses. * Create an instance of this to test making processing requests and get the response or response data. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.21 */ @Beta diff --git a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java index 195ecc73e9f..a9b8a9a67e2 100644 --- a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java +++ b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java @@ -12,7 +12,7 @@ import java.util.Map; * A processor which adds the current content of the Request.properties() to * the trace before calling the next processor, if traceLevel is 4 or more. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.17 */ public class RequestPropertyTracer extends Processor { diff --git a/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java b/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java index e89d98941be..4f5f27dd7d6 100644 --- a/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java +++ b/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java @@ -2,7 +2,7 @@ package com.yahoo.component; /** - * @author balder + * @author baldersheim */ public class ComponentIdBenchmark { public void run() { diff --git a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java b/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java index 7359cc8ba66..4a7c5642f96 100644 --- a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java +++ b/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java @@ -5,7 +5,7 @@ import com.yahoo.component.ComponentId; import junit.framework.TestCase; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ComponentIdTestCase extends TestCase { diff --git a/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java b/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java index 4ebe0819d9e..1aee548a7de 100644 --- a/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; * packets used today, they allow more flexible sets of parameters * to be shipped with query results. This packet can be decoded only. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DocsumPacket extends Packet { diff --git a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java index fb909a480b1..bc20e7e9501 100644 --- a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; * <p>A packet for requesting a list of document summaries. * This packet can be encoded only.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class GetDocSumsPacket extends Packet { diff --git a/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java b/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java index 948c537f068..47ea2b76dbf 100644 --- a/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java +++ b/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java @@ -17,7 +17,7 @@ import java.util.Set; /** * A static utility for encoding values to the binary map representation used in fs4 packets. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapEncoder { diff --git a/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java b/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java index f63ef59e093..0f6f58ba7b7 100644 --- a/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java +++ b/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; /** * Returns the correct package for a package byte stream * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="mailto:borud@yahoo-inc.com">Bj\u00f8rn Borud</a> */ public class PacketDecoder { diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java b/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java index 5a42d26901f..d26bb91236b 100644 --- a/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java +++ b/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java @@ -13,7 +13,7 @@ import java.util.logging.Logger; * Pool of com.yahoo.io.Listener instances for shared use by Vespa backend * searchers. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.3.0 */ public final class ListenerPool { diff --git a/container-search/src/main/java/com/yahoo/prelude/Index.java b/container-search/src/main/java/com/yahoo/prelude/Index.java index 5b1944c352b..4f596cefa95 100644 --- a/container-search/src/main/java/com/yahoo/prelude/Index.java +++ b/container-search/src/main/java/com/yahoo/prelude/Index.java @@ -18,7 +18,7 @@ import java.util.Set; * addCommand sets both types. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Index { diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java index 77ee36785f7..d183a47a66f 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java @@ -16,7 +16,7 @@ import com.yahoo.search.result.ErrorMessage; * Monitors of a cluster of remote nodes. The monitor uses an internal thread * for node monitoring. * - * @author <a href="mailto:jon.bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class ClusterMonitor implements Runnable, Freezable { diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java index 88982fa1b69..e315bee6040 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java @@ -57,7 +57,7 @@ import static com.yahoo.container.QrSearchersConfig.Searchcluster.Indexingmode.S * * @author bratseth * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ @After("*") public class ClusterSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java index c48a8804f9f..6cdfd3e8e43 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java @@ -12,7 +12,7 @@ import java.util.Map; /** * Representation of a back-end document database. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DocumentDatabase { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java index 1aa226dbeb8..f479bed14bd 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; /** * Provider for {@link com.yahoo.fs4.mplex.ListenerPool}. All users will get the same pool instance. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.4.0 */ public class FS4ResourcePool extends AbstractComponent { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java index dfca9c49cba..cd94d2a59ec 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java @@ -41,7 +41,7 @@ import static com.yahoo.container.util.Util.quote; * The searcher which forwards queries to fdispatch nodes, using the fnet/fs4 * network layer. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ // TODO: Clean up all the duplication in the various search methods by // switching to doing all the error handling using exceptions below doSearch2. diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java index e5a7d433324..01f12753ea7 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java @@ -15,7 +15,7 @@ import com.yahoo.log.LogLevel; * size limiting factor. Directly modelled after com.yahoo.collections.Cache. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class PacketCache extends LinkedHashMap<CacheKey, PacketWrapper> { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java index 66931f37369..44d38b0d96a 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.fastsearch; /** * Information about a rank profile * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class RankProfile { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java index 8c3d587a059..8d46b7ae441 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java @@ -6,7 +6,7 @@ import java.io.IOException; /** * Thrown on communication timeouts * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class TimeoutException extends IOException { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java index 820c764de06..e589f85cc96 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java @@ -48,7 +48,7 @@ import java.util.logging.Level; /** * Superclass for backend searchers. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ @SuppressWarnings("deprecation") public abstract class VespaBackEndSearcher extends PingableSearcher { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java b/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java index 3972d2b808e..151684ccf96 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java @@ -2,9 +2,9 @@ package com.yahoo.prelude.query; /** - * @author balder + * @author baldersheim */ -// TODO: balder to fix javadoc +// TODO: baldersheim to fix javadoc public class ExactstringItem extends WordItem { public ExactstringItem(String substring) { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java b/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java index 993c395b191..6aebf73c6ec 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; /** * A query item which never matches. This is sometimes an useful output of query rewriting. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FalseItem extends Item { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java index 90a9ce5a07f..da998088534 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java @@ -18,7 +18,7 @@ import java.nio.ByteBuffer; * If a range is specified in brackets, it is also permissible to add a third number specifying the number of hits this * will match on each node - [from;to;hitLimit] * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IntItem extends TermItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java b/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java index 8fb16e8a3ba..ae6fa4c81bd 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.query.textualrepresentation.Discloser; * Special words known by the index used for marking things. * The reserved word itself is not public, while a symbol representation is. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class MarkerWordItem extends WordItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java index abac8200f49..244706222a4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java @@ -9,7 +9,7 @@ package com.yahoo.prelude.query; * <p> * This type functions as a marked interfaces for query rewriters. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.22 */ public abstract class NonReducibleCompositeItem extends CompositeItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java index 0432795b716..61f04e6419e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java @@ -10,7 +10,7 @@ import java.util.Iterator; * <p>A composite item where the first item is positive and the following * items are negative items which should be excluded from the result. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // TODO: Handle nulls by creating nullItem or checking in encode/toString public class NotItem extends CompositeItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java index 9a78d4c8765..275f4871f33 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java @@ -4,11 +4,7 @@ package com.yahoo.prelude.query; import java.nio.ByteBuffer; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 07.12.12 - * Time: 13:42 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ // TODO: Fix javadoc public class PureWeightedInteger extends PureWeightedItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java index 16f38159235..255c2911f0c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java @@ -4,11 +4,7 @@ package com.yahoo.prelude.query; import java.nio.ByteBuffer; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 07.12.12 - * Time: 13:24 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ // TODO: Fix javadoc public abstract class PureWeightedItem extends Item { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java index 368ccd25483..814626d2294 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java @@ -4,11 +4,7 @@ package com.yahoo.prelude.query; import java.nio.ByteBuffer; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 07.12.12 - * Time: 13:15 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ // TODO: Fix javadoc public class PureWeightedString extends PureWeightedItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java b/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java index 410eb1c35f5..f52d711ff3d 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java @@ -12,7 +12,7 @@ import java.util.*; * A class which canonicalizes and validates queries. * This class is multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryCanonicalizer { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java index 4db8ff0b47a..5597724a8b5 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java @@ -9,7 +9,7 @@ package com.yahoo.prelude.query; * its way towards 'to' until it has reached its limit or range is exhausted. Negative number means that it will start * from 'to' and work its way towards 'from'. * - * @author balder + * @author baldersheim * @author bratseth * @since 5.1.23 */ diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Substring.java b/container-search/src/main/java/com/yahoo/prelude/query/Substring.java index fa304d6b63a..7c9a5040b63 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/Substring.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/Substring.java @@ -6,7 +6,7 @@ package com.yahoo.prelude.query; * An substring which also provides access to the full (query) string it is a substring of. * This is immutable. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Substring { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java index f2b38d5eacb..7f88cfd2a9b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.query; /** * A term type enumeration * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class TermType { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WandItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WandItem.java index df967464230..93394a93efd 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/WandItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/WandItem.java @@ -14,7 +14,7 @@ import java.nio.ByteBuffer; * The resulting dot product will be available as a raw score in the rank framework. * * @since 5.1.27 - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class WandItem extends WeightedSetItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java index 17ee905400e..f56d3ab02c7 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.query.parser; /** * Parser exceptions. JavaCC legacy, never thrown. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class ParseException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java index 27ad26279e7..48a68325018 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.query.Substring; /** * A query token. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Token { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java index a1ad4983f34..cfc22f038c0 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java @@ -9,7 +9,7 @@ import java.util.List; * An iterator-like view of a list, but typed, random-accessible * and with more convenience methods * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class TokenPosition { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java index e52a0347834..582395bc738 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java @@ -16,7 +16,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.*; /** * Query tokenizer. Singlethreaded. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public final class Tokenizer { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java index 519f07b0aa3..bf673083596 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java @@ -16,7 +16,7 @@ import java.util.Set; * <li>"a b": Phrase search for a followed by b * </ul> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class WebParser extends AllParser { diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java index da969986394..86fdee2bad9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java @@ -14,7 +14,7 @@ import static com.yahoo.language.LinguisticsCase.toLowerCase; /** * <p>Detects query phrases using an automaton. This class is thread safe.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PhraseMatcher { diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java index f3d4b09c65c..78c046efd10 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java @@ -19,7 +19,7 @@ import java.util.List; * <p>Detects query phrases. When a phrase is detected in the query, * the query is mutated to reflect this fact.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ @After(PhaseNames.RAW_QUERY) diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java index fe680bd5ad0..84689c5adf2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java @@ -17,7 +17,7 @@ import com.yahoo.search.query.Model; import com.yahoo.search.result.Hit; /** - * @author balder + * @author baldersheim */ public class QueryRewrite { diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java index f4b3ab3406a..fa6df50efe4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java @@ -26,7 +26,7 @@ import java.util.Set; * Any field in the configured hits which has a name starting by attribute * will be returned when attribute prefetch filling is requested.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings({"rawtypes"}) public class DocumentSourceSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/KeyValueSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/KeyValueSearcher.java deleted file mode 100644 index a282dc22b53..00000000000 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/KeyValueSearcher.java +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.prelude.searcher; - -import com.yahoo.document.BucketId; -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.DocumentId; -import com.yahoo.document.GlobalId; -import com.yahoo.document.idstring.IdString; -import com.yahoo.documentapi.messagebus.protocol.SearchColumnPolicy; -import com.yahoo.prelude.fastsearch.FastHit; -import com.yahoo.prelude.query.IntItem; -import com.yahoo.prelude.query.QueryCanonicalizer; -import com.yahoo.search.Query; -import com.yahoo.search.Result; -import com.yahoo.search.Searcher; -import com.yahoo.search.grouping.vespa.GroupingExecutor; -import com.yahoo.search.query.Model; -import com.yahoo.search.query.QueryTree; -import com.yahoo.search.result.DefaultErrorHit; -import com.yahoo.search.result.ErrorMessage; -import com.yahoo.search.result.Hit; -import com.yahoo.search.result.HitGroup; -import com.yahoo.search.searchchain.Execution; -import com.yahoo.vdslib.BucketDistribution; -import com.yahoo.component.chain.dependencies.Before; - -import java.util.Iterator; -import java.util.logging.Logger; - - -/** - * Searcher that does efficient key/value lookup using Vespa search as a - * backend. It does so by bypassing the first phase ranking, and only performs - * the second phase summary fetching. - * - * The keys to find are input as a comma-seprated list using the <i>keys</i> - * query parameter. Each key should match a part of a document id. Given the key - * 'foo', and document id namespace 'mynamespace', the document id matched will - * be 'id:mynamespace:keyvalue::foo'. - * - * To scale the throughput with the number of partitions, the searcher uses the - * same hashing mechanisms as the document API to find out which node each key - * belongs to. The searcher then dispatches a summary request to retrieve keys - * and returns the result. - * - * @author <a href="lulf@yahoo-inc.com">Ulf Lilleengen</a> - */ -@Before(GroupingExecutor.COMPONENT_NAME) -public class KeyValueSearcher extends Searcher { - - private static final Logger log = Logger.getLogger(KeyValueSearcher.class.getName()); - private final BucketIdFactory factory = new BucketIdFactory(); - private final BucketDistribution distribution; - private final String summaryClass; - private final String idSchemePrefix; - private final int numRowBits; - private final int traceLevel = 5; - - public KeyValueSearcher(KeyvalueConfig config) { - this.summaryClass = config.summaryName(); - this.idSchemePrefix = createIdSchemePrefix(config); - this.distribution = new BucketDistribution(config.numparts(), SearchColumnPolicy.DEFAULT_NUM_BUCKET_BITS); - this.numRowBits = calcNumRowBits(config.numrows()); - log.config("Configuring " + KeyValueSearcher.class.getName() + " with " + config.numparts() + " partitions and doc id scheme '" + idSchemePrefix + "'"); - } - - private String createIdSchemePrefix(KeyvalueConfig config) { - if (config.docIdScheme().equals(KeyvalueConfig.DocIdScheme.Enum.DOC_SCHEME)) { - return "doc:" + config.docIdNameSpace() + ":"; - } else { - return "id:" + config.docIdNameSpace() + ":" + config.docIdType() + "::"; - } - } - - public Hit createHit(Query query, String key) { - String docId = createDocId(key.trim()); - BucketId id = factory.getBucketId(new DocumentId(docId)); - int partition = getPartition(id); - - FastHit hit = new FastHit(); - hit.setGlobalId(new GlobalId(IdString.createIdString(docId))); - hit.setQuery(query); - hit.setFillable(); - hit.setCached(false); - hit.setPartId(partition << numRowBits, numRowBits); - hit.setRelevance(1.0); - hit.setIgnoreRowBits(true); - hit.setDistributionKey(42); - return hit; - } - - private String createDocId(String key) { - return idSchemePrefix + key; - } - - - @Override - public Result search(Query query, Execution execution) { - String keyProp = query.properties().getString("keys"); - query.getPresentation().setSummary(summaryClass); - if (keyProp == null || keyProp.length() == 0) { - return new Result(query, new ErrorMessage(ErrorMessage.NULL_QUERY, "'keys' parameter not set or empty.")); - } - String[] keyList = keyProp.split(","); - Model model = query.getModel(); - QueryTree tree = model.getQueryTree(); - QueryCanonicalizer.canonicalize(tree); - if (tree.isEmpty()) { - tree.setRoot(new IntItem(String.valueOf(keyProp.hashCode()))); - } - - Result result = new Result(query); - for (String key : keyList) { - result.hits().add(createHit(query, key)); - } - execution.fill(result, summaryClass); - if (query.isTraceable(traceLevel)) { - traceResult(query, result); - } - int totalHits = 0; - Iterator<Hit> hitIterator = result.hits().iterator(); - while (hitIterator.hasNext()) { - Hit hit = hitIterator.next(); - if (hit.isFillable() && hit.isFilled(summaryClass)) { - totalHits++; - } else { - hitIterator.remove(); - } - } - if (totalHits != keyList.length) { - ErrorMessage error = new ErrorMessage(1, "Some keys could not be fetched"); - result.hits().setError(error); - } - result.setTotalHitCount(totalHits); - return result; - } - - private void traceResult(Query query, Result result) { - Iterator<Hit> hitIterator = result.hits().iterator(); - while (hitIterator.hasNext()) { - Hit hit = hitIterator.next(); - if (hit.isFillable() && hit.isFilled(summaryClass)) { - query.trace("Found filled hit: " + hit, traceLevel); - } else { - query.trace("Found hit that was not filled/fillable: " + hit, traceLevel); - } - } - query.trace("Error hit: " + result.hits().getErrorHit(), traceLevel); - } - - private int getPartition(BucketId bucketId) { - return distribution.getColumn(bucketId); - } - - private static int calcNumRowBits(int numRows) { - if (numRows < 1) { - throw new IllegalArgumentException(); - } - for (int i = 0; i < 30; ++i) { - if (numRows - 1 < 1 << i) { - return i; - } - } - return 31; - } -} diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java index 03e212fc854..7e2ab396817 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java @@ -28,7 +28,7 @@ import com.yahoo.prelude.Location; * internal units (no suffix), meter (m), kilometer (km) or miles (mi) * </ul> * - * @author Arne J + * @author arnej27959 */ @After(PhaseNames.RAW_QUERY) @Before(PhaseNames.TRANSFORMED_QUERY) diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java index d3f51e76712..e236d60ff84 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java @@ -15,7 +15,7 @@ import java.util.*; * A set of semantic production rules and named conditions used to analyze * and rewrite queries * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RuleBase { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java index 34c113ceec8..2eb94eee603 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics; /** * Thrown on rule base consistency problems * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class RuleBaseException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java index f2650fef83a..fd63bcdbc33 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.rule.Condition; * closed if there are no further choices. In addition it contains enough information to enable * the rule evaluation to backtrack to this point * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Choicepoint { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java index fe3543fc655..0b0ae0918aa 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java @@ -14,7 +14,7 @@ import java.util.Set; * An evaluation of a query over a rule base. There is one evaluation for each evaluation * of one query over one rule base. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Evaluation { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java index 00a66206b46..d52741d7c1e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.engine; /** * Thrown on semantic exceptions on evaluation over a rule base * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class EvaluationException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java index 1631d60df6b..475f99640f2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java @@ -6,7 +6,7 @@ import com.yahoo.prelude.query.TermItem; /** * An item which knows its position in its parent * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class FlattenedItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java index fc7aec62412..5bdb58aba75 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.query.WordItem; /** * A match * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Match { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java index 76eea63bd68..061c16e0aa3 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.engine; * A collection of facts (addressed by namespace.fact in conditions) * over which we may write conditions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class NameSpace { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java index 35427250511..5f36c42b8d4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java @@ -6,7 +6,7 @@ import com.yahoo.search.Query; /** * A name space representing the (http) parameters following this query * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ParameterNameSpace extends NameSpace { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java index cb7d2af8d19..46e809b2db2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java @@ -10,7 +10,7 @@ import com.yahoo.prelude.query.PhraseItem; /** * The Matches referenced by a particular context name in a rule evaluation * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ReferencedMatches { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java index ee874b76ed6..16c80bd94f6 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java @@ -13,7 +13,7 @@ import java.util.ListIterator; * Evaluates the rules of a rule base. This method is thread safe on analyze calls, but * not on modification calls. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RuleEngine { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java index a6b90f98879..ba6bf821197 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java @@ -12,7 +12,7 @@ import java.util.*; /** * A particular evalutation of a particular rule. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RuleEvaluation { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java index 91eef25a8b0..aedcfebd20b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.rule; /** * A production rule which <i>adds</i> the production to the matched query * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class AddingProductionRule extends ProductionRule { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java index 2c826df9196..167b62dc53e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which consists of a list of alternatives to match at any location * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class AndCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java index 5cf3d4bf7a4..7cb29736db9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which consists of a list of alternatives to match at a specific location * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ChoiceCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java index 0d24368cf28..1bdad7bdd89 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java @@ -12,7 +12,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; * A condition which is true of the <i>values</i> of its two subconditions are true * and both have the same value * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ComparisonCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java index e7fd8d599d4..62bd6ff7095 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java @@ -10,7 +10,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which contains a list of conditions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class CompositeCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java index 18fbbb04412..ee22564605f 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition on the presense of a particular kind of composite item (possibly also with a particular content) * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.15 */ public class CompositeItemCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java index f2029ede6fa..8b796509dd3 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * Superclass of all kinds of conditions of production rules * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java index 855a8b802ba..a4aa2a04ea5 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java @@ -16,7 +16,7 @@ import java.util.Map; /** * A reference to a named condition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ConditionReference extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java index 84a470ff64e..cc8229d00c4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java @@ -11,7 +11,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which greedily matches anything, represented as "..." * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class EllipsisCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java index 3cde8bba5ff..e76cc8f75a6 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java @@ -6,7 +6,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which is always true, and which has it's own value as return value * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LiteralCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java index 23404fbc6e2..b1df2b517cf 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java @@ -15,7 +15,7 @@ import com.yahoo.protect.Validator; /** * A literal phrase produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LiteralPhraseProduction extends TermProduction { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java index f157fd6901d..370acb9beae 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java @@ -10,7 +10,7 @@ import com.yahoo.protect.Validator; /** * A literal term produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class LiteralTermProduction extends TermProduction { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java index ca1d623847d..ffef470d266 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java @@ -6,7 +6,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition given a name which enables it to be referenced from other conditions. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class NamedCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java index 0c73427ad82..4ca0edd2f65 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A production in a specified namespace * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class NamespaceProduction extends Production { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java index 64a10ea821a..f868d9c0174 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; * NotCondition inverts the term checking but not the label checking. * That is, it means "label:!term", it does not mean "!label:term". * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NotCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java index cc6a9c87fb0..02dd17b5f36 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A new term produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Production { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java index 3397a9ada1e..22dec34c009 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java @@ -11,7 +11,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A list of the productions of a rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ProductionList { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java index 55be2aa2afd..b34c8006d73 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java @@ -11,7 +11,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A query rewriting rule. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class ProductionRule { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java index 319e1969174..617dfcc37c8 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java @@ -15,7 +15,7 @@ import com.yahoo.protect.Validator; * A term produced by a production rule which takes it's actual term value * from one or more terms matched in the condition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ReferenceTermProduction extends TermProduction { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java index 76433ec693c..1de1cf008b9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A production rule which <i>replaces</i> matched terms by the production * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ReplacingProductionRule extends ProductionRule { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java index 3ba929da021..3ae8a140f75 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A set of conditions which much match the query in sequence * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SequenceCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java index 0b7b3b4a30b..6c36fcb1e84 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; * A condition which evaluates the <i>last included</i> version of * the named condition this is a premise of. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SuperCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java index 3558ef2b227..0db29820497 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A term in a rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class TermCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java index 6490d21e319..f0594926efe 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java @@ -10,7 +10,7 @@ import com.yahoo.protect.Validator; /** * A new term produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class TermProduction extends Production { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java index 1c50ea5d904..619beb0a8d1 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; * The monitor uses an internal thread for node monitoring. * All <i>public</i> methods of this class are multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ClusterMonitor<T> { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java index da3d0d8e20b..67f946f62c6 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java @@ -30,7 +30,7 @@ import java.util.concurrent.*; * The type argument is the class (of any type) representing the connections. * The connection objects should implement a good toString to ease diagnostics. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a> */ public abstract class ClusterSearcher<T> extends PingableSearcher implements NodeManager<T> { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java index 7071867c8c7..ce221fa1479 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java @@ -7,7 +7,7 @@ import java.util.concurrent.Executor; * Must be implemented by a node collection which wants * it's node state monitored by a ClusterMonitor * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public interface NodeManager<T> { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java index 486473eba8d..4f984efd942 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java @@ -10,7 +10,7 @@ import com.yahoo.search.searchchain.Execution; /** * A searcher to which we can send a ping to probe if it is alive * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class PingableSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java b/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java index 8b7e8a1d9d5..ca45ee0e4fa 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java +++ b/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java @@ -4,7 +4,7 @@ package com.yahoo.search.federation; /** * Thrown on timeouts * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class TimeoutException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java index 576c16f68db..66bb678e983 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java @@ -14,7 +14,7 @@ import com.yahoo.statistics.Statistics; * Superclass for http client searchers which depends on config. All this is doing is translating * the provider and cache configurations to parameters which are passed upwards. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class ConfiguredHTTPClientSearcher extends HTTPClientSearcher { diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java index 8d3ee016b4f..cb7f32d8e7e 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java +++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java @@ -9,7 +9,7 @@ import com.yahoo.search.federation.ProviderConfig; /** * Some static helper classes for configured*Searcher classes * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class ConfiguredSearcherHelper { diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java b/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java index 88e2c6ad0a0..b626dce16f5 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java +++ b/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java @@ -7,7 +7,7 @@ package com.yahoo.search.federation.http; * contain an open connection later. * The host and port state is immutable. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Connection { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java index 637e0fdf57e..4e2a57535e6 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathACosFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java index aa5677d90d4..76afb556dad 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathACosHFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java index c4b9c7a62d6..bf49fbaeb62 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathASinFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java index f368aefe88a..a50d50afb2f 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathASinHFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java index ed9349c86e6..7422dc5b587 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathATanFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java index ebcfd1895fa..854b24d3360 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathATanHFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java index 78e2c3c9aa5..cb98a8deb41 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathCbrtFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java index 0ab35653607..6235755f9bb 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathCosFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java index f4137c302e8..fefc58a50bf 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathCosHFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java index 4be93d77c41..c9c38969fe5 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathExpFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java index 5fe5a971be9..fd88fb9a822 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java @@ -2,7 +2,7 @@ package com.yahoo.search.grouping.request; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public abstract class MathFunctions { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java index 777a94f9107..4254f6cb1aa 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathHypotFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java index 444ea7a7349..750b1191cff 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathLog10Function extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java index 3be6c799bf2..61ed2f4d52a 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathLog1pFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java index 4d3b43d45b0..dc2007eac00 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathLogFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java index 09a9a28cbb0..18cfc879829 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathPowFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java index 66612e9d80a..51bdd2ad725 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathSinFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java index 79d260f51a0..220d5865dcb 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathSinHFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java index 18c9396dd12..9eea61c7479 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathSqrtFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java index 67db7a9d834..98fcb986a59 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathTanFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java index e111c1199d7..aaee8a6bce5 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author balder + * @author baldersheim */ public class MathTanHFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java index 274bb20c9f7..b92808dc895 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java @@ -7,7 +7,7 @@ import java.util.Arrays; * This class represents a reverse-function in a {@link GroupingExpression}. It evaluates to a list that equals the list * result of the argument, sorted in descending order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ReverseFunction extends FunctionNode { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java index 2a8845f9847..33d79ab8795 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java @@ -7,7 +7,7 @@ import java.util.Arrays; * This class represents a sort-function in a {@link GroupingExpression}. It evaluates to a list that equals the list * result of the argument, sorted in ascending order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class SortFunction extends FunctionNode { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java index 8eab2af8691..1faac228242 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java @@ -7,7 +7,7 @@ import java.util.Arrays; * This class represents a todouble-function in a {@link GroupingExpression}. It converts the result of the argument to * a double. If the argument can not be converted, this function returns 0. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ToDoubleFunction extends FunctionNode { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java index c47a043eea0..1fe84e3ac0d 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java @@ -7,7 +7,7 @@ import java.util.Arrays; * This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a * long. If the argument can not be converted, this function returns 0. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ToLongFunction extends FunctionNode { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java index 364d9e5064d..5ad2cca3591 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java @@ -7,7 +7,7 @@ import java.util.Arrays; * This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a * long. If the argument can not be converted, this function returns 0. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ToStringFunction extends FunctionNode { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java index b4790b912e7..6b9db922bd4 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ZCurveXFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java index e9a011f2193..e6220d96a42 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java @@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request; import java.util.Arrays; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ZCurveYFunction extends FunctionNode { /** diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java b/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java index f9d97e057d1..25962090a69 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java @@ -9,7 +9,7 @@ package com.yahoo.search.intent.model; * <p> * Intent ids should be human readable, start with lower case and use camel casing * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Intent { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java index c77c937b760..113bad46312 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java @@ -5,7 +5,7 @@ package com.yahoo.search.intent.model; * An intent in an intent model tree. The intent node score is the <i>probability</i> of this intent * given the parent interpretation. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IntentNode extends ParentNode<SourceNode> { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java index 51e5d00c563..d54025bb0c6 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java @@ -7,7 +7,7 @@ import com.yahoo.text.interpretation.Interpretation; * An interpretation which may have multiple intents. The score of this node is the probability of * the wrapped interpretation. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class InterpretationNode extends ParentNode<IntentNode> { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Node.java b/container-search/src/main/java/com/yahoo/search/intent/model/Node.java index ecd3ec712bb..163dc153379 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/Node.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/Node.java @@ -6,7 +6,7 @@ import java.util.Map; /** * A node in the <a href="TODO">intent model tree</a> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class Node implements Comparable<Node> { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java index 357060be93c..25c9b6940d1 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java @@ -8,7 +8,7 @@ import java.util.Map; /** * A node which is not a leaf in the intent tree * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class ParentNode<T extends Node> extends Node { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Source.java b/container-search/src/main/java/com/yahoo/search/intent/model/Source.java index 937b6ca02e4..f224612f23f 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/Source.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/Source.java @@ -9,7 +9,7 @@ package com.yahoo.search.intent.model; * <p> * Source ids should be human readable, start with lower case and use camel casing * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Source { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java index 5f63ddbe8d1..84c98b8c723 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java @@ -8,7 +8,7 @@ import java.util.Map; * (i.e the score of a source node is called <i>appropriateness</i>). * Sources are ordered by decreasing appropriateness. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SourceNode extends Node { diff --git a/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java b/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java index f4be6861364..3777d5f92de 100644 --- a/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java +++ b/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java @@ -11,7 +11,7 @@ import com.yahoo.search.searchchain.Execution; /** * A searchable database of documents * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DocumentDb extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java index 2d61d17ade8..de19e8ab747 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java @@ -15,7 +15,7 @@ import java.util.Map; * This visitor will throw an IllegalArgumentException if the same placeholder id * is referenced by two choices. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class PlaceholderMappingVisitor extends PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java index 2e22ad7291e..c464dd3dedc 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java @@ -10,7 +10,7 @@ import java.util.Map; * Creates references from all placeholders to the choices which resolves them. * If a placeholder is encountered which is not resolved by any choice, an IllegalArgumentException is thrown. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class PlaceholderReferenceCreatingVisitor extends PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java index bf2685da56f..22cc2dc0d7c 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java @@ -10,7 +10,7 @@ import java.util.Set; /** * Visits a page template object structure and records the sources mentioned. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class SourceVisitor extends PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java index 5d106a6df8e..e3c16853591 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java @@ -14,7 +14,7 @@ import java.util.List; * Provides a static method to convert a page template config into a PageTemplateRegistry. * In addition, instances of this can be created to subscribe to config and keep an up to date registry reference. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PageTemplateConfigurer { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java index 46823f30cf2..451efb851d5 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; * Reads all page template XML files from a given directory (or list of readers). * Instances of this are for single-thread usage only. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PageTemplateXMLReader { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java index 00e154d460b..8d3edab876e 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java @@ -17,7 +17,7 @@ import java.util.Map; * Reorganizes and prunes a result as prescribed by a resolved template. * This class is multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Organizer { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java index 7489768b5a3..5349d9f2aaa 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java @@ -7,7 +7,7 @@ import com.yahoo.search.result.Hit; import java.util.Comparator; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class RelevanceComparator extends ChainableComparator { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java index d67faf805ad..3ee3e3aeef0 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java @@ -12,7 +12,7 @@ import java.util.Map; /** * A resolution of choices within a template. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Resolution { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java index 4972b0e4689..6415dad37ec 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java @@ -19,7 +19,7 @@ import com.yahoo.search.pagetemplates.model.PageTemplateVisitor; * All subclasses of this must be multithread safe. I.e multiple calls may be made * to resolve at the same time from different threads. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class Resolver extends AbstractComponent { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java index b4cd01f0c36..e0185554066 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java @@ -8,7 +8,7 @@ import java.util.Comparator; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class SourceOrderComparator extends ChainableComparator { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java index 32ed54a6775..32ce65bf563 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java @@ -23,7 +23,7 @@ import java.util.Map; * <p> * The id of this if <code>native.deterministic</code> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DeterministicResolver extends Resolver { public static final String nativeId = "native.deterministic"; diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java index 5f06c66795d..be357245146 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java @@ -15,7 +15,7 @@ import java.util.*; * A resolver which makes all choices by random. * The id of this is <code>native.random</code>. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RandomResolver extends Resolver { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java index 069598b2e02..5a8abb76a5c 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java @@ -6,7 +6,7 @@ import com.yahoo.component.provider.FreezableClass; /** * Abstract superclass of various kinds of choices. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class AbstractChoice extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java index a1932012236..3e956d510e7 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java @@ -6,7 +6,7 @@ import java.util.*; /** * A choice between some alternative lists of page elements. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class Choice extends AbstractChoice { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java index f8e00b78787..4100ca5504c 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java @@ -4,7 +4,7 @@ package com.yahoo.search.pagetemplates.model; /** * The layout of a section * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // This is not made an enum, to allow the value set to be extendible. // It is not explicitly made immutable diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java index 33c3bba9a77..ccfad1673aa 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java @@ -13,7 +13,7 @@ import java.util.List; * Each unique set of mappings (pairs) from values to placeholder ids is a separate possible * alternative of this choice. The alternatives are not listed explicitly but are generated as needed. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapChoice extends AbstractChoice { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java index fba58f069ec..4cbabcf871f 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java @@ -6,7 +6,7 @@ import com.yahoo.component.provider.Freezable; /** * Implemented by all page template model classes * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface PageElement extends Freezable { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java index d7ebd3d1169..e4f6f12e47e 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java @@ -6,7 +6,7 @@ import com.yahoo.search.pagetemplates.PageTemplate; /** * Superclass of visitors over the page template object structure * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java index cf7a85fc779..0eb98f329cb 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java @@ -6,7 +6,7 @@ package com.yahoo.search.pagetemplates.model; * Source placeholders may not have any content themselves - attempting to call any setter on this * results in a IllegalStateException. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Placeholder implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java index 4564ceeef3c..c3a46dbee8b 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java @@ -14,7 +14,7 @@ import java.util.Map; * All data items has a default renderer. This can be overridden or parametrized by * an explicit renderer. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class Renderer extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java index 0a980419853..67f67cb8538 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; * Pages are freezable - once frozen calling a setter will cause an IllegalStateException, and returned * live collection references are unmodifiable * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Section extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java index 91c403eae84..de1cadff5db 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java @@ -11,7 +11,7 @@ import java.util.*; * <p> * Two sources are equal if they have the same name and parameters. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Source extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java index 00f6c6350fc..c9c482781a4 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java @@ -12,7 +12,7 @@ import java.util.List; * A hit group corresponding to a section - contains some additional information * in proper getters and setters which is used during rendering. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SectionHitGroup extends HitGroup { diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java index 588580dda4d..b11dd6b9b2c 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Model.java +++ b/container-search/src/main/java/com/yahoo/search/query/Model.java @@ -26,7 +26,7 @@ import static com.yahoo.text.Lowercase.toLowerCase; * The parameters defining the recall of a query. * * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Model implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/SessionId.java b/container-search/src/main/java/com/yahoo/search/query/SessionId.java index 7f8ca6385e1..86771c37d2a 100644 --- a/container-search/src/main/java/com/yahoo/search/query/SessionId.java +++ b/container-search/src/main/java/com/yahoo/search/query/SessionId.java @@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicLong; * A query id which is unique across this cluster - consisting of * container runtime id + timestamp + serial. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SessionId { diff --git a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java index e59f8589903..d6fc9adeac8 100644 --- a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java +++ b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java @@ -17,7 +17,7 @@ import java.util.Iterator; * * @since 4.2 * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryContext implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java index 393aba2b002..759e3978b7b 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllReferencesQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java index fb9638a958b..50da6552645 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllTypesQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java index 65c3480272e..6db6ebb994b 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java @@ -7,7 +7,7 @@ import java.util.HashSet; import java.util.Set; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllUnoverridableQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java index bef5b00c51b..ab8cd49047d 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllValuesQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java b/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java index 3c02677b676..f309ba952cc 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java @@ -13,7 +13,7 @@ import java.util.Map; * This may be frozen, at which point no further modifications are allowed. * Note that <b>until</b> this is cloned, the internal map may be both read and written. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CopyOnWriteContent extends FreezableClass implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java index 9adacee74af..78fa24973d4 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java @@ -10,7 +10,7 @@ import java.util.Map; /** * An immutable, binding of a list of dimensions to dimension values * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DimensionBinding { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java b/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java index b9d631cdd10..342b85e5b19 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java @@ -11,7 +11,7 @@ import com.yahoo.search.query.profile.config.QueryProfileXMLReader; /** * A standalone tool for dumping query profile properties * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DumpTool { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java index 73c0fcd2cb1..8170dffe974 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java @@ -6,7 +6,7 @@ import com.yahoo.search.query.profile.types.FieldDescription; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class FieldDescriptionQueryProfileVisitor extends QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java index 2a22d58d8b7..6fdcd576441 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java @@ -6,7 +6,7 @@ import com.yahoo.processing.request.CompoundName; /** * A query profile visitor which keeps track of name prefixes and can skip values outside a given prefix * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ abstract class PrefixQueryProfileVisitor extends QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java index 42ea4a96d8f..05bf7055822 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java @@ -10,7 +10,7 @@ import java.util.*; /** * A variant of a query profile * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryProfileVariant implements Cloneable, Comparable<QueryProfileVariant> { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java index fde851bdc75..705ba7d3d29 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java @@ -20,7 +20,7 @@ import java.util.*; * A set of virtual profiles are always owned by a single profile, which is also their parent * in the inheritance hierarchy. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryProfileVariants implements Freezable, Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java index 8cb6bf34021..723e772bda0 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java @@ -17,7 +17,7 @@ package com.yahoo.search.query.profile; * The first enter call will be on the root node, which has an empt reference name. * </code> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ abstract class QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java index 6d5d1b0686a..c6af9e53494 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java @@ -10,7 +10,7 @@ import java.util.List; * value, or query profile, whichever is encountered first which matches the name. * <p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class SingleValueQueryProfileVisitor extends QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java index 59401592378..d0d18d7ba85 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java @@ -16,7 +16,7 @@ import java.util.Map; * <p> * This is a value object. Lookups in this are thread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SubstituteString { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java index a440365ceba..3f52e10d32b 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java @@ -12,7 +12,7 @@ import java.util.Map; * An immutable binding of a set of dimensions to values. * This binding is minimal in that it only includes dimensions which actually have values. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Binding implements Comparable<Binding> { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java index b82939fa4ac..670377d5a09 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java @@ -14,7 +14,7 @@ import java.util.Set; * <p> * Dimensional maps are immutable and created through a DimensionalMap.Builder * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DimensionalMap<KEY, VALUE> { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java index 0112928ada6..c62696dfd8e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java @@ -14,7 +14,7 @@ import java.util.Set; /** * Contains the values a given key in a DimensionalMap may take for different dimensional contexts. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DimensionalValue<VALUE> { diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java index cc2c08c5504..536e31ba26e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java @@ -15,7 +15,7 @@ import java.util.Map; * This is multithread safe or not depending on the status of the passed map of aliases. * Cloning will not deep copy the set of aliases. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PropertyAliases extends Properties { diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java index 15544e8ff4c..9ebbee52afa 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java @@ -9,7 +9,7 @@ import java.util.Map; * Property aliases which contains some hardcoded unaliasing of prefixes of * rankfeature and rankproperty maps. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryPropertyAliases extends PropertyAliases { diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java index c97f4daf6d4..19f77b58dc4 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java @@ -11,7 +11,7 @@ import java.util.Map; * This is used to allow the query's request to be supplied to all property requests * without forcing users of the query.properties() to supply this explicitly. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RequestContextProperties extends Properties { diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java b/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java index b1865ad9d75..8f61c15e4fa 100644 --- a/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java +++ b/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java @@ -15,7 +15,7 @@ import java.util.Objects; * * <p>You specify an additional attribute to be the diversifier and also min diversity needed.</p> * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class Diversity implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java b/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java index eccb8bac2d4..2691b1fda9d 100644 --- a/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java @@ -16,7 +16,7 @@ import java.util.Map; * Contains the properties properties of a query. * This is a multimap: Multiple properties may be set for the same key. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankProperties implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java index 4b68ecfe5a9..98b0b1673f6 100644 --- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java +++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java @@ -4,9 +4,9 @@ package com.yahoo.search.query.textserialize.item; import com.yahoo.prelude.query.ExactstringItem; /** - * @author balder + * @author baldersheim */ -// TODO: balder to fix javadoc +// TODO: baldersheim to fix javadoc public class ExactStringConverter extends WordConverter { @Override ExactstringItem newTermItem(String word) { diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java index c2d462a17e4..8e95273e300 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java @@ -18,7 +18,7 @@ import java.util.Set; /** * If default position has not been set, it will be set here. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ @After({PhaseNames.RAW_QUERY, POSITION_PARSING}) @Before(PhaseNames.TRANSFORMED_QUERY) diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java b/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java index fb5373d59ea..37adf1d636a 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java @@ -9,7 +9,7 @@ import com.yahoo.search.query.QueryTree; /** * Utility class for manipulating a QueryTree. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class QueryTreeUtil { diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java b/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java index 5886014deed..0c7871eb6e6 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java @@ -26,7 +26,7 @@ import java.util.Set; * <p> * Queries are eligible if they do sorting, don't do grouping, and the first sort criteria is a fast-search attribute. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // This writes fields to query.getRanking which are moved to rank.properties during query.prepare() diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java index 6120a7aee30..1dd86dfc2fc 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java @@ -23,7 +23,7 @@ import com.yahoo.yolean.Exceptions; * IndexFacts is used to determine which WAND to create. * * @since 5.1.11 - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst * @author bratseth */ public class WandSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java b/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java index 0750618de67..4f74096feb1 100644 --- a/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java +++ b/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java @@ -7,7 +7,7 @@ import java.util.Comparator; * Superclass of hit comparators which delegates comparisons of hits which are * equal according to this comparator, to a secondary comparator. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class ChainableComparator implements Comparator<Hit> { diff --git a/container-search/src/main/java/com/yahoo/search/result/Coverage.java b/container-search/src/main/java/com/yahoo/search/result/Coverage.java index 7d1e737bfb8..bf34c42b97a 100644 --- a/container-search/src/main/java/com/yahoo/search/result/Coverage.java +++ b/container-search/src/main/java/com/yahoo/search/result/Coverage.java @@ -5,7 +5,7 @@ package com.yahoo.search.result; * The coverage report for a result set. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author balder + * @author baldersheim */ public class Coverage extends com.yahoo.container.handler.Coverage { diff --git a/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java b/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java index 5982a93d86a..4ce1bf3789a 100644 --- a/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java +++ b/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java @@ -7,7 +7,7 @@ import java.util.List; /** * A class capable of ordering a list of hits * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class HitOrderer { diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java index a5b9c58f084..e59808bdf5d 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java @@ -28,7 +28,7 @@ import com.yahoo.search.searchchain.Execution; * Any field in the configured hits which has a name starting by attribute * will be returned when attribute prefetch filling is requested.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DocumentSourceSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java b/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java index ff00c8edb9b..b6f8231da9d 100644 --- a/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java @@ -15,7 +15,8 @@ import java.util.Set; /** * Validates that the attribute given as match-phase override is actually a valid numeric attribute * with fast-search enabled. - * Created by balder on 1/21/15. + * + * @author baldersheim */ public class ValidateMatchPhaseSearcher extends Searcher { private Set<String> validMatchPhaseAttributes = new HashSet<>(); diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java index b95a4269cf7..3917d353630 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java @@ -38,7 +38,7 @@ import com.yahoo.vdslib.SearchResult; * The searcher is a visitor client responsible for starting search * visitors in storage and collecting and merging the results. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:ulf@yahoo-inc.com">Ulf Carlin</a> */ @SuppressWarnings("deprecation") diff --git a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java index eec70f77f34..346c51c989c 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java @@ -16,7 +16,7 @@ import java.util.*; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class RankFeaturesTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java index c3ab826bad8..02d8f83bca7 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java @@ -17,7 +17,7 @@ import java.nio.ByteBuffer; /** * Tests the packet cache. Also tested in FastSearcherTestCase. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class PacketCacheTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java index 5df2572242e..22d64f5eabd 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java @@ -18,7 +18,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.*; /** * Tests the tokenizer * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class TokenizerTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java index 28acb310472..5b6184d884d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java @@ -9,7 +9,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IntItemTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java index 4185065b33c..56a59e44fba 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java @@ -6,7 +6,7 @@ import com.yahoo.search.Query; import com.yahoo.search.query.QueryTree; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class QueryCanonicalizerTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java index 0173a42f592..ff45d3f2b28 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.querytransform.PhraseMatcher; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PhraseMatcherTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java index 58b46662e8b..309b606880c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** - * @author balder + * @author baldersheim */ public class QueryRewriteTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/KeyValueSearcherTest.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/KeyValueSearcherTest.java deleted file mode 100644 index 6a329185ef1..00000000000 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/KeyValueSearcherTest.java +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.prelude.searcher.test; - -import com.yahoo.component.chain.Chain; -import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.document.GlobalId; -import com.yahoo.document.idstring.IdString; -import com.yahoo.prelude.fastsearch.FastHit; -import com.yahoo.prelude.query.AndItem; -import com.yahoo.prelude.query.CompositeItem; -import com.yahoo.prelude.query.Item; -import com.yahoo.prelude.query.NullItem; -import com.yahoo.prelude.searcher.KeyValueSearcher; -import com.yahoo.prelude.searcher.KeyvalueConfig; -import com.yahoo.search.Query; -import com.yahoo.search.Result; -import com.yahoo.search.Searcher; -import com.yahoo.search.result.ErrorMessage; -import com.yahoo.search.result.Hit; -import com.yahoo.search.searchchain.Execution; -import org.junit.Before; -import org.junit.Test; - -import java.util.*; -import java.util.Map.Entry; - -import static org.junit.Assert.*; - -public class KeyValueSearcherTest { - - private static class BackendMockup extends Searcher { - private final Map<GlobalId, Entry<String, String>> dataMap; - private final String summaryType; - - public BackendMockup(Map<GlobalId, Entry<String, String>> dataMap, String summaryType) { - this.dataMap = dataMap; - this.summaryType = summaryType; - } - - @Override - public Result search(Query query, Execution execution) { - fail("Should not do search against backend"); - return null; - } - - @Override - public void fill(Result result, String summaryClass, Execution execution) { - if (containsNullItem(result.getQuery().getModel().getQueryTree().getRoot())) - fail("Got a query with a NullItem root. This cannot be encoded."); - int numEmpty = 0; - for (Hit hit : result.hits()) { - FastHit fhit = (FastHit) hit; - Entry<String, String> data = dataMap.get(fhit.getGlobalId()); - if (data != null) { - fhit.setField(data.getKey(), data.getValue()); - fhit.setFilled(summaryType); - } else { - numEmpty++; - } - } - if (numEmpty > 0) { - result.hits().addError(ErrorMessage.createBackendCommunicationError("One or more hits were not filled")); - } - } - } - - private Map<GlobalId, Entry<String,String>> dataMap; - private BackendMockup backend; - @Before - public void setupBackend() { - dataMap = new HashMap<>(); - dataMap.put(new GlobalId(IdString.createIdString("id:keyvalue:keyvalue::foo")), new AbstractMap.SimpleEntry<>("foo", "foovalue")); - dataMap.put(new GlobalId(IdString.createIdString("id:keyvalue:keyvalue::bar")), new AbstractMap.SimpleEntry<>("bar", "barvalue")); - dataMap.put(new GlobalId(IdString.createIdString("id:keyvalue:keyvalue::this_must_be_a_key_in_part1_fsadfasdfa")), new AbstractMap.SimpleEntry<>("this_must_be_a_key_in_part1_fsadfasdfa", "blabla")); - backend = new BackendMockup(dataMap, "mysummary"); - } - - @Test - public void testKeyValueSearcher() { - Result result = executeQuery(getConfigString(1), "?keys=foo,bar"); - assertEquals(2, result.getTotalHitCount()); - for (Hit hit : result.hits()) { - FastHit fhit = (FastHit)hit; - Entry<String, String> data = dataMap.get(fhit.getGlobalId()); - assertEquals(data.getValue(), hit.getField(data.getKey())); - assertTrue(hit.isFilled("mysummary")); - } - - result = executeQuery(getConfigString(1), - "?keys=blabla,fofo", new BackendMockup(dataMap, "mysummary")); - assertEquals(0, result.getTotalHitCount()); - - result = executeQuery(getConfigString(1), - "?keys=non,foo,slsl", new BackendMockup(dataMap, "mysummary")); - assertEquals(1, result.getTotalHitCount()); - } - - @Test - public void testKeyValueSearcherWithNullItemAsQuery() { - Query query = new Query("?keys=foo,bar"); - AndItem and = new AndItem(); - and.addItem(new NullItem()); - query.getModel().getQueryTree().setRoot(and); - Result result = executeQuery(getConfigString(1), query); - assertEquals(2, result.getTotalHitCount()); - } - - private static String getConfigString(int numRows) { - return "raw:numparts 2\nsummaryName \"mysummary\"\ndocIdType \"keyvalue\"\ndocIdNameSpace \"keyvalue\"\nnumrows " + numRows + "\n"; - } - - @Test - public void requireThatIgnoreRowBitsIsEnabledInGeneratedHits() { - Result result = executeQuery(getConfigString(1), - "?keys=foo,bar"); - for (Hit hit : result.hits()) { - FastHit fastHit = (FastHit)hit; - assertTrue(fastHit.shouldIgnoreRowBits()); - } - } - - @Test - public void requireThatNumRowsIsAPositiveNumber() { - for (int i = -10; i < 1; ++i) { - try { - newKeyValueSearcher(getConfigString(i)); - fail(); - } catch (IllegalArgumentException e) { - - } - } - for (int i = 1; i < 10; ++i) { - assertNotNull(newKeyValueSearcher(getConfigString(i))); - } - } - - @Test - public void requireThatNumRowBitsAreCalculatedCorrectly() { - assertRowBits(1, 0); - assertRowBits(2, 1); - assertRowBits(3, 2); - assertRowBits(4, 2); - assertRowBits(5, 3); - assertRowBits(10, 4); - assertRowBits(100, 7); - assertRowBits(1000, 10); - } - - private void assertRowBits(int numRows, int expectedNumRowBits) { - Result result = executeQuery(getConfigString(numRows), "?keys=this_must_be_a_key_in_part1_fsadfasdfa"); - assertEquals(1, result.hits().size()); - FastHit hit = (FastHit)result.hits().get(0); - assertEquals(0, hit.getPartId() & ((1 << expectedNumRowBits) - 1)); - assertEquals(1, hit.getPartId() >> expectedNumRowBits); - } - - private Result executeQuery(String configId, String queryString, Searcher... searchers) { - return executeQuery(configId, new Query(queryString), searchers); - } - - private Result executeQuery(String configId, Query query, Searcher... searchers) { - List<Searcher> chain = new LinkedList<>(); - chain.add(newKeyValueSearcher(configId)); - chain.addAll(Arrays.asList(searchers)); - chain.add(backend); - return new Execution(new Chain<>(chain), Execution.Context.createContextStub()).search(query); - } - - - private static KeyValueSearcher newKeyValueSearcher(String configId) { - return new KeyValueSearcher(new ConfigGetter<>(KeyvalueConfig.class).getConfig(configId)); - } - - private static boolean containsNullItem(Item item) { - if (item instanceof NullItem) return true; - if (item instanceof CompositeItem) { - for (Iterator<Item> i = ((CompositeItem)item).getItemIterator(); i.hasNext(); ) - if (containsNullItem(i.next())) - return true; - } - return false; - } - -} diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java index cea65790644..6d8dd8535e2 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Test a case reported by Alibaba * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class AlibabaTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java index 4f477dca5c9..b3e65ad5192 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Tests anchoring * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class AnchorTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java index 92815b74ca1..3f1d2cd594b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.test; * Tests that ![a] is interpreted as "default:![a]", not as "!default:[a]", * that is, in negative conditions we still only want to match the default index by default. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class AutomataNotTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java index 7a34674f554..049a28c67bc 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.RuleBase; /** * Tests rule bases using automatas for matching * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class AutomataTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java index f30bfffc18d..6390ea72391 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java @@ -6,7 +6,7 @@ import com.yahoo.search.Query; /** * Tests blending rules * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class BlendingTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java index 00c2ebf8d58..09ef73dbbcf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Tests that using rule bases containing cjk characters work * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CJKTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java index 80f41ad61a4..6b12e1d7de7 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.prelude.semantics.test; /** - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ComparisonTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java index 8b85f8bc587..bc867d240bf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.prelude.semantics.test; /** - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ComparisonsTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java index ece03da5262..8a9cc0d856a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java @@ -14,7 +14,7 @@ import com.yahoo.prelude.semantics.rule.SequenceCondition; import com.yahoo.prelude.semantics.rule.TermCondition; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ConditionTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java index e1d5b93a32f..a7de4d86995 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java @@ -6,7 +6,7 @@ import com.yahoo.prelude.semantics.RuleImporter; import com.yahoo.prelude.semantics.parser.ParseException; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DuplicateRuleTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java index 7aa60630db3..f6d89073124 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * tersts the ellipsis rule base * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Ellipsis2TestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java index 329006414c3..c0d6a094657 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * tersts the ellipsis rule base * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class EllipsisTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java index 6cc56478fc9..73bf01e64ae 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.prelude.semantics.test; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExactMatchTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java index 382870a97b9..d51f4d3c926 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.parser.ParseException; /** * Tests label-dependent matching * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LabelMatchingTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java index 6cb2a3052d7..74a40ef5beb 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * tersts the ellipsis rule base * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MatchAllTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java index 9907c710411..17dad7de425 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.test; * Experiments with a way to match only if it doesn't remove all hard conditions in the query. * The problem is that a straightforward use case of replacement leads to nonsensical queries as shown. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MatchOnlyIfNotOnlyTermTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java index fd71c7f682c..c56d5aba219 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Tests a case reported by tularam * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NoStemmingTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java index 5d7db4e0260..a29c041ba32 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.prelude.semantics.test; /** - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NotTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java index abf407d7b9c..238c28e717c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Tests numbers as conditions and productions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class NumbersTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java index c2b4bdbab35..727a5b04e75 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Tests numeric terms * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NumericTermsTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java index 9a8fc7d6b41..15b8606fa90 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.prelude.semantics.test; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class OrPhraseTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java index 45c1cf5d4ec..7d65106ec5d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java @@ -6,7 +6,7 @@ import com.yahoo.search.Query; /** * Tests parameter matching and production * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Parameter2TestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java index ce40ea6f6c5..58b5d781b90 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java @@ -6,7 +6,7 @@ import com.yahoo.search.Query; /** * Tests parameter matching and production * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ParameterTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java index 2a8f7008ac1..0c04b647f5b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.test; * Tests that the phrase produced by an automata match can subsequently be replaced by an AND of the * same terms. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PhraseMatchTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java index 595a2b4c75c..01956eba561 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java @@ -15,7 +15,7 @@ import com.yahoo.prelude.semantics.rule.TermCondition; import com.yahoo.prelude.semantics.rule.TermProduction; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ProductionRuleTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java index 17f95d37dc7..006b0b5a6a6 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Tests a case reported by tularam * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class StemmingTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java index bfac8149a99..390f0ee11ad 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java @@ -7,7 +7,7 @@ import com.yahoo.search.test.QueryTestCase; /** * Tests numeric terms * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class StopwordTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java index 3dbb27332db..2b94763e06b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test; /** * Tests working with url indexes * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class UrlTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java index d8263f915b0..364fdfed627 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.prelude.semantics.test; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class WeightingTestCase extends RuleBaseAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java index c59dffb9cb7..d9d4755ac96 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java @@ -22,7 +22,7 @@ import java.util.Map; /** * Rudimentary http searcher test. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class HttpTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java index baeb9fd0a41..59a68700405 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java @@ -16,7 +16,7 @@ import java.util.Map; /** * Tests that source and backend specific parameters from the query are added correctly to the backend requests * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryParametersTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java index 9135984b26b..984caecd46c 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java @@ -8,7 +8,7 @@ import java.util.Map; /** * Tests that source and backend specific parameters from the query are added correctly to the backend requests * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryParametersTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java index 052ea62d4f0..32bf80bc512 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java @@ -9,7 +9,7 @@ import com.yahoo.search.pagetemplates.model.*; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapPageTemplateXMLReadingTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java index 7832719412a..6c061cdce47 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java @@ -18,7 +18,7 @@ import java.util.HashSet; import java.util.Set; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PageTemplateXMLReadingTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java index 58d05971805..0decab2e13a 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java @@ -15,7 +15,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ChoiceOfRenderersTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java index 3d92a721f0d..c03322d63cf 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java @@ -13,7 +13,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ChoiceOfSubsectionsTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java index facffb50649..71a32b75434 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java @@ -15,7 +15,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ChoiceOfTwoSourcesTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java index a646823c8cb..e26846c57b9 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ChoicesTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java index 54fc342aa22..e1eaa11dde9 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapSectionsToSectionsTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java index 49cc0411ac5..d0cd65741fc 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapSourcesToSectionsTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java index 04e550a631c..eb7c3e698dc 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java @@ -12,7 +12,7 @@ import com.yahoo.search.pagetemplates.model.Choice; import org.junit.Test; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SourceChoiceTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java index 3fff2103332..5019fc0d0ca 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java @@ -15,7 +15,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TwoSectionsFourSourcesTestCase extends ExecutionAbstractTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java index e7a0c78aa88..b87d4d02b9b 100644 --- a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java @@ -14,7 +14,7 @@ import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; /** - * @author balder + * @author baldersheim */ public class SortingTestCase { @Test diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java index bbddae0f7f0..6f47c326e0c 100644 --- a/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java @@ -10,7 +10,7 @@ import com.yahoo.search.Query; import com.yahoo.search.query.context.QueryContext; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LoggingTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java index e9bdb6f60f5..2e0dff115ed 100644 --- a/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java @@ -5,7 +5,7 @@ import com.yahoo.search.Query; import com.yahoo.search.query.context.QueryContext; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PropertiesTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java index 2f304693d1c..2f668602680 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java @@ -10,7 +10,7 @@ import com.yahoo.search.query.profile.compiled.CompiledQueryProfile; import static com.yahoo.jdisc.http.HttpRequest.Method; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ParametersTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java index 7a9f5ce59b6..365a8e87c40 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java @@ -5,7 +5,7 @@ import com.yahoo.prelude.query.WeightedSetItem; import com.yahoo.search.Query; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryCloneMicroBenchmark { diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java index 4479650cd49..15c6f707c4f 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java @@ -34,7 +34,7 @@ import com.yahoo.search.searchchain.Execution; import static com.yahoo.search.searchchain.Execution.Context.createContextStub; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NGramSearcherTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java index 8e645f2781b..649681a0e13 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java @@ -17,7 +17,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SortingDegraderTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java index c2d5e73fb97..b60ec24f747 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java @@ -7,7 +7,7 @@ import com.yahoo.search.result.HitGroup; import java.util.Arrays; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class HitGroupTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java index 482b3e08661..ac0f3fe63a5 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class AsyncExecutionOfOneChainTestCase extends TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java index 79881c06852..51a050b1e76 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java @@ -29,7 +29,7 @@ import com.yahoo.component.chain.Chain; /** * Tests using the async capabilities of the Processing parent framework of searchers. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FutureDataTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java index 92091fabbf9..a0641374a62 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java @@ -19,7 +19,7 @@ import java.util.List; /** * Tests tracing scenarios where traces from multiple executions over the same query are involved. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TraceTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java index 4f7654ba3c0..6453c3928de 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java @@ -21,7 +21,7 @@ import java.util.List; import static org.junit.Assert.*; /** - * @author balder + * @author baldersheim */ public class ValidateMatchPhaseSearcherTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java index bab7c0be548..4908efb823f 100644 --- a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java @@ -6,7 +6,7 @@ import com.yahoo.search.Query; /** * Tests the speed of accessing the query * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryBenchmark { diff --git a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java index 5c77dc0215d..c8bb28b4367 100644 --- a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.search.test; import com.yahoo.search.Query; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RequestParameterPreservationTestCase extends junit.framework.TestCase { diff --git a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java index 450da35b7a4..33b221cdf36 100644 --- a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java @@ -9,7 +9,7 @@ import com.yahoo.search.result.HitGroup; /** * Tests the speed of accessing hits in the query by id * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ResultBenchmark { diff --git a/dist/vespa.spec b/dist/vespa.spec index 1bcda21c45c..99ee034f79e 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -177,13 +177,13 @@ exit 0 %{_prefix}/libexec/vespa/common-env.sh %{_prefix}/libexec/vespa/start-vespa-base.sh %{_prefix}/libexec/vespa/stop-vespa-base.sh -%{_prefix}/libexec/start-file -%{_prefix}/libexec/ping-configserver -%{_prefix}/libexec/start-configserver -%{_prefix}/libexec/start-logd -%{_prefix}/libexec/stop-configserver +%{_prefix}/libexec/vespa/start-filedistribution +%{_prefix}/libexec/vespa/ping-configserver +%{_prefix}/libexec/vespa/start-configserver +%{_prefix}/libexec/vespa/start-logd +%{_prefix}/libexec/vespa/stop-configserver %{_prefix}/var/db/vespa/config_server/serverdb/classes/*.def -%{_prefix}/lib/vespa/jars/*.jar +%{_prefix}/lib/jars/*.jar %{_prefix}/lib/perl5/site_perl/Yahoo/Vespa/*.pm %{_prefix}/lib64/*.so %{_prefix}/bin/* @@ -191,5 +191,6 @@ exit 0 %{_prefix}/man/* %{_prefix}/include/* %{_prefix}/etc/* +%{_prefix}/conf/* %changelog diff --git a/docproc/src/main/java/com/yahoo/docproc/Call.java b/docproc/src/main/java/com/yahoo/docproc/Call.java index 6d5b25b92b5..7517594a094 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Call.java +++ b/docproc/src/main/java/com/yahoo/docproc/Call.java @@ -19,7 +19,7 @@ import java.util.List; /** * A document processor to call - an item on a {@link com.yahoo.docproc.CallStack}. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ public class Call implements Cloneable { diff --git a/docproc/src/main/java/com/yahoo/docproc/CallStack.java b/docproc/src/main/java/com/yahoo/docproc/CallStack.java index 8fbe72577d3..52b16302e26 100644 --- a/docproc/src/main/java/com/yahoo/docproc/CallStack.java +++ b/docproc/src/main/java/com/yahoo/docproc/CallStack.java @@ -22,7 +22,7 @@ import java.util.ListIterator; * This is not thread safe. * </p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CallStack { diff --git a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java index 1ad745ac1b7..cb272a1d151 100644 --- a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java +++ b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java @@ -39,7 +39,7 @@ import java.util.logging.Logger; * access to any mutable, thread-unsafe state held in a field by the processor is * synchronized.</p> * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class DocumentProcessor extends ChainedComponent { static Logger log = Logger.getLogger(DocprocService.class.getName()); diff --git a/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java b/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java index 8ef832faf31..42906f062fd 100644 --- a/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java @@ -6,7 +6,7 @@ import java.util.Iterator; /** * Tests call stacks * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class CallStackTestCase extends junit.framework.TestCase { diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java index 1b7a005350e..e35685384c7 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java @@ -12,7 +12,7 @@ import com.yahoo.document.datatypes.StringFieldValue; /** * Tests a document processing where some processings fail with an exception * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class FailingDocumentProcessingTestCase extends junit.framework.TestCase { diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java index 8ca553b9290..cdeded370f7 100644 --- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java @@ -7,7 +7,7 @@ import com.yahoo.docproc.Accesses.Field.Tree; /** * Tests the basic operation of the docproc service * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SimpleDocumentProcessingTestCase extends DocumentProcessingAbstractTestCase { diff --git a/document/OWNERS b/document/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/document/OWNERS +++ b/document/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java index 740c91c5c1b..34c952e1cec 100644 --- a/document/src/main/java/com/yahoo/document/Document.java +++ b/document/src/main/java/com/yahoo/document/Document.java @@ -25,7 +25,7 @@ import java.util.Map; * not with primitive types. Support for direct access to primitive types will * be removed soon. * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ public class Document extends StructuredFieldValue { diff --git a/document/src/main/java/com/yahoo/document/DocumentRemove.java b/document/src/main/java/com/yahoo/document/DocumentRemove.java index 8d4f37d5583..aa0ffbc000a 100644 --- a/document/src/main/java/com/yahoo/document/DocumentRemove.java +++ b/document/src/main/java/com/yahoo/document/DocumentRemove.java @@ -2,7 +2,7 @@ package com.yahoo.document; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class DocumentRemove extends DocumentOperation { diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java index db38228489d..b703a22255d 100755 --- a/document/src/main/java/com/yahoo/document/DocumentType.java +++ b/document/src/main/java/com/yahoo/document/DocumentType.java @@ -17,7 +17,7 @@ import java.util.*; * any document, it will always inherit the document "document.0".</p> * * @author <a href="mailto:thomasg@yahoo-inc.com">Thomas Gundersen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DocumentType extends StructuredDataType { diff --git a/document/src/main/java/com/yahoo/document/annotation/Span.java b/document/src/main/java/com/yahoo/document/annotation/Span.java index 87bd568b94a..a6132078c54 100644 --- a/document/src/main/java/com/yahoo/document/annotation/Span.java +++ b/document/src/main/java/com/yahoo/document/annotation/Span.java @@ -10,7 +10,7 @@ import java.util.NoSuchElementException; * This class represents a range of characters from a string. This is the leaf node * in a Span tree. Its boundaries are defined as inclusive-from and exclusive-to. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ public class Span extends SpanNode { diff --git a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java index 82e3ff36c1c..bee29478219 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java @@ -15,7 +15,7 @@ import java.util.Optional; /** * Field value class that wraps a tensor. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class TensorFieldValue extends FieldValue { diff --git a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java index 2b210cb2ee5..4476acfae22 100644 --- a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java +++ b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java @@ -14,7 +14,7 @@ import java.io.InputStream; /** * Parser that supports parsing PUT operation and UPDATE operation. * - * @author dybdahl + * @author dybis */ public class SingleDocumentParser { private static final JsonFactory jsonFactory = new JsonFactory(); diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java index aa26efb0c2d..8f287d4a213 100644 --- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java +++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java @@ -15,7 +15,7 @@ import com.yahoo.document.select.rule.ExpressionNode; * * <p>Document selectors are multithread safe.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DocumentSelector { diff --git a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java index b444c2d5ac2..79411894664 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java @@ -4,7 +4,7 @@ package com.yahoo.document.select.simple; import com.yahoo.document.select.rule.IdNode; /** - * @author balder + * @author baldersheim */ public class IdSpecParser extends Parser { private IdNode id; diff --git a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java index 52a0b0a2c4f..3d0ae1ae2a8 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java @@ -4,7 +4,7 @@ package com.yahoo.document.select.simple; import com.yahoo.document.select.rule.LiteralNode; /** - * @author balder + * @author baldersheim */ public class IntegerParser extends Parser { private LiteralNode value; diff --git a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java index 58da1e0c179..a1ddee75ff2 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java @@ -2,7 +2,7 @@ package com.yahoo.document.select.simple; /** - * @author balder + * @author baldersheim */ public class OperatorParser extends Parser { private String operator; diff --git a/document/src/main/java/com/yahoo/document/select/simple/Parser.java b/document/src/main/java/com/yahoo/document/select/simple/Parser.java index 169f100de83..fa2e5d2910b 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/Parser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/Parser.java @@ -2,7 +2,7 @@ package com.yahoo.document.select.simple; /** - * @author balder + * @author baldersheim */ public abstract class Parser { public abstract boolean parse(CharSequence s); diff --git a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java index df3507e67c8..dd76202cfb2 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java @@ -5,7 +5,7 @@ import com.yahoo.document.select.rule.ComparisonNode; import com.yahoo.document.select.rule.ExpressionNode; /** - * @author balder + * @author baldersheim */ public class SelectionParser extends Parser { private ExpressionNode node; diff --git a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java index e18c2dad8e2..42047a63e5a 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java @@ -4,7 +4,7 @@ package com.yahoo.document.select.simple; import com.yahoo.document.select.rule.LiteralNode; /** - * @author balder + * @author baldersheim */ public class StringParser extends Parser { private LiteralNode value; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java index def358e0624..e4c1a3293b1 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java @@ -8,7 +8,7 @@ import com.yahoo.io.GrowableByteBuffer; * * A particular instance of this class is tied to a version of the document format. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public interface DocumentDeserializer extends DocumentReader, DocumentUpdateReader, FieldReader, AnnotationReader, SpanNodeReader, SpanTreeReader { diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java index cef5b024837..e6b5590b073 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java @@ -7,7 +7,7 @@ import com.yahoo.io.GrowableByteBuffer; /** * Factory for creating document de-serializers tied to a document format. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DocumentDeserializerFactory { diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java index 8a5e889eb8c..52a62caf296 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java @@ -10,7 +10,7 @@ import com.yahoo.document.DocumentTypeManager; * This interface is used to implement custom deserialization of document updates. * * @author <a href="mailto:ravishar@yahoo-inc.com">Ravi Sharma</a> - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public interface DocumentReader { diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java index 6eb0fc60c3f..c1d53430bdc 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java @@ -8,7 +8,7 @@ import com.yahoo.io.GrowableByteBuffer; * * A particular instance of this class is tied to a version of the document format. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public interface DocumentSerializer extends DocumentWriter, SpanNodeWriter, AnnotationWriter, SpanTreeWriter, DocumentUpdateWriter { diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java index 50268161aad..760858680a3 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java @@ -6,7 +6,7 @@ import com.yahoo.io.GrowableByteBuffer; /** * Factory for creating document serializers tied to a document format. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DocumentSerializerFactory { diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java index 808b5d90517..d6dd1ad35ac 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java @@ -8,7 +8,7 @@ package com.yahoo.document.serialization; * Flags currently used: * 0) create-if-non-existent. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class DocumentUpdateFlags { private byte flags; diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java index c3e51b2602a..49e61f64e3d 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java @@ -76,7 +76,7 @@ import static com.yahoo.text.Utf8.calculateStringPositions; * Class used for de-serializing documents on the Vespa 4.2 document format. * * @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentDeserializerHead} instead for new code. - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ @Deprecated // OK: Don't remove on Vespa 6: Mail may have documents on this format still // When removing: Move content of this class into VespaDocumentDeserializerHead (and subclass VespaDocumentSerializerHead in that) diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java index 927075a25b5..83dc9df2826 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java @@ -12,7 +12,7 @@ import com.yahoo.io.GrowableByteBuffer; /** * Class used for de-serializing documents on the current head document format. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class VespaDocumentDeserializerHead extends VespaDocumentDeserializer42 { diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java index 64aea73d000..a3f1b0a74d4 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java @@ -22,7 +22,7 @@ import static com.yahoo.text.Utf8.calculateBytePositions; * Class used for serializing documents on the Vespa 4.2 document format. * * @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentSerializerHead} instead for new code. - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ @Deprecated // OK: Don't remove on Vespa 6: Mail may have documents on this format still // When removing: Move content into VespaDocumentSerializerHead diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java index 7f4c1960122..df15c9fda0b 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java @@ -11,7 +11,7 @@ import com.yahoo.io.GrowableByteBuffer; /** * Class used for serializing documents on the current head document format. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class VespaDocumentSerializerHead extends VespaDocumentSerializer42 { diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java index 89f22e97d5d..7a22541c619 100644 --- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java @@ -13,7 +13,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DataTypeTestCase { diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java index 7712cc06c41..f36b4f1d6db 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java @@ -4,10 +4,8 @@ package com.yahoo.document; import java.util.Iterator; /** - * TODO: Document purpose - * - * @author <a href="thomasg@yahoo-inc.com>Thomas Gundersen</a> - * @author <a href="bratseth@yahoo-inc.com>Jon S Bratseth</a> + * @author Thomas Gundersen + * @author bratseth */ public class DocumentTypeTestCase extends junit.framework.TestCase { @@ -30,14 +28,6 @@ public class DocumentTypeTestCase extends junit.framework.TestCase { DocumentTypeManager typeManager = new DocumentTypeManager(); DocumentType child = new DocumentType("child"); - //typeManager.register(child); - - /* - ListIterator inherited = child.inheritedIterator(); - assertTrue(inherited.hasNext()); - assertEquals(new DataTypeName("document", 0), inherited.next()); - assertTrue(!inherited.hasNext()); - */ Iterator inherited; child.addField("childfield", DataType.INT); @@ -104,4 +94,5 @@ public class DocumentTypeTestCase extends junit.framework.TestCase { // TODO: Test uninheriting } + } diff --git a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java index c7f88ac64e9..5a63453564d 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Created by balder on 8/6/15. + * @author baldersheim */ public class NumericFieldValueTestCase { @Test diff --git a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java index 2c76d5ec547..a02446eee76 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java @@ -8,7 +8,7 @@ import java.nio.ByteBuffer; import static org.junit.Assert.*; /** - * Created by balder on 10/21/14. + * @author baldersheim */ public class RawTestCase { @Test diff --git a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java index 7c01f8ab300..3b9cac85634 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java @@ -10,7 +10,7 @@ import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class TensorFieldValueTestCase { diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java index 18e517fb74e..f3987085e32 100644 --- a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java +++ b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java @@ -16,7 +16,7 @@ import static org.junit.Assert.assertEquals; /** * Helper class with utils used in serialization and deserialization test cases. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class SerializationTestUtils { diff --git a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java index 62f9ea9f4d3..f0334ee7e4f 100644 --- a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java @@ -15,7 +15,7 @@ import static com.yahoo.document.serialization.SerializationTestUtils.serializeD import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class TensorFieldValueSerializationTestCase { diff --git a/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java b/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java index d54562862b7..1f04b9e1e71 100644 --- a/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java +++ b/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java @@ -8,7 +8,7 @@ import com.yahoo.document.DocumentTypeManager; /** * Helper class for creating a document for a given document type. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class TestDocumentFactory { diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java index 0d73138e077..3fbea80c54b 100644 --- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java @@ -8,7 +8,7 @@ import com.yahoo.document.serialization.*; import java.io.FileOutputStream; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SerializationTestCase extends junit.framework.TestCase { diff --git a/documentapi/OWNERS b/documentapi/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/documentapi/OWNERS +++ b/documentapi/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java index 3e06d5f8d94..a0e884e107e 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java @@ -4,7 +4,7 @@ package com.yahoo.documentapi; /** * Parameters for creating an async session * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class AsyncParameters extends Parameters { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java b/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java index fdf57cecfc8..012f492d476 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java @@ -6,7 +6,7 @@ package com.yahoo.documentapi; * but keeping this parameter hierarchy in place means that we can later add parameters with default values that all * clients will be able to use with no code changes. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Parameters { // empty diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Response.java b/documentapi/src/main/java/com/yahoo/documentapi/Response.java index 5a079ec8580..1a9214c05f4 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Response.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Response.java @@ -7,7 +7,7 @@ package com.yahoo.documentapi; * * <p>This is a <i>value object</i>.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Response { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Result.java b/documentapi/src/main/java/com/yahoo/documentapi/Result.java index e5982d297f7..9a24da9a676 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Result.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Result.java @@ -6,7 +6,7 @@ package com.yahoo.documentapi; * A result is either a success or not. If it is not a success, it will contain an explanation of why. * Document repositories may return subclasses which contain more information. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Result { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java index abd24099ff9..692eae01753 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java @@ -4,7 +4,7 @@ package com.yahoo.documentapi; /** * Parameters for creating or opening a visitor session * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SubscriptionParameters extends Parameters { } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java index 588a5e6f118..a4ff942bb5e 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java @@ -5,7 +5,7 @@ package com.yahoo.documentapi; * This class provides document <i>subscription</i> - accessing document changes to a * document repository. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface SubscriptionSession extends Session { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java index 5ac77abd3ae..edcefe9447d 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java @@ -11,7 +11,7 @@ import java.util.Map; /** * The main class of the local implementation of the document api * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LocalDocumentAccess extends DocumentAccess { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java index 7b895845f3d..5795ea771b5 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; * An access session which wraps a messagebus source session sending document messages. * The sessions are multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:einarmr@yahoo-inc.com">Einar Rosenvinge</a> */ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java index c72994a9fc7..ad07b6a9d70 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class MessageTypePolicy implements DocumentProtocolRoutingPolicy, ConfigSubscriber.SingleSubscriber<MessagetyperouteselectorpolicyConfig> { diff --git a/documentgen-test/OWNERS b/documentgen-test/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/documentgen-test/OWNERS +++ b/documentgen-test/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/fastlib/OWNERS b/fastlib/OWNERS index f6fda8f0404..885ab949d74 100644 --- a/fastlib/OWNERS +++ b/fastlib/OWNERS @@ -1,3 +1,3 @@ havardpe -tegge -balder +toregge +baldersheim diff --git a/fastos/OWNERS b/fastos/OWNERS index c6b7fc4c94f..912f61c59b8 100644 --- a/fastos/OWNERS +++ b/fastos/OWNERS @@ -1,2 +1,2 @@ -balder +baldersheim arnej27959 diff --git a/fbench/OWNERS b/fbench/OWNERS index 0aa3eee0364..fc41da17545 100644 --- a/fbench/OWNERS +++ b/fbench/OWNERS @@ -1,2 +1,2 @@ havardpe -balder +baldersheim diff --git a/fnet/OWNERS b/fnet/OWNERS index 0aa3eee0364..fc41da17545 100644 --- a/fnet/OWNERS +++ b/fnet/OWNERS @@ -1,2 +1,2 @@ havardpe -balder +baldersheim diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java index ce9854e7c44..87dcda1cf94 100644 --- a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java +++ b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java @@ -10,7 +10,7 @@ import java.util.List; import java.nio.BufferUnderflowException; /** - * @author <a href="geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class FSADataTestCase extends junit.framework.TestCase { diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java index 21dc86f4925..6a2c8049f6e 100644 --- a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java +++ b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.NoSuchElementException; /** - * @author <a href="geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class FSAIteratorTestCase extends junit.framework.TestCase { diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java index 4300c5938e1..dfd221a5bf6 100644 --- a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java +++ b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java @@ -7,7 +7,7 @@ import java.io.FileInputStream; import java.io.IOException; /** - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FSATestCase extends junit.framework.TestCase { diff --git a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java index 3f07816a914..6a68c4c50f2 100644 --- a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java +++ b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java @@ -6,7 +6,7 @@ import java.util.Iterator; import java.nio.charset.Charset; /** - * @author <a href="geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class UTF8TestCase extends junit.framework.TestCase { diff --git a/functions.cmake b/functions.cmake index 46b8083b94c..8bd0e3a97d1 100644 --- a/functions.cmake +++ b/functions.cmake @@ -151,7 +151,7 @@ endfunction() function(vespa_add_library TARGET) cmake_parse_arguments(ARG - "STATIC;OBJECT;INTERFACE" + "STATIC;OBJECT;INTERFACE;TEST" "INSTALL;OUTPUT_NAME" "DEPENDS;AFTER;SOURCES" ${ARGN}) @@ -178,6 +178,8 @@ function(vespa_add_library TARGET) add_library(${TARGET} ${LINKAGE} ${LIBRARY_TYPE} ${SOURCE_FILES}) __add_dependencies_to_target() + __handle_test_targets() + if(ARG_INSTALL) install(TARGETS ${TARGET} DESTINATION ${ARG_INSTALL}) endif() @@ -201,15 +203,7 @@ function(vespa_add_executable TARGET) add_executable(${TARGET} ${ARG_SOURCES}) __add_dependencies_to_target() - # If this is a test executable, add it to the test target for this module - # If building of unit tests is not specified, exclude this target from the all target - if(ARG_TEST) - __add_test_target_to_module(${TARGET}) - - if(EXCLUDE_TESTS_FROM_ALL) - set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) - endif() - endif() + __handle_test_targets() if(ARG_INSTALL) install(TARGETS ${TARGET} DESTINATION ${ARG_INSTALL}) @@ -439,6 +433,18 @@ function(__add_test_target_to_module TARGET) set_property(GLOBAL APPEND PROPERTY MODULE_${MODULE_NAME}_TEST_TARGETS ${TARGET}) endfunction() +macro(__handle_test_targets) + # If this is a test executable, add it to the test target for this module + # If building of unit tests is not specified, exclude this target from the all target + if(ARG_TEST) + __add_test_target_to_module(${TARGET}) + + if(EXCLUDE_TESTS_FROM_ALL) + set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) + endif() + endif() +endmacro() + function(__create_module_targets PROPERTY_POSTFIX TARGET_POSTFIX) get_property(VESPA_MODULES GLOBAL PROPERTY VESPA_MODULES) set(OUTPUT_ALL_TARGET "all_${TARGET_POSTFIX}s") diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java index c5b68e6c978..74e2b30a799 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java @@ -15,7 +15,7 @@ import java.util.Iterator; /** * A filter which splits incoming text into n-grams * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NGramExpression extends Expression { diff --git a/install_java.cmake b/install_java.cmake index bdc2acbaa2d..e62d931539e 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -1,9 +1,12 @@ function(install_java_artifact NAME) - install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/vespa/jars/) + install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) + if (IS_DIRECTORY "${NAME}/target/dependency") + install(DIRECTORY "${NAME}/target/dependency" DESTINATION lib/jars/ FILES_MATCHING PATTERN "*.jar") + endif() endfunction() function(install_fat_java_artifact NAME) - install(FILES "${NAME}/target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/vespa/jars/) + install(FILES "${NAME}/target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/jars/) endfunction() install_java_artifact(document) @@ -13,18 +16,22 @@ install_java_artifact(vespajlib) install_fat_java_artifact(application-preprocessor) install_fat_java_artifact(component) install_fat_java_artifact(config-bundle) +install_fat_java_artifact(config-model-api) +install_fat_java_artifact(config-model) +install_fat_java_artifact(config-provisioning) install_fat_java_artifact(configdefinitions) install_fat_java_artifact(container-disc) install_fat_java_artifact(container-jersey2) install_fat_java_artifact(container-search-and-docproc) +install_fat_java_artifact(defaults) install_fat_java_artifact(docprocs) install_fat_java_artifact(jdisc_core) install_fat_java_artifact(jdisc_http_service) install_fat_java_artifact(persistence) install_fat_java_artifact(simplemetrics) +install_fat_java_artifact(standalone-container) install_fat_java_artifact(vespaclient-container-plugin) -vespa_install_script(standalone-container/src/main/sh/jdisc_container_start bin) vespa_install_script(jdisc_core/src/main/perl/jdisc_logfmt bin) install(FILES jdisc_core/src/main/perl/jdisc_logfmt.1 DESTINATION man/man1) diff --git a/jaxrs_client_utils/OWNERS b/jaxrs_client_utils/OWNERS index 9ecc8472a21..f44aaadea3c 100644 --- a/jaxrs_client_utils/OWNERS +++ b/jaxrs_client_utils/OWNERS @@ -1,2 +1,2 @@ bakksjo -hakon +hakonhall diff --git a/jaxrs_utils/OWNERS b/jaxrs_utils/OWNERS index 9ecc8472a21..f44aaadea3c 100644 --- a/jaxrs_utils/OWNERS +++ b/jaxrs_utils/OWNERS @@ -1,2 +1,2 @@ bakksjo -hakon +hakonhall diff --git a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java index 1742b365697..8aa58a1ed03 100644 --- a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java +++ b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java @@ -10,7 +10,7 @@ import java.util.ArrayList; /** * A generic rpc invoker for use by command line tools * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RpcInvoker { diff --git a/juniper/OWNERS b/juniper/OWNERS index 9673ef97e16..6aeaba5f2a8 100644 --- a/juniper/OWNERS +++ b/juniper/OWNERS @@ -1,2 +1,2 @@ geirst -balder +baldersheim diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java b/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java index 93552bf9f00..132c0074cb7 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; * messages at level error or higher. Connecting to this handler * will return a Json object with the last errors (default is last 100 errors) * - * @author musum + * @author hmusum */ public class LastErrorsHolder extends AbstractLogHandler implements ConnectionFactory { private static final Logger log = Logger.getLogger(LastErrorsHolder.class.getName()); diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderConnection.java b/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderConnection.java index 0dc89e95d11..29e90a3ac0e 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderConnection.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderConnection.java @@ -17,7 +17,7 @@ import java.util.logging.Logger; /** * LastErrorsHandler client connection. * - * @author musum + * @author hmusum */ public class LastErrorsHolderConnection implements Connection, LogFilter { private static final Logger log = Logger.getLogger(LastErrorsHolderConnection.class.getName()); diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java index fee835b8189..ff587bdc396 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java @@ -25,7 +25,7 @@ import com.yahoo.logserver.handlers.AbstractLogHandler; * per level per host and sends an event count for this five minutes. * * - * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class LogMetricsHandler extends AbstractLogHandler { diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java index 686c8a8a089..4aece1a6b32 100644 --- a/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java +++ b/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java @@ -13,7 +13,7 @@ import org.junit.*; import static org.junit.Assert.*; /** - * @author <a href="mailto:musum@europe.yahoo-inc.com">Harald Musum</a> + * @author hmusum */ public class LogMetricsTestCase { // Some of the tests depend upon the number of messages for a diff --git a/messagebus-disc/OWNERS b/messagebus-disc/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/messagebus-disc/OWNERS +++ b/messagebus-disc/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/messagebus/OWNERS b/messagebus/OWNERS index 631c3b2dd30..7379f3287ad 100644 --- a/messagebus/OWNERS +++ b/messagebus/OWNERS @@ -1,2 +1,3 @@ -dybdahl -balder +dybis +baldersheim + diff --git a/messagebus/src/main/java/com/yahoo/messagebus/AllPassThrottlePolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/AllPassThrottlePolicy.java index 72f13ac2a1e..469deefa7f7 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/AllPassThrottlePolicy.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/AllPassThrottlePolicy.java @@ -3,7 +3,7 @@ package com.yahoo.messagebus; /** * This is an implementation of the {@link ThrottlePolicy} that passes all requests (no real throttling). - * @author <a href="mailto:dybdahl@yahoo-inc.com">Haakon Dybdahl</a> + * @author dybis */ public class AllPassThrottlePolicy implements ThrottlePolicy { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java index 4e96c9af959..746ab2adc2d 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java @@ -8,7 +8,7 @@ import com.yahoo.messagebus.routing.RoutingPolicy; /** * Interface implemented by the concrete application message protocol. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public interface Protocol { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Result.java b/messagebus/src/main/java/com/yahoo/messagebus/Result.java index 095398f6b5d..6341e75e158 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/Result.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Result.java @@ -10,7 +10,7 @@ package com.yahoo.messagebus; * * <p>This class is <b>immutable</b>. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Result { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java index 66321b5975e..cf568eeffb9 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java @@ -7,7 +7,7 @@ import java.util.*; * A hop blueprint is a stored prototype of a hop that has been created from a {@link HopSpec} object. A map of these * are stored in a {@link RoutingTable}. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class HopBlueprint { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java index c9684e77a66..bb045e435cf 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java @@ -15,7 +15,7 @@ import java.util.List; * #parse(String)} to produce a route instance from a string representation, or * you may build one programatically through the hop accessors.</p> * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Route { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java index a9f2ed8de3c..2fc523542e3 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java @@ -4,7 +4,7 @@ package com.yahoo.messagebus.routing; /** * This replaces the incredibly slow javacc RouteParser.jj. It is a has its c++ sibling and * the implementation is a a copy of the C++ version. - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java index b8fa37b0542..a3f93a6231c 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java @@ -17,8 +17,8 @@ package com.yahoo.messagebus.routing; * <p> * This class is pluggable per template point in the address of a hop. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> - * @author <a href="bratseth@yahoo-inc.com">Simon Thoresen</a> + * @author bratseth + * @author Simon Thoresen */ public interface RoutingPolicy { @@ -29,7 +29,7 @@ public interface RoutingPolicy { * * @param context the complete context for the invocation of this policy. Contains all available data. */ - public void select(RoutingContext context); + void select(RoutingContext context); /** * This function is called when all replies have arrived for some message. The implementation is responsible for @@ -38,11 +38,12 @@ public interface RoutingPolicy { * * @param context the complete context for the invocation of this policy. Contains all available data. */ - public void merge(RoutingContext context); + void merge(RoutingContext context); /** * Destroys this factory and frees up any resources it has held. Making further calls on a destroyed * factory causes a runtime exception. */ - public void destroy(); + void destroy(); + } diff --git a/node-admin/OWNERS b/node-admin/OWNERS index 9ecc8472a21..f44aaadea3c 100644 --- a/node-admin/OWNERS +++ b/node-admin/OWNERS @@ -1,2 +1,2 @@ bakksjo -hakon +hakonhall diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java index ab8198bc9fa..4ef7b1b0705 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java @@ -29,13 +29,14 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.InetAddress; import java.net.UnknownHostException; -import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.time.Instant; import java.util.Arrays; +import java.util.Date; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -43,6 +44,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.TimeZone; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -69,12 +71,17 @@ public class DockerImpl implements Docker { private static final String LABEL_NAME_MANAGEDBY = "com.yahoo.vespa.managedby"; private static final String LABEL_VALUE_MANAGEDBY = "node-admin"; private static final Map<String,String> CONTAINER_LABELS = new HashMap<>(); + private static DateFormat filenameFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); + static { CONTAINER_LABELS.put(LABEL_NAME_MANAGEDBY, LABEL_VALUE_MANAGEDBY); + filenameFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); } private static final Path RELATIVE_APPLICATION_STORAGE_PATH = Paths.get("home/docker/container-storage"); + private static final Path RELATIVE_CLEANUP_APPLICATION_STORAGE_PATH = RELATIVE_APPLICATION_STORAGE_PATH.resolve("../container-storage-cleanup"); private static final Path APPLICATION_STORAGE_PATH_FOR_NODE_ADMIN = Paths.get("/host").resolve(RELATIVE_APPLICATION_STORAGE_PATH); + private static final Path CLEANUP_APPLICATION_STORAGE_PATH_FOR_NODE_ADMIN = Paths.get("/host").resolve(RELATIVE_CLEANUP_APPLICATION_STORAGE_PATH); private static final Path APPLICATION_STORAGE_PATH_FOR_HOST = Paths.get("/").resolve(RELATIVE_APPLICATION_STORAGE_PATH); private static final List<String> DIRECTORIES_TO_MOUNT = Arrays.asList( @@ -188,28 +195,20 @@ public class DockerImpl implements Docker { } } + /** + * Delete application storage, implemented by moving it away for later cleanup + */ @Override public void deleteApplicationStorage(ContainerName containerName) throws IOException { - Path applicationStoragePath = applicationStoragePathForNodeAdmin(containerName.asString()); - if (!Files.exists(applicationStoragePath)) { - log.log(LogLevel.INFO, "The application storage at " + applicationStoragePath + " doesn't exist"); + Path from = applicationStoragePathForNodeAdmin(containerName.asString()); + if (!Files.exists(from)) { + log.log(LogLevel.INFO, "The application storage at " + from + " doesn't exist"); return; } - - log.log(LogLevel.INFO, "Deleting application storage in " + applicationStoragePath); - Files.walkFileTree(applicationStoragePath, - new SimpleFileVisitor<Path>() { - @Override - public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException { - Files.delete(path); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - return visitFile(dir, null); - } - }); + Path to = CLEANUP_APPLICATION_STORAGE_PATH_FOR_NODE_ADMIN.resolve(containerName.asString() + "_" + filenameFormatter + .format(Date.from(Instant.now()))); + log.log(LogLevel.INFO, "Deleting application storage by moving it from " + from + " to " + to); + Files.move(from, to); } @Override diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/NodeAgentImplTest.java index 1965da591f4..f17c3919d81 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/NodeAgentImplTest.java @@ -160,7 +160,7 @@ public class NodeAgentImplTest { final String vespaVersion = "7.8.9"; when(docker.imageIsDownloaded(wantedDockerImage)).thenReturn(true); - when(docker.executeInContainer(eq(containerName), anyVararg())).thenReturn(NODE_PROGRAM_DOESNT_EXIST);; + when(docker.executeInContainer(eq(containerName), anyVararg())).thenReturn(NODE_PROGRAM_DOESNT_EXIST); when(docker.getVespaVersion(containerName)).thenReturn(vespaVersion); when(orchestrator.suspend(any(HostName.class))).thenReturn(true); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImplTest.java index 06c3a260790..9351e80cdab 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImplTest.java @@ -13,7 +13,6 @@ import com.yahoo.vespa.defaults.Defaults; import org.junit.Test; import java.io.IOException; -import java.time.Duration; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; @@ -23,7 +22,6 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import static org.hamcrest.CoreMatchers.hasItem; diff --git a/node-repository/OWNERS b/node-repository/OWNERS index cc4d4971a75..a713f3f57c3 100644 --- a/node-repository/OWNERS +++ b/node-repository/OWNERS @@ -1,2 +1,2 @@ bratseth -musum +hmusum diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java index b1be9da62fe..f466eaf9f57 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java @@ -8,7 +8,7 @@ import javax.annotation.concurrent.Immutable; * is increased when an action (restart services or reboot are the available * actions) is wanted, current is updated when the action has been done on the node. * - * @author musum + * @author hmusum */ @Immutable public class Generation { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java index 3e79acffce3..3d1583eedb5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; /** * Filter based on the parent host value (for virtualized nodes). - * @author dybdahl + * @author dybis */ public class ParentHostFilter extends NodeFilter { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java index 990051b2317..3ca0c4ff365 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java @@ -5,7 +5,7 @@ package com.yahoo.vespa.hosted.provision.testutils; * For running NodeRepository API with some mocked data. * This is used by both NodeAdmin and NodeRepository tests. * - * @author dybdahl + * @author dybis */ public class ContainerConfig { public static final String servicesXmlV2(int port) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java index a79123959cc..db4c2941970 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull; /** * Tests provisioning of virtual nodes * - * @author musum + * @author hmusum * @author mpolden */ public class VirtualNodeProvisioningTest { diff --git a/orchestrator-restapi/OWNERS b/orchestrator-restapi/OWNERS index 9ecc8472a21..f44aaadea3c 100644 --- a/orchestrator-restapi/OWNERS +++ b/orchestrator-restapi/OWNERS @@ -1,2 +1,2 @@ bakksjo -hakon +hakonhall diff --git a/orchestrator/OWNERS b/orchestrator/OWNERS index 3d08c49311b..e131dacde49 100644 --- a/orchestrator/OWNERS +++ b/orchestrator/OWNERS @@ -1 +1 @@ -hakon +hakonhall diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/VespaModelUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/VespaModelUtil.java index 148c9463f62..e16ccdca5b7 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/VespaModelUtil.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/VespaModelUtil.java @@ -25,7 +25,7 @@ import static com.yahoo.collections.CollectionUtil.first; * Utility methods for working with Vespa-specific model entities (see OrchestratorUtil * for more generic model utilities). * - * @author hakon + * @author hakonhall */ public class VespaModelUtil { private static final Logger log = Logger.getLogger(VespaModelUtil.class.getName()); diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerJaxRsApi.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerJaxRsApi.java index e49173d84bf..d6c4bda8871 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerJaxRsApi.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerJaxRsApi.java @@ -9,7 +9,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; /** - * @author hakon + * @author hakonhall */ public interface ClusterControllerJaxRsApi { @POST diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerState.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerState.java index 58f1ef32b10..e5db0ec9795 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerState.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerState.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonValue; * that class is already fairly complicated, and may perhaps best be screened from JSON annotations - the only * thing we need is the enum < - > String conversions). * - * @author hakon + * @author hakonhall */ public enum ClusterControllerState { MAINTENANCE("maintenance"), diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateRequest.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateRequest.java index 870ba79158c..a7680d9659d 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateRequest.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateRequest.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Objects; /** - * @author hakon + * @author hakonhall */ public class ClusterControllerStateRequest { diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateResponse.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateResponse.java index 16d64566b8e..6036cad9aaa 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateResponse.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerStateResponse.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * The response returned by the cluster controller's set-node-state APIs. * - * @author hakon + * @author hakonhall */ public class ClusterControllerStateResponse { @JsonProperty("wasModified") diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/ServiceClusterSuspendPolicy.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/ServiceClusterSuspendPolicy.java index b2fdd7878d3..7cb20cb8657 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/ServiceClusterSuspendPolicy.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/ServiceClusterSuspendPolicy.java @@ -5,7 +5,7 @@ import com.yahoo.vespa.orchestrator.VespaModelUtil; import com.yahoo.vespa.applicationmodel.ServiceCluster; /** - * @author hakon + * @author hakonhall * @author bakksjo */ public final class ServiceClusterSuspendPolicy { diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/VespaModelUtilTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/VespaModelUtilTest.java index ab533528cd4..d96b85d50bf 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/VespaModelUtilTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/VespaModelUtilTest.java @@ -25,7 +25,7 @@ import static junit.framework.TestCase.assertTrue; import static org.fest.assertions.Assertions.assertThat; /** - * @author hakon + * @author hakonhall */ public class VespaModelUtilTest { // Cluster Controller Service Cluster diff --git a/persistence/OWNERS b/persistence/OWNERS index 97c35339850..11a58a546b1 100644 --- a/persistence/OWNERS +++ b/persistence/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/persistencetypes/OWNERS b/persistencetypes/OWNERS index 97c35339850..11a58a546b1 100644 --- a/persistencetypes/OWNERS +++ b/persistencetypes/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java b/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java index 7915fbedb0d..61df0c992b9 100644 --- a/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java +++ b/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java @@ -32,7 +32,7 @@ import java.util.concurrent.*; * The request is not thread safe. A clone() must be made for each parallel processing. * </p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @see Execution */ public class AsyncExecution { diff --git a/processing/src/main/java/com/yahoo/processing/execution/Execution.java b/processing/src/main/java/com/yahoo/processing/execution/Execution.java index c8bc291c036..4930e46f707 100644 --- a/processing/src/main/java/com/yahoo/processing/execution/Execution.java +++ b/processing/src/main/java/com/yahoo/processing/execution/Execution.java @@ -16,7 +16,7 @@ import java.util.Iterator; * An execution of a chain. This keeps tracks of the progress of the execution and is called by the * processors (using {@link #process} to move the execution to the next one. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Execution { @@ -240,7 +240,7 @@ public class Execution { * Tre trace of this execution. This is a facade into a node in the larger trace tree which captures * the information about all executions caused by some request * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public static class Trace { diff --git a/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java b/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java index ceb5d4f7ccc..79242c6e2dd 100644 --- a/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java +++ b/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java @@ -10,7 +10,7 @@ import com.yahoo.processing.Response; * An execution which has a response which is returned when this gets to the end of the chain. * This is useful to run processing chains where a response exists up front, typically for on completion listeners. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExecutionWithResponse extends Execution { diff --git a/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java b/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java index fbc6d0fb6d8..2d4b3a9c317 100644 --- a/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java +++ b/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java @@ -8,7 +8,7 @@ import com.yahoo.processing.Response; * Freeze listeners may implement this to be handed the response * before they are run. There is probably no other sensible use for this. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface ResponseReceiver { diff --git a/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java b/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java index 617a2b98b03..c86631cca4a 100644 --- a/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java +++ b/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java @@ -8,7 +8,7 @@ import com.yahoo.processing.Response; * An adaptor of an Execution to a runnable. Calling run on this causes process to be called on the * given processor. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RunnableExecution implements Runnable { diff --git a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java b/processing/src/main/java/com/yahoo/processing/request/CompoundName.java index 798d2d11f89..348966891b2 100644 --- a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java +++ b/processing/src/main/java/com/yahoo/processing/request/CompoundName.java @@ -15,7 +15,7 @@ import static com.yahoo.text.Lowercase.toLowerCase; * <p> * Using CompoundName is generally substantially faster than using strings. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class CompoundName { diff --git a/processing/src/main/java/com/yahoo/processing/response/AbstractData.java b/processing/src/main/java/com/yahoo/processing/response/AbstractData.java index 3595315bd62..9404f991901 100644 --- a/processing/src/main/java/com/yahoo/processing/response/AbstractData.java +++ b/processing/src/main/java/com/yahoo/processing/response/AbstractData.java @@ -7,7 +7,7 @@ import com.yahoo.processing.Request; /** * Convenience superclass for implementations of data. This contains no payload. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class AbstractData extends ListenableFreezableClass implements Data { diff --git a/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java b/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java index 845ab041d73..a1935a1a631 100644 --- a/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java +++ b/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeoutException; /** * A convenience superclass for dataList implementations which handles references to the request and to incoming data. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class AbstractDataList<DATATYPE extends Data> extends ListenableFreezableClass implements DataList<DATATYPE>, Streamed, Ordered { diff --git a/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java b/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java index d30d1848c7f..7d75f3f4d45 100644 --- a/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java +++ b/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java @@ -10,7 +10,7 @@ import java.util.List; * A data list backed by an array. * This implementation supports subclassing. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ArrayDataList<DATATYPE extends Data> extends AbstractDataList<DATATYPE> { diff --git a/processing/src/main/java/com/yahoo/processing/response/Data.java b/processing/src/main/java/com/yahoo/processing/response/Data.java index 31207210ef2..67530b32f53 100644 --- a/processing/src/main/java/com/yahoo/processing/response/Data.java +++ b/processing/src/main/java/com/yahoo/processing/response/Data.java @@ -9,7 +9,7 @@ import com.yahoo.processing.Request; * <p> * If a data item is <i>frozen</i> it is illegal to make further changes to its payload or referenced request. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // TODO: Have DataList implement this instead, probably (should be a safe change in practise) public interface Data extends ListenableFreezable { diff --git a/processing/src/main/java/com/yahoo/processing/response/DataList.java b/processing/src/main/java/com/yahoo/processing/response/DataList.java index 42cb1f98a70..fd392a72e0b 100644 --- a/processing/src/main/java/com/yahoo/processing/response/DataList.java +++ b/processing/src/main/java/com/yahoo/processing/response/DataList.java @@ -18,7 +18,7 @@ import java.util.concurrent.Executor; * Content in a frozen list may be returned to the requesting client immediately by the underlying engine, * even if the Response owning the list is not returned yet. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface DataList<DATATYPE extends Data> extends Data { diff --git a/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java b/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java index 212644a186f..4a85f582905 100644 --- a/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java +++ b/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java @@ -14,7 +14,7 @@ import java.util.concurrent.Executor; /** * The default incoming data implementation * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DefaultIncomingData<DATATYPE extends Data> implements IncomingData<DATATYPE> { diff --git a/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java b/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java index 7653b8e6c28..dfc0ab0e54c 100644 --- a/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java +++ b/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; /** * A processing response which will arrive in the future. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FutureResponse extends ForwardingFuture<Response> { diff --git a/processing/src/main/java/com/yahoo/processing/response/IncomingData.java b/processing/src/main/java/com/yahoo/processing/response/IncomingData.java index 5939f56a8f3..cf45cda1c16 100644 --- a/processing/src/main/java/com/yahoo/processing/response/IncomingData.java +++ b/processing/src/main/java/com/yahoo/processing/response/IncomingData.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; * A data list own once instance of this which can be used to provide data asynchronously to the list, * and consume, wait for or be notified upon the arrival of such data. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface IncomingData<DATATYPE extends Data> { diff --git a/processing/src/main/java/com/yahoo/processing/response/Ordered.java b/processing/src/main/java/com/yahoo/processing/response/Ordered.java index 10aeaaeb952..87fa14e3c04 100644 --- a/processing/src/main/java/com/yahoo/processing/response/Ordered.java +++ b/processing/src/main/java/com/yahoo/processing/response/Ordered.java @@ -7,7 +7,7 @@ package com.yahoo.processing.response; * the list is insignificant. The usage of this is to allow the content of a list to be rendered in the order * in which it completes rather than in the order in which it is added to the list. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.19 */ public interface Ordered { diff --git a/processing/src/main/java/com/yahoo/processing/response/Streamed.java b/processing/src/main/java/com/yahoo/processing/response/Streamed.java index 6eab5a3287f..f51ef4a7817 100644 --- a/processing/src/main/java/com/yahoo/processing/response/Streamed.java +++ b/processing/src/main/java/com/yahoo/processing/response/Streamed.java @@ -7,7 +7,7 @@ package com.yahoo.processing.response; * until it is completed. This is useful in cases where some decision making which may impact the content of the list * must be deferred until the list is complete. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.19 */ public interface Streamed { diff --git a/processing/src/main/java/com/yahoo/processing/test/Responses.java b/processing/src/main/java/com/yahoo/processing/test/Responses.java index bd795770b87..3b1196528c7 100644 --- a/processing/src/main/java/com/yahoo/processing/test/Responses.java +++ b/processing/src/main/java/com/yahoo/processing/test/Responses.java @@ -7,7 +7,7 @@ import com.yahoo.processing.response.DataList; /** * Static utilities * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.13 */ public class Responses { diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java index bdf04859151..098c5666187 100644 --- a/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java +++ b/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java @@ -12,7 +12,7 @@ import static com.yahoo.processing.test.ProcessorLibrary.*; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class AsyncExecutionTestCase { diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java index f5b3121f2f8..fa733489e48 100644 --- a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java +++ b/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java @@ -11,7 +11,7 @@ import java.util.Iterator; import java.util.Set; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExecutionContextTestCase extends junit.framework.TestCase { diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java index 09d7c38322f..9a31a8d1938 100644 --- a/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java +++ b/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; * Tests scenarios where a data producer returns a promise of some future data rather than the data itself. * As no processor waits for the data it is returned all the way to the caller. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FutureDataTestCase { diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java index 1ce4e293104..6002c1993e2 100644 --- a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java +++ b/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; /** * Tests listening on every available new piece of data in a response * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class StreamingTestCase { diff --git a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java index 6c512c82903..680f67f56c1 100644 --- a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java +++ b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java @@ -4,7 +4,7 @@ package com.yahoo.processing.request.test; import com.yahoo.processing.request.CompoundName; /** - * @author balder + * @author baldersheim */ public class CompoundNameBenchmark { public void run() { diff --git a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java index 647000c5f88..4b906a723c3 100644 --- a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java +++ b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CompoundNameTestCase { diff --git a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java index 82fd25f9754..8b2f2c64d24 100644 --- a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java +++ b/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java @@ -6,7 +6,7 @@ import com.yahoo.processing.request.ErrorMessage; import org.junit.Test; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ErrorMessageTestCase extends junit.framework.TestCase { diff --git a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java index 61ef75c55a2..812ce2fae65 100644 --- a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java +++ b/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PropertyMapTestCase extends junit.framework.TestCase { diff --git a/searchcommon/OWNERS b/searchcommon/OWNERS index 6b6bfc6e2ac..cf65e9c8229 100644 --- a/searchcommon/OWNERS +++ b/searchcommon/OWNERS @@ -1,3 +1,3 @@ geirst -balder -tegge +baldersheim +toregge diff --git a/searchcore/OWNERS b/searchcore/OWNERS index 22a8fdfdfa6..81de3c9fc79 100644 --- a/searchcore/OWNERS +++ b/searchcore/OWNERS @@ -1,5 +1,5 @@ geirst -tegge -balder +toregge +baldersheim havardpe yngve diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp index e1e9f58fc14..7b09beb35b6 100644 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp @@ -44,6 +44,15 @@ using proton::bucketdb::BucketState; namespace proton { +namespace +{ + +static constexpr uint32_t numBucketBits = UINT32_C(20); +static constexpr uint64_t timestampBias = UINT64_C(2000000000000); + +} + + class DummyTlsSyncer : public ITlsSyncer { public: @@ -552,23 +561,21 @@ TEST("requireThatWeCanStoreBucketIdAndTimestamp") { DocumentMetaStore dms(createBucketDB()); uint32_t numLids = 1000; - uint32_t bkBits = UINT32_C(20); - uint64_t tsbias = UINT64_C(2000000000000); dms.constructFreeList(); for (uint32_t lid = 1; lid <= numLids; ++lid) { GlobalId gid = createGid(lid); BucketId bucketId(gid.convertToBucketId()); - bucketId.setUsedBits(bkBits); - uint32_t addLid = addGid(dms, gid, bucketId, Timestamp(lid + tsbias)); + bucketId.setUsedBits(numBucketBits); + uint32_t addLid = addGid(dms, gid, bucketId, Timestamp(lid + timestampBias)); EXPECT_EQUAL(lid, addLid); } for (uint32_t lid = 1; lid <= numLids; ++lid) { GlobalId gid = createGid(lid); BucketId bucketId(gid.convertToBucketId()); - bucketId.setUsedBits(bkBits); + bucketId.setUsedBits(numBucketBits); EXPECT_TRUE(assertGid(gid, lid, dms, bucketId, - Timestamp(lid + tsbias))); + Timestamp(lid + timestampBias))); EXPECT_TRUE(assertLid(lid, gid, dms)); } } @@ -577,8 +584,6 @@ TEST("requireThatGidsCanBeSavedAndLoaded") { DocumentMetaStore dms1(createBucketDB()); uint32_t numLids = 1000; - uint32_t bkBits = UINT32_C(20); - uint64_t tsbias = UINT64_C(2000000000000); std::vector<uint32_t> removeLids; removeLids.push_back(10); removeLids.push_back(20); @@ -588,8 +593,8 @@ TEST("requireThatGidsCanBeSavedAndLoaded") for (uint32_t lid = 1; lid <= numLids; ++lid) { GlobalId gid = createGid(lid); BucketId bucketId(gid.convertToBucketId()); - bucketId.setUsedBits(bkBits); - uint32_t addLid = addGid(dms1, gid, bucketId, Timestamp(lid + tsbias)); + bucketId.setUsedBits(numBucketBits); + uint32_t addLid = addGid(dms1, gid, bucketId, Timestamp(lid + timestampBias)); EXPECT_EQUAL(lid, addLid); } for (size_t i = 0; i < removeLids.size(); ++i) { @@ -612,10 +617,10 @@ TEST("requireThatGidsCanBeSavedAndLoaded") for (uint32_t lid = 1; lid <= numLids; ++lid) { GlobalId gid = createGid(lid); BucketId bucketId(gid.convertToBucketId()); - bucketId.setUsedBits(bkBits); + bucketId.setUsedBits(numBucketBits); if (std::count(removeLids.begin(), removeLids.end(), lid) == 0) { EXPECT_TRUE(assertGid(gid, lid, dms2, bucketId, - Timestamp(lid + tsbias))); + Timestamp(lid + timestampBias))); EXPECT_TRUE(assertLid(lid, gid, dms2)); } else { LOG(info, "Lid %u was removed before saving", lid); @@ -629,7 +634,7 @@ TEST("requireThatGidsCanBeSavedAndLoaded") for (size_t i = 0; i < removeLids.size(); ++i) { LOG(info, "Re-use remove lid %u", removeLids[i]); GlobalId gid = createGid(removeLids[i]); - BucketId bucketId(bkBits, + BucketId bucketId(numBucketBits, gid.convertToBucketId().getRawId()); // re-use removeLid[i] uint32_t addLid = addGid(dms2, gid, bucketId, Timestamp(43u + i)); @@ -1870,6 +1875,69 @@ TEST("requireThatShrinkViaFlushTargetWorks") ft->getApproxMemoryGain().getAfter()); } + +namespace { + +void +addLid(DocumentMetaStore &dms, uint32_t lid) +{ + GlobalId gid = createGid(lid); + BucketId bucketId(gid.convertToBucketId()); + bucketId.setUsedBits(numBucketBits); + uint32_t addedLid = addGid(dms, gid, bucketId, Timestamp(lid + timestampBias)); + EXPECT_EQUAL(lid, addedLid); +} + +void +removeLid(DocumentMetaStore &dms, uint32_t lid) +{ + dms.remove(lid); + dms.removeComplete(lid); +} + + +void +assertCompact(DocumentMetaStore &dms, uint32_t docIdLimit, + uint32_t committedDocIdLimit, + uint32_t compactTarget, uint32_t numUsedLids) +{ + EXPECT_TRUE(assertLidSpace(docIdLimit, committedDocIdLimit, numUsedLids, false, false, dms)); + dms.compactLidSpace(compactTarget); + EXPECT_TRUE(assertLidSpace(docIdLimit, compactTarget, numUsedLids, true, false, dms)); + dms.holdUnblockShrinkLidSpace(); + EXPECT_TRUE(assertLidSpace(docIdLimit, compactTarget, numUsedLids, true, true, dms)); +} + + +void +assertShrink(DocumentMetaStore &dms, uint32_t shrinkTarget, + uint32_t numUsedLids) +{ + dms.shrinkLidSpace(); + TEST_DO(EXPECT_TRUE(assertLidSpace(shrinkTarget, shrinkTarget, numUsedLids, false, false, dms))); +} + +} + + +TEST("requireThatSecondShrinkWorksAfterCompactAndInactiveInsert") +{ + DocumentMetaStore dms(createBucketDB()); + dms.constructFreeList(); + TEST_DO(addLid(dms, 1)); + TEST_DO(addLid(dms, 2)); + TEST_DO(addLid(dms, 3)); + removeLid(dms, 2); + removeLid(dms, 3); + EXPECT_TRUE(assertLidSpace(4, 4, 1, false, false, dms)); + TEST_DO(assertCompact(dms, 4, 4, 2, 1)); + TEST_DO(addLid(dms, 2)); + TEST_DO(assertShrink(dms, 3, 2)); + removeLid(dms, 2); + TEST_DO(assertCompact(dms, 3, 3, 2, 1)); + TEST_DO(assertShrink(dms, 2, 1)); +} + } TEST_MAIN() diff --git a/searchcore/src/tests/proton/flushengine/flushengine.cpp b/searchcore/src/tests/proton/flushengine/flushengine.cpp index 59b86671a0d..cb195a9cdc6 100644 --- a/searchcore/src/tests/proton/flushengine/flushengine.cpp +++ b/searchcore/src/tests/proton/flushengine/flushengine.cpp @@ -15,6 +15,7 @@ LOG_SETUP("flushengine_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/util/sync.h> +#include <vespa/vespalib/test/insertion_operators.h> #include <memory> // -------------------------------------------------------------------------------- @@ -75,6 +76,7 @@ public: search::SerialNum _oldestSerial; search::SerialNum _currentSerial; vespalib::CountDownLatch _done; + std::vector<search::SerialNum> _flushDoneHistory; public: typedef std::shared_ptr<SimpleHandler> SP; @@ -85,7 +87,8 @@ public: _targets(targets), _oldestSerial(0), _currentSerial(currentSerial), - _done(targets.size()) + _done(targets.size() + 1), + _flushDoneHistory() { // empty } @@ -112,12 +115,15 @@ public: LOG(info, "SimpleHandler(%s)::flushDone(%" PRIu64 ")", getName().c_str(), oldestSerial); _oldestSerial = std::max(_oldestSerial, oldestSerial); + _flushDoneHistory.push_back(oldestSerial); _done.countDown(); } }; class SimpleTask : public searchcorespi::FlushTask { + search::SerialNum &_flushedSerial; + search::SerialNum &_currentSerial; public: vespalib::Gate &_start; vespalib::Gate &_done; @@ -126,8 +132,11 @@ public: public: SimpleTask(vespalib::Gate &start, vespalib::Gate &done, - vespalib::Gate *proceed) - : _start(start), _done(done), _proceed(proceed) + vespalib::Gate *proceed, + search::SerialNum &flushedSerial, + search::SerialNum ¤tSerial) + : _flushedSerial(flushedSerial), _currentSerial(currentSerial), + _start(start), _done(done), _proceed(proceed) { // empty } @@ -137,6 +146,7 @@ public: if (_proceed != NULL) { _proceed->await(); } + _flushedSerial = _currentSerial; _done.countDown(); } @@ -150,6 +160,7 @@ public: class SimpleTarget : public test::DummyFlushTarget { public: search::SerialNum _flushedSerial; + search::SerialNum _currentSerial; vespalib::Gate _proceed; vespalib::Gate _initDone; vespalib::Gate _taskStart; @@ -162,6 +173,7 @@ public: SimpleTarget(Task::UP task, const std::string &name) : test::DummyFlushTarget(name), _flushedSerial(0), + _currentSerial(0), _proceed(), _initDone(), _taskStart(), @@ -177,7 +189,8 @@ public: _initDone(), _taskStart(), _taskDone(), - _task(new SimpleTask(_taskStart, _taskDone, &_proceed)) + _task(new SimpleTask(_taskStart, _taskDone, &_proceed, + _flushedSerial, _currentSerial)) { if (proceedImmediately) { _proceed.countDown(); @@ -190,8 +203,8 @@ public: virtual SerialNum getFlushedSerialNum() const override { - LOG(info, "SimpleTarget(%s)::getFlushedSerialNum()", - getName().c_str()); + LOG(info, "SimpleTarget(%s)::getFlushedSerialNum() = %" PRIu64, + getName().c_str(), _flushedSerial); return _flushedSerial; } @@ -200,6 +213,7 @@ public: { LOG(info, "SimpleTarget(%s)::initFlush(%" PRIu64 ")", getName().c_str(), currentSerial); + _currentSerial = currentSerial; _initDone.countDown(); return std::move(_task); } @@ -340,7 +354,7 @@ struct Fixture Fixture(uint32_t numThreads, uint32_t idleIntervalMS) : tlsStatsFactory(std::make_shared<SimpleTlsStatsFactory>()), strategy(std::make_shared<SimpleStrategy>()), - engine(tlsStatsFactory, strategy, numThreads, idleIntervalMS, false) + engine(tlsStatsFactory, strategy, numThreads, idleIntervalMS) { } }; @@ -398,7 +412,9 @@ TEST_F("require that oldest serial is found", Fixture(1, IINTERVAL)) f.engine.start(); EXPECT_TRUE(handler->_done.await(LONG_TIMEOUT)); - EXPECT_EQUAL(20ul, handler->_oldestSerial); + EXPECT_EQUAL(25ul, handler->_oldestSerial); + EXPECT_EQUAL(std::vector<search::SerialNum>({ 10, 20, 25 }), + handler->_flushDoneHistory); } TEST_F("require that oldest serial is found in group", Fixture(2, IINTERVAL)) @@ -423,9 +439,13 @@ TEST_F("require that oldest serial is found in group", Fixture(2, IINTERVAL)) f.engine.start(); EXPECT_TRUE(fooH->_done.await(LONG_TIMEOUT)); - EXPECT_EQUAL(20ul, fooH->_oldestSerial); + EXPECT_EQUAL(25ul, fooH->_oldestSerial); + EXPECT_EQUAL(std::vector<search::SerialNum>({ 10, 20, 25 }), + fooH->_flushDoneHistory); EXPECT_TRUE(barH->_done.await(LONG_TIMEOUT)); - EXPECT_EQUAL(15ul, barH->_oldestSerial); + EXPECT_EQUAL(20ul, barH->_oldestSerial); + EXPECT_EQUAL(std::vector<search::SerialNum>({ 5, 15, 20 }), + barH->_flushDoneHistory); } TEST_F("require that target can refuse flush", Fixture(2, IINTERVAL)) diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp index ac3dbb8fed2..b3fd9a050a8 100644 --- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp +++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp @@ -72,7 +72,7 @@ public: targetType, flushedSerial, approxDiskBytes); - _result.push_back(std::make_shared<FlushContext>(handler, target, 0, 0)); + _result.push_back(std::make_shared<FlushContext>(handler, target, 0)); return *this; } ContextsBuilder &add(const vespalib::string &handlerName, diff --git a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp index 2f4083228f9..6c235766de6 100644 --- a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp +++ b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp @@ -105,7 +105,7 @@ public: return *this; } ContextBuilder &add(const IFlushTarget::SP &target, SerialNum lastSerial = 0) { - FlushContext::SP ctx(new FlushContext(_handler, target, 0, lastSerial)); + FlushContext::SP ctx(new FlushContext(_handler, target, lastSerial)); return add(ctx); } const FlushContext::List &list() const { return _list; } @@ -282,22 +282,22 @@ requireThatWeCanOrderByTlsSize() (handler1, createTargetT("t2", TimeStamp(now.val() - 10 * TimeStamp::SEC), 1900), - 2000, 2000)). + 2000)). add(std::make_shared<FlushContext> (handler2, createTargetT("t1", TimeStamp(now.val() - 5 * TimeStamp::SEC), 1000), - 2000, 2000)). + 2000)). add(std::make_shared<FlushContext> (handler1, createTargetT("t4", TimeStamp(), 1000), - 2000, 2000)). + 2000)). add(std::make_shared<FlushContext> (handler2, createTargetT("t3", TimeStamp(now.val() - 15 * TimeStamp::SEC), 1900), - 2000, 2000)); + 2000)); { // sum of tls sizes above limit, trigger sort order based on tls size MemoryFlush flush({1000, 3 * gibi, 1.0, 1000, 1.0, 2000, TimeStamp(2 * TimeStamp::SEC)}, start); EXPECT_TRUE(assertOrder(StringList().add("t4").add("t1").add("t2").add("t3"), diff --git a/searchcore/src/vespa/searchcore/common/OWNERS b/searchcore/src/vespa/searchcore/common/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchcore/src/vespa/searchcore/common/OWNERS +++ b/searchcore/src/vespa/searchcore/common/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index b55f29ff810..89e15952a42 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -57,26 +57,26 @@ flush.idleinterval double default=10.0 restart flush.strategy enum {SIMPLE, MEMORY} default=MEMORY restart ## Total number of bytes allowed before forcing flush. -flush.memory.maxmemory long default=4294967296 restart +flush.memory.maxmemory long default=4294967296 ## Maximum total disk bloat factor before forcing flush. -flush.memory.diskbloatfactor double default=0.2 restart +flush.memory.diskbloatfactor double default=0.2 ## Max disk usage (in bytes) for all transaction logs before forcing flush. -flush.memory.maxtlssize long default=21474836480 restart +flush.memory.maxtlssize long default=21474836480 ## Number of bytes allowed per component before forcing memory prioritization. -flush.memory.each.maxmemory long default=1073741824 restart +flush.memory.each.maxmemory long default=1073741824 ## Maximum disk bloat factor per component before forcing flush. -flush.memory.each.diskbloatfactor double default=0.2 restart +flush.memory.each.diskbloatfactor double default=0.2 ## Age of unflushed content before forcing age prioritization. ## Unit is seconds with 1 day being the default. -flush.memory.maxage.time double default=86400.0 restart +flush.memory.maxage.time double default=86400.0 ## Max diff in serial number allowed before that takes precedence. -flush.memory.maxage.serial long default=1000000 restart +flush.memory.maxage.serial long default=1000000 ## The cost of doing replay when replaying the transaction log. ## @@ -86,7 +86,7 @@ flush.memory.maxage.serial long default=1000000 restart ## The prepare for restart flush strategy will choose a set of components to flush ## such that the cost of flushing these + the cost of replaying the transaction log ## is as low as possible. -flush.preparerestart.replaycost double default=4.0 restart +flush.preparerestart.replaycost double default=4.0 ## The cost of doing writes when flushing components to disk. ## @@ -96,7 +96,7 @@ flush.preparerestart.replaycost double default=4.0 restart ## The prepare for restart flush strategy will choose a set of components to flush ## such that the cost of flushing these + the cost of replaying the transaction log ## is as low as possible. -flush.preparerestart.writecost double default=1.0 restart +flush.preparerestart.writecost double default=1.0 ## Control io options during write both under dump and fusion. indexing.write.io enum {NORMAL, OSYNC, DIRECTIO} default=DIRECTIO restart diff --git a/searchcore/src/vespa/searchcore/fdispatch/OWNERS b/searchcore/src/vespa/searchcore/fdispatch/OWNERS index 3e9fc8ab356..f4d47806ed9 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/OWNERS +++ b/searchcore/src/vespa/searchcore/fdispatch/OWNERS @@ -1,2 +1,2 @@ -balder -tegge +baldersheim +toregge diff --git a/searchcore/src/vespa/searchcore/grouping/OWNERS b/searchcore/src/vespa/searchcore/grouping/OWNERS index 9bbc3a73836..a59a5ddcdbf 100644 --- a/searchcore/src/vespa/searchcore/grouping/OWNERS +++ b/searchcore/src/vespa/searchcore/grouping/OWNERS @@ -1,2 +1,2 @@ -balder +baldersheim havardpe diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/OWNERS b/searchcore/src/vespa/searchcore/proton/documentmetastore/OWNERS index 7c03446a5d4..614d678c95e 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/OWNERS +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/OWNERS @@ -1,2 +1,2 @@ geirst -tegge +toregge diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp index 7b66a4b0105..ea26ef20788 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp @@ -178,9 +178,8 @@ DocumentMetaStore::insert(DocId lid, metaData.getBucketId().stripUnused(), metaData.getTimestamp(), _subDbType); - if (state.isActive()) { - _lidAlloc.markAsActive(lid); - } + _lidAlloc.updateActiveLids(lid, state.isActive()); + _lidAlloc.commitActiveLids(); updateCommittedDocIdLimit(); return true; } diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp index 2e22b14eccc..244fb940f13 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp @@ -90,16 +90,6 @@ LidAllocator::ensureSpace(DocId lid, } void -LidAllocator::markAsActive(DocId lid) -{ - if (_activeLids.get(lid) == 0) { - ++_numActiveLids; - } - _activeLids.update(lid, 1); - _activeLids.commit(); -} - -void LidAllocator::unregisterLid(DocId lid) { assert(!_pendingHoldLids.testBit(lid)); diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h index 0922f9d4edd..836d4c12cbb 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h @@ -45,7 +45,6 @@ public: uint32_t newSize, uint32_t newCapacity); void registerLid(DocId lid) { _usedLids.setBit(lid); } - void markAsActive(DocId lid); void unregisterLid(DocId lid); size_t getUsedLidsSize() const; void trimHoldLists(generation_t firstUsed); diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS b/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS +++ b/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.cpp index 7f436a8d594..1624bc3b51c 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.cpp +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.cpp @@ -10,13 +10,11 @@ namespace proton { FlushContext::FlushContext( const IFlushHandler::SP &handler, const IFlushTarget::SP &target, - search::SerialNum oldestFlushable, search::SerialNum lastSerial) : _name(createName(*handler, *target)), _handler(handler), _target(target), _task(), - _oldestFlushable(oldestFlushable), _lastSerial(lastSerial) { // empty diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h index 9f2b557b3a9..837a99f153e 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h @@ -19,7 +19,6 @@ private: IFlushHandler::SP _handler; IFlushTarget::SP _target; searchcorespi::FlushTask::UP _task; - search::SerialNum _oldestFlushable; search::SerialNum _lastSerial; public: @@ -43,7 +42,6 @@ public: */ FlushContext(const IFlushHandler::SP &handler, const IFlushTarget::SP &target, - search::SerialNum oldestFlushable, search::SerialNum lastSerial); /** @@ -83,13 +81,6 @@ public: const IFlushTarget::SP & getTarget() const { return _target; } /** - * Returns the oldest flushable serial number. - * - * @return The oldest flushable serial number - */ - search::SerialNum getOldestFlushable() const { return _oldestFlushable; } - - /** * Returns the last serial number. * * @return The last serial number diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp index b1a2e23fca0..f3013b4e5de 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp @@ -22,16 +22,13 @@ namespace { search::SerialNum findOldestFlushedSerial(const IFlushTarget::List &lst, - const IFlushHandler &handler, - const IFlushTarget *self) + const IFlushHandler &handler) { search::SerialNum ret(handler.getCurrentSerialNumber()); for (const IFlushTarget::SP & target : lst) { - if (self != target.get()) { - ret = std::min(ret, target->getFlushedSerialNum()); - } + ret = std::min(ret, target->getFlushedSerialNum()); } - LOG(debug, "Oldest flushed serial for '%s' will be %" PRIu64 " after flush.", handler.getName().c_str(), ret); + LOG(debug, "Oldest flushed serial for '%s' is %" PRIu64 ".", handler.getName().c_str(), ret); return ret; } @@ -55,11 +52,10 @@ FlushEngine::FlushInfo::FlushInfo(uint32_t taskId, FlushEngine::FlushEngine(std::shared_ptr<flushengine::ITlsStatsFactory> tlsStatsFactory, IFlushStrategy::SP strategy, uint32_t numThreads, - uint32_t idleIntervalMS, bool enableAutoPrune) + uint32_t idleIntervalMS) : _closed(false), _maxConcurrent(numThreads), _idleIntervalMS(idleIntervalMS), - _enableAutoPrune(enableAutoPrune), _taskId(0), _threadPool(128 * 1024), _strategy(strategy), @@ -70,7 +66,8 @@ FlushEngine::FlushEngine(std::shared_ptr<flushengine::ITlsStatsFactory> _flushing(), _strategyLock(), _strategyMonitor(), - _tlsStatsFactory(tlsStatsFactory) + _tlsStatsFactory(tlsStatsFactory), + _pendingPrune() { // empty } @@ -128,10 +125,10 @@ bool FlushEngine::wait(size_t minimumWaitTimeIfReady) { MonitorGuard guard(_monitor); - if ( (minimumWaitTimeIfReady > 0) && canFlushMore(guard)) { + if ( (minimumWaitTimeIfReady > 0) && canFlushMore(guard) && _pendingPrune.empty()) { guard.wait(minimumWaitTimeIfReady); } - while ( ! canFlushMore(guard) ) { + while ( ! canFlushMore(guard) && _pendingPrune.empty()) { guard.wait(1000); // broadcast when flush done } return !_closed; @@ -146,6 +143,9 @@ FlushEngine::Run(FastOS_ThreadInterface *thread, void *arg) vespalib::string prevFlushName; while (wait(shouldIdle ? _idleIntervalMS : 0)) { shouldIdle = false; + if (prune()) { + continue; // Prune attempted on one or more handlers + } prevFlushName = flushNextTarget(prevFlushName); if ( ! prevFlushName.empty()) { // Sleep at least 10 ms after a successful flush in order to avoid busy loop in case @@ -154,23 +154,26 @@ FlushEngine::Run(FastOS_ThreadInterface *thread, void *arg) } else { shouldIdle = true; } - if (_enableAutoPrune) { - prune(); - } LOG(debug, "Making another wait(idle=%s, timeMS=%d) last was '%s'", shouldIdle ? "true" : "false", shouldIdle ? _idleIntervalMS : 0, prevFlushName.c_str()); } } -void FlushEngine::prune() +bool +FlushEngine::prune() { - if (_flushing.empty()) { + std::set<IFlushHandler::SP> toPrune; + { MonitorGuard guard(_monitor); - for (const auto & it : _handlers) { - IFlushHandler & handler(*it.second); - IFlushTarget::List lst = handler.getFlushTargets(); - handler.flushDone(findOldestFlushedSerial(lst, handler, NULL)); + if (_pendingPrune.empty()) { + return false; } + _pendingPrune.swap(toPrune); } + for (const auto &handler : toPrune) { + IFlushTarget::List lst = handler->getFlushTargets(); + handler->flushDone(findOldestFlushedSerial(lst, *handler)); + } + return true; } bool FlushEngine::isFlushing(const MonitorGuard & guard, const vespalib::string & name) const @@ -201,7 +204,6 @@ FlushEngine::getTargetList(bool includeFlushingTargets) const if (!isFlushing(guard, FlushContext::createName(handler, *target)) || includeFlushingTargets) { ret.push_back(FlushContext::SP(new FlushContext(it.second, IFlushTarget::SP(new CachedFlushTarget(target)), - findOldestFlushedSerial(lst, handler, target.get()), serial))); } else { LOG(debug, "Target '%s' with flushedSerialNum = %ld already has a flush going. Local last serial = %ld.", @@ -263,7 +265,7 @@ FlushEngine::flushAll(const FlushContext::List &lst) ctx->getName().c_str(), ctx->getTarget()->getFlushedSerialNum() + 1, ctx->getHandler()->getCurrentSerialNumber()); - _executor.execute(Task::UP(new FlushTask(initFlush(*ctx), *this, ctx, ctx->getOldestFlushable()))); + _executor.execute(Task::UP(new FlushTask(initFlush(*ctx), *this, ctx))); } else { LOG(debug, "Target '%s' failed to initiate flush of transactions %" PRIu64 " through %" PRIu64 ".", ctx->getName().c_str(), @@ -303,7 +305,7 @@ FlushEngine::flushNextTarget(const vespalib::string & name) name.c_str(), lst.first.size()); FastOS_Thread::Sleep(1000); } - _executor.execute(Task::UP(new FlushTask(initFlush(*ctx), *this, ctx, ctx->getOldestFlushable()))); + _executor.execute(Task::UP(new FlushTask(initFlush(*ctx), *this, ctx))); return ctx->getName(); } @@ -340,6 +342,8 @@ FlushEngine::flushDone(const FlushContext &ctx, uint32_t taskId) LOG(debug, "FlushEngine::flushDone(taskId='%d') took '%f' secs", taskId, duration.sec()); MonitorGuard guard(_monitor); _flushing.erase(taskId); + assert(ctx.getHandler()); + _pendingPrune.insert(ctx.getHandler()); guard.broadcast(); } @@ -348,7 +352,12 @@ FlushEngine::putFlushHandler(const DocTypeName &docTypeName, const IFlushHandler::SP &flushHandler) { MonitorGuard guard(_monitor); - return _handlers.putHandler(docTypeName, flushHandler); + IFlushHandler::SP result(_handlers.putHandler(docTypeName, flushHandler)); + if (result) { + _pendingPrune.erase(result); + } + _pendingPrune.insert(flushHandler); + return std::move(result); } IFlushHandler::SP @@ -362,7 +371,9 @@ IFlushHandler::SP FlushEngine::removeFlushHandler(const DocTypeName &docTypeName) { MonitorGuard guard(_monitor); - return _handlers.removeHandler(docTypeName); + IFlushHandler::SP result(_handlers.removeHandler(docTypeName)); + _pendingPrune.erase(result); + return std::move(result); } FlushEngine::FlushMetaSet @@ -395,6 +406,7 @@ FlushEngine::initFlush(const IFlushHandler::SP &handler, const IFlushTarget::SP void FlushEngine::setStrategy(IFlushStrategy::SP strategy) { + vespalib::LockGuard strategyLock(_strategyLock); MonitorGuard strategyGuard(_strategyMonitor); if (_closed) { return; diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h index 215a8ac8de5..d8d77c11b8f 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h @@ -49,7 +49,6 @@ private: bool _closed; const uint32_t _maxConcurrent; const uint32_t _idleIntervalMS; - const bool _enableAutoPrune; uint32_t _taskId; FastOS_ThreadPool _threadPool; IFlushStrategy::SP _strategy; @@ -61,13 +60,14 @@ private: vespalib::Lock _strategyLock; // serialize setStrategy calls vespalib::Monitor _strategyMonitor; std::shared_ptr<flushengine::ITlsStatsFactory> _tlsStatsFactory; + std::set<IFlushHandler::SP> _pendingPrune; FlushContext::List getTargetList(bool includeFlushingTargets) const; std::pair<FlushContext::List,bool> getSortedTargetList(vespalib::MonitorGuard &strategyGuard) const; FlushContext::SP initNextFlush(const FlushContext::List &lst); vespalib::string flushNextTarget(const vespalib::string & name); void flushAll(const FlushContext::List &lst); - void prune(); + bool prune(); uint32_t initFlush(const FlushContext &ctx); uint32_t initFlush(const IFlushHandler::SP &handler, const IFlushTarget::SP &target); void flushDone(const FlushContext &ctx, uint32_t taskId); @@ -93,15 +93,10 @@ public: * @param strategy The flushing strategy to use. * @param numThreads The number of worker threads to use. * @param idleInterval The interval between when flushes are checked whne there are no one progressing. - * @param enableAutoPrune Indicate if pruning shall be done even if there - are no flushing happening. Turn off for some tests. - Needed for pruning to be correct if one flush is started - while another is in progress. In that case the pruning - will be too conservative. */ FlushEngine(std::shared_ptr<flushengine::ITlsStatsFactory> tlsStatsFactory, - IFlushStrategy::SP strategy, uint32_t numThreads, uint32_t idleIntervalMS, bool enableAutoPrune); + IFlushStrategy::SP strategy, uint32_t numThreads, uint32_t idleIntervalMS); /** * Destructor. Waits for all pending tasks to complete. diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp index fc692979753..8af59d3079f 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp @@ -9,12 +9,10 @@ namespace proton { FlushTask::FlushTask(uint32_t taskId, FlushEngine &engine, - const FlushContext::SP &ctx, - search::SerialNum serial) + const FlushContext::SP &ctx) : _taskId(taskId), _engine(engine), - _context(ctx), - _serial(serial) + _context(ctx) { LOG_ASSERT(_context.get() != NULL); } @@ -34,7 +32,6 @@ FlushTask::run() } task->run(); task.reset(); - _context->getHandler()->flushDone(_serial); } } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h index fd27538ca4b..c10fb740410 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h @@ -25,13 +25,10 @@ public: * @param taskId The identifier used by IFlushStrategy. * @param engine The running flush engine. * @param ctx The context of the flush to perform. - * @param serial The oldest unflushed serial available in the handler once - * this task has been run. */ FlushTask(uint32_t taskId, FlushEngine &engine, - const FlushContext::SP &ctx, - search::SerialNum serial); + const FlushContext::SP &ctx); /** * Destructor. Notifies the engine that the flush is done to prevent the diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h b/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h index 6912cbfde13..2d3eddf7af9 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h @@ -76,9 +76,10 @@ public: * up to the given serial number can be pruned from the domain of this * handler. This method is called by an arbitrary worker thread. * - * @param oldestSerial The oldest transaction that is still in use. + * @param flushedSerial Serial number flushed for all flush + * targets belonging to this handler. */ - virtual void flushDone(SerialNum oldestSerial) = 0; + virtual void flushDone(SerialNum flushedSerial) = 0; /* * This method is called to sync tls to stable media, up to and diff --git a/searchcore/src/vespa/searchcore/proton/index/OWNERS b/searchcore/src/vespa/searchcore/proton/index/OWNERS index 64735d11d93..1708c0d4695 100644 --- a/searchcore/src/vespa/searchcore/proton/index/OWNERS +++ b/searchcore/src/vespa/searchcore/proton/index/OWNERS @@ -1 +1 @@ -tegge +toregge diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp index 606312fcae2..06a20e8da78 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp +++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp @@ -12,14 +12,16 @@ TransLogServerMetrics::DomainMetrics::DomainMetrics(metrics::MetricSet *parent, const vespalib::string &documentType) : metrics::MetricSet("transactionlog", {{"documenttype", documentType}}, "Transaction log metrics for a document type", parent), - entries("entries", "", "The current number of entries in the transaction log", this) + entries("entries", "", "The current number of entries in the transaction log", this), + diskUsage("disk_usage", "", "The disk usage (in bytes) of the transaction log", this) { } void TransLogServerMetrics::DomainMetrics::update(const DomainInfo &stats) { - entries.set(stats.count); + entries.set(stats.numEntries); + diskUsage.set(stats.byteSize); } void diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h index 0d52f6cf0d1..4a7241bbef7 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h @@ -16,6 +16,7 @@ public: struct DomainMetrics : public metrics::MetricSet { metrics::LongValueMetric entries; + metrics::LongValueMetric diskUsage; typedef std::unique_ptr<DomainMetrics> UP; DomainMetrics(metrics::MetricSet *parent, const vespalib::string &documentType); diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/OWNERS b/searchcore/src/vespa/searchcore/proton/reprocessing/OWNERS index 7c03446a5d4..614d678c95e 100644 --- a/searchcore/src/vespa/searchcore/proton/reprocessing/OWNERS +++ b/searchcore/src/vespa/searchcore/proton/reprocessing/OWNERS @@ -1,2 +1,2 @@ geirst -tegge +toregge diff --git a/searchcore/src/vespa/searchcore/proton/server/OWNERS b/searchcore/src/vespa/searchcore/proton/server/OWNERS index 7c03446a5d4..614d678c95e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/OWNERS +++ b/searchcore/src/vespa/searchcore/proton/server/OWNERS @@ -1,2 +1,2 @@ geirst -tegge +toregge diff --git a/searchcore/src/vespa/searchcore/proton/server/configstore.h b/searchcore/src/vespa/searchcore/proton/server/configstore.h index ee6352d61d5..38d0dcfe7bd 100644 --- a/searchcore/src/vespa/searchcore/proton/server/configstore.h +++ b/searchcore/src/vespa/searchcore/proton/server/configstore.h @@ -33,6 +33,12 @@ struct ConfigStore : FeedConfigStore { SerialNum serialNum) = 0; virtual void removeInvalid() = 0; + /** + * Perform prune after everything up to and including serialNum has been + * flushed to stable storage. + * + * @param serialNum The serial number flushed to stable storage. + */ virtual void prune(SerialNum serialNum) = 0; virtual SerialNum getBestSerialNum() const = 0; diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp index eaa166afe9c..fb5e426933a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp @@ -648,13 +648,13 @@ DocumentDB::onTransactionLogReplayDone() void -DocumentDB::onPerformPrune(SerialNum oldestSerial) +DocumentDB::onPerformPrune(SerialNum flushedSerial) { if (!getAllowPrune()) { assert(_state.getClosed()); return; } - _config_store->prune(oldestSerial); + _config_store->prune(flushedSerial); } @@ -760,9 +760,9 @@ DocumentDB::getFlushTargets() } void -DocumentDB::flushDone(SerialNum oldestSerial) +DocumentDB::flushDone(SerialNum flushedSerial) { - _feedHandler.flushDone(oldestSerial); + _feedHandler.flushDone(flushedSerial); } void diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h index 0c49c2c0170..ebfede59497 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h @@ -201,7 +201,7 @@ private: * Implements FeedHandler::IOwner */ virtual void onTransactionLogReplayDone() __attribute__((noinline)); - virtual void onPerformPrune(SerialNum oldestSerial); + virtual void onPerformPrune(SerialNum flushedSerial); virtual bool isFeedBlockedByRejectedConfig(); /** @@ -391,7 +391,7 @@ public: getDocsums(const search::engine::DocsumRequest & request); IFlushTarget::List getFlushTargets(); - void flushDone(SerialNum oldestSerial); + void flushDone(SerialNum flushedSerial); virtual SerialNum getCurrentSerialNumber() const diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp index 61e2a83bd37..6b7eadb2cb8 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp @@ -432,32 +432,32 @@ FeedHandler::performEof() void -FeedHandler::performFlushDone(SerialNum oldestSerial) +FeedHandler::performFlushDone(SerialNum flushedSerial) { assert(_writeService.master().isCurrentThread()); - // XXX: oldestSerial can go backwards when attribute vectors are + // XXX: flushedSerial can go backwards when attribute vectors are // resurrected. This can be avoided if resurrected attribute vectors // pretends to have been flushed at resurrect time. - if (oldestSerial <= _prunedSerialNum) { + if (flushedSerial <= _prunedSerialNum) { return; // Cannot unprune. } if (!_owner.getAllowPrune()) { - _prunedSerialNum = oldestSerial; + _prunedSerialNum = flushedSerial; _delayedPrune = true; return; } _delayedPrune = false; - performPrune(oldestSerial); + performPrune(flushedSerial); } void -FeedHandler::performPrune(SerialNum oldestSerial) +FeedHandler::performPrune(SerialNum flushedSerial) { try { - tlsPrune(oldestSerial); // throws on error - LOG(debug, "Pruned TLS to token %" PRIu64 ".", oldestSerial); - _owner.onPerformPrune(oldestSerial); + tlsPrune(flushedSerial); // throws on error + LOG(debug, "Pruned TLS to token %" PRIu64 ".", flushedSerial); + _owner.onPerformPrune(flushedSerial); } catch (const vespalib::IllegalStateException & e) { LOG(warning, "FeedHandler::performPrune failed due to '%s'.", e.what()); } @@ -606,7 +606,7 @@ FeedHandler::replayTransactionLog(SerialNum flushedIndexMgrSerial, void -FeedHandler::flushDone(SerialNum oldestSerial) +FeedHandler::flushDone(SerialNum flushedSerial) { // Called by flush worker thread after performing a flush task _writeService.master().execute( @@ -614,7 +614,7 @@ FeedHandler::flushDone(SerialNum oldestSerial) makeClosure( this, &FeedHandler::performFlushDone, - oldestSerial))); + flushedSerial))); } void FeedHandler::changeToNormalFeedState(void) { diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h index 536013e0d02..a1bf80181db 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h @@ -62,7 +62,7 @@ public: virtual void performWipeHistory() = 0; virtual void onTransactionLogReplayDone() = 0; virtual void enterRedoReprocessState() = 0; - virtual void onPerformPrune(SerialNum oldestSerial) = 0; + virtual void onPerformPrune(SerialNum flushedSerial) = 0; virtual bool isFeedBlockedByRejectedConfig() = 0; virtual bool getAllowPrune() const = 0; }; @@ -153,10 +153,10 @@ private: * Used when flushing is done */ void - performFlushDone(SerialNum oldestSerial); + performFlushDone(SerialNum flushedSerial); void - performPrune(SerialNum oldestSerial); + performPrune(SerialNum flushedSerial); public: void @@ -240,10 +240,10 @@ public: /** * Called when a flush is done and allows pruning of the transaction log. * - * @param oldestSerial The oldest serial number that is still in use. + * @param flushedSerial serial number flushed for all relevant flush targets. */ void - flushDone(SerialNum oldestSerial); + flushDone(SerialNum flushedSerial); /** * Used to flip between normal and recovery feed states. diff --git a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp index 7736161ddbc..5599b245655 100644 --- a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp @@ -36,9 +36,9 @@ FlushHandlerProxy::getCurrentSerialNumber(void) const void -FlushHandlerProxy::flushDone(SerialNum oldestSerial) +FlushHandlerProxy::flushDone(SerialNum flushedSerial) { - _documentDB->flushDone(oldestSerial); + _documentDB->flushDone(flushedSerial); } diff --git a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.h b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.h index 7e4cd1f3176..9f27c29c2bb 100644 --- a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.h +++ b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.h @@ -28,7 +28,7 @@ public: getCurrentSerialNumber(void) const; virtual void - flushDone(SerialNum oldestSerial); + flushDone(SerialNum flushedSerial); virtual void syncTls(SerialNum syncTo); diff --git a/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp b/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp index 2f26c1a2601..bbf803adfe4 100644 --- a/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp @@ -83,13 +83,7 @@ MemoryFlush::Config::Config(uint64_t maxGlobalMemory_in, MemoryFlush::MemoryFlush(const Config &config, fastos::TimeStamp startTime) : _lock(), - _globalMaxMemory(config.maxGlobalMemory), - _maxGlobalTlsSize(config.maxGlobalTlsSize), - _globalDiskBloatFactor(config.globalDiskBloatFactor), - _maxMemoryGain(config.maxMemoryGain), - _diskBloatFactor(config.diskBloatFactor), - _maxSerialGain(config.maxSerialGain), - _maxTimeGain(config.maxTimeGain), + _config(config), _startTime(startTime) { } @@ -101,6 +95,18 @@ MemoryFlush::MemoryFlush() // empty } +MemoryFlush::Config MemoryFlush::getConfig() const +{ + vespalib::LockGuard guard(_lock); + return _config; +} + +void MemoryFlush::setConfig(const Config &config) +{ + vespalib::LockGuard guard(_lock); + _config = config; +} + FlushContext::List MemoryFlush::getFlushTargets(const FlushContext::List &targetList, const flushengine::TlsStatsMap & @@ -110,13 +116,16 @@ MemoryFlush::getFlushTargets(const FlushContext::List &targetList, uint64_t totalMemory(0); IFlushTarget::DiskGain totalDisk; uint64_t totalTlsSize(0); + const Config config(getConfig()); vespalib::hash_set<const void *> visitedHandlers; fastos::TimeStamp now(fastos::ClockSystem::now()); LOG(debug, "getFlushTargets(): globalMaxMemory(%" PRIu64 "), globalDiskBloatFactor(%f), " "maxMemoryGain(%" PRIu64 "), diskBloatFactor(%f), maxSerialGain(%" PRIu64 "), maxTimeGain(%f), startTime(%f)", - _globalMaxMemory, _globalDiskBloatFactor, _maxMemoryGain, _diskBloatFactor, - _maxSerialGain, _maxTimeGain.sec(), _startTime.sec()); + config.maxGlobalMemory, config.globalDiskBloatFactor, + config.maxMemoryGain, config.diskBloatFactor, + config.maxSerialGain, config.maxTimeGain.sec(), + _startTime.sec()); for (size_t i(0), m(targetList.size()); i < m; i++) { const IFlushTarget & target(*targetList[i]->getTarget()); const IFlushHandler & handler(*targetList[i]->getHandler()); @@ -133,26 +142,26 @@ MemoryFlush::getFlushTargets(const FlushContext::List &targetList, tlsStatsMap.getTlsStats(handler.getName()); if (visitedHandlers.insert(&handler).second) { totalTlsSize += tlsStats.getNumBytes(); - if ((totalTlsSize > _maxGlobalTlsSize) && (order < TLSSIZE)) { + if ((totalTlsSize > config.maxGlobalTlsSize) && (order < TLSSIZE)) { order = TLSSIZE; } } - if (((totalMemory >= _globalMaxMemory) || - (mgain >= _maxMemoryGain)) && (order < MEMORY)) { + if (((totalMemory >= config.maxGlobalMemory) || + (mgain >= config.maxMemoryGain)) && (order < MEMORY)) { order = MEMORY; } else if (((totalDisk.gain() > - _globalDiskBloatFactor * std::max(100000000l, + config.globalDiskBloatFactor * std::max(100000000l, std::max(totalDisk.getBefore(), totalDisk.getAfter()))) - || dgain.gain() > _diskBloatFactor * + || dgain.gain() > config.diskBloatFactor * std::max(10000000l, std::max(dgain.getBefore(), dgain.getAfter()))) && (order < DISKBLOAT) ) { order = DISKBLOAT; - } else if ((serialDiff >= _maxSerialGain) && (order < MAXSERIAL)) { + } else if ((serialDiff >= config.maxSerialGain) && (order < MAXSERIAL)) { order = MAXSERIAL; - } else if ((timeDiff >= _maxTimeGain) && (order < MAXAGE)) { + } else if ((timeDiff >= config.maxTimeGain) && (order < MAXAGE)) { order = MAXAGE; } LOG(debug, diff --git a/searchcore/src/vespa/searchcore/proton/server/memoryflush.h b/searchcore/src/vespa/searchcore/proton/server/memoryflush.h index cb0c84b6364..165ba4de70e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/memoryflush.h +++ b/searchcore/src/vespa/searchcore/proton/server/memoryflush.h @@ -15,12 +15,21 @@ class MemoryFlush : public boost::noncopyable, public: struct Config { + /// Global maxMemory uint64_t maxGlobalMemory; + /// Maximum global tls size. uint64_t maxGlobalTlsSize; + /// Maximum global disk bloat factor. When this limit is reached + /// flush is forced. double globalDiskBloatFactor; + /// Maximum memory saved. When this limit is reached flush is forced. int64_t maxMemoryGain; + /// Maximum disk bloat factor. When this limit is reached + /// flush is forced. double diskBloatFactor; + /// Maximum count of what a target can have outstanding in the TLS. int64_t maxSerialGain; + /// Maximum age of unflushed data. fastos::TimeStamp maxTimeGain; Config(); Config(uint64_t maxGlobalMemory_in, @@ -35,21 +44,7 @@ public: private: /// Needed as flushDone is called in different context from the rest vespalib::Lock _lock; - /// Global maxMemory - uint64_t _globalMaxMemory; - /// Maximum global tls size. - uint64_t _maxGlobalTlsSize; - /// Maximum global disk bloat factor. When this limit is reached - /// flush is forced. - double _globalDiskBloatFactor; - /// Maximum memory saved. When this limit is reached flush is forced. - int64_t _maxMemoryGain; - /// Maximum disk bloat factor. When this limit is reached flush is forced. - double _diskBloatFactor; - /// Maximum count of what a target can have outstanding in the TLS. - int64_t _maxSerialGain; - /// Maximum age of unflushed data. - fastos::TimeStamp _maxTimeGain; + Config _config; /// The time when the strategy was started. fastos::TimeStamp _startTime; @@ -73,6 +68,8 @@ private: const flushengine::TlsStatsMap &_tlsStatsMap; }; + Config getConfig() const; + public: MemoryFlush(); @@ -84,6 +81,8 @@ public: getFlushTargets(const FlushContext::List &targetList, const flushengine::TlsStatsMap & tlsStatsMap) const override; + + void setConfig(const Config &config); }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index 60c54bf1ef3..2750515661f 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -89,10 +89,41 @@ diskMemUsageSamplerConfig(const ProtonConfig &proton) proton.writefilter.sampleinterval); } +static constexpr size_t TOTAL_HARD_MEMORY_LIMIT=16*1024*1024*1024ul; +static constexpr size_t EACH_HARD_MEMORY_LIMIT=12*1024*1024*1024ul; + +MemoryFlush::Config +memoryFlushConfig(const ProtonConfig::Flush &flush) +{ + size_t totalMaxMemory = flush.memory.maxmemory; + if (totalMaxMemory > TOTAL_HARD_MEMORY_LIMIT) { + LOG(warning, "flush.memory.maxmemory=%ld can not" + " be set above the hard limit of %ld so we cap it", + flush.memory.maxmemory, + TOTAL_HARD_MEMORY_LIMIT); + totalMaxMemory = TOTAL_HARD_MEMORY_LIMIT; + } + size_t eachMaxMemory = flush.memory.each.maxmemory; + if (eachMaxMemory > EACH_HARD_MEMORY_LIMIT) { + LOG(warning, "flush.memory.each.maxmemory=%ld can not" + " be set above the hard limit of %ld so we cap it", + flush.memory.maxmemory, + EACH_HARD_MEMORY_LIMIT); + eachMaxMemory = EACH_HARD_MEMORY_LIMIT; + } + return MemoryFlush::Config(totalMaxMemory, + flush.memory.maxtlssize, + flush.memory.diskbloatfactor, + eachMaxMemory, + flush.memory.each.diskbloatfactor, + flush.memory.maxage.serial, + static_cast<long> + (flush.memory.maxage.time) * + fastos::TimeStamp::NANO); +} + } -static const size_t TOTAL_HARD_MEMORY_LIMIT=16*1024*1024*1024ul; -static const size_t EACH_HARD_MEMORY_LIMIT=12*1024*1024*1024ul; static const vespalib::string CUSTOM_COMPONENT_API_PATH = "/state/v1/custom/component"; Proton::ProtonFileHeaderContext::ProtonFileHeaderContext(const Proton &proton_, @@ -262,34 +293,9 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) IFlushStrategy::SP strategy; const ProtonConfig::Flush & flush(protonConfig.flush); switch (flush.strategy) { - case ProtonConfig::Flush::MEMORY: { - size_t totalMaxMemory = flush.memory.maxmemory; - if (totalMaxMemory > TOTAL_HARD_MEMORY_LIMIT) { - LOG(warning, "flush.memory.maxmemory=%ld can not" - " be set above the hard limit of %ld so we cap it", - flush.memory.maxmemory, - TOTAL_HARD_MEMORY_LIMIT); - totalMaxMemory = TOTAL_HARD_MEMORY_LIMIT; - } - size_t eachMaxMemory = flush.memory.each.maxmemory; - if (eachMaxMemory > EACH_HARD_MEMORY_LIMIT) { - LOG(warning, "flush.memory.each.maxmemory=%ld can not" - " be set above the hard limit of %ld so we cap it", - flush.memory.maxmemory, - EACH_HARD_MEMORY_LIMIT); - eachMaxMemory = EACH_HARD_MEMORY_LIMIT; - } + case ProtonConfig::Flush::MEMORY: strategy = std::make_shared<MemoryFlush>( - MemoryFlush::Config(totalMaxMemory, - flush.memory.maxtlssize, - flush.memory.diskbloatfactor, - eachMaxMemory, - flush.memory.each.diskbloatfactor, - flush.memory.maxage.serial, - static_cast<long> - (flush.memory.maxage.time) * - fastos::TimeStamp::NANO)); - } + memoryFlushConfig(flush)); break; case ProtonConfig::Flush::SIMPLE: default: @@ -299,8 +305,9 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) vespalib::mkdir(protonConfig.basedir + "/documents", true); vespalib::chdir(protonConfig.basedir); _tls->start(); + _strategy = strategy; _flushEngine.reset(new FlushEngine(std::make_shared<flushengine::TlsStatsFactory>(_tls->getTransLogServer()), - strategy, flush.maxconcurrent, flush.idleinterval*1000, true)); + strategy, flush.maxconcurrent, flush.idleinterval*1000)); _fs4Server.reset(new TransportServer(*_matchEngine, *_summaryEngine, *this, protonConfig.ptport, TransportServer::DEBUG_ALL)); _fs4Server->setTCPNoDelay(true); _metricsEngine->addExternalMetrics(_fs4Server->getMetrics()); @@ -538,6 +545,12 @@ Proton::applyConfig(const BootstrapConfig::SP & configSnapshot, configSnapshot->getGeneration())); _diskMemUsageSampler-> setConfig(diskMemUsageSamplerConfig(protonConfig)); + std::shared_ptr<MemoryFlush> memoryFlushStrategy = + std::dynamic_pointer_cast<MemoryFlush>(_strategy); + if (memoryFlushStrategy) { + memoryFlushStrategy->setConfig(memoryFlushConfig(protonConfig.flush)); + _flushEngine->kick(); + } } void diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h index 023a6173984..be8e602fa2a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.h +++ b/searchcore/src/vespa/searchcore/proton/server/proton.h @@ -106,6 +106,7 @@ private: MatchEngine::UP _matchEngine; SummaryEngine::UP _summaryEngine; DocsumBySlime::UP _docsumBySlime; + IFlushStrategy::SP _strategy; FlushEngine::UP _flushEngine; RPCHooks::UP _rpcHooks; HealthAdapter _healthAdapter; diff --git a/searchcore/src/vespa/searchcore/util/OWNERS b/searchcore/src/vespa/searchcore/util/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchcore/src/vespa/searchcore/util/OWNERS +++ b/searchcore/src/vespa/searchcore/util/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchcorespi/OWNERS b/searchcorespi/OWNERS index 7066165775a..23c5db50ab7 100644 --- a/searchcorespi/OWNERS +++ b/searchcorespi/OWNERS @@ -1,3 +1,3 @@ -tegge +toregge geirst -balder +baldersheim diff --git a/searchlib/OWNERS b/searchlib/OWNERS index 9289349b7db..edcc41fe923 100644 --- a/searchlib/OWNERS +++ b/searchlib/OWNERS @@ -1,4 +1,4 @@ havardpe -balder -tegge +baldersheim +toregge geirst diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java index b877a88fc8d..d059c270fa5 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; /** * <p>This is the aggregation super-class from which all types of aggregation inherits.</p> * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class AggregationResult extends ExpressionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java index 651ab192786..f961829b081 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This is an aggregated result holding the average of all results. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class AverageAggregationResult extends AggregationResult { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java index 5f90c126115..c35c8905c1d 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This is an aggregated result holding the number of aggregated hits. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class CountAggregationResult extends AggregationResult { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java index ecbab688821..381e7da994f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java @@ -19,7 +19,6 @@ public class ForceLoad { "VdsHit", "Grouping", "Hit", - "ForceLoad", "MinAggregationResult", "GroupingLevel", "MaxAggregationResult", @@ -27,10 +26,10 @@ public class ForceLoad { "AverageAggregationResult", "ExpressionCountAggregationResult", "hll.SparseSketch", - "hll.NormalSketch", - "ForceLoad" + "hll.NormalSketch" }; - com.yahoo.system.ForceLoad.forceLoad(pkg, classes); + com.yahoo.system.ForceLoad.forceLoad(pkg, classes, + ForceLoad.class.getClassLoader()); } public static boolean forceLoad() { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java index 6d5d95bbcc0..c9e29c86f66 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java @@ -15,7 +15,7 @@ import java.util.List; * This is an aggregated result holding the top n hits for a single group. * * @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a> - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class HitsAggregationResult extends AggregationResult { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java index dba44dcf023..ce51f7ee19f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This is an aggregated result holding the maximum result of the matching hits. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class MaxAggregationResult extends AggregationResult { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java index ca8c71e6ede..68866769a2c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This is an aggregated result holding the minimum result of the matching hits. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class MinAggregationResult extends AggregationResult { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java index 88e61d98ba0..0e882fb725e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This is an aggregated result holding the sum of the aggregating expression for all matching hits. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class SumAggregationResult extends AggregationResult { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java index ee171be0c4b..d04374bbe7e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This is an aggregated result holding the xor of the aggregating expression for all matching hits. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class XorAggregationResult extends AggregationResult { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java index a56215a6991..ef4ea8c1fb0 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to add all arguments. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class AddFunctionNode extends NumericFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java index d16058afde2..18c20785251 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; * This node holds the index of an ExpressionNode in an external array, and is used as a proxy in the back-end to allow * aggregators to be used in expressions. * - * @author <a href="mailto:balder@yahoo-inc.com">Ulf Lilleengen</a> + * @author baldersheim */ public class AggregationRefNode extends ExpressionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java index f54b8fba9ea..61db5371933 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to perform bitwise AND on the result of all arguments in order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class AndFunctionNode extends BitFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java index e58bf1e317d..c2bbef357de 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This function is an instruction to retrieve the value of a named attribute. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class AttributeNode extends FunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java index 830b74bbb5f..e870344b3ac 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This is an abstract super-class for all non-unary functions that operator on bit values. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class BitFunctionNode extends NumericFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java index 0dc7f49a826..f17259f4f58 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java @@ -5,7 +5,7 @@ package com.yahoo.searchlib.expression; * This is the superclass of all bucket values * * @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a> - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ abstract public class BucketResultNode extends ResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java index 98c3ba0580e..c84c345a57b 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to concatenate the bits of all arguments in order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class CatFunctionNode extends MultiArgFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java index 2ba6ee6e1c3..af5ec5c552d 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This abstract expression node represents a function to execute. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class ConstantNode extends ExpressionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java index 2a99e9f1edb..c7ff00a9e78 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to divide the arguments in order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class DivideFunctionNode extends NumericFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java index dabbf8d622b..581a70a3f82 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java @@ -5,7 +5,7 @@ package com.yahoo.searchlib.expression; * This abstract expression node represents a document whose content is accessed depending on the subclass * implementation of this. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class DocumentAccessorNode extends ExpressionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java index c33ef6cd7fd..aa9adc8203d 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * The node is a request to retrieve the content of a document field. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class DocumentFieldNode extends DocumentAccessorNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java index 07aa4c8d580..62b6b9ebac9 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java @@ -12,7 +12,7 @@ import java.io.Serializable; * This is the base class for all expression node types. There is no execution logic implemented in Java, since that all * happens in the C++ backend. This class hierarchy is for <b>building</b> the expression tree to pass to the backend. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class ExpressionNode extends Identifiable implements Serializable { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java index 9d6d83ccc5c..c5ae141cd26 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class FloatBucketResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java index 6e44f113eed..5e94f9880a1 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; /** * This result holds a float value. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class FloatResultNode extends NumericResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java index ae57aeb6a7f..ad2130eba24 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class FloatResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java index 6ebb4c672c8..8b12f4c5967 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java @@ -58,7 +58,6 @@ public class ForceLoad { "FloatResultNodeVector", "StringResultNodeVector", "RawResultNodeVector", - "ForceLoad", "MultiplyFunctionNode", "IntegerBucketResultNode", "FloatBucketResultNode", @@ -77,10 +76,10 @@ public class ForceLoad { "ZCurveFunctionNode", "XorBitFunctionNode", "MultiArgFunctionNode", - "DebugWaitFunctionNode", - "ForceLoad" + "DebugWaitFunctionNode" }; - com.yahoo.system.ForceLoad.forceLoad(pkg, classes); + com.yahoo.system.ForceLoad.forceLoad(pkg, classes, + ForceLoad.class.getClassLoader()); } public static boolean forceLoad() { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java index 13f7f8e11a2..5cee2df245b 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This abstract expression node represents a function to execute. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class FunctionNode extends ExpressionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java index 1308e668d3b..483443ed4dc 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * The node is a request to retrieve the namespace-specific content of a document id. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class GetDocIdNamespaceSpecificFunctionNode extends DocumentAccessorNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java index 89b1f477706..3714460846f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This node is a request to retrieve the YMUM checksum of a document. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class GetYMUMChecksumFunctionNode extends DocumentAccessorNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java index 53455fe26ec..4a636bb8a3f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; /** * This result holds an integer value. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Int16ResultNode extends NumericResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java index 7e67f80b5e0..a3439b820fc 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Int16ResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java index e2acb243714..0316ee2d9c3 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; /** * This result holds an integer value. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Int32ResultNode extends NumericResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java index f9166ac63da..90849fcb46c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Int32ResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java index dedb2f3ddbc..0bbc3414c2e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; /** * This result holds an integer value. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Int8ResultNode extends NumericResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java index da1edfc5a3a..ac1fad4125a 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Int8ResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java index 1ea639bd67f..a5caef9c77a 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class IntegerBucketResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java index 4ca5dfc4139..6b9b46b922c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; /** * This result holds an integer value. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class IntegerResultNode extends NumericResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java index ac55a4e7d8b..20454bb8198 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class IntegerResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java index 64c81072714..f7e85b974d5 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is a request to calculate the MD5 of the result of its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class MD5BitFunctionNode extends UnaryBitFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java index 0d82b6a260e..2e8f5b81eb8 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class MathFunctionNode extends MultiArgFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java index 8496f88eb1c..0ce18adeae8 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to return the maximum value of all its arguments. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class MaxFunctionNode extends NumericFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java index f7c18077791..fe2e473a61c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to return the minimum value of all its arguments. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class MinFunctionNode extends NumericFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java index a2c919b1d4d..94e1c98f974 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to modulo the arguments in order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class ModuloFunctionNode extends NumericFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java index 4f201e98bfb..1daef4f6419 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java @@ -10,7 +10,7 @@ import java.util.List; * <p>This is an abstract super-class for all functions that accepts multiple arguments. This node implements the * necessary API for manipulating arguments.</p> * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class MultiArgFunctionNode extends FunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java index b55e86ba5fe..a9848b8ccca 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to multiply all arguments. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class MultiplyFunctionNode extends NumericFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java index 0fdf07d6291..ab967eda024 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class NegateFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java index dd24c1f9efe..25ea8c58b49 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class NormalizeSubjectFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java index bc66e0d1899..5b3a0673491 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.objects.ObjectVisitor; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class NullResultNode extends ResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java index f949dc67936..102c598402a 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class NumElemFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java index 70a5cdcaf98..d828895d3c5 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This is a superclass for all numerical results. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ abstract public class NumericResultNode extends SingleResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java index 6f34f261543..215df07ec6a 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to perform bitwise OR on the result of all arguments. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class OrFunctionNode extends BitFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java index a72d9d41318..699b5faf506 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java @@ -2,7 +2,7 @@ package com.yahoo.searchlib.expression; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class PositiveInfinityResultNode extends ResultNode { // The global class identifier shared with C++. diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java index eef386735a1..cab5221e9de 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.objects.ObjectVisitor; import com.yahoo.vespa.objects.Serializer; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class RawBucketResultNode extends BucketResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java index caed1de4134..85212fa53f2 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java @@ -7,7 +7,7 @@ import com.yahoo.vespa.objects.Serializer; import java.util.ArrayList; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class RawBucketResultNodeVector extends ResultNodeVector { // The global class identifier shared with C++. diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java index ad40fc5026f..2288f1c9289 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java @@ -11,7 +11,7 @@ import java.util.Arrays; /** * This result holds a byte array value. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class RawResultNode extends SingleResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java index dc791b7ce69..9c18ff076b3 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class RawResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java index 90077238925..02ad64d8b98 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This abstract expression node represents a function to execute. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class RelevanceNode extends ExpressionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java index 7a31e1598f6..bd0fe0e4861 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.objects.Identifiable; /** * This abstract expression node represents the result value of execution. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class ResultNode extends Identifiable implements Comparable<ResultNode> { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java index e6d2818e39d..26471327229 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class ResultNodeVector extends ResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java index 7aa9cd92163..88818d6626b 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java @@ -5,7 +5,7 @@ package com.yahoo.searchlib.expression; * This class will revert the order on any multivalues. Nothing is done to single value types such as integers, float, * strings and Raw values. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ReverseFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java index 2c9b940cbf0..554cfb72f38 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java @@ -2,7 +2,7 @@ package com.yahoo.searchlib.expression; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public abstract class SingleResultNode extends ResultNode { // The global class identifier shared with C++. diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java index 0b0f1e1ed5b..961a423952f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java @@ -2,7 +2,7 @@ package com.yahoo.searchlib.expression; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class SortFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java index de748394ca3..d0929690f33 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to concatenate the bits of all arguments in order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class StrCatFunctionNode extends MultiArgFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java index dbec8903177..c3091fdf9fc 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class StrLenFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java index 89570c702ec..33082749c26 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class StringBucketResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java index f428e2aef9f..89b0313998f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java @@ -9,7 +9,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This result holds a string. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class StringResultNode extends SingleResultNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java index ba172f5db01..05b379bca9d 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java @@ -9,7 +9,7 @@ import java.util.ArrayList; /** * This result holds nothing. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class StringResultNodeVector extends ResultNodeVector { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java index 4511797d3dd..93a0ca259cb 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class ToFloatFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java index 8ff20216374..286318b9abe 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class ToIntFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java index 490d19ad9a8..e1e775225f7 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to negate its argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class ToStringFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java index 233023d1a2e..9531f8fa28e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This function is a request to use the Unicode Collation Algorithm specification when sorting this field. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class UcaFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java index 05afc5d99b9..c3c154ff410 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This is an abstract super-class for all unary functions that operator on bit values. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class UnaryBitFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java index 84264f47ef4..13006c6e5da 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This is an abstract super-class for all functions that accept only a single argument. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class UnaryFunctionNode extends MultiArgFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java index 57fa01c97de..49e8c947795 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java @@ -7,7 +7,7 @@ package com.yahoo.searchlib.expression; * the first 8 bits of the result with the next 8 bits of the result, and then XOR that number with the next 8 bits of * the result. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class XorBitFunctionNode extends UnaryBitFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java index 036d7fc8f16..bbcb26f3ac6 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression; /** * This function is an instruction to perform bitwise XOR on the result of all arguments in order. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class XorFunctionNode extends BitFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java index 54e86f8353c..8c60aa52894 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; /** * This function decompose two-dimensonal zcurve values into x and y values. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ZCurveFunctionNode extends UnaryFunctionNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java index 285b39cbfbb..556a69e3cb8 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java @@ -10,7 +10,7 @@ import java.util.Optional; /** * A GBDT node representing a set inclusion test: feature IN [value-list] where values can be strings or numbers. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class CategoryFeatureNode extends FeatureNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java index b78b9ed4224..eccd279190c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java @@ -10,7 +10,7 @@ import java.util.Optional; /** * A GBDT node representing a numeric "less than" comparison: feature < numeric-value * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class NumericFeatureNode extends FeatureNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java index 608a4b499ed..58a252a2c66 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java @@ -6,7 +6,7 @@ import java.util.List; /** * A producer of a list of cases for function training. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface CaseList { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java index 0ccce4ad2ad..ebf4f6f4bda 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java @@ -8,7 +8,7 @@ import java.util.List; /** * An entity which may evolve over time * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class Evolvable implements Comparable<Evolvable> { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java index 416e2da4c82..5b28b176341 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java @@ -12,7 +12,7 @@ import java.util.List; * <p> * As we are training ranking expressions, the genome, here, is the ranking expression. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Individual extends Evolvable { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java index 7f2e3645076..091990ffdc5 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java @@ -8,7 +8,7 @@ import java.awt.event.KeyEvent; /** * TODO * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class KeyboardChecker { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java index c62462d0c3d..8e515829f2e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java @@ -13,7 +13,7 @@ import java.io.IOException; /** * Command line runner for training sessions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ /* TODO: Switch order of generation and sequence in names diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java index 484a0747e24..184c566c5a2 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java @@ -10,7 +10,7 @@ import java.util.List; /** * A collection of evolvables * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Population { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java index 4a3edd35a8d..c4d8121867e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java @@ -9,7 +9,7 @@ import java.util.List; /** * A tracker which prints a summary of training events to standard out * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PrintingTracker implements Tracker { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java index a4421595917..98ed32209c2 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java @@ -15,7 +15,7 @@ import java.util.List; * from a Ranking Expression. * Useful for testing. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankingExpressionCaseList implements CaseList { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java index d67afddd3c5..27a61d2b157 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java @@ -15,7 +15,7 @@ import static java.lang.Math.min; /** * A class which returns a mutated, recombined genome from a list of parent genomes. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Recombiner { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java index 39694b6253f..1c559d92af7 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java @@ -11,7 +11,7 @@ import java.util.List; * Contrary to a real species, a species population may contain (sub)species * rather than individuals - at all levels but the lowest. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Species extends Evolvable { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java index 3bd8ae5e55f..31e85b52318 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java @@ -5,7 +5,7 @@ package com.yahoo.searchlib.mlr.ga; * The name of a species. For tracking purposes. * A name has the form superSpeciesName + "/" + serialNumber.generationNumber. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SpeciesName { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java index d86af40b805..93df1adb313 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java @@ -8,7 +8,7 @@ import java.util.List; /** * A tracker receives callbacks about events happening during a training session. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface Tracker { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java index 7e2551eccb2..af426f1a85c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java @@ -17,7 +17,7 @@ import java.util.Set; /** * Learns a ranking expression from some seed expressions and a training set. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Trainer { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java index 757a2e4d3d2..e1929c40001 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.mlr.ga; /** * The static environment of a training session * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TrainingEnvironment { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java index e18f560878e..225c40613ed 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TrainingParameters { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java index 507ab26806a..e574aa8e72f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java @@ -12,7 +12,7 @@ import java.util.Set; /** * A training set: a set of <i>cases</i>: Input data to output value pairs * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TrainingSet { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java index 78291768380..ce2cf86a91d 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java @@ -15,7 +15,7 @@ import java.util.Optional; * * <p>Comment lines starting with "#" are ignored.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CsvFileCaseList extends FileCaseList { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java index ec07a939932..82aed1ce517 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java @@ -16,7 +16,7 @@ import java.util.Optional; * * <p>Comment lines starting with "#" are ignored.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // NOTE: If we get another type of case list it is time to abstract into a common CaseList base class public class FvFileCaseList extends FileCaseList { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java index 9dac3db11c8..f381c8ea158 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java @@ -10,7 +10,7 @@ import java.util.Map; /** * A set of (immutable) computed features * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @Beta public class Features { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java index e5b4a899844..95bc7d4180e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java @@ -11,7 +11,7 @@ import java.util.Map; /** * Calculates the fieldTermMatch features * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @Beta public class FieldTermMatch { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java index 77083d4edb4..466463edaeb 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java @@ -11,7 +11,7 @@ import static java.lang.Math.*; /** * The collection of metrics calculated by the string match metric calculator. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class FieldMatchMetrics implements Cloneable { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java index 3fc3780151a..95284ba1e69 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java @@ -43,7 +43,7 @@ import java.util.Set; * * <p>This class is not multithread safe, but is reusable across queries for a single thread.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class FieldMatchMetricsComputer { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java index 4ab8565a285..49daf0c6961 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java @@ -5,7 +5,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch; * The parameters to a string match metric calculator. * Mutable until frozen. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class FieldMatchMetricsParameters { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java index f101448a3dd..cbd35a8565b 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java @@ -33,7 +33,7 @@ public class Main { private static void printUsage() { System.out.println("Computes the string segment match metrics of a query and field."); System.out.println("Usage: java -jar searchlib.jar query field"); - System.out.println("By: Jon Bratseth (bratseth@yahoo-inc.com)"); + System.out.println("Author: bratseth"); } } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java index 6cd9d651a09..6393300fe80 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java @@ -12,7 +12,7 @@ import java.util.Arrays; * explicitly. This allows us to model the matchWeight rank feature of a field as dependent of * the weights of all the terms in the query. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Query { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java index 803aaf52964..47ffb276f70 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch; /** * A query term. Query terms are equal if they have the same term string. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class QueryTerm { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java index 9f6e81a04bc..c7331a0b5b6 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java @@ -8,7 +8,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch; * and the end of the previous segment. In addition it holds information on how far we have tried * to look for alternative segments from this starting point (skipI and previousJ).</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class SegmentStartPoint { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java index 775c7d1d687..9dfefe5098d 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch; /** * A computation trace * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Trace { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java index 8b456b9236b..fd7b80f9342 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java @@ -8,7 +8,7 @@ import com.yahoo.searchlib.rankingexpression.rule.TruthOperator; * A value which is either true or false. * In numerical context true is interpreted as 1 and false as 0. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.21 */ public class BooleanValue extends DoubleCompatibleValue { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java index 3129bfa05a3..2bae382d5bd 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java @@ -7,7 +7,7 @@ import com.yahoo.searchlib.rankingexpression.rule.TruthOperator; /** * A value which acts as a double in numerical context. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.21 */ public abstract class DoubleCompatibleValue extends Value { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java index 6730053e9fe..d852267f1b7 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java @@ -27,7 +27,7 @@ import com.yahoo.searchlib.rankingexpression.evaluation.gbdtoptimization.GBDTOpt * <p> * Instances of this class are not multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExpressionOptimizer { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java index 340a074f179..0c062658089 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java @@ -9,7 +9,7 @@ import java.util.Map; /** * Reports the result of optimizations of a ranking expression. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class OptimizationReport { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java index ff935031149..b2dc5e27b91 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java @@ -8,7 +8,7 @@ import com.yahoo.searchlib.rankingexpression.rule.TruthOperator; /** * A string value. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.21 */ public class StringValue extends Value { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java index e56c005cdf7..142cd650ee8 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java @@ -11,7 +11,7 @@ import com.yahoo.tensor.MapTensor; * Concrete subclasses of this provides implementations of these methods or throws * UnsupportedOperationException if the operation is not supported. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.5 */ public abstract class Value { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java index 7e74bdce9e6..1d77c955699 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java @@ -16,7 +16,7 @@ import java.util.List; * * <p>This class is not multithread safe.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class GBDTOptimizer extends Optimizer { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java index 11feddb919e..18a572745f6 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java @@ -11,7 +11,7 @@ import java.util.List; /** * A node which flips the sign of the value produced from the nested expression * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NegativeNode extends CompositeNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java index bb3b028f696..a62ba02c728 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java @@ -11,7 +11,7 @@ import java.util.*; /** * A node which returns true or false depending on a set membership test * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.21 */ public class SetMembershipNode extends BooleanNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java index 26e8b183c21..60fe19f909f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java @@ -6,7 +6,7 @@ import java.io.Serializable; /** * A mathematical operator * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public enum TruthOperator implements Serializable { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java index bd9ad43f155..43eb7beb93e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java @@ -15,7 +15,7 @@ import java.util.Map; /** * Replaces "features" which found in the given constants by their constant value * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ConstantDereferencer extends ExpressionTransformer { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java index d8995bd8752..cb9358227fb 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java @@ -11,7 +11,7 @@ import java.util.List; /** * Superclass of expression transformers * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class ExpressionTransformer { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java index 5b5a06c99bf..c54c20a17d6 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java @@ -19,7 +19,7 @@ import java.util.List; /** * Performs simple algebraic simplification of expressions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Simplifier extends ExpressionTransformer { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java index 4506f4970b0..47bc16a48e0 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java @@ -6,7 +6,7 @@ import java.util.Iterator; /** * Represents a condition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class Condition extends TreeNode { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java index 95841bf829f..bb47947557c 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.searchlib.treenet.rule;
import com.yahoo.java7compat.Util;
@@ -11,7 +11,7 @@ import java.util.List; /**
* Represents a set membership test on the form <code>feature IN (integer1, integer2 ...)</code>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.21
*/
public class SetMembershipCondition extends Condition {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java index 2f271ec84db..77b6726c11c 100755..100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java @@ -12,7 +12,7 @@ import com.yahoo.vespa.objects.ObjectPredicate; import junit.framework.TestCase; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class AggregationTestCase extends TestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java index 2c5e65c03e4..62486e63f7f 100755..100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java @@ -11,7 +11,7 @@ import java.nio.ByteBuffer; import java.util.Arrays; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class ExpressionTestCase extends TestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java index e95af6ad61d..265b419a9e6 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java @@ -9,7 +9,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CsvFileCaseListTestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java index fc834181f53..1dce786e9e8 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java @@ -17,7 +17,7 @@ import java.util.List; /** * Main class - drives a learning session from the command line. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExampleLearningSessions { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java index 51460855983..1cfc1fa673b 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java @@ -16,7 +16,7 @@ import java.util.List; /** * Tests the main class used from the command line * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MainTestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java index ab1d5c362b8..b6f7d2a87ea 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MockTrainingSetTestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java index 9c3e514ddad..a1177aebefe 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java @@ -14,7 +14,7 @@ import java.util.*; /** * Reads a tripadvisor Kaggle challenge training set * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TripAdvisorFileCaseList implements CaseList { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java index 272ca98d7c4..3f55d3ed9a0 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java @@ -8,7 +8,7 @@ import java.util.Arrays; * and which uses 2*query length memory rather than field length*query length. * This class is not thread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class OptimalStringAlignmentDistance { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java index 398c4e70fb7..f57835cdc3f 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch.reference.test; import com.yahoo.searchlib.ranking.features.fieldmatch.reference.OptimalStringAlignmentDistance; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class OptimalStringAlignmentTestCase extends junit.framework.TestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java index 19948cad9f2..b67a423181d 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java @@ -16,7 +16,7 @@ import java.util.Set; /** * Tests expression evaluation * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class EvaluationTestCase extends junit.framework.TestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java index 9fbaddaab1e..851eafd2ac8 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ConstantDereferencerTestCase { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java index 69ec3a914d1..9d94ec0bc99 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java @@ -10,7 +10,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SimplifierTestCase { diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp index 775654d23fc..2e756e9d4b8 100644 --- a/searchlib/src/tests/transactionlog/translogclient_test.cpp +++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp @@ -715,7 +715,7 @@ void Test::testErase() "count %zu, numBytes %zu", partId, (uint64_t) part.range.from(), (uint64_t) part.range.to(), - part.count, part.byteSize); + part.numEntries, part.byteSize); } ASSERT_LESS_EQUAL(2u, numParts); // Erase everything before second to last domainpart file @@ -726,8 +726,8 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 2].count + - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 2].numEntries + + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing just first entry in 2nd to last part s1->erase(eraseSerial + 1); TEST_DO(assertVisitStats(tls, "erase", 2, TOTAL_NUM_ENTRIES, @@ -735,8 +735,8 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial + 1, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 2].count + - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 2].numEntries + + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing almost all of 2nd to last part SerialNum eraseSerial2 = domainInfo.parts[numParts - 2].range.to(); s1->erase(eraseSerial2); @@ -745,8 +745,8 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial2, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 2].count + - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 2].numEntries + + domainInfo.parts[numParts - 1].numEntries)); // Erase everything before last domainpart file eraseSerial = domainInfo.parts[numParts - 1].range.from(); s1->erase(eraseSerial); @@ -755,7 +755,7 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing just first entry in last part s1->erase(eraseSerial + 1); TEST_DO(assertVisitStats(tls, "erase", 2, TOTAL_NUM_ENTRIES, @@ -763,7 +763,7 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial + 1, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 1].numEntries)); // No apparent effect of erasing almost all of last part eraseSerial2 = domainInfo.parts[numParts - 1].range.to(); s1->erase(eraseSerial2); @@ -772,7 +772,7 @@ void Test::testErase() TOTAL_NUM_ENTRIES + 1 - eraseSerial, TOTAL_NUM_ENTRIES - eraseSerial)); TEST_DO(assertStatus(*s1, eraseSerial2, TOTAL_NUM_ENTRIES, - domainInfo.parts[numParts - 1].count)); + domainInfo.parts[numParts - 1].numEntries)); } } diff --git a/searchlib/src/tests/url/testurl.cpp b/searchlib/src/tests/url/testurl.cpp index 4ed28453890..bfe6c79de07 100644 --- a/searchlib/src/tests/url/testurl.cpp +++ b/searchlib/src/tests/url/testurl.cpp @@ -580,7 +580,7 @@ int main(int, char **) "SCHEME:http,DOMAIN:sony,DOMAIN:co,MAINTLD:uk");// Tokenstring #endif // Test fixes for bugs reported in cvs commit: - // tegge 2000/10/27 22:42:59 CEST + // toregge 2000/10/27 22:42:59 CEST success = success && CheckURL("http://somehost.somedomain/this!is!it/boom", // URL "http", // scheme diff --git a/searchlib/src/vespa/searchlib/aggregation/OWNERS b/searchlib/src/vespa/searchlib/aggregation/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchlib/src/vespa/searchlib/aggregation/OWNERS +++ b/searchlib/src/vespa/searchlib/aggregation/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/attribute/OWNERS b/searchlib/src/vespa/searchlib/attribute/OWNERS index 7066165775a..23c5db50ab7 100644 --- a/searchlib/src/vespa/searchlib/attribute/OWNERS +++ b/searchlib/src/vespa/searchlib/attribute/OWNERS @@ -1,3 +1,3 @@ -tegge +toregge geirst -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/bitcompression/OWNERS b/searchlib/src/vespa/searchlib/bitcompression/OWNERS index 64735d11d93..1708c0d4695 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/OWNERS +++ b/searchlib/src/vespa/searchlib/bitcompression/OWNERS @@ -1 +1 @@ -tegge +toregge diff --git a/searchlib/src/vespa/searchlib/btree/OWNERS b/searchlib/src/vespa/searchlib/btree/OWNERS index e6340232840..b7b549c6058 100644 --- a/searchlib/src/vespa/searchlib/btree/OWNERS +++ b/searchlib/src/vespa/searchlib/btree/OWNERS @@ -1,2 +1,2 @@ -tegge +toregge geirst diff --git a/searchlib/src/vespa/searchlib/diskindex/OWNERS b/searchlib/src/vespa/searchlib/diskindex/OWNERS index 64735d11d93..1708c0d4695 100644 --- a/searchlib/src/vespa/searchlib/diskindex/OWNERS +++ b/searchlib/src/vespa/searchlib/diskindex/OWNERS @@ -1 +1 @@ -tegge +toregge diff --git a/searchlib/src/vespa/searchlib/docstore/OWNERS b/searchlib/src/vespa/searchlib/docstore/OWNERS index 3e9fc8ab356..f4d47806ed9 100644 --- a/searchlib/src/vespa/searchlib/docstore/OWNERS +++ b/searchlib/src/vespa/searchlib/docstore/OWNERS @@ -1,2 +1,2 @@ -balder -tegge +baldersheim +toregge diff --git a/searchlib/src/vespa/searchlib/expression/OWNERS b/searchlib/src/vespa/searchlib/expression/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchlib/src/vespa/searchlib/expression/OWNERS +++ b/searchlib/src/vespa/searchlib/expression/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/expression/resultnodes.cpp b/searchlib/src/vespa/searchlib/expression/resultnodes.cpp index 9a1d3639a8e..2694385a557 100644 --- a/searchlib/src/vespa/searchlib/expression/resultnodes.cpp +++ b/searchlib/src/vespa/searchlib/expression/resultnodes.cpp @@ -7,6 +7,7 @@ #include <vespa/searchlib/expression/enumresultnode.h> #include <vespa/searchlib/expression/nullresultnode.h> #include <vespa/searchlib/expression/positiveinfinityresultnode.h> +#include <math.h> #include <vespa/log/log.h> LOG_SETUP(".searchlib.documentexpressions"); diff --git a/searchlib/src/vespa/searchlib/grouping/OWNERS b/searchlib/src/vespa/searchlib/grouping/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchlib/src/vespa/searchlib/grouping/OWNERS +++ b/searchlib/src/vespa/searchlib/grouping/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/index/OWNERS b/searchlib/src/vespa/searchlib/index/OWNERS index 64735d11d93..1708c0d4695 100644 --- a/searchlib/src/vespa/searchlib/index/OWNERS +++ b/searchlib/src/vespa/searchlib/index/OWNERS @@ -1 +1 @@ -tegge +toregge diff --git a/searchlib/src/vespa/searchlib/memoryindex/OWNERS b/searchlib/src/vespa/searchlib/memoryindex/OWNERS index e6340232840..b7b549c6058 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/OWNERS +++ b/searchlib/src/vespa/searchlib/memoryindex/OWNERS @@ -1,2 +1,2 @@ -tegge +toregge geirst diff --git a/searchlib/src/vespa/searchlib/parsequery/OWNERS b/searchlib/src/vespa/searchlib/parsequery/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchlib/src/vespa/searchlib/parsequery/OWNERS +++ b/searchlib/src/vespa/searchlib/parsequery/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/query/OWNERS b/searchlib/src/vespa/searchlib/query/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchlib/src/vespa/searchlib/query/OWNERS +++ b/searchlib/src/vespa/searchlib/query/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/test/OWNERS b/searchlib/src/vespa/searchlib/test/OWNERS index 64735d11d93..1708c0d4695 100644 --- a/searchlib/src/vespa/searchlib/test/OWNERS +++ b/searchlib/src/vespa/searchlib/test/OWNERS @@ -1 +1 @@ -tegge +toregge diff --git a/searchlib/src/vespa/searchlib/transactionlog/OWNERS b/searchlib/src/vespa/searchlib/transactionlog/OWNERS index 1037590124e..9dc0c2d970d 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/OWNERS +++ b/searchlib/src/vespa/searchlib/transactionlog/OWNERS @@ -1 +1 @@ -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp index be1de99efef..9faa80a76b9 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp @@ -38,7 +38,6 @@ Domain::Domain(const string &domainName, const FileHeaderContext &fileHeaderContext) : _defaultCrcType(defaultCrcType), _executor(executor), - _count(0), _sessionId(1), _useFsync(useFsync), _syncMonitor(), @@ -83,7 +82,6 @@ void Domain::addPart(int64_t partId, bool isLastPart) { } else { { LockGuard guard(_lock); - _count += dp->size(); _parts[partId] = dp; } if (! isLastPart) { @@ -119,7 +117,7 @@ DomainInfo Domain::getDomainInfo() const { LockGuard guard(_lock); - DomainInfo info(SerialNumRange(begin(), end()), count(), byteSize()); + DomainInfo info(SerialNumRange(begin(), end()), size(guard), byteSize()); for (const auto &entry: _parts) { const DomainPart &part = *entry.second; info.parts.emplace_back(PartInfo(part.range(), part.size(), @@ -272,12 +270,8 @@ void Domain::commit(const Packet & packet) } dp = _parts.rbegin()->second; } - size_t oldSz(dp->size()); dp->commit(entry.serial(), packet); cleanSessions(); - // If commit fails no updates should be sent to subscribers either. - // Is is better to keep a consistent behaviour. - _count += dp->size() - oldSz; LockGuard guard(_sessionLock); for (auto & it : _sessions) { diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.h b/searchlib/src/vespa/searchlib/transactionlog/domain.h index 6309d7113f1..d6dbde6b06e 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/domain.h +++ b/searchlib/src/vespa/searchlib/transactionlog/domain.h @@ -10,25 +10,25 @@ namespace transactionlog { struct PartInfo { SerialNumRange range; - size_t count; + size_t numEntries; size_t byteSize; vespalib::string file; - PartInfo(SerialNumRange range_in, size_t count_in, + PartInfo(SerialNumRange range_in, size_t numEntries_in, size_t byteSize_in, vespalib::stringref file_in) - : range(range_in), count(count_in), byteSize(byteSize_in), + : range(range_in), numEntries(numEntries_in), byteSize(byteSize_in), file(file_in) {} }; struct DomainInfo { SerialNumRange range; - size_t count; + size_t numEntries; size_t byteSize; std::vector<PartInfo> parts; - DomainInfo(SerialNumRange range_in, size_t count_in, size_t byteSize_in) - : range(range_in), count(count_in), byteSize(byteSize_in), parts() {} + DomainInfo(SerialNumRange range_in, size_t numEntries_in, size_t byteSize_in) + : range(range_in), numEntries(numEntries_in), byteSize(byteSize_in), parts() {} DomainInfo() - : range(), count(0), byteSize(0), parts() {} + : range(), numEntries(0), byteSize(0), parts() {} }; typedef std::map<vespalib::string, DomainInfo> DomainStats; @@ -69,7 +69,6 @@ public: bool getMarkedDeleted(void) const { return _markedDeleted; } void markDeleted(void) { _markedDeleted = true; } - uint64_t count() const { return _count; } size_t byteSize() const; size_t getNumSessions() const { return _sessions.size(); } @@ -103,7 +102,6 @@ private: DomainPart::Crc _defaultCrcType; Executor & _executor; - uint64_t _count; int _sessionId; const bool _useFsync; vespalib::Monitor _syncMonitor; diff --git a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp index 49c16940be5..fdc771a7b58 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp @@ -21,7 +21,7 @@ struct DomainExplorer : vespalib::StateExplorer { DomainInfo info = domain->getDomainInfo(); state.setLong("from", info.range.from()); state.setLong("to", info.range.to()); - state.setLong("count", info.count); + state.setLong("numEntries", info.numEntries); state.setLong("byteSize", info.byteSize); if (full) { Cursor &array = state.setArray("parts"); @@ -29,7 +29,7 @@ struct DomainExplorer : vespalib::StateExplorer { Cursor &part = array.addObject(); part.setLong("from", part_in.range.from()); part.setLong("to", part_in.range.to()); - part.setLong("count", part_in.count); + part.setLong("numEntries", part_in.numEntries); part.setLong("byteSize", part_in.byteSize); part.setString("file", part_in.file); { diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp index 79b7413c1b4..b9a9ea57a9e 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp @@ -219,7 +219,6 @@ void TransLogServer::logMetric() const EV_COUNT((prefix + "last").c_str(), it->second->end()); EV_COUNT((prefix + "first").c_str(), it->second->begin()); EV_VALUE((prefix + "numused").c_str(), it->second->size()); - EV_COUNT((prefix + "count").c_str(), it->second->count()); } } diff --git a/searchsummary/OWNERS b/searchsummary/OWNERS index 9673ef97e16..6aeaba5f2a8 100644 --- a/searchsummary/OWNERS +++ b/searchsummary/OWNERS @@ -1,2 +1,2 @@ geirst -balder +baldersheim diff --git a/serviceview/OWNERS b/serviceview/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/serviceview/OWNERS +++ b/serviceview/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/staging_vespalib/OWNERS b/staging_vespalib/OWNERS index 30c53a630b0..3853ae0ffae 100644 --- a/staging_vespalib/OWNERS +++ b/staging_vespalib/OWNERS @@ -1,3 +1,3 @@ arnej27959 havardpe -balder +baldersheim diff --git a/standalone-container/src/test/scala/com/yahoo/container/standalone/CloudConfigYinstVariablesTest.scala b/standalone-container/src/test/scala/com/yahoo/container/standalone/CloudConfigYinstVariablesTest.scala index 0a56f9ac19a..c281cd0eabc 100644 --- a/standalone-container/src/test/scala/com/yahoo/container/standalone/CloudConfigYinstVariablesTest.scala +++ b/standalone-container/src/test/scala/com/yahoo/container/standalone/CloudConfigYinstVariablesTest.scala @@ -16,13 +16,13 @@ class CloudConfigYinstVariablesTest { @Test def test_configserver_parsing { - val parsed = convert("test2-lulf.trondheim.corp.yahoo.com") + val parsed = convert("myhost.mydomain.com") assertThat(parsed.length, is(1)) } @Test def port_can_be_configured { - val parsed = convert("test1-tonyv:123") + val parsed = convert("myhost:123") val port: Int = parsed(0).port.get() assertThat(port, is(123)) } @@ -38,12 +38,12 @@ class CloudConfigYinstVariablesTest { @Test(expected = classOf[IllegalArgumentException]) def missing_port_gives_exception { - convert("test1-tonyv:") + convert("myhost:") } @Test(expected = classOf[IllegalArgumentException]) def non_numeric_port_gives_exception { - convert("test1-tonyv:non-numeric") + convert("myhost:non-numeric") } @Test diff --git a/storage/OWNERS b/storage/OWNERS index 97c35339850..11a58a546b1 100644 --- a/storage/OWNERS +++ b/storage/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/storage/src/tests/bucketdb/CMakeLists.txt b/storage/src/tests/bucketdb/CMakeLists.txt index 95228966589..2ba195e70e0 100644 --- a/storage/src/tests/bucketdb/CMakeLists.txt +++ b/storage/src/tests/bucketdb/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testbucketdb +vespa_add_library(storage_testbucketdb TEST SOURCES initializertest.cpp bucketmanagertest.cpp @@ -8,7 +8,7 @@ vespa_add_library(storage_testbucketdb lockablemaptest.cpp bucketinfotest.cpp distribution_hash_normalizer_test.cpp - DEPENDS AFTER storage_storageconfig + storage_bucketdb ) diff --git a/storage/src/tests/bucketmover/CMakeLists.txt b/storage/src/tests/bucketmover/CMakeLists.txt index 2d02cdc4942..e2929187f62 100644 --- a/storage/src/tests/bucketmover/CMakeLists.txt +++ b/storage/src/tests/bucketmover/CMakeLists.txt @@ -1,9 +1,8 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testbucketmover +vespa_add_library(storage_testbucketmover TEST SOURCES bucketmovertest.cpp htmltabletest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt index 309308473e1..dd1cdf87dcd 100644 --- a/storage/src/tests/common/CMakeLists.txt +++ b/storage/src/tests/common/CMakeLists.txt @@ -1,12 +1,11 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testcommon +vespa_add_library(storage_testcommon TEST SOURCES dummystoragelink.cpp testhelper.cpp metricstest.cpp storagelinktest.cpp teststorageapp.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt index f0cb197c5e2..9e3fabdcb29 100644 --- a/storage/src/tests/common/hostreporter/CMakeLists.txt +++ b/storage/src/tests/common/hostreporter/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testhostreporter +vespa_add_library(storage_testhostreporter TEST SOURCES cpureportertest.cpp memreportertest.cpp @@ -8,7 +8,6 @@ vespa_add_library(storage_testhostreporter diskreportertest.cpp util.cpp hostinfotest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt index 6c6ba62ba6e..29bb8cb67c1 100644 --- a/storage/src/tests/distributor/CMakeLists.txt +++ b/storage/src/tests/distributor/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testdistributor +vespa_add_library(storage_testdistributor TEST SOURCES mergelimitertest.cpp bucketdatabasetest.cpp @@ -38,7 +38,6 @@ vespa_add_library(storage_testdistributor bucketgctimecalculatortest.cpp nodemaintenancestatstrackertest.cpp distributor_host_info_reporter_test.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt index da78716459f..4d89a4aa548 100644 --- a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt +++ b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt @@ -1,8 +1,7 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testmemory +vespa_add_library(storage_testmemory TEST SOURCES memorystatusviewertest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/frameworkimpl/status/CMakeLists.txt b/storage/src/tests/frameworkimpl/status/CMakeLists.txt index 734be8e9998..95c4d3a532e 100644 --- a/storage/src/tests/frameworkimpl/status/CMakeLists.txt +++ b/storage/src/tests/frameworkimpl/status/CMakeLists.txt @@ -1,8 +1,7 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_teststatus +vespa_add_library(storage_teststatus TEST SOURCES statustest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/persistence/CMakeLists.txt b/storage/src/tests/persistence/CMakeLists.txt index c065c3eef5b..db0ac64c183 100644 --- a/storage/src/tests/persistence/CMakeLists.txt +++ b/storage/src/tests/persistence/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testpersistence +vespa_add_library(storage_testpersistence TEST SOURCES processalltest.cpp persistencetestutils.cpp @@ -13,7 +13,6 @@ vespa_add_library(storage_testpersistence bucketownershipnotifiertest.cpp persistencequeuetest.cpp testandsettest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt index b1314ca0537..072feb4a940 100644 --- a/storage/src/tests/persistence/filestorage/CMakeLists.txt +++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testfilestorage +vespa_add_library(storage_testfilestorage TEST SOURCES filestormanagertest.cpp operationabortingtest.cpp @@ -11,7 +11,6 @@ vespa_add_library(storage_testfilestorage filestormodifiedbucketstest.cpp deletebuckettest.cpp singlebucketjointest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt index 2e327089b4c..88e518f1ad1 100644 --- a/storage/src/tests/storageserver/CMakeLists.txt +++ b/storage/src/tests/storageserver/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_teststorageserver +vespa_add_library(storage_teststorageserver TEST SOURCES communicationmanagertest.cpp statemanagertest.cpp @@ -11,7 +11,6 @@ vespa_add_library(storage_teststorageserver priorityconvertertest.cpp statereportertest.cpp changedbucketownershiphandlertest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/storageutil/CMakeLists.txt b/storage/src/tests/storageutil/CMakeLists.txt index a48895352e8..e49361285d8 100644 --- a/storage/src/tests/storageutil/CMakeLists.txt +++ b/storage/src/tests/storageutil/CMakeLists.txt @@ -1,10 +1,9 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_teststorageutil +vespa_add_library(storage_teststorageutil TEST SOURCES functortest.cpp charttest.cpp palettetest.cpp - DEPENDS AFTER storage_storageconfig ) diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt index fde0eb6ac3d..f1c10bde4f0 100644 --- a/storage/src/tests/visiting/CMakeLists.txt +++ b/storage/src/tests/visiting/CMakeLists.txt @@ -1,11 +1,10 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_testvisiting +vespa_add_library(storage_testvisiting TEST SOURCES commandqueuetest.cpp visitormanagertest.cpp visitortest.cpp memory_bounded_trace_test.cpp - DEPENDS AFTER storage_storageconfig storage_visitor diff --git a/storageapi/OWNERS b/storageapi/OWNERS index 97c35339850..11a58a546b1 100644 --- a/storageapi/OWNERS +++ b/storageapi/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/storageframework/OWNERS b/storageframework/OWNERS index 97c35339850..11a58a546b1 100644 --- a/storageframework/OWNERS +++ b/storageframework/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/storageserver/OWNERS b/storageserver/OWNERS index 97c35339850..11a58a546b1 100644 --- a/storageserver/OWNERS +++ b/storageserver/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/streamingvisitors/OWNERS b/streamingvisitors/OWNERS index f62763ab1da..465c0e30113 100644 --- a/streamingvisitors/OWNERS +++ b/streamingvisitors/OWNERS @@ -1,2 +1,2 @@ -balder +baldersheim geirst diff --git a/vdslib/OWNERS b/vdslib/OWNERS index 97c35339850..11a58a546b1 100644 --- a/vdslib/OWNERS +++ b/vdslib/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java b/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java index eea51bf7787..0e3c819632f 100644 --- a/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java +++ b/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java @@ -7,7 +7,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** - * @author balder + * @author baldersheim */ public class SearchResultTestCase { diff --git a/vdstestlib/OWNERS b/vdstestlib/OWNERS index 97c35339850..11a58a546b1 100644 --- a/vdstestlib/OWNERS +++ b/vdstestlib/OWNERS @@ -1,2 +1,2 @@ vekterli -dybdahl +dybis diff --git a/vespa-documentgen-plugin/OWNERS b/vespa-documentgen-plugin/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/vespa-documentgen-plugin/OWNERS +++ b/vespa-documentgen-plugin/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/vespa-http-client/OWNERS b/vespa-http-client/OWNERS index 69bebdee173..efd3ad88b9a 100644 --- a/vespa-http-client/OWNERS +++ b/vespa-http-client/OWNERS @@ -1,2 +1,2 @@ -dybdahl +dybis vekterli diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java index f45e1a2edac..8f943ea288a 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicInteger; * * A {@link FeedClientFactory} is provided to instantiate Sessions. * - * @author dybdahl + * @author dybis * @see FeedClientFactory * @since 5.29.0 */ diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java index 39356eb33c6..262cb3e1ca4 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java @@ -9,7 +9,7 @@ import static com.yahoo.vespa.http.client.SessionFactory.createTimeoutExecutor; /** * Factory for creating FeedClient. - * @author dybdahl + * @author dybis */ public class FeedClientFactory { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java index 17d1313336e..391c90003e7 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicInteger; * "Result received: 34 (1 failed so far, 2003 sent, success rate 1999.23 docs/sec)." * On each failure it will print the Result object content. If tracing is enabled, it will print trace messages to * std err as well. - * @author dybdahl + * @author dybis */ public class SimpleLoggerResultCallback implements FeedClient.ResultCallback { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java index 6e25082a7a0..02a9d781840 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java @@ -5,7 +5,7 @@ import com.yahoo.vespa.http.client.Result; /** * Result from a single endpoint. - * @author dybdahl + * @author dybis */ public class EndpointResult { private final String operationId; diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java index 8913b01d799..19eacc6ab42 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java @@ -6,7 +6,7 @@ import com.google.common.annotations.Beta; /** * Helper methods for handling exceptions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @Beta public abstract class Exceptions { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/JsonReader.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/JsonReader.java index 530e22f8abc..31fca0a0d3d 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/JsonReader.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/JsonReader.java @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * Reads a stream of json documents and sends them to feedClient. - * @author dybdahl + * @author dybis */ public class JsonReader { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ThrottlePolicy.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ThrottlePolicy.java index 6c24f12c84c..f739964211a 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ThrottlePolicy.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ThrottlePolicy.java @@ -7,7 +7,7 @@ import static java.lang.Math.min; /** * Class that has a method for finding next maxInFlight. - * @author dybdahl + * @author dybis */ public class ThrottlePolicy { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/XmlFeedReader.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/XmlFeedReader.java index 3f1f896ff23..e22f16a200c 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/XmlFeedReader.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/XmlFeedReader.java @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * Reads an input stream of xml, sends these to session. - * @author dybdahl + * @author dybis */ public class XmlFeedReader { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java index 87f83d56840..62a93c84f79 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java @@ -15,7 +15,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; /** * Implementation of FeedClient. It is a thin layer on top of multiClusterHandler and multiClusterResultAggregator. - * @author dybdahl + * @author dybis */ public class FeedClientImpl implements FeedClient { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/MultiClusterSessionOutputStream.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/MultiClusterSessionOutputStream.java index cfe63610f4b..2f696d69e32 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/MultiClusterSessionOutputStream.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/MultiClusterSessionOutputStream.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Class for wiring up the Session API. It is the return value of stream() in the Session API. - * @author dybdahl + * @author dybis */ class MultiClusterSessionOutputStream extends ByteArrayOutputStream { private final CharSequence documentId; diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java index 0e6d6575dc6..6462ee1b2cd 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** * Document queue that only gives you document operations on documents for which there are no already in flight operations for. - * @author dybdahl + * @author dybis */ class DocumentQueue { private final Deque<Document> queue; diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DryRunGatewayConnection.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DryRunGatewayConnection.java index 4fc91e1eb0e..f634a2e22f7 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DryRunGatewayConnection.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DryRunGatewayConnection.java @@ -17,7 +17,7 @@ import java.util.List; /** * Dummy implementation. * - * @author dybdahl + * @author dybis */ public class DryRunGatewayConnection implements GatewayConnection { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/EndpointIOException.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/EndpointIOException.java index 1bb4d2ffeb0..e0256b33c60 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/EndpointIOException.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/EndpointIOException.java @@ -7,7 +7,7 @@ import java.io.IOException; /** * Class for throwing exception from endpoint. - * @author dybdahl + * @author dybis */ public class EndpointIOException extends IOException { private final Endpoint endpoint; diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/GatewayThrottler.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/GatewayThrottler.java index e26beee6890..4041ec21c44 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/GatewayThrottler.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/GatewayThrottler.java @@ -7,7 +7,7 @@ import java.util.Random; * When the gateways says it can not handle more load, we should send less load. That is the responsibility * of this component * - * @author dybdahl + * @author dybis */ public class GatewayThrottler { private long backOffTimeMs = 0; diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/ConcurrentDocumentOperationBlocker.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/ConcurrentDocumentOperationBlocker.java index 6072ad7f87b..48d58dcb354 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/ConcurrentDocumentOperationBlocker.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/ConcurrentDocumentOperationBlocker.java @@ -5,7 +5,7 @@ import java.util.concurrent.Semaphore; /** * A semaphore that can be re-sized. - * @author dybdahl + * @author dybis */ final public class ConcurrentDocumentOperationBlocker { @@ -64,4 +64,4 @@ final public class ConcurrentDocumentOperationBlocker { super.reducePermits(reduction); } } -}
\ No newline at end of file +} diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottler.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottler.java index 604617bda36..342b197c7b3 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottler.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottler.java @@ -27,7 +27,7 @@ import java.util.Random; * * Class is fully thread safe, i.e. all public methods are thread safe. * - * @author dybdahl + * @author dybis */ public class IncompleteResultsThrottler { private final ConcurrentDocumentOperationBlocker blocker = new ConcurrentDocumentOperationBlocker(); diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java index 1d712405795..b736a727c8f 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; /** * Merges several endpointResult into one Result and does the callback. - * @author dybdahl + * @author dybis * @since 5.1.20 */ @Beta diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java index 22f871ffbf8..80a24bc17f2 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; /** * Commandline interface for the binary. - * @author dybdahl + * @author dybis */ @Beta @Command(name = "vespa-http-client", diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java index 1a10be995c5..bd0b8d5276f 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java @@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> - * @author dybdahl + * @author dybis * @since 5.1.20 */ public class Runner { diff --git a/vespa-http-client/src/test/java/ExampleUsageFeedClientTest.java b/vespa-http-client/src/test/java/ExampleUsageFeedClientTest.java index 3af5e1d2435..923e4ed83ff 100644 --- a/vespa-http-client/src/test/java/ExampleUsageFeedClientTest.java +++ b/vespa-http-client/src/test/java/ExampleUsageFeedClientTest.java @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * Unit test that test documentation code. - * @author dybdahl + * @author dybis */ public class ExampleUsageFeedClientTest { diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/FeedClientTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/FeedClientTest.java index 872bc4192b2..0e7b281db26 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/FeedClientTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/FeedClientTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.*; /** * Tests for the API, using dryrun option to mock gateway. - * @author dybdahl + * @author dybis */ public class FeedClientTest { @@ -81,4 +81,4 @@ public class FeedClientTest { feedClient.close(); assertThat(resultsReceived.get(), is(1)); } -}
\ No newline at end of file +} diff --git a/vespa_feed_perf/OWNERS b/vespa_feed_perf/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/vespa_feed_perf/OWNERS +++ b/vespa_feed_perf/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/vespaapplication/OWNERS b/vespaapplication/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/vespaapplication/OWNERS +++ b/vespaapplication/OWNERS @@ -1 +1 @@ -musum +hmusum diff --git a/vespabase/OWNERS b/vespabase/OWNERS index 7028eebe31a..b13f1e9a5a3 100644 --- a/vespabase/OWNERS +++ b/vespabase/OWNERS @@ -1,2 +1,2 @@ -musum +hmusum arnej27959 diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index cbc096dc1bf..e2e20b9bd8f 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -100,7 +100,12 @@ populate_environment () { # VESPA_USE_NO_VESPAMALLOC - list of programs that should use normal system malloc read_conf_file - consider_fallback ROOT ${VESPA_HOME} + consider_fallback ROOT ${VESPA_HOME%/} + if id yahoo >/dev/null 2>&1 ; then + consider_fallback VESPA_USER "yahoo" + elif id vespa >/dev/null 2>&1 ; then + consider_fallback VESPA_USER "vespa" + fi } populate_environment @@ -154,11 +159,11 @@ fixlimits () { } checkjava () { - if java -version 2>&1 | grep "Java HotSpot.* 64-Bit Server VM" >/dev/null ; then + if java -version 2>&1 | grep "64-Bit Server VM" >/dev/null ; then : OK else echo - echo "java must invoke the 64-bit Sun Java VM" + echo "java must invoke the 64-bit Java VM" echo "Got:" java -version echo "Path: $PATH" diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 761fd6af334..0778ab378b8 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -61,6 +61,7 @@ findroot # END environment bootstrap section [ "$VESPA_HOME" ] || { echo "Missing VESPA_HOME variable" 1>&2; exit 1; } +[ "$VESPA_USER" ] || { echo "Missing VESPA_USER variable" 1>&2; exit 1; } cd $VESPA_HOME || { echo "Cannot cd to $VESPA_HOME" 1>&2; exit 1; } @@ -77,30 +78,33 @@ fixdir () { # BEGIN directory fixups -fixdir yahoo wheel 755 libdata/yell/exception -fixdir yahoo wheel 775 libexec/vespa/modelplugins -fixdir yahoo wheel 755 libexec/vespa/plugins/qrs -fixdir root wheel 1777 logs -fixdir yahoo wheel 1777 logs/vespa -fixdir yahoo wheel 755 logs/vespa/qrs -fixdir yahoo wheel 755 logs/vespa/search -fixdir root wheel 1777 tmp -fixdir yahoo wheel 1777 tmp/vespa -fixdir yahoo wheel 755 var/cache/vespa/config -fixdir yahoo wheel 1777 var/crash -fixdir yahoo wheel 755 var/db/vespa -fixdir yahoo wheel 755 var/db/vespa/config_server -fixdir yahoo wheel 755 var/db/vespa/config_server/serverdb -fixdir yahoo wheel 755 var/db/vespa/config_server/serverdb/applications -fixdir yahoo wheel 755 var/db/vespa/config_server/serverdb/configs -fixdir yahoo wheel 755 var/db/vespa/config_server/serverdb/configs/application -fixdir yahoo wheel 755 var/db/vespa/index -fixdir yahoo wheel 755 var/db/vespa/search -fixdir yahoo wheel 755 var/db/vespa/logcontrol -fixdir root wheel 1777 var/run - -chown -hR yahoo logs/vespa -chown -hR yahoo var/db/vespa +fixdir root wheel 1777 logs +fixdir root wheel 1777 tmp +fixdir root wheel 1777 var/run +fixdir ${VESPA_USER} wheel 1777 var/crash +fixdir ${VESPA_USER} wheel 1777 logs/vespa +fixdir ${VESPA_USER} wheel 1777 tmp/vespa +fixdir ${VESPA_USER} wheel 755 libdata/yell/exception +fixdir ${VESPA_USER} wheel 755 libexec/vespa/plugins/qrs +fixdir ${VESPA_USER} wheel 755 logs/vespa/qrs +fixdir ${VESPA_USER} wheel 755 logs/vespa/search +fixdir ${VESPA_USER} wheel 755 var/cache/vespa/config +fixdir ${VESPA_USER} wheel 755 var/db/vespa +fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server +fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb +fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb/applications +fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb/configs +fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb/configs/application +fixdir ${VESPA_USER} wheel 755 var/db/vespa/index +fixdir ${VESPA_USER} wheel 755 var/db/vespa/logcontrol +fixdir ${VESPA_USER} wheel 755 var/db/vespa/search +fixdir ${VESPA_USER} wheel 755 var/vespa/bundlecache +fixdir ${VESPA_USER} wheel 755 var/vespa/bundlecache/configserver +fixdir ${VESPA_USER} wheel 755 var/vespa/cache/config/ +fixdir ${VESPA_USER} wheel 775 libexec/vespa/modelplugins + +chown -hR ${VESPA_USER} logs/vespa +chown -hR ${VESPA_USER} var/db/vespa # END directory fixups diff --git a/vespaclient-container-plugin/OWNERS b/vespaclient-container-plugin/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/vespaclient-container-plugin/OWNERS +++ b/vespaclient-container-plugin/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/LocalDataVisitorHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/LocalDataVisitorHandler.java index 4dc47f20889..bd6d2f130ea 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/LocalDataVisitorHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/LocalDataVisitorHandler.java @@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets; /** * Handling data from visit. * - * @author dybdahl + * @author dybis */ class LocalDataVisitorHandler extends DumpVisitorDataHandler { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandler.java index 240cc3c3c61..fb1b317399c 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandler.java @@ -8,7 +8,7 @@ import java.util.Optional; /** * Abstract the backend stuff for the REST API, such as retrieving or updating documents. * - * @author dybdahl + * @author dybis */ public interface OperationHandler { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java index 21fd930e9d5..24f9873da53 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java @@ -32,7 +32,7 @@ import java.util.Set; /** * Sends operations to messagebus via document api. * - * @author dybdahl + * @author dybis */ public class OperationHandlerImpl implements OperationHandler { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestApiException.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestApiException.java index b553d83d848..77552a61317 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestApiException.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestApiException.java @@ -4,7 +4,7 @@ package com.yahoo.document.restapi; /** * Exceptions for Rest API * - * @author dybdahl + * @author dybis */ public class RestApiException extends Exception { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestUri.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestUri.java index 98293508168..f50e7c247b1 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestUri.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/RestUri.java @@ -15,7 +15,7 @@ import static com.yahoo.jdisc.Response.Status.*; /** * Represents the request URI with its values. * - * @author dybdahl + * @author dybis */ public class RestUri { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java index 8b863a69f5c..c016241c095 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java @@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * API for handling single operation on a document and visiting. * - * @author dybdahl + * @author dybis */ public class RestApi extends LoggingRequestHandler { @@ -226,4 +226,4 @@ public class RestApi extends LoggingRequestHandler { }; return httpResponse; } -}
\ No newline at end of file +} diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/DocumentOperationMessageV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/DocumentOperationMessageV3.java index cd61ae91dae..33b24e4b5e9 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/DocumentOperationMessageV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/DocumentOperationMessageV3.java @@ -20,7 +20,7 @@ import com.yahoo.yolean.Exceptions; * * This implementation is based on V2, but the code is restructured. * - * @author dybdahl + * @author dybis */ class DocumentOperationMessageV3 { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java index 4694563ecbe..50ce18d1524 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java @@ -33,7 +33,7 @@ import java.util.logging.Logger; * The new API has more logic for shutting down cleanly as the server is more likely to be upgraded. * The code is restructured a bit. * - * @author dybdahl + * @author dybis */ public class FeedHandlerV3 extends LoggingRequestHandler { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReaderFactory.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReaderFactory.java index 67d6acd926a..23d4bc7f3b7 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReaderFactory.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReaderFactory.java @@ -11,7 +11,7 @@ import java.io.InputStream; /** * Class for creating FeedReader based on dataFormat. - * @author dybdahl + * @author dybis */ public class FeedReaderFactory { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/StreamReaderV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/StreamReaderV3.java index 0453d41fab8..0728106da7c 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/StreamReaderV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/StreamReaderV3.java @@ -16,7 +16,7 @@ import java.util.zip.GZIPInputStream; /** * This code is based on v2 code, but restructured so stream reading code is in one dedicated class. - * @author dybdahl + * @author dybis */ public class StreamReaderV3 { diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java index cfb120d9891..1c0252704ea 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java @@ -12,7 +12,7 @@ import java.util.concurrent.Executor; /** * For setting up RestApi with a simple document type manager. * - * @author dybdahl + * @author dybis */ public class RestApiWithTestDocumentHandler extends RestApi{ diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/FeedHandlerTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/FeedHandlerTest.java index 6d0ee59c68d..2910b7ad443 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/FeedHandlerTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/FeedHandlerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; /** * Unit test for FeedHandler class. * - * @author dybdahl + * @author dybis */ public class FeedHandlerTest { @@ -100,4 +100,4 @@ public class FeedHandlerTest { } -}
\ No newline at end of file +} diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/vespaxmlparser/MockFeedReaderFactory.java b/vespaclient-container-plugin/src/test/java/com/yahoo/vespaxmlparser/MockFeedReaderFactory.java index c245490b1d7..726ed0ebb17 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/vespaxmlparser/MockFeedReaderFactory.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/vespaxmlparser/MockFeedReaderFactory.java @@ -9,7 +9,7 @@ import java.io.InputStream; /** * For creating MockReader of innput stream. - * @author dybdahl + * @author dybis */ public class MockFeedReaderFactory extends FeedReaderFactory { diff --git a/vespaclient-core/OWNERS b/vespaclient-core/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/vespaclient-core/OWNERS +++ b/vespaclient-core/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/vespaclient/OWNERS b/vespaclient/OWNERS index 0e39145d8c3..123437e2758 100644 --- a/vespaclient/OWNERS +++ b/vespaclient/OWNERS @@ -1 +1 @@ -dybdahl +dybis diff --git a/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java b/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java index c1cb0cc3e6c..c06ba4a2245 100644 --- a/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java +++ b/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public class RcuHashMapBenchmark { diff --git a/vespajlib/developernotes/Utf8MicroBencmark.java b/vespajlib/developernotes/Utf8MicroBencmark.java index ff1ae4ce3a2..280aa75c8bc 100644 --- a/vespajlib/developernotes/Utf8MicroBencmark.java +++ b/vespajlib/developernotes/Utf8MicroBencmark.java @@ -2,7 +2,7 @@ package com.yahoo.text; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ diff --git a/vespajlib/developernotes/XMLMicroBenchmark.java b/vespajlib/developernotes/XMLMicroBenchmark.java index 6a9d02e1c45..4724ead679a 100644 --- a/vespajlib/developernotes/XMLMicroBenchmark.java +++ b/vespajlib/developernotes/XMLMicroBenchmark.java @@ -4,7 +4,7 @@ package com.yahoo.text; /** * It is what it says * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class XMLMicroBenchmark { diff --git a/vespajlib/developernotes/XMLWriterMicroBenchmark.java b/vespajlib/developernotes/XMLWriterMicroBenchmark.java index 67570d54ea6..d1d5f9cdf26 100644 --- a/vespajlib/developernotes/XMLWriterMicroBenchmark.java +++ b/vespajlib/developernotes/XMLWriterMicroBenchmark.java @@ -11,7 +11,7 @@ import java.nio.charset.CharsetEncoder; /** * It is what it says * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class XMLWriterMicroBenchmark { diff --git a/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java b/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java index 8df46e113a2..64ff6d736ea 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java @@ -19,7 +19,7 @@ import java.util.Set; * </p> * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author balder + * @author baldersheim * @since 5.1.4 * * @param <E> diff --git a/vespajlib/src/main/java/com/yahoo/collections/BobHash.java b/vespajlib/src/main/java/com/yahoo/collections/BobHash.java index b942c4e78f0..41e4a934d71 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/BobHash.java +++ b/vespajlib/src/main/java/com/yahoo/collections/BobHash.java @@ -81,7 +81,7 @@ public class BobHash { * Note: This is copying the string content, change implementation to * use efficiently on large strings. * - * <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * bratseth */ public static int hash(String key) { return hash(Utf8.toBytes(key), 0); diff --git a/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java b/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java index 98cc443fd71..23fed831d1f 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java @@ -8,11 +8,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 13.11.12 - * Time: 20:57 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class ConcurrentResourcePool<T> implements Iterable<T> { diff --git a/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java b/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java index 43f38c67e4d..c920444a677 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java +++ b/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java @@ -17,7 +17,7 @@ import java.util.Set; * As with regular maps, this can only be used safely if the content of the map is immutable. * If not, the {@link #copyMap} method can be overridden to perform a deep clone. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @Beta public class CopyOnWriteHashMap<K,V> extends AbstractMap<K,V> implements Cloneable { diff --git a/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java b/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java index e145a08be09..4e6e1340b98 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java +++ b/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java @@ -9,7 +9,7 @@ import java.util.List; * After freezing, edit operations will throw UnsupportedOperationException. * Freezable lists may optionally allow new items to be added to the end of the list also after freeze. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.20 */ public class FreezableArrayList<ITEM> extends ListenableArrayList<ITEM> { diff --git a/vespajlib/src/main/java/com/yahoo/collections/ListMap.java b/vespajlib/src/main/java/com/yahoo/collections/ListMap.java index ab2c97fda17..8054179be30 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ListMap.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ListMap.java @@ -10,7 +10,7 @@ import java.util.*; /** * A map holding multiple items at each key (using ArrayList and HashMap). * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ListMap<K, V> { diff --git a/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java b/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java index 1b77e97d159..d195cf36172 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java @@ -8,7 +8,7 @@ import java.util.List; /** * An array list which notifies listeners after one or more items are added * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.17 */ @SuppressWarnings("serial") diff --git a/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java b/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java index 5dd9f68e5cc..f15c383be76 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java +++ b/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java @@ -7,11 +7,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 6/12/13 - * Time: 9:03 AM - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public final class MethodCache { private final String methodName; diff --git a/vespajlib/src/main/java/com/yahoo/collections/Pair.java b/vespajlib/src/main/java/com/yahoo/collections/Pair.java index 8969e1b1021..30c4c1f9276 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/Pair.java +++ b/vespajlib/src/main/java/com/yahoo/collections/Pair.java @@ -5,7 +5,7 @@ package com.yahoo.collections; * An immutable pair of objects. This implements equals and hashCode by delegating to the * pair objects. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Pair<F, S> { diff --git a/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java b/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java index 44d99f78cfe..d6fe032e0e3 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java @@ -2,7 +2,7 @@ package com.yahoo.collections; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public abstract class ResourceFactory<T> { diff --git a/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java b/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java index dcf73425f6d..112a77b069d 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java @@ -9,7 +9,7 @@ import java.util.Iterator; * <p>This implements a simple stack based resource pool. If you are out of resources new are allocated from the * factory.</p> * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public final class ResourcePool<T> implements Iterable<T> { diff --git a/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java b/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java index cbf12bd3d94..e94a4b9b802 100644 --- a/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java +++ b/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java @@ -4,7 +4,9 @@ package com.yahoo.compress; import java.nio.ByteBuffer; /** - * TODO: balder + * Utility for bytewise compressing of integers into a ByteBuffer. + * + * @author: baldersheim */ public class IntegerCompressor { diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java b/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java index e15a3734094..2c32791fb56 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java @@ -12,7 +12,7 @@ import java.util.Set; * it back as active again. Here are no locks, but the cost is that inserts will happen a lot more than necessary. The * map reference is volatile, but on most multicpu machines that has no cost unless modified.</p> * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public class CopyOnWriteHashMap<K, V> implements Map<K, V> { diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java index 5be6da8c66d..c3b6af0c1d8 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java @@ -7,11 +7,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 24.04.13 - * Time: 19:00 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class ThreadFactoryFactory { static public synchronized ThreadFactory getThreadFactory(String name) { diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java index 8a79db6a6eb..42d3ff51aae 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java @@ -16,7 +16,7 @@ import java.util.NoSuchElementException; * * @since 4.2 * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ThreadRobustList<T> implements Iterable<T> { diff --git a/vespajlib/src/main/java/com/yahoo/geo/BoundingBoxParser.java b/vespajlib/src/main/java/com/yahoo/geo/BoundingBoxParser.java index 001386cd4b0..6c7a265ca60 100644 --- a/vespajlib/src/main/java/com/yahoo/geo/BoundingBoxParser.java +++ b/vespajlib/src/main/java/com/yahoo/geo/BoundingBoxParser.java @@ -30,7 +30,7 @@ import com.yahoo.text.DoubleParser; * s=40.183868,w=-74.819519,n=40.248291,e=-74.728798 * </pre> * - * @author Arne J + * @author arnej27959 */ public class BoundingBoxParser { diff --git a/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java b/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java index 65016ff5384..a769aa4bda4 100644 --- a/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java +++ b/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java @@ -14,7 +14,7 @@ import java.nio.charset.CharsetEncoder; * Base class for writers needing to accept binary data. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public abstract class AbstractByteWriter extends GenericWriter implements WritableByteTransmitter { diff --git a/vespajlib/src/main/java/com/yahoo/io/IOUtils.java b/vespajlib/src/main/java/com/yahoo/io/IOUtils.java index 61687f92659..4dcf3f89d33 100644 --- a/vespajlib/src/main/java/com/yahoo/io/IOUtils.java +++ b/vespajlib/src/main/java/com/yahoo/io/IOUtils.java @@ -13,7 +13,7 @@ import java.nio.ByteBuffer; /** * <p>Some static io convenience methods.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a> */ public abstract class IOUtils { diff --git a/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java b/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java index d0d52a8c619..65201a02bae 100644 --- a/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java +++ b/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java @@ -10,7 +10,7 @@ import java.util.List; /** * A reader with a name. All reader methods are delegated to the wrapped reader. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @Beta public class NamedReader extends Reader { diff --git a/vespajlib/src/main/java/com/yahoo/java7compat/Util.java b/vespajlib/src/main/java/com/yahoo/java7compat/Util.java index 8a838308fbb..36bc23eba52 100644 --- a/vespajlib/src/main/java/com/yahoo/java7compat/Util.java +++ b/vespajlib/src/main/java/com/yahoo/java7compat/Util.java @@ -2,7 +2,7 @@ package com.yahoo.java7compat; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ diff --git a/vespajlib/src/main/java/com/yahoo/net/URI.java b/vespajlib/src/main/java/com/yahoo/net/URI.java index 1f9baa36c06..e97018f20cf 100644 --- a/vespajlib/src/main/java/com/yahoo/net/URI.java +++ b/vespajlib/src/main/java/com/yahoo/net/URI.java @@ -13,13 +13,10 @@ import static com.yahoo.text.Lowercase.toLowerCase; * <p>This does more normalization of hierarchical URIs (URLs) than * described in the RFC and allows hosts with underscores.</p> * - * @author <a href="mailto:bratseth@fast.no">Jon S Bratseth</a> + * @author bratseth */ public class URI implements Cloneable, java.io.Serializable, Comparable<URI> { - /** - * - */ private static final long serialVersionUID = 2271558213498856909L; /** The uri string */ @@ -795,7 +792,7 @@ public class URI implements Cloneable, java.io.Serializable, Comparable<URI> { } } - public static enum URLContext { + public enum URLContext { URL_SCHEME(0, "scheme"), URL_HOST(1, "host"), URL_DOMAIN(2, "domain"), @@ -811,9 +808,10 @@ public class URI implements Cloneable, java.io.Serializable, Comparable<URI> { public final int id; public final String name; - private URLContext(int id, String name) { + URLContext(int id, String name) { this.id = id; this.name = name; } } + } diff --git a/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java b/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java index f924740321f..1c1b818fb36 100644 --- a/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java +++ b/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java @@ -15,14 +15,14 @@ public class ForceLoad { * @param classNames array of names of classes (without package prefix) * to force load. **/ - public static void forceLoad(String packageName, String[] classNames) + public static void forceLoad(String packageName, String[] classNames, ClassLoader loader) throws ForceLoadError { String fullClassName = ""; try { for (String className : classNames) { fullClassName = packageName + "." + className; - Class.forName(fullClassName); + Class.forName(fullClassName, true, loader); } } catch (Exception e) { throw new ForceLoadError(fullClassName, e); diff --git a/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java b/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java index bb2909b346a..609fab1c58f 100644 --- a/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java +++ b/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java @@ -12,12 +12,13 @@ import com.yahoo.collections.Pair; /** * Executes a system command synchronously. * - * @author <a href="mailto:bratseth@yahoo-inc">Jon S Bratseth</a> + * @author bratseth */ public class ProcessExecuter { /** * Executes the given command synchronously without timeout. + * * @return Retcode and stdout/stderr merged */ public Pair<Integer, String> exec(String command) throws IOException { @@ -29,6 +30,7 @@ public class ProcessExecuter { /** * Executes the given command synchronously without timeout. + * * @param command tokens * @return Retcode and stdout/stderr merged */ diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java b/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java index f46f000d1ee..1738dd8f1ee 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java @@ -15,7 +15,7 @@ import java.util.Set; * the dimensions specified explicitly and the ones specified in the * tensor cell addresses. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ @Beta public class MapTensorBuilder { diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java index 507a2f9f612..3a5026a450f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; * A dimension can be indexed (bound or unbound) or mapped. * Currently, we only support tensor types where all dimensions have the same type. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ @Beta public class TensorType { diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java index 3d2e1663971..5cf046f6394 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Class for parsing a tensor type spec. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ @Beta class TensorTypeParser { diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/BinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/BinaryFormat.java index 97d62d5169a..652874082cf 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/BinaryFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/BinaryFormat.java @@ -9,7 +9,7 @@ import com.yahoo.tensor.Tensor; * Representation of a specific binary format with functions for serializing a Tensor object into * this format or de-serializing binary data into a Tensor object. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ @Beta interface BinaryFormat { diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/CompactBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/CompactBinaryFormat.java index 0c1f04552f4..e850e20fcab 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/CompactBinaryFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/CompactBinaryFormat.java @@ -20,7 +20,7 @@ import java.util.*; * Note that the dimensions are sorted and the tensor address labels are given in the same sorted order. * Unspecified labels are encoded as the empty string "". * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ @Beta class CompactBinaryFormat implements BinaryFormat { diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/TypedBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/TypedBinaryFormat.java index cdd26a11ac2..9e2c0b5a63f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/TypedBinaryFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/TypedBinaryFormat.java @@ -12,7 +12,7 @@ import com.yahoo.tensor.Tensor; * The actual binary format used is not a concern for the client and * is hidden in this class and in the binary data. * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ @Beta public class TypedBinaryFormat { diff --git a/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java b/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java index 1a11e30dd9d..15979c00b3c 100644 --- a/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java +++ b/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java @@ -4,7 +4,7 @@ package com.yahoo.text; import java.nio.ByteBuffer; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public abstract class AbstractUtf8Array implements Comparable<AbstractUtf8Array> { diff --git a/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java b/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java index a17d821ff9d..54ef07842f1 100644 --- a/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java +++ b/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java @@ -5,7 +5,7 @@ package com.yahoo.text; * Utility class parsing a string into a boolean. * In contrast to Boolean.parseBoolean in the Java API this parser is strict. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class BooleanParser { diff --git a/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java b/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java index 258f5f74d14..433bed8abe6 100644 --- a/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java +++ b/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java @@ -2,11 +2,7 @@ package com.yahoo.text; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 11.11.12 - * Time: 11:25 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class CaseInsensitiveIdentifier extends Identifier { private final Identifier original; diff --git a/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java b/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java index 364cb87d6f7..e52fb294bb1 100644 --- a/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java +++ b/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java @@ -2,11 +2,7 @@ package com.yahoo.text; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 11.11.12 - * Time: 21:11 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class DataTypeIdentifier { private static final byte [] ARRAY = {'a', 'r', 'r', 'a', 'y'}; diff --git a/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java b/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java index a7876d620b9..eb36eb4e396 100644 --- a/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java +++ b/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java @@ -6,7 +6,7 @@ import java.io.IOException; /** * Wraps another writer and also converting IOException to Exceptions. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public class ForwardWriter extends GenericWriter { diff --git a/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java b/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java index 0a07b617352..e231a41f08e 100644 --- a/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java +++ b/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java @@ -9,7 +9,7 @@ import java.io.Writer; * java.io.Writer, but it allows for more overrides for speed. * This introduces additional interfaces in addition to the java.lang.Writer. * The purpose is to allow for optimizations. - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ diff --git a/vespajlib/src/main/java/com/yahoo/text/Identifier.java b/vespajlib/src/main/java/com/yahoo/text/Identifier.java index 2d74b61e1e0..006c1baa65d 100644 --- a/vespajlib/src/main/java/com/yahoo/text/Identifier.java +++ b/vespajlib/src/main/java/com/yahoo/text/Identifier.java @@ -2,11 +2,9 @@ package com.yahoo.text; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 11.11.12 - * Time: 10:37 * This class is used to represent a legal identifier of [a-zA-Z_][a-zA-Z_0-9]* + * + * @author baldersheim */ public class Identifier extends Utf8Array { public Identifier(String s) { diff --git a/vespajlib/src/main/java/com/yahoo/text/JSON.java b/vespajlib/src/main/java/com/yahoo/text/JSON.java index 33af017b81d..d40638c3d3c 100644 --- a/vespajlib/src/main/java/com/yahoo/text/JSON.java +++ b/vespajlib/src/main/java/com/yahoo/text/JSON.java @@ -6,7 +6,7 @@ import java.util.Map; /** * Static methods for working with the map textual format which is parsed by {@link MapParser} * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class JSON { diff --git a/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java b/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java index b89092e9780..1ea9dc5eab9 100644 --- a/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java +++ b/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java @@ -7,7 +7,7 @@ import java.io.Writer; /** * Wraps a simple java.lang.Writer. Of course you loose the possible optimizations. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public final class JavaWriterWriter extends GenericWriter { diff --git a/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java b/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java index b0f5b023a38..5b2d0ccecd0 100644 --- a/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java +++ b/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java @@ -2,11 +2,7 @@ package com.yahoo.text; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 11.11.12 - * Time: 20:50 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class LowercaseIdentifier extends Identifier { public LowercaseIdentifier(String s) { diff --git a/vespajlib/src/main/java/com/yahoo/text/PositionedString.java b/vespajlib/src/main/java/com/yahoo/text/PositionedString.java index de2e349ef82..918a683a626 100644 --- a/vespajlib/src/main/java/com/yahoo/text/PositionedString.java +++ b/vespajlib/src/main/java/com/yahoo/text/PositionedString.java @@ -5,7 +5,7 @@ package com.yahoo.text; * A string which has a current position. * Useful for writing simple single-pass parsers. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.15 */ public class PositionedString { diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8.java b/vespajlib/src/main/java/com/yahoo/text/Utf8.java index 9126870117e..0d3386ee093 100644 --- a/vespajlib/src/main/java/com/yahoo/text/Utf8.java +++ b/vespajlib/src/main/java/com/yahoo/text/Utf8.java @@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets; * * @author arnej27959 * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * */ public final class Utf8 { diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java b/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java index 30b2e665392..1cb25094466 100644 --- a/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java +++ b/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java @@ -9,7 +9,7 @@ import java.nio.ByteBuffer; * This is a class that has speed as its primary purpose. * If you have a string, consider Utf8String * If you have a large backing array consider Utf8PartialArray - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java b/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java index c6032e751b7..1b74c56afc4 100644 --- a/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java +++ b/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java @@ -3,7 +3,7 @@ package com.yahoo.text; /** * This wraps a window in a backing byte array. Without doing any copying. - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public class Utf8PartialArray extends Utf8Array { diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8String.java b/vespajlib/src/main/java/com/yahoo/text/Utf8String.java index 1f4dfc0d4f6..da0f4a67c83 100644 --- a/vespajlib/src/main/java/com/yahoo/text/Utf8String.java +++ b/vespajlib/src/main/java/com/yahoo/text/Utf8String.java @@ -4,7 +4,7 @@ package com.yahoo.text; /** * String with Utf8 backing. - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public final class Utf8String extends Utf8Array implements CharSequence diff --git a/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java b/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java index ee5ff753c57..c52c4b8a0ea 100644 --- a/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java +++ b/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java @@ -15,7 +15,7 @@ import java.util.List; * using these methods, start tags are closed and newlines inserted automatically as appropriate. * * @author bratseth - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class XMLWriter extends ForwardWriter { diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java index cf5d2e28af3..e99f71dd918 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java @@ -8,7 +8,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; /** - * @author balder + * @author baldersheim */ public class BufferSerializer implements Serializer, Deserializer { protected GrowableByteBuffer buf; diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java index abd82f6b251..50197eada63 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.objects; /** - * @author balder + * @author baldersheim */ public interface Deserializer { byte getByte(FieldBase field); diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java index 2a7f9cbff7a..a05eca5cdcf 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.objects; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public class FieldBase { private final String name; diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java index 7bc9c2f8d6b..e0edc6f4e64 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java @@ -15,7 +15,7 @@ import java.util.HashMap; * of an identifiable object is done through the {@link #create(Deserializer)} or {@link #createFromId(int)} factory * methods. * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Identifiable extends Selectable implements Cloneable { diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java index 85647c58744..0a8ac288337 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java @@ -5,7 +5,7 @@ package com.yahoo.vespa.objects; * This is a class containing the global ids that are given out. * Must be in sync with version for c++ in staging_vespalib/src/vespalib/objects/ids.h * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim */ public interface Ids { public static int document = 0x1000; diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java index a49d09a212b..b856f78c5d6 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.objects; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * * This class acts as an interface for traversing a tree, or a graph. * Every non leaf Object implements {@link #selectMembers(ObjectPredicate, ObjectOperation)} implementing diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java index a50252fc70c..5001dd22223 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.objects; import java.nio.ByteBuffer; /** - * @author balder + * @author baldersheim */ public interface Serializer { Serializer putByte(FieldBase field, byte value); diff --git a/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java b/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java index 51cdd11bb7d..35a40b87c3b 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java +++ b/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** - * Created by balder on 1/20/14. + * @author baldersheim */ public class CollectionsBenchMark { abstract static class BenchMark { diff --git a/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java index 4370a9b46b0..a66d9c45893 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CopyOnWriteHashMapTestCase { diff --git a/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java b/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java index 762ae9d5b60..5a6c331393f 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java +++ b/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.junit.Assert.fail; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FreezableArrayListListener { diff --git a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java index e3fb48c7a0e..0412d9fefe4 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.ListIterator; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ListenableArrayListTestCase { diff --git a/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java b/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java index 46a70a4c956..95f734ba5f8 100644 --- a/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java +++ b/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java @@ -10,7 +10,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** - * TODO: balder + * Test that integers compresses correctly. + * + * @author: baldersheim */ public class IntegerCompressorTest { private void verifyPositiveNumber(int n, byte [] expected) { diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java index 22619e3865e..23d106a2790 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public class CopyOnWriteHashMapTest { diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java index 7fc6a9cc390..b13e4a7af22 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java @@ -9,11 +9,7 @@ import java.util.concurrent.ThreadFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 26.04.13 - * Time: 12:01 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class ThreadFactoryFactoryTest { diff --git a/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java b/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java index 47a8ade2235..b09296389b8 100644 --- a/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.geo; /** * Tests for the BoundingBoxParser class. * - * @author Arne J + * @author arnej27959 */ public class BoundingBoxParserTestCase extends junit.framework.TestCase { diff --git a/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java b/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java index 7f89cccc6c8..d4df3478da8 100644 --- a/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IOUtilsTestCase extends junit.framework.TestCase { diff --git a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java index 280d0782bd2..4d6954ca9a8 100644 --- a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java @@ -13,7 +13,7 @@ import com.yahoo.protect.ClassValidator; /** * Tests all method of NamedReader. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class NamedReaderTestCase extends junit.framework.TestCase { diff --git a/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java b/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java index 1f919978b7a..aebf081f496 100644 --- a/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java +++ b/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ diff --git a/vespajlib/src/test/java/com/yahoo/net/URITestCase.java b/vespajlib/src/test/java/com/yahoo/net/URITestCase.java index 7bb2303d7bb..dc04f42e9d1 100644 --- a/vespajlib/src/test/java/com/yahoo/net/URITestCase.java +++ b/vespajlib/src/test/java/com/yahoo/net/URITestCase.java @@ -1,14 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.net; - import java.util.List; - /** * Tests the URI class * - * @author <a href="mailto:bratseth@fast.no">Jon S Bratseth</a> + * @author bratseth */ public class URITestCase extends junit.framework.TestCase { @@ -472,41 +470,43 @@ public class URITestCase extends junit.framework.TestCase { // Error reported int bug #2466528 public void testFileURIEmptyHost() { - URI uri = new URI("file:///C:/Inetpub/wwwroot/DW_SHORTCUTS.htm"); - List<URI.Token> tokens = uri.tokenize(); - URI.Token token; - token = tokens.get(0); - assertEquals("file", token.getToken()); - assertEquals(URI.URLContext.URL_SCHEME, token.getContext()); - - token = tokens.get(1); - assertEquals("localhost", token.getToken()); - assertEquals(URI.URLContext.URL_HOST, token.getContext()); - - token = tokens.get(2); - assertEquals("C", token.getToken()); - assertEquals(URI.URLContext.URL_PATH, token.getContext()); - - token = tokens.get(3); - assertEquals("Inetpub", token.getToken()); - assertEquals(URI.URLContext.URL_PATH, token.getContext()); - - token = tokens.get(4); - assertEquals("wwwroot", token.getToken()); - assertEquals(URI.URLContext.URL_PATH, token.getContext()); - - token = tokens.get(5); - assertEquals("DW_SHORTCUTS", token.getToken()); - assertEquals(URI.URLContext.URL_PATH, token.getContext()); - - token = tokens.get(6); - assertEquals("htm", token.getToken()); - assertEquals(URI.URLContext.URL_PATH, token.getContext()); - - try { - tokens.get(7); - fail(); - } catch (IndexOutOfBoundsException ioobe) { - } + URI uri = new URI("file:///C:/Inetpub/wwwroot/DW_SHORTCUTS.htm"); + List<URI.Token> tokens = uri.tokenize(); + URI.Token token; + token = tokens.get(0); + assertEquals("file", token.getToken()); + assertEquals(URI.URLContext.URL_SCHEME, token.getContext()); + + token = tokens.get(1); + assertEquals("localhost", token.getToken()); + assertEquals(URI.URLContext.URL_HOST, token.getContext()); + + token = tokens.get(2); + assertEquals("C", token.getToken()); + assertEquals(URI.URLContext.URL_PATH, token.getContext()); + + token = tokens.get(3); + assertEquals("Inetpub", token.getToken()); + assertEquals(URI.URLContext.URL_PATH, token.getContext()); + + token = tokens.get(4); + assertEquals("wwwroot", token.getToken()); + assertEquals(URI.URLContext.URL_PATH, token.getContext()); + + token = tokens.get(5); + assertEquals("DW_SHORTCUTS", token.getToken()); + assertEquals(URI.URLContext.URL_PATH, token.getContext()); + + token = tokens.get(6); + assertEquals("htm", token.getToken()); + assertEquals(URI.URLContext.URL_PATH, token.getContext()); + + try { + tokens.get(7); + fail(); + } catch (IndexOutOfBoundsException ioobe) { + // Success + } } + } diff --git a/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java b/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java index fa611d8fd71..3e18df93e47 100644 --- a/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java +++ b/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java @@ -2,7 +2,7 @@ package com.yahoo.protect; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TestErrorMessage extends junit.framework.TestCase { diff --git a/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java b/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java index 6acbda729e5..d5de37ef50f 100644 --- a/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.protect; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ValidatorTestCase extends junit.framework.TestCase { diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java index 8ee1a91c970..5963f5a8eca 100644 --- a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java +++ b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.lang.Integer; /** - * Created by balder on 2/26/14. + * @author baldersheim */ public class JsonBenchmark { private static byte [] createJson(int numElements) { diff --git a/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java b/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java index ec4f716247e..078142014cd 100644 --- a/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java @@ -8,8 +8,10 @@ public class ForceLoadTestCase extends junit.framework.TestCase { } public void testLoadClasses() { + try { - ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar" }); + ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar" }, + this.getClass().getClassLoader()); } catch (ForceLoadError e) { e.printStackTrace(); assertTrue(false); @@ -18,7 +20,8 @@ public class ForceLoadTestCase extends junit.framework.TestCase { public void testLoadBogusClass() { try { - ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar", "Baz" }); + ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar", "Baz" }, + this.getClass().getClassLoader()); } catch (ForceLoadError e) { return; } diff --git a/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java b/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java index 2bf1d8c094a..97be79c069a 100644 --- a/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java @@ -8,7 +8,7 @@ import java.io.File; import java.io.IOException; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ProcessExecuterTestCase extends junit.framework.TestCase { diff --git a/vespajlib/src/test/java/com/yahoo/tensor/MapTensorBuilderTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/MapTensorBuilderTestCase.java index 92f0e71c7f5..889b2851a08 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/MapTensorBuilderTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/MapTensorBuilderTestCase.java @@ -8,7 +8,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class MapTensorBuilderTestCase { diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java index 59d77f6569a..feab8de97d6 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; /** - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class TensorTypeTestCase { diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/CompactBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/CompactBinaryFormatTestCase.java index 23589577c0c..bfa7f5a8546 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/CompactBinaryFormatTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/CompactBinaryFormatTestCase.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals; * TODO: When new formats are added we should refactor this test to test all formats * with the same set of tensor inputs (if feasible). * - * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a> + * @author geirst */ public class CompactBinaryFormatTestCase { diff --git a/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java index 6c6b5b62506..57eb86dc092 100644 --- a/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java @@ -6,11 +6,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 11.11.12 - * Time: 11:37 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class CaseInsensitiveIdentifierTestCase { @Test diff --git a/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java index b79f65d9eb2..75a5b7b277a 100644 --- a/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java @@ -5,11 +5,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 12.11.12 - * Time: 08:10 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class DataTypeIdentifierTestCase { @Test diff --git a/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java index 447b109983e..126cc10f5bc 100644 --- a/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java @@ -5,11 +5,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 11.11.12 - * Time: 10:58 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class IdentifierTestCase { @Test diff --git a/vespajlib/src/test/java/com/yahoo/text/JSONTest.java b/vespajlib/src/test/java/com/yahoo/text/JSONTest.java index 53be5a1bda5..2e7e1da65f0 100644 --- a/vespajlib/src/test/java/com/yahoo/text/JSONTest.java +++ b/vespajlib/src/test/java/com/yahoo/text/JSONTest.java @@ -8,7 +8,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class JSONTest { diff --git a/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java index 16d9fe65769..cbb0c37cdd9 100644 --- a/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.*; /** * Tests the JSON writer * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings("deprecation") public class JSONWriterTestCase { diff --git a/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java index 7d6b066a499..00f4010bdf4 100644 --- a/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java @@ -6,11 +6,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * Created with IntelliJ IDEA. - * User: balder - * Date: 11.11.12 - * Time: 20:54 - * To change this template use File | Settings | File Templates. + * @author baldersheim */ public class LowercaseIdentifierTestCase { @Test diff --git a/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java b/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java index 21ab4fd4309..5b4456f14f4 100644 --- a/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java +++ b/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java @@ -8,7 +8,7 @@ import java.util.Map; * A benchmark of map parsing. * Expected time on Jon's mac: 200 microseconds per 1k size map. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapParserMicroBenchmark { diff --git a/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java b/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java index 7bf11c277e1..f846c6263d1 100644 --- a/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java @@ -6,7 +6,7 @@ import java.util.Map; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapParserTestCase { diff --git a/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java b/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java index 69d62d59be5..7e62180d88e 100644 --- a/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java +++ b/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java @@ -6,7 +6,7 @@ import org.junit.Test; /** * Compares alternative ways of appending strings * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class StringAppendMicroBenchmarkTest { diff --git a/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java index dc3530fdd97..75f6bf64734 100644 --- a/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue; /** * This test is currently incomplete. Also much tested in the prelude module though. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings("deprecation") public class XMLWriterTestCase { diff --git a/vespalib/OWNERS b/vespalib/OWNERS index bfae37a0f56..dc761719bf4 100644 --- a/vespalib/OWNERS +++ b/vespalib/OWNERS @@ -1,3 +1,3 @@ havardpe arnej27959 -balder +baldersheim diff --git a/vespamalloc/OWNERS b/vespamalloc/OWNERS index 2b49711c817..d987fcf8c5b 100644 --- a/vespamalloc/OWNERS +++ b/vespamalloc/OWNERS @@ -1,2 +1,2 @@ -balder +baldersheim vekterli diff --git a/vespamalloc/src/vespamalloc/util/osmem.cpp b/vespamalloc/src/vespamalloc/util/osmem.cpp index c5f44342c75..0b02900b678 100644 --- a/vespamalloc/src/vespamalloc/util/osmem.cpp +++ b/vespamalloc/src/vespamalloc/util/osmem.cpp @@ -6,6 +6,7 @@ #include <sys/mman.h> #include <linux/mman.h> #include <algorithm> +#include <errno.h> namespace vespamalloc { diff --git a/vsm/OWNERS b/vsm/OWNERS index f62763ab1da..465c0e30113 100644 --- a/vsm/OWNERS +++ b/vsm/OWNERS @@ -1,2 +1,2 @@ -balder +baldersheim geirst diff --git a/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java b/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java index 38c6abf055b..fb0bcae7ca8 100644 --- a/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java +++ b/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java @@ -12,7 +12,7 @@ import java.util.Set; * it back as active again. Here are no locks, but the cost is that inserts will happen a lot more than necessary. The * map reference is volatile, but on most multi-cpu machines that has no cost unless modified.</p> * - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public class CopyOnWriteHashMap<K, V> implements Map<K, V> { diff --git a/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java b/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java index 5060ed8ef6a..25f4f62f418 100644 --- a/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java +++ b/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java @@ -19,7 +19,7 @@ import java.util.NoSuchElementException; * <p>The usage of <tt>ThreadRobustList</tt> has no memory consistency effects. </p> * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.15 */ public class ThreadRobustList<T> implements Iterable<T> { diff --git a/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java b/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java index d7e9d128ebd..641462b8819 100644 --- a/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java +++ b/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java @@ -22,7 +22,7 @@ import java.util.NoSuchElementException; * need to synchronize their access on the <tt>TraceNode</tt>.</p> * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.15 */ public class TraceNode { diff --git a/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java b/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java index 2cb48616e56..5000b5220c8 100644 --- a/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java +++ b/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java @@ -4,7 +4,7 @@ package com.yahoo.yolean.trace; /** * <p>This class is an abstract visitor of {@link TraceNode}. See {@link TraceNode#accept(TraceVisitor)}.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.15 */ public abstract class TraceVisitor { diff --git a/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java b/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java index 36c295ba7f4..893993b3318 100644 --- a/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java +++ b/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.yolean; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExceptionsTestCase extends junit.framework.TestCase { diff --git a/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java b/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java index 280fa2bd22f..22f6f726954 100644 --- a/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java +++ b/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ public class CopyOnWriteHashMapTest { diff --git a/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java b/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java index cc25ecf4cd0..097020ec579 100644 --- a/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java +++ b/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TraceNodeTestCase { diff --git a/zkfacade/OWNERS b/zkfacade/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/zkfacade/OWNERS +++ b/zkfacade/OWNERS @@ -1 +1 @@ -musum +hmusum |