long-overdue cleanup

* various invalid content here, was hidden by adding the same
  field twice, triggering other bugs.
* fix some warnings
* don't declare the same annotation twice

4 files changed, 8 insertions, 19 deletions

diff --git a/documentgen-test/etc/complex/book.sd b/documentgen-test/etc/complex/book.sd
index 96e76c1e2b4..ace6c33e440 100644
--- a/documentgen-test/etc/complex/book.sd
+++ b/documentgen-test/etc/complex/book.sd
@@ -50,7 +50,7 @@ search book {
             indexing: summary | index
         }
         field year type int {
-            indexing: summary | index
+            indexing: summary | attribute
         }
         field description type string {
             indexing: summary | index
@@ -71,10 +71,6 @@ search book {
     import field ref.dummy as my_dummy {}
     import field ref.foo as my_foo {}
 
-    field sw1 type float {
-    }
-    field didinteger type array<int> {
-    }
     rank-profile default {
         first-phase {
             expression: nativeRank
@@ -87,7 +83,7 @@ search book {
 
     }
     field sw1 type float {
-        indexing: input weight * 6 + input w1 + input w2 | summary
+        indexing: input weight_src * 67 + input w1_src + input w2_src | summary
     }
     field didinteger type array<int> {
         indexing: input did | split " " | for_each { to_int } | attribute
diff --git a/documentgen-test/etc/complex/common.sd b/documentgen-test/etc/complex/common.sd
index a5d07c455b8..3000bd8780c 100644
--- a/documentgen-test/etc/complex/common.sd
+++ b/documentgen-test/etc/complex/common.sd
@@ -7,10 +7,9 @@ search common {
         field title type string {
             bolding: on
             indexing: index|summary
-            summary-to: smallsum
         }
         field mid type int {
-            indexing: attribute|index|summary
+            indexing: attribute|summary
         }
         field scorekey type string {
             indexing: summary
@@ -43,12 +42,6 @@ search common {
         }
         annotation DocumentImplSub inherits DocumentImpl { }
     }
-    field weight type float {
-    }
-    field w1 type float {
-    }
-    field w2 type float {
-    }
     rank-profile default {
         first-phase {
             expression: nativeRank
@@ -63,4 +56,8 @@ search common {
     field w2 type float {
         indexing: input w2_src + input weight_src | summary
     }
+    document-summary smallsum {
+        from-disk
+        summary title type string {}
+    }
 }
diff --git a/documentgen-test/etc/complex/music2.sd b/documentgen-test/etc/complex/music2.sd
index 2dc659d5a1e..34419eeea6a 100644
--- a/documentgen-test/etc/complex/music2.sd
+++ b/documentgen-test/etc/complex/music2.sd
@@ -31,10 +31,6 @@ search music2 {
      field instrument type int { }
    }
 
-   annotation date {
-     field exacttime type long { }
-   }
-
    annotation place {
      field lat type long { }
      field lon type long { }
diff --git a/documentgen-test/etc/complex/video.sd b/documentgen-test/etc/complex/video.sd
index f49ea910128..5ca283eaa96 100644
--- a/documentgen-test/etc/complex/video.sd
+++ b/documentgen-test/etc/complex/video.sd
@@ -26,7 +26,7 @@ search video {
          indexing: index|summary
       }
       field year type int {
-         indexing: attribute|index|summary
+         indexing: attribute|summary
       }
    }