Skip to content

Commit 08b4d50

Browse files
authored
Merge 19bed6c into 7b7a29c
2 parents 7b7a29c + 19bed6c commit 08b4d50

File tree

18 files changed

+37
-16779
lines changed

18 files changed

+37
-16779
lines changed

.github/config/muted_ya.txt

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ ydb/tests/fq/yds *
9898
ydb/tests/fq/control_plane_storage *
9999
ydb/tests/functional/audit *
100100
ydb/tests/functional/blobstorage test_replication.py.TestReplicationAfterNodesRestart.test_replication*
101+
ydb/tests/functional/clickbench test.py.test_plans[column]
101102
ydb/tests/functional/kqp/kqp_indexes ConsistentIndexRead.InteractiveTx
102103
ydb/tests/functional/kqp/kqp_query_session KqpQuerySession.NoLocalAttach
103104
ydb/tests/functional/restarts test_restarts.py.*

ydb/apps/version/version_definition.cpp

+14-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,21 @@
22

33
NKikimrConfig::TCurrentCompatibilityInfo NKikimr::TCompatibilityInfo::MakeCurrent() {
44
using TCurrentConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
5-
// using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
6-
// using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
5+
using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
6+
using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
77

88
return TCurrentConstructor{
99
.Application = "ydb",
10+
.Version = TVersionConstructor{
11+
.Year = 24,
12+
.Major = 3,
13+
},
14+
.CanConnectTo = {
15+
TCompatibilityRuleConstructor{
16+
.Application = "nbs",
17+
.LowerLimit = TVersionConstructor{ .Year = 23, .Major = 3 },
18+
.UpperLimit = TVersionConstructor{ .Year = 24, .Major = 3 },
19+
}
20+
}
1021
}.ToPB();
11-
}
22+
}

