thomasmueller commented on a change in pull request #372:
URL: https://github.com/apache/jackrabbit-oak/pull/372#discussion_r712763314
##########
File path:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
##########
@@ -66,97 +71,200 @@ public IndexPrinter(IndexInfoService indexInfoService,
AsyncIndexInfoService asy
@Override
public void print(PrintWriter pw, Format format, boolean isZip) {
- //TODO Highlight if failing
- printAsyncIndexInfo(pw);
- printIndexInfo(pw);
+
+ if (format == Format.JSON) {
+ JsopBuilder json = new JsopBuilder();
+ startJsonObject(json);
+ printAsyncIndexInfo(pw, json, format);
+ printIndexInfo(pw, json, format);
+ endJsonObject(json);
+ pw.print(JsopBuilder.prettyPrint(json.toString()));
+ } else {
+ //TODO Highlight if failing
+ printAsyncIndexInfo(pw, null, format);
+ printIndexInfo(pw, null, format);
+ }
}
- private void printAsyncIndexInfo(PrintWriter pw) {
+ private void printAsyncIndexInfo(PrintWriter pw, JsopBuilder json, Format
format) {
List<String> asyncLanes =
ImmutableList.copyOf(asyncIndexInfoService.getAsyncLanes());
String title = "Async Indexers State";
- printTitle(pw, title);
- pw.printf("Number of async indexer lanes : %d%n", asyncLanes.size());
- pw.println();
+ printTitle(pw, title, format);
+ addJsonKey(json, title);
+ startJsonObject(json);
+ keyValue("Number of async indexer lanes ", asyncLanes.size(), pw,
json, format);
+ printWithNewLine(pw, "", format);
+
for (String lane : asyncLanes) {
- pw.println(lane);
+ printWithNewLine(pw, lane, format);
+ addJsonKey(json, lane);
AsyncIndexInfo info = asyncIndexInfoService.getInfo(lane);
+ startJsonObject(json);
if (info != null) {
- pw.printf(" Last indexed to : %s%n",
formatTime(info.getLastIndexedTo()));
+ keyValue(" Last indexed to ",
formatTime(info.getLastIndexedTo()), pw, json, format);
IndexStatsMBean stats = info.getStatsMBean();
if (stats != null) {
- pw.printf(" Status : %s%n",
stats.getStatus());
- pw.printf(" Failing : %s%n",
stats.isFailing());
- pw.printf(" Paused : %s%n",
stats.isPaused());
+ keyValue(" Status ", stats.getStatus(),
pw, json, format);
+ keyValue(" Failing ", stats.isFailing(),
pw, json, format);
+ keyValue(" Paused ", stats.isPaused(), pw,
json, format);
if (stats.isFailing()) {
- pw.printf(" Failing since : %s%n",
stats.getFailingSince());
- pw.printf(" Latest error : %s%n",
stats.getLatestError());
+ keyValue(" Failing since ",
stats.getFailingSince(), pw, json, format);
+ keyValue(" Latest error ",
stats.getLatestError(), pw, json, format);
}
}
- pw.println();
+ printWithNewLine(pw, "", format);
}
+ endJsonObject(json);
}
+ endJsonObject(json);
}
- private static void printTitle(PrintWriter pw, String title) {
- pw.println(title);
- pw.println(Strings.repeat("=", title.length()));
+ private static void printTitle(PrintWriter pw, String title, Format
format) {
+ if (format == Format.TEXT) {
+ pw.println(title);
+ pw.println(Strings.repeat("=", title.length()));
+ pw.println();
+ }
}
- private void printIndexInfo(PrintWriter pw) {
+ private static void printWithNewLine(PrintWriter pw, String printLine,
Format format) {
+ if (format == Format.TEXT) {
+ pw.println(printLine);
+ }
+ }
+
+ private void printIndexInfo(PrintWriter pw, JsopBuilder json, Format
format) {
ListMultimap<String, IndexInfo> infos = ArrayListMultimap.create();
for (IndexInfo info : indexInfoService.getAllIndexInfo()) {
infos.put(info.getType(), info);
}
- pw.printf("Total number of indexes : %d%n", infos.size());
+ keyValue("Total number of indexes ", infos.size(), pw, json, format);
+
for (String type : infos.keySet()){
List<IndexInfo> typedInfo = infos.get(type);
String title = String.format("%s(%d)", type, typedInfo.size());
- printTitle(pw, title);
- pw.println();
+ printTitle(pw, title, format);
+ addJsonKey(json, type);
+ startJsonObject(json);
for (IndexInfo info : typedInfo){
- printIndexInfo(pw, info);
+ printIndexInfo(pw, json, info, format);
}
+ endJsonObject(json);
}
}
- private static void printIndexInfo(PrintWriter pw, IndexInfo info) {
- pw.println(info.getIndexPath());
- pw.printf(" Type : %s%n", info.getType());
+
+ private static void printIndexInfo(PrintWriter pw, JsopBuilder json,
IndexInfo info, Format format) {
+ if (format == Format.TEXT) {
+ pw.println(info.getIndexPath());
+ }
+ addJsonKey(json, info.getIndexPath());
+ startJsonObject(json);
+
+ keyValue(" Type ", info.getType(), pw, json,
format);
if (info.getAsyncLaneName() != null) {
- pw.printf(" Async : true%n");
- pw.printf(" Async lane name : %s%n",
info.getAsyncLaneName());
+ keyValue(" Async ", true, pw, json, format);
+ keyValue(" Async lane name ", info.getAsyncLaneName(),
pw, json, format);
}
if (info.getIndexedUpToTime() > 0){
- pw.printf(" Last indexed up to : %s%n",
formatTime(info.getIndexedUpToTime()));
+ keyValue(" Last indexed up to ",
formatTime(info.getIndexedUpToTime()), pw, json, format);
}
if (info.getLastUpdatedTime() > 0){
- pw.printf(" Last updated time : %s%n",
formatTime(info.getLastUpdatedTime()));
+ keyValue(" Last updated time ",
formatTime(info.getLastUpdatedTime()), pw, json, format);
+ }
+
+ if (info.getCreationTimestamp() > 0){
+ keyValue(" Creation time ",
formatTime(info.getCreationTimestamp()), pw, json, format);
+ }
+
+ if (info.getReindexCompletionTimestamp() > 0){
+ keyValue(" Reindex completion time ",
formatTime(info.getReindexCompletionTimestamp()), pw, json, format);
}
if (info.getSizeInBytes() >= 0){
- pw.printf(" Size : %s%n",
IOUtils.humanReadableByteCount(info.getSizeInBytes()));
+ keyValue(" Size ",
IOUtils.humanReadableByteCount(info.getSizeInBytes()), pw, json, format);
+ keyValue(" Size (in Bytes) ", info.getSizeInBytes(),
pw, json, format);
+ }
+
+ if (info.getSuggestSizeInBytes() >= 0){
+ keyValue(" Suggest size ",
IOUtils.humanReadableByteCount(info.getSuggestSizeInBytes()), pw, json, format);
+ keyValue(" Suggest size (in Bytes) ",
info.getSuggestSizeInBytes(), pw, json, format);
}
if (info.getEstimatedEntryCount() >= 0){
- pw.printf(" Estimated entry count : %d%n",
info.getEstimatedEntryCount());
+ keyValue(" Estimated entry count ",
info.getEstimatedEntryCount(), pw, json, format);
+ }
+
+ if ("lucene".equals(info.getType())) {
+ // Only valid for lucene type indexes, for others it will simply
show false.
+ keyValue(" Has hidden oak mount ",
info.hasHiddenOakLibsMount(), pw, json, format);
+ keyValue(" Has property index ",
info.hasPropertyIndexNode(), pw, json, format);
}
if (info.hasIndexDefinitionChangedWithoutReindexing()) {
- pw.println(" Index definition changed without reindexing");
String diff = info.getIndexDefinitionDiff();
if (diff != null) {
- pw.println(" "+diff);
+ keyValue(" Index definition changed without reindexing ",
diff, pw, json, format);
+ printWithNewLine(pw, "", format);
}
}
- pw.println();
+ endJsonObject(json);
}
private static String formatTime(long time){
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(time);
- return ISO8601.format(cal);
+ Date date = cal.getTime();
+ SimpleDateFormat outputFmt = new
SimpleDateFormat("yyyy-mm-dd'T'HH:mm:ss.s z");
Review comment:
mm is for minutes, but you need month, I think that would be MM. "ss.s"
is incorrect, it shows seconds twice. I don't think we need milliseconds or
fractional seconds, but if you want them then this needs to be fixed.
For human readable, what about
SimpleDateFormat outputFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss
'UTC'");
For ISO 8601, I think this would be correct:
SimpleDateFormat outputFmt = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
##########
File path:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
##########
@@ -66,97 +71,200 @@ public IndexPrinter(IndexInfoService indexInfoService,
AsyncIndexInfoService asy
@Override
public void print(PrintWriter pw, Format format, boolean isZip) {
- //TODO Highlight if failing
- printAsyncIndexInfo(pw);
- printIndexInfo(pw);
+
+ if (format == Format.JSON) {
+ JsopBuilder json = new JsopBuilder();
+ startJsonObject(json);
+ printAsyncIndexInfo(pw, json, format);
+ printIndexInfo(pw, json, format);
+ endJsonObject(json);
+ pw.print(JsopBuilder.prettyPrint(json.toString()));
+ } else {
+ //TODO Highlight if failing
+ printAsyncIndexInfo(pw, null, format);
+ printIndexInfo(pw, null, format);
+ }
}
- private void printAsyncIndexInfo(PrintWriter pw) {
+ private void printAsyncIndexInfo(PrintWriter pw, JsopBuilder json, Format
format) {
List<String> asyncLanes =
ImmutableList.copyOf(asyncIndexInfoService.getAsyncLanes());
String title = "Async Indexers State";
- printTitle(pw, title);
- pw.printf("Number of async indexer lanes : %d%n", asyncLanes.size());
- pw.println();
+ printTitle(pw, title, format);
+ addJsonKey(json, title);
+ startJsonObject(json);
+ keyValue("Number of async indexer lanes ", asyncLanes.size(), pw,
json, format);
+ printWithNewLine(pw, "", format);
+
for (String lane : asyncLanes) {
- pw.println(lane);
+ printWithNewLine(pw, lane, format);
+ addJsonKey(json, lane);
AsyncIndexInfo info = asyncIndexInfoService.getInfo(lane);
+ startJsonObject(json);
if (info != null) {
- pw.printf(" Last indexed to : %s%n",
formatTime(info.getLastIndexedTo()));
+ keyValue(" Last indexed to ",
formatTime(info.getLastIndexedTo()), pw, json, format);
IndexStatsMBean stats = info.getStatsMBean();
if (stats != null) {
- pw.printf(" Status : %s%n",
stats.getStatus());
- pw.printf(" Failing : %s%n",
stats.isFailing());
- pw.printf(" Paused : %s%n",
stats.isPaused());
+ keyValue(" Status ", stats.getStatus(),
pw, json, format);
+ keyValue(" Failing ", stats.isFailing(),
pw, json, format);
+ keyValue(" Paused ", stats.isPaused(), pw,
json, format);
if (stats.isFailing()) {
- pw.printf(" Failing since : %s%n",
stats.getFailingSince());
- pw.printf(" Latest error : %s%n",
stats.getLatestError());
+ keyValue(" Failing since ",
stats.getFailingSince(), pw, json, format);
+ keyValue(" Latest error ",
stats.getLatestError(), pw, json, format);
}
}
- pw.println();
+ printWithNewLine(pw, "", format);
}
+ endJsonObject(json);
}
+ endJsonObject(json);
}
- private static void printTitle(PrintWriter pw, String title) {
- pw.println(title);
- pw.println(Strings.repeat("=", title.length()));
+ private static void printTitle(PrintWriter pw, String title, Format
format) {
+ if (format == Format.TEXT) {
+ pw.println(title);
+ pw.println(Strings.repeat("=", title.length()));
+ pw.println();
+ }
}
- private void printIndexInfo(PrintWriter pw) {
+ private static void printWithNewLine(PrintWriter pw, String printLine,
Format format) {
+ if (format == Format.TEXT) {
+ pw.println(printLine);
+ }
+ }
+
+ private void printIndexInfo(PrintWriter pw, JsopBuilder json, Format
format) {
ListMultimap<String, IndexInfo> infos = ArrayListMultimap.create();
for (IndexInfo info : indexInfoService.getAllIndexInfo()) {
infos.put(info.getType(), info);
}
- pw.printf("Total number of indexes : %d%n", infos.size());
+ keyValue("Total number of indexes ", infos.size(), pw, json, format);
+
for (String type : infos.keySet()){
List<IndexInfo> typedInfo = infos.get(type);
String title = String.format("%s(%d)", type, typedInfo.size());
- printTitle(pw, title);
- pw.println();
+ printTitle(pw, title, format);
+ addJsonKey(json, type);
+ startJsonObject(json);
for (IndexInfo info : typedInfo){
- printIndexInfo(pw, info);
+ printIndexInfo(pw, json, info, format);
}
+ endJsonObject(json);
}
}
- private static void printIndexInfo(PrintWriter pw, IndexInfo info) {
- pw.println(info.getIndexPath());
- pw.printf(" Type : %s%n", info.getType());
+
+ private static void printIndexInfo(PrintWriter pw, JsopBuilder json,
IndexInfo info, Format format) {
+ if (format == Format.TEXT) {
+ pw.println(info.getIndexPath());
+ }
+ addJsonKey(json, info.getIndexPath());
+ startJsonObject(json);
+
+ keyValue(" Type ", info.getType(), pw, json,
format);
if (info.getAsyncLaneName() != null) {
- pw.printf(" Async : true%n");
- pw.printf(" Async lane name : %s%n",
info.getAsyncLaneName());
+ keyValue(" Async ", true, pw, json, format);
+ keyValue(" Async lane name ", info.getAsyncLaneName(),
pw, json, format);
}
if (info.getIndexedUpToTime() > 0){
- pw.printf(" Last indexed up to : %s%n",
formatTime(info.getIndexedUpToTime()));
+ keyValue(" Last indexed up to ",
formatTime(info.getIndexedUpToTime()), pw, json, format);
}
if (info.getLastUpdatedTime() > 0){
- pw.printf(" Last updated time : %s%n",
formatTime(info.getLastUpdatedTime()));
+ keyValue(" Last updated time ",
formatTime(info.getLastUpdatedTime()), pw, json, format);
+ }
+
+ if (info.getCreationTimestamp() > 0){
+ keyValue(" Creation time ",
formatTime(info.getCreationTimestamp()), pw, json, format);
+ }
+
+ if (info.getReindexCompletionTimestamp() > 0){
+ keyValue(" Reindex completion time ",
formatTime(info.getReindexCompletionTimestamp()), pw, json, format);
}
if (info.getSizeInBytes() >= 0){
- pw.printf(" Size : %s%n",
IOUtils.humanReadableByteCount(info.getSizeInBytes()));
+ keyValue(" Size ",
IOUtils.humanReadableByteCount(info.getSizeInBytes()), pw, json, format);
+ keyValue(" Size (in Bytes) ", info.getSizeInBytes(),
pw, json, format);
+ }
+
+ if (info.getSuggestSizeInBytes() >= 0){
+ keyValue(" Suggest size ",
IOUtils.humanReadableByteCount(info.getSuggestSizeInBytes()), pw, json, format);
+ keyValue(" Suggest size (in Bytes) ",
info.getSuggestSizeInBytes(), pw, json, format);
}
if (info.getEstimatedEntryCount() >= 0){
- pw.printf(" Estimated entry count : %d%n",
info.getEstimatedEntryCount());
+ keyValue(" Estimated entry count ",
info.getEstimatedEntryCount(), pw, json, format);
+ }
+
+ if ("lucene".equals(info.getType())) {
+ // Only valid for lucene type indexes, for others it will simply
show false.
+ keyValue(" Has hidden oak mount ",
info.hasHiddenOakLibsMount(), pw, json, format);
+ keyValue(" Has property index ",
info.hasPropertyIndexNode(), pw, json, format);
}
if (info.hasIndexDefinitionChangedWithoutReindexing()) {
- pw.println(" Index definition changed without reindexing");
String diff = info.getIndexDefinitionDiff();
if (diff != null) {
- pw.println(" "+diff);
+ keyValue(" Index definition changed without reindexing ",
diff, pw, json, format);
+ printWithNewLine(pw, "", format);
}
}
- pw.println();
+ endJsonObject(json);
}
private static String formatTime(long time){
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(time);
- return ISO8601.format(cal);
+ Date date = cal.getTime();
+ SimpleDateFormat outputFmt = new
SimpleDateFormat("yyyy-mm-dd'T'HH:mm:ss.s z");
+ outputFmt.setTimeZone(TimeZone.getTimeZone("UTC"));
+ return outputFmt.format(date);
+ }
+
+ private static void keyValue(String key, Object value, PrintWriter pw,
JsopBuilder json, Format format) {
+ // In case the key is null or an emppty String or value is null,
+ // throw an IllegalArgumentException.
+ if (value == null || key == null || key.equals("")) {
Review comment:
I would support null values.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
