Skip to content

Commit

Permalink
[ref] Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
ppodolsky committed May 19, 2024
1 parent bb54ad1 commit a2c4591
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 59 deletions.
45 changes: 0 additions & 45 deletions summa-server/src/components/consumers/dummy.rs

This file was deleted.

1 change: 0 additions & 1 deletion summa-server/src/components/consumers/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! Consuming documents from Kafka
mod consumer_thread;
pub mod dummy;
#[cfg(feature = "kafka")]
pub mod kafka;

Expand Down
6 changes: 3 additions & 3 deletions summa-wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "summa-wasm"
version = "0.136.0"
version = "0.136.1"
authors = ["Pasha Podolsky <[email protected]>"]
edition = "2021"
license-file = "LICENSE"
Expand All @@ -26,11 +26,11 @@ prost = { workspace = true }
serde = { workspace = true }
serde-wasm-bindgen = "0.6"
strfmt = { workspace = true }
summa-core = { version = "0.23.2", path = "../summa-core", default_features = false }
summa-core = { version = "0.23.2", path = "../summa-core", default-features = false }
summa-proto = { workspace = true }
tantivy = { workspace = true, features = ["wasm"] }
thiserror = { workspace = true }
tokio = { workspace = true, default_features = false, features = ["sync"] }
tokio = { workspace = true, default-features = false, features = ["sync"] }
tracing = { workspace = true }
tracing-wasm = "0.2"
wasm-bindgen = "0.2.83"
Expand Down
3 changes: 1 addition & 2 deletions summa-wasm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ npx protoc \
--proto_path ../summa-proto/proto \
../summa-proto/proto/*.proto


PATH="/usr/local/opt/llvm/bin/:$PATH" CC=/usr/local/opt/llvm/bin/clang AR=/usr/local/opt/llvm/bin/llvm-ar npm run build
npm run build
sed -i '' 's/document.baseURI ||//g' dist/root-worker.js
sed -i '' 's/document.baseURI||//g' dist/root-worker.js
4 changes: 2 additions & 2 deletions summa-wasm/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion summa-wasm/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "summa-wasm",
"description": "WASM-bindings for Summa",
"version": "0.136.0",
"version": "0.136.1",
"keywords": [
"search",
"database",
Expand Down
43 changes: 38 additions & 5 deletions summa-wasm/src/grpc-web/index_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ export interface IndexAttributes {
* @generated from protobuf field: repeated summa.proto.MappedField mapped_fields = 9;
*/
mapped_fields: MappedField[];
/**
* @generated from protobuf field: optional string auto_id_field = 10;
*/
auto_id_field?: string;
}
/**
* Request for index creation
Expand Down Expand Up @@ -485,6 +489,10 @@ export interface IndexDocumentStreamRequest {
* @generated from protobuf field: optional summa.proto.ConflictStrategy conflict_strategy = 3;
*/
conflict_strategy?: ConflictStrategy;
/**
* @generated from protobuf field: bool skip_updated_at_modification = 4;
*/
skip_updated_at_modification: boolean;
}
/**
* @generated from protobuf message summa.proto.IndexDocumentStreamResponse
Expand Down Expand Up @@ -515,6 +523,10 @@ export interface IndexDocumentRequest {
* @generated from protobuf field: bytes document = 2;
*/
document: Uint8Array;
/**
* @generated from protobuf field: bool skip_updated_at_modification = 3;
*/
skip_updated_at_modification: boolean;
}
/**
* @generated from protobuf message summa.proto.IndexDocumentResponse
Expand Down Expand Up @@ -1679,7 +1691,8 @@ class IndexAttributes$Type extends MessageType<IndexAttributes> {
{ no: 4, name: "multi_fields", kind: "scalar", localName: "multi_fields", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ },
{ no: 6, name: "description", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
{ no: 8, name: "conflict_strategy", kind: "enum", localName: "conflict_strategy", T: () => ["summa.proto.ConflictStrategy", ConflictStrategy] },
{ no: 9, name: "mapped_fields", kind: "message", localName: "mapped_fields", repeat: 1 /*RepeatType.PACKED*/, T: () => MappedField }
{ no: 9, name: "mapped_fields", kind: "message", localName: "mapped_fields", repeat: 1 /*RepeatType.PACKED*/, T: () => MappedField },
{ no: 10, name: "auto_id_field", kind: "scalar", localName: "auto_id_field", opt: true, T: 9 /*ScalarType.STRING*/ }
]);
}
create(value?: PartialMessage<IndexAttributes>): IndexAttributes {
Expand Down Expand Up @@ -1712,6 +1725,9 @@ class IndexAttributes$Type extends MessageType<IndexAttributes> {
case /* repeated summa.proto.MappedField mapped_fields */ 9:
message.mapped_fields.push(MappedField.internalBinaryRead(reader, reader.uint32(), options));
break;
case /* optional string auto_id_field */ 10:
message.auto_id_field = reader.string();
break;
default:
let u = options.readUnknownField;
if (u === "throw")
Expand Down Expand Up @@ -1742,6 +1758,9 @@ class IndexAttributes$Type extends MessageType<IndexAttributes> {
/* repeated summa.proto.MappedField mapped_fields = 9; */
for (let i = 0; i < message.mapped_fields.length; i++)
MappedField.internalBinaryWrite(message.mapped_fields[i], writer.tag(9, WireType.LengthDelimited).fork(), options).join();
/* optional string auto_id_field = 10; */
if (message.auto_id_field !== undefined)
writer.tag(10, WireType.LengthDelimited).string(message.auto_id_field);
let u = options.writeUnknownFields;
if (u !== false)
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
Expand Down Expand Up @@ -2372,11 +2391,12 @@ class IndexDocumentStreamRequest$Type extends MessageType<IndexDocumentStreamReq
super("summa.proto.IndexDocumentStreamRequest", [
{ no: 1, name: "index_name", kind: "scalar", localName: "index_name", T: 9 /*ScalarType.STRING*/ },
{ no: 2, name: "documents", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 12 /*ScalarType.BYTES*/ },
{ no: 3, name: "conflict_strategy", kind: "enum", localName: "conflict_strategy", opt: true, T: () => ["summa.proto.ConflictStrategy", ConflictStrategy] }
{ no: 3, name: "conflict_strategy", kind: "enum", localName: "conflict_strategy", opt: true, T: () => ["summa.proto.ConflictStrategy", ConflictStrategy] },
{ no: 4, name: "skip_updated_at_modification", kind: "scalar", localName: "skip_updated_at_modification", T: 8 /*ScalarType.BOOL*/ }
]);
}
create(value?: PartialMessage<IndexDocumentStreamRequest>): IndexDocumentStreamRequest {
const message = { index_name: "", documents: [] };
const message = { index_name: "", documents: [], skip_updated_at_modification: false };
globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
if (value !== undefined)
reflectionMergePartial<IndexDocumentStreamRequest>(this, message, value);
Expand All @@ -2396,6 +2416,9 @@ class IndexDocumentStreamRequest$Type extends MessageType<IndexDocumentStreamReq
case /* optional summa.proto.ConflictStrategy conflict_strategy */ 3:
message.conflict_strategy = reader.int32();
break;
case /* bool skip_updated_at_modification */ 4:
message.skip_updated_at_modification = reader.bool();
break;
default:
let u = options.readUnknownField;
if (u === "throw")
Expand All @@ -2417,6 +2440,9 @@ class IndexDocumentStreamRequest$Type extends MessageType<IndexDocumentStreamReq
/* optional summa.proto.ConflictStrategy conflict_strategy = 3; */
if (message.conflict_strategy !== undefined)
writer.tag(3, WireType.Varint).int32(message.conflict_strategy);
/* bool skip_updated_at_modification = 4; */
if (message.skip_updated_at_modification !== false)
writer.tag(4, WireType.Varint).bool(message.skip_updated_at_modification);
let u = options.writeUnknownFields;
if (u !== false)
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
Expand Down Expand Up @@ -2493,11 +2519,12 @@ class IndexDocumentRequest$Type extends MessageType<IndexDocumentRequest> {
constructor() {
super("summa.proto.IndexDocumentRequest", [
{ no: 1, name: "index_name", kind: "scalar", localName: "index_name", T: 9 /*ScalarType.STRING*/ },
{ no: 2, name: "document", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
{ no: 2, name: "document", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
{ no: 3, name: "skip_updated_at_modification", kind: "scalar", localName: "skip_updated_at_modification", T: 8 /*ScalarType.BOOL*/ }
]);
}
create(value?: PartialMessage<IndexDocumentRequest>): IndexDocumentRequest {
const message = { index_name: "", document: new Uint8Array(0) };
const message = { index_name: "", document: new Uint8Array(0), skip_updated_at_modification: false };
globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
if (value !== undefined)
reflectionMergePartial<IndexDocumentRequest>(this, message, value);
Expand All @@ -2514,6 +2541,9 @@ class IndexDocumentRequest$Type extends MessageType<IndexDocumentRequest> {
case /* bytes document */ 2:
message.document = reader.bytes();
break;
case /* bool skip_updated_at_modification */ 3:
message.skip_updated_at_modification = reader.bool();
break;
default:
let u = options.readUnknownField;
if (u === "throw")
Expand All @@ -2532,6 +2562,9 @@ class IndexDocumentRequest$Type extends MessageType<IndexDocumentRequest> {
/* bytes document = 2; */
if (message.document.length)
writer.tag(2, WireType.LengthDelimited).bytes(message.document);
/* bool skip_updated_at_modification = 3; */
if (message.skip_updated_at_modification !== false)
writer.tag(3, WireType.Varint).bool(message.skip_updated_at_modification);
let u = options.writeUnknownFields;
if (u !== false)
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
Expand Down

0 comments on commit a2c4591

Please sign in to comment.