Skip to content

Commit a60931c

Browse files
avsejavsej
authored
update core to 1.0.0-beta.5 (#67)
1 parent 2448361 commit a60931c

File tree

5 files changed

+32
-21
lines changed

5 files changed

+32
-21
lines changed

‎Couchbase/QueryOptions.php

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ class QueryOptions
4343
private ?string $clientContextId = null;
4444
private ?bool $metrics = null;
4545
private ?bool $preserveExpiry = null;
46-
private ?string $scopeName = null;
47-
private ?string $scopeQualifier = null;
46+
private ?string $queryContext = null;
4847
private Transcoder $transcoder;
4948

5049
/**
@@ -332,7 +331,6 @@ public function scopeName(string $name): QueryOptions
332331
'Method ' . __METHOD__ . ' is deprecated, use scope level query()',
333332
E_USER_DEPRECATED
334333
);
335-
$this->scopeName = $name;
336334
return $this;
337335
}
338336

@@ -353,7 +351,7 @@ public function scopeQualifier(string $qualifier): QueryOptions
353351
'Method ' . __METHOD__ . ' is deprecated, use scope level query()',
354352
E_USER_DEPRECATED
355353
);
356-
$this->scopeQualifier = $qualifier;
354+
$this->queryContext = $qualifier;
357355
return $this;
358356
}
359357

@@ -403,10 +401,14 @@ public static function getTranscoder(?QueryOptions $options): Transcoder
403401

404402
public static function export(?QueryOptions $options, string $scopeName = null, string $bucketName = null): array
405403
{
404+
$defaultQueryContext = null;
405+
if ($scopeName != null && $bucketName != null) {
406+
$defaultQueryContext = sprintf("default:`%s`.`%s`", $bucketName, $scopeName);
407+
}
408+
406409
if ($options == null) {
407410
return [
408-
'scopeName' => $scopeName,
409-
'bucketName' => $bucketName,
411+
'queryContext' => $defaultQueryContext
410412
];
411413
}
412414

@@ -428,9 +430,6 @@ public static function export(?QueryOptions $options, string $scopeName = null,
428430
$raw[$key] = json_encode($param);
429431
}
430432
}
431-
if ($scopeName == null && $options->scopeName != null) {
432-
$scopeName = $options->scopeName;
433-
}
434433

435434
return [
436435
'timeoutMilliseconds' => $options->timeoutMilliseconds,
@@ -452,9 +451,7 @@ public static function export(?QueryOptions $options, string $scopeName = null,
452451
'clientContextId' => $options->clientContextId,
453452
'metrics' => $options->metrics,
454453
'preserveExpiry' => $options->preserveExpiry,
455-
'scopeName' => $scopeName,
456-
'bucketName' => $bucketName,
457-
'scopeQualifier' => $options->scopeQualifier,
454+
'queryContext' => $options->queryContext == null ? $defaultQueryContext : $options->queryContext,
458455
];
459456
}
460457
}

‎package.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<email>sergey@couchbase.com</email>
1414
<active>yes</active>
1515
</lead>
16-
<date>2023-02-16</date>
16+
<date>2023-02-19</date>
1717
<version>
1818
<release>4.1.0</release>
1919
<api>4.0.0</api>
@@ -425,16 +425,20 @@
425425
<file role="src" name="bootstrap_state_listener.hxx"/>
426426
<file role="src" name="build_deferred_query_indexes.cxx"/>
427427
<file role="src" name="cluster.cxx"/>
428+
<file role="src" name="collection_query_index_manager.cxx"/>
428429
<file role="src" name="common_error_category.cxx"/>
429430
<file role="src" name="configuration_profiles_registry.cxx"/>
431+
<file role="src" name="create_query_index.cxx"/>
430432
<file role="src" name="decrement.cxx"/>
431433
<file role="src" name="dns_srv_tracker.cxx"/>
432434
<file role="src" name="dns_srv_tracker.hxx"/>
435+
<file role="src" name="drop_query_index.cxx"/>
433436
<file role="src" name="exists.cxx"/>
434437
<file role="src" name="expiry.cxx"/>
435438
<file role="src" name="fail_fast_retry_strategy.cxx"/>
436439
<file role="src" name="field_level_encryption_error_category.cxx"/>
437440
<file role="src" name="get.cxx"/>
441+
<file role="src" name="get_all_query_indexes.cxx"/>
438442
<file role="src" name="get_all_replicas.cxx"/>
439443
<file role="src" name="get_all_replicas.hxx"/>
440444
<file role="src" name="get_and_lock.cxx"/>
@@ -469,6 +473,7 @@
469473
<file role="src" name="unlock.cxx"/>
470474
<file role="src" name="upsert.cxx"/>
471475
<file role="src" name="view_error_category.cxx"/>
476+
<file role="src" name="watch_query_indexes.cxx"/>
472477
<file role="src" name="with_legacy_durability.hxx"/>
473478
</dir>
474479
<dir name="io">
@@ -529,7 +534,6 @@
529534
<file role="src" name="eventing_function_json.hxx"/>
530535
<file role="src" name="eventing_status.hxx"/>
531536
<file role="src" name="eventing_status_json.hxx"/>
532-
<file role="src" name="query_index.hxx"/>
533537
<file role="src" name="rbac.hxx"/>
534538
<file role="src" name="rbac_fmt.hxx"/>
535539
<file role="src" name="rbac_json.hxx"/>
@@ -1005,6 +1009,7 @@
10051009
<file role="src" name="json_stream_control.hxx"/>
10061010
<file role="src" name="json_streaming_lexer.cxx"/>
10071011
<file role="src" name="json_streaming_lexer.hxx"/>
1012+
<file role="src" name="keyspace.hxx"/>
10081013
<file role="src" name="movable_function.hxx"/>
10091014
<file role="src" name="mutation_token.cxx"/>
10101015
<file role="src" name="mutation_token.hxx"/>
@@ -1079,6 +1084,7 @@
10791084
<file role="src" name="ping_collector.hxx"/>
10801085
<file role="src" name="ping_options.hxx"/>
10811086
<file role="src" name="ping_reporter.hxx"/>
1087+
<file role="src" name="query_context.hxx"/>
10821088
<file role="src" name="range_scan_options.cxx"/>
10831089
<file role="src" name="range_scan_options.hxx"/>
10841090
<file role="src" name="range_scan_orchestrator.cxx"/>
@@ -1133,6 +1139,9 @@
11331139
<file role="src" name="retry_reason.hxx"/>
11341140
<file role="src" name="tls_verify_mode.hxx"/>
11351141
</dir>
1142+
<dir name="management">
1143+
<file role="src" name="query_index.hxx"/>
1144+
</dir>
11361145
<dir name="metrics">
11371146
<file role="src" name="meter.hxx"/>
11381147
<file role="src" name="otel_meter.hxx"/>
@@ -1185,21 +1194,27 @@
11851194
<file role="src" name="cluster.hxx"/>
11861195
<file role="src" name="cluster_options.hxx"/>
11871196
<file role="src" name="collection.hxx"/>
1197+
<file role="src" name="collection_query_index_manager.hxx"/>
11881198
<file role="src" name="common_durability_options.hxx"/>
11891199
<file role="src" name="common_options.hxx"/>
11901200
<file role="src" name="compression_options.hxx"/>
11911201
<file role="src" name="configuration_profile.hxx"/>
11921202
<file role="src" name="configuration_profiles_registry.hxx"/>
11931203
<file role="src" name="counter_result.hxx"/>
1204+
<file role="src" name="create_primary_query_index_options.hxx"/>
1205+
<file role="src" name="create_query_index_options.hxx"/>
11941206
<file role="src" name="decrement_options.hxx"/>
11951207
<file role="src" name="dns_options.hxx"/>
1208+
<file role="src" name="drop_primary_query_index_options.hxx"/>
1209+
<file role="src" name="drop_query_index_options.hxx"/>
11961210
<file role="src" name="durability_level.hxx"/>
11971211
<file role="src" name="error_codes.hxx"/>
11981212
<file role="src" name="error_context.hxx"/>
11991213
<file role="src" name="exists_options.hxx"/>
12001214
<file role="src" name="exists_result.hxx"/>
12011215
<file role="src" name="expiry.hxx"/>
12021216
<file role="src" name="fail_fast_retry_strategy.hxx"/>
1217+
<file role="src" name="get_all_query_indexes_options.hxx"/>
12031218
<file role="src" name="get_all_replicas_options.hxx"/>
12041219
<file role="src" name="get_and_lock_options.hxx"/>
12051220
<file role="src" name="get_and_touch_options.hxx"/>
@@ -1262,6 +1277,7 @@
12621277
<file role="src" name="unlock_options.hxx"/>
12631278
<file role="src" name="upsert_options.hxx"/>
12641279
<file role="src" name="wan_development_configuration_profile.hxx"/>
1280+
<file role="src" name="watch_query_indexes_options.hxx"/>
12651281
</dir>
12661282
<dir name="third_party">
12671283
<dir name="asio">

‎src/deps/couchbase-cxx-client

‎src/wrapper/conversion_utilities.cxx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,7 @@ zval_to_query_request(const zend_string* statement, const zval* options)
421421
if (auto e = cb_assign_boolean(request.preserve_expiry, options, "preserveExpiry"); e.ec) {
422422
return { {}, e };
423423
}
424-
if (auto e = cb_assign_string(request.scope_name, options, "scopeName"); e.ec) {
425-
return { {}, e };
426-
}
427-
if (auto e = cb_assign_string(request.bucket_name, options, "bucketName"); e.ec) {
424+
if (auto e = cb_assign_string(request.query_context, options, "queryContext"); e.ec) {
428425
return { {}, e };
429426
}
430427
return { request, {} };

‎src/wrapper/transaction_context_resource.cxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,9 @@ build_error_context(const core::transactions::transaction_exception& e)
132132
out.type = failure_type_to_string(e.type());
133133
out.cause = external_exception_to_string(e.cause());
134134
transactions_error_context::transaction_result res;
135-
res.transaction_id = e.get_transaction_result().transaction_id;
136-
res.unstaging_complete = e.get_transaction_result().unstaging_complete;
135+
auto [_, core_res] = e.get_transaction_result();
136+
res.transaction_id = core_res.transaction_id;
137+
res.unstaging_complete = core_res.unstaging_complete;
137138
out.result = res;
138139
return out;
139140
}

0 commit comments

Comments
 (0)