Skip to content

Commit fb32f04

Browse files
authored
Update to Apache Kudu 1.16 (#11)
1 parent d05767b commit fb32f04

File tree

143 files changed

+178
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+178
-13
lines changed

.editorconfig

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# EditorConfig is awesome:http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
[*]
7+
indent_style = space
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
# Dotnet code style settings:
13+
[*.{cs,vb}]
14+
indent_size = 4
15+
# Sort using and Import directives with System.* appearing first
16+
dotnet_sort_system_directives_first = true
17+
18+
# Namespace settings
19+
csharp_style_namespace_declarations = file_scoped
20+
21+
[*.{xml,config,*proj,nuspec,props,resx,targets,yml}]
22+
indent_size = 2
23+
24+
[*.json]
25+
indent_size = 2
26+
27+
[*.cs]
28+
# Use range operator
29+
dotnet_diagnostic.IDE0057.severity = silent

.github/workflows/ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,37 @@ name: CI
33
on: [push]
44

55
env:
6+
DOTNET_NOLOGO: 1
67
DOTNET_CLI_TELEMETRY_OPTOUT: 1
78

89
jobs:
910
linux_build:
10-
1111
name: Linux build
1212
runs-on: ubuntu-20.04
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Setup .NET Core
16+
- name: Setup dotnet
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: '5.0.x'
19+
dotnet-version: '6.0.x'
2020
- name: Build
2121
run: dotnet build --configuration Release
2222

2323
publish:
24-
2524
name: Publish nuget package
2625
needs: linux_build
2726
runs-on: ubuntu-20.04
2827

2928
if: github.ref == 'refs/heads/main'
3029
steps:
3130
- uses: actions/checkout@v2
32-
- name: Setup .NET Core
31+
- name: Setup dotnet
3332
uses: actions/setup-dotnet@v1
3433
with:
35-
dotnet-version: '5.0.x'
34+
dotnet-version: '6.0.x'
3635
- name: Publish on version change
37-
uses: rohith/publish-nuget@v2
36+
uses: alirezanet/publish-nuget@v3.0.1
3837
with:
3938
PROJECT_FILE_PATH: src/Knet.Kudu.Binary/Knet.Kudu.Binary.csproj
4039
NUGET_KEY: ${{secrets.KUDU_NUGET_API_KEY}}

.gitignore

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
4+
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
55

66
# User-specific files
77
*.rsuser
@@ -23,6 +23,7 @@ mono_crash.*
2323
[Rr]eleases/
2424
x64/
2525
x86/
26+
[Ww][Ii][Nn]32/
2627
[Aa][Rr][Mm]/
2728
[Aa][Rr][Mm]64/
2829
bld/
@@ -61,6 +62,9 @@ project.lock.json
6162
project.fragment.lock.json
6263
artifacts/
6364

65+
# ASP.NET Scaffolding
66+
ScaffoldingReadMe.txt
67+
6468
# StyleCop
6569
StyleCopReport.xml
6670

@@ -86,6 +90,7 @@ StyleCopReport.xml
8690
*.tmp_proj
8791
*_wpftmp.csproj
8892
*.log
93+
*.tlog
8994
*.vspscc
9095
*.vssscc
9196
.builds
@@ -137,6 +142,11 @@ _TeamCity*
137142
.axoCover/*
138143
!.axoCover/settings.json
139144

145+
# Coverlet is a free, cross platform Code Coverage Tool
146+
coverage*.json
147+
coverage*.xml
148+
coverage*.info
149+
140150
# Visual Studio code coverage results
141151
*.coverage
142152
*.coveragexml
@@ -284,6 +294,17 @@ node_modules/
284294
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
285295
*.vbw
286296

297+
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
298+
*.vbp
299+
300+
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
301+
*.dsw
302+
*.dsp
303+
304+
# Visual Studio 6 technical files
305+
*.ncb
306+
*.aps
307+
287308
# Visual Studio LightSwitch build output
288309
**/*.HTMLClient/GeneratedArtifacts
289310
**/*.DesktopClient/GeneratedArtifacts
@@ -340,6 +361,9 @@ ASALocalRun/
340361
# Local History for Visual Studio
341362
.localhistory/
342363

364+
# Visual Studio History (VSHistory) files
365+
.vshistory/
366+
343367
# BeatPulse healthcheck temp database
344368
healthchecksdb
345369

@@ -349,5 +373,29 @@ MigrationBackup/
349373
# Ionide (cross platform F# VS Code tools) working folder
350374
.ionide/
351375

376+
# Fody - auto-generated XML schema
377+
FodyWeavers.xsd
378+
379+
# VS Code files for those working on multiple tools
380+
.vscode/*
381+
!.vscode/settings.json
382+
!.vscode/tasks.json
383+
!.vscode/launch.json
384+
!.vscode/extensions.json
385+
*.code-workspace
386+
387+
# Local History for Visual Studio Code
388+
.history/
389+
390+
# Windows Installer files from build outputs
391+
*.cab
392+
*.msi
393+
*.msix
394+
*.msm
395+
*.msp
396+
397+
# JetBrains Rider
398+
*.sln.iml
399+
352400
# Include Kudu binaries
353401
!**/kudu/bin/

src/Knet.Kudu.Binary/Knet.Kudu.Binary.csproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,25 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5+
<LangVersion>latest</LangVersion>
6+
<Nullable>enable</Nullable>
57
<NoWarn>CS1591</NoWarn>
68

79
<PackageId>$(AssemblyName)</PackageId>
8-
<Version>1.15.0</Version>
10+
<Version>1.16.0</Version>
911
<Authors>xqrzd</Authors>
1012
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1113
<Description>Native Apache Kudu binary for testing</Description>
1214
<PackageIcon>icon.png</PackageIcon>
1315
<PackageProjectUrl>https://github.com/xqrzd/kudu-binary-net</PackageProjectUrl>
14-
<RepositoryUrl>https://github.com/xqrzd/kudu-binary-net</RepositoryUrl>
1516
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
17+
18+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
19+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>embedded</DebugType>
22+
<Deterministic>true</Deterministic>
23+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
1624
</PropertyGroup>
1725

1826
<ItemGroup>

src/Knet.Kudu.Binary/KuduBinaryInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Knet.Kudu.Binary
1+
namespace Knet.Kudu.Binary
22
{
33
/// <summary>
44
/// Simple struct to provide various properties of a binary artifact to callers.
@@ -14,14 +14,14 @@ public class KuduBinaryInfo
1414
/// Return the SASL module directory of an extracted artifact.
1515
/// May be null if unknown.
1616
/// </summary>
17-
public string SaslDir { get; }
17+
public string? SaslDir { get; }
1818

1919
public KuduBinaryInfo(string binDir)
2020
: this(binDir, null)
2121
{
2222
}
2323

24-
public KuduBinaryInfo(string binDir, string saslDir)
24+
public KuduBinaryInfo(string binDir, string? saslDir)
2525
{
2626
BinDir = binDir;
2727
SaslDir = saslDir;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

src/Knet.Kudu.Binary/runtimes/linux-x64/native/kudu/www/scans.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ under the License.
1818
}}{{#raw}}{{{.}}}{{/raw}}{{^raw}}
1919

2020
<h1>Scans</h1>
21+
<p class="lead">This page lists all running scans and last {{scan_history_count}} completed scans.
22+
The number of historical scans is configurable with the <samp>--scan_history_count</samp> flag.</p>
2123
<table class="table table-striped">
2224
<thead>
2325
<tr>
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{{!
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
}}
19+
{{#error}}
20+
<div class="text-error">{{.}}</div>
21+
{{/error}}
22+
{{^error}}
23+
<h2>Server Startup Progress</h2>
24+
<table class='table table-striped'>
25+
<tr style="background-color: #eee">
26+
<th>Step</th>
27+
<th>Progress (%)</th>
28+
<th>Elapsed Time</th>
29+
</tr>
30+
<tr>
31+
<th>Initializing</th>
32+
<th>{{init_status}}%</th>
33+
<th>{{init_time}}</th>
34+
</tr>
35+
<tr>
36+
<th>Reading Filesystem</th>
37+
<th>{{read_filesystem_status}}%</th>
38+
<th>{{read_filesystem_time}}</th>
39+
</tr>
40+
<tr>
41+
<td style="padding-left:50px">Reading instance metadata files</td>
42+
<td>{{read_instance_metadatafiles_status}}%</td>
43+
<td>{{read_instance_metadatafiles_time}}</td>
44+
</tr>
45+
{{#is_log_block_manager}}
46+
<tr>
47+
<td style="padding-left:50px">Opening container files&emsp; &emsp;({{containers_processed}}/{{containers_total}})</td>
48+
<td>{{read_data_directories_status}}%</td>
49+
<td>{{read_data_directories_time}}</td>
50+
</tr>
51+
{{/is_log_block_manager}}
52+
{{^is_log_block_manager}}
53+
<tr>
54+
<td style="padding-left:50px">Reporting filesystem</td>
55+
<td>{{read_data_directories_status}}%</td>
56+
<td>{{read_data_directories_time}}</td>
57+
</tr>
58+
{{/is_log_block_manager}}
59+
{{#is_tablet_server}}
60+
<tr>
61+
<th>Bootstrapping and opening the tablets &emsp; &emsp;({{tablets_processed}}/{{tablets_total}})</th>
62+
<th>{{start_tablets_status}}%</th>
63+
<th>{{start_tablets_time}}</th>
64+
</tr>
65+
{{/is_tablet_server}}
66+
{{#is_master_server}}
67+
<tr>
68+
<th>Initializing master catalog</th>
69+
<th>{{initialize_master_catalog_status}}%</th>
70+
<th>{{initialize_master_catalog_time}}</th>
71+
</tr>
72+
{{/is_master_server}}
73+
<tr>
74+
<th>Starting RPC server</th>
75+
<th>{{start_rpc_server_status}}%</th>
76+
<th>{{start_rpc_server_time}}</th>
77+
</tr>
78+
</table>
79+
{{/error}}

0 commit comments

Comments
 (0)