Skip to content

Commit

Permalink
Initial commit for stable-24-3 (#6321)
Browse files Browse the repository at this point in the history
  • Loading branch information
maximyurchuk authored Jul 5, 2024
1 parent 0fcca60 commit 44a1cd0
Show file tree
Hide file tree
Showing 18 changed files with 37 additions and 16,780 deletions.
1 change: 1 addition & 0 deletions .github/config/muted_ya.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ ydb/tests/fq/yds *
ydb/tests/fq/control_plane_storage *
ydb/tests/functional/audit *
ydb/tests/functional/blobstorage test_replication.py.TestReplicationAfterNodesRestart.test_replication*
ydb/tests/functional/clickbench test.py.test_plans[column]
ydb/tests/functional/kqp/kqp_indexes ConsistentIndexRead.InteractiveTx
ydb/tests/functional/kqp/kqp_query_session KqpQuerySession.NoLocalAttach
ydb/tests/functional/restarts test_restarts.py.*
Expand Down
17 changes: 14 additions & 3 deletions ydb/apps/version/version_definition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,21 @@

NKikimrConfig::TCurrentCompatibilityInfo NKikimr::TCompatibilityInfo::MakeCurrent() {
using TCurrentConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
// using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
// using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;

return TCurrentConstructor{
.Application = "ydb",
.Version = TVersionConstructor{
.Year = 24,
.Major = 3,
},
.CanConnectTo = {
TCompatibilityRuleConstructor{
.Application = "nbs",
.LowerLimit = TVersionConstructor{ .Year = 23, .Major = 3 },
.UpperLimit = TVersionConstructor{ .Year = 24, .Major = 3 },
}
}
}.ToPB();
}
}
8 changes: 5 additions & 3 deletions ydb/core/driver_lib/version/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ TCompatibilityInfo::TCompatibilityInfo() {

auto current = MakeCurrent();

// bool success = CompleteFromTag(current);
bool success = CompleteFromTag(current);
Y_UNUSED(success);
// Y_ABORT_UNLESS(success);

CurrentCompatibilityInfo.CopyFrom(current);
Expand Down Expand Up @@ -72,12 +73,13 @@ const TStored* TCompatibilityInfo::GetDefault(TComponentId componentId) const {
// obsolete version control
TMaybe<NActors::TInterconnectProxyCommon::TVersionInfo> VERSION = NActors::TInterconnectProxyCommon::TVersionInfo{
// version of this binary
"trunk",
"stable-24-3",

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

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/formats/arrow/ssa_runtime_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace NKikimr::NSsa {

// Bump this version every time incompatible runtime functions are introduced.
#ifndef SSA_RUNTIME_VERSION
#define SSA_RUNTIME_VERSION 5U
#define SSA_RUNTIME_VERSION 4U
#endif

// History:
Expand Down
10 changes: 5 additions & 5 deletions ydb/core/protos/feature_flags.proto
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ message TFeatureFlags {
optional bool EnableAlterDatabaseCreateHiveFirst = 82 [default = false];
reserved 83; // EnableKqpDataQuerySourceRead
optional bool EnableSmallDiskOptimization = 84 [default = true];
optional bool EnableDataShardVolatileTransactions = 85 [default = true];
optional bool EnableDataShardVolatileTransactions = 85 [default = false];
optional bool EnableTopicServiceTx = 86 [default = false];
optional bool EnableLLVMCache = 87 [default = false];
optional bool EnableLLVMCache = 87 [default = true];
optional bool EnableExternalDataSources = 88 [default = false];
optional bool EnableTopicDiskSubDomainQuota = 89 [default = true];
optional bool EnableSeparationComputeActorsFromRead = 90 [default = false];
optional bool EnableSeparationComputeActorsFromRead = 90 [default = true];
optional bool EnablePQConfigTransactionsAtSchemeShard = 91 [default = false];
optional bool EnableScriptExecutionOperations = 92 [default = true];
optional bool EnableImplicitQueryParameterTypes = 93 [default = true];
optional bool EnableImplicitQueryParameterTypes = 93 [default = false];
optional bool EnableForceImmediateEffectsExecution = 94 [default = false];
optional bool EnableTopicSplitMerge = 95 [default = false];
optional bool EnableChangefeedDynamoDBStreamsFormat = 96 [default = true];
Expand All @@ -121,7 +121,7 @@ message TFeatureFlags {
optional bool EnableStatistics = 106 [default = false];
optional bool EnableUuidAsPrimaryKey = 107 [default = false];
optional bool EnableTablePgTypes = 108 [default = false];
optional bool EnableLocalDBBtreeIndex = 109 [default = true];
optional bool EnableLocalDBBtreeIndex = 109 [default = false];
optional bool EnablePDiskHighHDDInFlight = 110 [default = false];
optional bool UseVDisksBalancing = 111 [default = false];
optional bool EnableViews = 112 [default = false];
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/protos/table_service_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ message TTableServiceConfig {
optional uint64 SessionIdleDurationSeconds = 28 [default = 600];
optional TAggregationConfig AggregationConfig = 29;
optional bool EnableKqpScanQueryStreamLookup = 30 [default = true];
optional bool EnableKqpDataQueryStreamLookup = 31 [default = true];
optional bool EnableKqpDataQueryStreamLookup = 31 [default = false];
optional TExecuterRetriesConfig ExecuterRetriesConfig = 32;
reserved 33; // optional bool EnableKqpDataQueryStreamPointLookup = 33 [default = false];
optional bool EnablePublishKqpProxyByRM = 34 [default = true];
Expand All @@ -236,7 +236,7 @@ message TTableServiceConfig {
optional bool EnableKqpImmediateEffects = 38 [default = true];
reserved 39; // optional bool EnableSequentialReads = 39 [default = true];
optional bool EnablePreparedDdl = 42 [default = true];
optional bool EnableSequences = 43 [default = true];
optional bool EnableSequences = 43 [default = false];
optional bool EnableAsyncComputationPatternCompilation = 48 [default = true];
optional TCompileComputationPatternServiceConfig CompileComputationPatternServiceConfig = 47;

Expand Down Expand Up @@ -280,7 +280,7 @@ message TTableServiceConfig {
optional bool EnableCreateTableAs = 57 [default = true];

optional uint64 IdxLookupJoinPointsLimit = 58 [default = 1];
optional bool OldLookupJoinBehaviour = 59 [default = false];
optional bool OldLookupJoinBehaviour = 59 [default = true];

optional bool EnableOltpSink = 60 [default = false];

Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/mkql_runtime_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace NMiniKQL {
// 1. Bump this version every time incompatible runtime nodes are introduced.
// 2. Make sure you provide runtime node generation for previous runtime versions.
#ifndef MKQL_RUNTIME_VERSION
#define MKQL_RUNTIME_VERSION 50U
#define MKQL_RUNTIME_VERSION 47U
#endif

// History:
Expand Down
Loading

0 comments on commit 44a1cd0

Please sign in to comment.