Skip to content

Commit b299331

Browse files
davidwzhaoclaude
andcommitted
Rename CSVStorageIntegration to StorageIntegration
Rename the grammar nonterm to _storage_integration to avoid colliding with the renamed message's printer, and regenerate the SDKs. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent fa6eeb5 commit b299331

12 files changed

Lines changed: 819 additions & 819 deletions

File tree

meta/src/meta/grammar.y

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
%nonterm csv_data logic.CSVData
9292
%nonterm csv_locator_inline_data String
9393
%nonterm csv_locator_paths Sequence[String]
94-
%nonterm storage_integration Sequence[Tuple[String, logic.Value]]
94+
%nonterm _storage_integration Sequence[Tuple[String, logic.Value]]
9595
%nonterm csvlocator logic.CSVLocator
9696
%nonterm data logic.Data
9797
%nonterm date logic.DateValue
@@ -217,7 +217,7 @@
217217
%validator_ignore_completeness BeTreeLocator
218218
%validator_ignore_completeness BeTreeConfig
219219
%validator_ignore_completeness ExportCSVColumns
220-
%validator_ignore_completeness CSVStorageIntegration
220+
%validator_ignore_completeness StorageIntegration
221221

222222
%%
223223

@@ -1129,13 +1129,13 @@ csvlocator
11291129
$4: Optional[String] = builtin.decode_string($$.inline_data) if builtin.decode_string($$.inline_data) != "" else None
11301130

11311131
csv_config
1132-
: "(" "csv_config" config_dict storage_integration? ")"
1132+
: "(" "csv_config" config_dict _storage_integration? ")"
11331133
construct: $$ = construct_csv_config($3, $4)
11341134
deconstruct:
11351135
$3: Sequence[Tuple[String, logic.Value]] = deconstruct_csv_config($$)
11361136
$4: Optional[Sequence[Tuple[String, logic.Value]]] = deconstruct_csv_storage_integration_optional($$)
11371137

1138-
storage_integration
1138+
_storage_integration
11391139
: "(" "storage_integration" config_dict ")"
11401140
construct: $$ = $3
11411141
deconstruct: $3: Sequence[Tuple[String, logic.Value]] = $$
@@ -1490,7 +1490,7 @@ def construct_csv_config(
14901490
encoding: str = _extract_value_string(builtin.dict_get(config, "csv_encoding"), "utf-8")
14911491
compression: str = _extract_value_string(builtin.dict_get(config, "csv_compression"), "auto")
14921492
partition_size_mb: int = _extract_value_int64(builtin.dict_get(config, "csv_partition_size_mb"), 0)
1493-
storage_integration: Optional[logic.CSVStorageIntegration] = construct_csv_storage_integration(storage_integration_opt)
1493+
storage_integration: Optional[logic.StorageIntegration] = construct_csv_storage_integration(storage_integration_opt)
14941494
return logic.CSVConfig(
14951495
header_row=header_row,
14961496
skip=skip,
@@ -1510,11 +1510,11 @@ def construct_csv_config(
15101510

15111511
def construct_csv_storage_integration(
15121512
storage_integration_opt: Optional[Sequence[Tuple[String, logic.Value]]],
1513-
) -> Optional[logic.CSVStorageIntegration]:
1513+
) -> Optional[logic.StorageIntegration]:
15141514
if storage_integration_opt is None:
15151515
return builtin.none()
15161516
config: Dict[String, logic.Value] = builtin.dict_from_list(builtin.unwrap_option(storage_integration_opt))
1517-
return builtin.some(logic.CSVStorageIntegration(
1517+
return builtin.some(logic.StorageIntegration(
15181518
provider=_extract_value_string(builtin.dict_get(config, "provider"), ""),
15191519
azure_sas_token=_extract_value_string(builtin.dict_get(config, "azure_sas_token"), ""),
15201520
s3_region=_extract_value_string(builtin.dict_get(config, "s3_region"), ""),
@@ -1692,7 +1692,7 @@ def deconstruct_csv_config(msg: logic.CSVConfig) -> List[Tuple[String, logic.Val
16921692
def deconstruct_csv_storage_integration_optional(msg: logic.CSVConfig) -> Optional[Sequence[Tuple[String, logic.Value]]]:
16931693
if not builtin.has_proto_field(msg, "storage_integration"):
16941694
return builtin.none()
1695-
si: logic.CSVStorageIntegration = builtin.unwrap_option(msg.storage_integration)
1695+
si: logic.StorageIntegration = builtin.unwrap_option(msg.storage_integration)
16961696
result: List[Tuple[String, logic.Value]] = list[Tuple[String, logic.Value]]()
16971697
if si.provider != "":
16981698
builtin.list_push(result, builtin.tuple("provider", _make_value_string(si.provider)))

proto/relationalai/lqp/v1/logic.proto

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,18 @@ message BeTreeLocator {
276276
int64 tree_height = 3;
277277
}
278278

279+
message StorageIntegration {
280+
string provider = 1; // "azure" or "s3"
281+
282+
// Options for azure
283+
string azure_sas_token = 2;
284+
285+
// Options for s3
286+
string s3_region = 3;
287+
string s3_access_key_id = 4;
288+
string s3_secret_access_key = 5;
289+
}
290+
279291
message CSVData {
280292
CSVLocator locator = 1;
281293
CSVConfig config = 2;
@@ -288,18 +300,6 @@ message CSVLocator {
288300
bytes inline_data = 2; // Inline CSV content (mutually exclusive with paths)
289301
}
290302

291-
message CSVStorageIntegration {
292-
string provider = 1; // "azure" or "s3"
293-
294-
// Options for azure
295-
string azure_sas_token = 2;
296-
297-
// Options for s3
298-
string s3_region = 3;
299-
string s3_access_key_id = 4;
300-
string s3_secret_access_key = 5;
301-
}
302-
303303
message CSVConfig {
304304
// Header and structure
305305
int32 header_row = 1; // Row number for headers (< 1 means no header)
@@ -328,7 +328,7 @@ message CSVConfig {
328328
int64 partition_size_mb = 12;
329329

330330
// Storage integration (credentials for private buckets)
331-
optional CSVStorageIntegration storage_integration = 13;
331+
optional StorageIntegration storage_integration = 13;
332332
}
333333

334334
message IcebergData {

0 commit comments

Comments
 (0)