From a4ef16b4aa062c443e6d7c5afb658932d6443b3c Mon Sep 17 00:00:00 2001 From: Andrew Richardson Date: Wed, 22 Jun 2022 17:21:43 -0400 Subject: [PATCH] Remove "namespace" as a query param from all routes Signed-off-by: Andrew Richardson --- docs/swagger/swagger.yaml | 310 ------------------ internal/database/sqlcommon/data_sql_test.go | 1 - .../database/sqlcommon/datatype_sql_test.go | 1 - .../database/sqlcommon/filter_sql_test.go | 20 +- internal/database/sqlcommon/group_sql_test.go | 1 - .../database/sqlcommon/message_sql_test.go | 1 - .../sqlcommon/subscription_sql_test.go | 1 - .../database/sqlcommon/tokenpool_sql_test.go | 1 - .../database/sqlcommon/verifier_sql_test.go | 1 - internal/events/aggregator_batch_state.go | 1 - internal/events/event_dispatcher.go | 10 +- internal/networkmap/data_query.go | 1 - internal/networkmap/did.go | 1 - pkg/database/filter_test.go | 32 +- pkg/database/plugin.go | 70 ++-- 15 files changed, 53 insertions(+), 399 deletions(-) diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index ee397f80d1..c178f1a75f 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -31,11 +31,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: Sort field. For multi-field sort use comma separated values (or multiple query values) with '-' prefix for descending in: query @@ -820,11 +815,6 @@ paths: name: location schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: signature @@ -1439,11 +1429,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: node @@ -1680,11 +1665,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: protocolid @@ -2016,11 +1996,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: version @@ -3455,11 +3430,6 @@ paths: name: location schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: signature @@ -4169,11 +4139,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: validator @@ -4569,11 +4534,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pins @@ -4718,11 +4678,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pins @@ -4957,11 +4912,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: validator @@ -5318,11 +5268,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: reference @@ -5609,11 +5554,6 @@ paths: name: message schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: Sort field. For multi-field sort use comma separated values (or multiple query values) with '-' prefix for descending in: query @@ -5825,11 +5765,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -6724,11 +6659,6 @@ paths: name: identity schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type @@ -6878,11 +6808,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pins @@ -7398,11 +7323,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: reference @@ -8959,11 +8879,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: Sort field. For multi-field sort use comma separated values (or multiple query values) with '-' prefix for descending in: query @@ -9850,11 +9765,6 @@ paths: name: location schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: signature @@ -10617,11 +10527,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: node @@ -10872,11 +10777,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: protocolid @@ -11229,11 +11129,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: version @@ -12710,11 +12605,6 @@ paths: name: location schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: signature @@ -13459,11 +13349,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: validator @@ -13880,11 +13765,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pins @@ -14036,11 +13916,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pins @@ -14282,11 +14157,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: validator @@ -14664,11 +14534,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: reference @@ -14969,11 +14834,6 @@ paths: name: message schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: Sort field. For multi-field sort use comma separated values (or multiple query values) with '-' prefix for descending in: query @@ -15199,11 +15059,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -16140,11 +15995,6 @@ paths: name: identity schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type @@ -16301,11 +16151,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pins @@ -16842,11 +16687,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: reference @@ -18411,11 +18251,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -18765,11 +18600,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -19250,11 +19080,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -19928,11 +19753,6 @@ paths: name: input schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: output @@ -20335,11 +20155,6 @@ paths: name: masked schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: sequence @@ -20770,11 +20585,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: options @@ -22188,11 +21998,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: updated @@ -22276,11 +22081,6 @@ paths: schema: default: 2m0s type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pool @@ -22398,11 +22198,6 @@ paths: name: localid schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: operator @@ -22814,11 +22609,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pool @@ -23791,11 +23581,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: standard @@ -24381,11 +24166,6 @@ paths: name: messagehash schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pool @@ -25110,11 +24890,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type @@ -25245,11 +25020,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type @@ -25658,11 +25428,6 @@ paths: name: identity schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type @@ -25993,11 +25758,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -26333,11 +26093,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -26797,11 +26552,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: parent @@ -27447,11 +27197,6 @@ paths: name: input schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: output @@ -27833,11 +27578,6 @@ paths: name: masked schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: sequence @@ -28247,11 +27987,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: options @@ -29630,11 +29365,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: updated @@ -29711,11 +29441,6 @@ paths: schema: default: 2m0s type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pool @@ -29826,11 +29551,6 @@ paths: name: localid schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: operator @@ -30228,11 +29948,6 @@ paths: name: key schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pool @@ -31169,11 +30884,6 @@ paths: name: name schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: standard @@ -31738,11 +31448,6 @@ paths: name: messagehash schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: pool @@ -32446,11 +32151,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type @@ -32574,11 +32274,6 @@ paths: name: id schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type @@ -32959,11 +32654,6 @@ paths: name: identity schema: type: string - - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' - in: query - name: namespace - schema: - type: string - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^' in: query name: type diff --git a/internal/database/sqlcommon/data_sql_test.go b/internal/database/sqlcommon/data_sql_test.go index 573f9b6d21..ffad607563 100644 --- a/internal/database/sqlcommon/data_sql_test.go +++ b/internal/database/sqlcommon/data_sql_test.go @@ -129,7 +129,6 @@ func TestDataE2EWithDB(t *testing.T) { fb := database.DataQueryFactory.NewFilter(ctx) filter := fb.And( fb.Eq("id", dataUpdated.ID.String()), - fb.Eq("namespace", dataUpdated.Namespace), fb.Eq("validator", string(dataUpdated.Validator)), fb.Eq("datatype.name", dataUpdated.Datatype.Name), fb.Eq("datatype.version", dataUpdated.Datatype.Version), diff --git a/internal/database/sqlcommon/datatype_sql_test.go b/internal/database/sqlcommon/datatype_sql_test.go index fc7dc72065..fad4efb5e2 100644 --- a/internal/database/sqlcommon/datatype_sql_test.go +++ b/internal/database/sqlcommon/datatype_sql_test.go @@ -104,7 +104,6 @@ func TestDatatypeE2EWithDB(t *testing.T) { fb := database.DatatypeQueryFactory.NewFilter(ctx) filter := fb.And( fb.Eq("id", datatypeUpdated.ID.String()), - fb.Eq("namespace", datatypeUpdated.Namespace), fb.Eq("validator", string(datatypeUpdated.Validator)), fb.Eq("name", datatypeUpdated.Name), fb.Eq("version", datatypeUpdated.Version), diff --git a/internal/database/sqlcommon/filter_sql_test.go b/internal/database/sqlcommon/filter_sql_test.go index 54f5dfcfe9..d75fb9a9f0 100644 --- a/internal/database/sqlcommon/filter_sql_test.go +++ b/internal/database/sqlcommon/filter_sql_test.go @@ -32,7 +32,7 @@ func TestSQLQueryFactory(t *testing.T) { s.individualSort = true fb := database.MessageQueryFactory.NewFilter(context.Background()) f := fb.And( - fb.Eq("namespace", "ns1"), + fb.Eq("tag", "tag1"), fb.Or( fb.Eq("id", "35c11cba-adff-4a4d-970a-02e3a0858dc8"), fb.Eq("id", "caefb9d1-9fc9-4d6a-a155-514d3139adf7"), @@ -43,7 +43,7 @@ func TestSQLQueryFactory(t *testing.T) { Skip(50). Limit(25). Sort("-id"). - Sort("namespace"). + Sort("tag"). Sort("-sequence") sel := squirrel.Select("*").From("mytable") @@ -54,8 +54,8 @@ func TestSQLQueryFactory(t *testing.T) { sqlFilter, args, err := sel.ToSql() assert.NoError(t, err) - assert.Equal(t, "SELECT * FROM mytable WHERE (ns = ? AND (id = ? OR id = ?) AND seq > ? AND confirmed IS NULL) ORDER BY id DESC, ns, seq DESC LIMIT 25 OFFSET 50", sqlFilter) - assert.Equal(t, "ns1", args[0]) + assert.Equal(t, "SELECT * FROM mytable WHERE (tag = ? AND (id = ? OR id = ?) AND seq > ? AND confirmed IS NULL) ORDER BY id DESC, tag, seq DESC LIMIT 25 OFFSET 50", sqlFilter) + assert.Equal(t, "tag1", args[0]) assert.Equal(t, "35c11cba-adff-4a4d-970a-02e3a0858dc8", args[1]) assert.Equal(t, "caefb9d1-9fc9-4d6a-a155-514d3139adf7", args[2]) assert.Equal(t, int64(12345), args[3]) @@ -125,8 +125,8 @@ func TestSQLQueryFactoryFinalizeFail(t *testing.T) { s, _ := newMockProvider().init() fb := database.MessageQueryFactory.NewFilter(context.Background()) sel := squirrel.Select("*").From("mytable") - _, _, _, err := s.filterSelect(context.Background(), "ns", sel, fb.Eq("namespace", map[bool]bool{true: false}), nil, []interface{}{"sequence"}) - assert.Regexp(t, "FF00143.*namespace", err) + _, _, _, err := s.filterSelect(context.Background(), "ns", sel, fb.Eq("tag", map[bool]bool{true: false}), nil, []interface{}{"sequence"}) + assert.Regexp(t, "FF00143.*tag", err) } func TestSQLQueryFactoryBadOp(t *testing.T) { @@ -168,7 +168,7 @@ func TestSQLQueryFactoryDefaultSort(t *testing.T) { sel := squirrel.Select("*").From("mytable") fb := database.MessageQueryFactory.NewFilter(context.Background()) f := fb.And( - fb.Eq("namespace", "ns1"), + fb.Eq("tag", "tag1"), ) sel, _, _, err := s.filterSelect(context.Background(), "", sel, f, nil, []interface{}{ &database.SortField{ @@ -181,8 +181,8 @@ func TestSQLQueryFactoryDefaultSort(t *testing.T) { sqlFilter, args, err := sel.ToSql() assert.NoError(t, err) - assert.Equal(t, "SELECT * FROM mytable WHERE (namespace = ?) ORDER BY seq DESC NULLS LAST", sqlFilter) - assert.Equal(t, "ns1", args[0]) + assert.Equal(t, "SELECT * FROM mytable WHERE (tag = ?) ORDER BY seq DESC NULLS LAST", sqlFilter) + assert.Equal(t, "tag1", args[0]) } func TestSQLQueryFactoryDefaultSortBadType(t *testing.T) { @@ -191,7 +191,7 @@ func TestSQLQueryFactoryDefaultSortBadType(t *testing.T) { sel := squirrel.Select("*").From("mytable") fb := database.MessageQueryFactory.NewFilter(context.Background()) f := fb.And( - fb.Eq("namespace", "ns1"), + fb.Eq("tag", "tag1"), ) assert.PanicsWithValue(t, "unknown sort type: 100", func() { s.filterSelect(context.Background(), "", sel, f, nil, []interface{}{100}) diff --git a/internal/database/sqlcommon/group_sql_test.go b/internal/database/sqlcommon/group_sql_test.go index b75840559c..8ce1defd56 100644 --- a/internal/database/sqlcommon/group_sql_test.go +++ b/internal/database/sqlcommon/group_sql_test.go @@ -93,7 +93,6 @@ func TestUpsertGroupE2EWithDB(t *testing.T) { fb := database.GroupQueryFactory.NewFilter(ctx) filter := fb.And( fb.Eq("hash", groupUpdated.Hash), - fb.Eq("namespace", groupUpdated.Namespace), fb.Eq("message", groupUpdated.Message), fb.Gt("created", "0"), ) diff --git a/internal/database/sqlcommon/message_sql_test.go b/internal/database/sqlcommon/message_sql_test.go index 21419f1930..75b51df822 100644 --- a/internal/database/sqlcommon/message_sql_test.go +++ b/internal/database/sqlcommon/message_sql_test.go @@ -148,7 +148,6 @@ func TestUpsertE2EWithDB(t *testing.T) { fb := database.MessageQueryFactory.NewFilter(ctx) filter := fb.And( fb.Eq("id", msgUpdated.Header.ID.String()), - fb.Eq("namespace", msgUpdated.Header.Namespace), fb.Eq("type", string(msgUpdated.Header.Type)), fb.Eq("author", msgUpdated.Header.Author), fb.Eq("topics", msgUpdated.Header.Topics), diff --git a/internal/database/sqlcommon/subscription_sql_test.go b/internal/database/sqlcommon/subscription_sql_test.go index c8e12dc69f..62b3975f1b 100644 --- a/internal/database/sqlcommon/subscription_sql_test.go +++ b/internal/database/sqlcommon/subscription_sql_test.go @@ -111,7 +111,6 @@ func TestSubscriptionsE2EWithDB(t *testing.T) { // Query back the subscription fb := database.SubscriptionQueryFactory.NewFilter(ctx) filter := fb.And( - fb.Eq("namespace", subscriptionUpdated.Namespace), fb.Eq("name", subscriptionUpdated.Name), ) subscriptionRes, res, err := s.GetSubscriptions(ctx, "ns1", filter.Count(true)) diff --git a/internal/database/sqlcommon/tokenpool_sql_test.go b/internal/database/sqlcommon/tokenpool_sql_test.go index 6d84f39f32..72be8a5a8c 100644 --- a/internal/database/sqlcommon/tokenpool_sql_test.go +++ b/internal/database/sqlcommon/tokenpool_sql_test.go @@ -95,7 +95,6 @@ func TestTokenPoolE2EWithDB(t *testing.T) { fb := database.TokenPoolQueryFactory.NewFilter(ctx) filter := fb.And( fb.Eq("id", pool.ID.String()), - fb.Eq("namespace", pool.Namespace), fb.Eq("name", pool.Name), fb.Eq("locator", pool.Locator), fb.Eq("message", pool.Message), diff --git a/internal/database/sqlcommon/verifier_sql_test.go b/internal/database/sqlcommon/verifier_sql_test.go index 90759fbb99..0544eb8939 100644 --- a/internal/database/sqlcommon/verifier_sql_test.go +++ b/internal/database/sqlcommon/verifier_sql_test.go @@ -88,7 +88,6 @@ func TestVerifiersE2EWithDB(t *testing.T) { fb := database.VerifierQueryFactory.NewFilter(ctx) filter := fb.And( fb.Eq("value", string(verifierUpdated.Value)), - fb.Eq("namespace", verifierUpdated.Namespace), ) verifierRes, res, err := s.GetVerifiers(ctx, "ns1", filter.Count(true)) assert.NoError(t, err) diff --git a/internal/events/aggregator_batch_state.go b/internal/events/aggregator_batch_state.go index 18472de638..3dc54708a3 100644 --- a/internal/events/aggregator_batch_state.go +++ b/internal/events/aggregator_batch_state.go @@ -308,7 +308,6 @@ func (bs *batchState) flushPins(ctx context.Context) error { filter := fb.Or() for batchID, indexes := range pinsDispatched { filter.Condition(fb.And( - fb.Eq("namespace", bs.namespace), fb.Eq("batch", batchID), fb.In("index", indexes), )) diff --git a/internal/events/event_dispatcher.go b/internal/events/event_dispatcher.go index ea642b1d66..2462146c68 100644 --- a/internal/events/event_dispatcher.go +++ b/internal/events/event_dispatcher.go @@ -109,12 +109,10 @@ func newEventDispatcher(ctx context.Context, ei events.Plugin, di database.Plugi MaximumDelay: config.GetDuration(coreconfig.EventDispatcherRetryMaxDelay), Factor: config.GetFloat64(coreconfig.EventDispatcherRetryFactor), }, - namespace: sub.definition.Namespace, - offsetType: core.OffsetTypeSubscription, - offsetName: sub.definition.ID.String(), - addCriteria: func(af database.AndFilter) database.AndFilter { - return af.Condition(af.Builder().Eq("namespace", sub.definition.Namespace)) - }, + namespace: sub.definition.Namespace, + offsetType: core.OffsetTypeSubscription, + offsetName: sub.definition.ID.String(), + addCriteria: func(af database.AndFilter) database.AndFilter { return af }, queryFactory: database.EventQueryFactory, getItems: ed.getEvents, newEventsHandler: ed.bufferedDelivery, diff --git a/internal/networkmap/data_query.go b/internal/networkmap/data_query.go index 56549ed020..0d86c0e97e 100644 --- a/internal/networkmap/data_query.go +++ b/internal/networkmap/data_query.go @@ -105,7 +105,6 @@ func (nm *networkMap) GetIdentityByID(ctx context.Context, id string) (*core.Ide func (nm *networkMap) withVerifiers(ctx context.Context, identity *core.Identity) (*core.IdentityWithVerifiers, error) { fb := database.VerifierQueryFactory.NewFilter(ctx) filter := fb.And( - fb.Eq("namespace", identity.Namespace), fb.Eq("identity", identity.ID), ) verifiers, _, err := nm.database.GetVerifiers(ctx, nm.namespace, filter) diff --git a/internal/networkmap/did.go b/internal/networkmap/did.go index 6d3f5a3501..8ecab752a5 100644 --- a/internal/networkmap/did.go +++ b/internal/networkmap/did.go @@ -48,7 +48,6 @@ func (nm *networkMap) generateDIDDocument(ctx context.Context, identity *core.Id fb := database.VerifierQueryFactory.NewFilter(ctx) filter := fb.And( fb.Eq("identity", identity.ID), - fb.Eq("namespace", identity.Namespace), ) verifiers, _, err := nm.database.GetVerifiers(ctx, nm.namespace, filter) if err != nil { diff --git a/pkg/database/filter_test.go b/pkg/database/filter_test.go index 2f30cc5712..5e303e8379 100644 --- a/pkg/database/filter_test.go +++ b/pkg/database/filter_test.go @@ -29,7 +29,7 @@ import ( func TestBuildMessageFilter(t *testing.T) { fb := MessageQueryFactory.NewFilter(context.Background()) f, err := fb.And(). - Condition(fb.Eq("namespace", "ns1")). + Condition(fb.Eq("tag", "tag1")). Condition(fb.Or(). Condition(fb.Eq("id", "35c11cba-adff-4a4d-970a-02e3a0858dc8")). Condition(fb.Eq("id", "caefb9d1-9fc9-4d6a-a155-514d3139adf7")), @@ -39,11 +39,11 @@ func TestBuildMessageFilter(t *testing.T) { Skip(50). Limit(25). Count(true). - Sort("namespace"). + Sort("tag"). Descending(). Finalize() assert.NoError(t, err) - assert.Equal(t, "( namespace == 'ns1' ) && ( ( id == '35c11cba-adff-4a4d-970a-02e3a0858dc8' ) || ( id == 'caefb9d1-9fc9-4d6a-a155-514d3139adf7' ) ) && ( sequence >> 12345 ) && ( confirmed == null ) sort=-namespace skip=50 limit=25 count=true", f.String()) + assert.Equal(t, "( tag == 'tag1' ) && ( ( id == '35c11cba-adff-4a4d-970a-02e3a0858dc8' ) || ( id == 'caefb9d1-9fc9-4d6a-a155-514d3139adf7' ) ) && ( sequence >> 12345 ) && ( confirmed == null ) sort=-tag skip=50 limit=25 count=true", f.String()) } func TestBuildMessageFilter2(t *testing.T) { @@ -183,19 +183,19 @@ func TestBuildMessageStringConvert(t *testing.T) { u := fftypes.MustParseUUID("3f96e0d5-a10e-47c6-87a0-f2e7604af179") b32 := fftypes.UUIDBytes(u) f, err := fb.And( - fb.Lt("namespace", int(111)), - fb.Lt("namespace", int32(222)), - fb.Lt("namespace", int64(333)), - fb.Lt("namespace", uint(444)), - fb.Lt("namespace", uint32(555)), - fb.Lt("namespace", uint64(666)), - fb.Lt("namespace", *u), - fb.Lt("namespace", u), - fb.Lt("namespace", *b32), - fb.Lt("namespace", b32), + fb.Lt("tag", int(111)), + fb.Lt("tag", int32(222)), + fb.Lt("tag", int64(333)), + fb.Lt("tag", uint(444)), + fb.Lt("tag", uint32(555)), + fb.Lt("tag", uint64(666)), + fb.Lt("tag", *u), + fb.Lt("tag", u), + fb.Lt("tag", *b32), + fb.Lt("tag", b32), ).Finalize() assert.NoError(t, err) - assert.Equal(t, "( namespace << '111' ) && ( namespace << '222' ) && ( namespace << '333' ) && ( namespace << '444' ) && ( namespace << '555' ) && ( namespace << '666' ) && ( namespace << '3f96e0d5-a10e-47c6-87a0-f2e7604af179' ) && ( namespace << '3f96e0d5-a10e-47c6-87a0-f2e7604af179' ) && ( namespace << '3f96e0d5a10e47c687a0f2e7604af17900000000000000000000000000000000' ) && ( namespace << '3f96e0d5a10e47c687a0f2e7604af17900000000000000000000000000000000' )", f.String()) + assert.Equal(t, "( tag << '111' ) && ( tag << '222' ) && ( tag << '333' ) && ( tag << '444' ) && ( tag << '555' ) && ( tag << '666' ) && ( tag << '3f96e0d5-a10e-47c6-87a0-f2e7604af179' ) && ( tag << '3f96e0d5-a10e-47c6-87a0-f2e7604af179' ) && ( tag << '3f96e0d5a10e47c687a0f2e7604af17900000000000000000000000000000000' ) && ( tag << '3f96e0d5a10e47c687a0f2e7604af17900000000000000000000000000000000' )", f.String()) } func TestBuildMessageBoolConvert(t *testing.T) { @@ -244,8 +244,8 @@ func TestBuildFFStringArrayConvert(t *testing.T) { func TestBuildMessageFailStringConvert(t *testing.T) { fb := MessageQueryFactory.NewFilter(context.Background()) - _, err := fb.Lt("namespace", map[bool]bool{true: false}).Finalize() - assert.Regexp(t, "FF00143.*namespace", err) + _, err := fb.Lt("tag", map[bool]bool{true: false}).Finalize() + assert.Regexp(t, "FF00143.*tag", err) } func TestBuildMessageFailBoolConvert(t *testing.T) { diff --git a/pkg/database/plugin.go b/pkg/database/plugin.go index 61e5be8b33..e58096c7a5 100644 --- a/pkg/database/plugin.go +++ b/pkg/database/plugin.go @@ -693,7 +693,6 @@ type Capabilities struct { var MessageQueryFactory = &queryFields{ "id": &UUIDField{}, "cid": &UUIDField{}, - "namespace": &StringField{}, "type": &StringField{}, "author": &StringField{}, "key": &StringField{}, @@ -713,7 +712,6 @@ var MessageQueryFactory = &queryFields{ // BatchQueryFactory filter fields for batches var BatchQueryFactory = &queryFields{ "id": &UUIDField{}, - "namespace": &StringField{}, "type": &StringField{}, "author": &StringField{}, "key": &StringField{}, @@ -732,14 +730,12 @@ var TransactionQueryFactory = &queryFields{ "id": &UUIDField{}, "type": &StringField{}, "created": &TimeField{}, - "namespace": &StringField{}, "blockchainids": &FFStringArrayField{}, } // DataQueryFactory filter fields for data var DataQueryFactory = &queryFields{ "id": &UUIDField{}, - "namespace": &StringField{}, "validator": &StringField{}, "datatype.name": &StringField{}, "datatype.version": &StringField{}, @@ -756,7 +752,6 @@ var DataQueryFactory = &queryFields{ var DatatypeQueryFactory = &queryFields{ "id": &UUIDField{}, "message": &UUIDField{}, - "namespace": &StringField{}, "validator": &StringField{}, "name": &StringField{}, "version": &StringField{}, @@ -772,24 +767,22 @@ var OffsetQueryFactory = &queryFields{ // OperationQueryFactory filter fields for data operations var OperationQueryFactory = &queryFields{ - "id": &UUIDField{}, - "tx": &UUIDField{}, - "type": &StringField{}, - "namespace": &StringField{}, - "status": &StringField{}, - "error": &StringField{}, - "plugin": &StringField{}, - "input": &JSONField{}, - "output": &JSONField{}, - "created": &TimeField{}, - "updated": &TimeField{}, - "retry": &UUIDField{}, + "id": &UUIDField{}, + "tx": &UUIDField{}, + "type": &StringField{}, + "status": &StringField{}, + "error": &StringField{}, + "plugin": &StringField{}, + "input": &JSONField{}, + "output": &JSONField{}, + "created": &TimeField{}, + "updated": &TimeField{}, + "retry": &UUIDField{}, } // SubscriptionQueryFactory filter fields for data subscriptions var SubscriptionQueryFactory = &queryFields{ "id": &UUIDField{}, - "namespace": &StringField{}, "name": &StringField{}, "transport": &StringField{}, "events": &StringField{}, @@ -802,7 +795,6 @@ var SubscriptionQueryFactory = &queryFields{ var EventQueryFactory = &queryFields{ "id": &UUIDField{}, "type": &StringField{}, - "namespace": &StringField{}, "reference": &UUIDField{}, "correlator": &UUIDField{}, "tx": &UUIDField{}, @@ -813,7 +805,6 @@ var EventQueryFactory = &queryFields{ // PinQueryFactory filter fields for parked contexts var PinQueryFactory = &queryFields{ - "namespace": &StringField{}, "sequence": &Int64Field{}, "masked": &BoolField{}, "hash": &Bytes32Field{}, @@ -832,7 +823,6 @@ var IdentityQueryFactory = &queryFields{ "messages.verification": &UUIDField{}, "messages.update": &UUIDField{}, "type": &StringField{}, - "namespace": &StringField{}, "name": &StringField{}, "description": &StringField{}, "profile": &JSONField{}, @@ -842,19 +832,17 @@ var IdentityQueryFactory = &queryFields{ // VerifierQueryFactory filter fields for identities var VerifierQueryFactory = &queryFields{ - "hash": &Bytes32Field{}, - "identity": &UUIDField{}, - "type": &StringField{}, - "namespace": &StringField{}, - "value": &StringField{}, - "created": &TimeField{}, + "hash": &Bytes32Field{}, + "identity": &UUIDField{}, + "type": &StringField{}, + "value": &StringField{}, + "created": &TimeField{}, } // GroupQueryFactory filter fields for nodes var GroupQueryFactory = &queryFields{ "hash": &Bytes32Field{}, "message": &UUIDField{}, - "namespace": &StringField{}, "description": &StringField{}, "ledger": &UUIDField{}, "created": &TimeField{}, @@ -886,7 +874,6 @@ var BlobQueryFactory = &queryFields{ var TokenPoolQueryFactory = &queryFields{ "id": &UUIDField{}, "type": &StringField{}, - "namespace": &StringField{}, "name": &StringField{}, "standard": &StringField{}, "locator": &StringField{}, @@ -906,7 +893,6 @@ var TokenBalanceQueryFactory = &queryFields{ "tokenindex": &StringField{}, "uri": &StringField{}, "connector": &StringField{}, - "namespace": &StringField{}, "key": &StringField{}, "balance": &Int64Field{}, "updated": &TimeField{}, @@ -914,16 +900,14 @@ var TokenBalanceQueryFactory = &queryFields{ // TokenAccountQueryFactory filter fields for token accounts var TokenAccountQueryFactory = &queryFields{ - "key": &StringField{}, - "namespace": &StringField{}, - "updated": &TimeField{}, + "key": &StringField{}, + "updated": &TimeField{}, } // TokenAccountPoolQueryFactory filter fields for token account pools var TokenAccountPoolQueryFactory = &queryFields{ - "pool": &UUIDField{}, - "namespace": &StringField{}, - "updated": &TimeField{}, + "pool": &UUIDField{}, + "updated": &TimeField{}, } // TokenTransferQueryFactory filter fields for token transfers @@ -933,7 +917,6 @@ var TokenTransferQueryFactory = &queryFields{ "tokenindex": &StringField{}, "uri": &StringField{}, "connector": &StringField{}, - "namespace": &StringField{}, "key": &StringField{}, "from": &StringField{}, "to": &StringField{}, @@ -952,7 +935,6 @@ var TokenApprovalQueryFactory = &queryFields{ "localid": &StringField{}, "pool": &UUIDField{}, "connector": &StringField{}, - "namespace": &StringField{}, "key": &StringField{}, "operator": &StringField{}, "approved": &BoolField{}, @@ -967,16 +949,14 @@ var TokenApprovalQueryFactory = &queryFields{ // FFIQueryFactory filter fields for contract definitions var FFIQueryFactory = &queryFields{ - "id": &UUIDField{}, - "namespace": &StringField{}, - "name": &StringField{}, - "version": &StringField{}, + "id": &UUIDField{}, + "name": &StringField{}, + "version": &StringField{}, } // FFIMethodQueryFactory filter fields for contract methods var FFIMethodQueryFactory = &queryFields{ "id": &UUIDField{}, - "namespace": &StringField{}, "name": &StringField{}, "pathname": &StringField{}, "interface": &UUIDField{}, @@ -986,7 +966,6 @@ var FFIMethodQueryFactory = &queryFields{ // FFIEventQueryFactory filter fields for contract events var FFIEventQueryFactory = &queryFields{ "id": &UUIDField{}, - "namespace": &StringField{}, "name": &StringField{}, "pathname": &StringField{}, "interface": &UUIDField{}, @@ -997,7 +976,6 @@ var FFIEventQueryFactory = &queryFields{ var ContractListenerQueryFactory = &queryFields{ "id": &UUIDField{}, "interface": &UUIDField{}, - "namespace": &StringField{}, "location": &JSONField{}, "topic": &StringField{}, "signature": &StringField{}, @@ -1011,7 +989,6 @@ var ContractListenerQueryFactory = &queryFields{ var BlockchainEventQueryFactory = &queryFields{ "id": &UUIDField{}, "source": &StringField{}, - "namespace": &StringField{}, "name": &StringField{}, "protocolid": &StringField{}, "listener": &StringField{}, @@ -1025,6 +1002,5 @@ var BlockchainEventQueryFactory = &queryFields{ var ContractAPIQueryFactory = &queryFields{ "id": &UUIDField{}, "name": &StringField{}, - "namespace": &StringField{}, "interface": &UUIDField{}, }