apache#1322 Allow null time for converting map to row

seoeun25 · Jan 28, 2019 · a24e7f5 · a24e7f5
1 parent c5c0f1f
commit a24e7f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/common/src/main/java/io/druid/data/input/Rows.java b/common/src/main/java/io/druid/data/input/Rows.java
@@ -136,11 +136,8 @@ public static Function<Map<String, Object>, Row> mapToRow(final String timestamp
       @Override
       public Row apply(Map<String, Object> input)
       {
-        Object timestamp = input.get(timestampColumn);
-        if (timestamp == null) {
-          throw new IllegalArgumentException("cannot find time column '" + timestampColumn + "'");
-        }
-        return new MapBasedRow(new DateTime(timestamp), input);
+        final Object timestamp = input.get(timestampColumn);
+        return new MapBasedRow(timestamp == null ? null : new DateTime(timestamp), input);
       }
     };
   }

diff --git a/server/src/main/java/io/druid/client/CachingClusteredClient.java b/server/src/main/java/io/druid/client/CachingClusteredClient.java
@@ -330,7 +330,7 @@ public Interval apply(TimelineObjectHolder<String, ServerSelector> input)
         for (byte[] value : cachedValues.values()) {
           total += value.length;
         }
-        log.info(
+        log.debug(
             "Requested %,d segments from cache for [%s] and returned %,d segments (%,d bytes), took %,d msec",
             cacheKeys.size(), query.getType(), cachedValues.size(), total, System.currentTimeMillis() - start
         );
@@ -641,7 +641,7 @@ sequence, new Closeable()
             @Override
             public void close() throws IOException
             {
-              log.info(
+              log.debug(
                   "Deserialized %,d rows from %,d cached segments, took %,d msec",
                   cacheAccessor.rows(), numCachedSegments, cacheAccessor.time()
               );

diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/QueryMaker.java b/sql/src/main/java/io/druid/sql/calcite/rel/QueryMaker.java
@@ -147,6 +147,7 @@ private Query prepareQuery(Query<?> query)
   @SuppressWarnings("unchecked")
   private <T> Sequence<T> runQuery(final Query query)
   {
+    LOG.info("Running.. %s", query);
     return query.run(segmentWalker, Maps.newHashMap());
   }