Merge pull request #101 from eldenmoon/doris-ddl

update doris ddl and version

Author: rschu1ze

doris/ddl.sql

@@ -1,8 +1,11 @@
 CREATE TABLE bluesky (
-    `id` BIGINT NOT NULL AUTO_INCREMENT,
-    `data` variant NOT NULL
+    kind VARCHAR(100) GENERATED ALWAYS AS (get_json_string(data, '$.kind')) NOT NULL,
+    operation VARCHAR(100) GENERATED ALWAYS AS (get_json_string(data, '$.commit.operation')) NULL,
+    collection VARCHAR(100) GENERATED ALWAYS AS (get_json_string(data, '$.commit.collection')) NULL,
+    did VARCHAR(100) GENERATED ALWAYS AS (get_json_string(data,'$.did')) NOT NULL,
+    time DATETIME GENERATED ALWAYS AS (from_microsecond(get_json_bigint(data, '$.time_us'))) NOT NULL,
+    `data` variant<'kind': string, 'commit.operation' : string, 'commit.collection' : string, 'did' : string, 'time_us' : bigint, properties("variant_max_subcolumns_count" = "1024")> NOT NULL
 )
-DISTRIBUTED BY HASH(id) BUCKETS 32
-PROPERTIES (
-    "replication_num"="1"
-);
+DUPLICATE KEY (kind, operation, collection, did)
+DISTRIBUTED BY HASH(collection, did) BUCKETS 32
+PROPERTIES ("replication_num"="1");

doris/main.sh

@@ -2,7 +2,7 @@
 
 # If you change something in this file, please change also in starrocks/main.sh.
 
-export DORIS_FULL_NAME="apache-doris-3.0.5-bin-x64"
+export DORIS_FULL_NAME="apache-doris-3.1.0-bin-x64"
 
 DEFAULT_CHOICE=ask
 DEFAULT_DATA_DIRECTORY=~/data/bluesky

doris/queries_materialized.sql doris/queries.sqldoris/queries_materialized.sql renamed to doris/queries.sql

@@ -12,10 +12,10 @@
   "total_size": 214623810748,
   "data_size": 214623810748,
   "result": [
-      [4.24,1.67,1.66],
-      [222.33,11.01,10.16],
-      [27.82,7.47,7.45],
-      [235.20,6.41,6.07],
-      [234.71,6.37,5.78]
+      [1.84,1.61,1.61],
+	[43.06,6.20,6.18],
+	[21.74,5.67,5.45],
+	[4.46,1.18,1.12],
+	[1.15,1.16,1.15]
   ]
 }

doris/results/m6i.8xlarge_bluesky_1000m.json

@@ -12,10 +12,10 @@
   "total_size": 21304111530,
   "data_size": 21304111530,
   "result": [
-      [0.23,0.19,0.19],
-      [20.94,1.01,1.04],
-      [1.21,0.74,0.75],
-      [0.54,0.51,0.55],
-      [0.57,0.56,0.53]
+      [0.19,0.18,0.19],
+	[1.06,0.72,0.70],
+	[1.23,0.57,0.55],
+	[0.16,0.15,0.16],
+	[0.17,0.18,0.16]
   ]
 }

doris/results/m6i.8xlarge_bluesky_100m.json

@@ -12,10 +12,10 @@
   "total_size": 2170032226,
   "data_size": 2170032226,
   "result": [
-      [1.05,0.04,0.05],
-      [1.33,0.15,0.15],
-      [0.11,0.11,0.11],
-      [0.08,0.08,0.08],
-      [0.09,0.08,0.08]
+      [0.03,0.04,0.04],
+	[0.11,0.11,0.11],
+	[0.08,0.07,0.08],
+	[0.03,0.03,0.04],
+	[0.03,0.03,0.04]
   ]
 }

doris/results/m6i.8xlarge_bluesky_10m.json

@@ -12,10 +12,10 @@
   "total_size": 207785820,
   "data_size": 207785820,
   "result": [
-      [0.05,0.02,0.03],
-      [0.09,0.04,0.05],
-      [0.06,0.04,0.04],
-      [0.04,0.03,0.05],
-      [0.03,0.04,0.03]
+      [0.02,0.02,0.02],
+	[0.04,0.03,0.03],
+	[0.02,0.02,0.03],
+	[0.03,0.02,0.02],
+	[0.02,0.02,0.02]
   ]
 }