366569bbe2e738da4f223bda0a0c49fa8d6d2cef
angie
  Fri Dec 2 12:24:34 2016 -0800
Code review feedback from Kate.  refs #18433

diff --git src/hg/lib/annoStreamDb.c src/hg/lib/annoStreamDb.c
index a2f61da..efba308 100644
--- src/hg/lib/annoStreamDb.c
+++ src/hg/lib/annoStreamDb.c
@@ -149,53 +149,53 @@
 resetMergeState(self);
 resetChunkState(self);
 }
 
 // Forward declaration in order to avoid moving lots of code:
 static void asdUpdateBaselineQuery(struct annoStreamDb *self);
 /* Build a dy SQL query with no position constraints (select ... from ...)
  * possibly including joins and filters if specified (where ...), using the current splitTable. */
 
 static void asdSetRegion(struct annoStreamer *vSelf, char *chrom, uint regionStart, uint regionEnd)
 /* Set region -- and free current sqlResult if there is one. */
 {
 annoStreamerSetRegion(vSelf, chrom, regionStart, regionEnd);
 struct annoStreamDb *self = (struct annoStreamDb *)vSelf;
 // If splitTable differs from table, use new chrom in splitTable:
-if (!sameString(self->table, self->trackTable))
+if (differentString(self->table, self->trackTable))
     {
     char newSplitTable[PATH_LEN];
     safef(newSplitTable, sizeof(newSplitTable), "%s_%s", chrom, self->trackTable);
     freeMem(self->table);
     self->table = cloneString(newSplitTable);
     }
 resetQueryState(self);
 asdUpdateBaselineQuery(self);
 }
 
 static char **nextRowFromSqlResult(struct annoStreamDb *self)
 /* Stream rows directly from self->sr. */
 {
 return sqlNextRow(self->sr);
 }
 
 INLINE boolean useSplitTable(struct annoStreamDb *self, struct joinerDtf *dtf)
 /* Return TRUE if dtf matches self->{db,table} and table is split. */
 {
 return (sameString(dtf->database, self->db) &&
         sameString(dtf->table, self->trackTable) &&
-        !sameString(self->table, self->trackTable));
+        differentString(self->table, self->trackTable));
 }
 
 static void appendFieldList(struct annoStreamDb *self, struct dyString *query)
 /* Append SQL field list to query. */
 {
 struct joinerDtf *fieldList = self->joinMixer ? self->joinMixer->sqlFieldList :
                                                 self->mainTableDtfList;
 struct joinerDtf *dtf;
 for (dtf = fieldList;  dtf != NULL;  dtf = dtf->next)
     {
     if (dtf != fieldList)
         dyStringAppendC(query, ',');
     if (useSplitTable(self, dtf))
         dyStringPrintf(query, "%s.%s", self->table, dtf->field);
     else