diff options
1043 files changed, 2294 insertions, 1625 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 49b031c7664..84cd755ac79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # @author Vegard Sjonfjell # @author Eirik Nygaard +# @author Arnstein Ressem cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(vespa CXX C) 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/build_settings.cmake b/build_settings.cmake index 7898ccf00fc..2115d80d387 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -1,8 +1,14 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # @author Vegard Sjonfjell -if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(OS_IS_MACOSX true) -endif() + +include(vtag.cmake) + +# Build options +# Whether to build unit tests as part of the 'all' target +set(EXCLUDE_TESTS_FROM_ALL FALSE CACHE BOOL "If TRUE, do not build tests as part of the 'all' target") + +# Whether to run unit tests via valgrind +set(VALGRIND_UNIT_TESTS FALSE CACHE BOOL "If TRUE, run unit tests via valgrind") # Warnings set(WARN_OPTS "-Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wformat -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings") @@ -10,7 +16,6 @@ set(WARN_OPTS "-Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wfo # C and C++ compiler flags set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -DWITH_SHIPPED_GEOIP -march=westmere -mtune=intel") -include(vtag.cmake) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VTAG_DEFINES}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -Wnon-virtual-dtor -fvisibility-inlines-hidden -fdiagnostics-color=auto") @@ -24,6 +29,8 @@ set(CMAKE_CXX_STANDARD 14) # Always build shared libs if not explicitly specified set(BUILD_SHARED_LIBS ON) +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + # Default RPATH settings for CMake 3.4: # For non-installed targets, reference external libraries using an RPATH into the build tree. # For installed targets, reference external libraries using INSTALL_RPATH (i.e. /home/y/lib64 on ylinux) @@ -31,8 +38,8 @@ set(CMAKE_CMAKE_SKIP_BUILD_RPATH FALSE) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) -# OSX Stuff -if(OS_IS_MACOSX) +# OS X Stuff +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(MACOSX_RPATH ON) if(__COMPILER_GNU) @@ -41,13 +48,14 @@ if(OS_IS_MACOSX) endif() endif() -# Use ccache if it is found +# Find ccache and use it if it is found find_program(CCACHE_EXECUTABLE ccache) if(CCACHE_EXECUTABLE) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_EXECUTABLE}) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE}) endif() +# Check for valgrind and set flags find_program(VALGRIND_EXECUTABLE valgrind) if(VALGRIND_EXECUTABLE) set(VALGRIND_SUPPRESSIONS_FILE "${PROJECT_SOURCE_DIR}/valgrind-suppressions.txt") @@ -55,8 +63,9 @@ if(VALGRIND_EXECUTABLE) set(VALGRIND_COMMAND "${VALGRIND_EXECUTABLE} ${VALGRIND_OPTIONS}") endif() -set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - +if(EXTRA_INCLUDE_DIRECTORY) + include_directories(${EXTRA_INCLUDE_DIRECTORY}) +endif() if(EXTRA_LINK_DIRECTORY) link_directories(${EXTRA_LINK_DIRECTORY}) endif() 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/Makefile b/config-model/src/main/Makefile new file mode 100644 index 00000000000..5e7024ccff9 --- /dev/null +++ b/config-model/src/main/Makefile @@ -0,0 +1,30 @@ +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#all: services.xsd hosts.xsd + +trangjar=../../target/trang.jar + +all: resources/schema/services.rng resources/schema/hosts.rng resources/schema/container-include.rng resources/schema/services.xsd resources/schema/hosts.xsd resources/schema/container-include.xsd + +resources/schema/services.rng: resources/schema/services.rnc resources/schema/common.rnc resources/schema/admin.rnc resources/schema/clients.rnc resources/schema/docproc.rnc resources/schema/routing.rnc resources/schema/clients-v2.rnc resources/schema/content.rnc resources/schema/genericmodule.rnc resources/schema/legacygenericcluster.rnc resources/schema/genericcluster.rnc resources/schema/legacygenericmodule.rnc resources/schema/containercluster.rnc + java -jar $(trangjar) -I rnc -O rng resources/schema/services.rnc resources/schema/services.rng + +resources/schema/services.xsd: resources/schema/services.rng + java -jar $(trangjar) -I rng -O xsd resources/schema/services.rng resources/schema/services.xsd + + +resources/schema/container-include.rng: resources/schema/common.rnc resources/schema/containercluster.rnc + java -jar $(trangjar) -I rnc -O rng resources/schema/container-include.rnc resources/schema/container-include.rng + +resources/schema/container-include.xsd: resources/schema/container-include.rng + java -jar $(trangjar) -I rng -O xsd resources/schema/container-include.rng resources/schema/container-include.xsd + + +resources/schema/hosts.rng: resources/schema/hosts.rnc + java -jar $(trangjar) -I rnc -O rng resources/schema/hosts.rnc resources/schema/hosts.rng + +resources/schema/hosts.xsd: resources/schema/hosts.rng + java -jar $(trangjar) -I rng -O xsd resources/schema/hosts.rng resources/schema/hosts.xsd + +clean: + rm -f resources/schema/*.rng + rm -f resources/schema/*.xsd 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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-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/src/tests/api/CMakeLists.txt b/config/src/tests/api/CMakeLists.txt index 93d12a5dc66..ef99f267586 100644 --- a/config/src/tests/api/CMakeLists.txt +++ b/config/src/tests/api/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_executable(config_api_test_app +vespa_add_executable(config_api_test_app TEST SOURCES api.cpp DEPENDS diff --git a/config/src/tests/configagent/CMakeLists.txt b/config/src/tests/configagent/CMakeLists.txt index 715e5260e30..b7a3bc941a2 100644 --- a/config/src/tests/configagent/CMakeLists.txt +++ b/config/src/tests/configagent/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_executable(config_configagent_test_app +vespa_add_executable(config_configagent_test_app TEST SOURCES configagent.cpp DEPENDS diff --git a/config/src/tests/configfetcher/CMakeLists.txt b/config/src/tests/configfetcher/CMakeLists.txt index 58598815f7d..ce87bd49b85 100644 --- a/config/src/tests/configfetcher/CMakeLists.txt +++ b/config/src/tests/configfetcher/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_executable(config_configfetcher_test_app +vespa_add_executable(config_configfetcher_test_app TEST SOURCES configfetcher.cpp DEPENDS diff --git a/config/src/tests/configformat/CMakeLists.txt b/config/src/tests/configformat/CMakeLists.txt index f17215bc66c..112e807cc42 100644 --- a/config/src/tests/configformat/CMakeLists.txt +++ b/config/src/tests/configformat/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_executable(config_configformat_test_app +vespa_add_executable(config_configformat_test_app TEST SOURCES configformat.cpp DEPENDS diff --git a/config/src/tests/configgen/CMakeLists.txt b/config/src/tests/configgen/CMakeLists.txt index 8a71b737919..263a646a315 100644 --- a/config/src/tests/configgen/CMakeLists.txt +++ b/config/src/tests/configgen/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_executable(config_configgen_test_app +vespa_add_executable(config_configgen_test_app TEST SOURCES configgen.cpp DEPENDS @@ -7,21 +7,21 @@ vespa_add_executable(config_configgen_test_app ) vespa_add_test(NAME config_configgen_test_app COMMAND config_configgen_test_app) vespa_generate_config(config_configgen_test_app ../../test/resources/configdefinitions/motd.def) -vespa_add_executable(config_vector_inserter_test_app +vespa_add_executable(config_vector_inserter_test_app TEST SOURCES vector_inserter.cpp DEPENDS config_cloudconfig ) vespa_add_test(NAME config_vector_inserter_test_app COMMAND config_vector_inserter_test_app) -vespa_add_executable(config_map_inserter_test_app +vespa_add_executable(config_map_inserter_test_app TEST SOURCES map_inserter.cpp DEPENDS config_cloudconfig ) vespa_add_test(NAME config_map_inserter_test_app COMMAND config_map_inserter_test_app) -vespa_add_executable(config_value_converter_test_app +vespa_add_executable(config_value_converter_test_app TEST SOURCES value_converter.cpp DEPENDS diff --git a/config/src/tests/configholder/CMakeLists.txt b/config/src/tests/configholder/CMakeLists.txt index 050160d2ad3..e0c83aeef8f 100644 --- a/config/src/tests/configholder/CMakeLists.txt +++ b/config/src/tests/configholder/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_executable(config_configholder_test_app +vespa_add_executable(config_configholder_test_app TEST SOURCES configholder.cpp DEPENDS diff --git a/config/src/tests/configmanager/CMakeLists.txt b/config/src/tests/configmanager/CMakeLists.txt index 87c11296dea..d12e09a6564 100644 --- a/config/src/tests/configmanager/CMakeLists.txt +++ b/config/src/tests/configmanager/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_executable(config_configmanager_test_app +vespa_add_executable(config_configmanager_test_app TEST SOURCES configmanager.cpp DEPENDS diff --git a/config/src/tests/configparser/CMakeLists.txt b/config/src/tests/configparser/CMakeLists.txt index d2bdaf09d40..3a14d9c2ee3 100644 --- a/config/src/tests/configparser/CMakeLists.txt +++ b/config/src/tests/configparser/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_executable(config_configparser_test_app +vespa_add_executable(config_configparser_test_app TEST SOURCES configparser.cpp DEPENDS diff --git a/config/src/tests/configretriever/CMakeLists.txt b/config/src/tests/configretriever/CMakeLists.txt index 5c0d8152734..89fd1ba4cc3 100644 --- a/config/src/tests/configretriever/CMakeLists.txt +++ b/config/src/tests/configretriever/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_executable(config_configretriever_test_app +vespa_add_executable(config_configretriever_test_app TEST SOURCES configretriever.cpp DEPENDS diff --git a/config/src/tests/configuri/CMakeLists.txt b/config/src/tests/configuri/CMakeLists.txt index 10fcac86c76..5608efa585d 100644 --- a/config/src/tests/configuri/CMakeLists.txt +++ b/config/src/tests/configuri/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_executable(config_configuri_test_app +vespa_add_executable(config_configuri_test_app TEST SOURCES configuri_test.cpp DEPENDS diff --git a/config/src/tests/failover/CMakeLists.txt b/config/src/tests/failover/CMakeLists.txt index aa5ab803bc5..d58bf9a3824 100644 --- a/config/src/tests/failover/CMakeLists.txt +++ b/config/src/tests/failover/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_executable(config_failover_test_app +vespa_add_executable(config_failover_test_app TEST SOURCES failover.cpp DEPENDS diff --git a/config/src/tests/file_subscription/CMakeLists.txt b/config/src/tests/file_subscription/CMakeLists.txt index f582732ffb2..71f12e0a7c6 100644 --- a/config/src/tests/file_subscription/CMakeLists.txt +++ b/config/src/tests/file_subscription/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_executable(config_file_subscription_test_app +vespa_add_executable(config_file_subscription_test_app TEST SOURCES file_subscription.cpp DEPENDS diff --git a/config/src/tests/frt/CMakeLists.txt b/config/src/tests/frt/CMakeLists.txt index 96f0fbb0076..cffca93c5b2 100644 --- a/config/src/tests/frt/CMakeLists.txt +++ b/config/src/tests/frt/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_executable(config_frt_test_app +vespa_add_executable(config_frt_test_app TEST SOURCES frt.cpp DEPENDS diff --git a/config/src/tests/frtconnectionpool/CMakeLists.txt b/config/src/tests/frtconnectionpool/CMakeLists.txt index 1979577f5fb..6d21903c357 100644 --- a/config/src/tests/frtconnectionpool/CMakeLists.txt +++ b/config/src/tests/frtconnectionpool/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_executable(config_frtconnectionpool_test_app +vespa_add_executable(config_frtconnectionpool_test_app TEST SOURCES frtconnectionpool.cpp DEPENDS diff --git a/config/src/tests/functiontest/CMakeLists.txt b/config/src/tests/functiontest/CMakeLists.txt index d798ad53de4..86481532c98 100644 --- a/config/src/tests/functiontest/CMakeLists.txt +++ b/config/src/tests/functiontest/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_executable(config_functiontest_test_app +vespa_add_executable(config_functiontest_test_app TEST SOURCES functiontest.cpp DEPENDS diff --git a/config/src/tests/getconfig/CMakeLists.txt b/config/src/tests/getconfig/CMakeLists.txt index f8ad5c2c7ed..dc7b9b34b4e 100644 --- a/config/src/tests/getconfig/CMakeLists.txt +++ b/config/src/tests/getconfig/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_executable(config_getconfig_test_app +vespa_add_executable(config_getconfig_test_app TEST SOURCES getconfig.cpp DEPENDS diff --git a/config/src/tests/legacysubscriber/CMakeLists.txt b/config/src/tests/legacysubscriber/CMakeLists.txt index 66022e31007..28ca227e7b5 100644 --- a/config/src/tests/legacysubscriber/CMakeLists.txt +++ b/config/src/tests/legacysubscriber/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_executable(config_legacysubscriber_test_app +vespa_add_executable(config_legacysubscriber_test_app TEST SOURCES legacysubscriber.cpp DEPENDS diff --git a/config/src/tests/misc/CMakeLists.txt b/config/src/tests/misc/CMakeLists.txt index a37f6411e0b..928fd41cd36 100644 --- a/config/src/tests/misc/CMakeLists.txt +++ b/config/src/tests/misc/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_executable(config_misc_test_app +vespa_add_executable(config_misc_test_app TEST SOURCES misc.cpp DEPENDS diff --git a/config/src/tests/payload_converter/CMakeLists.txt b/config/src/tests/payload_converter/CMakeLists.txt index 743486e7164..58017d4a4e5 100644 --- a/config/src/tests/payload_converter/CMakeLists.txt +++ b/config/src/tests/payload_converter/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_executable(config_payload_converter_test_app +vespa_add_executable(config_payload_converter_test_app TEST SOURCES payload_converter.cpp DEPENDS diff --git a/config/src/tests/print/CMakeLists.txt b/config/src/tests/print/CMakeLists.txt index 7af3b842c50..8472d14babb 100644 --- a/config/src/tests/print/CMakeLists.txt +++ b/config/src/tests/print/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_executable(config_print_test_app +vespa_add_executable(config_print_test_app TEST SOURCES print.cpp DEPENDS diff --git a/config/src/tests/raw_subscription/CMakeLists.txt b/config/src/tests/raw_subscription/CMakeLists.txt index 8f1431006e0..eb25cf833c3 100644 --- a/config/src/tests/raw_subscription/CMakeLists.txt +++ b/config/src/tests/raw_subscription/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_executable(config_raw_subscription_test_app +vespa_add_executable(config_raw_subscription_test_app TEST SOURCES raw_subscription.cpp DEPENDS diff --git a/config/src/tests/subscriber/CMakeLists.txt b/config/src/tests/subscriber/CMakeLists.txt index 1b1673a2512..c5840925951 100644 --- a/config/src/tests/subscriber/CMakeLists.txt +++ b/config/src/tests/subscriber/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_executable(config_subscriber_test_app +vespa_add_executable(config_subscriber_test_app TEST SOURCES subscriber.cpp DEPENDS diff --git a/config/src/tests/subscription/CMakeLists.txt b/config/src/tests/subscription/CMakeLists.txt index bbc3546c1da..0877bf20cfb 100644 --- a/config/src/tests/subscription/CMakeLists.txt +++ b/config/src/tests/subscription/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_executable(config_subscription_test_app +vespa_add_executable(config_subscription_test_app TEST SOURCES subscription.cpp DEPENDS diff --git a/config/src/tests/trace/CMakeLists.txt b/config/src/tests/trace/CMakeLists.txt index b328f61abdc..3e13b579783 100644 --- a/config/src/tests/trace/CMakeLists.txt +++ b/config/src/tests/trace/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_executable(config_trace_test_app +vespa_add_executable(config_trace_test_app TEST SOURCES trace.cpp DEPENDS diff --git a/config/src/tests/unittest/CMakeLists.txt b/config/src/tests/unittest/CMakeLists.txt index 9eeb5c761d1..3afdcb0dcb8 100644 --- a/config/src/tests/unittest/CMakeLists.txt +++ b/config/src/tests/unittest/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_executable(config_unittest_test_app +vespa_add_executable(config_unittest_test_app TEST SOURCES unittest.cpp DEPENDS 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/tests/messages/CMakeLists.txt b/configd/src/tests/messages/CMakeLists.txt index fed4f9fe470..400e47e0fe9 100644 --- a/configd/src/tests/messages/CMakeLists.txt +++ b/configd/src/tests/messages/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_executable(configd_messages_test_app +vespa_add_executable(configd_messages_test_app TEST SOURCES messages.cpp DEPENDS 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/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/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/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/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 358454bd5bd..4fafe1bdf88 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -60,24 +60,19 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME -export ROOT -cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } +cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } -# get common PATH etc: -. $ROOT/libexec/vespa/common-env.sh - -if [ -f $ROOT/conf/zookeeper/zookeeper.cfg ]; then - chown yahoo $ROOT/conf/zookeeper/zookeeper.cfg - chmod 644 $ROOT/conf/zookeeper/zookeeper.cfg +if [ -f ${VESPA_HOME}conf/zookeeper/zookeeper.cfg ]; then + chown yahoo ${VESPA_HOME}conf/zookeeper/zookeeper.cfg + chmod 644 ${VESPA_HOME}conf/zookeeper/zookeeper.cfg fi -if [ -f $ROOT/var/zookeeper/myid ]; then - chown yahoo $ROOT/var/zookeeper/myid - chmod 644 $ROOT/var/zookeeper/myid +if [ -f ${VESPA_HOME}var/zookeeper/myid ]; then + chown yahoo ${VESPA_HOME}var/zookeeper/myid + chmod 644 ${VESPA_HOME}var/zookeeper/myid fi -$ROOT/libexec/vespa/vespa-config.pl -isthisaconfigserver 1>/dev/null +${VESPA_HOME}libexec/vespa/vespa-config.pl -isthisaconfigserver 1>/dev/null if [ "$?" != "0" ] ; then echo "Not able to start config server, host `hostname` is not part of 'services.addr_configserver'" exit 1; @@ -86,34 +81,76 @@ fi fixlimits checkjava -ZOOKEEPER_DATA_PATH="$VESPA_HOME/var/zookeeper/version-2" +ZOOKEEPER_DATA_PATH="${VESPA_HOME}var/zookeeper/version-2" if [ ! -d "$ZOOKEEPER_DATA_PATH" ]; then echo "Creating data directory $ZOOKEEPER_DATA_PATH" mkdir -p $ZOOKEEPER_DATA_PATH chown yahoo:users $ZOOKEEPER_DATA_PATH fi -ZOOKEEPER_LOG_FILE="$VESPA_HOME/logs/vespa/zookeeper.configserver.log" +ZOOKEEPER_LOG_FILE="${VESPA_HOME}logs/vespa/zookeeper.configserver.log" rm -f $ZOOKEEPER_LOG_FILE*lck -baseuserargs=$vespa_base__jvmargs_configserver -serveruserargs="$cloudconfig_server__jvmargs" +# 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 + +#Does not need fast allocation +export MALLOC_ARENA_MAX=1 + +run-as-yahoo ${VESPA_HOME}libexec/vespa/start-filedistribution +run-as-yahoo ${VESPA_HOME}libexec/vespa/start-logd + +# stuff for the configserver process: -# TODO: Move this stuff to package when fully working -APP=$VESPA_HOME/conf/configserver-app -VESPA_SERVICE_NAME=configserver -LOGFILE="${ROOT}/logs/vespa/vespa.log" -VESPA_LOG_TARGET="file:${LOGFILE}" -PID_FILE="${ROOT}/var/run/configserver.pid" -VESPA_LOG_CONTROL_DIR="$ROOT/var/db/vespa/logcontrol" -VESPA_LOG_CONTROL_FILE="$ROOT/var/db/vespa/logcontrol/configserver.logcontrol" -jvmargs="-Dzookeeperlogfile=$ZOOKEEPER_LOG_FILE $baseuserargs $serveruserargs" -standalone_jdisc_container__deployment_profile="configserver" -MAXRESTARTS=100000 -export UNPRIVILEGED=1 -export MALLOC_ARENA_MAX=1 #Does not need fast allocation -export VESPA_SERVICE_NAME VESPA_LOG_TARGET PID_FILE VESPA_LOG_CONTROL_DIR JAVA_OPTS VESPA_LOG_CONTROL_FILE standalone_jdisc_container__deployment_profile MAXRESTARTS -run-as-yahoo ${ROOT}/bin/jdisc_container_start $APP $jvmargs - -run-as-yahoo $ROOT/libexec/vespa/start-filedistribution -run-as-yahoo $ROOT/libexec/vespa/start-logd +appdir="${VESPA_HOME}conf/configserver-app" +pidfile="${VESPA_HOME}var/run/configserver.pid" +cfpfile="${VESPA_HOME}var/jdisc_core/configserver.properties" +bundlecachedir="${VESPA_HOME}var/vespa/bundlecache/configserver" + +export JAVAVM_LD_PRELOAD= +unset LD_PRELOAD +# will be picked up by standalone-container: +export standalone_jdisc_container__app_location=${appdir} +export standalone_jdisc_container__deployment_profile=configserver +# used by vespa/models etc: +export VESPA_WEB_SERVICE_PORT=4080 + +# class path +CP="${VESPA_HOME}lib/jars/jdisc_core-jar-with-dependencies.jar" + +baseuserargs="$vespa_base__jvmargs_configserver" +serveruserargs="$cloudconfig_server__jvmargs" +jvmargs="$baseuserargs $serveruserargs" + +printenv > $cfpfile +mkdir -p $bundlecachedir + +run-as-yahoo vespa-runserver -s configserver -r 30 -p $pidfile -- \ + java \ + -Xms128m -Xmx2048m \ + -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${VESPA_HOME}var/crash \ + -XX:OnOutOfMemoryError='kill -9 %p' \ + $jvmargs \ + -Djava.library.path=${VESPA_HOME}lib64 \ + -Djava.awt.headless=true \ + -Dsun.rmi.dgc.client.gcInterval=3600000 \ + -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 \ + -Djavax.net.ssl.keyStoreType=JKS \ + -Djdisc.config.file=$cfpfile \ + -Djdisc.export.packages= \ + -Djdisc.cache.path=$bundlecachedir \ + -Djdisc.debug.resources=false \ + -Djdisc.bundle.path=${VESPA_HOME}lib/jars \ + -Djdisc.logger.enabled=true \ + -Djdisc.logger.level=ALL \ + -Djdisc.logger.tag=jdisc/configserver \ + -Dfile.encoding=UTF-8 \ + -Dzookeeperlogfile=${VESPA_HOME}logs/vespa/zookeeper.configserver.log \ + -cp "$CP" \ + com.yahoo.jdisc.core.StandaloneMain standalone-container-jar-with-dependencies.jar 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/configutil/src/tests/config_status/CMakeLists.txt b/configutil/src/tests/config_status/CMakeLists.txt index 2eda052bfd8..05801a0c5d3 100644 --- a/configutil/src/tests/config_status/CMakeLists.txt +++ b/configutil/src/tests/config_status/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_executable(configutil_config_status_test_app +vespa_add_executable(configutil_config_status_test_app TEST SOURCES config_status_test.cpp DEPENDS diff --git a/configutil/src/tests/model_inspect/CMakeLists.txt b/configutil/src/tests/model_inspect/CMakeLists.txt index a2890b5ae23..7abd8e69a5b 100644 --- a/configutil/src/tests/model_inspect/CMakeLists.txt +++ b/configutil/src/tests/model_inspect/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_executable(configutil_model_inspect_test_app +vespa_add_executable(configutil_model_inspect_test_app TEST SOURCES model_inspect_test.cpp DEPENDS diff --git a/configutil/src/tests/tags/CMakeLists.txt b/configutil/src/tests/tags/CMakeLists.txt index 5e43bee2ecc..30ee89de8b5 100644 --- a/configutil/src/tests/tags/CMakeLists.txt +++ b/configutil/src/tests/tags/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_executable(configutil_tags_test_app +vespa_add_executable(configutil_tags_test_app TEST SOURCES tags_test.cpp DEPENDS diff --git a/container-core/pom.xml b/container-core/pom.xml index e9b2d18628d..650c5e87074 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -144,6 +144,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>log4j</groupId> 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-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/pom.xml b/container-di/pom.xml index f78cae8f434..0cab901ab9f 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -73,6 +73,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>log4j</groupId> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index f320eb371bb..b94b626da73 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -94,6 +94,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> 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/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/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/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/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/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/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/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/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/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/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/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/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/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/dist/vespa.spec b/dist/vespa.spec index 32a756b7e2b..1bcda21c45c 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -53,12 +53,10 @@ This is the Vespa! source /opt/rh/devtoolset-4/enable || true sh bootstrap.sh -cmake3 \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY=%{_prefix}/lib64 \ - -DCMAKE_C_COMPILER=gcc \ - -DCMAKE_CXX_COMPILER=g++ \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include" \ -DCMAKE_INSTALL_RPATH=%{_prefix}/lib64 \ -DCMAKE_BUILD_RPATH=%{_prefix}/lib64 \ . @@ -186,6 +184,7 @@ exit 0 %{_prefix}/libexec/stop-configserver %{_prefix}/var/db/vespa/config_server/serverdb/classes/*.def %{_prefix}/lib/vespa/jars/*.jar +%{_prefix}/lib/perl5/site_perl/Yahoo/Vespa/*.pm %{_prefix}/lib64/*.so %{_prefix}/bin/* %{_prefix}/sbin/* 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/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/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/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/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/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/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/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt index 95e6b4b9a18..14bbeaa90d0 100644 --- a/document/src/tests/CMakeLists.txt +++ b/document/src/tests/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_executable(document_testrunner_app +vespa_add_executable(document_testrunner_app TEST SOURCES teststringutil.cpp testbytebuffer.cpp diff --git a/document/src/tests/annotation/CMakeLists.txt b/document/src/tests/annotation/CMakeLists.txt index 1ec6a3e3dde..5ecb7213266 100644 --- a/document/src/tests/annotation/CMakeLists.txt +++ b/document/src/tests/annotation/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_executable(document_annotation_test_app +vespa_add_executable(document_annotation_test_app TEST SOURCES annotation_test.cpp DEPENDS diff --git a/document/src/tests/base/CMakeLists.txt b/document/src/tests/base/CMakeLists.txt index 550d77d1340..b5099443252 100644 --- a/document/src/tests/base/CMakeLists.txt +++ b/document/src/tests/base/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_executable(document_documentid_test_app +vespa_add_executable(document_documentid_test_app TEST SOURCES documentid_test.cpp DEPENDS diff --git a/document/src/tests/datatype/CMakeLists.txt b/document/src/tests/datatype/CMakeLists.txt index 399bccdf691..1061b115be9 100644 --- a/document/src/tests/datatype/CMakeLists.txt +++ b/document/src/tests/datatype/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_executable(document_datatype_test_app +vespa_add_executable(document_datatype_test_app TEST SOURCES datatype_test.cpp DEPENDS diff --git a/document/src/tests/fieldvalue/CMakeLists.txt b/document/src/tests/fieldvalue/CMakeLists.txt index 7b5fc637e4f..c44cca690b7 100644 --- a/document/src/tests/fieldvalue/CMakeLists.txt +++ b/document/src/tests/fieldvalue/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_executable(document_document_test_app +vespa_add_executable(document_document_test_app TEST SOURCES document_test.cpp DEPENDS @@ -8,7 +8,7 @@ vespa_add_executable(document_document_test_app document_documentconfig ) vespa_add_test(NAME document_document_test_app COMMAND document_document_test_app) -vespa_add_executable(document_fieldvalue_test_app +vespa_add_executable(document_fieldvalue_test_app TEST SOURCES fieldvalue_test.cpp DEPENDS @@ -17,7 +17,7 @@ vespa_add_executable(document_fieldvalue_test_app document_documentconfig ) vespa_add_test(NAME document_fieldvalue_test_app COMMAND document_fieldvalue_test_app) -vespa_add_executable(document_predicatefieldvalue_test_app +vespa_add_executable(document_predicatefieldvalue_test_app TEST SOURCES predicatefieldvalue_test.cpp DEPENDS diff --git a/document/src/tests/predicate/CMakeLists.txt b/document/src/tests/predicate/CMakeLists.txt index 445da128498..d1181340852 100644 --- a/document/src/tests/predicate/CMakeLists.txt +++ b/document/src/tests/predicate/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_executable(document_predicate_test_app +vespa_add_executable(document_predicate_test_app TEST SOURCES predicate_test.cpp DEPENDS @@ -8,7 +8,7 @@ vespa_add_executable(document_predicate_test_app document_documentconfig ) vespa_add_test(NAME document_predicate_test_app COMMAND document_predicate_test_app) -vespa_add_executable(document_predicate_builder_test_app +vespa_add_executable(document_predicate_builder_test_app TEST SOURCES predicate_builder_test.cpp DEPENDS @@ -17,7 +17,7 @@ vespa_add_executable(document_predicate_builder_test_app document_documentconfig ) vespa_add_test(NAME document_predicate_builder_test_app COMMAND document_predicate_builder_test_app) -vespa_add_executable(document_predicate_printer_test_app +vespa_add_executable(document_predicate_printer_test_app TEST SOURCES predicate_printer_test.cpp DEPENDS diff --git a/document/src/tests/repo/CMakeLists.txt b/document/src/tests/repo/CMakeLists.txt index efd74caf954..8b268d1f719 100644 --- a/document/src/tests/repo/CMakeLists.txt +++ b/document/src/tests/repo/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_executable(document_documenttyperepo_test_app +vespa_add_executable(document_documenttyperepo_test_app TEST SOURCES documenttyperepo_test.cpp DEPENDS diff --git a/document/src/tests/serialization/CMakeLists.txt b/document/src/tests/serialization/CMakeLists.txt index dcbf067e4a5..cd645adf0ad 100644 --- a/document/src/tests/serialization/CMakeLists.txt +++ b/document/src/tests/serialization/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_executable(document_vespadocumentserializer_test_app +vespa_add_executable(document_vespadocumentserializer_test_app TEST SOURCES vespadocumentserializer_test.cpp DEPENDS @@ -8,7 +8,7 @@ vespa_add_executable(document_vespadocumentserializer_test_app document_documentconfig ) vespa_add_test(NAME document_vespadocumentserializer_test_app COMMAND document_vespadocumentserializer_test_app) -vespa_add_executable(document_annotationserializer_test_app +vespa_add_executable(document_annotationserializer_test_app TEST SOURCES annotationserializer_test.cpp DEPENDS @@ -17,7 +17,7 @@ vespa_add_executable(document_annotationserializer_test_app document_documentconfig ) vespa_add_test(NAME document_annotationserializer_test_app COMMAND document_annotationserializer_test_app) -vespa_add_executable(document_compression_test_app +vespa_add_executable(document_compression_test_app TEST SOURCES compression_test.cpp DEPENDS diff --git a/document/src/tests/struct_anno/CMakeLists.txt b/document/src/tests/struct_anno/CMakeLists.txt index 64678282842..495d58a4d55 100644 --- a/document/src/tests/struct_anno/CMakeLists.txt +++ b/document/src/tests/struct_anno/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_executable(document_struct_anno_test_app +vespa_add_executable(document_struct_anno_test_app TEST SOURCES struct_anno_test.cpp DEPENDS diff --git a/document/src/tests/tensor_fieldvalue/CMakeLists.txt b/document/src/tests/tensor_fieldvalue/CMakeLists.txt index d0fa1526bbc..4456d5a0c2b 100644 --- a/document/src/tests/tensor_fieldvalue/CMakeLists.txt +++ b/document/src/tests/tensor_fieldvalue/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_executable(document_tensor_fieldvalue_test_app +vespa_add_executable(document_tensor_fieldvalue_test_app TEST SOURCES tensor_fieldvalue_test.cpp DEPENDS diff --git a/document/src/vespa/document/fieldvalue/serializablearray.cpp b/document/src/vespa/document/fieldvalue/serializablearray.cpp index a2d92100dde..6309338eb3b 100644 --- a/document/src/vespa/document/fieldvalue/serializablearray.cpp +++ b/document/src/vespa/document/fieldvalue/serializablearray.cpp @@ -191,7 +191,7 @@ SerializableArray::deCompress() // throw (DeserializeException) if (unCompressed.getDataLen() != (size_t)_uncompressedLength) { throw DeserializeException( vespalib::make_string( - "Did not decompress to the expected length: had %" PRIu64 ", wanted %" PRId32 ", got %" PRIu64, + "Did not decompress to the expected length: had %" PRIu64 ", wanted %d, got %" PRIu64, _compSerData->getRemaining(), _uncompressedLength, unCompressed.getDataLen()), VESPA_STRLOC); } 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/documentapi/src/tests/loadtypes/CMakeLists.txt b/documentapi/src/tests/loadtypes/CMakeLists.txt index 7c1e92b087f..e75fa7b8e0f 100644 --- a/documentapi/src/tests/loadtypes/CMakeLists.txt +++ b/documentapi/src/tests/loadtypes/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_executable(documentapi_loadtype_test_app +vespa_add_executable(documentapi_loadtype_test_app TEST SOURCES loadtypetest.cpp testrunner.cpp diff --git a/documentapi/src/tests/messagebus/CMakeLists.txt b/documentapi/src/tests/messagebus/CMakeLists.txt index 0f0760c1b57..de85fedc97e 100644 --- a/documentapi/src/tests/messagebus/CMakeLists.txt +++ b/documentapi/src/tests/messagebus/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_executable(documentapi_messagebus_test_app +vespa_add_executable(documentapi_messagebus_test_app TEST SOURCES messagebus_test.cpp DEPENDS diff --git a/documentapi/src/tests/messages/CMakeLists.txt b/documentapi/src/tests/messages/CMakeLists.txt index bfffd0d0502..fc7560254a1 100644 --- a/documentapi/src/tests/messages/CMakeLists.txt +++ b/documentapi/src/tests/messages/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_executable(documentapi_messages50_test_app +vespa_add_executable(documentapi_messages50_test_app TEST SOURCES testbase.cpp messages50test.cpp @@ -8,7 +8,7 @@ vespa_add_executable(documentapi_messages50_test_app documentapi ) vespa_add_test(NAME documentapi_messages50_test_app COMMAND documentapi_messages50_test_app) -vespa_add_executable(documentapi_messages51_test_app +vespa_add_executable(documentapi_messages51_test_app TEST SOURCES testbase.cpp messages50test.cpp @@ -18,7 +18,7 @@ vespa_add_executable(documentapi_messages51_test_app documentapi ) vespa_add_test(NAME documentapi_messages51_test_app COMMAND documentapi_messages51_test_app) -vespa_add_executable(documentapi_messages52_test_app +vespa_add_executable(documentapi_messages52_test_app TEST SOURCES testbase.cpp messages50test.cpp @@ -29,7 +29,7 @@ vespa_add_executable(documentapi_messages52_test_app documentapi ) vespa_add_test(NAME documentapi_messages52_test_app COMMAND documentapi_messages52_test_app) -vespa_add_executable(documentapi_error_codes_test_app_app +vespa_add_executable(documentapi_error_codes_test_app_app TEST SOURCES error_codes_test.cpp DEPENDS diff --git a/documentapi/src/tests/policies/CMakeLists.txt b/documentapi/src/tests/policies/CMakeLists.txt index dcf0f4bef4b..a749997a612 100644 --- a/documentapi/src/tests/policies/CMakeLists.txt +++ b/documentapi/src/tests/policies/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_executable(documentapi_policies_test_app +vespa_add_executable(documentapi_policies_test_app TEST SOURCES testframe.cpp policies_test.cpp diff --git a/documentapi/src/tests/policyfactory/CMakeLists.txt b/documentapi/src/tests/policyfactory/CMakeLists.txt index c533847ff36..6b8090ec60d 100644 --- a/documentapi/src/tests/policyfactory/CMakeLists.txt +++ b/documentapi/src/tests/policyfactory/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_executable(documentapi_policyfactory_test_app +vespa_add_executable(documentapi_policyfactory_test_app TEST SOURCES policyfactory.cpp DEPENDS diff --git a/documentapi/src/tests/priority/CMakeLists.txt b/documentapi/src/tests/priority/CMakeLists.txt index 289ea4b4ebe..5e2a35f06a1 100644 --- a/documentapi/src/tests/priority/CMakeLists.txt +++ b/documentapi/src/tests/priority/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_executable(documentapi_priority_test_app +vespa_add_executable(documentapi_priority_test_app TEST SOURCES priority.cpp DEPENDS diff --git a/documentapi/src/tests/replymerger/CMakeLists.txt b/documentapi/src/tests/replymerger/CMakeLists.txt index 9faa203fb2b..c2267f8d3ff 100644 --- a/documentapi/src/tests/replymerger/CMakeLists.txt +++ b/documentapi/src/tests/replymerger/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_executable(documentapi_replymerger_test_app +vespa_add_executable(documentapi_replymerger_test_app TEST SOURCES replymerger_test.cpp DEPENDS diff --git a/documentapi/src/tests/routablefactory/CMakeLists.txt b/documentapi/src/tests/routablefactory/CMakeLists.txt index ba6ea53bf8f..0d7179261bc 100644 --- a/documentapi/src/tests/routablefactory/CMakeLists.txt +++ b/documentapi/src/tests/routablefactory/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_executable(documentapi_routablefactory_test_app +vespa_add_executable(documentapi_routablefactory_test_app TEST SOURCES routablefactory.cpp DEPENDS diff --git a/documentapi/src/tests/systemstate/CMakeLists.txt b/documentapi/src/tests/systemstate/CMakeLists.txt index a1a88c66278..539bd7386cc 100644 --- a/documentapi/src/tests/systemstate/CMakeLists.txt +++ b/documentapi/src/tests/systemstate/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_executable(documentapi_systemstate_test_app +vespa_add_executable(documentapi_systemstate_test_app TEST SOURCES systemstate.cpp DEPENDS diff --git a/fastlib/OWNERS b/fastlib/OWNERS index f6fda8f0404..9e842aedad9 100644 --- a/fastlib/OWNERS +++ b/fastlib/OWNERS @@ -1,3 +1,3 @@ havardpe tegge -balder +baldersheim diff --git a/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt index 06705ef1294..29912156b59 100644 --- a/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt +++ b/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(fastlib_bufferedstreamtest_app +vespa_add_executable(fastlib_bufferedstreamtest_app TEST SOURCES bufferedstreamtest.cpp DEPENDS fastlib_io ) vespa_add_test(NAME fastlib_bufferedstreamtest_app COMMAND fastlib_bufferedstreamtest_app fastlib_bufferedstreamtest_app) -vespa_add_executable(fastlib_bufferedfiletest_app +vespa_add_executable(fastlib_bufferedfiletest_app TEST SOURCES bufferedfiletest.cpp DEPENDS diff --git a/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt index bb6bdd420b3..72957df223e 100644 --- a/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt +++ b/fastlib/src/vespa/fastlib/net/tests/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_executable(fastlib_httpheaderparsertest_app +vespa_add_executable(fastlib_httpheaderparsertest_app TEST SOURCES httpheaderparsertest.cpp DEPENDS diff --git a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt index de9bb279126..e0c137151ca 100644 --- a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt +++ b/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(fastlib_unicodeutiltest_app +vespa_add_executable(fastlib_unicodeutiltest_app TEST SOURCES unicodeutiltest.cpp DEPENDS fastlib_text ) vespa_add_test(NAME fastlib_unicodeutiltest_app NO_VALGRIND COMMAND fastlib_unicodeutiltest_app) -vespa_add_executable(fastlib_latintokenizertest_app +vespa_add_executable(fastlib_latintokenizertest_app TEST SOURCES latintokenizertest.cpp DEPENDS fastlib_text ) vespa_add_test(NAME fastlib_latintokenizertest_app NO_VALGRIND COMMAND fastlib_latintokenizertest_app) -vespa_add_executable(fastlib_wordfolderstest_app +vespa_add_executable(fastlib_wordfolderstest_app TEST SOURCES wordfolderstest.cpp DEPENDS diff --git a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt index 8d45ffd58b0..3cd980552fe 100644 --- a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt +++ b/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(fastlib_base64test_app +vespa_add_executable(fastlib_base64test_app TEST SOURCES base64test.cpp DEPENDS fastlib_util ) vespa_add_test(NAME fastlib_base64test_app NO_VALGRIND COMMAND fastlib_base64test_app fastlib_base64test_app) -vespa_add_executable(fastlib_bagtest_app +vespa_add_executable(fastlib_bagtest_app TEST SOURCES bagtest.cpp DEPENDS fastlib_util ) vespa_add_test(NAME fastlib_bagtest_app NO_VALGRIND COMMAND fastlib_bagtest_app) -vespa_add_executable(fastlib_wildcard_match_test_app +vespa_add_executable(fastlib_wildcard_match_test_app TEST SOURCES wildcard_match_test.cpp DEPENDS 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/fastos/src/tests/CMakeLists.txt b/fastos/src/tests/CMakeLists.txt index 06e891b88b3..8b069e15dcb 100644 --- a/fastos/src/tests/CMakeLists.txt +++ b/fastos/src/tests/CMakeLists.txt @@ -1,61 +1,60 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(fastos_processtest_app +vespa_add_executable(fastos_processtest_app TEST SOURCES processtest.cpp DEPENDS fastos ) -vespa_add_test(NAME fastos_processtest_app NO_VALGRIND COMMAND fastos_processtest_app fastos_processtest_app fastos_usecputest_app) -vespa_add_executable(fastos_prefetchtest_app +vespa_add_executable(fastos_prefetchtest_app TEST SOURCES prefetchtest.cpp DEPENDS fastos ) vespa_add_test(NAME fastos_prefetchtest_app NO_VALGRIND COMMAND fastos_prefetchtest_app) -vespa_add_executable(fastos_filetest_app +vespa_add_executable(fastos_filetest_app TEST SOURCES filetest.cpp DEPENDS fastos ) vespa_add_test(NAME fastos_filetest_app NO_VALGRIND COMMAND fastos_filetest_app) -vespa_add_executable(fastos_sockettest_app +vespa_add_executable(fastos_sockettest_app TEST SOURCES sockettest.cpp DEPENDS fastos ) vespa_add_test(NAME fastos_sockettest_app NO_VALGRIND COMMAND fastos_sockettest_app) -vespa_add_executable(fastos_threadtest_app +vespa_add_executable(fastos_threadtest_app TEST SOURCES threadtest.cpp DEPENDS fastos ) vespa_add_test(NAME fastos_threadtest_app NO_VALGRIND COMMAND fastos_threadtest_app) -vespa_add_executable(fastos_backtracetest_app +vespa_add_executable(fastos_backtracetest_app TEST SOURCES backtracetest.cpp DEPENDS fastos ) vespa_add_test(NAME fastos_backtracetest_app NO_VALGRIND COMMAND fastos_backtracetest_app) -vespa_add_executable(fastos_timetest_app +vespa_add_executable(fastos_timetest_app TEST SOURCES timetest.cpp DEPENDS fastos ) vespa_add_test(NAME fastos_timetest_app NO_VALGRIND COMMAND fastos_timetest_app) -vespa_add_executable(fastos_typetest_app +vespa_add_executable(fastos_typetest_app TEST SOURCES typetest.cpp DEPENDS fastos ) vespa_add_test(NAME fastos_typetest_app NO_VALGRIND COMMAND fastos_typetest_app) -vespa_add_executable(fastos_usecputest_app +vespa_add_executable(fastos_usecputest_app TEST SOURCES usecputest.cpp DEPENDS diff --git a/fastos/src/vespa/fastos/serversocket.cpp b/fastos/src/vespa/fastos/serversocket.cpp index eb4a737683a..15f52e83bc1 100644 --- a/fastos/src/vespa/fastos/serversocket.cpp +++ b/fastos/src/vespa/fastos/serversocket.cpp @@ -43,7 +43,7 @@ FastOS_SocketInterface *FastOS_ServerSocket::Accept() int handlerSocketHandle; struct sockaddr_storage clientAddress; - FastOS_SocketLen clientAddressLength = sizeof(clientAddress); + socklen_t clientAddressLength = sizeof(clientAddress); memset(&clientAddress, 0, sizeof(clientAddress)); @@ -71,7 +71,7 @@ FastOS_Socket *FastOS_ServerSocket::AcceptPlain() int handlerSocketHandle; struct sockaddr_storage clientAddress; - FastOS_SocketLen clientAddressLength = sizeof(clientAddress); + socklen_t clientAddressLength = sizeof(clientAddress); memset(&clientAddress, 0, sizeof(clientAddress)); diff --git a/fastos/src/vespa/fastos/socket.cpp b/fastos/src/vespa/fastos/socket.cpp index c7ec605d524..4e30a9216ea 100644 --- a/fastos/src/vespa/fastos/socket.cpp +++ b/fastos/src/vespa/fastos/socket.cpp @@ -156,9 +156,7 @@ bool FastOS_SocketInterface::SetSoLinger( bool doLinger, int seconds ) lingerTime.l_linger = seconds; if (CreateIfNoSocketYet()) { - rc = (0 == setsockopt(_socketHandle, SOL_SOCKET, SO_LINGER, - reinterpret_cast<FastOS_SockOptValP>(&lingerTime), - sizeof(lingerTime))); + rc = (0 == setsockopt(_socketHandle, SOL_SOCKET, SO_LINGER, &lingerTime, sizeof(lingerTime))); } return rc; @@ -171,9 +169,7 @@ FastOS_SocketInterface::SetNoDelay(bool noDelay) int noDelayInt = noDelay ? 1 : 0; if (CreateIfNoSocketYet()) { - rc = (setsockopt(_socketHandle, IPPROTO_TCP, TCP_NODELAY, - reinterpret_cast<FastOS_SockOptValP>(&noDelayInt), - sizeof(noDelayInt)) == 0); + rc = (setsockopt(_socketHandle, IPPROTO_TCP, TCP_NODELAY, &noDelayInt, sizeof(noDelayInt)) == 0); } return rc; } @@ -187,10 +183,9 @@ int FastOS_SocketInterface::GetSoError () int lastError = FastOS_Socket::GetLastError(); int soError = 0; - FastOS_SocketLen soErrorLen = sizeof(soError); + socklen_t soErrorLen = sizeof(soError); - if (getsockopt(_socketHandle, SOL_SOCKET, SO_ERROR, - reinterpret_cast<FastOS_SockOptValP>(&soError), &soErrorLen) != 0) { + if (getsockopt(_socketHandle, SOL_SOCKET, SO_ERROR, &soError, &soErrorLen) != 0) { return lastError; } @@ -206,9 +201,7 @@ bool FastOS_SocketInterface::SetSoIntOpt (int option, int value) bool rc=false; if (CreateIfNoSocketYet()) { - rc = (0 == setsockopt(_socketHandle, SOL_SOCKET, option, - reinterpret_cast<FastOS_SockOptValP>(&value), - sizeof(value))); + rc = (0 == setsockopt(_socketHandle, SOL_SOCKET, option, &value, sizeof(value))); } return rc; @@ -219,11 +212,9 @@ bool FastOS_SocketInterface::GetSoIntOpt(int option, int &value) bool rc=false; if (CreateIfNoSocketYet()) { - FastOS_SocketLen len = sizeof(value); + socklen_t len = sizeof(value); - int retval = getsockopt(_socketHandle, SOL_SOCKET, option, - reinterpret_cast<FastOS_SockOptValP>(&value), - &len); + int retval = getsockopt(_socketHandle, SOL_SOCKET, option, &value, &len); if (len != sizeof(value)) { // FIX! - What about GetLastError() in this case? @@ -262,7 +253,7 @@ int FastOS_SocketInterface::GetLocalPort () { int result = -1; sockaddr_storage addr; - FastOS_SocketLen len = sizeof(addr); + socklen_t len = sizeof(addr); if(getsockname(_socketHandle, reinterpret_cast<struct sockaddr *>(&addr), &len) == 0) { if ((addr.ss_family == AF_INET) && (len == sizeof(sockaddr_in))) { const sockaddr_in *my_addr = reinterpret_cast<const sockaddr_in *>(&addr); diff --git a/fastos/src/vespa/fastos/thread.h b/fastos/src/vespa/fastos/thread.h index db0baf7e3d9..a6ef359342a 100644 --- a/fastos/src/vespa/fastos/thread.h +++ b/fastos/src/vespa/fastos/thread.h @@ -15,6 +15,7 @@ #include <vespa/fastos/mutex.h> #include <vespa/fastos/cond.h> +typedef pthread_t FastOS_ThreadId; class FastOS_Runnable; class FastOS_ThreadInterface; @@ -207,10 +208,9 @@ public: // Operating system thread entry point -FASTOS_EXTERNC -{ +extern "C" { void *FastOS_ThreadHook (void *arg); -}; +} /** * This class controls each operating system thread. diff --git a/fastos/src/vespa/fastos/types.h b/fastos/src/vespa/fastos/types.h index 5e2b0e68f1d..72c7cbd7cf8 100644 --- a/fastos/src/vespa/fastos/types.h +++ b/fastos/src/vespa/fastos/types.h @@ -10,10 +10,6 @@ #pragma once -#ifndef FASTOS_AUTOCONF /* Are we in the autoconf stage? */ -#include <vespa/fastos/autoconf.h> -#endif - /** * @def __STDC_LIMIT_MACROS * According to C99, C++ implementations will only define UINT64_MAX @@ -23,10 +19,13 @@ * below, we define the behaviour here. */ #ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 + #define __STDC_LIMIT_MACROS 1 #endif #ifndef __STDC_CONSTANT_MACROS -#define __STDC_CONSTANT_MACROS 1 + #define __STDC_CONSTANT_MACROS 1 +#endif +#ifndef __STDC_FORMAT_MACROS + #define __STDC_FORMAT_MACROS #endif #include <assert.h> @@ -60,10 +59,6 @@ #include <sys/socket.h> -#ifndef SHUT_RDWR -#define SHUT_RDWR 2 -#endif - #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h> @@ -74,18 +69,6 @@ #include <sys/time.h> #include <time.h> -#define FASTOS_EMFILE_VERIFIED (-1) -#ifdef EMFILE -#undef FASTOS_EMFILE_VERIFIED -#define FASTOS_EMFILE_VERIFIED EMFILE -#endif - -#define FASTOS_ENFILE_VERIFIED (-1) -#ifdef ENFILE -#undef FASTOS_ENFILE_VERIFIED -#define FASTOS_ENFILE_VERIFIED ENFILE -#endif - #ifndef __USE_GNU #define __USE_GNU /* for O_DIRECT define */ #define __TYPES_H_DIRECTIO_GNU @@ -97,17 +80,6 @@ #undef __USE_GNU /* for O_DIRECT define */ #endif -typedef caddr_t FastOS_SockOptValP; - -#ifndef FASTOS_AUTOCONF -#if defined(FASTOS_HAVE_SOCKLEN_T) -typedef socklen_t FastOS_SocketLen; -#else -typedef int FastOS_SocketLen; -#endif -#endif /* FASTOS_AUTOCONF */ - - #include <stdio.h> #include <stdlib.h> @@ -116,264 +88,26 @@ typedef int FastOS_SocketLen; #include <sys/stat.h> #include <limits.h> #include <float.h> - #include <netinet/tcp.h> - -#define FASTOS_PREFIX(a) FastOS_##a - -#ifndef NULL -#define NULL 0 -#endif - -#ifndef FASTOS_AUTOCONF - #include <inttypes.h> - -/** - * On UNIX we use the [long long] type for 64bit integers. - */ -#ifndef FASTOS_HAVE_INT64_T -typedef long long int64_t; -#endif - -#ifndef FASTOS_HAVE_UINT64_T -typedef unsigned long long uint64_t; -#endif - -#ifndef FASTOS_HAVE_INT32_T -typedef int int32_t; -#endif - -#ifndef FASTOS_HAVE_UINT32_T -typedef unsigned int uint32_t; -#endif - -#ifndef FASTOS_HAVE_INT16_T -typedef short int int16_t; -#endif - -#ifndef FASTOS_HAVE_UINT16_T -typedef unsigned short int uint16_t; -#endif - -#ifndef FASTOS_HAVE_INT8_T -typedef signed char int8_t; -#endif - -#ifndef FASTOS_HAVE_UINT8_T -typedef unsigned char uint8_t; -#endif - -#ifndef INT64_C -#ifdef FASTOS_64BIT_LONG -#define INT64_C(c) c ## L -#else -# warning "You need to define INT64_C or find a header that defines this macro" -#endif -#endif /* INT64_C */ - -#ifndef UINT64_C -#ifdef FASTOS_64BIT_LONG -#define UINT64_C(c) c ## UL -#else -#define UINT64_C(c) c ## ULL -#endif -#endif /* UINT64_C */ - - -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif - -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif - -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif - -#ifndef INT64_MIN -#define INT64_MIN (-INT64_C(9223372036854775807)-1) -#endif - -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif - -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif - -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif - -#ifndef INT64_MAX -#define INT64_MAX (INT64_C(9223372036854775807)) -#endif - -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif - -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif - -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#ifndef UINT64_MAX -#define UINT64_MAX (UINT64_C(18446744073709551615)) -#endif - #include <getopt.h> -#endif /* FASTOS_AUTOCONF */ - -#ifndef SHUT_WR -#define SHUT_WR 1 -#endif - -/* 64bit printf specifiers */ -#ifdef FASTOS_64BIT_LONG -#ifndef PRId64 -#define PRId64 "ld" -#endif - -#ifndef PRIu64 -#define PRIu64 "lu" -#endif - -#ifndef PRIo64 -#define PRIo64 "lo" -#endif - -#ifndef PRIx64 -#define PRIx64 "lx" -#endif - -#ifndef PRIX64 -#define PRIX64 "lX" -#endif - -#ifndef SCNd64 -#define SCNd64 "ld" -#endif - -#ifndef SCNu64 -#define SCNu64 "lu" -#endif - -#ifndef SCNo64 -#define SCNo64 "lo" -#endif - -#ifndef SCNx64 -#define SCNx64 "lx" -#endif - -#ifndef SCNX64 -#define SCNX64 "lX" -#endif - -#else /* ! FASTOS_64BIT_LONG */ - -#ifndef PRId64 -#define PRId64 "lld" -#endif - -#ifndef PRIu64 -#define PRIu64 "llu" -#endif - -#ifndef PRIo64 -#define PRIo64 "llo" -#endif - -#ifndef PRIx64 -#define PRIx64 "llx" -#endif - -#ifndef PRIX64 -#define PRIX64 "llX" -#endif - -#ifndef SCNd64 -#define SCNd64 "lld" -#endif - -#ifndef SCNu64 -#define SCNu64 "llu" -#endif +#if (__WORDSIZE == 64) -#ifndef SCNo64 -#define SCNo64 "llo" -#endif - -#ifndef SCNx64 -#define SCNx64 "llx" -#endif - -#ifndef SCNX64 -#define SCNX64 "llX" -#endif - -#endif /* FASTOS_64BIT_LONG */ - -#ifndef PRId32 -#define PRId32 "d" -#endif - -#ifndef PRIu32 -#define PRIu32 "u" -#endif - -#ifndef PRIo32 -#define PRIo32 "o" -#endif - -#ifndef PRIx32 -#define PRIx32 "x" -#endif - -#ifndef PRIX32 -#define PRIX32 "X" -#endif - -#ifndef SCNd32 -#define SCNd32 "d" -#endif - -#ifndef SCNu32 -#define SCNu32 "u" -#endif - -#ifndef SCNo32 -#define SCNo32 "o" +#else + #error "Only LP 64 environments are supported." #endif -#ifndef SCNx32 -#define SCNx32 "x" -#endif +#define FASTOS_PREFIX(a) FastOS_##a -#ifndef SCNX32 -#define SCNX32 "X" +#define FASTOS_EMFILE_VERIFIED (-1) +#ifdef EMFILE +#undef FASTOS_EMFILE_VERIFIED +#define FASTOS_EMFILE_VERIFIED EMFILE #endif - -typedef pthread_t FastOS_ThreadId; - -#define FASTOS_EXTERNC extern "C" -#define FASTOS_KLASS class - -#define FASTOS_IPCMSGBUF_MAXSIZE (200) - -#if defined(FASTOS_ICONV_NOT_CONST) -#define LIBICONV_CONST -#else -#define LIBICONV_CONST const +#define FASTOS_ENFILE_VERIFIED (-1) +#ifdef ENFILE +#undef FASTOS_ENFILE_VERIFIED +#define FASTOS_ENFILE_VERIFIED ENFILE #endif - diff --git a/fastos/src/vespa/fastos/unix_process.cpp b/fastos/src/vespa/fastos/unix_process.cpp index 96074cd07b0..394b41eb986 100644 --- a/fastos/src/vespa/fastos/unix_process.cpp +++ b/fastos/src/vespa/fastos/unix_process.cpp @@ -1,5 +1,4 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/autoconf.h> #include <vespa/fastos/process.h> #include <vespa/fastos/app.h> #include <vespa/fastos/unix_ipc.h> diff --git a/fastos/src/vespa/fastos/version.h b/fastos/src/vespa/fastos/version.h deleted file mode 100644 index 18c0a64184a..00000000000 --- a/fastos/src/vespa/fastos/version.h +++ /dev/null @@ -1,2 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#define FASTOS_VERSIONSTRING "fastos 1.9.1 (current)" 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/fbench/src/test/CMakeLists.txt b/fbench/src/test/CMakeLists.txt index 2ea472ad8e5..23a95df9dff 100644 --- a/fbench/src/test/CMakeLists.txt +++ b/fbench/src/test/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_executable(fbench_httpclient_splitstring_app +vespa_add_executable(fbench_httpclient_splitstring_app TEST SOURCES httpclient_splitstring.cpp DEPENDS @@ -14,14 +14,14 @@ vespa_add_executable(fbench_httpclient_app fbench_util fastos ) -vespa_add_executable(fbench_filereader_app +vespa_add_executable(fbench_filereader_app TEST SOURCES filereader.cpp DEPENDS fbench_util ) vespa_add_test(NAME fbench_filereader_app COMMAND fbench_filereader_app) -vespa_add_executable(fbench_clientstatus_app +vespa_add_executable(fbench_clientstatus_app TEST SOURCES clientstatus.cpp DEPENDS diff --git a/filedistribution/src/tests/common/CMakeLists.txt b/filedistribution/src/tests/common/CMakeLists.txt index b9670848fbc..10fae25892c 100644 --- a/filedistribution/src/tests/common/CMakeLists.txt +++ b/filedistribution/src/tests/common/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_executable(filedistribution_common_test_app +vespa_add_executable(filedistribution_common_test_app TEST SOURCES testCommon.cpp DEPENDS diff --git a/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt b/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt index 9bd7bd14ebb..aded3e4f07e 100644 --- a/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt +++ b/filedistribution/src/tests/filedbmodelimpl/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_executable(filedistribution_filedbmodelimpl_test_app +vespa_add_executable(filedistribution_filedbmodelimpl_test_app TEST SOURCES test-filedistributionmodelimpl.cpp DEPENDS diff --git a/filedistribution/src/tests/filedownloader/CMakeLists.txt b/filedistribution/src/tests/filedownloader/CMakeLists.txt index 6be9b28651d..31c2f67738d 100644 --- a/filedistribution/src/tests/filedownloader/CMakeLists.txt +++ b/filedistribution/src/tests/filedownloader/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_executable(filedistribution_filedownloader_test_app +vespa_add_executable(filedistribution_filedownloader_test_app TEST SOURCES testfiledownloader.cpp DEPENDS diff --git a/filedistribution/src/tests/rpc/CMakeLists.txt b/filedistribution/src/tests/rpc/CMakeLists.txt index 9a592c15ab4..faf23f1d464 100644 --- a/filedistribution/src/tests/rpc/CMakeLists.txt +++ b/filedistribution/src/tests/rpc/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_executable(filedistribution_rpc_test_app +vespa_add_executable(filedistribution_rpc_test_app TEST SOURCES testfileprovider.cpp DEPENDS diff --git a/filedistribution/src/tests/scheduler/CMakeLists.txt b/filedistribution/src/tests/scheduler/CMakeLists.txt index 67b86c3e634..ffc569b480b 100644 --- a/filedistribution/src/tests/scheduler/CMakeLists.txt +++ b/filedistribution/src/tests/scheduler/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_executable(filedistribution_scheduler_test_app +vespa_add_executable(filedistribution_scheduler_test_app TEST SOURCES test-scheduler.cpp DEPENDS diff --git a/filedistribution/src/tests/status/CMakeLists.txt b/filedistribution/src/tests/status/CMakeLists.txt index 79676c4e811..30037c518ac 100644 --- a/filedistribution/src/tests/status/CMakeLists.txt +++ b/filedistribution/src/tests/status/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_executable(filedistribution_status_test_app +vespa_add_executable(filedistribution_status_test_app TEST SOURCES test-status.cpp DEPENDS diff --git a/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt b/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt index 7b205d009f8..f1ee7ac3e84 100644 --- a/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt +++ b/filedistribution/src/tests/zkfiledbmodel/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_executable(filedistribution_zkfiledbmodel_test_app +vespa_add_executable(filedistribution_zkfiledbmodel_test_app TEST SOURCES test-zkfiledbmodel.cpp DEPENDS 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/fnet/src/tests/connect_thread/CMakeLists.txt b/fnet/src/tests/connect_thread/CMakeLists.txt index 535ac5e3561..337ab336a7b 100644 --- a/fnet/src/tests/connect_thread/CMakeLists.txt +++ b/fnet/src/tests/connect_thread/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_executable(fnet_connect_thread_test_app +vespa_add_executable(fnet_connect_thread_test_app TEST SOURCES connect_thread_test.cpp DEPENDS diff --git a/fnet/src/tests/connection_spread/CMakeLists.txt b/fnet/src/tests/connection_spread/CMakeLists.txt index 9ed541b62e3..6d02e842c9a 100644 --- a/fnet/src/tests/connection_spread/CMakeLists.txt +++ b/fnet/src/tests/connection_spread/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_executable(fnet_connection_spread_test_app +vespa_add_executable(fnet_connection_spread_test_app TEST SOURCES connection_spread_test.cpp DEPENDS diff --git a/fnet/src/tests/databuffer/CMakeLists.txt b/fnet/src/tests/databuffer/CMakeLists.txt index 47122e11d96..877d39cec60 100644 --- a/fnet/src/tests/databuffer/CMakeLists.txt +++ b/fnet/src/tests/databuffer/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_executable(fnet_databuffer_test_app +vespa_add_executable(fnet_databuffer_test_app TEST SOURCES databuffer.cpp DEPENDS diff --git a/fnet/src/tests/examples/CMakeLists.txt b/fnet/src/tests/examples/CMakeLists.txt index 79f9047f626..fed462f8115 100644 --- a/fnet/src/tests/examples/CMakeLists.txt +++ b/fnet/src/tests/examples/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_executable(fnet_examples_test_app +vespa_add_executable(fnet_examples_test_app TEST SOURCES examples_test.cpp DEPENDS diff --git a/fnet/src/tests/fdselector/CMakeLists.txt b/fnet/src/tests/fdselector/CMakeLists.txt index 149d3642983..578d2f4a10e 100644 --- a/fnet/src/tests/fdselector/CMakeLists.txt +++ b/fnet/src/tests/fdselector/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_executable(fnet_fdselector_test_app +vespa_add_executable(fnet_fdselector_test_app TEST SOURCES fdselector.cpp DEPENDS diff --git a/fnet/src/tests/frt/memorytub/CMakeLists.txt b/fnet/src/tests/frt/memorytub/CMakeLists.txt index 1b6aa6e778b..e33dc154212 100644 --- a/fnet/src/tests/frt/memorytub/CMakeLists.txt +++ b/fnet/src/tests/frt/memorytub/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_executable(fnet_memorytub_test_app +vespa_add_executable(fnet_memorytub_test_app TEST SOURCES memorytub.cpp DEPENDS diff --git a/fnet/src/tests/frt/method_pt/CMakeLists.txt b/fnet/src/tests/frt/method_pt/CMakeLists.txt index d5a9566dbba..6de4a51b0c9 100644 --- a/fnet/src/tests/frt/method_pt/CMakeLists.txt +++ b/fnet/src/tests/frt/method_pt/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_executable(fnet_method_pt_test_app +vespa_add_executable(fnet_method_pt_test_app TEST SOURCES method_pt.cpp DEPENDS diff --git a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt b/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt index 00a0c12e413..d61fffcd8db 100644 --- a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt +++ b/fnet/src/tests/frt/parallel_rpc/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_executable(fnet_parallel_rpc_test_app +vespa_add_executable(fnet_parallel_rpc_test_app TEST SOURCES parallel_rpc_test.cpp DEPENDS diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt index 806a78ec6b7..8cd50f13910 100644 --- a/fnet/src/tests/frt/rpc/CMakeLists.txt +++ b/fnet/src/tests/frt/rpc/CMakeLists.txt @@ -1,26 +1,26 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(fnet_invoke_test_app +vespa_add_executable(fnet_invoke_test_app TEST SOURCES invoke.cpp DEPENDS fnet ) vespa_add_test(NAME fnet_invoke_test_app COMMAND fnet_invoke_test_app) -vespa_add_executable(fnet_detach_return_invoke_test_app +vespa_add_executable(fnet_detach_return_invoke_test_app TEST SOURCES detach_return_invoke.cpp DEPENDS fnet ) vespa_add_test(NAME fnet_detach_return_invoke_test_app COMMAND fnet_detach_return_invoke_test_app) -vespa_add_executable(fnet_session_test_app +vespa_add_executable(fnet_session_test_app TEST SOURCES session.cpp DEPENDS fnet ) vespa_add_test(NAME fnet_session_test_app COMMAND fnet_session_test_app) -vespa_add_executable(fnet_sharedblob_test_app +vespa_add_executable(fnet_sharedblob_test_app TEST SOURCES sharedblob.cpp DEPENDS diff --git a/fnet/src/tests/frt/values/CMakeLists.txt b/fnet/src/tests/frt/values/CMakeLists.txt index f1a851a09b1..f2f2f3dd915 100644 --- a/fnet/src/tests/frt/values/CMakeLists.txt +++ b/fnet/src/tests/frt/values/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_executable(fnet_values_test_app +vespa_add_executable(fnet_values_test_app TEST SOURCES values_test.cpp DEPENDS diff --git a/fnet/src/tests/info/CMakeLists.txt b/fnet/src/tests/info/CMakeLists.txt index fb6069e5f8a..4825617605b 100644 --- a/fnet/src/tests/info/CMakeLists.txt +++ b/fnet/src/tests/info/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_executable(fnet_info_test_app +vespa_add_executable(fnet_info_test_app TEST SOURCES info.cpp DEPENDS diff --git a/fnet/src/tests/locking/CMakeLists.txt b/fnet/src/tests/locking/CMakeLists.txt index 7a0187717e6..21a48376b1c 100644 --- a/fnet/src/tests/locking/CMakeLists.txt +++ b/fnet/src/tests/locking/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(fnet_drainpackets_test_app +vespa_add_executable(fnet_drainpackets_test_app TEST SOURCES drainpackets.cpp DEPENDS fnet ) vespa_add_test(NAME fnet_drainpackets_test_app NO_VALGRIND COMMAND fnet_drainpackets_test_app) -vespa_add_executable(fnet_lockspeed_test_app +vespa_add_executable(fnet_lockspeed_test_app TEST SOURCES lockspeed.cpp dummy.cpp @@ -14,7 +14,7 @@ vespa_add_executable(fnet_lockspeed_test_app fnet ) vespa_add_test(NAME fnet_lockspeed_test_app NO_VALGRIND COMMAND fnet_lockspeed_test_app) -vespa_add_executable(fnet_castspeed_test_app +vespa_add_executable(fnet_castspeed_test_app TEST SOURCES castspeed.cpp DEPENDS diff --git a/fnet/src/tests/printstuff/CMakeLists.txt b/fnet/src/tests/printstuff/CMakeLists.txt index 7180d2866f0..75aa822120f 100644 --- a/fnet/src/tests/printstuff/CMakeLists.txt +++ b/fnet/src/tests/printstuff/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_executable(fnet_printstuff_test_app +vespa_add_executable(fnet_printstuff_test_app TEST SOURCES printstuff_test.cpp DEPENDS diff --git a/fnet/src/tests/scheduling/CMakeLists.txt b/fnet/src/tests/scheduling/CMakeLists.txt index 244211a7cb6..17a2d00da4c 100644 --- a/fnet/src/tests/scheduling/CMakeLists.txt +++ b/fnet/src/tests/scheduling/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(fnet_schedule_test_app +vespa_add_executable(fnet_schedule_test_app TEST SOURCES schedule.cpp DEPENDS fnet ) vespa_add_test(NAME fnet_schedule_test_app COMMAND fnet_schedule_test_app) -vespa_add_executable(fnet_sloweventloop_test_app +vespa_add_executable(fnet_sloweventloop_test_app TEST SOURCES sloweventloop.cpp DEPENDS diff --git a/fnet/src/tests/sync_execute/CMakeLists.txt b/fnet/src/tests/sync_execute/CMakeLists.txt index 820cdb1af86..127d04fc456 100644 --- a/fnet/src/tests/sync_execute/CMakeLists.txt +++ b/fnet/src/tests/sync_execute/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_executable(fnet_sync_execute_test_app +vespa_add_executable(fnet_sync_execute_test_app TEST SOURCES sync_execute.cpp DEPENDS diff --git a/fnet/src/tests/thread_selection/CMakeLists.txt b/fnet/src/tests/thread_selection/CMakeLists.txt index 183781f3b21..3f8dd642834 100644 --- a/fnet/src/tests/thread_selection/CMakeLists.txt +++ b/fnet/src/tests/thread_selection/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_executable(fnet_thread_selection_test_app +vespa_add_executable(fnet_thread_selection_test_app TEST SOURCES thread_selection_test.cpp DEPENDS diff --git a/fnet/src/tests/time/CMakeLists.txt b/fnet/src/tests/time/CMakeLists.txt index 5f620af2b53..a2ff8431c4e 100644 --- a/fnet/src/tests/time/CMakeLists.txt +++ b/fnet/src/tests/time/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_executable(fnet_timespeed_test_app +vespa_add_executable(fnet_timespeed_test_app TEST SOURCES timespeed.cpp DEPENDS diff --git a/fsa/src/alltest/CMakeLists.txt b/fsa/src/alltest/CMakeLists.txt index d82ca400405..a2d99497499 100644 --- a/fsa/src/alltest/CMakeLists.txt +++ b/fsa/src/alltest/CMakeLists.txt @@ -61,7 +61,7 @@ vespa_add_executable(fsa_vectorizer_test_app DEPENDS fsa ) -vespa_add_executable(fsa_vectorizer_perf_test_app +vespa_add_executable(fsa_vectorizer_perf_test_app TEST SOURCES vectorizer_perftest.cpp DEPENDS diff --git a/functions.cmake b/functions.cmake index c75a454923b..46b8083b94c 100644 --- a/functions.cmake +++ b/functions.cmake @@ -192,7 +192,7 @@ endfunction() function(vespa_add_executable TARGET) cmake_parse_arguments(ARG - "" + "TEST" "INSTALL;OUTPUT_NAME" "DEPENDS;AFTER;SOURCES" ${ARGN}) @@ -201,6 +201,16 @@ 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() + if(ARG_INSTALL) install(TARGETS ${TARGET} DESTINATION ${ARG_INSTALL}) endif() @@ -344,13 +354,6 @@ function(vespa_add_test) separate_arguments(ARG_COMMAND) endif() - # If there exists a target with the same name as the test, exclude the target from the "all" target - # Instead, add it to the test target for this module - if (TARGET ${ARG_NAME}) - set_target_properties(${ARG_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE) - __add_test_target_to_module(${ARG_NAME}) - endif() - add_test(NAME ${ARG_NAME} COMMAND ${ARG_COMMAND} WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY}) if(ARG_ENVIRONMENT) diff --git a/install_java.cmake b/install_java.cmake index ec609dd2608..bdc2acbaa2d 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -24,6 +24,7 @@ install_fat_java_artifact(persistence) install_fat_java_artifact(simplemetrics) 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/jdisc_core/pom.xml b/jdisc_core/pom.xml index 315a46a65c4..7bd1a54d330 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -121,7 +121,13 @@ <scope>compile</scope> </dependency> <dependency> - <!-- This seems odd. Used for export-package parsing. Lazy stuff. Should be separated out. --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <!-- Used for export-package parsing. Ideally, that should have been a separate artifact. --> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> @@ -206,6 +212,7 @@ <argument>${project.build.directory}/dependency/log4j-over-slf4j.jar</argument> <argument>${project.build.directory}/dependency/config-lib.jar</argument> <argument>${project.build.directory}/dependency/yolean.jar</argument> + <argument>${project.build.directory}/dependency/vespajlib.jar</argument> </arguments> </configuration> </execution> diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapDaemon.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapDaemon.java index 21c52d6047d..cc87abdd292 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapDaemon.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapDaemon.java @@ -1,15 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.core; -import com.google.inject.Module; -import com.yahoo.jdisc.application.ContainerBuilder; -import com.yahoo.jdisc.application.OsgiFramework; import org.apache.commons.daemon.Daemon; import org.apache.commons.daemon.DaemonContext; -import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import java.util.logging.Logger; /** @@ -28,7 +23,7 @@ public class BootstrapDaemon implements Daemon { } public BootstrapDaemon() { - this(new ApplicationLoader(newOsgiFramework(), newConfigModule()), + this(new ApplicationLoader(Main.newOsgiFramework(), Main.newConfigModule()), Boolean.valueOf(System.getProperty("jdisc.privileged"))); } @@ -73,32 +68,4 @@ public class BootstrapDaemon implements Daemon { loader.destroy(); } - private static OsgiFramework newOsgiFramework() { - String cachePath = System.getProperty("jdisc.cache.path"); - if (cachePath == null) { - throw new IllegalStateException("System property 'jdisc.cache.path' not set."); - } - FelixParams params = new FelixParams() - .setCachePath(cachePath) - .setLoggerEnabled(Boolean.valueOf(System.getProperty("jdisc.logger.enabled", "true"))); - for (String str : ContainerBuilder.safeStringSplit(System.getProperty("jdisc.export.packages"), ",")) { - params.exportPackage(str); - } - return new FelixFramework(params); - } - - private static Iterable<Module> newConfigModule() { - String configFile = System.getProperty("jdisc.config.file"); - if (configFile == null) { - return Collections.emptyList(); - } - Module configModule; - try { - configModule = ApplicationConfigModule.newInstanceFromFile(configFile); - } catch (IOException e) { - throw new IllegalStateException("Exception thrown while reading config file '" + configFile + "'.", e); - } - return Arrays.asList(configModule); - } - } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/Main.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/Main.java new file mode 100644 index 00000000000..1fd5cad04db --- /dev/null +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/Main.java @@ -0,0 +1,45 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.jdisc.core; + +import com.google.inject.Module; +import com.yahoo.jdisc.application.ContainerBuilder; +import com.yahoo.jdisc.application.OsgiFramework; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; + +/** + * @author simon + */ +public class Main { + + static OsgiFramework newOsgiFramework() { + String cachePath = System.getProperty("jdisc.cache.path"); + if (cachePath == null) { + throw new IllegalStateException("System property 'jdisc.cache.path' not set."); + } + FelixParams params = new FelixParams() + .setCachePath(cachePath) + .setLoggerEnabled(Boolean.valueOf(System.getProperty("jdisc.logger.enabled", "true"))); + for (String str : ContainerBuilder.safeStringSplit(System.getProperty("jdisc.export.packages"), ",")) { + params.exportPackage(str); + } + return new FelixFramework(params); + } + + static Iterable<Module> newConfigModule() { + String configFile = System.getProperty("jdisc.config.file"); + if (configFile == null) { + return Collections.emptyList(); + } + Module configModule; + try { + configModule = ApplicationConfigModule.newInstanceFromFile(configFile); + } catch (IOException e) { + throw new IllegalStateException("Exception thrown while reading config file '" + configFile + "'.", e); + } + return Arrays.asList(configModule); + } + +} diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java new file mode 100644 index 00000000000..552d423f8cb --- /dev/null +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java @@ -0,0 +1,71 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.jdisc.core; + +import com.yahoo.system.CatchSigTerm; + +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.logging.Level; +import java.util.logging.Logger; + + +/** + * @author arnej27959 + */ +public class StandaloneMain { + + private static final Logger log = Logger.getLogger(StandaloneMain.class.getName()); + private final BootstrapLoader loader; + + static { + // force load slf4j to avoid other logging frameworks from initializing before it + org.slf4j.LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); + } + + public StandaloneMain() { + this.loader = new ApplicationLoader(Main.newOsgiFramework(), Main.newConfigModule()); + } + + public static void main(String [] args) { + if (args == null || args.length != 1 || args[0] == null) { + throw new IllegalArgumentException("Expected 1 argument, got " + Arrays.toString(args) + "."); + } + StandaloneMain me = new StandaloneMain(); + me.run(args[0]); + } + + void run(String bundleLocation) { + try { + log.info("Initializing application without privileges."); + loader.init(bundleLocation, false); + loader.start(); + setupSigTermHandler(); + waitForShutdown(); + // Event.stopping(APPNAME, "shutdown"); + loader.stop(); + // Event.stopped(APPNAME, 0, 0); + loader.destroy(); + // System.exit(0); + } catch (Exception e) { + log.log(Level.WARNING, "Unexpected: ", e); + System.exit(6); + } + } + + private final AtomicBoolean signalCaught = new AtomicBoolean(false); + private void setupSigTermHandler() { + CatchSigTerm.setup(signalCaught); // catch termination signal + } + private void waitForShutdown() { + synchronized (signalCaught) { + while (!signalCaught.get()) { + try { + signalCaught.wait(); + } catch (InterruptedException e) { + // empty + } + } + } + } + +} diff --git a/jrt_test/src/binref/compilejava.in b/jrt_test/src/binref/compilejava.in index d2751bb717d..d5c7a8eec7d 100755 --- a/jrt_test/src/binref/compilejava.in +++ b/jrt_test/src/binref/compilejava.in @@ -1,7 +1,7 @@ #!/bin/sh unset VESPA_LOG_TARGET -CLASSPATH=@PROJECT_BINARY_DIR@/jrt/target/jrt.jar -CLASSPATH=$CLASSPATH:@PROJECT_BINARY_DIR@/vespajlib/target/vespajlib.jar +CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar +CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes CLASSPATH=$CLASSPATH:. if [ $# -lt 1 ]; then diff --git a/jrt_test/src/tests/echo/CMakeLists.txt b/jrt_test/src/tests/echo/CMakeLists.txt index 3ac6183a27d..bab581e1606 100644 --- a/jrt_test/src/tests/echo/CMakeLists.txt +++ b/jrt_test/src/tests/echo/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_executable(jrt_test_echo-client_app +vespa_add_executable(jrt_test_echo-client_app TEST SOURCES echo-client.cpp DEPENDS diff --git a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt index f4496d86cbb..561f19e5912 100644 --- a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt +++ b/jrt_test/src/tests/mandatory-methods/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_executable(jrt_test_extract-reflection_app +vespa_add_executable(jrt_test_extract-reflection_app TEST SOURCES extract-reflection.cpp DEPENDS diff --git a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt index 773de6f4283..049b42a7e16 100644 --- a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt +++ b/jrt_test/src/tests/mockup-invoke/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_executable(jrt_test_mockup-server_app +vespa_add_executable(jrt_test_mockup-server_app TEST SOURCES mockup-server.cpp DEPENDS diff --git a/jrt_test/src/tests/rpc-error/CMakeLists.txt b/jrt_test/src/tests/rpc-error/CMakeLists.txt index 9d144709dfc..f4756f3dffa 100644 --- a/jrt_test/src/tests/rpc-error/CMakeLists.txt +++ b/jrt_test/src/tests/rpc-error/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_executable(jrt_test_test-errors_app +vespa_add_executable(jrt_test_test-errors_app TEST SOURCES test-errors.cpp DEPENDS 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/juniper/src/test/CMakeLists.txt b/juniper/src/test/CMakeLists.txt index 285e705f42b..d574c068c38 100644 --- a/juniper/src/test/CMakeLists.txt +++ b/juniper/src/test/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_executable(juniper_mcandTest_app +vespa_add_executable(juniper_mcandTest_app TEST SOURCES mcandTest.cpp mcandTestApp.cpp @@ -8,7 +8,7 @@ vespa_add_executable(juniper_mcandTest_app juniper ) vespa_add_test(NAME juniper_mcandTest_app COMMAND juniper_mcandTest_app) -vespa_add_executable(juniper_queryparserTest_app +vespa_add_executable(juniper_queryparserTest_app TEST SOURCES queryparserTest.cpp queryparserTestApp.cpp @@ -18,7 +18,7 @@ vespa_add_executable(juniper_queryparserTest_app juniper ) vespa_add_test(NAME juniper_queryparserTest_app COMMAND juniper_queryparserTest_app) -vespa_add_executable(juniper_matchobjectTest_app +vespa_add_executable(juniper_matchobjectTest_app TEST SOURCES matchobjectTest.cpp matchobjectTestApp.cpp @@ -28,21 +28,21 @@ vespa_add_executable(juniper_matchobjectTest_app juniper ) vespa_add_test(NAME juniper_matchobjectTest_app COMMAND juniper_matchobjectTest_app) -vespa_add_executable(juniper_appender_test_app +vespa_add_executable(juniper_appender_test_app TEST SOURCES appender_test.cpp DEPENDS juniper ) vespa_add_test(NAME juniper_appender_test_app COMMAND juniper_appender_test_app) -vespa_add_executable(juniper_queryvisitor_test_app +vespa_add_executable(juniper_queryvisitor_test_app TEST SOURCES queryvisitor_test.cpp DEPENDS juniper ) vespa_add_test(NAME juniper_queryvisitor_test_app COMMAND juniper_queryvisitor_test_app) -vespa_add_executable(juniper_auxTest_app +vespa_add_executable(juniper_auxTest_app TEST SOURCES auxTest.cpp auxTestApp.cpp @@ -51,7 +51,7 @@ vespa_add_executable(juniper_auxTest_app juniper ) vespa_add_test(NAME juniper_auxTest_app COMMAND juniper_auxTest_app) -vespa_add_executable(juniper_SrcTestSuite_app +vespa_add_executable(juniper_SrcTestSuite_app TEST SOURCES mcandTest.cpp queryparserTest.cpp diff --git a/logd/src/tests/forward/CMakeLists.txt b/logd/src/tests/forward/CMakeLists.txt index c71b8d89c6e..653fa145522 100644 --- a/logd/src/tests/forward/CMakeLists.txt +++ b/logd/src/tests/forward/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_executable(logd_forward_test_app +vespa_add_executable(logd_forward_test_app TEST SOURCES forward.cpp DEPENDS diff --git a/logd/src/tests/info/CMakeLists.txt b/logd/src/tests/info/CMakeLists.txt index 3be1ab3cb49..b82292dd9d4 100644 --- a/logd/src/tests/info/CMakeLists.txt +++ b/logd/src/tests/info/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_executable(logd_info_test_app +vespa_add_executable(logd_info_test_app TEST SOURCES info.cpp DEPENDS diff --git a/logserver/.gitignore b/logserver/.gitignore index 3c9aa00964f..1eb021de874 100644 --- a/logserver/.gitignore +++ b/logserver/.gitignore @@ -1,7 +1,6 @@ .classpath .git .project -archive build classes javamake.pdb diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java new file mode 100644 index 00000000000..06bf5183005 --- /dev/null +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java @@ -0,0 +1,255 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.logserver.handlers.archive; + +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.Iterator; +import java.util.TimeZone; +import java.util.logging.Level; +import java.util.logging.Logger; + +import com.yahoo.logserver.filter.LogFilter; +import com.yahoo.logserver.filter.LogFilterManager; + +import com.yahoo.log.LogLevel; +import com.yahoo.log.LogMessage; +import com.yahoo.logserver.handlers.AbstractLogHandler; + + +/** + * This class implements a log handler which archives the incoming + * messages based on their timestamp. The goal of this archiver + * is to make it easy to locate messages in a time interval, while + * ensuring that no log file exceeds the maximum allowed size. + * + * <p> + * This class is not thread safe. + * </p> + * + * <p> + * TODO: + * </p> + * <ul> + * <li> Add file locking support in order to make it + * possible to do concurrent compression of log + * files. + * + * <li> Add support for disk monitoring. Should have + * high/low watermark mechanism and three modes + * of operation: normal, tight and full. In + * "tight" mode disk is running low and compression + * and cleanup should possibly be more frequent. + * + * <li> Add compression task which periodically scans + * the log directory looking for uncompressed + * candidate log files. + * + * </ul> + * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a> + */ +public class ArchiverHandler extends AbstractLogHandler +{ + private static final Logger log + = Logger.getLogger(ArchiverHandler.class.getName()); + + /** File instance representing root directory for logging */ + private File root; + + /** Root directory for logging */ + private String absoluteRootDir; + + /** Max number of log files open at any given time */ + private final int maxFilesOpen = 100; + + /** + *The maximum number of bytes we allow a file to grow to + * before we rotate it + */ + private int maxFileSize; + + /** Calendar instance for operating on Date objects */ + private final Calendar calendar; + + /** DateFormat instance for building filenames */ + private final SimpleDateFormat dateformat; + + /** + * This is an LRU cache for LogWriter objects. Remember that + * we have one LogWriter for each time slot + */ + private final LogWriterLRUCache logWriterLRUCache; + + /** + * Filtering + */ + private LogFilter filter = null; + + /** + * Creates an ArchiverHandler which puts files under + * the given root directory. + */ + public ArchiverHandler () { + calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC")); + dateformat = new SimpleDateFormat("yyyy/MM/dd/HH"); + dateformat.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Set up filtering + String archiveMetrics = System.getProperty("vespa_log_server__archive_metric"); + if ("off".equals(archiveMetrics)){ + filter = LogFilterManager.getLogFilter("system.nometricsevents"); + } + + setLogFilter(filter); + + // set up LRU for files + logWriterLRUCache = new LogWriterLRUCache(maxFilesOpen, + (float)0.75); + } + + /** + * Creates an ArchiverHandler which puts files under + * the given root directory. + */ + public ArchiverHandler (String rootDir, int maxFileSize) { + this(); + setRootDir(rootDir); + this.maxFileSize = maxFileSize; + } + + + /** + * Return the appropriate LogWriter given a log message. + */ + private synchronized LogWriter getLogWriter (LogMessage m) throws IOException { + Integer slot = new Integer(dateHash(m.getTime())); + LogWriter logWriter = logWriterLRUCache.get(slot); + if (logWriter != null) { + return logWriter; + } + + // invariant: LogWriter we sought was not in the cache + logWriter = new LogWriter(getPrefix(m), maxFileSize); + logWriterLRUCache.put(slot, logWriter); + + return logWriter; + } + + /** + * This method is just a fancy way of generating a stripped + * down number representing year, month, day and hour in order + * to partition logging in time. + * + * <P> + * This method is not thread-safe. + */ + public int dateHash (long time) { + calendar.setTimeInMillis(time); + int year = calendar.get(Calendar.YEAR); + int month = calendar.get(Calendar.MONTH) + 1; + int day = calendar.get(Calendar.DAY_OF_MONTH); + int hour = calendar.get(Calendar.HOUR_OF_DAY); + + return year * 1000000 + + month * 10000 + + day * 100 + + hour; + } + + /** + * Generate prefix for log filenames based on log message. + * + * <P> + * <EM>This message is <code>public</code> only because we need + * access to it in unit tests. For all practical purposes this + * method does not exist to you, the application programmer, OK? :-)</EM> + * <P> + * XXX optimize! + */ + public String getPrefix (LogMessage msg) { + calendar.setTimeInMillis(msg.getTime()); +/* + int year = calendar.get(Calendar.YEAR); + int month = calendar.get(Calendar.MONTH) + 1; + int day = calendar.get(Calendar.DAY_OF_MONTH); + int hour = calendar.get(Calendar.HOUR_OF_DAY); +*/ + StringBuffer result = new StringBuffer(absoluteRootDir.length() + + 1 // slash + + 4 // year + + 1 // slash + + 2 // month + + 1 // slash + + 2 // day + + 1 // slash + + 2 // hour + ) + .append(absoluteRootDir).append("/") + .append(dateformat.format(calendar.getTime())); + return result.toString(); + } + + public boolean doHandle (LogMessage msg) { + try { + LogWriter logWriter = getLogWriter(msg); + logWriter.write(msg.toString()); + } + catch (IOException e) { + throw new RuntimeException(e); + } + return true; + } + + public synchronized void flush () { + for (LogWriter l : logWriterLRUCache.values()) { + try { + l.flush(); + } + catch (IOException e) { + log.log(Level.WARNING, "Flushing failed", e); + } + } + } + + public synchronized void close () { + Iterator<LogWriter> it = logWriterLRUCache.values().iterator(); + while (it.hasNext()) { + LogWriter l = it.next(); + try { + l.close(); + } + catch (IOException e) { + log.log(Level.WARNING, "Closing failed", e); + } + it.remove(); + } + } + + private void setRootDir(String rootDir) { + // roundabout way of setting things, but this way we can + // get around Java's ineptitude for file handling. (relative + // paths in File are broken) + // + absoluteRootDir = new File(rootDir).getAbsolutePath(); + root = new File(absoluteRootDir); + + // ensure that root dir exists + if (root.isDirectory()) { + log.log(LogLevel.DEBUG, "Using " + absoluteRootDir + " as root"); + } else { + if (! root.mkdirs()) { + log.log(LogLevel.ERROR, + "Unable to create directory " + absoluteRootDir); + } else { + log.log(LogLevel.DEBUG, "Created root at " + absoluteRootDir); + } + } + + } + + public String toString () { + return ArchiverHandler.class.getName() + ": root=" + absoluteRootDir; + } +} diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverPlugin.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverPlugin.java new file mode 100644 index 00000000000..0d04b4cf981 --- /dev/null +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverPlugin.java @@ -0,0 +1,77 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.logserver.handlers.archive; + +import java.util.logging.Logger; +import com.yahoo.logserver.Server; +import com.yahoo.plugin.Config; +import com.yahoo.plugin.Plugin; + + +public class ArchiverPlugin implements Plugin +{ + /** + * Default log archive dir (relative to current directory + * at startup). + */ + private static final String DEFAULT_DIR = "logarchive"; + + /** + * Default max file size for archived log files. + */ + private static final String DEFAULT_MAXFILESIZE = "20971520"; + + private final Server server = Server.getInstance(); + private static final Logger log = + Logger.getLogger(ArchiverPlugin.class.getName()); + private ArchiverHandler archiver; + + /** + * @return the name of this plugin + */ + public String getPluginName() { + return "logarchive"; + } + + /** Initialize the archiver plugin + * + * Config keys used: + * + * maxfilesize + * dir The root of the logarchive, make sure this does + * <b>not</b> end with a '/' character. + */ + public void initPlugin(Config config) { + + if (archiver != null) { + log.finer("ArchivePlugin doubly initialized"); + throw new IllegalStateException("plugin already initialized: " + + getPluginName()); + } + + // Possible to disable logarchive for testing + String rootDir = config.get("dir", DEFAULT_DIR); + int maxFileSize = config.getInt("maxfilesize", DEFAULT_MAXFILESIZE); + String threadName = config.get("thread", getPluginName()); + + // register log handler and flusher + archiver = new ArchiverHandler(rootDir, maxFileSize); + server.registerLogHandler(archiver, threadName); + server.registerFlusher(archiver); + } + + /** + * Shut down the archiver plugin. + */ + public void shutdownPlugin() { + + if (archiver == null) { + log.finer("ArchiverPlugin shutdown before initialize"); + throw new IllegalStateException("plugin not initialized: " + + getPluginName()); + } + server.unregisterLogHandler(archiver); + server.unregisterFlusher(archiver); + archiver.close(); + archiver = null; + } +} diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java new file mode 100644 index 00000000000..fb78e8243c3 --- /dev/null +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java @@ -0,0 +1,147 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.logserver.handlers.archive; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.util.logging.Logger; + +import com.yahoo.log.LogLevel; + +/** + * This class is not thread-safe. + * + * + * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a> + */ +public class LogWriter extends Writer +{ + private static final Logger log = Logger.getLogger(LogWriter.class.getName()); + + private long bytesWritten = 0; + private int generation = 0; + private int maxSize = 20 * (1024*1024); + private final int resumeLimit = 95; + private final int resumeLimitSize = (maxSize * resumeLimit / 100); + private File currentFile; + private Writer writer; + private final String prefix; + + public LogWriter (String prefix, int maxSize) throws IOException { + this.prefix = prefix; + this.maxSize = maxSize; + writer = nextWriter(); + } + + /** + * This is called when we want to rotate the output file to + * start writing the next file. There are two scenarios when + * we do this: + * + * <UL> + * <LI> initial case, when we have no file + * <LI> when we have filled the file and want to rotate it + * </UL> + * + */ + private Writer nextWriter () throws IOException { + + if (writer != null) { + writer.close(); + } + + int maxAttempts = 1000; + while (maxAttempts-- > 0) { + String name = prefix + "-" + generation++; + File f = new File(name); + + // make sure directory exists + File dir = f.getParentFile(); + if (! dir.exists()) { + dir.mkdirs(); + } + + // if compressed version exists we skip it + if ((new File(name + ".gz").exists()) + || (new File(name + ".bz2").exists())) { + continue; + } + + // if file does not exist we have a winner + if (! f.exists()) { + log.log(LogLevel.DEBUG, "nextWriter, new file: " + name); + currentFile = f; + bytesWritten = 0; + return new FileWriter(f, true); + } + + // just skip over directories for now + if (! f.isFile()) { + log.fine("nextWriter, " + name + " is a directory, skipping"); + continue; + } + + // if the size is < resumeSizeLimit then we open it + if (f.length() < resumeLimitSize) { + log.fine("nextWriter, resuming " + name + ", length was " + f.length()); + currentFile = f; + bytesWritten = f.length(); + return new FileWriter(f, true); + } else { + + log.fine("nextWriter, not resuming " + name + + " because it is bigger than " + + resumeLimit + + " percent of max"); + } + } + + throw new RuntimeException("Unable to create next log file"); + } + + /** + * Note that this method should not be used directly since + * that would circumvent rotation when it grows past its + * maximum size. use the one that takes String instead. + * + * <P> + * <em> + * (This is a class which is only used internally anyway) + * </em> + */ + public void write (char[] cbuff, int offset, int len) throws IOException { + throw new RuntimeException("This method should not be used"); + } + + public void write(String str) throws IOException { + if (writer == null) { + writer = nextWriter(); + } + + bytesWritten += str.length(); + writer.write(str, 0, str.length()); + + if (bytesWritten >= maxSize) { + log.fine("logfile '" + + currentFile.getAbsolutePath() + + "' full, rotating"); + writer = nextWriter(); + } + } + + + public void flush() throws IOException{ + if (writer != null) { + writer.flush(); + } + } + + public void close() throws IOException { + flush(); + if (writer != null) { + writer.close(); + writer = null; + } + } +} diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriterLRUCache.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriterLRUCache.java new file mode 100644 index 00000000000..21ca26efdd2 --- /dev/null +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriterLRUCache.java @@ -0,0 +1,41 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.logserver.handlers.archive; + +import java.io.IOException; +import java.util.logging.Logger; +import java.util.logging.Level; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a> + */ +@SuppressWarnings("serial") +public class LogWriterLRUCache extends LinkedHashMap<Integer, LogWriter> +{ + private static final Logger log + = Logger.getLogger(LogWriterLRUCache.class.getName()); + + final int maxEntries = 100; + + public LogWriterLRUCache(int initialCapacity, + float loadFactor) { + super(initialCapacity, loadFactor, true); + } + + // TODO: implement unit test for this + protected boolean removeEldestEntry (Map.Entry<Integer, LogWriter> eldest) { + if (size() > maxEntries) { + LogWriter logWriter = (LogWriter)eldest.getValue(); + log.fine("Closing oldest LogWriter: " + logWriter); + try { + logWriter.close(); + } catch (IOException e) { + log.log(Level.WARNING, "closing LogWriter failed", e); + } + return true; + } + + return false; + } +} 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/archive/ArchiverHandlerTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/ArchiverHandlerTestCase.java new file mode 100644 index 00000000000..ec1b0d962ef --- /dev/null +++ b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/ArchiverHandlerTestCase.java @@ -0,0 +1,243 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.logserver.handlers.archive; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import com.yahoo.io.IOUtils; +import com.yahoo.log.InvalidLogFormatException; +import com.yahoo.log.LogMessage; +import com.yahoo.plugin.SystemPropertyConfig; + +import org.junit.*; +import org.junit.rules.TemporaryFolder; + +import static org.junit.Assert.*; + +/** + * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a> + */ +public class ArchiverHandlerTestCase { + + private static final String[] mStrings = { + "1095159244.095\thost\t1/2\tservice\tcomponent\tinfo\tpayload1", + "1095206399.000\thost\t1/2\tservice\tcomponent\tinfo\tpayload2", + "1095206400.000\thost\t1/2\tservice\tcomponent\tinfo\tpayload3", + "1095206401.000\thost\t1/2\tservice\tcomponent\tinfo\tpayload4", + }; + + private static final LogMessage[] msg = new LogMessage[mStrings.length]; + + static { + try { + for (int i = 0; i < mStrings.length; i++) { + msg[i] = LogMessage.parseNativeFormat(mStrings[i]); + } + } catch (InvalidLogFormatException e) { + throw new RuntimeException(e); + } + + // mute the logging + Logger.getLogger(ArchiverHandler.class.getName()).setLevel(Level.WARNING); + Logger.getLogger(LogWriter.class.getName()).setLevel(Level.WARNING); + + } + + + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + + /** + * Make sure that rollover for dateHash() occurs at midnight, so that + * points in time belonging to the same day are in the interval + * [00:00:00.000, 23:59:59.999]. + */ + @Test + public void testDateHash () throws IOException { + File tmpDir = temporaryFolder.newFolder(); + try { + ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(), + 1024); + long now = 1095159244095L; + long midnight = 1095206400000L; + assertEquals(2004091410, a.dateHash(now)); + assertEquals(2004091423, a.dateHash(midnight-1)); + assertEquals(2004091500, a.dateHash(midnight)); + assertEquals(2004091500, a.dateHash(midnight+1)); + a.close(); + } + finally { + IOUtils.recursiveDeleteDir(tmpDir); + } + } + + /** + * Test that the ArchiverHandler creates correct filenames. + */ + @Test + public void testFilenameCreation() throws IOException { + File tmpDir = temporaryFolder.newFolder(); + try { + ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(), + 1024); + LogMessage msg1 = LogMessage.parseNativeFormat("1139322725\thost\tthread\tservice\tcomponent\tinfo\tpayload"); + LogMessage msg2 = LogMessage.parseNativeFormat("1161172200\thost\tthread\tservice\tcomponent\tinfo\tpayload"); + assertEquals(tmpDir.getAbsolutePath() + "/2006/02/07/14", a.getPrefix(msg1)); + assertEquals(tmpDir.getAbsolutePath() + "/2006/10/18/11", a.getPrefix(msg2)); + assertEquals(a.getPrefix(msg1).length(), a.getPrefix(msg2).length()); + a.close(); + } catch (InvalidLogFormatException e) { + fail(e.toString()); + } + finally { + IOUtils.recursiveDeleteDir(tmpDir); + } + } + + /** + * Log some messages to the handler and verify that they are + * written. + */ + @Test + public void testLogging () throws java.io.IOException, InvalidLogFormatException { + File tmpDir = temporaryFolder.newFolder(); + try { + ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(), + 1024); + + for (int i = 0; i < msg.length; i++) { + a.handle(msg[i]); + } + a.close(); + + + // make sure all the log files are there, that all log entries + // are accounted for and that they match what we logged. + int messageCount = 0; + + // map of files we've already inspected. this we need to ensure + // that we are not inspecting the same files over and over again + // so the counts get messed up + Set<String> inspectedFiles = new HashSet<String>(); + + for (int i = 0; i < msg.length; i++) { + String name = a.getPrefix(msg[i]) + "-0"; + + // have we inspected this file before? + if (! inspectedFiles.add(name)) { + continue; + } + + + File f = new File(name); + assertTrue(f.exists()); + + BufferedReader br = new BufferedReader(new FileReader(f)); + for (String line = br.readLine(); + line != null; + line = br.readLine()) + { + // primitive check if the messages match + boolean foundMatch = false; + for (int k = 0; k < mStrings.length; k++) { + if (mStrings[k].equals(line)) { + foundMatch = true; + break; + } + } + assertTrue(foundMatch); + + // try to instantiate messages to ensure that they + // are parseable + @SuppressWarnings("unused") + LogMessage m = LogMessage.parseNativeFormat(line); + messageCount++; + } + br.close(); + } + + // verify that the number of log messages written equals + // the number of log messages we have in our test + assertEquals(mStrings.length, messageCount); + } + finally { + IOUtils.recursiveDeleteDir(tmpDir); + } + } + + /** + * Make sure that the file is rotated after N bytes + */ + @Test + public void testRotation () throws IOException { + File tmpDir = temporaryFolder.newFolder(); + try { + ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(), + msg[1].toString().length() + 1); + // log the same message 4 times + for (int i = 0; i < 4; i++) { + a.handle(msg[1]); + } + a.close(); + + // we should now have 3 files + String prefix = a.getPrefix(msg[1]); + int msgCount = 0; + for (int i = 0; i < 3; i++) { + File f = new File(prefix + "-" + i); + assertTrue(f.exists()); + + // ensure there's the same log message in all files + BufferedReader br = new BufferedReader(new FileReader(f)); + for (String line = br.readLine(); + line != null; + line = br.readLine()) + { + assertTrue(msg[1].toString().equals((line + "\n"))); + msgCount++; + } + br.close(); + } + assertEquals(4, msgCount); + + // make sure we have no more than 3 files + assertTrue(! (new File(prefix + "-3").exists())); + } + finally { + IOUtils.recursiveDeleteDir(tmpDir); + } + } + + @Test + public void testCacheEldestEntry() throws IOException { + LogWriterLRUCache cache = new LogWriterLRUCache(5, (float) 0.75); + for (int i = 0 ; i < cache.maxEntries+10 ; i++) { + cache.put(i, new LogWriter("/tmp/", 5)); + } + assertEquals(cache.size(), cache.maxEntries); + } + + @Test + public void testArchiverPlugin() { + ArchiverPlugin ap = new ArchiverPlugin(); + try { + ap.shutdownPlugin(); + fail("Shutdown before init didn't throw."); + } catch (Exception e) { + } + ap.initPlugin(new SystemPropertyConfig("test")); + try { + ap.initPlugin(new SystemPropertyConfig("test")); + fail("Multiple init didn't throw."); + } catch (Exception e) { + } + ap.shutdownPlugin(); + } + +} diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/archive/test/.gitignore b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/test/.gitignore new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/test/.gitignore 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/lowercasing_test/src/java/.gitignore b/lowercasing_test/src/java/.gitignore index 5dec1497a4f..b9e1611ac9e 100644 --- a/lowercasing_test/src/java/.gitignore +++ b/lowercasing_test/src/java/.gitignore @@ -1,3 +1,4 @@ build.inc classes lowercasing_test.jar +java_code_compiled diff --git a/lowercasing_test/src/java/CMakeLists.txt b/lowercasing_test/src/java/CMakeLists.txt index 5ef6b6b1e92..34b531c2093 100644 --- a/lowercasing_test/src/java/CMakeLists.txt +++ b/lowercasing_test/src/java/CMakeLists.txt @@ -1,5 +1,6 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -add_custom_target(lowercasing_test_java ALL - ant -q -buildfile ${CMAKE_CURRENT_SOURCE_DIR}/build.xml >>/dev/null - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build.xml ${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld.java -) +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled + COMMAND ant -q -buildfile ${CMAKE_CURRENT_SOURCE_DIR}/build.xml >>/dev/null + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build.xml ${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld.java) +add_custom_target(lowercasing_test_java ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled) diff --git a/lowercasing_test/src/tests/hello-world/CMakeLists.txt b/lowercasing_test/src/tests/hello-world/CMakeLists.txt index ec4d0c68532..079fbe85d71 100644 --- a/lowercasing_test/src/tests/hello-world/CMakeLists.txt +++ b/lowercasing_test/src/tests/hello-world/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_executable(lowercasing_test_hello-world-local_app +vespa_add_executable(lowercasing_test_hello-world-local_app TEST SOURCES hello-world-local.cpp DEPENDS diff --git a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt index 02bc9f3db52..cfcc932a35a 100644 --- a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt +++ b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt @@ -1,11 +1,11 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(lowercasing_test_casingvariants_fastlib_app +vespa_add_executable(lowercasing_test_casingvariants_fastlib_app TEST SOURCES casingvariants_fastlib.cpp DEPENDS ) vespa_add_test(NAME lowercasing_test_lowrcasing NO_VALGRIND COMMAND sh lowercasing_test.sh) -vespa_add_executable(lowercasing_test_casingvariants_vespalib_app +vespa_add_executable(lowercasing_test_casingvariants_vespalib_app TEST SOURCES casingvariants_vespalib.cpp DEPENDS diff --git a/memfilepersistence/src/tests/CMakeLists.txt b/memfilepersistence/src/tests/CMakeLists.txt index ee0cea9e1a5..24863d6e837 100644 --- a/memfilepersistence/src/tests/CMakeLists.txt +++ b/memfilepersistence/src/tests/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_executable(memfilepersistence_testrunner_app +vespa_add_executable(memfilepersistence_testrunner_app TEST SOURCES testhelper.cpp testrunner.cpp diff --git a/messagebus/CMakeLists.txt b/messagebus/CMakeLists.txt index c66874e4ec4..06a37a0ec95 100644 --- a/messagebus/CMakeLists.txt +++ b/messagebus/CMakeLists.txt @@ -22,5 +22,4 @@ vespa_define_module( TESTS src/tests - test ) diff --git a/messagebus/OWNERS b/messagebus/OWNERS index 631c3b2dd30..b9557349aa2 100644 --- a/messagebus/OWNERS +++ b/messagebus/OWNERS @@ -1,2 +1,2 @@ dybdahl -balder +baldersheim 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/tests/advancedrouting/CMakeLists.txt b/messagebus/src/tests/advancedrouting/CMakeLists.txt index 99f5b037b69..c51be60518d 100644 --- a/messagebus/src/tests/advancedrouting/CMakeLists.txt +++ b/messagebus/src/tests/advancedrouting/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_executable(messagebus_advancedrouting_test_app +vespa_add_executable(messagebus_advancedrouting_test_app TEST SOURCES advancedrouting.cpp DEPENDS diff --git a/messagebus/src/tests/auto-reply/CMakeLists.txt b/messagebus/src/tests/auto-reply/CMakeLists.txt index 950ade550b7..46037f7844a 100644 --- a/messagebus/src/tests/auto-reply/CMakeLists.txt +++ b/messagebus/src/tests/auto-reply/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_executable(messagebus_auto-reply_test_app +vespa_add_executable(messagebus_auto-reply_test_app TEST SOURCES auto-reply.cpp DEPENDS diff --git a/messagebus/src/tests/blob/CMakeLists.txt b/messagebus/src/tests/blob/CMakeLists.txt index d9a865519cb..268b3ee40c3 100644 --- a/messagebus/src/tests/blob/CMakeLists.txt +++ b/messagebus/src/tests/blob/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_executable(messagebus_blob_test_app +vespa_add_executable(messagebus_blob_test_app TEST SOURCES blob.cpp DEPENDS diff --git a/messagebus/src/tests/bucketsequence/CMakeLists.txt b/messagebus/src/tests/bucketsequence/CMakeLists.txt index 5ab01524d51..35d46d95802 100644 --- a/messagebus/src/tests/bucketsequence/CMakeLists.txt +++ b/messagebus/src/tests/bucketsequence/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_executable(messagebus_bucketsequence_test_app +vespa_add_executable(messagebus_bucketsequence_test_app TEST SOURCES bucketsequence.cpp DEPENDS diff --git a/messagebus/src/tests/choke/CMakeLists.txt b/messagebus/src/tests/choke/CMakeLists.txt index 02e2c14b943..cb500c48be4 100644 --- a/messagebus/src/tests/choke/CMakeLists.txt +++ b/messagebus/src/tests/choke/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_executable(messagebus_choke_test_app +vespa_add_executable(messagebus_choke_test_app TEST SOURCES choke.cpp DEPENDS diff --git a/messagebus/src/tests/configagent/CMakeLists.txt b/messagebus/src/tests/configagent/CMakeLists.txt index 04170cc9d05..844371986fd 100644 --- a/messagebus/src/tests/configagent/CMakeLists.txt +++ b/messagebus/src/tests/configagent/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_executable(messagebus_configagent_test_app +vespa_add_executable(messagebus_configagent_test_app TEST SOURCES configagent.cpp DEPENDS diff --git a/messagebus/src/tests/context/CMakeLists.txt b/messagebus/src/tests/context/CMakeLists.txt index d9a85a1b8c9..bd4705b7a28 100644 --- a/messagebus/src/tests/context/CMakeLists.txt +++ b/messagebus/src/tests/context/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_executable(messagebus_context_test_app +vespa_add_executable(messagebus_context_test_app TEST SOURCES context.cpp DEPENDS diff --git a/messagebus/src/tests/emptyreply/CMakeLists.txt b/messagebus/src/tests/emptyreply/CMakeLists.txt index 17f26719396..832e761c7fc 100644 --- a/messagebus/src/tests/emptyreply/CMakeLists.txt +++ b/messagebus/src/tests/emptyreply/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_executable(messagebus_emptyreply_test_app +vespa_add_executable(messagebus_emptyreply_test_app TEST SOURCES emptyreply.cpp DEPENDS diff --git a/messagebus/src/tests/error/CMakeLists.txt b/messagebus/src/tests/error/CMakeLists.txt index 7a5ea78fab3..65d5c69f189 100644 --- a/messagebus/src/tests/error/CMakeLists.txt +++ b/messagebus/src/tests/error/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_executable(messagebus_error_test_app +vespa_add_executable(messagebus_error_test_app TEST SOURCES error.cpp DEPENDS diff --git a/messagebus/src/tests/identity/CMakeLists.txt b/messagebus/src/tests/identity/CMakeLists.txt index 66aea485746..7090b5e6365 100644 --- a/messagebus/src/tests/identity/CMakeLists.txt +++ b/messagebus/src/tests/identity/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_executable(messagebus_identity_test_app +vespa_add_executable(messagebus_identity_test_app TEST SOURCES identity.cpp DEPENDS diff --git a/messagebus/src/tests/loadbalance/CMakeLists.txt b/messagebus/src/tests/loadbalance/CMakeLists.txt index 68d0483ce5d..67e67df3719 100644 --- a/messagebus/src/tests/loadbalance/CMakeLists.txt +++ b/messagebus/src/tests/loadbalance/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_executable(messagebus_loadbalance_test_app +vespa_add_executable(messagebus_loadbalance_test_app TEST SOURCES loadbalance.cpp DEPENDS diff --git a/messagebus/src/tests/messagebus/CMakeLists.txt b/messagebus/src/tests/messagebus/CMakeLists.txt index fc44bb60069..bb0b555d563 100644 --- a/messagebus/src/tests/messagebus/CMakeLists.txt +++ b/messagebus/src/tests/messagebus/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_executable(messagebus_messagebus_test_app +vespa_add_executable(messagebus_messagebus_test_app TEST SOURCES messagebus.cpp DEPENDS diff --git a/messagebus/src/tests/messageordering/CMakeLists.txt b/messagebus/src/tests/messageordering/CMakeLists.txt index b3af6386684..b92926a8dd8 100644 --- a/messagebus/src/tests/messageordering/CMakeLists.txt +++ b/messagebus/src/tests/messageordering/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_executable(messagebus_messageordering_test_app +vespa_add_executable(messagebus_messageordering_test_app TEST SOURCES messageordering.cpp DEPENDS diff --git a/messagebus/src/tests/messenger/CMakeLists.txt b/messagebus/src/tests/messenger/CMakeLists.txt index 6dfab750bf4..11b29190483 100644 --- a/messagebus/src/tests/messenger/CMakeLists.txt +++ b/messagebus/src/tests/messenger/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_executable(messagebus_messenger_test_app +vespa_add_executable(messagebus_messenger_test_app TEST SOURCES messenger.cpp DEPENDS diff --git a/messagebus/src/tests/oos/CMakeLists.txt b/messagebus/src/tests/oos/CMakeLists.txt index 1d037ef6f6e..09819d27fff 100644 --- a/messagebus/src/tests/oos/CMakeLists.txt +++ b/messagebus/src/tests/oos/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_executable(messagebus_oos_test_app +vespa_add_executable(messagebus_oos_test_app TEST SOURCES oos.cpp DEPENDS diff --git a/messagebus/src/tests/protocolrepository/CMakeLists.txt b/messagebus/src/tests/protocolrepository/CMakeLists.txt index 68156e5eee9..c2968e67c94 100644 --- a/messagebus/src/tests/protocolrepository/CMakeLists.txt +++ b/messagebus/src/tests/protocolrepository/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_executable(messagebus_protocolrepository_test_app +vespa_add_executable(messagebus_protocolrepository_test_app TEST SOURCES protocolrepository.cpp DEPENDS diff --git a/messagebus/src/tests/queue/CMakeLists.txt b/messagebus/src/tests/queue/CMakeLists.txt index c330421ac8a..77080ec9043 100644 --- a/messagebus/src/tests/queue/CMakeLists.txt +++ b/messagebus/src/tests/queue/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_executable(messagebus_queue_test_app +vespa_add_executable(messagebus_queue_test_app TEST SOURCES queue.cpp DEPENDS diff --git a/messagebus/src/tests/replygate/CMakeLists.txt b/messagebus/src/tests/replygate/CMakeLists.txt index 8844ef862dd..b2c87d5c405 100644 --- a/messagebus/src/tests/replygate/CMakeLists.txt +++ b/messagebus/src/tests/replygate/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_executable(messagebus_replygate_test_app +vespa_add_executable(messagebus_replygate_test_app TEST SOURCES replygate.cpp DEPENDS diff --git a/messagebus/src/tests/resender/CMakeLists.txt b/messagebus/src/tests/resender/CMakeLists.txt index b253e582af8..19a0a600301 100644 --- a/messagebus/src/tests/resender/CMakeLists.txt +++ b/messagebus/src/tests/resender/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_executable(messagebus_resender_test_app +vespa_add_executable(messagebus_resender_test_app TEST SOURCES resender.cpp DEPENDS diff --git a/messagebus/src/tests/result/CMakeLists.txt b/messagebus/src/tests/result/CMakeLists.txt index bd1ed96ab5f..c58966ad983 100644 --- a/messagebus/src/tests/result/CMakeLists.txt +++ b/messagebus/src/tests/result/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_executable(messagebus_result_test_app +vespa_add_executable(messagebus_result_test_app TEST SOURCES result.cpp DEPENDS diff --git a/messagebus/src/tests/retrypolicy/CMakeLists.txt b/messagebus/src/tests/retrypolicy/CMakeLists.txt index 2a2a2a20e6e..221ad583f08 100644 --- a/messagebus/src/tests/retrypolicy/CMakeLists.txt +++ b/messagebus/src/tests/retrypolicy/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_executable(messagebus_retrypolicy_test_app +vespa_add_executable(messagebus_retrypolicy_test_app TEST SOURCES retrypolicy.cpp DEPENDS diff --git a/messagebus/src/tests/routable/CMakeLists.txt b/messagebus/src/tests/routable/CMakeLists.txt index d44eca1dc71..632c90105a7 100644 --- a/messagebus/src/tests/routable/CMakeLists.txt +++ b/messagebus/src/tests/routable/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_executable(messagebus_routable_test_app +vespa_add_executable(messagebus_routable_test_app TEST SOURCES routable.cpp DEPENDS diff --git a/messagebus/src/tests/routablequeue/CMakeLists.txt b/messagebus/src/tests/routablequeue/CMakeLists.txt index 18e2be0a748..a8963a6c920 100644 --- a/messagebus/src/tests/routablequeue/CMakeLists.txt +++ b/messagebus/src/tests/routablequeue/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_executable(messagebus_routablequeue_test_app +vespa_add_executable(messagebus_routablequeue_test_app TEST SOURCES routablequeue.cpp DEPENDS diff --git a/messagebus/src/tests/routeparser/CMakeLists.txt b/messagebus/src/tests/routeparser/CMakeLists.txt index 712672c6b20..9c16f52fba0 100644 --- a/messagebus/src/tests/routeparser/CMakeLists.txt +++ b/messagebus/src/tests/routeparser/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_executable(messagebus_routeparser_test_app +vespa_add_executable(messagebus_routeparser_test_app TEST SOURCES routeparser.cpp DEPENDS diff --git a/messagebus/src/tests/routing/CMakeLists.txt b/messagebus/src/tests/routing/CMakeLists.txt index c2b38e4c4b4..01f245c5ffb 100644 --- a/messagebus/src/tests/routing/CMakeLists.txt +++ b/messagebus/src/tests/routing/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_executable(messagebus_routing_test_app +vespa_add_executable(messagebus_routing_test_app TEST SOURCES routing.cpp DEPENDS diff --git a/messagebus/src/tests/routingcontext/CMakeLists.txt b/messagebus/src/tests/routingcontext/CMakeLists.txt index 064487d2d71..a5c57ed0eba 100644 --- a/messagebus/src/tests/routingcontext/CMakeLists.txt +++ b/messagebus/src/tests/routingcontext/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_executable(messagebus_routingcontext_test_app +vespa_add_executable(messagebus_routingcontext_test_app TEST SOURCES routingcontext.cpp DEPENDS diff --git a/messagebus/src/tests/routingspec/CMakeLists.txt b/messagebus/src/tests/routingspec/CMakeLists.txt index 43539e07af5..e0d5108c95e 100644 --- a/messagebus/src/tests/routingspec/CMakeLists.txt +++ b/messagebus/src/tests/routingspec/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_executable(messagebus_routingspec_test_app +vespa_add_executable(messagebus_routingspec_test_app TEST SOURCES routingspec.cpp DEPENDS diff --git a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt b/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt index e4ada1c8c1b..ad83a43e7c0 100644 --- a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt +++ b/messagebus/src/tests/rpcserviceaddress/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_executable(messagebus_rpcserviceaddress_test_app +vespa_add_executable(messagebus_rpcserviceaddress_test_app TEST SOURCES rpcserviceaddress.cpp DEPENDS diff --git a/messagebus/src/tests/sendadapter/CMakeLists.txt b/messagebus/src/tests/sendadapter/CMakeLists.txt index 32c41b40c3c..91d5232d2bc 100644 --- a/messagebus/src/tests/sendadapter/CMakeLists.txt +++ b/messagebus/src/tests/sendadapter/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_executable(messagebus_sendadapter_test_app +vespa_add_executable(messagebus_sendadapter_test_app TEST SOURCES sendadapter.cpp DEPENDS diff --git a/messagebus/src/tests/sequencer/CMakeLists.txt b/messagebus/src/tests/sequencer/CMakeLists.txt index dab54431722..be647934904 100644 --- a/messagebus/src/tests/sequencer/CMakeLists.txt +++ b/messagebus/src/tests/sequencer/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_executable(messagebus_sequencer_test_app +vespa_add_executable(messagebus_sequencer_test_app TEST SOURCES sequencer.cpp DEPENDS diff --git a/messagebus/src/tests/serviceaddress/CMakeLists.txt b/messagebus/src/tests/serviceaddress/CMakeLists.txt index 630e28dc94f..67f290585c9 100644 --- a/messagebus/src/tests/serviceaddress/CMakeLists.txt +++ b/messagebus/src/tests/serviceaddress/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_executable(messagebus_serviceaddress_test_app +vespa_add_executable(messagebus_serviceaddress_test_app TEST SOURCES serviceaddress.cpp DEPENDS diff --git a/messagebus/src/tests/servicepool/CMakeLists.txt b/messagebus/src/tests/servicepool/CMakeLists.txt index 0d6cbc54862..3453326250d 100644 --- a/messagebus/src/tests/servicepool/CMakeLists.txt +++ b/messagebus/src/tests/servicepool/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_executable(messagebus_servicepool_test_app +vespa_add_executable(messagebus_servicepool_test_app TEST SOURCES servicepool.cpp DEPENDS diff --git a/messagebus/src/tests/shutdown/CMakeLists.txt b/messagebus/src/tests/shutdown/CMakeLists.txt index 69c849ae5fb..f759a988f6f 100644 --- a/messagebus/src/tests/shutdown/CMakeLists.txt +++ b/messagebus/src/tests/shutdown/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_executable(messagebus_shutdown_test_app +vespa_add_executable(messagebus_shutdown_test_app TEST SOURCES shutdown.cpp DEPENDS diff --git a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt b/messagebus/src/tests/simple-roundtrip/CMakeLists.txt index dff6ebf3e55..bd64d2d2274 100644 --- a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt +++ b/messagebus/src/tests/simple-roundtrip/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_executable(messagebus_simple-roundtrip_test_app +vespa_add_executable(messagebus_simple-roundtrip_test_app TEST SOURCES simple-roundtrip.cpp DEPENDS diff --git a/messagebus/src/tests/simpleprotocol/CMakeLists.txt b/messagebus/src/tests/simpleprotocol/CMakeLists.txt index 4b4e777ea57..8ad20f8587c 100644 --- a/messagebus/src/tests/simpleprotocol/CMakeLists.txt +++ b/messagebus/src/tests/simpleprotocol/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_executable(messagebus_simpleprotocol_test_app +vespa_add_executable(messagebus_simpleprotocol_test_app TEST SOURCES simpleprotocol.cpp DEPENDS diff --git a/messagebus/src/tests/slobrok/CMakeLists.txt b/messagebus/src/tests/slobrok/CMakeLists.txt index d21768c1f6b..4fc2c70e211 100644 --- a/messagebus/src/tests/slobrok/CMakeLists.txt +++ b/messagebus/src/tests/slobrok/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_executable(messagebus_slobrok_test_app +vespa_add_executable(messagebus_slobrok_test_app TEST SOURCES slobrok.cpp DEPENDS diff --git a/messagebus/src/tests/sourcesession/CMakeLists.txt b/messagebus/src/tests/sourcesession/CMakeLists.txt index c2cf4f59682..bab8a55c811 100644 --- a/messagebus/src/tests/sourcesession/CMakeLists.txt +++ b/messagebus/src/tests/sourcesession/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_executable(messagebus_sourcesession_test_app +vespa_add_executable(messagebus_sourcesession_test_app TEST SOURCES sourcesession.cpp DEPENDS diff --git a/messagebus/src/tests/targetpool/CMakeLists.txt b/messagebus/src/tests/targetpool/CMakeLists.txt index 2fedf07d03d..6dd462269f1 100644 --- a/messagebus/src/tests/targetpool/CMakeLists.txt +++ b/messagebus/src/tests/targetpool/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_executable(messagebus_targetpool_test_app +vespa_add_executable(messagebus_targetpool_test_app TEST SOURCES targetpool.cpp DEPENDS diff --git a/messagebus/src/tests/throttling/CMakeLists.txt b/messagebus/src/tests/throttling/CMakeLists.txt index 28c27971e6f..54ec7a8696d 100644 --- a/messagebus/src/tests/throttling/CMakeLists.txt +++ b/messagebus/src/tests/throttling/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_executable(messagebus_throttling_test_app +vespa_add_executable(messagebus_throttling_test_app TEST SOURCES throttling.cpp DEPENDS diff --git a/messagebus/src/tests/timeout/CMakeLists.txt b/messagebus/src/tests/timeout/CMakeLists.txt index f50b81ff03f..d3ea5550031 100644 --- a/messagebus/src/tests/timeout/CMakeLists.txt +++ b/messagebus/src/tests/timeout/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_executable(messagebus_timeout_test_app +vespa_add_executable(messagebus_timeout_test_app TEST SOURCES timeout.cpp DEPENDS diff --git a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt b/messagebus/src/tests/trace-roundtrip/CMakeLists.txt index 94ed14c8d99..16b6b45003d 100644 --- a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt +++ b/messagebus/src/tests/trace-roundtrip/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_executable(messagebus_trace-roundtrip_test_app +vespa_add_executable(messagebus_trace-roundtrip_test_app TEST SOURCES trace-roundtrip.cpp DEPENDS diff --git a/messagebus/test/CMakeLists.txt b/messagebus/test/CMakeLists.txt index a6d2fdcb8a0..1e2fb57b960 100644 --- a/messagebus/test/CMakeLists.txt +++ b/messagebus/test/CMakeLists.txt @@ -1,5 +1,4 @@ vespa_add_module_dependency(slobrok_slobrokserver) -vespa_add_module_dependency(messagebus_messagebus-test) vespa_add_module_dependency(messagebus) add_subdirectory(src/binref) add_subdirectory(src/tests/compile-cpp) diff --git a/messagebus/test/src/tests/compile-cpp/CMakeLists.txt b/messagebus/test/src/tests/compile-cpp/CMakeLists.txt index 5491399fce2..aa82392d661 100644 --- a/messagebus/test/src/tests/compile-cpp/CMakeLists.txt +++ b/messagebus/test/src/tests/compile-cpp/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_executable(messagebus_test_compile-cpp_test_app +vespa_add_executable(messagebus_test_compile-cpp_test_app TEST SOURCES compile-cpp.cpp DEPENDS diff --git a/messagebus/test/src/tests/error/CMakeLists.txt b/messagebus/test/src/tests/error/CMakeLists.txt index abd089571f5..5baadf2b18b 100644 --- a/messagebus/test/src/tests/error/CMakeLists.txt +++ b/messagebus/test/src/tests/error/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_executable(messagebus_test_error_test_app +vespa_add_executable(messagebus_test_error_test_app TEST SOURCES error.cpp DEPENDS diff --git a/messagebus/test/src/tests/errorcodes/CMakeLists.txt b/messagebus/test/src/tests/errorcodes/CMakeLists.txt index 3f08783b363..3e12ae340d3 100644 --- a/messagebus/test/src/tests/errorcodes/CMakeLists.txt +++ b/messagebus/test/src/tests/errorcodes/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_executable(messagebus_test_dumpcodes_app +vespa_add_executable(messagebus_test_dumpcodes_app TEST SOURCES dumpcodes.cpp DEPENDS diff --git a/messagebus/test/src/tests/trace/CMakeLists.txt b/messagebus/test/src/tests/trace/CMakeLists.txt index 5cebc9ae667..b2c31e19ba7 100644 --- a/messagebus/test/src/tests/trace/CMakeLists.txt +++ b/messagebus/test/src/tests/trace/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_executable(messagebus_test_trace_test_app +vespa_add_executable(messagebus_test_trace_test_app TEST SOURCES trace.cpp DEPENDS diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt index b84701e9487..d361713d8ec 100644 --- a/metrics/src/tests/CMakeLists.txt +++ b/metrics/src/tests/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_executable(metrics_testrunner_app +vespa_add_executable(metrics_testrunner_app TEST SOURCES testrunner.cpp countmetrictest.cpp 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/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/persistence/src/tests/CMakeLists.txt b/persistence/src/tests/CMakeLists.txt index 946e479d0c3..e547c4e72eb 100644 --- a/persistence/src/tests/CMakeLists.txt +++ b/persistence/src/tests/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_executable(persistence_testrunner_app +vespa_add_executable(persistence_testrunner_app TEST SOURCES testrunner.cpp DEPENDS diff --git a/persistence/src/tests/dummyimpl/CMakeLists.txt b/persistence/src/tests/dummyimpl/CMakeLists.txt index 5a257eb56f3..66758e8a0b4 100644 --- a/persistence/src/tests/dummyimpl/CMakeLists.txt +++ b/persistence/src/tests/dummyimpl/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_library(persistence_testdummyimpl dummyimpltest.cpp DEPENDS ) -vespa_add_executable(persistence_dummypersistence_test_app +vespa_add_executable(persistence_dummypersistence_test_app TEST SOURCES dummypersistence_test.cpp DEPENDS diff --git a/persistence/src/tests/proxy/CMakeLists.txt b/persistence/src/tests/proxy/CMakeLists.txt index c12eaf217a4..4f873f25e50 100644 --- a/persistence/src/tests/proxy/CMakeLists.txt +++ b/persistence/src/tests/proxy/CMakeLists.txt @@ -11,7 +11,7 @@ vespa_add_executable(persistence_providerproxy_test_app DEPENDS persistence ) -vespa_add_executable(persistence_providerproxy_conformance_test_app +vespa_add_executable(persistence_providerproxy_conformance_test_app TEST SOURCES providerproxy_conformancetest.cpp DEPENDS @@ -21,6 +21,8 @@ vespa_add_executable(persistence_providerproxy_conformance_test_app vespa_add_executable(persistence_external_providerproxy_conformancetest_app SOURCES external_providerproxy_conformancetest.cpp + OUTPUT_NAME external_providerproxy_conformancetest + INSTALL bin DEPENDS persistence persistence_persistence_conformancetest 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/searchcommon/OWNERS b/searchcommon/OWNERS index 6b6bfc6e2ac..593ba19b1e6 100644 --- a/searchcommon/OWNERS +++ b/searchcommon/OWNERS @@ -1,3 +1,3 @@ geirst -balder +baldersheim tegge diff --git a/searchcommon/src/tests/attribute/config/CMakeLists.txt b/searchcommon/src/tests/attribute/config/CMakeLists.txt index d0864c68240..302edb6495f 100644 --- a/searchcommon/src/tests/attribute/config/CMakeLists.txt +++ b/searchcommon/src/tests/attribute/config/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_executable(searchcommon_attribute_config_test_app +vespa_add_executable(searchcommon_attribute_config_test_app TEST SOURCES attribute_config_test.cpp DEPENDS diff --git a/searchcommon/src/tests/schema/CMakeLists.txt b/searchcommon/src/tests/schema/CMakeLists.txt index 0a600a55e7b..f7777dc8905 100644 --- a/searchcommon/src/tests/schema/CMakeLists.txt +++ b/searchcommon/src/tests/schema/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_executable(searchcommon_schema_test_app +vespa_add_executable(searchcommon_schema_test_app TEST SOURCES schema_test.cpp DEPENDS diff --git a/searchcore/OWNERS b/searchcore/OWNERS index 22a8fdfdfa6..0775e8692a2 100644 --- a/searchcore/OWNERS +++ b/searchcore/OWNERS @@ -1,5 +1,5 @@ geirst tegge -balder +baldersheim havardpe yngve diff --git a/searchcore/src/apps/tests/CMakeLists.txt b/searchcore/src/apps/tests/CMakeLists.txt index 307ae51f7f6..37287fdda37 100644 --- a/searchcore/src/apps/tests/CMakeLists.txt +++ b/searchcore/src/apps/tests/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_executable(searchcore_persistenceconformance_test_app +vespa_add_executable(searchcore_persistenceconformance_test_app TEST SOURCES persistenceconformance_test.cpp DEPENDS diff --git a/searchcore/src/tests/applyattrupdates/CMakeLists.txt b/searchcore/src/tests/applyattrupdates/CMakeLists.txt index 2778d0f62dc..8e4b11bb71f 100644 --- a/searchcore/src/tests/applyattrupdates/CMakeLists.txt +++ b/searchcore/src/tests/applyattrupdates/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_executable(searchcore_applyattrupdates_test_app +vespa_add_executable(searchcore_applyattrupdates_test_app TEST SOURCES applyattrupdates.cpp DEPENDS diff --git a/searchcore/src/tests/fdispatch/randomrow/CMakeLists.txt b/searchcore/src/tests/fdispatch/randomrow/CMakeLists.txt index f3ad936ded2..204dc8fa00d 100644 --- a/searchcore/src/tests/fdispatch/randomrow/CMakeLists.txt +++ b/searchcore/src/tests/fdispatch/randomrow/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_executable(searchcore_randomrow_test_app +vespa_add_executable(searchcore_randomrow_test_app TEST SOURCES randomrow_test.cpp DEPENDS diff --git a/searchcore/src/tests/fdispatch/search_path/CMakeLists.txt b/searchcore/src/tests/fdispatch/search_path/CMakeLists.txt index 86067faa4cc..cf2f4872c54 100644 --- a/searchcore/src/tests/fdispatch/search_path/CMakeLists.txt +++ b/searchcore/src/tests/fdispatch/search_path/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_executable(searchcore_search_path_test_app +vespa_add_executable(searchcore_search_path_test_app TEST SOURCES search_path_test.cpp DEPENDS diff --git a/searchcore/src/tests/grouping/CMakeLists.txt b/searchcore/src/tests/grouping/CMakeLists.txt index 245406187f6..1b7ae72f76d 100644 --- a/searchcore/src/tests/grouping/CMakeLists.txt +++ b/searchcore/src/tests/grouping/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_executable(searchcore_grouping_test_app +vespa_add_executable(searchcore_grouping_test_app TEST SOURCES grouping.cpp DEPENDS diff --git a/searchcore/src/tests/proton/attribute/CMakeLists.txt b/searchcore/src/tests/proton/attribute/CMakeLists.txt index 1439c2b2646..4082a8f5563 100644 --- a/searchcore/src/tests/proton/attribute/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/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_executable(searchcore_attribute_test_app +vespa_add_executable(searchcore_attribute_test_app TEST SOURCES attribute_test.cpp DEPENDS @@ -9,7 +9,7 @@ vespa_add_executable(searchcore_attribute_test_app searchcore_pcommon ) vespa_add_test(NAME searchcore_attribute_test_app COMMAND sh attribute_test.sh) -vespa_add_executable(searchcore_attributeflush_test_app +vespa_add_executable(searchcore_attributeflush_test_app TEST SOURCES attributeflush_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt index 7e8ab14a13b..d1a0e3a45e0 100644 --- a/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/attribute_manager/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_executable(searchcore_attribute_manager_test_app +vespa_add_executable(searchcore_attribute_manager_test_app TEST SOURCES attribute_manager_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_populator/CMakeLists.txt index 064759b88d1..e1de90c0284 100644 --- a/searchcore/src/tests/proton/attribute/attribute_populator/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/attribute_populator/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_executable(searchcore_attribute_populator_test_app +vespa_add_executable(searchcore_attribute_populator_test_app TEST SOURCES attribute_populator_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_filter/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_usage_filter/CMakeLists.txt index 2dd66c2a3ec..db904aaf5b3 100644 --- a/searchcore/src/tests/proton/attribute/attribute_usage_filter/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/attribute_usage_filter/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_executable(searchcore_attribute_usage_filter_test_app +vespa_add_executable(searchcore_attribute_usage_filter_test_app TEST SOURCES attribute_usage_filter_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt index 322d22c8f0d..158dd78c0a7 100644 --- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/attributes_state_explorer/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_executable(searchcore_attributes_state_explorer_test_app +vespa_add_executable(searchcore_attributes_state_explorer_test_app TEST SOURCES attributes_state_explorer_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt b/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt index 4c6da0a3397..35a89676c5b 100644 --- a/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/document_field_populator/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_executable(searchcore_document_field_populator_test_app +vespa_add_executable(searchcore_document_field_populator_test_app TEST SOURCES document_field_populator_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/CMakeLists.txt b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/CMakeLists.txt index c39025ae39f..81afcc7a4af 100644 --- a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/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_executable(searchcore_exclusive_attribute_read_accessor_test_app +vespa_add_executable(searchcore_exclusive_attribute_read_accessor_test_app TEST SOURCES exclusive_attribute_read_accessor_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/bucketdb/bucketdb/CMakeLists.txt b/searchcore/src/tests/proton/bucketdb/bucketdb/CMakeLists.txt index f07ded6d89b..58c27f31726 100644 --- a/searchcore/src/tests/proton/bucketdb/bucketdb/CMakeLists.txt +++ b/searchcore/src/tests/proton/bucketdb/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_executable(searchcore_bucketdb_test_app +vespa_add_executable(searchcore_bucketdb_test_app TEST SOURCES bucketdb_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/common/CMakeLists.txt b/searchcore/src/tests/proton/common/CMakeLists.txt index 833bac4c065..5f0fa227c88 100644 --- a/searchcore/src/tests/proton/common/CMakeLists.txt +++ b/searchcore/src/tests/proton/common/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchcore_schemautil_test_app +vespa_add_executable(searchcore_schemautil_test_app TEST SOURCES schemautil_test.cpp DEPENDS searchcore_pcommon ) vespa_add_test(NAME searchcore_schemautil_test_app COMMAND searchcore_schemautil_test_app) -vespa_add_executable(searchcore_selectpruner_test_app +vespa_add_executable(searchcore_selectpruner_test_app TEST SOURCES selectpruner_test.cpp DEPENDS searchcore_pcommon ) vespa_add_test(NAME searchcore_selectpruner_test_app COMMAND searchcore_selectpruner_test_app) -vespa_add_executable(searchcore_cachedselect_test_app +vespa_add_executable(searchcore_cachedselect_test_app TEST SOURCES cachedselect_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/common/document_type_inspector/CMakeLists.txt b/searchcore/src/tests/proton/common/document_type_inspector/CMakeLists.txt index f5c4610fc1b..cd4533510ff 100644 --- a/searchcore/src/tests/proton/common/document_type_inspector/CMakeLists.txt +++ b/searchcore/src/tests/proton/common/document_type_inspector/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_executable(searchcore_document_type_inspector_test_app +vespa_add_executable(searchcore_document_type_inspector_test_app TEST SOURCES document_type_inspector_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/common/state_reporter_utils/CMakeLists.txt b/searchcore/src/tests/proton/common/state_reporter_utils/CMakeLists.txt index 9b1ffd8aef2..d872cc5d89f 100644 --- a/searchcore/src/tests/proton/common/state_reporter_utils/CMakeLists.txt +++ b/searchcore/src/tests/proton/common/state_reporter_utils/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_executable(searchcore_state_reporter_utils_test_app +vespa_add_executable(searchcore_state_reporter_utils_test_app TEST SOURCES state_reporter_utils_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/config/CMakeLists.txt b/searchcore/src/tests/proton/config/CMakeLists.txt index 803556c2ae1..7bef6552154 100644 --- a/searchcore/src/tests/proton/config/CMakeLists.txt +++ b/searchcore/src/tests/proton/config/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_executable(searchcore_config_test_app +vespa_add_executable(searchcore_config_test_app TEST SOURCES config.cpp DEPENDS diff --git a/searchcore/src/tests/proton/docsummary/CMakeLists.txt b/searchcore/src/tests/proton/docsummary/CMakeLists.txt index dca65528840..7550a80aa3a 100644 --- a/searchcore/src/tests/proton/docsummary/CMakeLists.txt +++ b/searchcore/src/tests/proton/docsummary/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_executable(searchcore_docsummary_test_app +vespa_add_executable(searchcore_docsummary_test_app TEST SOURCES docsummary.cpp DEPENDS diff --git a/searchcore/src/tests/proton/document_iterator/CMakeLists.txt b/searchcore/src/tests/proton/document_iterator/CMakeLists.txt index 03d910ef02e..32a8e44efd5 100644 --- a/searchcore/src/tests/proton/document_iterator/CMakeLists.txt +++ b/searchcore/src/tests/proton/document_iterator/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_executable(searchcore_document_iterator_test_app +vespa_add_executable(searchcore_document_iterator_test_app TEST SOURCES document_iterator_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/CMakeLists.txt index 9270a4b0b7c..7cd23e47d00 100644 --- a/searchcore/src/tests/proton/documentdb/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/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_executable(searchcore_documentdb_test_app +vespa_add_executable(searchcore_documentdb_test_app TEST SOURCES documentdb_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt index 3c1f5c79a57..226d8965844 100644 --- a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/buckethandler/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_executable(searchcore_buckethandler_test_app +vespa_add_executable(searchcore_buckethandler_test_app TEST SOURCES buckethandler_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt index f107cddd103..6244fb0537a 100644 --- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/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_executable(searchcore_clusterstatehandler_test_app +vespa_add_executable(searchcore_clusterstatehandler_test_app TEST SOURCES clusterstatehandler_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt index 74f605d36d0..e435c27fbde 100644 --- a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/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_executable(searchcore_combiningfeedview_test_app +vespa_add_executable(searchcore_combiningfeedview_test_app TEST SOURCES combiningfeedview_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt index ee18f0f6938..1e8b241b72c 100644 --- a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/configurer/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_executable(searchcore_configurer_test_app +vespa_add_executable(searchcore_configurer_test_app TEST SOURCES configurer_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/configvalidator/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/configvalidator/CMakeLists.txt index c7a3a6235cf..cea6144fd99 100644 --- a/searchcore/src/tests/proton/documentdb/configvalidator/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/configvalidator/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_executable(searchcore_configvalidator_test_app +vespa_add_executable(searchcore_configvalidator_test_app TEST SOURCES configvalidator_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/document_scan_iterator/CMakeLists.txt index 1a342660f7c..1789beee7da 100644 --- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/document_scan_iterator/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_executable(searchcore_document_scan_iterator_test_app +vespa_add_executable(searchcore_document_scan_iterator_test_app TEST SOURCES document_scan_iterator_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt index d79b9ad92ae..121b37bbfcc 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/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_executable(searchcore_document_subdbs_test_app +vespa_add_executable(searchcore_document_subdbs_test_app TEST SOURCES document_subdbs_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/documentbucketmover/CMakeLists.txt index 97a9ae1516b..a550ce6451f 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/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_executable(searchcore_documentbucketmover_test_app +vespa_add_executable(searchcore_documentbucketmover_test_app TEST SOURCES documentbucketmover_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt index b9105fc9c91..1ad3b7f21f6 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/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_executable(searchcore_documentdbconfig_test_app +vespa_add_executable(searchcore_documentdbconfig_test_app TEST SOURCES documentdbconfig_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/CMakeLists.txt index e1dea56782d..8de0cc67b2a 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/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_executable(searchcore_documentdbconfigscout_test_app +vespa_add_executable(searchcore_documentdbconfigscout_test_app TEST SOURCES documentdbconfigscout_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt index 756c11f35b4..fe848e0588b 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/feedhandler/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_executable(searchcore_feedhandler_test_app +vespa_add_executable(searchcore_feedhandler_test_app TEST SOURCES feedhandler_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt index 0ea395a339a..a4cebe05541 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/feedview/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_executable(searchcore_feedview_test_app +vespa_add_executable(searchcore_feedview_test_app TEST SOURCES feedview_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt index 458607e66c5..f5c40a85192 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/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_executable(searchcore_fileconfigmanager_test_app +vespa_add_executable(searchcore_fileconfigmanager_test_app TEST SOURCES fileconfigmanager_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/CMakeLists.txt index 3b81994e7da..e858efd45ea 100644 --- a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/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_executable(searchcore_job_tracked_maintenance_job_test_app +vespa_add_executable(searchcore_job_tracked_maintenance_job_test_app TEST SOURCES job_tracked_maintenance_job_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt index 938e0dc7baf..6f993ac1593 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/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_executable(searchcore_lid_space_compaction_test_app +vespa_add_executable(searchcore_lid_space_compaction_test_app TEST SOURCES lid_space_compaction_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt index 4f26a79f0eb..388d527dec5 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/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_executable(searchcore_maintenancecontroller_test_app +vespa_add_executable(searchcore_maintenancecontroller_test_app TEST SOURCES maintenancecontroller_test.cpp DEPENDS @@ -18,7 +18,7 @@ vespa_add_executable(searchcore_maintenancecontroller_test_app searchcore_fconfig ) vespa_add_test(NAME searchcore_maintenancecontroller_test_app COMMAND searchcore_maintenancecontroller_test_app) -vespa_add_executable(searchcore_frozenbucketsmap_test_app +vespa_add_executable(searchcore_frozenbucketsmap_test_app TEST SOURCES frozenbucketsmap_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt index 294360b51ba..7c8b092811f 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/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_executable(searchcore_storeonlyfeedview_test_app +vespa_add_executable(searchcore_storeonlyfeedview_test_app TEST SOURCES storeonlyfeedview_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index fe9251e1193..266fb6279e9 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -1,8 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for storeonlyfeedview. - -#include <vespa/log/log.h> -LOG_SETUP("storeonlyfeedview_test"); #include <vespa/fastos/fastos.h> #include <vespa/document/base/documentid.h> @@ -20,6 +17,9 @@ LOG_SETUP("storeonlyfeedview_test"); #include <vespa/searchlib/common/serialnum.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/log/log.h> +LOG_SETUP("storeonlyfeedview_test"); + using document::BucketId; using document::DataType; using document::Document; diff --git a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt index fbaa86cafc8..56b07ffc181 100644 --- a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentmetastore/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_executable(searchcore_documentmetastore_test_app +vespa_add_executable(searchcore_documentmetastore_test_app TEST SOURCES documentmetastore_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/CMakeLists.txt index 5e333c74b2f..8aab9158529 100644 --- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/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_executable(searchcore_lidreusedelayer_test_app +vespa_add_executable(searchcore_lidreusedelayer_test_app TEST SOURCES lidreusedelayer_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/feed_and_search/CMakeLists.txt b/searchcore/src/tests/proton/feed_and_search/CMakeLists.txt index b6d1258a386..0921195e56c 100644 --- a/searchcore/src/tests/proton/feed_and_search/CMakeLists.txt +++ b/searchcore/src/tests/proton/feed_and_search/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_executable(searchcore_feed_and_search_test_app +vespa_add_executable(searchcore_feed_and_search_test_app TEST SOURCES feed_and_search.cpp DEPENDS diff --git a/searchcore/src/tests/proton/feedoperation/CMakeLists.txt b/searchcore/src/tests/proton/feedoperation/CMakeLists.txt index fc47a3bde85..613d4b9f603 100644 --- a/searchcore/src/tests/proton/feedoperation/CMakeLists.txt +++ b/searchcore/src/tests/proton/feedoperation/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_executable(searchcore_feedoperation_test_app +vespa_add_executable(searchcore_feedoperation_test_app TEST SOURCES feedoperation_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/feedtoken/CMakeLists.txt b/searchcore/src/tests/proton/feedtoken/CMakeLists.txt index 328d872f668..438c0b72b1c 100644 --- a/searchcore/src/tests/proton/feedtoken/CMakeLists.txt +++ b/searchcore/src/tests/proton/feedtoken/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_executable(searchcore_feedtoken_test_app +vespa_add_executable(searchcore_feedtoken_test_app TEST SOURCES feedtoken.cpp DEPENDS diff --git a/searchcore/src/tests/proton/flushengine/CMakeLists.txt b/searchcore/src/tests/proton/flushengine/CMakeLists.txt index 4fc59180946..bbc97818f51 100644 --- a/searchcore/src/tests/proton/flushengine/CMakeLists.txt +++ b/searchcore/src/tests/proton/flushengine/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_executable(searchcore_flushengine_test_app +vespa_add_executable(searchcore_flushengine_test_app TEST SOURCES flushengine.cpp DEPENDS diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt index a4bff892ffa..d1a2c909a37 100644 --- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt +++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/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_executable(searchcore_flushengine_prepare_restart_flush_strategy_test_app +vespa_add_executable(searchcore_flushengine_prepare_restart_flush_strategy_test_app TEST SOURCES prepare_restart_flush_strategy_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/index/CMakeLists.txt b/searchcore/src/tests/proton/index/CMakeLists.txt index 46cbf4117ac..be3fff431a9 100644 --- a/searchcore/src/tests/proton/index/CMakeLists.txt +++ b/searchcore/src/tests/proton/index/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_executable(searchcore_indexmanager_test_app +vespa_add_executable(searchcore_indexmanager_test_app TEST SOURCES indexmanager_test.cpp DEPENDS @@ -9,7 +9,7 @@ vespa_add_executable(searchcore_indexmanager_test_app searchcore_pcommon searchcore_util ) -vespa_add_executable(searchcore_fusionrunner_test_app +vespa_add_executable(searchcore_fusionrunner_test_app TEST SOURCES fusionrunner_test.cpp DEPENDS @@ -18,13 +18,13 @@ vespa_add_executable(searchcore_fusionrunner_test_app searchcore_pcommon searchcore_util ) -vespa_add_executable(searchcore_diskindexcleaner_test_app +vespa_add_executable(searchcore_diskindexcleaner_test_app TEST SOURCES diskindexcleaner_test.cpp DEPENDS searchcore_index ) -vespa_add_executable(searchcore_indexcollection_test_app +vespa_add_executable(searchcore_indexcollection_test_app TEST SOURCES indexcollection_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/index/index_writer/CMakeLists.txt b/searchcore/src/tests/proton/index/index_writer/CMakeLists.txt index 88db11dbdba..d588baf7211 100644 --- a/searchcore/src/tests/proton/index/index_writer/CMakeLists.txt +++ b/searchcore/src/tests/proton/index/index_writer/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_executable(searchcore_index_writer_test_app +vespa_add_executable(searchcore_index_writer_test_app TEST SOURCES index_writer_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/initializer/CMakeLists.txt b/searchcore/src/tests/proton/initializer/CMakeLists.txt index 0f20324cae3..165e12fb808 100644 --- a/searchcore/src/tests/proton/initializer/CMakeLists.txt +++ b/searchcore/src/tests/proton/initializer/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_executable(searchcore_task_runner_test_app +vespa_add_executable(searchcore_task_runner_test_app TEST SOURCES task_runner_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/matchengine/CMakeLists.txt b/searchcore/src/tests/proton/matchengine/CMakeLists.txt index 32c0b47ae4b..820fd8a1bcb 100644 --- a/searchcore/src/tests/proton/matchengine/CMakeLists.txt +++ b/searchcore/src/tests/proton/matchengine/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_executable(searchcore_matchengine_test_app +vespa_add_executable(searchcore_matchengine_test_app TEST SOURCES matchengine.cpp DEPENDS diff --git a/searchcore/src/tests/proton/matching/CMakeLists.txt b/searchcore/src/tests/proton/matching/CMakeLists.txt index 8007ff0344d..ecd9c19eec0 100644 --- a/searchcore/src/tests/proton/matching/CMakeLists.txt +++ b/searchcore/src/tests/proton/matching/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_executable(searchcore_matching_test_app +vespa_add_executable(searchcore_matching_test_app TEST SOURCES matching_test.cpp DEPENDS @@ -14,7 +14,7 @@ vespa_add_executable(searchcore_matching_test_app searchcore_util ) vespa_add_test(NAME searchcore_matching_test_app COMMAND searchcore_matching_test_app) -vespa_add_executable(searchcore_sessionmanager_test_app +vespa_add_executable(searchcore_sessionmanager_test_app TEST SOURCES sessionmanager_test.cpp DEPENDS @@ -22,14 +22,14 @@ vespa_add_executable(searchcore_sessionmanager_test_app searchcore_grouping ) vespa_add_test(NAME searchcore_sessionmanager_test_app COMMAND searchcore_sessionmanager_test_app) -vespa_add_executable(searchcore_matching_stats_test_app +vespa_add_executable(searchcore_matching_stats_test_app TEST SOURCES matching_stats_test.cpp DEPENDS searchcore_matching ) vespa_add_test(NAME searchcore_matching_stats_test_app COMMAND searchcore_matching_stats_test_app) -vespa_add_executable(searchcore_query_test_app +vespa_add_executable(searchcore_query_test_app TEST SOURCES query_test.cpp DEPENDS @@ -37,21 +37,21 @@ vespa_add_executable(searchcore_query_test_app searchcore_matching ) vespa_add_test(NAME searchcore_query_test_app COMMAND searchcore_query_test_app) -vespa_add_executable(searchcore_termdataextractor_test_app +vespa_add_executable(searchcore_termdataextractor_test_app TEST SOURCES termdataextractor_test.cpp DEPENDS searchcore_matching ) vespa_add_test(NAME searchcore_termdataextractor_test_app COMMAND searchcore_termdataextractor_test_app) -vespa_add_executable(searchcore_resolveviewvisitor_test_app +vespa_add_executable(searchcore_resolveviewvisitor_test_app TEST SOURCES resolveviewvisitor_test.cpp DEPENDS searchcore_matching ) vespa_add_test(NAME searchcore_resolveviewvisitor_test_app COMMAND searchcore_resolveviewvisitor_test_app) -vespa_add_executable(searchcore_querynodes_test_app +vespa_add_executable(searchcore_querynodes_test_app TEST SOURCES querynodes_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/matching/docid_range_scheduler/CMakeLists.txt b/searchcore/src/tests/proton/matching/docid_range_scheduler/CMakeLists.txt index 3892ac41b92..6cba6019fa5 100644 --- a/searchcore/src/tests/proton/matching/docid_range_scheduler/CMakeLists.txt +++ b/searchcore/src/tests/proton/matching/docid_range_scheduler/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_executable(searchcore_docid_range_scheduler_test_app +vespa_add_executable(searchcore_docid_range_scheduler_test_app TEST SOURCES docid_range_scheduler_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/matching/match_loop_communicator/CMakeLists.txt b/searchcore/src/tests/proton/matching/match_loop_communicator/CMakeLists.txt index 513e002f064..e3b9d94b659 100644 --- a/searchcore/src/tests/proton/matching/match_loop_communicator/CMakeLists.txt +++ b/searchcore/src/tests/proton/matching/match_loop_communicator/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_executable(searchcore_match_loop_communicator_test_app +vespa_add_executable(searchcore_match_loop_communicator_test_app TEST SOURCES match_loop_communicator_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/matching/match_phase_limiter/CMakeLists.txt b/searchcore/src/tests/proton/matching/match_phase_limiter/CMakeLists.txt index 78c16d1435d..54edcf2f61c 100644 --- a/searchcore/src/tests/proton/matching/match_phase_limiter/CMakeLists.txt +++ b/searchcore/src/tests/proton/matching/match_phase_limiter/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_executable(searchcore_match_phase_limiter_test_app +vespa_add_executable(searchcore_match_phase_limiter_test_app TEST SOURCES match_phase_limiter_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/matching/partial_result/CMakeLists.txt b/searchcore/src/tests/proton/matching/partial_result/CMakeLists.txt index 39c1679fc27..8246a35f8fe 100644 --- a/searchcore/src/tests/proton/matching/partial_result/CMakeLists.txt +++ b/searchcore/src/tests/proton/matching/partial_result/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_executable(searchcore_partial_result_test_app +vespa_add_executable(searchcore_partial_result_test_app TEST SOURCES partial_result_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp index 078a6985fc4..00c1ebeab16 100644 --- a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp +++ b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for sessionmanager. -#include <vespa/log/log.h> -LOG_SETUP("sessionmanager_test"); #include <vespa/fastos/fastos.h> #include <vespa/searchcore/proton/matching/sessionmanager.h> @@ -13,6 +11,9 @@ LOG_SETUP("sessionmanager_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/data/slime/slime.h> +#include <vespa/log/log.h> +LOG_SETUP("sessionmanager_test"); + using vespalib::string; using namespace proton; using namespace proton::matching; diff --git a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt index bf77c583468..42c2fc29ada 100644 --- a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt +++ b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/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_executable(searchcore_documentdb_job_trackers_test_app +vespa_add_executable(searchcore_documentdb_job_trackers_test_app TEST SOURCES documentdb_job_trackers_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/metrics/job_load_sampler/CMakeLists.txt b/searchcore/src/tests/proton/metrics/job_load_sampler/CMakeLists.txt index 478a7201228..ae4a6df9373 100644 --- a/searchcore/src/tests/proton/metrics/job_load_sampler/CMakeLists.txt +++ b/searchcore/src/tests/proton/metrics/job_load_sampler/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_executable(searchcore_job_load_sampler_test_app +vespa_add_executable(searchcore_job_load_sampler_test_app TEST SOURCES job_load_sampler_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt b/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt index f4544740f8e..1a1644097be 100644 --- a/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt +++ b/searchcore/src/tests/proton/metrics/job_tracked_flush/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_executable(searchcore_job_tracked_flush_test_app +vespa_add_executable(searchcore_job_tracked_flush_test_app TEST SOURCES job_tracked_flush_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/metrics/metrics_engine/CMakeLists.txt b/searchcore/src/tests/proton/metrics/metrics_engine/CMakeLists.txt index e50e584e578..1c75b9af82b 100644 --- a/searchcore/src/tests/proton/metrics/metrics_engine/CMakeLists.txt +++ b/searchcore/src/tests/proton/metrics/metrics_engine/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_executable(searchcore_metrics_engine_test_app +vespa_add_executable(searchcore_metrics_engine_test_app TEST SOURCES metrics_engine_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/persistenceengine/CMakeLists.txt b/searchcore/src/tests/proton/persistenceengine/CMakeLists.txt index b5e42ac5075..6317d48bae6 100644 --- a/searchcore/src/tests/proton/persistenceengine/CMakeLists.txt +++ b/searchcore/src/tests/proton/persistenceengine/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_executable(searchcore_persistenceengine_test_app +vespa_add_executable(searchcore_persistenceengine_test_app TEST SOURCES persistenceengine_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt index 5e17a1d6606..07abb46b3e1 100644 --- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt +++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/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_executable(searchcore_attribute_reprocessing_initializer_test_app +vespa_add_executable(searchcore_attribute_reprocessing_initializer_test_app TEST SOURCES attribute_reprocessing_initializer_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/CMakeLists.txt b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/CMakeLists.txt index 170e381c99c..50f6d2e55d9 100644 --- a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/CMakeLists.txt +++ b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/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_executable(searchcore_document_reprocessing_handler_test_app +vespa_add_executable(searchcore_document_reprocessing_handler_test_app TEST SOURCES document_reprocessing_handler_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/CMakeLists.txt b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/CMakeLists.txt index f5eff73f9f0..6e2e0689440 100644 --- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/CMakeLists.txt +++ b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/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_executable(searchcore_reprocessing_runner_test_app +vespa_add_executable(searchcore_reprocessing_runner_test_app TEST SOURCES reprocessing_runner_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/server/CMakeLists.txt b/searchcore/src/tests/proton/server/CMakeLists.txt index 3ae89e7393d..7b689e33de7 100644 --- a/searchcore/src/tests/proton/server/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/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_executable(searchcore_attribute_metrics_test_app +vespa_add_executable(searchcore_attribute_metrics_test_app TEST SOURCES attribute_metrics_test.cpp DEPENDS @@ -7,7 +7,7 @@ vespa_add_executable(searchcore_attribute_metrics_test_app searchcore_proton_metrics ) vespa_add_test(NAME searchcore_attribute_metrics_test_app COMMAND searchcore_attribute_metrics_test_app) -vespa_add_executable(searchcore_documentretriever_test_app +vespa_add_executable(searchcore_documentretriever_test_app TEST SOURCES documentretriever_test.cpp DEPENDS @@ -21,7 +21,7 @@ vespa_add_executable(searchcore_documentretriever_test_app searchcore_persistenceengine ) vespa_add_test(NAME searchcore_documentretriever_test_app COMMAND searchcore_documentretriever_test_app) -vespa_add_executable(searchcore_feeddebugger_test_app +vespa_add_executable(searchcore_feeddebugger_test_app TEST SOURCES feeddebugger_test.cpp DEPENDS @@ -29,7 +29,7 @@ vespa_add_executable(searchcore_feeddebugger_test_app searchcore_pcommon ) vespa_add_test(NAME searchcore_feeddebugger_test_app COMMAND searchcore_feeddebugger_test_app) -vespa_add_executable(searchcore_feedstates_test_app +vespa_add_executable(searchcore_feedstates_test_app TEST SOURCES feedstates_test.cpp DEPENDS @@ -42,7 +42,7 @@ vespa_add_executable(searchcore_feedstates_test_app searchcore_fconfig ) vespa_add_test(NAME searchcore_feedstates_test_app COMMAND searchcore_feedstates_test_app) -vespa_add_executable(searchcore_memoryconfigstore_test_app +vespa_add_executable(searchcore_memoryconfigstore_test_app TEST SOURCES memoryconfigstore_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/server/data_directory_upgrader/CMakeLists.txt b/searchcore/src/tests/proton/server/data_directory_upgrader/CMakeLists.txt index 9c8048a0a69..ffcc7a82d2e 100644 --- a/searchcore/src/tests/proton/server/data_directory_upgrader/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/data_directory_upgrader/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_executable(searchcore_data_directory_upgrader_test_app +vespa_add_executable(searchcore_data_directory_upgrader_test_app TEST SOURCES data_directory_upgrader_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt b/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt index 1d9b0234d76..48f64db5d82 100644 --- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/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_executable(searchcore_disk_mem_usage_filter_test_app +vespa_add_executable(searchcore_disk_mem_usage_filter_test_app TEST SOURCES disk_mem_usage_filter_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/server/health_adapter/CMakeLists.txt b/searchcore/src/tests/proton/server/health_adapter/CMakeLists.txt index 2fee205f636..b4dab3d9f54 100644 --- a/searchcore/src/tests/proton/server/health_adapter/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/health_adapter/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_executable(searchcore_health_adapter_test_app +vespa_add_executable(searchcore_health_adapter_test_app TEST SOURCES health_adapter_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt b/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt index 51ea36dc077..aad23ab7b0a 100644 --- a/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/memoryflush/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_executable(searchcore_memoryflush_test_app +vespa_add_executable(searchcore_memoryflush_test_app TEST SOURCES memoryflush_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt b/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt index f86504c84dc..247bda1f5f8 100644 --- a/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/visibility_handler/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_executable(searchcore_visibility_handler_test_app +vespa_add_executable(searchcore_visibility_handler_test_app TEST SOURCES visibility_handler_test.cpp DEPENDS diff --git a/searchcore/src/tests/proton/statusreport/CMakeLists.txt b/searchcore/src/tests/proton/statusreport/CMakeLists.txt index fa11b343d0d..98462c157fc 100644 --- a/searchcore/src/tests/proton/statusreport/CMakeLists.txt +++ b/searchcore/src/tests/proton/statusreport/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_executable(searchcore_statusreport_test_app +vespa_add_executable(searchcore_statusreport_test_app TEST SOURCES statusreport.cpp DEPENDS diff --git a/searchcore/src/tests/proton/summaryengine/CMakeLists.txt b/searchcore/src/tests/proton/summaryengine/CMakeLists.txt index af3b09db1de..d3699428a9d 100644 --- a/searchcore/src/tests/proton/summaryengine/CMakeLists.txt +++ b/searchcore/src/tests/proton/summaryengine/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_executable(searchcore_summaryengine_test_app +vespa_add_executable(searchcore_summaryengine_test_app TEST SOURCES summaryengine.cpp DEPENDS diff --git a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt index 2d74c323c1a..a3a03ea8849 100644 --- a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt +++ b/searchcore/src/tests/proton/verify_ranksetup/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_executable(searchcore_verify_ranksetup_test_app +vespa_add_executable(searchcore_verify_ranksetup_test_app TEST SOURCES verify_ranksetup_test.cpp DEPENDS 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/fdispatch/OWNERS b/searchcore/src/vespa/searchcore/fdispatch/OWNERS index 3e9fc8ab356..d14485102db 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/OWNERS +++ b/searchcore/src/vespa/searchcore/fdispatch/OWNERS @@ -1,2 +1,2 @@ -balder +baldersheim tegge 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/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/server/feedstate.cpp b/searchcore/src/vespa/searchcore/proton/server/feedstate.cpp index 275b8006be2..6cd4df5c571 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstate.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedstate.cpp @@ -1,11 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include <vespa/log/log.h> -LOG_SETUP(".feedstate"); #include <vespa/fastos/fastos.h> - -#include "feedstate.h" #include <vespa/document/bucket/bucketid.h> +#include "feedstate.h" +#include <vespa/log/log.h> +LOG_SETUP(".feedstate"); using document::BucketId; using vespalib::IllegalStateException; diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp index d20fe9f093a..6ded3dd7879 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp @@ -1,9 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include <vespa/log/log.h> -LOG_SETUP(".proton.server.feedstates"); #include <vespa/fastos/fastos.h> - #include "feedstates.h" #include "feedconfigstore.h" #include "ireplaypackethandler.h" @@ -11,6 +7,8 @@ LOG_SETUP(".proton.server.feedstates"); #include <vespa/searchcore/proton/common/eventlogger.h> #include <vespa/vespalib/util/closuretask.h> #include <vespa/searchcore/proton/bucketdb/ibucketdbhandler.h> +#include <vespa/log/log.h> +LOG_SETUP(".proton.server.feedstates"); using search::transactionlog::Packet; using search::transactionlog::RPC; 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..fda83fc8cf8 100644 --- a/searchcorespi/OWNERS +++ b/searchcorespi/OWNERS @@ -1,3 +1,3 @@ tegge geirst -balder +baldersheim diff --git a/searchcorespi/src/tests/plugin/CMakeLists.txt b/searchcorespi/src/tests/plugin/CMakeLists.txt index ae70cc2d7f7..ef7f0ad316f 100644 --- a/searchcorespi/src/tests/plugin/CMakeLists.txt +++ b/searchcorespi/src/tests/plugin/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_executable(searchcorespi_plugin_test_app +vespa_add_executable(searchcorespi_plugin_test_app TEST SOURCES plugin_test.cpp DEPENDS @@ -10,7 +10,7 @@ vespa_add_test( COMMAND searchcorespi_plugin_test_app ENVIRONMENT "LD_LIBRARY_PATH=." ) -vespa_add_executable(searchcorespi_factoryregistry_test_app +vespa_add_executable(searchcorespi_factoryregistry_test_app TEST SOURCES factoryregistry_test.cpp DEPENDS diff --git a/searchlib/OWNERS b/searchlib/OWNERS index 9289349b7db..2b546321fd4 100644 --- a/searchlib/OWNERS +++ b/searchlib/OWNERS @@ -1,4 +1,4 @@ havardpe -balder +baldersheim tegge 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/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/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/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/tests/aggregator/CMakeLists.txt b/searchlib/src/tests/aggregator/CMakeLists.txt index 1cc750a8fac..df3be797204 100644 --- a/searchlib/src/tests/aggregator/CMakeLists.txt +++ b/searchlib/src/tests/aggregator/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_perdocexpr_test_app +vespa_add_executable(searchlib_perdocexpr_test_app TEST SOURCES perdocexpr.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_perdocexpr_test_app COMMAND searchlib_perdocexpr_test_app) -vespa_add_executable(searchlib_attr_test_app +vespa_add_executable(searchlib_attr_test_app TEST SOURCES attr_test.cpp DEPENDS diff --git a/searchlib/src/tests/alignment/CMakeLists.txt b/searchlib/src/tests/alignment/CMakeLists.txt index 3695c600f9b..5aa724890fa 100644 --- a/searchlib/src/tests/alignment/CMakeLists.txt +++ b/searchlib/src/tests/alignment/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_executable(searchlib_alignment_test_app +vespa_add_executable(searchlib_alignment_test_app TEST SOURCES alignment.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/CMakeLists.txt b/searchlib/src/tests/attribute/CMakeLists.txt index 0598b5776a8..b746dfc521d 100644 --- a/searchlib/src/tests/attribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_attributeguard_test_app +vespa_add_executable(searchlib_attributeguard_test_app TEST SOURCES attributeguard.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND sh attributeguard_test.sh) -vespa_add_executable(searchlib_attribute_test_app +vespa_add_executable(searchlib_attribute_test_app TEST SOURCES attribute_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_attribute_test_app COMMAND sh attribute_test.sh) -vespa_add_executable(searchlib_changevector_test_app +vespa_add_executable(searchlib_changevector_test_app TEST SOURCES changevector_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt b/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt index a1d859bbfb9..e5fcb9f4504 100644 --- a/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt +++ b/searchlib/src/tests/attribute/attributefilewriter/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_executable(searchlib_attributefilewriter_test_app +vespa_add_executable(searchlib_attributefilewriter_test_app TEST SOURCES attributefilewriter_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt b/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt index ed3eeee1065..cb828cd6ab5 100644 --- a/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt +++ b/searchlib/src/tests/attribute/attributemanager/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_executable(searchlib_attributemanager_test_app +vespa_add_executable(searchlib_attributemanager_test_app TEST SOURCES attributemanager_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt b/searchlib/src/tests/attribute/bitvector/CMakeLists.txt index bc65fc04dc4..9842b4169f0 100644 --- a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt +++ b/searchlib/src/tests/attribute/bitvector/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_executable(searchlib_bitvector_test_app +vespa_add_executable(searchlib_bitvector_test_app TEST SOURCES bitvector_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/comparator/CMakeLists.txt b/searchlib/src/tests/attribute/comparator/CMakeLists.txt index 4a14181db3c..9069ee499d0 100644 --- a/searchlib/src/tests/attribute/comparator/CMakeLists.txt +++ b/searchlib/src/tests/attribute/comparator/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_executable(searchlib_comparator_test_app +vespa_add_executable(searchlib_comparator_test_app TEST SOURCES comparator_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt b/searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt index 2a1b36a626d..8a6176d56c0 100644 --- a/searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt +++ b/searchlib/src/tests/attribute/document_weight_iterator/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_executable(searchlib_document_weight_iterator_test_app +vespa_add_executable(searchlib_document_weight_iterator_test_app TEST SOURCES document_weight_iterator_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt b/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt index 0dbb59043c1..54f39e0633a 100644 --- a/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt +++ b/searchlib/src/tests/attribute/enumeratedsave/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_executable(searchlib_enumeratedsave_test_app +vespa_add_executable(searchlib_enumeratedsave_test_app TEST SOURCES enumeratedsave_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt b/searchlib/src/tests/attribute/enumstore/CMakeLists.txt index 33190553747..f0657c83f51 100644 --- a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt +++ b/searchlib/src/tests/attribute/enumstore/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_executable(searchlib_enumstore_test_app +vespa_add_executable(searchlib_enumstore_test_app TEST SOURCES enumstore_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt index b0803f0a232..207519951ae 100644 --- a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt +++ b/searchlib/src/tests/attribute/extendattributes/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_executable(searchlib_extendattribute_test_app +vespa_add_executable(searchlib_extendattribute_test_app TEST SOURCES extendattribute.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt b/searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt index 36c66b09966..3cb99c84d16 100644 --- a/searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt +++ b/searchlib/src/tests/attribute/multivaluemapping/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_executable(searchlib_multivaluemapping_test_app +vespa_add_executable(searchlib_multivaluemapping_test_app TEST SOURCES multivaluemapping_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/postinglist/CMakeLists.txt b/searchlib/src/tests/attribute/postinglist/CMakeLists.txt index a22d1ae2fdc..b6621667678 100644 --- a/searchlib/src/tests/attribute/postinglist/CMakeLists.txt +++ b/searchlib/src/tests/attribute/postinglist/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_executable(searchlib_postinglist_test_app +vespa_add_executable(searchlib_postinglist_test_app TEST SOURCES postinglist.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt index 77d137c7b6e..3b2f86a6509 100644 --- a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/postinglistattribute/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_executable(searchlib_postinglistattribute_test_app +vespa_add_executable(searchlib_postinglistattribute_test_app TEST SOURCES postinglistattribute_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/searchable/CMakeLists.txt b/searchlib/src/tests/attribute/searchable/CMakeLists.txt index ed76520af29..d2f745b35ee 100644 --- a/searchlib/src/tests/attribute/searchable/CMakeLists.txt +++ b/searchlib/src/tests/attribute/searchable/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_attribute_searchable_adapter_test_app +vespa_add_executable(searchlib_attribute_searchable_adapter_test_app TEST SOURCES attribute_searchable_adapter_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_attribute_searchable_adapter_test_app COMMAND sh attribute_searchable_adapter_test.sh) -vespa_add_executable(searchlib_attribute_weighted_set_blueprint_test_app +vespa_add_executable(searchlib_attribute_weighted_set_blueprint_test_app TEST SOURCES attribute_weighted_set_blueprint_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_attribute_weighted_set_blueprint_test_app COMMAND searchlib_attribute_weighted_set_blueprint_test_app) -vespa_add_executable(searchlib_attribute_blueprint_test_app +vespa_add_executable(searchlib_attribute_blueprint_test_app TEST SOURCES attributeblueprint_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt index 24652373a00..6a921ce242c 100644 --- a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt +++ b/searchlib/src/tests/attribute/searchcontext/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_executable(searchlib_searchcontext_test_app +vespa_add_executable(searchlib_searchcontext_test_app TEST SOURCES searchcontext.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt b/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt index 24b7a75dd07..68b4c869bcc 100644 --- a/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt +++ b/searchlib/src/tests/attribute/sourceselector/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_executable(searchlib_sourceselector_test_app +vespa_add_executable(searchlib_sourceselector_test_app TEST SOURCES sourceselector_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt index 032ce9cac4e..2aa39bcca48 100644 --- a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/stringattribute/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_executable(searchlib_stringattribute_test_app +vespa_add_executable(searchlib_stringattribute_test_app TEST SOURCES stringattribute_test.cpp DEPENDS diff --git a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt index ec16b4363eb..81b7bc9b1cf 100644 --- a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/tensorattribute/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_executable(searchlib_tensorattribute_test_app +vespa_add_executable(searchlib_tensorattribute_test_app TEST SOURCES tensorattribute_test.cpp DEPENDS diff --git a/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt b/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt index f724773dfd6..2eaf6e29314 100644 --- a/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt +++ b/searchlib/src/tests/bitcompression/expgolomb/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_executable(searchlib_expgolomb_test_app +vespa_add_executable(searchlib_expgolomb_test_app TEST SOURCES expgolomb_test.cpp DEPENDS diff --git a/searchlib/src/tests/btree/CMakeLists.txt b/searchlib/src/tests/btree/CMakeLists.txt index d88953d43fd..8a8a83c1239 100644 --- a/searchlib/src/tests/btree/CMakeLists.txt +++ b/searchlib/src/tests/btree/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_executable(searchlib_btreeaggregation_test_app +vespa_add_executable(searchlib_btreeaggregation_test_app TEST SOURCES btreeaggregation_test.cpp DEPENDS diff --git a/searchlib/src/tests/bytecomplens/CMakeLists.txt b/searchlib/src/tests/bytecomplens/CMakeLists.txt index 188c3fccbdf..b152a93e26c 100644 --- a/searchlib/src/tests/bytecomplens/CMakeLists.txt +++ b/searchlib/src/tests/bytecomplens/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_executable(searchlib_bytecomp_test_app +vespa_add_executable(searchlib_bytecomp_test_app TEST SOURCES bytecomp.cpp DEPENDS diff --git a/searchlib/src/tests/common/bitvector/CMakeLists.txt b/searchlib/src/tests/common/bitvector/CMakeLists.txt index ce49872319a..cb87c749d47 100644 --- a/searchlib/src/tests/common/bitvector/CMakeLists.txt +++ b/searchlib/src/tests/common/bitvector/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_executable(searchlib_bitvector_test-common_app +vespa_add_executable(searchlib_bitvector_test-common_app TEST SOURCES bitvector_test.cpp DEPENDS @@ -13,7 +13,7 @@ vespa_add_executable(searchlib_bitvector_benchmark_app searchlib ) vespa_add_test(NAME searchlib_bitvector_benchmark_app COMMAND searchlib_bitvector_benchmark_app BENCHMARK) -vespa_add_executable(searchlib_condensedbitvector_test_app +vespa_add_executable(searchlib_condensedbitvector_test_app TEST SOURCES condensedbitvector_test.cpp DEPENDS diff --git a/searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt b/searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt index dd0e5c0b039..67eebbfe53a 100644 --- a/searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt +++ b/searchlib/src/tests/common/foregroundtaskexecutor/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_executable(searchlib_foregroundtaskexecutor_test_app +vespa_add_executable(searchlib_foregroundtaskexecutor_test_app TEST SOURCES foregroundtaskexecutor_test.cpp DEPENDS diff --git a/searchlib/src/tests/common/location/CMakeLists.txt b/searchlib/src/tests/common/location/CMakeLists.txt index 3617657cdf9..7664e89a022 100644 --- a/searchlib/src/tests/common/location/CMakeLists.txt +++ b/searchlib/src/tests/common/location/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_executable(searchlib_location_test_app +vespa_add_executable(searchlib_location_test_app TEST SOURCES location_test.cpp DEPENDS diff --git a/searchlib/src/tests/common/packets/CMakeLists.txt b/searchlib/src/tests/common/packets/CMakeLists.txt index e35883b1d8c..0df9e15f3d1 100644 --- a/searchlib/src/tests/common/packets/CMakeLists.txt +++ b/searchlib/src/tests/common/packets/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_executable(searchlib_packets_test_app +vespa_add_executable(searchlib_packets_test_app TEST SOURCES packets_test.cpp DEPENDS diff --git a/searchlib/src/tests/common/rcuvector/CMakeLists.txt b/searchlib/src/tests/common/rcuvector/CMakeLists.txt index 362dbf68dca..bb5e91c4da4 100644 --- a/searchlib/src/tests/common/rcuvector/CMakeLists.txt +++ b/searchlib/src/tests/common/rcuvector/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_executable(searchlib_rcuvector_test_app +vespa_add_executable(searchlib_rcuvector_test_app TEST SOURCES rcuvector_test.cpp DEPENDS diff --git a/searchlib/src/tests/common/resultset/CMakeLists.txt b/searchlib/src/tests/common/resultset/CMakeLists.txt index 0aed46f6e89..79b6db17cf8 100644 --- a/searchlib/src/tests/common/resultset/CMakeLists.txt +++ b/searchlib/src/tests/common/resultset/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_executable(searchlib_resultset_test_app +vespa_add_executable(searchlib_resultset_test_app TEST SOURCES resultset_test.cpp DEPENDS diff --git a/searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt b/searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt index 501fd3b07f1..8db4b51c690 100644 --- a/searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt +++ b/searchlib/src/tests/common/sequencedtaskexecutor/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_executable(searchlib_sequencedtaskexecutor_test_app +vespa_add_executable(searchlib_sequencedtaskexecutor_test_app TEST SOURCES sequencedtaskexecutor_test.cpp DEPENDS diff --git a/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt b/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt index 3b6cb392615..6207106dafe 100644 --- a/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt +++ b/searchlib/src/tests/common/summaryfeatures/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_executable(searchlib_summaryfeatures_test_app +vespa_add_executable(searchlib_summaryfeatures_test_app TEST SOURCES summaryfeatures.cpp DEPENDS diff --git a/searchlib/src/tests/datastore/CMakeLists.txt b/searchlib/src/tests/datastore/CMakeLists.txt index b10bc4d4e09..576393d1a34 100644 --- a/searchlib/src/tests/datastore/CMakeLists.txt +++ b/searchlib/src/tests/datastore/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_executable(searchlib_logdatastore_test_app +vespa_add_executable(searchlib_logdatastore_test_app TEST SOURCES logdatastore_test.cpp DEPENDS diff --git a/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt b/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt index 27c03b483ab..dbeb0cdc366 100644 --- a/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/bitvector/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_executable(searchlib_bitvector_test-diskindex_app +vespa_add_executable(searchlib_bitvector_test-diskindex_app TEST SOURCES bitvector_test.cpp DEPENDS diff --git a/searchlib/src/tests/diskindex/diskindex/CMakeLists.txt b/searchlib/src/tests/diskindex/diskindex/CMakeLists.txt index 7cee100f534..f300f80ad3e 100644 --- a/searchlib/src/tests/diskindex/diskindex/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/diskindex/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_executable(searchlib_diskindex_test_app +vespa_add_executable(searchlib_diskindex_test_app TEST SOURCES diskindex_test.cpp DEPENDS diff --git a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt index a03313fac35..f13f49a9051 100644 --- a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fieldwriter/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_executable(searchlib_fieldwriter_test_app +vespa_add_executable(searchlib_fieldwriter_test_app TEST SOURCES fieldwriter_test.cpp DEPENDS diff --git a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt index 9c079b09c90..2449a4e2dc1 100644 --- a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fusion/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_executable(searchlib_fusion_test_app +vespa_add_executable(searchlib_fusion_test_app TEST SOURCES fusion_test.cpp DEPENDS diff --git a/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt b/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt index f8aef573c9a..b7c9b8cc9c0 100644 --- a/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/pagedict4/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_executable(searchlib_pagedict4_test_app +vespa_add_executable(searchlib_pagedict4_test_app TEST SOURCES pagedict4test.cpp DEPENDS diff --git a/searchlib/src/tests/document_store/CMakeLists.txt b/searchlib/src/tests/document_store/CMakeLists.txt index 18b9e408fae..f782c3d45e0 100644 --- a/searchlib/src/tests/document_store/CMakeLists.txt +++ b/searchlib/src/tests/document_store/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_executable(searchlib_document_store_test_app +vespa_add_executable(searchlib_document_store_test_app TEST SOURCES document_store_test.cpp DEPENDS diff --git a/searchlib/src/tests/document_store/visitor/CMakeLists.txt b/searchlib/src/tests/document_store/visitor/CMakeLists.txt index 976463bdfe8..0cac84d2427 100644 --- a/searchlib/src/tests/document_store/visitor/CMakeLists.txt +++ b/searchlib/src/tests/document_store/visitor/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_executable(searchlib_document_store_visitor_test_app +vespa_add_executable(searchlib_document_store_visitor_test_app TEST SOURCES document_store_visitor_test.cpp DEPENDS diff --git a/searchlib/src/tests/engine/docsumapi/CMakeLists.txt b/searchlib/src/tests/engine/docsumapi/CMakeLists.txt index a8fbe70de4b..0a191d28f02 100644 --- a/searchlib/src/tests/engine/docsumapi/CMakeLists.txt +++ b/searchlib/src/tests/engine/docsumapi/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_executable(searchlib_docsumapi_test_app +vespa_add_executable(searchlib_docsumapi_test_app TEST SOURCES docsumapi_test.cpp DEPENDS diff --git a/searchlib/src/tests/engine/monitorapi/CMakeLists.txt b/searchlib/src/tests/engine/monitorapi/CMakeLists.txt index f78a8e04fd1..c8e6b37a1b6 100644 --- a/searchlib/src/tests/engine/monitorapi/CMakeLists.txt +++ b/searchlib/src/tests/engine/monitorapi/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_executable(searchlib_monitorapi_test_app +vespa_add_executable(searchlib_monitorapi_test_app TEST SOURCES monitorapi_test.cpp DEPENDS diff --git a/searchlib/src/tests/engine/searchapi/CMakeLists.txt b/searchlib/src/tests/engine/searchapi/CMakeLists.txt index 89d1b8197a5..12b7f94ca3f 100644 --- a/searchlib/src/tests/engine/searchapi/CMakeLists.txt +++ b/searchlib/src/tests/engine/searchapi/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_executable(searchlib_searchapi_test_app +vespa_add_executable(searchlib_searchapi_test_app TEST SOURCES searchapi_test.cpp DEPENDS diff --git a/searchlib/src/tests/engine/transportserver/CMakeLists.txt b/searchlib/src/tests/engine/transportserver/CMakeLists.txt index 502279bc728..eac2ecfabea 100644 --- a/searchlib/src/tests/engine/transportserver/CMakeLists.txt +++ b/searchlib/src/tests/engine/transportserver/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_executable(searchlib_transportserver_test_app +vespa_add_executable(searchlib_transportserver_test_app TEST SOURCES transportserver_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/CMakeLists.txt b/searchlib/src/tests/features/CMakeLists.txt index f1703b02c8b..965366f6ab8 100644 --- a/searchlib/src/tests/features/CMakeLists.txt +++ b/searchlib/src/tests/features/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_executable(searchlib_prod_features_test_app +vespa_add_executable(searchlib_prod_features_test_app TEST SOURCES prod_features.cpp prod_features_framework.cpp diff --git a/searchlib/src/tests/features/beta/CMakeLists.txt b/searchlib/src/tests/features/beta/CMakeLists.txt index ee7020f01fc..9dc4597e8a0 100644 --- a/searchlib/src/tests/features/beta/CMakeLists.txt +++ b/searchlib/src/tests/features/beta/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_executable(searchlib_beta_features_test_app +vespa_add_executable(searchlib_beta_features_test_app TEST SOURCES beta_features.cpp DEPENDS diff --git a/searchlib/src/tests/features/element_completeness/CMakeLists.txt b/searchlib/src/tests/features/element_completeness/CMakeLists.txt index aee13befe2d..fd2d96c5cd7 100644 --- a/searchlib/src/tests/features/element_completeness/CMakeLists.txt +++ b/searchlib/src/tests/features/element_completeness/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_executable(searchlib_element_completeness_test_app +vespa_add_executable(searchlib_element_completeness_test_app TEST SOURCES element_completeness_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt b/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt index 08e3b04cd73..ac6ca3ff9b4 100644 --- a/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt +++ b/searchlib/src/tests/features/element_similarity_feature/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_executable(searchlib_element_similarity_feature_test_app +vespa_add_executable(searchlib_element_similarity_feature_test_app TEST SOURCES element_similarity_feature_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt b/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt index d79aa9572bc..eb50d4478c9 100644 --- a/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt +++ b/searchlib/src/tests/features/euclidean_distance/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_executable(searchlib_euclidean_distance_test_app +vespa_add_executable(searchlib_euclidean_distance_test_app TEST SOURCES euclidean_distance_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/item_raw_score/CMakeLists.txt b/searchlib/src/tests/features/item_raw_score/CMakeLists.txt index 24ef339133c..b1eb50f20cf 100644 --- a/searchlib/src/tests/features/item_raw_score/CMakeLists.txt +++ b/searchlib/src/tests/features/item_raw_score/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_executable(searchlib_item_raw_score_test_app +vespa_add_executable(searchlib_item_raw_score_test_app TEST SOURCES item_raw_score_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/native_dot_product/CMakeLists.txt b/searchlib/src/tests/features/native_dot_product/CMakeLists.txt index 2dad758c82d..973b022c2e2 100644 --- a/searchlib/src/tests/features/native_dot_product/CMakeLists.txt +++ b/searchlib/src/tests/features/native_dot_product/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_executable(searchlib_native_dot_product_test_app +vespa_add_executable(searchlib_native_dot_product_test_app TEST SOURCES native_dot_product_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/ranking_expression/CMakeLists.txt b/searchlib/src/tests/features/ranking_expression/CMakeLists.txt index 4caddaa7bd8..abc91572d50 100644 --- a/searchlib/src/tests/features/ranking_expression/CMakeLists.txt +++ b/searchlib/src/tests/features/ranking_expression/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_executable(searchlib_ranking_expression_test_app +vespa_add_executable(searchlib_ranking_expression_test_app TEST SOURCES ranking_expression_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/raw_score/CMakeLists.txt b/searchlib/src/tests/features/raw_score/CMakeLists.txt index a672b7b071d..c25004e1931 100644 --- a/searchlib/src/tests/features/raw_score/CMakeLists.txt +++ b/searchlib/src/tests/features/raw_score/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_executable(searchlib_raw_score_test_app +vespa_add_executable(searchlib_raw_score_test_app TEST SOURCES raw_score_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/subqueries/CMakeLists.txt b/searchlib/src/tests/features/subqueries/CMakeLists.txt index 45845e8ec1b..4d0d8a41bbf 100644 --- a/searchlib/src/tests/features/subqueries/CMakeLists.txt +++ b/searchlib/src/tests/features/subqueries/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_executable(searchlib_subqueries_test_app +vespa_add_executable(searchlib_subqueries_test_app TEST SOURCES subqueries_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/tensor/CMakeLists.txt b/searchlib/src/tests/features/tensor/CMakeLists.txt index 33f7d44d8fe..dd06994370d 100644 --- a/searchlib/src/tests/features/tensor/CMakeLists.txt +++ b/searchlib/src/tests/features/tensor/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_executable(searchlib_tensor_test_app +vespa_add_executable(searchlib_tensor_test_app TEST SOURCES tensor_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt b/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt index db1814a0f66..ba13082c78f 100644 --- a/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt +++ b/searchlib/src/tests/features/tensor_from_labels/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_executable(searchlib_tensor_from_labels_test_app +vespa_add_executable(searchlib_tensor_from_labels_test_app TEST SOURCES tensor_from_labels_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt b/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt index 7c38b301679..8bab4853ca6 100644 --- a/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt +++ b/searchlib/src/tests/features/tensor_from_weighted_set/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_executable(searchlib_tensor_from_weighted_set_test_app +vespa_add_executable(searchlib_tensor_from_weighted_set_test_app TEST SOURCES tensor_from_weighted_set_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt b/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt index e0cb043c8f1..a40ba17bcbe 100644 --- a/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt +++ b/searchlib/src/tests/features/text_similarity_feature/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_executable(searchlib_text_similarity_feature_test_app +vespa_add_executable(searchlib_text_similarity_feature_test_app TEST SOURCES text_similarity_feature_test.cpp DEPENDS diff --git a/searchlib/src/tests/features/util/CMakeLists.txt b/searchlib/src/tests/features/util/CMakeLists.txt index 95a0bf3b45d..7db3768d737 100644 --- a/searchlib/src/tests/features/util/CMakeLists.txt +++ b/searchlib/src/tests/features/util/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_executable(searchlib_util_test_app +vespa_add_executable(searchlib_util_test_app TEST SOURCES util_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/CMakeLists.txt b/searchlib/src/tests/fef/CMakeLists.txt index a239ba972c3..e85d544807b 100644 --- a/searchlib/src/tests/fef/CMakeLists.txt +++ b/searchlib/src/tests/fef/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_executable(searchlib_fef_test_app +vespa_add_executable(searchlib_fef_test_app TEST SOURCES fef_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/attributecontent/CMakeLists.txt b/searchlib/src/tests/fef/attributecontent/CMakeLists.txt index 84cdb3d4fce..fcfc2129166 100644 --- a/searchlib/src/tests/fef/attributecontent/CMakeLists.txt +++ b/searchlib/src/tests/fef/attributecontent/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_executable(searchlib_attributecontent_test_app +vespa_add_executable(searchlib_attributecontent_test_app TEST SOURCES attributecontent_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt b/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt index 167642c1337..9d8576fc36b 100644 --- a/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt +++ b/searchlib/src/tests/fef/featurenamebuilder/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_executable(searchlib_featurenamebuilder_test_app +vespa_add_executable(searchlib_featurenamebuilder_test_app TEST SOURCES featurenamebuilder_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt b/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt index e313ee24deb..7a2b4530123 100644 --- a/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt +++ b/searchlib/src/tests/fef/featurenameparser/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_executable(searchlib_featurenameparser_test_app +vespa_add_executable(searchlib_featurenameparser_test_app TEST SOURCES featurenameparser_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/featureoverride/CMakeLists.txt b/searchlib/src/tests/fef/featureoverride/CMakeLists.txt index 23370d51d22..365f171597f 100644 --- a/searchlib/src/tests/fef/featureoverride/CMakeLists.txt +++ b/searchlib/src/tests/fef/featureoverride/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_executable(searchlib_featureoverride_test_app +vespa_add_executable(searchlib_featureoverride_test_app TEST SOURCES featureoverride.cpp DEPENDS diff --git a/searchlib/src/tests/fef/object_passing/CMakeLists.txt b/searchlib/src/tests/fef/object_passing/CMakeLists.txt index 2334711f015..3c60f99b131 100644 --- a/searchlib/src/tests/fef/object_passing/CMakeLists.txt +++ b/searchlib/src/tests/fef/object_passing/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_executable(searchlib_object_passing_test_app +vespa_add_executable(searchlib_object_passing_test_app TEST SOURCES object_passing_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/parameter/CMakeLists.txt b/searchlib/src/tests/fef/parameter/CMakeLists.txt index dcd45390ce3..36e0ea0b9db 100644 --- a/searchlib/src/tests/fef/parameter/CMakeLists.txt +++ b/searchlib/src/tests/fef/parameter/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_executable(searchlib_parameter_test_app +vespa_add_executable(searchlib_parameter_test_app TEST SOURCES parameter_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt b/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt index aa16f3e0a0d..84ac2ef7280 100644 --- a/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt +++ b/searchlib/src/tests/fef/phrasesplitter/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_executable(searchlib_phrasesplitter_test_app +vespa_add_executable(searchlib_phrasesplitter_test_app TEST SOURCES phrasesplitter_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/properties/CMakeLists.txt b/searchlib/src/tests/fef/properties/CMakeLists.txt index 0b74b10cb31..ec5805b4aaf 100644 --- a/searchlib/src/tests/fef/properties/CMakeLists.txt +++ b/searchlib/src/tests/fef/properties/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_executable(searchlib_properties_test_app +vespa_add_executable(searchlib_properties_test_app TEST SOURCES properties_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/rank_program/CMakeLists.txt b/searchlib/src/tests/fef/rank_program/CMakeLists.txt index 12d971a9421..1ab20a0de59 100644 --- a/searchlib/src/tests/fef/rank_program/CMakeLists.txt +++ b/searchlib/src/tests/fef/rank_program/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_executable(searchlib_rank_program_test_app +vespa_add_executable(searchlib_rank_program_test_app TEST SOURCES rank_program_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/resolver/CMakeLists.txt b/searchlib/src/tests/fef/resolver/CMakeLists.txt index 835a50fd6fb..aceb8e84573 100644 --- a/searchlib/src/tests/fef/resolver/CMakeLists.txt +++ b/searchlib/src/tests/fef/resolver/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_executable(searchlib_resolver_test_app +vespa_add_executable(searchlib_resolver_test_app TEST SOURCES resolver_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/table/CMakeLists.txt b/searchlib/src/tests/fef/table/CMakeLists.txt index ca61eb7c365..ce5d24e3540 100644 --- a/searchlib/src/tests/fef/table/CMakeLists.txt +++ b/searchlib/src/tests/fef/table/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_executable(searchlib_table_test_app +vespa_add_executable(searchlib_table_test_app TEST SOURCES table_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt b/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt index c8a678c11bb..5519f88cb71 100644 --- a/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt +++ b/searchlib/src/tests/fef/termfieldmodel/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_executable(searchlib_termfieldmodel_test_app +vespa_add_executable(searchlib_termfieldmodel_test_app TEST SOURCES termfieldmodel_test.cpp DEPENDS diff --git a/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt b/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt index cfb6ae2611f..7ea18aedab3 100644 --- a/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt +++ b/searchlib/src/tests/fef/termmatchdatamerger/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_executable(searchlib_termmatchdatamerger_test_app +vespa_add_executable(searchlib_termmatchdatamerger_test_app TEST SOURCES termmatchdatamerger_test.cpp DEPENDS diff --git a/searchlib/src/tests/fileheaderinspect/CMakeLists.txt b/searchlib/src/tests/fileheaderinspect/CMakeLists.txt index 024e83bde02..1369cbdde0d 100644 --- a/searchlib/src/tests/fileheaderinspect/CMakeLists.txt +++ b/searchlib/src/tests/fileheaderinspect/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_executable(searchlib_fileheaderinspect_test_app +vespa_add_executable(searchlib_fileheaderinspect_test_app TEST SOURCES fileheaderinspect.cpp DEPENDS diff --git a/searchlib/src/tests/fileheadertk/CMakeLists.txt b/searchlib/src/tests/fileheadertk/CMakeLists.txt index bc6969fbac2..809c220954d 100644 --- a/searchlib/src/tests/fileheadertk/CMakeLists.txt +++ b/searchlib/src/tests/fileheadertk/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_executable(searchlib_fileheadertk_test_app +vespa_add_executable(searchlib_fileheadertk_test_app TEST SOURCES fileheadertk_test.cpp DEPENDS diff --git a/searchlib/src/tests/forcelink/CMakeLists.txt b/searchlib/src/tests/forcelink/CMakeLists.txt index 50e39d2d844..48c9b4fd1a3 100644 --- a/searchlib/src/tests/forcelink/CMakeLists.txt +++ b/searchlib/src/tests/forcelink/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_executable(searchlib_forcelink_test_app +vespa_add_executable(searchlib_forcelink_test_app TEST SOURCES forcelink.cpp DEPENDS diff --git a/searchlib/src/tests/grouping/CMakeLists.txt b/searchlib/src/tests/grouping/CMakeLists.txt index ef44472edfc..d9e3abfae59 100644 --- a/searchlib/src/tests/grouping/CMakeLists.txt +++ b/searchlib/src/tests/grouping/CMakeLists.txt @@ -1,26 +1,26 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_grouping_test_app +vespa_add_executable(searchlib_grouping_test_app TEST SOURCES grouping_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_grouping_test_app COMMAND searchlib_grouping_test_app) -vespa_add_executable(searchlib_hyperloglog_test_app +vespa_add_executable(searchlib_hyperloglog_test_app TEST SOURCES hyperloglog_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_hyperloglog_test_app COMMAND searchlib_hyperloglog_test_app) -vespa_add_executable(searchlib_sketch_test_app +vespa_add_executable(searchlib_sketch_test_app TEST SOURCES sketch_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_sketch_test_app COMMAND searchlib_sketch_test_app) -vespa_add_executable(searchlib_grouping_serialization_test_app +vespa_add_executable(searchlib_grouping_serialization_test_app TEST SOURCES grouping_serialization_test.cpp DEPENDS diff --git a/searchlib/src/tests/grouping/grouping_serialization_test.cpp b/searchlib/src/tests/grouping/grouping_serialization_test.cpp index 99757af8439..cb3a8281ae1 100644 --- a/searchlib/src/tests/grouping/grouping_serialization_test.cpp +++ b/searchlib/src/tests/grouping/grouping_serialization_test.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for grouping_serialization. -#include <vespa/log/log.h> -LOG_SETUP("grouping_serialization_test"); #include <vespa/fastos/fastos.h> #include <vespa/searchlib/aggregation/aggregation.h> @@ -24,6 +22,8 @@ LOG_SETUP("grouping_serialization_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/stringfmt.h> #include <fstream> +#include <vespa/log/log.h> +LOG_SETUP("grouping_serialization_test"); using search::HitRank; using vespalib::Identifiable; diff --git a/searchlib/src/tests/hitcollector/CMakeLists.txt b/searchlib/src/tests/hitcollector/CMakeLists.txt index c2b130b2890..ca3f29f83e1 100644 --- a/searchlib/src/tests/hitcollector/CMakeLists.txt +++ b/searchlib/src/tests/hitcollector/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_executable(searchlib_hitcollector_test_app +vespa_add_executable(searchlib_hitcollector_test_app TEST SOURCES hitcollector_test.cpp DEPENDS diff --git a/searchlib/src/tests/index/docbuilder/CMakeLists.txt b/searchlib/src/tests/index/docbuilder/CMakeLists.txt index de382bcc2fe..c7f49cfa4b6 100644 --- a/searchlib/src/tests/index/docbuilder/CMakeLists.txt +++ b/searchlib/src/tests/index/docbuilder/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_executable(searchlib_docbuilder_test_app +vespa_add_executable(searchlib_docbuilder_test_app TEST SOURCES docbuilder_test.cpp DEPENDS diff --git a/searchlib/src/tests/index/doctypebuilder/CMakeLists.txt b/searchlib/src/tests/index/doctypebuilder/CMakeLists.txt index 51fb59421f9..562b34c5120 100644 --- a/searchlib/src/tests/index/doctypebuilder/CMakeLists.txt +++ b/searchlib/src/tests/index/doctypebuilder/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_executable(searchlib_doctypebuilder_test_app +vespa_add_executable(searchlib_doctypebuilder_test_app TEST SOURCES doctypebuilder_test.cpp DEPENDS diff --git a/searchlib/src/tests/indexmetainfo/CMakeLists.txt b/searchlib/src/tests/indexmetainfo/CMakeLists.txt index 607ab7b7e5b..6932793a319 100644 --- a/searchlib/src/tests/indexmetainfo/CMakeLists.txt +++ b/searchlib/src/tests/indexmetainfo/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_executable(searchlib_indexmetainfo_test_app +vespa_add_executable(searchlib_indexmetainfo_test_app TEST SOURCES indexmetainfo_test.cpp DEPENDS diff --git a/searchlib/src/tests/ld-library-path/CMakeLists.txt b/searchlib/src/tests/ld-library-path/CMakeLists.txt index 47e1372ffc6..2f0af32041e 100644 --- a/searchlib/src/tests/ld-library-path/CMakeLists.txt +++ b/searchlib/src/tests/ld-library-path/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_executable(searchlib_ld-library-path_test_app +vespa_add_executable(searchlib_ld-library-path_test_app TEST SOURCES ld-library-path.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/btree/CMakeLists.txt b/searchlib/src/tests/memoryindex/btree/CMakeLists.txt index 8b523030cab..768b35874ca 100644 --- a/searchlib/src/tests/memoryindex/btree/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/btree/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_btree_test_app +vespa_add_executable(searchlib_btree_test_app TEST SOURCES btree_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_btree_test_app COMMAND searchlib_btree_test_app) -vespa_add_executable(searchlib_frozenbtree_test_app +vespa_add_executable(searchlib_frozenbtree_test_app TEST SOURCES frozenbtree_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt b/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt index 666639f20ba..c2bdcd34bf8 100644 --- a/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/compact_document_words_store/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_executable(searchlib_compact_document_words_store_test_app +vespa_add_executable(searchlib_compact_document_words_store_test_app TEST SOURCES compact_document_words_store_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt index da45288fe5e..de59c92e590 100644 --- a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_datastore_test_app +vespa_add_executable(searchlib_datastore_test_app TEST SOURCES datastore_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_datastore_test_app COMMAND searchlib_datastore_test_app) -vespa_add_executable(searchlib_featurestore_test_app +vespa_add_executable(searchlib_featurestore_test_app TEST SOURCES featurestore_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_featurestore_test_app COMMAND searchlib_featurestore_test_app) -vespa_add_executable(searchlib_wordstore_test_app +vespa_add_executable(searchlib_wordstore_test_app TEST SOURCES wordstore_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt b/searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt index 9520b37d267..28d5de7310a 100644 --- a/searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/dictionary/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_executable(searchlib_dictionary_test_app +vespa_add_executable(searchlib_dictionary_test_app TEST SOURCES dictionary_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt b/searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt index e918d0400b2..238ce902783 100644 --- a/searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/document_remover/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_executable(searchlib_document_remover_test_app +vespa_add_executable(searchlib_document_remover_test_app TEST SOURCES document_remover_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt index 85a77fad361..0d546f6f986 100644 --- a/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/documentinverter/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_executable(searchlib_documentinverter_test_app +vespa_add_executable(searchlib_documentinverter_test_app TEST SOURCES documentinverter_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt index 9d81ebbb57c..4e73c27bf17 100644 --- a/searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/fieldinverter/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_executable(searchlib_fieldinverter_test_app +vespa_add_executable(searchlib_fieldinverter_test_app TEST SOURCES fieldinverter_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt b/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt index f25089e85bb..a0230479346 100644 --- a/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/memoryindex/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_executable(searchlib_memoryindex_test_app +vespa_add_executable(searchlib_memoryindex_test_app TEST SOURCES memoryindex_test.cpp DEPENDS diff --git a/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt index c5a0374fad9..22f7916f834 100644 --- a/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/urlfieldinverter/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_executable(searchlib_urlfieldinverter_test_app +vespa_add_executable(searchlib_urlfieldinverter_test_app TEST SOURCES urlfieldinverter_test.cpp DEPENDS diff --git a/searchlib/src/tests/memorytub/CMakeLists.txt b/searchlib/src/tests/memorytub/CMakeLists.txt index a06fb4de8e2..bdb2c7d2ca3 100644 --- a/searchlib/src/tests/memorytub/CMakeLists.txt +++ b/searchlib/src/tests/memorytub/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_executable(searchlib_test_memorytub_app +vespa_add_executable(searchlib_test_memorytub_app TEST SOURCES memorytub_test.cpp DEPENDS diff --git a/searchlib/src/tests/nativerank/CMakeLists.txt b/searchlib/src/tests/nativerank/CMakeLists.txt index dc9542a4988..3938cd298c6 100644 --- a/searchlib/src/tests/nativerank/CMakeLists.txt +++ b/searchlib/src/tests/nativerank/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_executable(searchlib_nativerank_test_app +vespa_add_executable(searchlib_nativerank_test_app TEST SOURCES nativerank.cpp DEPENDS diff --git a/searchlib/src/tests/nearsearch/CMakeLists.txt b/searchlib/src/tests/nearsearch/CMakeLists.txt index a526a059a3d..65b5275e227 100644 --- a/searchlib/src/tests/nearsearch/CMakeLists.txt +++ b/searchlib/src/tests/nearsearch/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_executable(searchlib_nearsearch_test_app +vespa_add_executable(searchlib_nearsearch_test_app TEST SOURCES nearsearch_test.cpp DEPENDS diff --git a/searchlib/src/tests/postinglistbm/CMakeLists.txt b/searchlib/src/tests/postinglistbm/CMakeLists.txt index 403c12da1b1..77d24b1f829 100644 --- a/searchlib/src/tests/postinglistbm/CMakeLists.txt +++ b/searchlib/src/tests/postinglistbm/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_executable(searchlib_postinglistbm_app +vespa_add_executable(searchlib_postinglistbm_app TEST SOURCES postinglistbm.cpp andstress.cpp diff --git a/searchlib/src/tests/predicate/CMakeLists.txt b/searchlib/src/tests/predicate/CMakeLists.txt index cd15356eeee..3b29e1badc6 100644 --- a/searchlib/src/tests/predicate/CMakeLists.txt +++ b/searchlib/src/tests/predicate/CMakeLists.txt @@ -1,89 +1,89 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_predicate_index_test_app +vespa_add_executable(searchlib_predicate_index_test_app TEST SOURCES predicate_index_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_index_test_app COMMAND searchlib_predicate_index_test_app) -vespa_add_executable(searchlib_simple_index_test_app +vespa_add_executable(searchlib_simple_index_test_app TEST SOURCES simple_index_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_simple_index_test_app COMMAND searchlib_simple_index_test_app) -vespa_add_executable(searchlib_tree_crumbs_test_app +vespa_add_executable(searchlib_tree_crumbs_test_app TEST SOURCES tree_crumbs_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_tree_crumbs_test_app COMMAND searchlib_tree_crumbs_test_app) -vespa_add_executable(searchlib_predicate_tree_analyzer_test_app +vespa_add_executable(searchlib_predicate_tree_analyzer_test_app TEST SOURCES predicate_tree_analyzer_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_tree_analyzer_test_app COMMAND searchlib_predicate_tree_analyzer_test_app) -vespa_add_executable(searchlib_predicate_tree_annotator_test_app +vespa_add_executable(searchlib_predicate_tree_annotator_test_app TEST SOURCES predicate_tree_annotator_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_tree_annotator_test_app COMMAND searchlib_predicate_tree_annotator_test_app) -vespa_add_executable(searchlib_predicate_interval_store_test_app +vespa_add_executable(searchlib_predicate_interval_store_test_app TEST SOURCES predicate_interval_store_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_interval_store_test_app COMMAND searchlib_predicate_interval_store_test_app) -vespa_add_executable(searchlib_document_features_store_test_app +vespa_add_executable(searchlib_document_features_store_test_app TEST SOURCES document_features_store_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_document_features_store_test_app COMMAND searchlib_document_features_store_test_app) -vespa_add_executable(searchlib_predicate_ref_cache_test_app +vespa_add_executable(searchlib_predicate_ref_cache_test_app TEST SOURCES predicate_ref_cache_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_ref_cache_test_app COMMAND searchlib_predicate_ref_cache_test_app) -vespa_add_executable(searchlib_predicate_interval_posting_list_test_app +vespa_add_executable(searchlib_predicate_interval_posting_list_test_app TEST SOURCES predicate_interval_posting_list_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_interval_posting_list_test_app COMMAND searchlib_predicate_interval_posting_list_test_app) -vespa_add_executable(searchlib_predicate_bounds_posting_list_test_app +vespa_add_executable(searchlib_predicate_bounds_posting_list_test_app TEST SOURCES predicate_bounds_posting_list_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_bounds_posting_list_test_app COMMAND searchlib_predicate_bounds_posting_list_test_app) -vespa_add_executable(searchlib_predicate_zero_constraint_posting_list_test_app +vespa_add_executable(searchlib_predicate_zero_constraint_posting_list_test_app TEST SOURCES predicate_zero_constraint_posting_list_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_zero_constraint_posting_list_test_app COMMAND searchlib_predicate_zero_constraint_posting_list_test_app) -vespa_add_executable(searchlib_predicate_zstar_compressed_posting_list_test_app +vespa_add_executable(searchlib_predicate_zstar_compressed_posting_list_test_app TEST SOURCES predicate_zstar_compressed_posting_list_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_zstar_compressed_posting_list_test_app COMMAND searchlib_predicate_zstar_compressed_posting_list_test_app) -vespa_add_executable(searchlib_predicate_range_term_expander_test_app +vespa_add_executable(searchlib_predicate_range_term_expander_test_app TEST SOURCES predicate_range_term_expander_test.cpp DEPENDS diff --git a/searchlib/src/tests/predicate/simple_index_test.cpp b/searchlib/src/tests/predicate/simple_index_test.cpp index 8ba9e6182fb..d9cbd473ebf 100644 --- a/searchlib/src/tests/predicate/simple_index_test.cpp +++ b/searchlib/src/tests/predicate/simple_index_test.cpp @@ -1,14 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for simple_index. - -#include <vespa/log/log.h> -LOG_SETUP("simple_index_test"); #include <vespa/fastos/fastos.h> - #include <vespa/searchlib/predicate/simple_index.hpp> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/attribute/predicate_attribute.h> +#include <vespa/log/log.h> +LOG_SETUP("simple_index_test"); + using namespace search; using namespace search::predicate; using vespalib::GenerationHolder; diff --git a/searchlib/src/tests/prettyfloat/CMakeLists.txt b/searchlib/src/tests/prettyfloat/CMakeLists.txt index 74e91518030..f40ce1e3a16 100644 --- a/searchlib/src/tests/prettyfloat/CMakeLists.txt +++ b/searchlib/src/tests/prettyfloat/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_executable(searchlib_prettyfloat_test_app +vespa_add_executable(searchlib_prettyfloat_test_app TEST SOURCES prettyfloat.cpp DEPENDS diff --git a/searchlib/src/tests/query/CMakeLists.txt b/searchlib/src/tests/query/CMakeLists.txt index 16a75b7142a..48cac7b94c3 100644 --- a/searchlib/src/tests/query/CMakeLists.txt +++ b/searchlib/src/tests/query/CMakeLists.txt @@ -1,47 +1,47 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_query_visitor_test_app +vespa_add_executable(searchlib_query_visitor_test_app TEST SOURCES query_visitor_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_query_visitor_test_app COMMAND searchlib_query_visitor_test_app) -vespa_add_executable(searchlib_customtypevisitor_test_app +vespa_add_executable(searchlib_customtypevisitor_test_app TEST SOURCES customtypevisitor_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_customtypevisitor_test_app COMMAND searchlib_customtypevisitor_test_app) -vespa_add_executable(searchlib_templatetermvisitor_test_app +vespa_add_executable(searchlib_templatetermvisitor_test_app TEST SOURCES templatetermvisitor_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_templatetermvisitor_test_app COMMAND searchlib_templatetermvisitor_test_app) -vespa_add_executable(searchlib_querybuilder_test_app +vespa_add_executable(searchlib_querybuilder_test_app TEST SOURCES querybuilder_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_querybuilder_test_app COMMAND searchlib_querybuilder_test_app) -vespa_add_executable(searchlib_stackdumpquerycreator_test_app +vespa_add_executable(searchlib_stackdumpquerycreator_test_app TEST SOURCES stackdumpquerycreator_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_stackdumpquerycreator_test_app COMMAND searchlib_stackdumpquerycreator_test_app) -vespa_add_executable(searchlib_query-old_test_app +vespa_add_executable(searchlib_query-old_test_app TEST SOURCES query-old.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_query-old_test_app COMMAND searchlib_query-old_test_app) -vespa_add_executable(searchlib_query-old-large_test_app +vespa_add_executable(searchlib_query-old-large_test_app TEST SOURCES query-old-large.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/CMakeLists.txt b/searchlib/src/tests/queryeval/CMakeLists.txt index 35496b7f99a..7cd607f8470 100644 --- a/searchlib/src/tests/queryeval/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/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_executable(searchlib_queryeval_test_app +vespa_add_executable(searchlib_queryeval_test_app TEST SOURCES queryeval.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt b/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt index 88ba3deeb29..cb84fd6a557 100644 --- a/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_blueprint_test_app +vespa_add_executable(searchlib_blueprint_test_app TEST SOURCES blueprint_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_blueprint_test_app COMMAND searchlib_blueprint_test_app || diff -u lhs.out rhs.out) -vespa_add_executable(searchlib_leaf_blueprints_test_app +vespa_add_executable(searchlib_leaf_blueprints_test_app TEST SOURCES leaf_blueprints_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_leaf_blueprints_test_app COMMAND searchlib_leaf_blueprints_test_app || diff -u lhs.out rhs.out) -vespa_add_executable(searchlib_intermediate_blueprints_test_app +vespa_add_executable(searchlib_intermediate_blueprints_test_app TEST SOURCES intermediate_blueprints_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt index cf701c430aa..60d21c532aa 100644 --- a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/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_executable(searchlib_booleanmatchiteratorwrapper_test_app +vespa_add_executable(searchlib_booleanmatchiteratorwrapper_test_app TEST SOURCES booleanmatchiteratorwrapper_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt b/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt index 91b78f2e54d..d2ff2eebc4a 100644 --- a/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/dot_product/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_executable(searchlib_dot_product_test_app +vespa_add_executable(searchlib_dot_product_test_app TEST SOURCES dot_product_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/equiv/CMakeLists.txt b/searchlib/src/tests/queryeval/equiv/CMakeLists.txt index 695e9b87121..6252021f40c 100644 --- a/searchlib/src/tests/queryeval/equiv/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/equiv/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_executable(searchlib_equiv_test_app +vespa_add_executable(searchlib_equiv_test_app TEST SOURCES equiv_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt b/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt index 75eaae7d9ed..6b6f7007323 100644 --- a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/fake_searchable/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_executable(searchlib_fake_searchable_test_app +vespa_add_executable(searchlib_fake_searchable_test_app TEST SOURCES fake_searchable_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt b/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt index 5502e2c033b..2e5ffaa495b 100644 --- a/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/getnodeweight/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_executable(searchlib_getnodeweight_test_app +vespa_add_executable(searchlib_getnodeweight_test_app TEST SOURCES getnodeweight_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt b/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt index eebc9c8cf17..aefa2312992 100644 --- a/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/monitoring_search_iterator/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_executable(searchlib_monitoring_search_iterator_test_app +vespa_add_executable(searchlib_monitoring_search_iterator_test_app TEST SOURCES monitoring_search_iterator_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt b/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt index 1bac095225f..dcae2ee1d61 100644 --- a/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/multibitvectoriterator/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_executable(searchlib_multibitvectoriterator_test_app +vespa_add_executable(searchlib_multibitvectoriterator_test_app TEST SOURCES multibitvectoriterator_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt b/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt index b76286bea65..6a946bd0681 100644 --- a/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/parallel_weak_and/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_executable(searchlib_parallel_weak_and_test_app +vespa_add_executable(searchlib_parallel_weak_and_test_app TEST SOURCES parallel_weak_and_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/predicate/CMakeLists.txt b/searchlib/src/tests/queryeval/predicate/CMakeLists.txt index e1c4ebf9aa8..4d823cc1d54 100644 --- a/searchlib/src/tests/queryeval/predicate/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/predicate/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_predicate_blueprint_test_app +vespa_add_executable(searchlib_predicate_blueprint_test_app TEST SOURCES predicate_blueprint_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_predicate_blueprint_test_app COMMAND searchlib_predicate_blueprint_test_app) -vespa_add_executable(searchlib_predicate_search_test_app +vespa_add_executable(searchlib_predicate_search_test_app TEST SOURCES predicate_search_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt b/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt index bc9e664a8cf..05c281854aa 100644 --- a/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/simple_phrase/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_executable(searchlib_simple_phrase_test_app +vespa_add_executable(searchlib_simple_phrase_test_app TEST SOURCES simple_phrase_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt b/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt index e566cb0fdf0..b712a01f1b9 100644 --- a/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/sourceblender/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_executable(searchlib_sourceblender_test_app +vespa_add_executable(searchlib_sourceblender_test_app TEST SOURCES sourceblender.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt b/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt index ab9362f6e99..ea94f2b99f1 100644 --- a/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/termwise_eval/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_executable(searchlib_termwise_eval_test_app +vespa_add_executable(searchlib_termwise_eval_test_app TEST SOURCES termwise_eval_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt index b3839ac75f3..c621219227d 100644 --- a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/weak_and/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_executable(searchlib_weak_and_test_app +vespa_add_executable(searchlib_weak_and_test_app TEST SOURCES weak_and_test.cpp DEPENDS @@ -7,7 +7,7 @@ vespa_add_executable(searchlib_weak_and_test_app searchlib_test ) vespa_add_test(NAME searchlib_weak_and_test_app COMMAND searchlib_weak_and_test_app) -vespa_add_executable(searchlib_weak_and_test_expensive_app +vespa_add_executable(searchlib_weak_and_test_expensive_app TEST SOURCES weak_and_test_expensive.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt index cacf4987aff..afad2d28349 100644 --- a/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/weak_and_heap/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_executable(searchlib_weak_and_heap_test_app +vespa_add_executable(searchlib_weak_and_heap_test_app TEST SOURCES weak_and_heap_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt index 74a37c8fce8..8f163933a33 100644 --- a/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/weak_and_scorers/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_executable(searchlib_weak_and_scorers_test_app +vespa_add_executable(searchlib_weak_and_scorers_test_app TEST SOURCES weak_and_scorers_test.cpp DEPENDS diff --git a/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt b/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt index 4083762d115..e0d943035e9 100644 --- a/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt +++ b/searchlib/src/tests/queryeval/weighted_set_term/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_executable(searchlib_weighted_set_term_test_app +vespa_add_executable(searchlib_weighted_set_term_test_app TEST SOURCES weighted_set_term_test.cpp DEPENDS diff --git a/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt b/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt index b1b81efd840..4fbd0b73d34 100644 --- a/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt +++ b/searchlib/src/tests/rankingexpression/feature_name_extractor/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_executable(searchlib_feature_name_extractor_test_app +vespa_add_executable(searchlib_feature_name_extractor_test_app TEST SOURCES feature_name_extractor_test.cpp DEPENDS diff --git a/searchlib/src/tests/ranksetup/CMakeLists.txt b/searchlib/src/tests/ranksetup/CMakeLists.txt index 712f1ffefa4..454375f65b1 100644 --- a/searchlib/src/tests/ranksetup/CMakeLists.txt +++ b/searchlib/src/tests/ranksetup/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_executable(searchlib_ranksetup_test_app +vespa_add_executable(searchlib_ranksetup_test_app TEST SOURCES ranksetup_test.cpp DEPENDS diff --git a/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt b/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt index 8ffd79fe327..a648cc79917 100644 --- a/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt +++ b/searchlib/src/tests/ranksetup/verify_feature/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_executable(searchlib_verify_feature_test_app +vespa_add_executable(searchlib_verify_feature_test_app TEST SOURCES verify_feature_test.cpp DEPENDS diff --git a/searchlib/src/tests/sortresults/CMakeLists.txt b/searchlib/src/tests/sortresults/CMakeLists.txt index 6889e4c517d..3f0a892d10f 100644 --- a/searchlib/src/tests/sortresults/CMakeLists.txt +++ b/searchlib/src/tests/sortresults/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_executable(searchlib_sortresults_app +vespa_add_executable(searchlib_sortresults_app TEST SOURCES sorttest.cpp DEPENDS diff --git a/searchlib/src/tests/sortspec/CMakeLists.txt b/searchlib/src/tests/sortspec/CMakeLists.txt index a436bb744c5..a59a5c102f7 100644 --- a/searchlib/src/tests/sortspec/CMakeLists.txt +++ b/searchlib/src/tests/sortspec/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_executable(searchlib_multilevelsort_test_app +vespa_add_executable(searchlib_multilevelsort_test_app TEST SOURCES multilevelsort.cpp DEPENDS diff --git a/searchlib/src/tests/stackdumpiterator/CMakeLists.txt b/searchlib/src/tests/stackdumpiterator/CMakeLists.txt index dceeaad3f26..a3148d0b068 100644 --- a/searchlib/src/tests/stackdumpiterator/CMakeLists.txt +++ b/searchlib/src/tests/stackdumpiterator/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_executable(searchlib_stackdumpiteratortest_app +vespa_add_executable(searchlib_stackdumpiteratortest_app TEST SOURCES stackdumpiteratortest.cpp DEPENDS diff --git a/searchlib/src/tests/stringenum/CMakeLists.txt b/searchlib/src/tests/stringenum/CMakeLists.txt index b59e739be47..b608aeceecc 100644 --- a/searchlib/src/tests/stringenum/CMakeLists.txt +++ b/searchlib/src/tests/stringenum/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_executable(searchlib_stringenum_test_app +vespa_add_executable(searchlib_stringenum_test_app TEST SOURCES stringenum_test.cpp DEPENDS diff --git a/searchlib/src/tests/transactionlog/CMakeLists.txt b/searchlib/src/tests/transactionlog/CMakeLists.txt index 545c81ba45f..1b59b5834f8 100644 --- a/searchlib/src/tests/transactionlog/CMakeLists.txt +++ b/searchlib/src/tests/transactionlog/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_translogserver_test_app +vespa_add_executable(searchlib_translogserver_test_app TEST SOURCES translogserver_test.cpp DEPENDS searchlib ) vespa_add_test(NAME searchlib_translogserver_test_app COMMAND searchlib_translogserver_test_app) -vespa_add_executable(searchlib_translogclient_test_app +vespa_add_executable(searchlib_translogclient_test_app TEST SOURCES translogclient_test.cpp DEPENDS diff --git a/searchlib/src/tests/true/CMakeLists.txt b/searchlib/src/tests/true/CMakeLists.txt index f7c80db8f92..c78cf8ad388 100644 --- a/searchlib/src/tests/true/CMakeLists.txt +++ b/searchlib/src/tests/true/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_executable(searchlib_true_test_app +vespa_add_executable(searchlib_true_test_app TEST SOURCES true.cpp DEPENDS diff --git a/searchlib/src/tests/url/CMakeLists.txt b/searchlib/src/tests/url/CMakeLists.txt index aa52f3d8374..f09ec7c9ca5 100644 --- a/searchlib/src/tests/url/CMakeLists.txt +++ b/searchlib/src/tests/url/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_executable(searchlib_testurl_app +vespa_add_executable(searchlib_testurl_app TEST SOURCES testurl.cpp DEPENDS diff --git a/searchlib/src/tests/util/CMakeLists.txt b/searchlib/src/tests/util/CMakeLists.txt index 43fec57c182..5303f125c3b 100644 --- a/searchlib/src/tests/util/CMakeLists.txt +++ b/searchlib/src/tests/util/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_executable(searchlib_rawbuf_test_app +vespa_add_executable(searchlib_rawbuf_test_app TEST SOURCES rawbuf_test.cpp DEPENDS diff --git a/searchlib/src/tests/util/bufferwriter/CMakeLists.txt b/searchlib/src/tests/util/bufferwriter/CMakeLists.txt index a57749ff853..efe91549e1f 100644 --- a/searchlib/src/tests/util/bufferwriter/CMakeLists.txt +++ b/searchlib/src/tests/util/bufferwriter/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_executable(searchlib_bufferwriter_test_app +vespa_add_executable(searchlib_bufferwriter_test_app TEST SOURCES bufferwriter_test.cpp DEPENDS diff --git a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt index 92d6ab30d72..53db132472f 100644 --- a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt +++ b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt @@ -1,9 +1,10 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_ioerrorhandler_test_app +vespa_add_executable(searchlib_ioerrorhandler_test_app TEST SOURCES ioerrorhandler_test.cpp DEPENDS searchlib_test searchlib + dl ) vespa_add_test(NAME searchlib_ioerrorhandler_test_app COMMAND searchlib_ioerrorhandler_test_app) diff --git a/searchlib/src/tests/util/searchable_stats/CMakeLists.txt b/searchlib/src/tests/util/searchable_stats/CMakeLists.txt index 3bc0fbe9c6b..c679fdd1097 100644 --- a/searchlib/src/tests/util/searchable_stats/CMakeLists.txt +++ b/searchlib/src/tests/util/searchable_stats/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_executable(searchlib_searchable_stats_test_app +vespa_add_executable(searchlib_searchable_stats_test_app TEST SOURCES searchable_stats_test.cpp DEPENDS diff --git a/searchlib/src/tests/util/sigbushandler/CMakeLists.txt b/searchlib/src/tests/util/sigbushandler/CMakeLists.txt index a55e1e354c7..7896c719822 100644 --- a/searchlib/src/tests/util/sigbushandler/CMakeLists.txt +++ b/searchlib/src/tests/util/sigbushandler/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_executable(searchlib_sigbushandler_test_app +vespa_add_executable(searchlib_sigbushandler_test_app TEST SOURCES sigbushandler_test.cpp DEPENDS diff --git a/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt b/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt index 0735511fe7a..3a273ee589a 100644 --- a/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt +++ b/searchlib/src/tests/util/slime_output_raw_buf_adapter/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_executable(searchlib_slime_output_raw_buf_adapter_test_app +vespa_add_executable(searchlib_slime_output_raw_buf_adapter_test_app TEST SOURCES slime_output_raw_buf_adapter_test.cpp DEPENDS diff --git a/searchlib/src/tests/util/statebuf/CMakeLists.txt b/searchlib/src/tests/util/statebuf/CMakeLists.txt index 0b24cd1552b..c162c3bc461 100644 --- a/searchlib/src/tests/util/statebuf/CMakeLists.txt +++ b/searchlib/src/tests/util/statebuf/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_executable(searchlib_statebuf_test_app +vespa_add_executable(searchlib_statebuf_test_app TEST SOURCES statebuf_test.cpp DEPENDS diff --git a/searchlib/src/tests/util/statefile/CMakeLists.txt b/searchlib/src/tests/util/statefile/CMakeLists.txt index b90b87fce7d..37410d67473 100644 --- a/searchlib/src/tests/util/statefile/CMakeLists.txt +++ b/searchlib/src/tests/util/statefile/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_executable(searchlib_statefile_test_app +vespa_add_executable(searchlib_statefile_test_app TEST SOURCES statefile_test.cpp DEPENDS diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt index 6b94631cdeb..f0351687918 100644 --- a/searchlib/src/vespa/searchlib/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/CMakeLists.txt @@ -28,4 +28,6 @@ vespa_add_library(searchlib searchlib_queryeval searchlib_queryeval_test staging_vespalib + icuuc + atomic ) 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..fda83fc8cf8 100644 --- a/searchlib/src/vespa/searchlib/attribute/OWNERS +++ b/searchlib/src/vespa/searchlib/attribute/OWNERS @@ -1,3 +1,3 @@ tegge geirst -balder +baldersheim diff --git a/searchlib/src/vespa/searchlib/docstore/OWNERS b/searchlib/src/vespa/searchlib/docstore/OWNERS index 3e9fc8ab356..d14485102db 100644 --- a/searchlib/src/vespa/searchlib/docstore/OWNERS +++ b/searchlib/src/vespa/searchlib/docstore/OWNERS @@ -1,2 +1,2 @@ -balder +baldersheim tegge 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/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/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/predicate/document_features_store.cpp b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp index db5f1611d0a..5e5e1617c10 100644 --- a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp +++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".document_features_store"); #include <vespa/fastos/fastos.h> #include "document_features_store.h" @@ -13,6 +11,8 @@ LOG_SETUP(".document_features_store"); #include <unordered_map> #include <vector> +#include <vespa/log/log.h> +LOG_SETUP(".document_features_store"); using search::btree::BTreeNoLeafData; using search::btree::EntryRef; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp index 5ca00d1863f..81533c36951 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_index"); #include <vespa/fastos/fastos.h> #include "predicate_index.h" @@ -10,6 +8,8 @@ LOG_SETUP(".predicate_index"); #include <vespa/searchlib/btree/entryref.h> #include "predicate_hash.h" #include <algorithm> +#include <vespa/log/log.h> +LOG_SETUP(".predicate_index"); using search::btree::EntryRef; using vespalib::MMapDataBuffer; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp index b4204010eec..57b260d7a15 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_interval_store"); #include <vespa/fastos/fastos.h> #include "predicate_interval_store.h" @@ -10,6 +8,8 @@ LOG_SETUP(".predicate_interval_store"); #include <vespa/searchlib/btree/bufferstate.h> #include <vespa/searchlib/btree/datastore.hpp> #include <vespa/searchlib/btree/entryref.h> +#include <vespa/log/log.h> +LOG_SETUP(".predicate_interval_store"); using search::btree::BufferState; using search::btree::EntryRef; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_range_expander.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_range_expander.cpp index bb7e26f168f..16052ec41d0 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_range_expander.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_range_expander.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_range_expander"); #include <vespa/fastos/fastos.h> #include "predicate_range_expander.h" +#include <vespa/log/log.h> +LOG_SETUP(".predicate_range_expander"); namespace search { namespace predicate { diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp index 21878d5ca9e..e35928e3edc 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_tree_analyzer"); #include <vespa/fastos/fastos.h> #include "predicate_tree_analyzer.h" @@ -9,6 +7,8 @@ LOG_SETUP(".predicate_tree_analyzer"); #include <algorithm> #include <iostream> #include <cmath> +#include <vespa/log/log.h> +LOG_SETUP(".predicate_tree_analyzer"); using document::Predicate; using std::map; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp index c97f1f73848..84df5adc9d4 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_tree_annotator"); #include <vespa/fastos/fastos.h> #include "predicate_tree_annotator.h" @@ -16,6 +14,9 @@ LOG_SETUP(".predicate_tree_annotator"); #include <map> #include <string> +#include <vespa/log/log.h> +LOG_SETUP(".predicate_tree_annotator"); + using document::Predicate; using std::map; using std::string; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_zero_constraint_posting_list.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_zero_constraint_posting_list.cpp index ca08d65b82f..4ca88d5b4b8 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_zero_constraint_posting_list.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_zero_constraint_posting_list.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_zero_constraint_posting_list"); #include <vespa/fastos/fastos.h> #include "predicate_zero_constraint_posting_list.h" +#include <vespa/log/log.h> +LOG_SETUP(".predicate_zero_constraint_posting_list"); namespace search { namespace predicate { diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.cpp b/searchlib/src/vespa/searchlib/predicate/simple_index.cpp index 829423bdc86..98bf03c1e7c 100644 --- a/searchlib/src/vespa/searchlib/predicate/simple_index.cpp +++ b/searchlib/src/vespa/searchlib/predicate/simple_index.cpp @@ -1,7 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> +#include <vespa/fastos/fastos.h> #include "simple_index.hpp" +#include <vespa/log/log.h> LOG_SETUP(".searchlib.simple_index"); namespace search { 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/transactionlog/CMakeLists.txt b/searchlib/src/vespa/searchlib/transactionlog/CMakeLists.txt index 6b01f773124..ea6b238e8b3 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/transactionlog/CMakeLists.txt @@ -11,4 +11,6 @@ vespa_add_library(searchlib_translog OBJECT translogserver.cpp translogserverapp.cpp DEPENDS + AFTER + searchlib_common ) 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/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/searchsummary/src/tests/docsumformat/CMakeLists.txt b/searchsummary/src/tests/docsumformat/CMakeLists.txt index ac8d2151792..0cae34527e6 100644 --- a/searchsummary/src/tests/docsumformat/CMakeLists.txt +++ b/searchsummary/src/tests/docsumformat/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_executable(searchsummary_docsum-pack_app +vespa_add_executable(searchsummary_docsum-pack_app TEST SOURCES docsum-pack.cpp DEPENDS diff --git a/searchsummary/src/tests/docsummary/CMakeLists.txt b/searchsummary/src/tests/docsummary/CMakeLists.txt index 7eaa78d923e..8f116721338 100644 --- a/searchsummary/src/tests/docsummary/CMakeLists.txt +++ b/searchsummary/src/tests/docsummary/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_executable(searchsummary_positionsdfw_test_app +vespa_add_executable(searchsummary_positionsdfw_test_app TEST SOURCES positionsdfw_test.cpp DEPENDS diff --git a/searchsummary/src/tests/docsummary/slime_summary/CMakeLists.txt b/searchsummary/src/tests/docsummary/slime_summary/CMakeLists.txt index a2bd3bbc610..3e5e19da8b0 100644 --- a/searchsummary/src/tests/docsummary/slime_summary/CMakeLists.txt +++ b/searchsummary/src/tests/docsummary/slime_summary/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_executable(searchsummary_slime_summary_test_app +vespa_add_executable(searchsummary_slime_summary_test_app TEST SOURCES slime_summary_test.cpp DEPENDS diff --git a/searchsummary/src/tests/extractkeywords/CMakeLists.txt b/searchsummary/src/tests/extractkeywords/CMakeLists.txt index d726ffe794c..48fe0aa9785 100644 --- a/searchsummary/src/tests/extractkeywords/CMakeLists.txt +++ b/searchsummary/src/tests/extractkeywords/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_executable(searchsummary_extractkeywordstest_app +vespa_add_executable(searchsummary_extractkeywordstest_app TEST SOURCES extractkeywordstest.cpp DEPENDS 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/simplemetrics/src/main/java/com/yahoo/metrics/simple/UnitTestSetup.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UnitTestSetup.java index c800eae4f5d..8ce3775d5e9 100644 --- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/UnitTestSetup.java +++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UnitTestSetup.java @@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit; /** * Common code for running unit tests of simplemetrics * - * @author eirik + * @author ean */ public class UnitTestSetup { MetricManager metricManager; diff --git a/slobrok/src/tests/backoff/CMakeLists.txt b/slobrok/src/tests/backoff/CMakeLists.txt index 800f984d69d..b64b9f36cba 100644 --- a/slobrok/src/tests/backoff/CMakeLists.txt +++ b/slobrok/src/tests/backoff/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_executable(slobrok_backoff_test_app +vespa_add_executable(slobrok_backoff_test_app TEST SOURCES testbackoff.cpp DEPENDS diff --git a/slobrok/src/tests/configure/CMakeLists.txt b/slobrok/src/tests/configure/CMakeLists.txt index a9988ead03f..93718d305b3 100644 --- a/slobrok/src/tests/configure/CMakeLists.txt +++ b/slobrok/src/tests/configure/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(slobrok_gencfg_app gencfg.cpp DEPENDS ) -vespa_add_executable(slobrok_configure_test_app +vespa_add_executable(slobrok_configure_test_app TEST SOURCES configure.cpp DEPENDS diff --git a/slobrok/src/tests/mirrorapi/CMakeLists.txt b/slobrok/src/tests/mirrorapi/CMakeLists.txt index 8ae5107dbcb..62b1d32eac7 100644 --- a/slobrok/src/tests/mirrorapi/CMakeLists.txt +++ b/slobrok/src/tests/mirrorapi/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_executable(slobrok_mirrorapi_test_app +vespa_add_executable(slobrok_mirrorapi_test_app TEST SOURCES mirrorapi.cpp DEPENDS @@ -7,7 +7,7 @@ vespa_add_executable(slobrok_mirrorapi_test_app slobrok_slobrokserver ) vespa_add_test(NAME slobrok_mirrorapi_test_app COMMAND slobrok_mirrorapi_test_app) -vespa_add_executable(slobrok_mirror_match_test_app +vespa_add_executable(slobrok_mirror_match_test_app TEST SOURCES match_test.cpp DEPENDS diff --git a/slobrok/src/tests/multi/CMakeLists.txt b/slobrok/src/tests/multi/CMakeLists.txt index a133cd79a29..276dd2f0845 100644 --- a/slobrok/src/tests/multi/CMakeLists.txt +++ b/slobrok/src/tests/multi/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(slobrok_multi_test_app +vespa_add_executable(slobrok_multi_test_app TEST SOURCES multi.cpp DEPENDS ) -vespa_add_test(NAME slobrok_multi_test_app NO_VALGRIND COMMAND sh multi_test.sh) diff --git a/slobrok/src/tests/multi/multi_test.sh b/slobrok/src/tests/multi/multi_test.sh index 8f5805be592..ffc917c94db 100755 --- a/slobrok/src/tests/multi/multi_test.sh +++ b/slobrok/src/tests/multi/multi_test.sh @@ -1,5 +1,6 @@ #/bin/bash +ok=true ./start.sh -sleep 2 -./slobrok_multi_test_app || (./stop.sh; false) +./slobrok_multi_test_app || ok=false ./stop.sh +$ok diff --git a/slobrok/src/tests/multi/start.sh b/slobrok/src/tests/multi/start.sh index 81e0bb93269..d45b1f17e3b 100755 --- a/slobrok/src/tests/multi/start.sh +++ b/slobrok/src/tests/multi/start.sh @@ -19,3 +19,22 @@ echo $! >> pids.txt echo $! >> pids.txt ../../apps/slobrok/slobrok -c file:7.cfg -p 18517 > slobrok6.out 2>&1 & echo $! >> pids.txt + +echo "Started: " `cat pids.txt` + +export VESPA_LOG_LEVEL='all -debug -spam' + +for x in 1 2 3 4 5 6 7 8 9; do + sleep $x + echo "waiting for service location brokers to start, slept $x seconds" + alive=true + for port in 18511 18512 18513 18514 18515 18516 18517; do + ../../apps/sbcmd/sbcmd $port slobrok.callback.listNamesServed || alive=false + done + if $alive; then + echo "all started ok after $x seconds" + exit 0 + fi +done +echo "giving up, this probably won't work" +exit 1 diff --git a/slobrok/src/tests/multi/stop.sh b/slobrok/src/tests/multi/stop.sh index adf351b03e1..0089c0b77d3 100755 --- a/slobrok/src/tests/multi/stop.sh +++ b/slobrok/src/tests/multi/stop.sh @@ -11,11 +11,26 @@ ok=true ../../apps/sbcmd/sbcmd 18516 slobrok.system.stop || ok=false ../../apps/sbcmd/sbcmd 18517 slobrok.system.stop || ok=false -sleep 2 +if $ok; then + echo "Signaled all brokers to stop OK" +fi -for x in `cat pids.txt`; do - kill $x 2>/dev/null && ok=false +for cnt in 1 2 3 4 5 6 7 8 9; do + sleep $cnt + alive=false + for x in `cat pids.txt`; do + kill $x 2>/dev/null && ps -p $x && alive=true + done + if $alive; then + echo "Some processes still alive after $cnt seconds" + else + rm -f pids.txt + $ok + exit + fi done -rm -f pids.txt -$ok +for x in `cat pids.txt`; do + kill -9 $x 2>/dev/null && echo "Force killed pid $x" +done +exit 1 diff --git a/slobrok/src/tests/oldapi/CMakeLists.txt b/slobrok/src/tests/oldapi/CMakeLists.txt index b4def919688..0616e0e0696 100644 --- a/slobrok/src/tests/oldapi/CMakeLists.txt +++ b/slobrok/src/tests/oldapi/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_executable(slobrok_oldapi_test_app +vespa_add_executable(slobrok_oldapi_test_app TEST SOURCES old.cpp mirror.cpp diff --git a/slobrok/src/tests/registerapi/CMakeLists.txt b/slobrok/src/tests/registerapi/CMakeLists.txt index de4f84cbf9f..366a5adda78 100644 --- a/slobrok/src/tests/registerapi/CMakeLists.txt +++ b/slobrok/src/tests/registerapi/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_executable(slobrok_registerapi_test_app +vespa_add_executable(slobrok_registerapi_test_app TEST SOURCES registerapi.cpp DEPENDS diff --git a/slobrok/src/tests/standalone/CMakeLists.txt b/slobrok/src/tests/standalone/CMakeLists.txt index 60b10b9ddd0..ce9517a67af 100644 --- a/slobrok/src/tests/standalone/CMakeLists.txt +++ b/slobrok/src/tests/standalone/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_executable(slobrok_standalone_test_app +vespa_add_executable(slobrok_standalone_test_app TEST SOURCES standalone.cpp DEPENDS diff --git a/slobrok/src/tests/startsome/CMakeLists.txt b/slobrok/src/tests/startsome/CMakeLists.txt index d22dc1215ee..55b82e6100b 100644 --- a/slobrok/src/tests/startsome/CMakeLists.txt +++ b/slobrok/src/tests/startsome/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_executable(slobrok_tstdst_app +vespa_add_executable(slobrok_tstdst_app TEST SOURCES tstdst.cpp DEPENDS 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/staging_vespalib/src/tests/array/CMakeLists.txt b/staging_vespalib/src/tests/array/CMakeLists.txt index 7b9841d474a..139d3132e43 100644 --- a/staging_vespalib/src/tests/array/CMakeLists.txt +++ b/staging_vespalib/src/tests/array/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_executable(staging_vespalib_allocinarray_test_app +vespa_add_executable(staging_vespalib_allocinarray_test_app TEST SOURCES allocinarray_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/bits/CMakeLists.txt b/staging_vespalib/src/tests/bits/CMakeLists.txt index 693b6cbb6cc..7a0533bf230 100644 --- a/staging_vespalib/src/tests/bits/CMakeLists.txt +++ b/staging_vespalib/src/tests/bits/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_executable(staging_vespalib_bits_test_app +vespa_add_executable(staging_vespalib_bits_test_app TEST SOURCES bits_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/clock/CMakeLists.txt b/staging_vespalib/src/tests/clock/CMakeLists.txt index 8717a6411ab..9a7c5eddec3 100644 --- a/staging_vespalib/src/tests/clock/CMakeLists.txt +++ b/staging_vespalib/src/tests/clock/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_executable(staging_vespalib_clock_test_app +vespa_add_executable(staging_vespalib_clock_test_app TEST SOURCES clock_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/cpu/CMakeLists.txt b/staging_vespalib/src/tests/cpu/CMakeLists.txt index 13bc4014d85..665c662bbf2 100644 --- a/staging_vespalib/src/tests/cpu/CMakeLists.txt +++ b/staging_vespalib/src/tests/cpu/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_executable(staging_vespalib_cpu_test_app +vespa_add_executable(staging_vespalib_cpu_test_app TEST SOURCES cpu_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/crc/CMakeLists.txt b/staging_vespalib/src/tests/crc/CMakeLists.txt index cc8e828d0d4..2d5a0099fd0 100644 --- a/staging_vespalib/src/tests/crc/CMakeLists.txt +++ b/staging_vespalib/src/tests/crc/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_executable(staging_vespalib_crc_test_app +vespa_add_executable(staging_vespalib_crc_test_app TEST SOURCES crc_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/databuffer/CMakeLists.txt b/staging_vespalib/src/tests/databuffer/CMakeLists.txt index 65eae47a502..7f9ebcc3dd8 100644 --- a/staging_vespalib/src/tests/databuffer/CMakeLists.txt +++ b/staging_vespalib/src/tests/databuffer/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_executable(staging_vespalib_databuffer_test_app +vespa_add_executable(staging_vespalib_databuffer_test_app TEST SOURCES databuffer_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/directio/CMakeLists.txt b/staging_vespalib/src/tests/directio/CMakeLists.txt index 334ae825bf6..a73f34a4719 100644 --- a/staging_vespalib/src/tests/directio/CMakeLists.txt +++ b/staging_vespalib/src/tests/directio/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_executable(staging_vespalib_directio_test_app +vespa_add_executable(staging_vespalib_directio_test_app TEST SOURCES directio.cpp DEPENDS diff --git a/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt b/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt index bc515aa26d6..a01dad8033c 100644 --- a/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt +++ b/staging_vespalib/src/tests/encoding/base64/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_executable(staging_vespalib_base64_test_app +vespa_add_executable(staging_vespalib_base64_test_app TEST SOURCES base64_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/fileheader/CMakeLists.txt b/staging_vespalib/src/tests/fileheader/CMakeLists.txt index 9e8e834147e..73f5a909abb 100644 --- a/staging_vespalib/src/tests/fileheader/CMakeLists.txt +++ b/staging_vespalib/src/tests/fileheader/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_executable(staging_vespalib_fileheader_test_app +vespa_add_executable(staging_vespalib_fileheader_test_app TEST SOURCES fileheader_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt b/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt index 88c73073ed4..d2ba3c87ada 100644 --- a/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt +++ b/staging_vespalib/src/tests/floatingpointtype/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_executable(staging_vespalib_floatingpointtype_test_app +vespa_add_executable(staging_vespalib_floatingpointtype_test_app TEST SOURCES floatingpointtypetest.cpp DEPENDS diff --git a/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt b/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt index cd19f0f1256..590c14a684c 100644 --- a/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt +++ b/staging_vespalib/src/tests/growablebytebuffer/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_executable(staging_vespalib_growablebytebuffer_test_app +vespa_add_executable(staging_vespalib_growablebytebuffer_test_app TEST SOURCES growablebytebuffer_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/json/CMakeLists.txt b/staging_vespalib/src/tests/json/CMakeLists.txt index 284e858e033..df40ec2bc5d 100644 --- a/staging_vespalib/src/tests/json/CMakeLists.txt +++ b/staging_vespalib/src/tests/json/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_executable(staging_vespalib_json_test_app +vespa_add_executable(staging_vespalib_json_test_app TEST SOURCES json.cpp DEPENDS diff --git a/staging_vespalib/src/tests/librarypool/CMakeLists.txt b/staging_vespalib/src/tests/librarypool/CMakeLists.txt index 0ef8d03ccda..c599dd54c29 100644 --- a/staging_vespalib/src/tests/librarypool/CMakeLists.txt +++ b/staging_vespalib/src/tests/librarypool/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_executable(staging_vespalib_librarypool_test_app +vespa_add_executable(staging_vespalib_librarypool_test_app TEST SOURCES librarypool_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt b/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt index 386cf7d6865..24f05959a9d 100644 --- a/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt +++ b/staging_vespalib/src/tests/memorydatastore/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_executable(staging_vespalib_memorydatastore_test_app +vespa_add_executable(staging_vespalib_memorydatastore_test_app TEST SOURCES memorydatastore.cpp DEPENDS diff --git a/staging_vespalib/src/tests/objectdump/CMakeLists.txt b/staging_vespalib/src/tests/objectdump/CMakeLists.txt index e8b5f76b934..e6cc957369f 100644 --- a/staging_vespalib/src/tests/objectdump/CMakeLists.txt +++ b/staging_vespalib/src/tests/objectdump/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_executable(staging_vespalib_objectdump_test_app +vespa_add_executable(staging_vespalib_objectdump_test_app TEST SOURCES objectdump.cpp DEPENDS diff --git a/staging_vespalib/src/tests/objects/CMakeLists.txt b/staging_vespalib/src/tests/objects/CMakeLists.txt index 1ef21d0aaa5..9f8739b9071 100644 --- a/staging_vespalib/src/tests/objects/CMakeLists.txt +++ b/staging_vespalib/src/tests/objects/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_executable(staging_vespalib_identifiable_test_app +vespa_add_executable(staging_vespalib_identifiable_test_app TEST SOURCES identifiable_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/objectselection/CMakeLists.txt b/staging_vespalib/src/tests/objectselection/CMakeLists.txt index 53453035267..d63c457ea27 100644 --- a/staging_vespalib/src/tests/objectselection/CMakeLists.txt +++ b/staging_vespalib/src/tests/objectselection/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_executable(staging_vespalib_objectselection_test_app +vespa_add_executable(staging_vespalib_objectselection_test_app TEST SOURCES objectselection.cpp DEPENDS diff --git a/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt b/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt index 929dd258cfe..f15e497b467 100644 --- a/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt +++ b/staging_vespalib/src/tests/polymorphicarray/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_executable(staging_vespalib_polymorphicarray_test_app +vespa_add_executable(staging_vespalib_polymorphicarray_test_app TEST SOURCES polymorphicarray_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/programoptions/CMakeLists.txt b/staging_vespalib/src/tests/programoptions/CMakeLists.txt index 7e436e7cee7..841141fb370 100644 --- a/staging_vespalib/src/tests/programoptions/CMakeLists.txt +++ b/staging_vespalib/src/tests/programoptions/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_executable(staging_vespalib_programoptions_test_app +vespa_add_executable(staging_vespalib_programoptions_test_app TEST SOURCES programoptions_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/rusage/CMakeLists.txt b/staging_vespalib/src/tests/rusage/CMakeLists.txt index b927110179e..4ebaa9657b9 100644 --- a/staging_vespalib/src/tests/rusage/CMakeLists.txt +++ b/staging_vespalib/src/tests/rusage/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_executable(staging_vespalib_rusage_test_app +vespa_add_executable(staging_vespalib_rusage_test_app TEST SOURCES rusage_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt b/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt index 75093312cd3..c2d2ccdfdf8 100644 --- a/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt +++ b/staging_vespalib/src/tests/shutdownguard/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_executable(staging_vespalib_shutdownguard_test_app +vespa_add_executable(staging_vespalib_shutdownguard_test_app TEST SOURCES shutdownguard_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/state_server/CMakeLists.txt b/staging_vespalib/src/tests/state_server/CMakeLists.txt index a62549a563b..635647c85b5 100644 --- a/staging_vespalib/src/tests/state_server/CMakeLists.txt +++ b/staging_vespalib/src/tests/state_server/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_executable(staging_vespalib_state_server_test_app +vespa_add_executable(staging_vespalib_state_server_test_app TEST SOURCES state_server_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/stllike/CMakeLists.txt b/staging_vespalib/src/tests/stllike/CMakeLists.txt index 690582676ad..93c5ce047d6 100644 --- a/staging_vespalib/src/tests/stllike/CMakeLists.txt +++ b/staging_vespalib/src/tests/stllike/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_lrucache_test_app +vespa_add_executable(staging_vespalib_lrucache_test_app TEST SOURCES lrucache.cpp DEPENDS staging_vespalib ) vespa_add_test(NAME staging_vespalib_lrucache_test_app COMMAND staging_vespalib_lrucache_test_app) -vespa_add_executable(staging_vespalib_cache_test_app +vespa_add_executable(staging_vespalib_cache_test_app TEST SOURCES cache_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/timer/CMakeLists.txt b/staging_vespalib/src/tests/timer/CMakeLists.txt index ab16cc236c4..96d306e44b9 100644 --- a/staging_vespalib/src/tests/timer/CMakeLists.txt +++ b/staging_vespalib/src/tests/timer/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_executable(staging_vespalib_timer_test_app +vespa_add_executable(staging_vespalib_timer_test_app TEST SOURCES timer_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/trace/CMakeLists.txt b/staging_vespalib/src/tests/trace/CMakeLists.txt index cb381733bff..9eeef16e6ea 100644 --- a/staging_vespalib/src/tests/trace/CMakeLists.txt +++ b/staging_vespalib/src/tests/trace/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_executable(staging_vespalib_trace_test_app +vespa_add_executable(staging_vespalib_trace_test_app TEST SOURCES trace.cpp DEPENDS diff --git a/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt b/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt index a9c23944575..bc5bb9194ff 100644 --- a/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt +++ b/staging_vespalib/src/tests/util/process_memory_stats/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_executable(staging_vespalib_process_memory_stats_test_app +vespa_add_executable(staging_vespalib_process_memory_stats_test_app TEST SOURCES process_memory_stats_test.cpp DEPENDS diff --git a/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt b/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt index 9d351cec4d9..ce7c040163c 100644 --- a/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt +++ b/staging_vespalib/src/tests/xmlserializable/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_executable(staging_vespalib_xmlserializable_test_app +vespa_add_executable(staging_vespalib_xmlserializable_test_app TEST SOURCES xmlserializabletest.cpp DEPENDS diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index eb5665760c4..b211d196160 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -85,8 +85,7 @@ config-bundle-jar-with-dependencies.jar, config-model-api-jar-with-dependencies.jar, config-model-jar-with-dependencies.jar, - container-disc-jar-with-dependencies.jar, - vespajlib.jar + container-disc-jar-with-dependencies.jar </discPreInstallBundle> <bundleActivator>com.yahoo.container.standalone.StandaloneContainerActivator</bundleActivator> <jdiscPrivilegedActivator>true</jdiscPrivilegedActivator> diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt index 894ea7b4d25..03fbefed448 100644 --- a/storage/src/tests/CMakeLists.txt +++ b/storage/src/tests/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_executable(storage_testrunner_app +vespa_add_executable(storage_testrunner_app TEST SOURCES testrunner.cpp DEPENDS diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt index 60e130c003c..fde0eb6ac3d 100644 --- a/storage/src/tests/visiting/CMakeLists.txt +++ b/storage/src/tests/visiting/CMakeLists.txt @@ -8,4 +8,5 @@ vespa_add_library(storage_testvisiting DEPENDS AFTER storage_storageconfig + storage_visitor ) diff --git a/storageapi/src/tests/CMakeLists.txt b/storageapi/src/tests/CMakeLists.txt index eeeb701f8b5..2d98f06456d 100644 --- a/storageapi/src/tests/CMakeLists.txt +++ b/storageapi/src/tests/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_executable(storageapi_testrunner_app +vespa_add_executable(storageapi_testrunner_app TEST SOURCES testrunner.cpp DEPENDS diff --git a/storageframework/src/tests/CMakeLists.txt b/storageframework/src/tests/CMakeLists.txt index 863d5381d20..47a0a7bcc6e 100644 --- a/storageframework/src/tests/CMakeLists.txt +++ b/storageframework/src/tests/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_executable(storageframework_testrunner_app +vespa_add_executable(storageframework_testrunner_app TEST SOURCES testrunner.cpp DEPENDS diff --git a/storageserver/src/tests/CMakeLists.txt b/storageserver/src/tests/CMakeLists.txt index b735716c705..5074c434bd8 100644 --- a/storageserver/src/tests/CMakeLists.txt +++ b/storageserver/src/tests/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_executable(storageserver_testrunner_app +vespa_add_executable(storageserver_testrunner_app TEST SOURCES storageservertest.cpp testhelper.cpp 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/streamingvisitors/src/tests/hitcollector/CMakeLists.txt b/streamingvisitors/src/tests/hitcollector/CMakeLists.txt index 62c481e13a7..074f6bfdf38 100644 --- a/streamingvisitors/src/tests/hitcollector/CMakeLists.txt +++ b/streamingvisitors/src/tests/hitcollector/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_executable(streamingvisitors_hitcollector_test_app +vespa_add_executable(streamingvisitors_hitcollector_test_app TEST SOURCES hitcollector.cpp DEPENDS diff --git a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt b/streamingvisitors/src/tests/querywrapper/CMakeLists.txt index 501b1eee1a9..38a419e0c02 100644 --- a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt +++ b/streamingvisitors/src/tests/querywrapper/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_executable(streamingvisitors_querywrapper_test_app +vespa_add_executable(streamingvisitors_querywrapper_test_app TEST SOURCES querywrapper.cpp DEPENDS diff --git a/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt b/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt index 83abfde144a..d3251bac1df 100644 --- a/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt +++ b/streamingvisitors/src/tests/searchvisitor/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_executable(streamingvisitors_searchvisitor_test_app +vespa_add_executable(streamingvisitors_searchvisitor_test_app TEST SOURCES searchvisitor.cpp DEPENDS diff --git a/valgrind-suppressions.txt b/valgrind-suppressions.txt index 1f04263fe99..92954b39f92 100644 --- a/valgrind-suppressions.txt +++ b/valgrind-suppressions.txt @@ -21,7 +21,19 @@ fun:_Znwm fun:*addTestsToSuite*CppUnit*TestSuiteBuilderContextBase* } - +{ + Bug in cppunit. This suppression is created on CentOS7. + Memcheck:Leak + match-leak-kinds: definite + fun:_Znwm + fun:addTestsToSuite + fun:suite + fun:*makeTest* + fun:_ZN7CppUnit19TestFactoryRegistry14addTestToSuiteEPNS_9TestSuiteE + fun:_ZN7CppUnit19TestFactoryRegistry8makeTestEv + fun:_ZN10vdstestlib17CppUnitTestRunner3runEiPKPKc + fun:main +} { RHEL6 strlen is eager and will read 16 bytes blocks. Memcheck:Cond @@ -267,14 +279,23 @@ fun:_ZN26FastOS_UNIX_DynamicLibrary4OpenEPKc } { - This supresses a bug in valgrind-3.10.1. It is fixed in version 3.11.0. + This supresses a bug in valgrind-3.10.1. It is fixed in version 3.11.0. (http://permalink.gmane.org/gmane.comp.kde.devel.bugs/1594999) Memcheck:Leak match-leak-kinds: possible fun:_Znwm fun:_ZNSs4_Rep9_S_createEmmRKSaIcE fun:_ZNSs12_S_constructIPKcEEPcT_S3_RKSaIcESt20forward_iterator_tag fun:_ZNSsC1EPKcRKSaIcE + obj:/usr/lib64/llvm/libLLVM-3.4.so + ... +} +{ + This supresses a bug in valgrind-3.10.1. It is fixed in version 3.11.0. (http://permalink.gmane.org/gmane.comp.kde.devel.bugs/1594999) + Memcheck:Leak + match-leak-kinds: possible + fun:_Znwm + fun:_ZNSs4_Rep9_S_createEmmRKSaIcE + ... fun:__static_initialization_and_destruction_0 - fun:_GLOBAL__sub_I_unix_dynamiclibrary.cpp - fun:_dl_init + ... } diff --git a/vbench/src/tests/app_dumpurl/CMakeLists.txt b/vbench/src/tests/app_dumpurl/CMakeLists.txt index 2ff66e4edcd..d75aa9595f4 100644 --- a/vbench/src/tests/app_dumpurl/CMakeLists.txt +++ b/vbench/src/tests/app_dumpurl/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_executable(vbench_app_dumpurl_test_app +vespa_add_executable(vbench_app_dumpurl_test_app TEST SOURCES app_dumpurl_test.cpp DEPENDS diff --git a/vbench/src/tests/app_vbench/CMakeLists.txt b/vbench/src/tests/app_vbench/CMakeLists.txt index 6295571cc09..c8970393a60 100644 --- a/vbench/src/tests/app_vbench/CMakeLists.txt +++ b/vbench/src/tests/app_vbench/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_executable(vbench_app_vbench_test_app +vespa_add_executable(vbench_app_vbench_test_app TEST SOURCES app_vbench_test.cpp DEPENDS diff --git a/vbench/src/tests/benchmark_headers/CMakeLists.txt b/vbench/src/tests/benchmark_headers/CMakeLists.txt index ab8f0bce02e..4d2a3d53247 100644 --- a/vbench/src/tests/benchmark_headers/CMakeLists.txt +++ b/vbench/src/tests/benchmark_headers/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_executable(vbench_benchmark_headers_test_app +vespa_add_executable(vbench_benchmark_headers_test_app TEST SOURCES benchmark_headers_test.cpp DEPENDS diff --git a/vbench/src/tests/buffered_output/CMakeLists.txt b/vbench/src/tests/buffered_output/CMakeLists.txt index 7dfc6c326a7..c9c3386b0e4 100644 --- a/vbench/src/tests/buffered_output/CMakeLists.txt +++ b/vbench/src/tests/buffered_output/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_executable(vbench_buffered_output_test_app +vespa_add_executable(vbench_buffered_output_test_app TEST SOURCES buffered_output_test.cpp DEPENDS diff --git a/vbench/src/tests/byte_input/CMakeLists.txt b/vbench/src/tests/byte_input/CMakeLists.txt index 5838ed58d76..3c946c223b6 100644 --- a/vbench/src/tests/byte_input/CMakeLists.txt +++ b/vbench/src/tests/byte_input/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_executable(vbench_byte_input_test_app +vespa_add_executable(vbench_byte_input_test_app TEST SOURCES byte_input_test.cpp DEPENDS diff --git a/vbench/src/tests/dispatcher/CMakeLists.txt b/vbench/src/tests/dispatcher/CMakeLists.txt index 0cdc9ffb2d3..de021c35f1d 100644 --- a/vbench/src/tests/dispatcher/CMakeLists.txt +++ b/vbench/src/tests/dispatcher/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_executable(vbench_dispatcher_test_app +vespa_add_executable(vbench_dispatcher_test_app TEST SOURCES dispatcher_test.cpp DEPENDS diff --git a/vbench/src/tests/dropped_tagger/CMakeLists.txt b/vbench/src/tests/dropped_tagger/CMakeLists.txt index 2fc41839d5d..6e2e3e96c92 100644 --- a/vbench/src/tests/dropped_tagger/CMakeLists.txt +++ b/vbench/src/tests/dropped_tagger/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_executable(vbench_dropped_tagger_test_app +vespa_add_executable(vbench_dropped_tagger_test_app TEST SOURCES dropped_tagger_test.cpp DEPENDS diff --git a/vbench/src/tests/handler_thread/CMakeLists.txt b/vbench/src/tests/handler_thread/CMakeLists.txt index ee69cc594de..92fcee0399e 100644 --- a/vbench/src/tests/handler_thread/CMakeLists.txt +++ b/vbench/src/tests/handler_thread/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_executable(vbench_handler_thread_test_app +vespa_add_executable(vbench_handler_thread_test_app TEST SOURCES handler_thread_test.cpp DEPENDS diff --git a/vbench/src/tests/hex_number/CMakeLists.txt b/vbench/src/tests/hex_number/CMakeLists.txt index 37875434e5e..ed19d720b73 100644 --- a/vbench/src/tests/hex_number/CMakeLists.txt +++ b/vbench/src/tests/hex_number/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_executable(vbench_hex_number_test_app +vespa_add_executable(vbench_hex_number_test_app TEST SOURCES hex_number_test.cpp DEPENDS diff --git a/vbench/src/tests/http_client/CMakeLists.txt b/vbench/src/tests/http_client/CMakeLists.txt index 3a01f9712a3..6c6ceaaebbc 100644 --- a/vbench/src/tests/http_client/CMakeLists.txt +++ b/vbench/src/tests/http_client/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_executable(vbench_http_client_test_app +vespa_add_executable(vbench_http_client_test_app TEST SOURCES http_client_test.cpp DEPENDS diff --git a/vbench/src/tests/http_connection/CMakeLists.txt b/vbench/src/tests/http_connection/CMakeLists.txt index 8d33e8fb1e3..fc24e9a3dda 100644 --- a/vbench/src/tests/http_connection/CMakeLists.txt +++ b/vbench/src/tests/http_connection/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_executable(vbench_http_connection_test_app +vespa_add_executable(vbench_http_connection_test_app TEST SOURCES http_connection_test.cpp DEPENDS diff --git a/vbench/src/tests/http_connection_pool/CMakeLists.txt b/vbench/src/tests/http_connection_pool/CMakeLists.txt index 6ebac01b954..b22598a5eda 100644 --- a/vbench/src/tests/http_connection_pool/CMakeLists.txt +++ b/vbench/src/tests/http_connection_pool/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_executable(vbench_http_connection_pool_test_app +vespa_add_executable(vbench_http_connection_pool_test_app TEST SOURCES http_connection_pool_test.cpp DEPENDS diff --git a/vbench/src/tests/input_file_reader/CMakeLists.txt b/vbench/src/tests/input_file_reader/CMakeLists.txt index ac4ded756f9..cf565282337 100644 --- a/vbench/src/tests/input_file_reader/CMakeLists.txt +++ b/vbench/src/tests/input_file_reader/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_executable(vbench_input_file_reader_test_app +vespa_add_executable(vbench_input_file_reader_test_app TEST SOURCES input_file_reader_test.cpp DEPENDS diff --git a/vbench/src/tests/latency_analyzer/CMakeLists.txt b/vbench/src/tests/latency_analyzer/CMakeLists.txt index 01fbb5c3d5c..035744b1f18 100644 --- a/vbench/src/tests/latency_analyzer/CMakeLists.txt +++ b/vbench/src/tests/latency_analyzer/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_executable(vbench_latency_analyzer_test_app +vespa_add_executable(vbench_latency_analyzer_test_app TEST SOURCES latency_analyzer_test.cpp DEPENDS diff --git a/vbench/src/tests/line_reader/CMakeLists.txt b/vbench/src/tests/line_reader/CMakeLists.txt index 5235d4dfe12..2d610f1a6e3 100644 --- a/vbench/src/tests/line_reader/CMakeLists.txt +++ b/vbench/src/tests/line_reader/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_executable(vbench_line_reader_test_app +vespa_add_executable(vbench_line_reader_test_app TEST SOURCES line_reader_test.cpp DEPENDS diff --git a/vbench/src/tests/mapped_file_input/CMakeLists.txt b/vbench/src/tests/mapped_file_input/CMakeLists.txt index de7cbb7c89d..35132ae5845 100644 --- a/vbench/src/tests/mapped_file_input/CMakeLists.txt +++ b/vbench/src/tests/mapped_file_input/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_executable(vbench_mapped_file_input_test_app +vespa_add_executable(vbench_mapped_file_input_test_app TEST SOURCES mapped_file_input_test.cpp DEPENDS diff --git a/vbench/src/tests/memory/CMakeLists.txt b/vbench/src/tests/memory/CMakeLists.txt index bcdaf55f4a1..c2dc5b45306 100644 --- a/vbench/src/tests/memory/CMakeLists.txt +++ b/vbench/src/tests/memory/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_executable(vbench_memory_test_app +vespa_add_executable(vbench_memory_test_app TEST SOURCES memory_test.cpp DEPENDS diff --git a/vbench/src/tests/qps_analyzer/CMakeLists.txt b/vbench/src/tests/qps_analyzer/CMakeLists.txt index b4167511665..dce9b81f73f 100644 --- a/vbench/src/tests/qps_analyzer/CMakeLists.txt +++ b/vbench/src/tests/qps_analyzer/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_executable(vbench_qps_analyzer_test_app +vespa_add_executable(vbench_qps_analyzer_test_app TEST SOURCES qps_analyzer_test.cpp DEPENDS diff --git a/vbench/src/tests/qps_tagger/CMakeLists.txt b/vbench/src/tests/qps_tagger/CMakeLists.txt index 2538de07b8f..8b77947fac9 100644 --- a/vbench/src/tests/qps_tagger/CMakeLists.txt +++ b/vbench/src/tests/qps_tagger/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_executable(vbench_qps_tagger_test_app +vespa_add_executable(vbench_qps_tagger_test_app TEST SOURCES qps_tagger_test.cpp DEPENDS diff --git a/vbench/src/tests/request_dumper/CMakeLists.txt b/vbench/src/tests/request_dumper/CMakeLists.txt index 08cd6f12ebe..96841442bff 100644 --- a/vbench/src/tests/request_dumper/CMakeLists.txt +++ b/vbench/src/tests/request_dumper/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_executable(vbench_request_dumper_test_app +vespa_add_executable(vbench_request_dumper_test_app TEST SOURCES request_dumper_test.cpp DEPENDS diff --git a/vbench/src/tests/request_generator/CMakeLists.txt b/vbench/src/tests/request_generator/CMakeLists.txt index a59029055d0..b9fb23beb88 100644 --- a/vbench/src/tests/request_generator/CMakeLists.txt +++ b/vbench/src/tests/request_generator/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_executable(vbench_request_generator_test_app +vespa_add_executable(vbench_request_generator_test_app TEST SOURCES request_generator_test.cpp DEPENDS diff --git a/vbench/src/tests/request_sink/CMakeLists.txt b/vbench/src/tests/request_sink/CMakeLists.txt index 4b184c25f91..a327f4376c5 100644 --- a/vbench/src/tests/request_sink/CMakeLists.txt +++ b/vbench/src/tests/request_sink/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_executable(vbench_request_sink_test_app +vespa_add_executable(vbench_request_sink_test_app TEST SOURCES request_sink_test.cpp DEPENDS diff --git a/vbench/src/tests/server_socket/CMakeLists.txt b/vbench/src/tests/server_socket/CMakeLists.txt index 1077d7d0525..ac76763ae16 100644 --- a/vbench/src/tests/server_socket/CMakeLists.txt +++ b/vbench/src/tests/server_socket/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_executable(vbench_server_socket_test_app +vespa_add_executable(vbench_server_socket_test_app TEST SOURCES server_socket_test.cpp DEPENDS diff --git a/vbench/src/tests/server_spec/CMakeLists.txt b/vbench/src/tests/server_spec/CMakeLists.txt index a43d2c80dde..1f570bbf114 100644 --- a/vbench/src/tests/server_spec/CMakeLists.txt +++ b/vbench/src/tests/server_spec/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_executable(vbench_server_spec_test_app +vespa_add_executable(vbench_server_spec_test_app TEST SOURCES server_spec_test.cpp DEPENDS diff --git a/vbench/src/tests/server_tagger/CMakeLists.txt b/vbench/src/tests/server_tagger/CMakeLists.txt index d7cc0bdbea9..0b7b8a63e02 100644 --- a/vbench/src/tests/server_tagger/CMakeLists.txt +++ b/vbench/src/tests/server_tagger/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_executable(vbench_server_tagger_test_app +vespa_add_executable(vbench_server_tagger_test_app TEST SOURCES server_tagger_test.cpp DEPENDS diff --git a/vbench/src/tests/simple_buffer/CMakeLists.txt b/vbench/src/tests/simple_buffer/CMakeLists.txt index dd8da993c0b..97ce39faa4e 100644 --- a/vbench/src/tests/simple_buffer/CMakeLists.txt +++ b/vbench/src/tests/simple_buffer/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_executable(vbench_simple_buffer_test_app +vespa_add_executable(vbench_simple_buffer_test_app TEST SOURCES simple_buffer_test.cpp DEPENDS diff --git a/vbench/src/tests/socket/CMakeLists.txt b/vbench/src/tests/socket/CMakeLists.txt index 6ede77e5d63..543fd20466e 100644 --- a/vbench/src/tests/socket/CMakeLists.txt +++ b/vbench/src/tests/socket/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_executable(vbench_socket_test_app +vespa_add_executable(vbench_socket_test_app TEST SOURCES socket_test.cpp DEPENDS diff --git a/vbench/src/tests/taint/CMakeLists.txt b/vbench/src/tests/taint/CMakeLists.txt index 7dd23e62020..c581aa0b0c0 100644 --- a/vbench/src/tests/taint/CMakeLists.txt +++ b/vbench/src/tests/taint/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_executable(vbench_taint_test_app +vespa_add_executable(vbench_taint_test_app TEST SOURCES taint_test.cpp DEPENDS diff --git a/vbench/src/tests/time_queue/CMakeLists.txt b/vbench/src/tests/time_queue/CMakeLists.txt index a87a4c1982e..ea9df3cb12b 100644 --- a/vbench/src/tests/time_queue/CMakeLists.txt +++ b/vbench/src/tests/time_queue/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_executable(vbench_time_queue_test_app +vespa_add_executable(vbench_time_queue_test_app TEST SOURCES time_queue_test.cpp DEPENDS diff --git a/vbench/src/tests/timer/CMakeLists.txt b/vbench/src/tests/timer/CMakeLists.txt index fc50c222ba0..2e53358da47 100644 --- a/vbench/src/tests/timer/CMakeLists.txt +++ b/vbench/src/tests/timer/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_executable(vbench_timer_test_app +vespa_add_executable(vbench_timer_test_app TEST SOURCES timer_test.cpp DEPENDS diff --git a/vbench/src/tests/writable_memory/CMakeLists.txt b/vbench/src/tests/writable_memory/CMakeLists.txt index 4011ee64f63..8b480ff05af 100644 --- a/vbench/src/tests/writable_memory/CMakeLists.txt +++ b/vbench/src/tests/writable_memory/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_executable(vbench_writable_memory_test_app +vespa_add_executable(vbench_writable_memory_test_app TEST SOURCES writable_memory_test.cpp DEPENDS 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/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt index 484ea533ccc..b5af2f05501 100644 --- a/vdslib/src/tests/CMakeLists.txt +++ b/vdslib/src/tests/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_executable(vdslib_testrunner_app +vespa_add_executable(vdslib_testrunner_app TEST SOURCES testrunner.cpp DEPENDS diff --git a/vdstestlib/src/tests/cppunit/CMakeLists.txt b/vdstestlib/src/tests/cppunit/CMakeLists.txt index 01356972a56..190ef213ca1 100644 --- a/vdstestlib/src/tests/cppunit/CMakeLists.txt +++ b/vdstestlib/src/tests/cppunit/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_executable(vdstestlib_testrunner_app +vespa_add_executable(vdstestlib_testrunner_app TEST SOURCES testrunner.cpp cppunittest.cpp diff --git a/vdstestlib/src/tests/dirconfig/CMakeLists.txt b/vdstestlib/src/tests/dirconfig/CMakeLists.txt index 1cd06c06930..12248715749 100644 --- a/vdstestlib/src/tests/dirconfig/CMakeLists.txt +++ b/vdstestlib/src/tests/dirconfig/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_executable(vdstestlib_dirconfig_test_app +vespa_add_executable(vdstestlib_dirconfig_test_app TEST SOURCES dirconfigtest.cpp DEPENDS 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/CMakeLists.txt b/vespabase/CMakeLists.txt index 3519ad9274e..def88408fd5 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -35,3 +35,5 @@ vespa_install_script(src/vespa-start-configserver.sh vespa-start-configserver bi vespa_install_script(src/vespa-start-services.sh vespa-start-services bin) vespa_install_script(src/vespa-stop-configserver.sh vespa-stop-configserver bin) vespa_install_script(src/vespa-stop-services.sh vespa-stop-services bin) + +install(FILES src/Defaults.pm DESTINATION lib/perl5/site_perl/Yahoo/Vespa) 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt index 610ec0fb3a6..e4c9ab27225 100644 --- a/vespalib/CMakeLists.txt +++ b/vespalib/CMakeLists.txt @@ -5,7 +5,7 @@ vespa_define_module( vespalog EXTERNAL_DEPENDS - LLVM + LLVM-3.4 APPS src/apps/eval_expr 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/vespalib/src/tests/alignedmemory/CMakeLists.txt b/vespalib/src/tests/alignedmemory/CMakeLists.txt index 685705b0761..716720e6346 100644 --- a/vespalib/src/tests/alignedmemory/CMakeLists.txt +++ b/vespalib/src/tests/alignedmemory/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_executable(vespalib_alignedmemory_test_app +vespa_add_executable(vespalib_alignedmemory_test_app TEST SOURCES alignedmemory_test.cpp DEPENDS diff --git a/vespalib/src/tests/alloc/CMakeLists.txt b/vespalib/src/tests/alloc/CMakeLists.txt index 9b1a2493dce..b9f686363c9 100644 --- a/vespalib/src/tests/alloc/CMakeLists.txt +++ b/vespalib/src/tests/alloc/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_executable(vespalib_alloc_test_app +vespa_add_executable(vespalib_alloc_test_app TEST SOURCES alloc_test.cpp DEPENDS diff --git a/vespalib/src/tests/approx/CMakeLists.txt b/vespalib/src/tests/approx/CMakeLists.txt index e58117c0761..ef638beade8 100644 --- a/vespalib/src/tests/approx/CMakeLists.txt +++ b/vespalib/src/tests/approx/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_executable(vespalib_approx_test_app +vespa_add_executable(vespalib_approx_test_app TEST SOURCES approx_test.cpp DEPENDS diff --git a/vespalib/src/tests/array/CMakeLists.txt b/vespalib/src/tests/array/CMakeLists.txt index 28ebedecba0..e29e7e90796 100644 --- a/vespalib/src/tests/array/CMakeLists.txt +++ b/vespalib/src/tests/array/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_executable(vespalib_array_test_app +vespa_add_executable(vespalib_array_test_app TEST SOURCES array_test.cpp DEPENDS diff --git a/vespalib/src/tests/arrayqueue/CMakeLists.txt b/vespalib/src/tests/arrayqueue/CMakeLists.txt index 57fd14dc536..9e9dcd59526 100644 --- a/vespalib/src/tests/arrayqueue/CMakeLists.txt +++ b/vespalib/src/tests/arrayqueue/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_executable(vespalib_arrayqueue_test_app +vespa_add_executable(vespalib_arrayqueue_test_app TEST SOURCES arrayqueue.cpp DEPENDS diff --git a/vespalib/src/tests/atomic/CMakeLists.txt b/vespalib/src/tests/atomic/CMakeLists.txt index c7cffde606c..b66413c1fa3 100644 --- a/vespalib/src/tests/atomic/CMakeLists.txt +++ b/vespalib/src/tests/atomic/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_executable(vespalib_atomic_test_app +vespa_add_executable(vespalib_atomic_test_app TEST SOURCES atomic_test.cpp DEPENDS diff --git a/vespalib/src/tests/barrier/CMakeLists.txt b/vespalib/src/tests/barrier/CMakeLists.txt index db0e98b04c5..42d41c140e4 100644 --- a/vespalib/src/tests/barrier/CMakeLists.txt +++ b/vespalib/src/tests/barrier/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_executable(vespalib_barrier_test_app +vespa_add_executable(vespalib_barrier_test_app TEST SOURCES barrier_test.cpp DEPENDS diff --git a/vespalib/src/tests/box/CMakeLists.txt b/vespalib/src/tests/box/CMakeLists.txt index c115383fcd2..a8df84f5cc1 100644 --- a/vespalib/src/tests/box/CMakeLists.txt +++ b/vespalib/src/tests/box/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_executable(vespalib_box_test_app +vespa_add_executable(vespalib_box_test_app TEST SOURCES box_test.cpp DEPENDS diff --git a/vespalib/src/tests/closure/CMakeLists.txt b/vespalib/src/tests/closure/CMakeLists.txt index 174c1e8700b..cf744fc3bd9 100644 --- a/vespalib/src/tests/closure/CMakeLists.txt +++ b/vespalib/src/tests/closure/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespalib_closure_test_app +vespa_add_executable(vespalib_closure_test_app TEST SOURCES closure_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_closure_test_app COMMAND vespalib_closure_test_app) -vespa_add_executable(vespalib_autoclosurecaller_test_app +vespa_add_executable(vespalib_autoclosurecaller_test_app TEST SOURCES autoclosurecaller_test.cpp DEPENDS diff --git a/vespalib/src/tests/component/CMakeLists.txt b/vespalib/src/tests/component/CMakeLists.txt index 0f30f398db2..5a0c46b27bc 100644 --- a/vespalib/src/tests/component/CMakeLists.txt +++ b/vespalib/src/tests/component/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_executable(vespalib_component_test_app +vespa_add_executable(vespalib_component_test_app TEST SOURCES component.cpp DEPENDS diff --git a/vespalib/src/tests/compress/CMakeLists.txt b/vespalib/src/tests/compress/CMakeLists.txt index eb6c403f1d9..5988ba94840 100644 --- a/vespalib/src/tests/compress/CMakeLists.txt +++ b/vespalib/src/tests/compress/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_executable(vespalib_compress_test_app +vespa_add_executable(vespalib_compress_test_app TEST SOURCES compress_test.cpp DEPENDS diff --git a/vespalib/src/tests/delegatelist/CMakeLists.txt b/vespalib/src/tests/delegatelist/CMakeLists.txt index ad7d22a2ceb..ebbfbb23830 100644 --- a/vespalib/src/tests/delegatelist/CMakeLists.txt +++ b/vespalib/src/tests/delegatelist/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_executable(vespalib_delegatelist_test_app +vespa_add_executable(vespalib_delegatelist_test_app TEST SOURCES delegatelist.cpp DEPENDS diff --git a/vespalib/src/tests/dual_merge_director/CMakeLists.txt b/vespalib/src/tests/dual_merge_director/CMakeLists.txt index 8ea80b46320..b2e9bcb941b 100644 --- a/vespalib/src/tests/dual_merge_director/CMakeLists.txt +++ b/vespalib/src/tests/dual_merge_director/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_executable(vespalib_dual_merge_director_test_app +vespa_add_executable(vespalib_dual_merge_director_test_app TEST SOURCES dual_merge_director_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/compile_cache/CMakeLists.txt b/vespalib/src/tests/eval/compile_cache/CMakeLists.txt index 7fbadc3410b..21edf07e638 100644 --- a/vespalib/src/tests/eval/compile_cache/CMakeLists.txt +++ b/vespalib/src/tests/eval/compile_cache/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_executable(vespalib_compile_cache_test_app +vespa_add_executable(vespalib_compile_cache_test_app TEST SOURCES compile_cache_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/compiled_function/CMakeLists.txt b/vespalib/src/tests/eval/compiled_function/CMakeLists.txt index 04ec6aa3df0..ca947ab6fd3 100644 --- a/vespalib/src/tests/eval/compiled_function/CMakeLists.txt +++ b/vespalib/src/tests/eval/compiled_function/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_executable(vespalib_compiled_function_test_app +vespa_add_executable(vespalib_compiled_function_test_app TEST SOURCES compiled_function_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/function/CMakeLists.txt b/vespalib/src/tests/eval/function/CMakeLists.txt index 2f1d2718a2a..7c7268eb492 100644 --- a/vespalib/src/tests/eval/function/CMakeLists.txt +++ b/vespalib/src/tests/eval/function/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_executable(vespalib_function_test_app +vespa_add_executable(vespalib_function_test_app TEST SOURCES function_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/function_speed/CMakeLists.txt b/vespalib/src/tests/eval/function_speed/CMakeLists.txt index 2c062118136..629d3dad483 100644 --- a/vespalib/src/tests/eval/function_speed/CMakeLists.txt +++ b/vespalib/src/tests/eval/function_speed/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_executable(vespalib_function_speed_test_app +vespa_add_executable(vespalib_function_speed_test_app TEST SOURCES function_speed_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/gbdt/CMakeLists.txt b/vespalib/src/tests/eval/gbdt/CMakeLists.txt index b6328900258..c68614a5911 100644 --- a/vespalib/src/tests/eval/gbdt/CMakeLists.txt +++ b/vespalib/src/tests/eval/gbdt/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_executable(vespalib_gbdt_test_app +vespa_add_executable(vespalib_gbdt_test_app TEST SOURCES gbdt_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/interpreted_function/CMakeLists.txt b/vespalib/src/tests/eval/interpreted_function/CMakeLists.txt index 0a9010dff05..09d7ce7364b 100644 --- a/vespalib/src/tests/eval/interpreted_function/CMakeLists.txt +++ b/vespalib/src/tests/eval/interpreted_function/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_executable(vespalib_interpreted_function_test_app +vespa_add_executable(vespalib_interpreted_function_test_app TEST SOURCES interpreted_function_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/node_types/CMakeLists.txt b/vespalib/src/tests/eval/node_types/CMakeLists.txt index 5aeb5aa242c..2471815fa51 100644 --- a/vespalib/src/tests/eval/node_types/CMakeLists.txt +++ b/vespalib/src/tests/eval/node_types/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_executable(vespalib_node_types_test_app +vespa_add_executable(vespalib_node_types_test_app TEST SOURCES node_types_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/simple_tensor/CMakeLists.txt b/vespalib/src/tests/eval/simple_tensor/CMakeLists.txt index 6fd9b8173be..cbd65296abc 100644 --- a/vespalib/src/tests/eval/simple_tensor/CMakeLists.txt +++ b/vespalib/src/tests/eval/simple_tensor/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_executable(vespalib_simple_tensor_test_app +vespa_add_executable(vespalib_simple_tensor_test_app TEST SOURCES simple_tensor_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/tensor/CMakeLists.txt b/vespalib/src/tests/eval/tensor/CMakeLists.txt index f5749b036f2..5a84d73f3a3 100644 --- a/vespalib/src/tests/eval/tensor/CMakeLists.txt +++ b/vespalib/src/tests/eval/tensor/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_executable(vespalib_eval_tensor_test_app +vespa_add_executable(vespalib_eval_tensor_test_app TEST SOURCES eval_tensor_test.cpp DEPENDS diff --git a/vespalib/src/tests/eval/value_type/CMakeLists.txt b/vespalib/src/tests/eval/value_type/CMakeLists.txt index 67b31834414..c6ef9f61359 100644 --- a/vespalib/src/tests/eval/value_type/CMakeLists.txt +++ b/vespalib/src/tests/eval/value_type/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_executable(vespalib_value_type_test_app +vespa_add_executable(vespalib_value_type_test_app TEST SOURCES value_type_test.cpp DEPENDS diff --git a/vespalib/src/tests/eventbarrier/CMakeLists.txt b/vespalib/src/tests/eventbarrier/CMakeLists.txt index ce50f024445..a9fbf83b847 100644 --- a/vespalib/src/tests/eventbarrier/CMakeLists.txt +++ b/vespalib/src/tests/eventbarrier/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_executable(vespalib_eventbarrier_test_app +vespa_add_executable(vespalib_eventbarrier_test_app TEST SOURCES eventbarrier.cpp DEPENDS diff --git a/vespalib/src/tests/exception_classes/CMakeLists.txt b/vespalib/src/tests/exception_classes/CMakeLists.txt index 928200be5c7..691ebc1daea 100644 --- a/vespalib/src/tests/exception_classes/CMakeLists.txt +++ b/vespalib/src/tests/exception_classes/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_executable(vespalib_exception_classes_test_app +vespa_add_executable(vespalib_exception_classes_test_app TEST SOURCES exception_classes_test.cpp DEPENDS diff --git a/vespalib/src/tests/executor/CMakeLists.txt b/vespalib/src/tests/executor/CMakeLists.txt index 5b5ab2ab169..0745c7523b1 100644 --- a/vespalib/src/tests/executor/CMakeLists.txt +++ b/vespalib/src/tests/executor/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespalib_threadstackexecutor_test_app +vespa_add_executable(vespalib_threadstackexecutor_test_app TEST SOURCES threadstackexecutor_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_threadstackexecutor_test_app COMMAND vespalib_threadstackexecutor_test_app) -vespa_add_executable(vespalib_executor_test_app +vespa_add_executable(vespalib_executor_test_app TEST SOURCES executor_test.cpp DEPENDS diff --git a/vespalib/src/tests/explore_modern_cpp/CMakeLists.txt b/vespalib/src/tests/explore_modern_cpp/CMakeLists.txt index d2406224a05..c9b6598d6c7 100644 --- a/vespalib/src/tests/explore_modern_cpp/CMakeLists.txt +++ b/vespalib/src/tests/explore_modern_cpp/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_executable(vespalib_explore_modern_cpp_test_app +vespa_add_executable(vespalib_explore_modern_cpp_test_app TEST SOURCES explore_modern_cpp_test.cpp DEPENDS diff --git a/vespalib/src/tests/fiddle/CMakeLists.txt b/vespalib/src/tests/fiddle/CMakeLists.txt index a110209846d..456396b9726 100644 --- a/vespalib/src/tests/fiddle/CMakeLists.txt +++ b/vespalib/src/tests/fiddle/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_executable(vespalib_fiddle_test_app +vespa_add_executable(vespalib_fiddle_test_app TEST SOURCES fiddle_test.cpp DEPENDS diff --git a/vespalib/src/tests/gencnt/CMakeLists.txt b/vespalib/src/tests/gencnt/CMakeLists.txt index ddacebae09f..cefdfd2e7d6 100644 --- a/vespalib/src/tests/gencnt/CMakeLists.txt +++ b/vespalib/src/tests/gencnt/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_executable(vespalib_gencnt_test_app +vespa_add_executable(vespalib_gencnt_test_app TEST SOURCES gencnt_test.cpp DEPENDS diff --git a/vespalib/src/tests/guard/CMakeLists.txt b/vespalib/src/tests/guard/CMakeLists.txt index dc4ba9fcd64..053f18843a6 100644 --- a/vespalib/src/tests/guard/CMakeLists.txt +++ b/vespalib/src/tests/guard/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_executable(vespalib_guard_test_app +vespa_add_executable(vespalib_guard_test_app TEST SOURCES guard_test.cpp DEPENDS diff --git a/vespalib/src/tests/hashmap/CMakeLists.txt b/vespalib/src/tests/hashmap/CMakeLists.txt index 78696f99454..c66e21b1118 100644 --- a/vespalib/src/tests/hashmap/CMakeLists.txt +++ b/vespalib/src/tests/hashmap/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_executable(vespalib_hashmap_test_app +vespa_add_executable(vespalib_hashmap_test_app TEST SOURCES hashmap_test.cpp DEPENDS diff --git a/vespalib/src/tests/host_name/CMakeLists.txt b/vespalib/src/tests/host_name/CMakeLists.txt index 79c2657b839..6be4faf7ffc 100644 --- a/vespalib/src/tests/host_name/CMakeLists.txt +++ b/vespalib/src/tests/host_name/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_executable(vespalib_host_name_test_app +vespa_add_executable(vespalib_host_name_test_app TEST SOURCES host_name_test.cpp DEPENDS diff --git a/vespalib/src/tests/io/fileutil/CMakeLists.txt b/vespalib/src/tests/io/fileutil/CMakeLists.txt index 2b6af2f2dce..7b0344f49b5 100644 --- a/vespalib/src/tests/io/fileutil/CMakeLists.txt +++ b/vespalib/src/tests/io/fileutil/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_executable(vespalib_fileutil_test_app +vespa_add_executable(vespalib_fileutil_test_app TEST SOURCES fileutiltest.cpp DEPENDS diff --git a/vespalib/src/tests/left_right_heap/CMakeLists.txt b/vespalib/src/tests/left_right_heap/CMakeLists.txt index 2681cfae637..ec23b97c267 100644 --- a/vespalib/src/tests/left_right_heap/CMakeLists.txt +++ b/vespalib/src/tests/left_right_heap/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_executable(vespalib_left_right_heap_test_app +vespa_add_executable(vespalib_left_right_heap_test_app TEST SOURCES left_right_heap_test.cpp DEPENDS diff --git a/vespalib/src/tests/linkedptr/CMakeLists.txt b/vespalib/src/tests/linkedptr/CMakeLists.txt index c907417e432..671ebdd1bc4 100644 --- a/vespalib/src/tests/linkedptr/CMakeLists.txt +++ b/vespalib/src/tests/linkedptr/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_executable(vespalib_linkedptr_test_app +vespa_add_executable(vespalib_linkedptr_test_app TEST SOURCES linkedptr_test.cpp DEPENDS diff --git a/vespalib/src/tests/make_fixture_macros/CMakeLists.txt b/vespalib/src/tests/make_fixture_macros/CMakeLists.txt index 3ef3d15e6c5..10d1615b0c9 100644 --- a/vespalib/src/tests/make_fixture_macros/CMakeLists.txt +++ b/vespalib/src/tests/make_fixture_macros/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_executable(vespalib_make_fixture_macros_test_app +vespa_add_executable(vespalib_make_fixture_macros_test_app TEST SOURCES make_fixture_macros_test.cpp DEPENDS diff --git a/vespalib/src/tests/memory/CMakeLists.txt b/vespalib/src/tests/memory/CMakeLists.txt index f2521f000f0..dddf58d88f2 100644 --- a/vespalib/src/tests/memory/CMakeLists.txt +++ b/vespalib/src/tests/memory/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_executable(vespalib_memory_test_app +vespa_add_executable(vespalib_memory_test_app TEST SOURCES memory_test.cpp DEPENDS diff --git a/vespalib/src/tests/net/socket/CMakeLists.txt b/vespalib/src/tests/net/socket/CMakeLists.txt index 16fce4a2453..e7ceac5dd45 100644 --- a/vespalib/src/tests/net/socket/CMakeLists.txt +++ b/vespalib/src/tests/net/socket/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_executable(vespalib_socket_test_app +vespa_add_executable(vespalib_socket_test_app TEST SOURCES socket_test.cpp DEPENDS diff --git a/vespalib/src/tests/objects/nbostream/CMakeLists.txt b/vespalib/src/tests/objects/nbostream/CMakeLists.txt index 63be798a751..1a4dcdf9271 100644 --- a/vespalib/src/tests/objects/nbostream/CMakeLists.txt +++ b/vespalib/src/tests/objects/nbostream/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_executable(vespalib_nbostream_test_app +vespa_add_executable(vespalib_nbostream_test_app TEST SOURCES nbostream_test.cpp DEPENDS diff --git a/vespalib/src/tests/optimized/CMakeLists.txt b/vespalib/src/tests/optimized/CMakeLists.txt index 627a3ceb77c..e4ff19d8cb0 100644 --- a/vespalib/src/tests/optimized/CMakeLists.txt +++ b/vespalib/src/tests/optimized/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_executable(vespalib_optimized_test_app +vespa_add_executable(vespalib_optimized_test_app TEST SOURCES optimized_test.cpp DEPENDS diff --git a/vespalib/src/tests/placement-delete/CMakeLists.txt b/vespalib/src/tests/placement-delete/CMakeLists.txt index 289d5331a14..74c4a431958 100644 --- a/vespalib/src/tests/placement-delete/CMakeLists.txt +++ b/vespalib/src/tests/placement-delete/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_executable(vespalib_placement-delete_test_app +vespa_add_executable(vespalib_placement-delete_test_app TEST SOURCES placement-delete.cpp DEPENDS diff --git a/vespalib/src/tests/printable/CMakeLists.txt b/vespalib/src/tests/printable/CMakeLists.txt index 3aedbe7c011..dfdd0cd7b63 100644 --- a/vespalib/src/tests/printable/CMakeLists.txt +++ b/vespalib/src/tests/printable/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_executable(vespalib_printabletest_app +vespa_add_executable(vespalib_printabletest_app TEST SOURCES printabletest.cpp DEPENDS diff --git a/vespalib/src/tests/priority_queue/CMakeLists.txt b/vespalib/src/tests/priority_queue/CMakeLists.txt index cd564bab0a1..f516e9f9e03 100644 --- a/vespalib/src/tests/priority_queue/CMakeLists.txt +++ b/vespalib/src/tests/priority_queue/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_executable(vespalib_priority_queue_test_app +vespa_add_executable(vespalib_priority_queue_test_app TEST SOURCES priority_queue_test.cpp DEPENDS diff --git a/vespalib/src/tests/random/CMakeLists.txt b/vespalib/src/tests/random/CMakeLists.txt index 52c25dbdf07..d46faa7688c 100644 --- a/vespalib/src/tests/random/CMakeLists.txt +++ b/vespalib/src/tests/random/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_executable(vespalib_random_test_app +vespa_add_executable(vespalib_random_test_app TEST SOURCES random_test.cpp DEPENDS diff --git a/vespalib/src/tests/referencecounter/CMakeLists.txt b/vespalib/src/tests/referencecounter/CMakeLists.txt index 4a259f9a4d3..f1ae8ddca0e 100644 --- a/vespalib/src/tests/referencecounter/CMakeLists.txt +++ b/vespalib/src/tests/referencecounter/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_executable(vespalib_referencecounter_test_app +vespa_add_executable(vespalib_referencecounter_test_app TEST SOURCES referencecounter_test.cpp DEPENDS diff --git a/vespalib/src/tests/regex/CMakeLists.txt b/vespalib/src/tests/regex/CMakeLists.txt index a1fcc2c5bdf..1555e646948 100644 --- a/vespalib/src/tests/regex/CMakeLists.txt +++ b/vespalib/src/tests/regex/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_executable(vespalib_regex_test_app +vespa_add_executable(vespalib_regex_test_app TEST SOURCES regex.cpp DEPENDS diff --git a/vespalib/src/tests/rendezvous/CMakeLists.txt b/vespalib/src/tests/rendezvous/CMakeLists.txt index f99ff6ab175..9687ce86e56 100644 --- a/vespalib/src/tests/rendezvous/CMakeLists.txt +++ b/vespalib/src/tests/rendezvous/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_executable(vespalib_rendezvous_test_app +vespa_add_executable(vespalib_rendezvous_test_app TEST SOURCES rendezvous_test.cpp DEPENDS diff --git a/vespalib/src/tests/runnable_pair/CMakeLists.txt b/vespalib/src/tests/runnable_pair/CMakeLists.txt index 15374cd7993..f5fb8509d30 100644 --- a/vespalib/src/tests/runnable_pair/CMakeLists.txt +++ b/vespalib/src/tests/runnable_pair/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_executable(vespalib_runnable_pair_test_app +vespa_add_executable(vespalib_runnable_pair_test_app TEST SOURCES runnable_pair_test.cpp DEPENDS diff --git a/vespalib/src/tests/rwlock/CMakeLists.txt b/vespalib/src/tests/rwlock/CMakeLists.txt index bc769c78c3d..19214dbc7ae 100644 --- a/vespalib/src/tests/rwlock/CMakeLists.txt +++ b/vespalib/src/tests/rwlock/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_executable(vespalib_rwlock_test_app +vespa_add_executable(vespalib_rwlock_test_app TEST SOURCES rwlock_test.cpp DEPENDS diff --git a/vespalib/src/tests/sha1/CMakeLists.txt b/vespalib/src/tests/sha1/CMakeLists.txt index 17f2fd40072..0dba1ebc6db 100644 --- a/vespalib/src/tests/sha1/CMakeLists.txt +++ b/vespalib/src/tests/sha1/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_executable(vespalib_sha1_test_app +vespa_add_executable(vespalib_sha1_test_app TEST SOURCES sha1_test.cpp rfc_sha1.cpp diff --git a/vespalib/src/tests/sharedptr/CMakeLists.txt b/vespalib/src/tests/sharedptr/CMakeLists.txt index 78684d3ad51..c3b59b9bbf8 100644 --- a/vespalib/src/tests/sharedptr/CMakeLists.txt +++ b/vespalib/src/tests/sharedptr/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_executable(vespalib_ptrholder_test_app +vespa_add_executable(vespalib_ptrholder_test_app TEST SOURCES ptrholder.cpp DEPENDS diff --git a/vespalib/src/tests/signalhandler/CMakeLists.txt b/vespalib/src/tests/signalhandler/CMakeLists.txt index 20339d16ebe..5dddc1b96ee 100644 --- a/vespalib/src/tests/signalhandler/CMakeLists.txt +++ b/vespalib/src/tests/signalhandler/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_executable(vespalib_signalhandler_test_app +vespa_add_executable(vespalib_signalhandler_test_app TEST SOURCES signalhandler_test.cpp DEPENDS diff --git a/vespalib/src/tests/simple_thread_bundle/CMakeLists.txt b/vespalib/src/tests/simple_thread_bundle/CMakeLists.txt index 7f3fbd9e014..8c9efbf4300 100644 --- a/vespalib/src/tests/simple_thread_bundle/CMakeLists.txt +++ b/vespalib/src/tests/simple_thread_bundle/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_executable(vespalib_simple_thread_bundle_test_app +vespa_add_executable(vespalib_simple_thread_bundle_test_app TEST SOURCES simple_thread_bundle_test.cpp DEPENDS diff --git a/vespalib/src/tests/slaveproc/CMakeLists.txt b/vespalib/src/tests/slaveproc/CMakeLists.txt index 7a834bc0962..b71fa00760c 100644 --- a/vespalib/src/tests/slaveproc/CMakeLists.txt +++ b/vespalib/src/tests/slaveproc/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_executable(vespalib_slaveproc_test_app +vespa_add_executable(vespalib_slaveproc_test_app TEST SOURCES slaveproc_test.cpp DEPENDS diff --git a/vespalib/src/tests/slime/CMakeLists.txt b/vespalib/src/tests/slime/CMakeLists.txt index 65d28337928..3debed06a27 100644 --- a/vespalib/src/tests/slime/CMakeLists.txt +++ b/vespalib/src/tests/slime/CMakeLists.txt @@ -1,19 +1,19 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespalib_slime_test_app +vespa_add_executable(vespalib_slime_test_app TEST SOURCES slime_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_slime_test_app COMMAND vespalib_slime_test_app) -vespa_add_executable(vespalib_slime_inject_test_app +vespa_add_executable(vespalib_slime_inject_test_app TEST SOURCES slime_inject_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_slime_inject_test_app COMMAND vespalib_slime_inject_test_app) -vespa_add_executable(vespalib_slime_binary_format_test_app +vespa_add_executable(vespalib_slime_binary_format_test_app TEST SOURCES slime_binary_format_test.cpp type_traits.cpp @@ -21,7 +21,7 @@ vespa_add_executable(vespalib_slime_binary_format_test_app vespalib ) vespa_add_test(NAME vespalib_slime_binary_format_test_app COMMAND vespalib_slime_binary_format_test_app) -vespa_add_executable(vespalib_slime_json_format_test_app +vespa_add_executable(vespalib_slime_json_format_test_app TEST SOURCES slime_json_format_test.cpp DEPENDS diff --git a/vespalib/src/tests/stash/CMakeLists.txt b/vespalib/src/tests/stash/CMakeLists.txt index 68da4f2bfbf..10049730412 100644 --- a/vespalib/src/tests/stash/CMakeLists.txt +++ b/vespalib/src/tests/stash/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_executable(vespalib_stash_test_app +vespa_add_executable(vespalib_stash_test_app TEST SOURCES stash.cpp DEPENDS diff --git a/vespalib/src/tests/stllike/CMakeLists.txt b/vespalib/src/tests/stllike/CMakeLists.txt index 2753a167f72..0d8685b2639 100644 --- a/vespalib/src/tests/stllike/CMakeLists.txt +++ b/vespalib/src/tests/stllike/CMakeLists.txt @@ -1,33 +1,33 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespalib_hash_test_app +vespa_add_executable(vespalib_hash_test_app TEST SOURCES hash_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_hash_test_app COMMAND vespalib_hash_test_app) -vespa_add_executable(vespalib_string_test_app +vespa_add_executable(vespalib_string_test_app TEST SOURCES string_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_string_test_app COMMAND vespalib_string_test_app) -vespa_add_executable(vespalib_vector_map_test_app +vespa_add_executable(vespalib_vector_map_test_app TEST SOURCES vector_map_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_vector_map_test_app COMMAND vespalib_vector_map_test_app) -vespa_add_executable(vespalib_asciistream_test_app +vespa_add_executable(vespalib_asciistream_test_app TEST SOURCES asciistream_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_asciistream_test_app COMMAND vespalib_asciistream_test_app) -vespa_add_executable(vespalib_hashtable_test_app +vespa_add_executable(vespalib_hashtable_test_app TEST SOURCES hashtable_test.cpp DEPENDS diff --git a/vespalib/src/tests/stringfmt/CMakeLists.txt b/vespalib/src/tests/stringfmt/CMakeLists.txt index 174e45545ac..e86836b7577 100644 --- a/vespalib/src/tests/stringfmt/CMakeLists.txt +++ b/vespalib/src/tests/stringfmt/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_executable(vespalib_stringfmt_test_app +vespa_add_executable(vespalib_stringfmt_test_app TEST SOURCES fmt.cpp DEPENDS diff --git a/vespalib/src/tests/sync/CMakeLists.txt b/vespalib/src/tests/sync/CMakeLists.txt index 944d9d76337..fb361c7abb8 100644 --- a/vespalib/src/tests/sync/CMakeLists.txt +++ b/vespalib/src/tests/sync/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_executable(vespalib_sync_test_app +vespa_add_executable(vespalib_sync_test_app TEST SOURCES sync_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/compact_tensor_builder/CMakeLists.txt b/vespalib/src/tests/tensor/compact_tensor_builder/CMakeLists.txt index bc6a2bfe981..b19fdf2f296 100644 --- a/vespalib/src/tests/tensor/compact_tensor_builder/CMakeLists.txt +++ b/vespalib/src/tests/tensor/compact_tensor_builder/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_executable(vespalib_compact_tensor_builder_test_app +vespa_add_executable(vespalib_compact_tensor_builder_test_app TEST SOURCES compact_tensor_builder_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/compact_tensor_v2_builder/CMakeLists.txt b/vespalib/src/tests/tensor/compact_tensor_v2_builder/CMakeLists.txt index 820db2fbc0c..978e2f9142a 100644 --- a/vespalib/src/tests/tensor/compact_tensor_v2_builder/CMakeLists.txt +++ b/vespalib/src/tests/tensor/compact_tensor_v2_builder/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_executable(vespalib_compact_tensor_v2_builder_test_app +vespa_add_executable(vespalib_compact_tensor_v2_builder_test_app TEST SOURCES compact_tensor_v2_builder_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/dense_tensor_builder/CMakeLists.txt b/vespalib/src/tests/tensor/dense_tensor_builder/CMakeLists.txt index 0be94792298..ffccbf52ec6 100644 --- a/vespalib/src/tests/tensor/dense_tensor_builder/CMakeLists.txt +++ b/vespalib/src/tests/tensor/dense_tensor_builder/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_executable(vespalib_dense_tensor_builder_test_app +vespa_add_executable(vespalib_dense_tensor_builder_test_app TEST SOURCES dense_tensor_builder_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/dense_tensor_operations/CMakeLists.txt b/vespalib/src/tests/tensor/dense_tensor_operations/CMakeLists.txt index 800ffeeccc9..2b23b2d5120 100644 --- a/vespalib/src/tests/tensor/dense_tensor_operations/CMakeLists.txt +++ b/vespalib/src/tests/tensor/dense_tensor_operations/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_executable(vespalib_dense_tensor_operations_test_app +vespa_add_executable(vespalib_dense_tensor_operations_test_app TEST SOURCES dense_tensor_operations_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/join_tensor_addresses/CMakeLists.txt b/vespalib/src/tests/tensor/join_tensor_addresses/CMakeLists.txt index c03137947fe..9b59c1de09a 100644 --- a/vespalib/src/tests/tensor/join_tensor_addresses/CMakeLists.txt +++ b/vespalib/src/tests/tensor/join_tensor_addresses/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_executable(vespalib_join_tensor_addresses_test_app +vespa_add_executable(vespalib_join_tensor_addresses_test_app TEST SOURCES join_tensor_addresses_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/simple_tensor_builder/CMakeLists.txt b/vespalib/src/tests/tensor/simple_tensor_builder/CMakeLists.txt index e41866c9589..986492a8d37 100644 --- a/vespalib/src/tests/tensor/simple_tensor_builder/CMakeLists.txt +++ b/vespalib/src/tests/tensor/simple_tensor_builder/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_executable(vespalib_simple_tensor_builder_test_app +vespa_add_executable(vespalib_simple_tensor_builder_test_app TEST SOURCES simple_tensor_builder_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor/CMakeLists.txt b/vespalib/src/tests/tensor/tensor/CMakeLists.txt index 6e76b1a322d..b6d2ae2f5ee 100644 --- a/vespalib/src/tests/tensor/tensor/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor/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_executable(vespalib_tensor_test_app +vespa_add_executable(vespalib_tensor_test_app TEST SOURCES tensor_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_address/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_address/CMakeLists.txt index ecd3bf8898b..7ea369549da 100644 --- a/vespalib/src/tests/tensor/tensor_address/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_address/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_executable(vespalib_tensor_address_test_app +vespa_add_executable(vespalib_tensor_address_test_app TEST SOURCES tensor_address_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_address_element_iterator/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_address_element_iterator/CMakeLists.txt index fd923f3ce4c..59a07942600 100644 --- a/vespalib/src/tests/tensor/tensor_address_element_iterator/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_address_element_iterator/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_executable(vespalib_tensor_address_element_iterator_test_app +vespa_add_executable(vespalib_tensor_address_element_iterator_test_app TEST SOURCES tensor_address_element_iterator_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_function/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_function/CMakeLists.txt index 944fa7d28f5..f849258d900 100644 --- a/vespalib/src/tests/tensor/tensor_function/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_function/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_executable(vespalib_tensor_function_test_app +vespa_add_executable(vespalib_tensor_function_test_app TEST SOURCES tensor_function_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_mapper/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_mapper/CMakeLists.txt index 62216540417..91e0a185a3a 100644 --- a/vespalib/src/tests/tensor/tensor_mapper/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_mapper/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_executable(vespalib_tensor_mapper_test_app +vespa_add_executable(vespalib_tensor_mapper_test_app TEST SOURCES tensor_mapper_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_operations/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_operations/CMakeLists.txt index d9d688dc82d..7bf856d388e 100644 --- a/vespalib/src/tests/tensor/tensor_operations/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_operations/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_executable(vespalib_tensor_operations_test_app +vespa_add_executable(vespalib_tensor_operations_test_app TEST SOURCES tensor_operations_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_performance/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_performance/CMakeLists.txt index cda4e309497..8dd2bc72d61 100644 --- a/vespalib/src/tests/tensor/tensor_performance/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_performance/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_executable(vespalib_tensor_performance_test_app +vespa_add_executable(vespalib_tensor_performance_test_app TEST SOURCES tensor_performance_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_serialization/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_serialization/CMakeLists.txt index cc1ff3ecc43..e0e64b12e7f 100644 --- a/vespalib/src/tests/tensor/tensor_serialization/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_serialization/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_executable(vespalib_tensor_serialization_test_app +vespa_add_executable(vespalib_tensor_serialization_test_app TEST SOURCES tensor_serialization_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt index 51e68c26d2d..e002450f280 100644 --- a/vespalib/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_slime_serialization/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_executable(vespalib_tensor_slime_serialization_test_app +vespa_add_executable(vespalib_tensor_slime_serialization_test_app TEST SOURCES tensor_slime_serialization_test.cpp DEPENDS diff --git a/vespalib/src/tests/tensor/tensor_type/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_type/CMakeLists.txt index 29f7231683c..feaa7a20c3c 100644 --- a/vespalib/src/tests/tensor/tensor_type/CMakeLists.txt +++ b/vespalib/src/tests/tensor/tensor_type/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_executable(vespalib_tensor_type_test_app +vespa_add_executable(vespalib_tensor_type_test_app TEST SOURCES tensor_type_test.cpp DEPENDS diff --git a/vespalib/src/tests/testapp-debug/CMakeLists.txt b/vespalib/src/tests/testapp-debug/CMakeLists.txt index 7102162f76f..abbb3159545 100644 --- a/vespalib/src/tests/testapp-debug/CMakeLists.txt +++ b/vespalib/src/tests/testapp-debug/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_executable(vespalib_testapp-debug_test_app +vespa_add_executable(vespalib_testapp-debug_test_app TEST SOURCES testapp-debug.cpp DEPENDS diff --git a/vespalib/src/tests/testapp-generic/CMakeLists.txt b/vespalib/src/tests/testapp-generic/CMakeLists.txt index 109af28225b..e2c63f01185 100644 --- a/vespalib/src/tests/testapp-generic/CMakeLists.txt +++ b/vespalib/src/tests/testapp-generic/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_executable(vespalib_testapp-generic_test_app +vespa_add_executable(vespalib_testapp-generic_test_app TEST SOURCES testapp-generic.cpp DEPENDS diff --git a/vespalib/src/tests/testapp-main/CMakeLists.txt b/vespalib/src/tests/testapp-main/CMakeLists.txt index 8aeb28e975d..e1bed92b86f 100644 --- a/vespalib/src/tests/testapp-main/CMakeLists.txt +++ b/vespalib/src/tests/testapp-main/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_executable(vespalib_testapp-main_test_app +vespa_add_executable(vespalib_testapp-main_test_app TEST SOURCES testapp-main_test.cpp DEPENDS diff --git a/vespalib/src/tests/testapp-state/CMakeLists.txt b/vespalib/src/tests/testapp-state/CMakeLists.txt index 0fa88d7ddd2..9fcac59d202 100644 --- a/vespalib/src/tests/testapp-state/CMakeLists.txt +++ b/vespalib/src/tests/testapp-state/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_executable(vespalib_testapp-state_test_app +vespa_add_executable(vespalib_testapp-state_test_app TEST SOURCES testapp-state.cpp DEPENDS diff --git a/vespalib/src/tests/testkit-mt/CMakeLists.txt b/vespalib/src/tests/testkit-mt/CMakeLists.txt index ad74618064a..2490fa06cac 100644 --- a/vespalib/src/tests/testkit-mt/CMakeLists.txt +++ b/vespalib/src/tests/testkit-mt/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_executable(vespalib_testkit-mt_test_app +vespa_add_executable(vespalib_testkit-mt_test_app TEST SOURCES testkit-mt_test.cpp DEPENDS diff --git a/vespalib/src/tests/testkit-subset/CMakeLists.txt b/vespalib/src/tests/testkit-subset/CMakeLists.txt index 8267a213aa7..cde1a0c5cc1 100644 --- a/vespalib/src/tests/testkit-subset/CMakeLists.txt +++ b/vespalib/src/tests/testkit-subset/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_executable(vespalib_testkit-subset_test_app +vespa_add_executable(vespalib_testkit-subset_test_app TEST SOURCES testkit-subset_test.cpp testkit-subset_extra.cpp diff --git a/vespalib/src/tests/testkit-testhook/CMakeLists.txt b/vespalib/src/tests/testkit-testhook/CMakeLists.txt index 8f5d31ba338..daeee24a9f9 100644 --- a/vespalib/src/tests/testkit-testhook/CMakeLists.txt +++ b/vespalib/src/tests/testkit-testhook/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_executable(vespalib_testkit-testhook_test_app +vespa_add_executable(vespalib_testkit-testhook_test_app TEST SOURCES testkit-testhook_test.cpp DEPENDS diff --git a/vespalib/src/tests/text/lowercase/CMakeLists.txt b/vespalib/src/tests/text/lowercase/CMakeLists.txt index 82fa2a7f1a7..7466cfe7c3e 100644 --- a/vespalib/src/tests/text/lowercase/CMakeLists.txt +++ b/vespalib/src/tests/text/lowercase/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_executable(vespalib_lowercase_test_app +vespa_add_executable(vespalib_lowercase_test_app TEST SOURCES lowercase_test.cpp DEPENDS diff --git a/vespalib/src/tests/text/stringtokenizer/CMakeLists.txt b/vespalib/src/tests/text/stringtokenizer/CMakeLists.txt index a31710b2447..571b73dab60 100644 --- a/vespalib/src/tests/text/stringtokenizer/CMakeLists.txt +++ b/vespalib/src/tests/text/stringtokenizer/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_executable(vespalib_stringtokenizer_test_app +vespa_add_executable(vespalib_stringtokenizer_test_app TEST SOURCES stringtokenizer_test.cpp DEPENDS diff --git a/vespalib/src/tests/text/utf8/CMakeLists.txt b/vespalib/src/tests/text/utf8/CMakeLists.txt index 888df5eb6dc..b9c89f7ada9 100644 --- a/vespalib/src/tests/text/utf8/CMakeLists.txt +++ b/vespalib/src/tests/text/utf8/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_executable(vespalib_utf8_test_app +vespa_add_executable(vespalib_utf8_test_app TEST SOURCES utf8_test.cpp DEPENDS diff --git a/vespalib/src/tests/thread/CMakeLists.txt b/vespalib/src/tests/thread/CMakeLists.txt index eae0fde2646..2dcb92b2579 100644 --- a/vespalib/src/tests/thread/CMakeLists.txt +++ b/vespalib/src/tests/thread/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_executable(vespalib_thread_test_app +vespa_add_executable(vespalib_thread_test_app TEST SOURCES thread_test.cpp DEPENDS diff --git a/vespalib/src/tests/time_tracker/CMakeLists.txt b/vespalib/src/tests/time_tracker/CMakeLists.txt index 504cceab892..28563a5d7e3 100644 --- a/vespalib/src/tests/time_tracker/CMakeLists.txt +++ b/vespalib/src/tests/time_tracker/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_executable(vespalib_time_tracker_test_app +vespa_add_executable(vespalib_time_tracker_test_app TEST SOURCES time_tracker_test.cpp DEPENDS diff --git a/vespalib/src/tests/trace/CMakeLists.txt b/vespalib/src/tests/trace/CMakeLists.txt index c0dbdef7ad3..c87c3f1b3a8 100644 --- a/vespalib/src/tests/trace/CMakeLists.txt +++ b/vespalib/src/tests/trace/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_executable(vespalib_trace_test_app +vespa_add_executable(vespalib_trace_test_app TEST SOURCES trace.cpp DEPENDS diff --git a/vespalib/src/tests/traits/CMakeLists.txt b/vespalib/src/tests/traits/CMakeLists.txt index 9d9280c671d..866da4ceb40 100644 --- a/vespalib/src/tests/traits/CMakeLists.txt +++ b/vespalib/src/tests/traits/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_executable(vespalib_traits_test_app +vespa_add_executable(vespalib_traits_test_app TEST SOURCES traits_test.cpp DEPENDS diff --git a/vespalib/src/tests/true/CMakeLists.txt b/vespalib/src/tests/true/CMakeLists.txt index 7042424c1c0..a1aa97460b8 100644 --- a/vespalib/src/tests/true/CMakeLists.txt +++ b/vespalib/src/tests/true/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_executable(vespalib_true_test_app +vespa_add_executable(vespalib_true_test_app TEST SOURCES true.cpp DEPENDS diff --git a/vespalib/src/tests/tutorial/CMakeLists.txt b/vespalib/src/tests/tutorial/CMakeLists.txt index d99ad20ff92..40f12c42edb 100644 --- a/vespalib/src/tests/tutorial/CMakeLists.txt +++ b/vespalib/src/tests/tutorial/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_executable(vespalib_make_tutorial_app +vespa_add_executable(vespalib_make_tutorial_app TEST SOURCES make_tutorial.cpp DEPENDS diff --git a/vespalib/src/tests/tutorial/fixtures/CMakeLists.txt b/vespalib/src/tests/tutorial/fixtures/CMakeLists.txt index 7e67f34d472..4be33e6fe56 100644 --- a/vespalib/src/tests/tutorial/fixtures/CMakeLists.txt +++ b/vespalib/src/tests/tutorial/fixtures/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_executable(vespalib_fixtures_test_app +vespa_add_executable(vespalib_fixtures_test_app TEST SOURCES fixtures_test.cpp DEPENDS diff --git a/vespalib/src/tests/tutorial/minimal/CMakeLists.txt b/vespalib/src/tests/tutorial/minimal/CMakeLists.txt index 206684d4d55..dedda165252 100644 --- a/vespalib/src/tests/tutorial/minimal/CMakeLists.txt +++ b/vespalib/src/tests/tutorial/minimal/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_executable(vespalib_minimal_test_app +vespa_add_executable(vespalib_minimal_test_app TEST SOURCES minimal_test.cpp DEPENDS diff --git a/vespalib/src/tests/tutorial/simple/CMakeLists.txt b/vespalib/src/tests/tutorial/simple/CMakeLists.txt index b23470f4758..31c069a1ee0 100644 --- a/vespalib/src/tests/tutorial/simple/CMakeLists.txt +++ b/vespalib/src/tests/tutorial/simple/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_executable(vespalib_simple_test_app +vespa_add_executable(vespalib_simple_test_app TEST SOURCES simple_test.cpp DEPENDS diff --git a/vespalib/src/tests/tutorial/threads/CMakeLists.txt b/vespalib/src/tests/tutorial/threads/CMakeLists.txt index 88898df697c..f60939ee9f6 100644 --- a/vespalib/src/tests/tutorial/threads/CMakeLists.txt +++ b/vespalib/src/tests/tutorial/threads/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_executable(vespalib_threads_test_app +vespa_add_executable(vespalib_threads_test_app TEST SOURCES threads_test.cpp DEPENDS diff --git a/vespalib/src/tests/util/generationhandler/CMakeLists.txt b/vespalib/src/tests/util/generationhandler/CMakeLists.txt index 98c0a59d006..de060996e02 100644 --- a/vespalib/src/tests/util/generationhandler/CMakeLists.txt +++ b/vespalib/src/tests/util/generationhandler/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_executable(vespalib_generationhandler_test_app +vespa_add_executable(vespalib_generationhandler_test_app TEST SOURCES generationhandler_test.cpp DEPENDS diff --git a/vespalib/src/tests/valgrind/CMakeLists.txt b/vespalib/src/tests/valgrind/CMakeLists.txt index 72643d9b7e7..69bb10cd6d6 100644 --- a/vespalib/src/tests/valgrind/CMakeLists.txt +++ b/vespalib/src/tests/valgrind/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_executable(vespalib_valgrind_test_app +vespa_add_executable(vespalib_valgrind_test_app TEST SOURCES valgrind_test.cpp DEPENDS diff --git a/vespalib/src/tests/weakref/CMakeLists.txt b/vespalib/src/tests/weakref/CMakeLists.txt index fe2a61d6586..45d6d241224 100644 --- a/vespalib/src/tests/weakref/CMakeLists.txt +++ b/vespalib/src/tests/weakref/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_executable(vespalib_weakref_test_app +vespa_add_executable(vespalib_weakref_test_app TEST SOURCES weakref_test.cpp DEPENDS diff --git a/vespalib/src/tests/websocket/CMakeLists.txt b/vespalib/src/tests/websocket/CMakeLists.txt index c74aad84692..0617b1f19f6 100644 --- a/vespalib/src/tests/websocket/CMakeLists.txt +++ b/vespalib/src/tests/websocket/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_executable(vespalib_websocket_test_app +vespa_add_executable(vespalib_websocket_test_app TEST SOURCES websocket_test.cpp DEPENDS diff --git a/vespalib/src/tests/zcurve/CMakeLists.txt b/vespalib/src/tests/zcurve/CMakeLists.txt index 14d08bbe9ba..8bc489a70d6 100644 --- a/vespalib/src/tests/zcurve/CMakeLists.txt +++ b/vespalib/src/tests/zcurve/CMakeLists.txt @@ -1,12 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespalib_zcurve_test_app +vespa_add_executable(vespalib_zcurve_test_app TEST SOURCES zcurve_test.cpp DEPENDS vespalib ) vespa_add_test(NAME vespalib_zcurve_test_app COMMAND vespalib_zcurve_test_app) -vespa_add_executable(vespalib_zcurve_ranges_test_app +vespa_add_executable(vespalib_zcurve_ranges_test_app TEST SOURCES zcurve_ranges_test.cpp DEPENDS diff --git a/vespalib/src/vespa/vespalib/util/atomic.h b/vespalib/src/vespa/vespalib/util/atomic.h index 77f1f7554ae..c9259671cae 100644 --- a/vespalib/src/vespa/vespalib/util/atomic.h +++ b/vespalib/src/vespa/vespalib/util/atomic.h @@ -67,7 +67,7 @@ public: static inline int64_t postDec(volatile int64_t *data); static inline bool cmpSwap(volatile int64_t * dest, int64_t newVal, int64_t oldVal); -#if defined(FASTOS_64BIT_LONG) +#if defined(__x86_64__) static inline bool cmpSwap(volatile long long * dest, long long newVal, long long oldVal); static inline bool cmpSwap(volatile unsigned long long * dest, unsigned long long newVal, unsigned long long oldVal); #endif @@ -75,8 +75,6 @@ public: #if defined(__x86_64__) #define VESPALIB_ATOMIC_TAGGEDPTR_ALIGNMENT __attribute__ ((aligned (16))) -#elif defined(__i386__) - #define VESPALIB_ATOMIC_TAGGEDPTR_ALIGNMENT #else #error "VESPALIB_ATOMIC_TAGGEDPTR_ALIGNMENT can not be defined." #endif diff --git a/vespalog/src/logger/CMakeLists.txt b/vespalog/src/logger/CMakeLists.txt index b2327a1327a..3e055e3b288 100644 --- a/vespalog/src/logger/CMakeLists.txt +++ b/vespalog/src/logger/CMakeLists.txt @@ -14,6 +14,7 @@ vespa_add_executable(vespalog_vlogreplay_app OUTPUT_NAME vlogreplay INSTALL bin DEPENDS + m ) vespa_add_executable(vespalog_vespa-runserver_app SOURCES diff --git a/vespalog/src/test/CMakeLists.txt b/vespalog/src/test/CMakeLists.txt index f9b2f360fa8..b50d9d60cb1 100644 --- a/vespalog/src/test/CMakeLists.txt +++ b/vespalog/src/test/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_executable(vespalog_bufferedlogtest_app +vespa_add_executable(vespalog_bufferedlogtest_app TEST SOURCES bufferedlogtest.cpp bufferedlogtest.logger1.cpp @@ -8,14 +8,14 @@ vespa_add_executable(vespalog_bufferedlogtest_app vespalog ) vespa_add_test(NAME vespalog_bufferedlogtest_app NO_VALGRIND COMMAND sh bufferedlogtest_test.sh) -vespa_add_executable(vespalog_bufferedlogskiptest_app +vespa_add_executable(vespalog_bufferedlogskiptest_app TEST SOURCES bufferedlogskiptest.cpp DEPENDS vespalog ) vespa_add_test(NAME vespalog_bufferedlogskiptest_app NO_VALGRIND COMMAND sh bufferedlogskiptest_test.sh) -vespa_add_executable(vespalog_rejectfiltertest_app +vespa_add_executable(vespalog_rejectfiltertest_app TEST SOURCES rejectfiltertest.cpp DEPENDS diff --git a/vespalog/src/test/simple/CMakeLists.txt b/vespalog/src/test/simple/CMakeLists.txt index f915772d80f..6d3821b07d8 100644 --- a/vespalog/src/test/simple/CMakeLists.txt +++ b/vespalog/src/test/simple/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_executable(vespalog_simple_test_app +vespa_add_executable(vespalog_simple_test_app TEST SOURCES logtest.cpp DEPENDS diff --git a/vespalog/src/test/threads/CMakeLists.txt b/vespalog/src/test/threads/CMakeLists.txt index 77928ed3213..f49f00115c6 100644 --- a/vespalog/src/test/threads/CMakeLists.txt +++ b/vespalog/src/test/threads/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_executable(vespalog_threads_test_app +vespa_add_executable(vespalog_threads_test_app TEST SOURCES testthreads.cpp DEPENDS 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/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt index 1dc36f8dec7..08588fa6aa6 100644 --- a/vespamalloc/src/tests/allocfree/CMakeLists.txt +++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt @@ -20,4 +20,6 @@ vespa_add_executable(vespamalloc_linklist_test_app ../../vespamalloc/malloc/allocchunk.cpp ../../vespamalloc/malloc/common.cpp $<TARGET_OBJECTS:vespamalloc_util> + DEPENDS + dl ) diff --git a/vespamalloc/src/tests/allocfree/allocfree.cpp b/vespamalloc/src/tests/allocfree/allocfree.cpp index 0f7b4d53c6f..f1ecb74754b 100644 --- a/vespamalloc/src/tests/allocfree/allocfree.cpp +++ b/vespamalloc/src/tests/allocfree/allocfree.cpp @@ -1,6 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> #include <vespa/fastos/fastos.h> +#include <vespa/log/log.h> #include <vespa/vespalib/testkit/testapp.h> #include "producerconsumer.h" #include <map> @@ -107,9 +107,9 @@ int Test::Main() { EXPECT_EQUAL(numFreeOperations, numMallocOperations); const size_t numCrossThreadMallocFreeOperations(numMallocOperations); - fprintf(stderr, "Did %" PRIu64 " Cross thread malloc/free operations\n", numCrossThreadMallocFreeOperations); - fprintf(stderr, "Did %" PRIu64 " Same thread malloc/free operations\n", numSameThreadMallocFreeOperations); - fprintf(stderr, "Did %" PRIu64 " Total operations\n", numCrossThreadMallocFreeOperations + numSameThreadMallocFreeOperations); + fprintf(stderr, "Did %lu Cross thread malloc/free operations\n", numCrossThreadMallocFreeOperations); + fprintf(stderr, "Did %lu Same thread malloc/free operations\n", numSameThreadMallocFreeOperations); + fprintf(stderr, "Did %lu Total operations\n", numCrossThreadMallocFreeOperations + numSameThreadMallocFreeOperations); TEST_DONE(); } diff --git a/vespamalloc/src/tests/allocfree/linklist.cpp b/vespamalloc/src/tests/allocfree/linklist.cpp index 5ad31d481f9..39cd237420b 100644 --- a/vespamalloc/src/tests/allocfree/linklist.cpp +++ b/vespamalloc/src/tests/allocfree/linklist.cpp @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> #include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/testapp.h> #include "producerconsumer.h" #include <vespamalloc/malloc/allocchunk.h> #include <vespamalloc/util/callstack.h> +#include <vespa/log/log.h> using vespalib::Consumer; using vespalib::Producer; @@ -169,13 +169,13 @@ int Test::Main() { FastOS_Thread::Sleep(1000); } pool.Close(); - fprintf(stderr, "Did (%" PRIu64 " + %" PRIu64 ") = %" PRIu64 " linkIn operations\n", + fprintf(stderr, "Did (%lu + %lu) = %lu linkIn operations\n", c1.operations(), c2.operations(), c1.operations() + c2.operations()); - fprintf(stderr, "Did (%" PRIu64 " + %" PRIu64 ") = %" PRIu64 " linkOut operations\n", + fprintf(stderr, "Did (%lu + %lu) = %lu linkOut operations\n", p1.operations(), p2.operations(), p1.operations() + p2.operations()); - fprintf(stderr, "Did (%" PRIu64 " + %" PRIu64 ") = %" PRIu64 " linkInOut operations\n", + fprintf(stderr, "Did (%lu + %lu) = %lu linkInOut operations\n", pc1.operationsConsumed(), pc2.operationsConsumed(), pc1.operationsConsumed() + pc2.operationsConsumed()); - fprintf(stderr, "Did %" PRIu64 " Total operations\n", + fprintf(stderr, "Did %lu Total operations\n", c1.operations() + c2.operations() + p1.operations() + p2.operations() + pc1.operationsConsumed() + pc2.operationsConsumed()); fprintf(stderr, "Start verifying result 2.\n"); for (size_t i=0; i < NumBlocks; i++) { diff --git a/vespamalloc/src/tests/doubledelete/CMakeLists.txt b/vespamalloc/src/tests/doubledelete/CMakeLists.txt index e38f163148a..c687b7ab098 100644 --- a/vespamalloc/src/tests/doubledelete/CMakeLists.txt +++ b/vespamalloc/src/tests/doubledelete/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_executable(vespamalloc_doubledelete_test_app +vespa_add_executable(vespamalloc_doubledelete_test_app TEST SOURCES doubledelete.cpp DEPENDS diff --git a/vespamalloc/src/tests/overwrite/CMakeLists.txt b/vespamalloc/src/tests/overwrite/CMakeLists.txt index f3625bd396c..7777c930669 100644 --- a/vespamalloc/src/tests/overwrite/CMakeLists.txt +++ b/vespamalloc/src/tests/overwrite/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_executable(vespamalloc_overwrite_test_app +vespa_add_executable(vespamalloc_overwrite_test_app TEST SOURCES overwrite.cpp DEPENDS diff --git a/vespamalloc/src/tests/stacktrace/CMakeLists.txt b/vespamalloc/src/tests/stacktrace/CMakeLists.txt index 6d8fbfcbaa1..6aed633e918 100644 --- a/vespamalloc/src/tests/stacktrace/CMakeLists.txt +++ b/vespamalloc/src/tests/stacktrace/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_executable(vespamalloc_stacktrace_test_app +vespa_add_executable(vespamalloc_stacktrace_test_app TEST SOURCES stacktrace.cpp backtrace.c diff --git a/vespamalloc/src/tests/test1/CMakeLists.txt b/vespamalloc/src/tests/test1/CMakeLists.txt index dc0217b139a..205de0f96fc 100644 --- a/vespamalloc/src/tests/test1/CMakeLists.txt +++ b/vespamalloc/src/tests/test1/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_executable(vespamalloc_testatomic_app +vespa_add_executable(vespamalloc_testatomic_app TEST SOURCES testatomic.cpp DEPENDS diff --git a/vespamalloc/src/tests/test2/CMakeLists.txt b/vespamalloc/src/tests/test2/CMakeLists.txt index 668c09feb03..ce785a6a166 100644 --- a/vespamalloc/src/tests/test2/CMakeLists.txt +++ b/vespamalloc/src/tests/test2/CMakeLists.txt @@ -1,10 +1,11 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespamalloc_testgraph_app +vespa_add_executable(vespamalloc_testgraph_app TEST SOURCES testgraph.cpp ../../vespamalloc/util/stream.cpp ../../vespamalloc/util/traceutil.cpp ../../vespamalloc/util/callstack.cpp DEPENDS + dl ) vespa_add_test(NAME vespamalloc_testgraph_app NO_VALGRIND COMMAND vespamalloc_testgraph_app) diff --git a/vespamalloc/src/tests/thread/CMakeLists.txt b/vespamalloc/src/tests/thread/CMakeLists.txt index 67539a68f77..e9bf1489347 100644 --- a/vespamalloc/src/tests/thread/CMakeLists.txt +++ b/vespamalloc/src/tests/thread/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_executable(vespamalloc_thread_test_app +vespa_add_executable(vespamalloc_thread_test_app TEST SOURCES thread.cpp ) diff --git a/vespamalloc/src/tests/thread/thread_test.sh b/vespamalloc/src/tests/thread/thread_test.sh index edcd7a41a17..68654d35ce7 100755 --- a/vespamalloc/src/tests/thread/thread_test.sh +++ b/vespamalloc/src/tests/thread/thread_test.sh @@ -1,5 +1,7 @@ #!/bin/bash +ulimit -u 31215 + VESPA_MALLOC_SO=../../../src/vespamalloc/libvespamalloc.so VESPA_MALLOC_SO_D=../../../src/vespamalloc/libvespamalloc_vespamallocd.so diff --git a/vespamalloc/src/vespamalloc/CMakeLists.txt b/vespamalloc/src/vespamalloc/CMakeLists.txt index ece7f9f61a0..26dd91bb3df 100644 --- a/vespamalloc/src/vespamalloc/CMakeLists.txt +++ b/vespamalloc/src/vespamalloc/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_add_library(vespamalloc $<TARGET_OBJECTS:vespamalloc_util> INSTALL lib64 DEPENDS + dl ) vespa_add_library(vespamalloc_vespamallocd SOURCES @@ -12,6 +13,7 @@ vespa_add_library(vespamalloc_vespamallocd $<TARGET_OBJECTS:vespamalloc_util> INSTALL lib64 DEPENDS + dl ) vespa_add_library(vespamalloc_vespamallocdst16 SOURCES @@ -19,6 +21,7 @@ vespa_add_library(vespamalloc_vespamallocdst16 $<TARGET_OBJECTS:vespamalloc_util> INSTALL lib64 DEPENDS + dl ) vespa_add_library(vespamalloc_vespamallocdst16_nl SOURCES @@ -26,6 +29,7 @@ vespa_add_library(vespamalloc_vespamallocdst16_nl $<TARGET_OBJECTS:vespamalloc_util> INSTALL lib64 DEPENDS + dl ) vespa_add_library(vespamalloc_vespammap SOURCES 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/vsm/src/tests/charbuffer/CMakeLists.txt b/vsm/src/tests/charbuffer/CMakeLists.txt index 38d1f519714..44e6c4072b8 100644 --- a/vsm/src/tests/charbuffer/CMakeLists.txt +++ b/vsm/src/tests/charbuffer/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_executable(vsm_charbuffer_test_app +vespa_add_executable(vsm_charbuffer_test_app TEST SOURCES charbuffer.cpp DEPENDS diff --git a/vsm/src/tests/docsum/CMakeLists.txt b/vsm/src/tests/docsum/CMakeLists.txt index 506e0a9bf66..1b9203ea5cf 100644 --- a/vsm/src/tests/docsum/CMakeLists.txt +++ b/vsm/src/tests/docsum/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_executable(vsm_docsum_test_app +vespa_add_executable(vsm_docsum_test_app TEST SOURCES docsum.cpp DEPENDS diff --git a/vsm/src/tests/document/CMakeLists.txt b/vsm/src/tests/document/CMakeLists.txt index 36da98129a1..6b7a1688a56 100644 --- a/vsm/src/tests/document/CMakeLists.txt +++ b/vsm/src/tests/document/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_executable(vsm_document_test_app +vespa_add_executable(vsm_document_test_app TEST SOURCES document.cpp DEPENDS diff --git a/vsm/src/tests/searcher/CMakeLists.txt b/vsm/src/tests/searcher/CMakeLists.txt index 26d6115e3a7..a91f2f60b9d 100644 --- a/vsm/src/tests/searcher/CMakeLists.txt +++ b/vsm/src/tests/searcher/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_executable(vsm_searcher_test_app +vespa_add_executable(vsm_searcher_test_app TEST SOURCES searcher.cpp DEPENDS diff --git a/vsm/src/tests/textutil/CMakeLists.txt b/vsm/src/tests/textutil/CMakeLists.txt index c3169a842f0..7915e595477 100644 --- a/vsm/src/tests/textutil/CMakeLists.txt +++ b/vsm/src/tests/textutil/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_executable(vsm_textutil_test_app +vespa_add_executable(vsm_textutil_test_app TEST SOURCES textutil.cpp DEPENDS 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/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/zkfacade/OWNERS b/zkfacade/OWNERS index e0a00db5f4f..338ed581212 100644 --- a/zkfacade/OWNERS +++ b/zkfacade/OWNERS @@ -1 +1 @@ -musum +hmusum |