@@ -24,13 +24,18 @@ jest.mock('@/hooks/useMetadata', () => ({
2424 ...jest . requireActual ( '@/hooks/useMetadata' ) ,
2525 useTableMetadata : jest . fn ( ) ,
2626 useColumns : jest . fn ( ) ,
27+ useMergeTreeSettings : jest . fn ( ) ,
2728} ) ) ;
2829
29- const { useTableMetadata : mockUseTableMetadata , useColumns : mockUseColumns } =
30- jest . requireMock < {
31- useTableMetadata : jest . Mock ;
32- useColumns : jest . Mock ;
33- } > ( '@/hooks/useMetadata' ) ;
30+ const {
31+ useTableMetadata : mockUseTableMetadata ,
32+ useColumns : mockUseColumns ,
33+ useMergeTreeSettings : mockUseMergeTreeSettings ,
34+ } = jest . requireMock < {
35+ useTableMetadata : jest . Mock ;
36+ useColumns : jest . Mock ;
37+ useMergeTreeSettings : jest . Mock ;
38+ } > ( '@/hooks/useMetadata' ) ;
3439
3540// The inline expanded row reads the row query params through nuqs, which needs
3641// a mounted Next router. Routing every setter through one mock lets tests assert
@@ -859,6 +864,41 @@ describe('getPersistedBlockColumns', () => {
859864 expect ( getPersistedBlockColumns ( engine ( '' ) ) ) . toEqual ( [ ] ) ;
860865 expect ( getPersistedBlockColumns ( '' ) ) . toEqual ( [ ] ) ;
861866 } ) ;
867+
868+ it ( 'accepts true as an enabled value' , ( ) => {
869+ expect (
870+ getPersistedBlockColumns ( engine ( ', enable_block_offset_column = true' ) ) ,
871+ ) . toEqual ( [ '_block_offset' ] ) ;
872+ } ) ;
873+
874+ it ( 'falls back to the server setting when the table does not set it' , ( ) => {
875+ const serverSettings = new Map ( [
876+ [ 'enable_block_number_column' , '1' ] ,
877+ [ 'enable_block_offset_column' , '1' ] ,
878+ ] ) ;
879+ expect ( getPersistedBlockColumns ( engine ( '' ) , serverSettings ) ) . toEqual ( [
880+ '_block_number' ,
881+ '_block_offset' ,
882+ ] ) ;
883+ expect (
884+ getPersistedBlockColumns (
885+ engine ( ', enable_block_number_column = 1' ) ,
886+ new Map ( [ [ 'enable_block_offset_column' , '1' ] ] ) ,
887+ ) ,
888+ ) . toEqual ( [ '_block_number' , '_block_offset' ] ) ;
889+ } ) ;
890+
891+ it ( 'prefers the table setting over the server setting' , ( ) => {
892+ expect (
893+ getPersistedBlockColumns (
894+ engine ( ', enable_block_number_column = 0' ) ,
895+ new Map ( [
896+ [ 'enable_block_number_column' , '1' ] ,
897+ [ 'enable_block_offset_column' , '0' ] ,
898+ ] ) ,
899+ ) ,
900+ ) . toEqual ( [ ] ) ;
901+ } ) ;
862902} ) ;
863903
864904describe ( 'useConfigWithAdditionalSelect' , ( ) => {
@@ -873,25 +913,40 @@ describe('useConfigWithAdditionalSelect', () => {
873913 } ;
874914
875915 const mockMetadata = ( {
916+ engine = 'MergeTree' ,
876917 engineFull,
877918 columns = [ ] ,
919+ mergeTreeSettings = new Map ( ) ,
920+ isMergeTreeSettingsLoading = false ,
878921 } : {
922+ engine ?: string ;
879923 engineFull : string ;
880924 columns ?: { name : string ; type : string } [ ] ;
925+ mergeTreeSettings ?: Map < string , string > ;
926+ isMergeTreeSettingsLoading ?: boolean ;
881927 } ) => {
882928 mockUseTableMetadata . mockReturnValue ( {
883929 data : {
884930 primary_key : 'toStartOfFiveMinutes(Timestamp), ServiceName, Timestamp' ,
885931 partition_key : 'toDate(Timestamp)' ,
932+ engine,
886933 engine_full : engineFull ,
887934 } ,
888935 } ) ;
889936 mockUseColumns . mockReturnValue ( { data : columns } ) ;
937+ // react-query never reports a disabled query as loading
938+ mockUseMergeTreeSettings . mockImplementation (
939+ ( _connectionId : string , { enabled } : { enabled : boolean } ) => ( {
940+ data : isMergeTreeSettingsLoading ? undefined : mergeTreeSettings ,
941+ isLoading : enabled && isMergeTreeSettingsLoading ,
942+ } ) ,
943+ ) ;
890944 } ;
891945
892946 afterEach ( ( ) => {
893947 mockUseTableMetadata . mockReset ( ) ;
894948 mockUseColumns . mockReset ( ) ;
949+ mockUseMergeTreeSettings . mockReset ( ) ;
895950 } ) ;
896951
897952 it ( 'restricts the row lookup to PK + _block_offset when only the offset column is persisted' , ( ) => {
@@ -984,4 +1039,95 @@ describe('useConfigWithAdditionalSelect', () => {
9841039 ) ;
9851040 expect ( result . current ?. rowKeyColumns ) . toBeUndefined ( ) ;
9861041 } ) ;
1042+
1043+ it ( 'uses the server MergeTree settings when the table does not set them' , ( ) => {
1044+ mockMetadata ( {
1045+ engine : 'SharedMergeTree' ,
1046+ engineFull :
1047+ 'SharedMergeTree ORDER BY Timestamp SETTINGS index_granularity = 8192' ,
1048+ mergeTreeSettings : new Map ( [
1049+ [ 'enable_block_number_column' , '1' ] ,
1050+ [ 'enable_block_offset_column' , '1' ] ,
1051+ ] ) ,
1052+ } ) ;
1053+
1054+ const { result } = renderHook ( ( ) =>
1055+ useConfigWithAdditionalSelect ( config , 'source-id' ) ,
1056+ ) ;
1057+
1058+ expect ( result . current ?. select ) . toBe (
1059+ 'Timestamp,ServiceName,Body,toDate(Timestamp),toStartOfFiveMinutes(Timestamp),_block_number,_block_offset' ,
1060+ ) ;
1061+ expect ( result . current ?. rowKeyColumns ?. has ( '_block_number' ) ) . toBe ( true ) ;
1062+ expect ( result . current ?. rowKeyColumns ?. has ( '_block_offset' ) ) . toBe ( true ) ;
1063+ } ) ;
1064+
1065+ it ( 'ignores the server MergeTree settings for non-MergeTree engines' , ( ) => {
1066+ mockMetadata ( {
1067+ engine : 'Merge' ,
1068+ engineFull : "Merge('default', '^otel_logs')" ,
1069+ mergeTreeSettings : new Map ( [ [ 'enable_block_number_column' , '1' ] ] ) ,
1070+ } ) ;
1071+
1072+ const { result } = renderHook ( ( ) =>
1073+ useConfigWithAdditionalSelect ( config , 'source-id' ) ,
1074+ ) ;
1075+
1076+ expect ( mockUseMergeTreeSettings ) . toHaveBeenCalledWith ( 'conn' , {
1077+ enabled : false ,
1078+ } ) ;
1079+ expect ( result . current ?. select ) . toBe (
1080+ 'Timestamp,ServiceName,Body,toDate(Timestamp),toStartOfFiveMinutes(Timestamp)' ,
1081+ ) ;
1082+ expect ( result . current ?. rowKeyColumns ) . toBeUndefined ( ) ;
1083+ } ) ;
1084+
1085+ it ( 'skips the server MergeTree settings when the table sets both' , ( ) => {
1086+ mockMetadata ( {
1087+ engineFull :
1088+ 'MergeTree ORDER BY Timestamp SETTINGS enable_block_number_column = 0, enable_block_offset_column = 0' ,
1089+ mergeTreeSettings : new Map ( [
1090+ [ 'enable_block_number_column' , '1' ] ,
1091+ [ 'enable_block_offset_column' , '1' ] ,
1092+ ] ) ,
1093+ isMergeTreeSettingsLoading : true ,
1094+ } ) ;
1095+
1096+ const { result } = renderHook ( ( ) =>
1097+ useConfigWithAdditionalSelect ( config , 'source-id' ) ,
1098+ ) ;
1099+
1100+ expect ( mockUseMergeTreeSettings ) . toHaveBeenCalledWith ( 'conn' , {
1101+ enabled : false ,
1102+ } ) ;
1103+ expect ( result . current ?. select ) . toBe (
1104+ 'Timestamp,ServiceName,Body,toDate(Timestamp),toStartOfFiveMinutes(Timestamp)' ,
1105+ ) ;
1106+ } ) ;
1107+
1108+ it ( 'waits for the server MergeTree settings before returning a config' , ( ) => {
1109+ mockMetadata ( {
1110+ engineFull : 'MergeTree ORDER BY Timestamp' ,
1111+ isMergeTreeSettingsLoading : true ,
1112+ } ) ;
1113+
1114+ const { result, rerender } = renderHook ( ( ) =>
1115+ useConfigWithAdditionalSelect ( config , 'source-id' ) ,
1116+ ) ;
1117+
1118+ expect ( mockUseMergeTreeSettings ) . toHaveBeenCalledWith ( 'conn' , {
1119+ enabled : true ,
1120+ } ) ;
1121+ expect ( result . current ) . toBeUndefined ( ) ;
1122+
1123+ mockMetadata ( {
1124+ engineFull : 'MergeTree ORDER BY Timestamp' ,
1125+ mergeTreeSettings : new Map ( [ [ 'enable_block_offset_column' , '1' ] ] ) ,
1126+ } ) ;
1127+ rerender ( ) ;
1128+
1129+ expect ( result . current ?. select ) . toBe (
1130+ 'Timestamp,ServiceName,Body,toDate(Timestamp),toStartOfFiveMinutes(Timestamp),_block_offset' ,
1131+ ) ;
1132+ } ) ;
9871133} ) ;
0 commit comments