Process names by rank then name. Start names index ids with 1, not 2

dao/src/main/java/life/catalogue/db/mapper/NamesIndexMapper.java

@@ -28,5 +28,5 @@ public interface NamesIndexMapper extends CRUD<Integer, IndexName> {
   /**
    * Resets the primary key sequence to the next highest int or 1 if no records exist.
    */
-  void resetSequence();
+  void updateSequence();
 }

dao/src/main/java/life/catalogue/matching/NameIndexImpl.java

@@ -278,8 +278,6 @@ public void reset() {
       NamesIndexMapper nim = session.getMapper(NamesIndexMapper.class);
       LOG.warn("Truncating the names index postgres table");
       nim.truncate();
-      LOG.info("Resetting names index sequence, count = {}", nim.count());
-      nim.resetSequence();
     }
   }
 

dao/src/main/resources/life/catalogue/db/mapper/NameMapper.xml

@@ -354,7 +354,7 @@
     <include refid="life.catalogue.db.Common.partitionByDatasetKey"/>
     SELECT <include refid="SELECT"/>
     FROM <include refid="FROM"/>
-    ORDER BY rank
+    ORDER BY rank, scientific_name
   </select>
 
   <select id="processSince" parameterType="map" resultMap="nameResultMap" resultOrdered="true" fetchSize="5000" resultSetType="FORWARD_ONLY">

dao/src/main/resources/life/catalogue/db/mapper/NamesIndexMapper.xml

@@ -97,10 +97,10 @@
   </select>
 
   <update id="truncate">
-    TRUNCATE names_index
+    TRUNCATE names_index RESTART IDENTITY
   </update>
 
-  <update id="resetSequence">
+  <update id="updateSequence">
     SELECT setval('names_index_id_seq', (SELECT COALESCE(max(id),1) FROM names_index))
   </update>
 

dao/src/test/java/life/catalogue/db/TestDataRule.java

@@ -222,7 +222,7 @@ public void updateSequences() throws Exception {
       pm.updateIdSequences(testData.key);
     }
     // names index keys
-    session.getMapper(NamesIndexMapper.class).resetSequence();
+    session.getMapper(NamesIndexMapper.class).updateSequence();
     session.commit();
   }
 

dao/src/test/java/life/catalogue/db/mapper/NamesIndexMapperTest.java

@@ -41,10 +41,9 @@ public void truncate() {
     mapper().truncate();
     assertEquals(0, mapper().count());
 
-    mapper().resetSequence();
     IndexName n = createTestEntity(-1);
     mapper().create(n);
-    assertEquals(2, (int) n.getKey());
+    assertEquals(1, (int) n.getKey());
   }
 
   /**

webservice/src/test/java/life/catalogue/release/StableIdProviderTest.java

@@ -54,7 +54,6 @@ public void destroy() {
   }
 
   @Test
-  @Ignore
   public void run() throws Exception {
     provider.run();
     try (SqlSession session = PgSetupRule.getSqlSessionFactory().openSession(true)) {