@@ -64,6 +64,19 @@ struct survey_report_object_summary {
size_t blobs_nr;
};
+/**
+ * For some category given by 'label', count the number of objects
+ * that match that label along with the on-disk size and the size
+ * after decompressing (both with delta bases and zlib).
+ */
+struct survey_report_object_size_summary {
+ char *label;
+ size_t nr;
+ size_t disk_size;
+ size_t inflated_size;
+ size_t num_missing;
+};
+
/**
* This struct contains all of the information that needs to be printed
* at the end of the exploration of the repository and its references.
@@ -71,8 +84,15 @@ struct survey_report_object_summary {
struct survey_report {
struct survey_report_ref_summary refs;
struct survey_report_object_summary reachable_objects;
+
+ struct survey_report_object_size_summary *by_type;
};
+#define REPORT_TYPE_COMMIT 0
+#define REPORT_TYPE_TREE 1
+#define REPORT_TYPE_BLOB 2
+#define REPORT_TYPE_COUNT 3
+
struct survey_context {
/* Options that control what is done. */
struct survey_opts opts;
@@ -282,12 +302,41 @@ static void survey_report_plaintext_reachable_object_summary(struct survey_conte
clear_table(&table);
}
+static void survey_report_object_sizes(const char *title,
+ const char *categories,
+ struct survey_report_object_size_summary *summary,
+ size_t summary_nr)
+{
+ struct survey_table table = SURVEY_TABLE_INIT;
+ table.table_name = title;
+
+ strvec_push(&table.header, xstrdup(categories));
+ strvec_push(&table.header, xstrdup(_("Count")));
+ strvec_push(&table.header, xstrdup(_("Disk Size")));
+ strvec_push(&table.header, xstrdup(_("Inflated Size")));
+
+ for (size_t i = 0; i < summary_nr; i++) {
+ insert_table_rowv(&table, xstrdup(summary[i].label),
+ xstrfmt("%"PRIuMAX, summary[i].nr),
+ xstrfmt("%"PRIuMAX, summary[i].disk_size),
+ xstrfmt("%"PRIuMAX, summary[i].inflated_size),
+ NULL);
+ }
+
+ print_table_plaintext(&table);
+ clear_table(&table);
+}
+
static void survey_report_plaintext(struct survey_context *ctx)
{
printf("GIT SURVEY for \"%s\"\n", ctx->repo->worktree);
printf("-----------------------------------------------------\n");
survey_report_plaintext_refs(ctx);
survey_report_plaintext_reachable_object_summary(ctx);
+ survey_report_object_sizes(_("TOTAL OBJECT SIZES BY TYPE"),
+ _("Object Type"),
+ ctx->report.by_type,
+ REPORT_TYPE_COUNT);
}
static void survey_report_json(struct survey_context *ctx)
@@ -500,6 +549,64 @@ static void increment_object_counts(
}
}
+static void increment_totals(struct survey_context *ctx,
+ struct oid_array *oids,
+ struct survey_report_object_size_summary *summary)
+{
+ for (size_t i = 0; i < oids->nr; i++) {
+ struct object_info oi = OBJECT_INFO_INIT;
+ unsigned oi_flags = OBJECT_INFO_FOR_PREFETCH;
+ unsigned long object_length = 0;
+ off_t disk_sizep = 0;
+ enum object_type type;
+
+ oi.typep = &type;
+ oi.sizep = &object_length;
+ oi.disk_sizep = &disk_sizep;
+
+ if (oid_object_info_extended(ctx->repo, &oids->oid[i],
+ &oi, oi_flags) < 0) {
+ summary->num_missing++;
+ } else {
+ summary->nr++;
+ summary->disk_size += disk_sizep;
+ summary->inflated_size += object_length;
+ }
+ }
+}
+
+static void increment_object_totals(struct survey_context *ctx,
+ struct oid_array *oids,
+ enum object_type type)
+{
+ struct survey_report_object_size_summary *total;
+ struct survey_report_object_size_summary summary = { 0 };
+
+ increment_totals(ctx, oids, &summary);
+
+ switch (type) {
+ case OBJ_COMMIT:
+ total = &ctx->report.by_type[REPORT_TYPE_COMMIT];
+ break;
+
+ case OBJ_TREE:
+ total = &ctx->report.by_type[REPORT_TYPE_TREE];
+ break;
+
+ case OBJ_BLOB:
+ total = &ctx->report.by_type[REPORT_TYPE_BLOB];
+ break;
+
+ default:
+ BUG("No other type allowed");
+ }
+
+ total->nr += summary.nr;
+ total->disk_size += summary.disk_size;
+ total->inflated_size += summary.inflated_size;
+ total->num_missing += summary.num_missing;
+}
+
static int survey_objects_path_walk_fn(const char *path,
struct oid_array *oids,
enum object_type type,
@@ -509,6 +616,7 @@ static int survey_objects_path_walk_fn(const char *path,
increment_object_counts(&ctx->report.reachable_objects,
type, oids->nr);
+ increment_object_totals(ctx, oids, type);
return 0;
}
@@ -567,6 +675,11 @@ static void survey_phase_objects(struct survey_context *ctx)
info.blobs = 1;
info.tags = 1;
+ CALLOC_ARRAY(ctx->report.by_type, REPORT_TYPE_COUNT);
+ ctx->report.by_type[REPORT_TYPE_COMMIT].label = xstrdup(_("Commits"));
+ ctx->report.by_type[REPORT_TYPE_TREE].label = xstrdup(_("Trees"));
+ ctx->report.by_type[REPORT_TYPE_BLOB].label = xstrdup(_("Blobs"));
+
repo_init_revisions(ctx->repo, &revs, "");
for (size_t i = 0; i < ctx->ref_array.nr; i++) {
@@ -50,6 +50,14 @@ test_expect_success 'git survey (default)' '
Commits | 10
Trees | 10
Blobs | 10
+
+ TOTAL OBJECT SIZES BY TYPE
+ ===============================================
+ Object Type | Count | Disk Size | Inflated Size
+ ------------+-------+-----------+--------------
+ Commits | 10 | 1523 | 2153
+ Trees | 10 | 495 | 1706
+ Blobs | 10 | 191 | 101
EOF
test_cmp expect out