fix(sql): make table column names case insensitive in where (questdb#1045)

Author: ideoma

core/src/main/java/io/questdb/cairo/BaseRecordMetadata.java

@@ -26,12 +26,12 @@
 
 
 import io.questdb.cairo.sql.RecordMetadata;
-import io.questdb.std.CharSequenceIntHashMap;
+import io.questdb.std.LowerCaseCharSequenceIntHashMap;
 import io.questdb.std.ObjList;
 
 public abstract class BaseRecordMetadata implements RecordMetadata {
  protected ObjList<TableColumnMetadata> columnMetadata;
- protected CharSequenceIntHashMap columnNameIndexMap;
+ protected LowerCaseCharSequenceIntHashMap columnNameIndexMap;
  protected int timestampIndex;
  protected int columnCount;
 

core/src/main/java/io/questdb/cairo/TableReaderMetadata.java

@@ -37,7 +37,7 @@ public class TableReaderMetadata extends BaseRecordMetadata implements Closeable
  private final MappedReadOnlyMemory metaMem;
  private final Path path;
  private final FilesFacade ff;
- private final CharSequenceIntHashMap tmpValidationMap = new CharSequenceIntHashMap();
+ private final LowerCaseCharSequenceIntHashMap tmpValidationMap = new LowerCaseCharSequenceIntHashMap();
  private int id;
  private MappedReadOnlyMemory transitionMeta;
 
@@ -46,7 +46,7 @@ public TableReaderMetadata(FilesFacade ff) {
  this.ff = ff;
  this.metaMem = new SinglePageMappedReadOnlyPageMemory();
  this.columnMetadata = new ObjList<>(columnCount);
- this.columnNameIndexMap = new CharSequenceIntHashMap();
+ this.columnNameIndexMap = new LowerCaseCharSequenceIntHashMap();
  }
 
  public TableReaderMetadata(FilesFacade ff, Path path) {

core/src/main/java/io/questdb/cairo/TableUtils.java

@@ -526,7 +526,7 @@ public static void txnPartitionConditionally(CharSink path, long txn) {
  }
  }
 
- public static void validate(FilesFacade ff, MappedReadOnlyMemory metaMem, CharSequenceIntHashMap nameIndex) {
+ public static void validate(FilesFacade ff, MappedReadOnlyMemory metaMem, LowerCaseCharSequenceIntHashMap nameIndex) {
  try {
  final int metaVersion = metaMem.getInt(TableUtils.META_OFFSET_VERSION);
  if (ColumnType.VERSION != metaVersion && metaVersion != 404) {

core/src/main/java/io/questdb/cairo/TableWriter.java

@@ -97,7 +97,7 @@ public class TableWriter implements Closeable {
  private final CharSequence tableName;
  private final TableWriterMetadata metadata;
  private final CairoConfiguration configuration;
- private final CharSequenceIntHashMap validationMap = new CharSequenceIntHashMap();
+ private final LowerCaseCharSequenceIntHashMap validationMap = new LowerCaseCharSequenceIntHashMap();
  private final FragileCode RECOVER_FROM_META_RENAME_FAILURE = this::recoverFromMetaRenameFailure;
  private final SOCountDownLatch indexLatch = new SOCountDownLatch();
  private final LongList indexSequences = new LongList();

core/src/main/java/io/questdb/cairo/TableWriterMetadata.java

@@ -26,9 +26,9 @@
 
 import io.questdb.cairo.vm.MappedReadOnlyMemory;
 import io.questdb.cairo.vm.VmUtils;
-import io.questdb.std.CharSequenceIntHashMap;
 import io.questdb.std.Chars;
 import io.questdb.std.FilesFacade;
+import io.questdb.std.LowerCaseCharSequenceIntHashMap;
 import io.questdb.std.ObjList;
 
 public class TableWriterMetadata extends BaseRecordMetadata {
@@ -40,7 +40,7 @@ public class TableWriterMetadata extends BaseRecordMetadata {
 
  public TableWriterMetadata(FilesFacade ff, MappedReadOnlyMemory metaMem) {
  this.columnCount = metaMem.getInt(TableUtils.META_OFFSET_COUNT);
- this.columnNameIndexMap = new CharSequenceIntHashMap(columnCount);
+ this.columnNameIndexMap = new LowerCaseCharSequenceIntHashMap(columnCount);
  this.version = metaMem.getInt(TableUtils.META_OFFSET_VERSION);
  this.id = metaMem.getInt(TableUtils.META_OFFSET_TABLE_ID);
  this.maxUncommittedRows = metaMem.getInt(TableUtils.META_OFFSET_MAX_UNCOMMITTED_ROWS);

core/src/main/java/io/questdb/griffin/engine/join/JoinRecordMetadata.java

@@ -30,8 +30,8 @@
 import io.questdb.cairo.map.MapKey;
 import io.questdb.cairo.map.MapValue;
 import io.questdb.cairo.sql.RecordMetadata;
-import io.questdb.std.CharSequenceIntHashMap;
 import io.questdb.std.Chars;
+import io.questdb.std.LowerCaseCharSequenceIntHashMap;
 import io.questdb.std.Misc;
 import io.questdb.std.ObjList;
 import io.questdb.std.str.CharSink;
@@ -49,7 +49,7 @@ public JoinRecordMetadata(CairoConfiguration configuration, int columnCount) {
  this.map = new FastMap(configuration.getSqlJoinMetadataPageSize(), keyTypes, valueTypes, columnCount * 2, 0.6, configuration.getSqlJoinMetadataMaxResizes());
  this.timestampIndex = -1;
  this.columnCount = 0;
- this.columnNameIndexMap = new CharSequenceIntHashMap(columnCount);
+ this.columnNameIndexMap = new LowerCaseCharSequenceIntHashMap(columnCount);
  this.columnMetadata = new ObjList<>(columnCount);
  this.refCount = 1;
  }

core/src/main/java/io/questdb/std/CharSequenceIntHashMap.java

@@ -128,7 +128,9 @@ public boolean putAt(int index, CharSequence key, int value) {
  public void putIfAbsent(CharSequence key, int value) {
  int index = keyIndex(key);
  if (index > -1) {
- putAt0(index, Chars.toString(key), value);
+ String keyString = Chars.toString(key);
+ putAt0(index, keyString, value);
+ list.add(keyString);
  }
  }
 

core/src/main/java/io/questdb/std/LowerCaseCharSequenceIntHashMap.java

@@ -29,7 +29,7 @@
 public class LowerCaseCharSequenceIntHashMap extends AbstractLowerCaseCharSequenceHashSet {
  private static final int NO_ENTRY_VALUE = -1;
  private final int noEntryValue;
- protected int[] values;
+ private int[] values;
  private final ObjList<CharSequence> list;
 
  public LowerCaseCharSequenceIntHashMap() {
@@ -48,7 +48,8 @@ public LowerCaseCharSequenceIntHashMap(int initialCapacity, double loadFactor, i
  clear();
  }
 
- public void clear() {
+ @Override
+ public final void clear() {
  super.clear();
  list.clear();
  Arrays.fill(values, noEntryValue);
@@ -60,6 +61,7 @@ protected void erase(int index) {
  values[index] = noEntryValue;
  }
 
+ @Override
  public void removeAt(int index) {
  if (index < 0) {
  int index1 = -index - 1;
@@ -90,16 +92,21 @@ public boolean putAt(int index, CharSequence key, int value) {
  values[-index - 1] = value;
  return false;
  }
- putAt0(index, key, value);
- list.add(key);
+ final String keyString = Chars.toString(key);
+ putAt0(index, keyString, value);
+ list.add(keyString);
  return true;
  }
 
- public void putIfAbsent(CharSequence key, int value) {
+ public boolean putIfAbsent(CharSequence key, int value) {
  int index = keyIndex(key);
  if (index > -1) {
- putAt0(index, key, value);
+ String keyStr = Chars.toString(key);
+ putAt0(index, keyStr, value);
+ list.add(keyStr);
+ return true;
  }
+ return false;
  }
 
  @Override

core/src/test/java/io/questdb/griffin/AlterTableAddColumnTest.java

@@ -302,7 +302,7 @@ public void testAddColumnUpperCase() throws Exception {
  compiler.compile("alter table x add column D int", sqlExecutionContext);
  Assert.fail();
  } catch (SqlException e) {
- TestUtils.assertContains(e.getFlyweightMessage(), "could add column [error=Duplicate column name: D, errno=0]");
+ TestUtils.assertContains(e.getFlyweightMessage(), "column 'D' already exists");
  }
  }
  );

core/src/test/java/io/questdb/griffin/KeyedAggregationTest.java

@@ -1001,6 +1001,23 @@ public void testCountAggregationWithConst() throws Exception {
  assertSqlWithTypes(sql, expected);
  }
 
+ @Test
+ public void testCountCaseInsensitive() throws Exception {
+ try (TableModel tt1 = new TableModel(configuration, "tt1", PartitionBy.DAY)) {
+ tt1.col("tts", ColumnType.LONG).timestamp("ts")
+ .col("ID", ColumnType.LONG);
+ createPopulateTable(tt1, 100, "2020-01-01", 2);
+ }
+
+ String expected = "ts\tcount\n" +
+ "2020-01-01T00:28:47.990000Z:TIMESTAMP\t1:LONG\n" +
+ "2020-01-01T00:57:35.980000Z:TIMESTAMP\t1:LONG\n";
+
+ String sql = "select ts, count() from tt1 WHERE id > 0 LIMIT 2";
+
+ assertSqlWithTypes(sql, expected);
+ }
+
  @Test
  public void testFirstLastAggregationsNotSupported() {
  String[] aggregateFunctions = {"first"};