minor fixes

quidem-ut/README.md

@@ -20,7 +20,7 @@
 # Quidem UT
 
 Enables to write sql level tests easily.
-Can be used to write tests against existing test backends (ComponentSupplier) - by doing so the testcases can be moved closer to the excercised codes.
+Can be used to write tests against existing test backends (ComponentSupplier) - by doing so the testcases can be moved closer to the exercised codes.
 
 ## Usage
 
@@ -39,8 +39,8 @@ sdk install maven
 # run mvn to see if it works
 mvn --version
 
-# download druid sourcces (FIXME: change this to the main repo/branch before merging)
-git clone --branch quidem-record https://github.com/kgyrtkirk/druid
+# download druid sources
+git clone https://github.com/apache/druid
 ```
 
 

sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java

@@ -115,7 +115,6 @@ public class CountSqlAggregator implements SqlAggregator
       return null;
     }
 
-    // FIXME: is-all-literal
     if (args.isEmpty()) {
       // COUNT(*)
       return Aggregation.create(new CountAggregatorFactory(name));

sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTestBase.java

@@ -93,24 +93,6 @@ public abstract class CalciteTestBase
     }
   }
 
-  // FIXME remove
-  public TempFolderOverTempDir temXMEXAXISporaryFolder = new TempFolderOverTempDir();
-
-  public class TempFolderOverTempDir
-  {
-
-    public File newFolder()
-    {
-      return newTempFolder("unknown");
-    }
-
-    public File newFolder(String string)
-    {
-      return newTempFolder(string);
-    }
-  }
-
-
   /**
    * @deprecated prefer to make {@link DruidExpression} directly to ensure expression tests accurately test the full
    * expression structure, this method is just to have a convenient way to fix a very large number of existing tests