Skip to content

Commit 32af214

Browse files
committed
fix contextID type, move ipni in market
1 parent e2d9c9a commit 32af214

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

harmony/harmonydb/sql/20240823-ipni.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
CREATE TABLE ipni (
33
order_number BIGSERIAL PRIMARY KEY, -- Unique increasing order number
44
ad_cid TEXT NOT NULL,
5-
context_id TEXT NOT NULL, -- abi.PieceInfo in Curio
5+
context_id BYTEA NOT NULL, -- abi.PieceInfo in Curio
66
-- metadata column in not required as Curio only supports one type of metadata(HTTP)
77
is_rm BOOLEAN NOT NULL,
88

@@ -39,7 +39,7 @@ CREATE TABLE ipni_head (
3939

4040
CREATE OR REPLACE FUNCTION insert_ad_and_update_head(
4141
_ad_cid TEXT,
42-
_context_id TEXT,
42+
_context_id BYTEA,
4343
_is_rm BOOLEAN,
4444
_provider TEXT,
4545
_addresses TEXT,
@@ -71,7 +71,7 @@ CREATE OR REPLACE FUNCTION get_ad_chain(
7171
_ad_cid TEXT
7272
) RETURNS TABLE (
7373
ad_cid TEXT,
74-
context_id TEXT,
74+
context_id BYTEA,
7575
is_rm BOOLEAN,
7676
previous TEXT,
7777
provider TEXT,
@@ -98,7 +98,7 @@ END;
9898
$$ LANGUAGE plpgsql;
9999

100100
-- IPNI pipeline is kept separate from rest for robustness
101-
-- and reuse. This allows for removing, recreating as using CLI.
101+
-- and reuse. This allows for removing, recreating ads using CLI.
102102
CREATE TABLE ipni_task (
103103
sp_id BIGINT NOT NULL,
104104
sector BIGINT NOT NULL,

lib/ipni/chunker/chunker.go renamed to market/ipni/chunker/chunker.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ import (
77
"io"
88
"slices"
99

10+
"github.com/filecoin-project/curio/market/ipni/ipniculib"
1011
lru "github.com/hashicorp/golang-lru/v2"
1112
logging "github.com/ipfs/go-log/v2"
1213
"github.com/ipld/go-car/v2/index"
1314
"github.com/ipld/go-ipld-prime"
1415
"github.com/ipld/go-ipld-prime/datamodel"
1516
"github.com/ipni/go-libipni/ingest/schema"
1617
"github.com/multiformats/go-multihash"
17-
18-
"github.com/filecoin-project/curio/lib/ipni/ipniculib"
1918
)
2019

2120
var log = logging.Logger("chunker")

lib/ipni/ipni-provider/ipni-provider.go renamed to market/ipni/ipni-provider/ipni-provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import (
1111
"strings"
1212
"time"
1313

14+
"github.com/filecoin-project/curio/market/ipni/chunker"
15+
"github.com/filecoin-project/curio/market/ipni/ipniculib"
1416
"github.com/gorilla/mux"
1517
lru "github.com/hashicorp/golang-lru/v2"
1618
"github.com/ipfs/go-cid"
@@ -35,8 +37,6 @@ import (
3537

3638
"github.com/filecoin-project/curio/deps"
3739
"github.com/filecoin-project/curio/harmony/harmonydb"
38-
"github.com/filecoin-project/curio/lib/ipni/chunker"
39-
"github.com/filecoin-project/curio/lib/ipni/ipniculib"
4040
"github.com/filecoin-project/curio/lib/pieceprovider"
4141
"github.com/filecoin-project/curio/lib/storiface"
4242
"github.com/filecoin-project/curio/lib/urltomultiaddr"
File renamed without changes.

tasks/indexing/task_ipni.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import (
2727
"github.com/filecoin-project/curio/harmony/harmonytask"
2828
"github.com/filecoin-project/curio/harmony/resources"
2929
"github.com/filecoin-project/curio/lib/ffi"
30-
"github.com/filecoin-project/curio/lib/ipni/chunker"
31-
"github.com/filecoin-project/curio/lib/ipni/ipniculib"
3230
"github.com/filecoin-project/curio/lib/passcall"
3331
"github.com/filecoin-project/curio/lib/pieceprovider"
3432
"github.com/filecoin-project/curio/lib/storiface"
3533
"github.com/filecoin-project/curio/market/indexstore"
34+
"github.com/filecoin-project/curio/market/ipni/chunker"
35+
"github.com/filecoin-project/curio/market/ipni/ipniculib"
3636
)
3737

3838
var ilog = logging.Logger("ipni")

0 commit comments

Comments
 (0)