Skip to content

Commit e2909ef

Browse files
winsmithwinsmith
committed
Remove sampleFactor property
With the move to namespaces, we’re no longer going to support name spaces
1 parent 3e08256 commit e2909ef

File tree

4 files changed

+1
-105
lines changed

4 files changed

+1
-105
lines changed

‎Sources/DataTransferObjects/Query/CustomQuery+CompileDown.swift

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,7 @@ extension CustomQuery {
173173
"com.telemetrydeck.compacted"
174174
]
175175

176-
if let sampleFactor = query.sampleFactor {
177-
switch sampleFactor {
178-
case 10:
179-
query.dataSource = .init("telemetry-signals-sample10")
180-
case 100:
181-
query.dataSource = .init("telemetry-signals-sample100")
182-
case 1000:
183-
query.dataSource = .init("telemetry-signals-sample1000")
184-
default:
185-
query.dataSource = .init("telemetry-signals")
186-
}
187-
} else if let dataSource = query.dataSource, allowedDataSourceNames.contains(dataSource.name) {
176+
if let dataSource = query.dataSource, allowedDataSourceNames.contains(dataSource.name) {
188177
query.dataSource = .init(dataSource.name)
189178
} else {
190179
if let namespace {

‎Sources/DataTransferObjects/Query/CustomQuery.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public struct CustomQuery: Codable, Hashable, Equatable {
99
restrictions: [QueryTimeInterval]? = nil,
1010
dataSource: String? = nil,
1111
virtualColumns: [VirtualColumn]? = nil,
12-
sampleFactor: Int? = nil,
1312
descending: Bool? = nil,
1413
filter: Filter? = nil,
1514
having: HavingSpec? = nil,
@@ -45,7 +44,6 @@ public struct CustomQuery: Codable, Hashable, Equatable {
4544
}
4645

4746
self.virtualColumns = virtualColumns
48-
self.sampleFactor = sampleFactor
4947
self.descending = descending
5048
self.baseFilters = baseFilters
5149
self.testMode = testMode
@@ -79,7 +77,6 @@ public struct CustomQuery: Codable, Hashable, Equatable {
7977
restrictions: [QueryTimeInterval]? = nil,
8078
dataSource: DataSource?,
8179
virtualColumns: [VirtualColumn]? = nil,
82-
sampleFactor: Int? = nil,
8380
descending: Bool? = nil,
8481
filter: Filter? = nil,
8582
having: HavingSpec? = nil,
@@ -111,7 +108,6 @@ public struct CustomQuery: Codable, Hashable, Equatable {
111108
self.restrictions = restrictions
112109
self.dataSource = dataSource
113110
self.virtualColumns = virtualColumns
114-
self.sampleFactor = sampleFactor
115111
self.descending = descending
116112
self.baseFilters = baseFilters
117113
self.testMode = testMode
@@ -173,13 +169,6 @@ public struct CustomQuery: Codable, Hashable, Equatable {
173169

174170
public var virtualColumns: [VirtualColumn]?
175171

176-
/// The sample factor to apply to this query
177-
///
178-
/// To speed up calculation, you can sample e.g. 1/10 or 1/100 of the signals, and get a good idea of the shapre of the available data.
179-
///
180-
/// Must be either 1, 10, 100 or 1000. All other values will be treated as 1 (i.e. look at all signals).
181-
/// Setting this property will overwrite the dataSource property.
182-
public var sampleFactor: Int?
183172
public var descending: Bool?
184173
public var baseFilters: BaseFilters?
185174
public var testMode: Bool?
@@ -249,7 +238,6 @@ public struct CustomQuery: Codable, Hashable, Equatable {
249238
hasher.combine(restrictions)
250239
hasher.combine(dataSource)
251240
hasher.combine(virtualColumns)
252-
hasher.combine(sampleFactor)
253241
hasher.combine(descending)
254242
hasher.combine(baseFilters)
255243
hasher.combine(testMode)
@@ -288,7 +276,6 @@ public struct CustomQuery: Codable, Hashable, Equatable {
288276
restrictions = try container.decodeIfPresent([QueryTimeInterval].self, forKey: CustomQuery.CodingKeys.restrictions)
289277
dataSource = try container.decodeIfPresent(DataSource.self, forKey: CustomQuery.CodingKeys.dataSource)
290278
virtualColumns = try container.decodeIfPresent([VirtualColumn].self, forKey: CustomQuery.CodingKeys.virtualColumns)
291-
sampleFactor = try container.decodeIfPresent(Int.self, forKey: CustomQuery.CodingKeys.sampleFactor)
292279
descending = try container.decodeIfPresent(Bool.self, forKey: CustomQuery.CodingKeys.descending)
293280
baseFilters = try container.decodeIfPresent(BaseFilters.self, forKey: CustomQuery.CodingKeys.baseFilters)
294281
testMode = try container.decodeIfPresent(Bool.self, forKey: CustomQuery.CodingKeys.testMode)

‎Tests/QueryGenerationTests/CompileDownTests.swift

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -276,61 +276,6 @@ final class CompileDownTests: XCTestCase {
276276
])
277277
}
278278

279-
func testSampleFactor1() throws {
280-
let intervals: [QueryTimeInterval] = [
281-
.init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),
282-
]
283-
284-
let query = CustomQuery(queryType: .timeseries, sampleFactor: 1, intervals: intervals, granularity: .day)
285-
let precompiledQuery = try query.precompile(organizationAppIDs: [appID1, appID2], isSuperOrg: false)
286-
let compiledQuery = try precompiledQuery.compileToRunnableQuery()
287-
XCTAssertEqual(compiledQuery.dataSource?.name, "telemetry-signals")
288-
}
289-
290-
func testSampleFactor10() throws {
291-
let intervals: [QueryTimeInterval] = [
292-
.init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),
293-
]
294-
295-
let query = CustomQuery(queryType: .timeseries, sampleFactor: 10, intervals: intervals, granularity: .day)
296-
let precompiledQuery = try query.precompile(organizationAppIDs: [appID1, appID2], isSuperOrg: false)
297-
let compiledQuery = try precompiledQuery.compileToRunnableQuery()
298-
XCTAssertEqual(compiledQuery.dataSource?.name, "telemetry-signals-sample10")
299-
}
300-
301-
func testSampleFactor100() throws {
302-
let intervals: [QueryTimeInterval] = [
303-
.init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),
304-
]
305-
306-
let query = CustomQuery(queryType: .timeseries, sampleFactor: 100, intervals: intervals, granularity: .day)
307-
let precompiledQuery = try query.precompile(organizationAppIDs: [appID1, appID2], isSuperOrg: false)
308-
let compiledQuery = try precompiledQuery.compileToRunnableQuery()
309-
XCTAssertEqual(compiledQuery.dataSource?.name, "telemetry-signals-sample100")
310-
}
311-
312-
func testSampleFactor1000() throws {
313-
let intervals: [QueryTimeInterval] = [
314-
.init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),
315-
]
316-
317-
let query = CustomQuery(queryType: .timeseries, sampleFactor: 1000, intervals: intervals, granularity: .day)
318-
let precompiledQuery = try query.precompile(organizationAppIDs: [appID1, appID2], isSuperOrg: false)
319-
let compiledQuery = try precompiledQuery.compileToRunnableQuery()
320-
XCTAssertEqual(compiledQuery.dataSource?.name, "telemetry-signals-sample1000")
321-
}
322-
323-
func testIllegalSampleFactor() throws {
324-
let intervals: [QueryTimeInterval] = [
325-
.init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),
326-
]
327-
328-
let query = CustomQuery(queryType: .timeseries, sampleFactor: 42, intervals: intervals, granularity: .day)
329-
let precompiledQuery = try query.precompile(organizationAppIDs: [appID1, appID2], isSuperOrg: false)
330-
let compiledQuery = try precompiledQuery.compileToRunnableQuery()
331-
XCTAssertEqual(compiledQuery.dataSource?.name, "telemetry-signals")
332-
}
333-
334279
func testNamespace() throws {
335280
let intervals: [QueryTimeInterval] = [
336281
.init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),

‎Tests/QueryTests/CustomQueryTests.swift

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -383,31 +383,6 @@ final class CustomQueryTests: XCTestCase {
383383
)
384384
}
385385

386-
func testSampleFactorEncoding() throws {
387-
let input = CustomQuery(queryType: .timeseries, sampleFactor: 10, granularity: .day)
388-
389-
let expectedOutput = """
390-
{"granularity":"day","queryType":"timeseries","sampleFactor":10}
391-
"""
392-
393-
let encodedOutput = try JSONEncoder.telemetryEncoder.encode(input)
394-
395-
XCTAssertEqual(expectedOutput, String(data: encodedOutput, encoding: .utf8)!)
396-
}
397-
398-
func testSampleFactorDecoding() throws {
399-
let input = """
400-
{"granularity":"day","queryType":"timeseries","sampleFactor":10}
401-
"""
402-
.data(using: .utf8)!
403-
404-
let expectedOutput = CustomQuery(queryType: .timeseries, sampleFactor: 10, granularity: .day)
405-
406-
let decodedOutput = try JSONDecoder.telemetryDecoder.decode(CustomQuery.self, from: input)
407-
408-
XCTAssertEqual(expectedOutput, decodedOutput)
409-
}
410-
411386
func testScanQueryDecoding() throws {
412387
let input = """
413388
{

0 commit comments

Comments
 (0)