replace uuid with ulid (#251)

* replace uuid with ulid.
G-Research · Oct 3, 2024 · 3bda40d · 3bda40d
1 parent 457704f
commit 3bda40d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/internal/database/repository/application.go b/internal/database/repository/application.go
@@ -5,13 +5,14 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/oklog/ulid/v2"
+
 	"github.com/G-Research/yunikorn-history-server/internal/model"
 	"github.com/G-Research/yunikorn-history-server/internal/util"
 
 	"github.com/G-Research/yunikorn-history-server/internal/database/sql"
 
 	"github.com/apache/yunikorn-core/pkg/webservice/dao"
-	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 )
 
@@ -80,7 +81,7 @@ func (s *PostgresRepository) UpsertApplications(ctx context.Context, apps []*dao
 		}
 		_, err = s.dbpool.Exec(ctx, upsertSQL,
 			pgx.NamedArgs{
-				"id":                   uuid.NewString(),
+				"id":                   ulid.Make().String(),
 				"app_id":               a.ApplicationID,
 				"used_resource":        a.UsedResource,
 				"max_used_resource":    a.MaxUsedResource,

diff --git a/internal/database/repository/history.go b/internal/database/repository/history.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/apache/yunikorn-core/pkg/webservice/dao"
-	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/oklog/ulid/v2"
 )
 
 func (s *PostgresRepository) UpdateHistory(
@@ -23,7 +23,7 @@ func (s *PostgresRepository) UpdateHistory(
 	for _, app := range apps {
 		_, err := s.dbpool.Exec(ctx, appSQL,
 			pgx.NamedArgs{
-				"id":           uuid.NewString(),
+				"id":           ulid.Make().String(),
 				"total_number": app.TotalApplications,
 				"timestamp":    app.Timestamp,
 			})
@@ -34,7 +34,7 @@ func (s *PostgresRepository) UpdateHistory(
 	for _, container := range containers {
 		_, err := s.dbpool.Exec(ctx, containerSQL,
 			pgx.NamedArgs{
-				"id":           uuid.NewString(),
+				"id":           ulid.Make().String(),
 				"total_number": container.TotalContainers,
 				"timestamp":    container.Timestamp,
 			})

diff --git a/internal/database/repository/node.go b/internal/database/repository/node.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/apache/yunikorn-core/pkg/webservice/dao"
-	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/oklog/ulid/v2"
 )
@@ -29,7 +28,7 @@ func (s *PostgresRepository) UpsertNodes(ctx context.Context, nodes []*dao.NodeD
 	for _, n := range nodes {
 		_, err := s.dbpool.Exec(ctx, upsertSQL,
 			pgx.NamedArgs{
-				"id":           uuid.NewString(),
+				"id":           ulid.Make().String(),
 				"node_id":      n.NodeID,
 				"partition":    partition,
 				"host_name":    n.HostName,
@@ -63,7 +62,7 @@ func (s *PostgresRepository) InsertNodeUtilizations(
 	for _, nu := range nus {
 		_, err := s.dbpool.Exec(ctx, insertSQL,
 			pgx.NamedArgs{
-				"id":              ulid.Make(),
+				"id":              ulid.Make().String(),
 				"cluster_id":      nu.ClusterID,
 				"partition":       nu.Partition,
 				"nodes_util_list": nu.NodesUtilList,

diff --git a/internal/database/repository/partitions.go b/internal/database/repository/partitions.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/apache/yunikorn-core/pkg/webservice/dao"
-	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/oklog/ulid/v2"
 )
 
 func (s *PostgresRepository) UpsertPartitions(ctx context.Context, partitions []*dao.PartitionInfo) error {
@@ -35,7 +35,7 @@ func (s *PostgresRepository) UpsertPartitions(ctx context.Context, partitions []
 	for _, p := range partitions {
 		_, err := s.dbpool.Exec(ctx, upsertSQL,
 			pgx.NamedArgs{
-				"id":                         uuid.NewString(),
+				"id":                         ulid.Make().String(),
 				"cluster_id":                 p.ClusterID,
 				"name":                       p.Name,
 				"capacity":                   p.Capacity.Capacity,

diff --git a/internal/database/repository/queue.go b/internal/database/repository/queue.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/apache/yunikorn-core/pkg/webservice/dao"
-	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/oklog/ulid/v2"
 
 	"github.com/G-Research/yunikorn-history-server/internal/model"
 	"github.com/G-Research/yunikorn-history-server/internal/util"
@@ -59,7 +59,7 @@ func (s *PostgresRepository) UpsertQueues(ctx context.Context, queues []*dao.Par
 		}
 		_, err = s.dbpool.Exec(ctx, upsertSQL,
 			pgx.NamedArgs{
-				"id":                       uuid.NewString(),
+				"id":                       ulid.Make().String(),
 				"parent_id":                parentId,
 				"queue_name":               q.QueueName,
 				"status":                   q.Status,

diff --git a/migrations/20240628155246_init-tables.up.sql b/migrations/20240628155246_init-tables.up.sql
@@ -1,6 +1,6 @@
 -- Create partitions table
 CREATE TABLE partitions(
-    id UUID,
+    id TEXT,
     cluster_id TEXT NOT NULL,
     name TEXT NOT NULL,
     capacity JSONB,
@@ -18,7 +18,7 @@ CREATE TABLE partitions(
 
 -- Create applications table
 CREATE TABLE applications(
-    id UUID,
+    id TEXT,
     app_id TEXT NOT NULL,
     used_resource JSONB,
     max_used_resource JSONB,
@@ -80,7 +80,7 @@ CREATE UNIQUE INDEX idx_partition_queue_name ON queues (partition, queue_name);
 
 -- Create nodes table
 CREATE TABLE nodes(
-    id UUID,
+    id TEXT,
     node_id TEXT NOT NULL,
     partition TEXT NOT NULL,
     host_name TEXT NOT NULL,
@@ -102,7 +102,7 @@ CREATE TABLE nodes(
 
 -- Create partition_nodes_util table
 CREATE TABLE partition_nodes_util(
-    id UUID,
+    id TEXT,
     cluster_id TEXT NOT NULL,
     partition TEXT NOT NULL,
     nodes_util_list JSONB,
@@ -118,7 +118,7 @@ CREATE TYPE history_type AS ENUM ('container', 'application');
 
 -- Create history table
 CREATE TABLE history(
-    id UUID,
+    id TEXT,
     history_type history_type NOT NULL,
     total_number BIGINT NOT NULL,
     timestamp BIGINT NOT NULL,