Merge branch 'fv2-string' of github.com:sundy-li/fuse-query into fv2-string

Author: sundy-li

Cargo.lock

@@ -22,6 +22,8 @@ The function extracts a date and time from the provided string. If the argument
 
 Returns a value of Timestamp type in the format “YYYY-MM-DD hh:mm:ss.ffffff”.
 
+If the expr matches this format but does not have a time part, it is automatically extended to this pattern. The padding value is 0.
+
 ## Examples
 
 ### Using a String as Argument
@@ -46,6 +48,11 @@ SELECT TO_DATETIME('2022-01-02T01:12:00-07:00');
 
 ---
 2022-01-02 08:12:00.000000
+
+SELECT TO_DATETIME('2022-01-02T01');
+
+---
+2022-01-02 01:00:00.000000
 ```
 
 ### Using an Integer as Argument

docs/doc/30-reference/20-functions/30-datetime-functions/todatetime.md

@@ -33,8 +33,8 @@ common-grpc = { path = "../common/grpc" }
 common-macros = { path = "../common/macros" }
 common-meta-api = { path = "../meta/api" }
 common-meta-app = { path = "../meta/app" }
+common-meta-client = { path = "../meta/client" }
 common-meta-embedded = { path = "../meta/embedded" }
-common-meta-grpc = { path = "../meta/grpc" }
 common-meta-raft-store = { path = "../meta/raft-store" }
 common-meta-sled-store = { path = "../meta/sled-store" }
 common-meta-store = { path = "../meta/store" }

src/binaries/Cargo.toml

@@ -27,8 +27,8 @@ use common_meta_app::schema::DatabaseNameIdent;
 use common_meta_app::schema::GetTableReq;
 use common_meta_app::schema::TableNameIdent;
 use common_meta_app::schema::UpsertTableOptionReq;
-use common_meta_grpc::ClientHandle;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::ClientHandle;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::UpsertKVReq;

src/binaries/metabench/main.rs

@@ -15,7 +15,7 @@
 use std::fs::File;
 use std::io::Write;
 
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::protobuf::Empty;
 use tokio_stream::StreamExt;
 

src/binaries/metactl/grpc.rs

@@ -20,7 +20,7 @@ mod snapshot;
 use clap::Parser;
 use common_base::base::tokio;
 use common_meta_api::KVApi;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use common_meta_raft_store::config::get_default_raft_advertise_host;
 use common_tracing::init_logging;
 use common_tracing::Config as LogConfig;

src/binaries/metactl/main.rs

@@ -18,8 +18,8 @@ use std::sync::Arc;
 
 use common_base::base::RuntimeTracker;
 use common_macros::databend_main;
+use common_meta_client::MIN_METASRV_SEMVER;
 use common_meta_embedded::MetaEmbedded;
-use common_meta_grpc::MIN_METASRV_SEMVER;
 use common_metrics::init_default_metrics_recorder;
 use common_tracing::set_panic_hook;
 use databend_query::api::HttpService;

src/binaries/query/main.rs

@@ -97,15 +97,27 @@ where R: BufferRead
             loop {
                 buf.clear();
                 let size = self.keep_read(&mut buf, |f| (b'0'..=b'9').contains(&f))?;
-                match get_time(&mut buf, size) {
-                    Ok(time) => times.push(time),
-                    Err(e) => return Err(e),
-                }
-                if times.len() == 3 {
+                if size == 0 {
                     break;
+                } else {
+                    let time = get_time(&mut buf, size)?;
+                    times.push(time);
+                    if times.len() == 3 {
+                        break;
+                    }
+                    self.ignore_byte(b':')?;
                 }
-                self.must_ignore_byte(b':')?;
             }
+            // Time part is HH:MM or HH or empty
+            // Examples: '2022-02-02T', '2022-02-02 ', '2022-02-02T02', '2022-02-02T3:', '2022-02-03T03:13', '2022-02-03T03:13:'
+            if times.len() < 3 {
+                times.resize(3, 0);
+                dt = tz
+                    .from_local_datetime(&d.and_hms(times[0], times[1], times[2]))
+                    .unwrap();
+                return less_1000(dt);
+            }
+
             dt = tz
                 .from_local_datetime(&d.and_hms(times[0], times[1], times[2]))
                 .unwrap();

src/common/io/src/buffer/buffer_read_datetime_ext.rs

@@ -19,10 +19,14 @@ use common_io::prelude::*;
 #[test]
 fn test_read_datetime_ext() -> Result<()> {
     let mut reader = BufferReader::new(
-        "2023-03-03,2022-02-02,2009-01-01 3:2:1.123,2009-01-01 0:00:00,2009-01-01 00:00:00.123,2009-01-01 00:00:00.123456,0002-03-03T00:01:02,2022-03-04T00:01:02+08:00,2022-03-04T00:01:02-08:00,0000-00-00,0000-00-00 00:00:00,0001-01-01 00:00:00,2020-01-01T11:11:11Z,2009-01-03 00:00:00,2020-01-01T11:11:11.123Z,2055-02-03 10:00:20.234+08:00,2055-02-03 10:00:20.234-08:00,1022-05-16T03:25:02.000000+08:00".as_bytes(),
+        "2022-02-02T,2022-02-02 12,2022-02-02T13:4:,2022-02-02 12:03,2023-03-03,2022-02-02,2009-01-01 3:2:1.123,2009-01-01 0:00:00,2009-01-01 00:00:00.123,2009-01-01 00:00:00.123456,0002-03-03T00:01:02,2022-03-04T00:01:02+08:00,2022-03-04T00:01:02-08:00,0000-00-00,0000-00-00 00:00:00,0001-01-01 00:00:00,2020-01-01T11:11:11Z,2009-01-03 00:00:00,2020-01-01T11:11:11.123Z,2055-02-03 10:00:20.234+08:00,2055-02-03 10:00:20.234-08:00,1022-05-16T03:25:02.000000+08:00".as_bytes(),
     );
     let tz = Tz::UTC;
     let expected = vec![
+        "2022-02-02T00:00:00UTC",
+        "2022-02-02T12:00:00UTC",
+        "2022-02-02T13:04:00UTC",
+        "2022-02-02T12:03:00UTC",
         "2023-03-03T00:00:00UTC",
         "2022-02-02T00:00:00UTC",
         "2009-01-01T03:02:01.123UTC",

src/common/io/tests/it/buffer/buffer_read_datetime_ext.rs

@@ -5,7 +5,7 @@ Databend Meta is a transactional metadata service.
 - [`api`](./api/), the user level api interface exposed based on the KVApi implementation.
 - [`app`](./app/), defines meta data types used by meta-client application.
 - [`embedded`](./embedded/), a meta store backed with a local sled::Tree.
-- [`grpc`](./grpc/), the client library based on grpc and is used to communicate with meta service.
+- [`grpc`](client/), the client library based on grpc and is used to communicate with meta service.
 - [`protos`](./protos/) defines the protobuf messages a meta client talks to a meta server.
 - [`proto-conv`](./proto-conv/) defines how to convert metadata types in rust from and to protobuf messages.
 - [`raft-store`](./raft-store/), the storage layer implementation of openraft, including the state machine.