aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--airlift-zstd/pom.xml3
-rw-r--r--annotations/pom.xml3
-rw-r--r--config-model/pom.xml3
-rw-r--r--config-provisioning/pom.xml3
-rwxr-xr-xconfig/pom.xml3
-rw-r--r--configdefinitions/pom.xml3
-rw-r--r--configserver/pom.xml3
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java43
-rw-r--r--defaults/pom.xml3
-rw-r--r--docprocs/pom.xml3
-rw-r--r--documentgen-test/pom.xml3
-rw-r--r--jrt/pom.xml3
-rw-r--r--metrics/pom.xml3
-rw-r--r--parent/pom.xml3
-rw-r--r--searchlib/pom.xml3
-rw-r--r--vdslib/pom.xml3
-rw-r--r--vespa-documentgen-plugin/pom.xml3
-rw-r--r--vespajlib/pom.xml3
-rw-r--r--vespalog/pom.xml3
-rw-r--r--zkfacade/pom.xml3
-rw-r--r--zookeeper-server/pom.xml3
-rw-r--r--zookeeper-server/zookeeper-server-3.8.1/pom.xml3
-rw-r--r--zookeeper-server/zookeeper-server-common/pom.xml3
-rw-r--r--zookeeper-server/zookeeper-server/pom.xml3
24 files changed, 26 insertions, 86 deletions
diff --git a/airlift-zstd/pom.xml b/airlift-zstd/pom.xml
index c7eb8c96f39..9d9cb344891 100644
--- a/airlift-zstd/pom.xml
+++ b/airlift-zstd/pom.xml
@@ -75,9 +75,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/annotations/pom.xml b/annotations/pom.xml
index e3f5455c88b..067a6966a11 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -42,9 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/config-model/pom.xml b/config-model/pom.xml
index 79e892903fa..a634a40c93b 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -491,9 +491,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.github.os72</groupId>
diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml
index ab9418ec488..e405f1192b1 100644
--- a/config-provisioning/pom.xml
+++ b/config-provisioning/pom.xml
@@ -104,9 +104,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/config/pom.xml b/config/pom.xml
index 0a95c0e1144..83a25b8631d 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -191,9 +191,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml
index 47cc106c789..51221c4899f 100644
--- a/configdefinitions/pom.xml
+++ b/configdefinitions/pom.xml
@@ -56,9 +56,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/configserver/pom.xml b/configserver/pom.xml
index ef0fde3e57e..5bd155c797b 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -345,9 +345,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java
index f48dc9a8630..30c02944f19 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java
@@ -210,7 +210,7 @@ public abstract class CompositeItem extends Item {
public CompositeItem clone() {
CompositeItem copy = (CompositeItem) super.clone();
- copy.subitems = new java.util.ArrayList<>();
+ copy.subitems = new java.util.ArrayList<>(subitems.size());
for (Item subItem : subitems) {
Item subItemCopy = subItem.clone();
subItemCopy.setParent(copy);
@@ -221,14 +221,16 @@ public abstract class CompositeItem extends Item {
}
private void fixConnexity(CompositeItem copy) {
- List<Item> flatland = new ArrayList<>();
- List<Item> flatCopy = new ArrayList<>();
- taggingFlatten(this, flatland);
+ int hasUniqueIdCount = countUniqueId(this);
+ if (hasUniqueIdCount == 0) return;
+ List<Item> flat = new ArrayList<>(hasUniqueIdCount);
+ List<Item> flatCopy = new ArrayList<>(hasUniqueIdCount);
+ taggingFlatten(this, flat);
taggingFlatten(copy, flatCopy);
- int barrier = flatland.size();
+ int barrier = flat.size();
for (int i = 0; i < barrier; ++i) {
- Item orig = flatland.get(i);
- int connectedTo = find(orig.connectedItem, flatland);
+ Item orig = flat.get(i);
+ int connectedTo = find(orig.connectedItem, flat);
if (connectedTo >= 0) {
TaggableItem tagged = (TaggableItem) flatCopy.get(i);
tagged.setConnectivity(flatCopy.get(connectedTo), orig.connectivity);
@@ -236,18 +238,28 @@ public abstract class CompositeItem extends Item {
}
}
- private void taggingFlatten(Item tree, List<Item> container) {
+ private static int countUniqueId(Item tree) {
+ int sum = tree.hasUniqueID() ? 1 : 0;
+ if (tree instanceof CompositeItem asComposite) {
+ for (Iterator<Item> i = asComposite.getItemIterator(); i.hasNext();) {
+ sum += countUniqueId(i.next());
+ }
+ }
+ return sum;
+ }
+
+ private static void taggingFlatten(Item tree, List<Item> container) {
if (tree.hasUniqueID()) {
container.add(tree);
- } else if (tree instanceof CompositeItem) {
- CompositeItem asComposite = (CompositeItem) tree;
+ }
+ if (tree instanceof CompositeItem asComposite) {
for (Iterator<Item> i = asComposite.getItemIterator(); i.hasNext();) {
taggingFlatten(i.next(), container);
}
}
}
- private int find(Item needle, List<Item> haystack) {
+ private static int find(Item needle, List<Item> haystack) {
if (needle == null) {
return -1;
}
@@ -352,8 +364,7 @@ public abstract class CompositeItem extends Item {
}
@Override
- public void set(Item o) {
- Item newItem = o;
+ public void set(Item newItem) {
owner.removing(current);
owner.adding(newItem);
current = newItem;
@@ -361,12 +372,10 @@ public abstract class CompositeItem extends Item {
}
@Override
- public void add(Item o) {
- Item newItem = o;
-
+ public void add(Item newItem) {
owner.adding(newItem);
// TODO: Change current here? Check javadoc
- wrapped.add(o);
+ wrapped.add(newItem);
}
}
diff --git a/defaults/pom.xml b/defaults/pom.xml
index ffafc683fd6..4a5299e1782 100644
--- a/defaults/pom.xml
+++ b/defaults/pom.xml
@@ -76,9 +76,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/docprocs/pom.xml b/docprocs/pom.xml
index eb988610168..2a28e6e5bd8 100644
--- a/docprocs/pom.xml
+++ b/docprocs/pom.xml
@@ -147,9 +147,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml
index 0477c834477..2d9ce13dc90 100644
--- a/documentgen-test/pom.xml
+++ b/documentgen-test/pom.xml
@@ -96,9 +96,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin> <!-- We're testing this plugin in this module. -->
<groupId>com.yahoo.vespa</groupId>
diff --git a/jrt/pom.xml b/jrt/pom.xml
index 353e0df777d..926756da4a0 100644
--- a/jrt/pom.xml
+++ b/jrt/pom.xml
@@ -58,9 +58,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 2cf5ccc57d1..f44a2569ace 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -78,9 +78,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<!-- Remove when v2.1 is the default
diff --git a/parent/pom.xml b/parent/pom.xml
index fe99e72c03e..b0ba6e89f6e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,9 +114,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/searchlib/pom.xml b/searchlib/pom.xml
index e1e61c954b9..5555c83adde 100644
--- a/searchlib/pom.xml
+++ b/searchlib/pom.xml
@@ -95,9 +95,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/vdslib/pom.xml b/vdslib/pom.xml
index 4067fc9d8d4..e966d8ce6b6 100644
--- a/vdslib/pom.xml
+++ b/vdslib/pom.xml
@@ -72,9 +72,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml
index f3357d64e27..b73c1ab7595 100644
--- a/vespa-documentgen-plugin/pom.xml
+++ b/vespa-documentgen-plugin/pom.xml
@@ -76,9 +76,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index ff244ad07f8..9b10f82c986 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -117,9 +117,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/vespalog/pom.xml b/vespalog/pom.xml
index 8bb72743b38..f8260471fa2 100644
--- a/vespalog/pom.xml
+++ b/vespalog/pom.xml
@@ -67,9 +67,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
index 58a0601424d..dd890fef3a8 100644
--- a/zkfacade/pom.xml
+++ b/zkfacade/pom.xml
@@ -119,9 +119,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 053361c7e66..c1f92eece63 100644
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -52,9 +52,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/zookeeper-server/zookeeper-server-3.8.1/pom.xml b/zookeeper-server/zookeeper-server-3.8.1/pom.xml
index 72da1ba26c4..b90a5feefa3 100644
--- a/zookeeper-server/zookeeper-server-3.8.1/pom.xml
+++ b/zookeeper-server/zookeeper-server-3.8.1/pom.xml
@@ -89,9 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/zookeeper-server/zookeeper-server-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml
index 13c3660bfa2..33af7e3a296 100644
--- a/zookeeper-server/zookeeper-server-common/pom.xml
+++ b/zookeeper-server/zookeeper-server-common/pom.xml
@@ -40,9 +40,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>
diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml
index d8dbe35ec9c..d37709da6cd 100644
--- a/zookeeper-server/zookeeper-server/pom.xml
+++ b/zookeeper-server/zookeeper-server/pom.xml
@@ -89,9 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
</plugin>
<plugin>
<groupId>com.yahoo.vespa</groupId>