ydb/core/driver_lib/version/version.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ TCompatibilityInfo::TCompatibilityInfo() {
2626

2727
auto current = MakeCurrent();
2828

29+
// TODO: uncomment next 2 lines after real branch creation
2930
// bool success = CompleteFromTag(current);
31+
// Y_UNUSED(success);
3032
// Y_ABORT_UNLESS(success);
3133

3234
CurrentCompatibilityInfo.CopyFrom(current);
@@ -72,12 +74,13 @@ const TStored* TCompatibilityInfo::GetDefault(TComponentId componentId) const {
7274
// obsolete version control
7375
TMaybe<NActors::TInterconnectProxyCommon::TVersionInfo> VERSION = NActors::TInterconnectProxyCommon::TVersionInfo{
7476
// version of this binary
75-
"trunk",
77+
"stable-24-3",
7678

7779
// compatible versions; must include all compatible old ones, including this one; version verification occurs on both
7880
// peers and connection is accepted if at least one of peers accepts the version of the other peer
7981
{
80-
"trunk"
82+
"stable-24-2",
83+
"stable-24-3"
8184
}
8285
};
8386

ydb/core/formats/arrow/ssa_runtime_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace NKikimr::NSsa {
1919

2020
// Bump this version every time incompatible runtime functions are introduced.
2121
#ifndef SSA_RUNTIME_VERSION
22-
#define SSA_RUNTIME_VERSION 5U
22+
#define SSA_RUNTIME_VERSION 4U
2323
#endif
2424

2525
// History:

ydb/core/protos/feature_flags.proto

+5-5
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ message TFeatureFlags {
9797
optional bool EnableAlterDatabaseCreateHiveFirst = 82 [default = false];
9898
reserved 83; // EnableKqpDataQuerySourceRead
9999
optional bool EnableSmallDiskOptimization = 84 [default = true];
100-
optional bool EnableDataShardVolatileTransactions = 85 [default = true];
100+
optional bool EnableDataShardVolatileTransactions = 85 [default = false];
101101
optional bool EnableTopicServiceTx = 86 [default = false];
102-
optional bool EnableLLVMCache = 87 [default = false];
102+
optional bool EnableLLVMCache = 87 [default = true];
103103
optional bool EnableExternalDataSources = 88 [default = false];
104104
optional bool EnableTopicDiskSubDomainQuota = 89 [default = true];
105-
optional bool EnableSeparationComputeActorsFromRead = 90 [default = false];
105+
optional bool EnableSeparationComputeActorsFromRead = 90 [default = true];
106106
optional bool EnablePQConfigTransactionsAtSchemeShard = 91 [default = false];
107107
optional bool EnableScriptExecutionOperations = 92 [default = true];
108-
optional bool EnableImplicitQueryParameterTypes = 93 [default = true];
108+
optional bool EnableImplicitQueryParameterTypes = 93 [default = false];
109109
optional bool EnableForceImmediateEffectsExecution = 94 [default = false];
110110
optional bool EnableTopicSplitMerge = 95 [default = false];
111111
optional bool EnableChangefeedDynamoDBStreamsFormat = 96 [default = true];
@@ -121,7 +121,7 @@ message TFeatureFlags {
121121
optional bool EnableStatistics = 106 [default = false];
122122
optional bool EnableUuidAsPrimaryKey = 107 [default = false];
123123
optional bool EnableTablePgTypes = 108 [default = false];
124-
optional bool EnableLocalDBBtreeIndex = 109 [default = true];
124+
optional bool EnableLocalDBBtreeIndex = 109 [default = false];
125125
optional bool EnablePDiskHighHDDInFlight = 110 [default = false];
126126
optional bool UseVDisksBalancing = 111 [default = false];
127127
optional bool EnableViews = 112 [default = false];

ydb/core/protos/table_service_config.proto

+3-3
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ message TTableServiceConfig {
225225
optional uint64 SessionIdleDurationSeconds = 28 [default = 600];
226226
optional TAggregationConfig AggregationConfig = 29;
227227
optional bool EnableKqpScanQueryStreamLookup = 30 [default = true];
228-
optional bool EnableKqpDataQueryStreamLookup = 31 [default = true];
228+
optional bool EnableKqpDataQueryStreamLookup = 31 [default = false];
229229
optional TExecuterRetriesConfig ExecuterRetriesConfig = 32;
230230
reserved 33; // optional bool EnableKqpDataQueryStreamPointLookup = 33 [default = false];
231231
optional bool EnablePublishKqpProxyByRM = 34 [default = true];
@@ -236,7 +236,7 @@ message TTableServiceConfig {
236236
optional bool EnableKqpImmediateEffects = 38 [default = true];
237237
reserved 39; // optional bool EnableSequentialReads = 39 [default = true];
238238
optional bool EnablePreparedDdl = 42 [default = true];
239-
optional bool EnableSequences = 43 [default = true];
239+
optional bool EnableSequences = 43 [default = false];
240240
optional bool EnableAsyncComputationPatternCompilation = 48 [default = true];
241241
optional TCompileComputationPatternServiceConfig CompileComputationPatternServiceConfig = 47;
242242

@@ -280,7 +280,7 @@ message TTableServiceConfig {
280280
optional bool EnableCreateTableAs = 57 [default = true];
281281

282282
optional uint64 IdxLookupJoinPointsLimit = 58 [default = 1];
283-
optional bool OldLookupJoinBehaviour = 59 [default = false];
283+
optional bool OldLookupJoinBehaviour = 59 [default = true];
284284

285285
optional bool EnableOltpSink = 60 [default = false];
286286

ydb/library/yql/minikql/mkql_runtime_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace NMiniKQL {
2424
// 1. Bump this version every time incompatible runtime nodes are introduced.
2525
// 2. Make sure you provide runtime node generation for previous runtime versions.
2626
#ifndef MKQL_RUNTIME_VERSION
27-
#define MKQL_RUNTIME_VERSION 50U
27+
#define MKQL_RUNTIME_VERSION 47U
2828
#endif
2929

3030
// History:

0 commit comments

Comments
 (0)