Changes aggregated at redwerk #15

ArneBab · 2020-07-29T07:11:30Z

No description provided.

Fixed indentation (and obvious bug because of it). Removed some System.out logging, fixed other.

Doing the first refacturing. --HG-- branch : eclipse-separation

--HG-- branch : eclipse-separation

Logging is left commented out for when another logging mechanism is eventually added. --HG-- branch : eclipse-separation

--HG-- branch : eclipse-separation

Logging was commented out. --HG-- branch : eclipse-separation

--HG-- branch : eclipse-separation

…gged time. --HG-- branch : eclipse-separation

--HG-- branch : eclipse-separation

…o be read. --HG-- branch : eclipse-separation

--HG-- branch : eclipse-separation

… part. --HG-- branch : eclipse-separation

--HG-- branch : eclipse-separation

Moved Priority. --HG-- branch : eclipse-separation

--HG-- branch : eclipse-separation

`Outstanding 0 jobs (0/0)` but keeps waiting

desyncr

Looking good so far. Mentioned a couple of places where there's either blocks of code commented or unnecessary files added. Haven't yet arrived at the interesting parts.

One thing to note is the uploader. Can it be moved to another repository? Or it's too coupled with plugin-library? It also would make the reviewer a bit easier.

desyncr · 2020-07-30T01:21:48Z

src/plugins/Library/util/SortedArraySet.java

 package plugins.Library.util;

-import freenet.support.Fields; // JDK6: use this instead of Arrays.binarySearch
+// import freenet.support.Fields; // JDK6: use this instead of Arrays.binarySearch


Unnecessary comment.

desyncr · 2020-07-30T01:23:55Z

src/plugins/Library/util/exec/SimpleProgress.java

+			throw new IllegalStateException("More parts done than known");
 		}
 		pdone++;
+		// System.err.println("DEBUG: " + this + " done " + pdone + "/" + known);


Watch out these left out comments. Also in line 120, 127.

desyncr · 2020-07-30T01:27:34Z

.hgignore

@@ -0,0 +1,7 @@
+build


Can we remove this file? The main repository is a git repository not a mercurial (AFAIK).

desyncr · 2020-07-30T01:28:41Z

loop.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -x


Is this file for local tests? Can we clarify it if so?

desyncr · 2020-07-30T01:30:05Z

src/plugins/Library/Library.java

 	private static int version = 36;
 	public static final String plugName = "Library " + getVersion();

+


Multiple empty lines.

desyncr · 2020-07-30T01:32:01Z

src/plugins/Library/SpiderIndexUploader.java

-	/** The uploaded index on Freenet. This never changes, it just gets updated. */
-	ProtoIndex idxFreenet;
-
+//<<<<<<< HEAD


Commented out block of code.

desyncr · 2020-07-30T01:33:00Z

src/plugins/Library/client/FreenetArchiver.java

-//					uri = hlsc.insert(ib, false, null, priorityClass, ctx);
-//					if (progress != null)
-//						progress.addPartKnown(0, true);
+//<<<<<<< HEAD


Commented out code.

desyncr · 2020-07-30T01:33:19Z

src/plugins/Library/client/FreenetArchiver.java

-        }
-
-	}
+//<<<<<<< HEAD


Commented out code.

desyncr · 2020-07-30T01:36:14Z

src/plugins/Library/io/serial/Packer.java

-	static {
-		Logger.registerClass(Packer.class);
-	}
+	//	static {


Commented out code.

desyncr · 2020-07-30T01:36:24Z

src/plugins/Library/io/serial/Packer.java

 			// read local copy of aggression
 			int agg = getAggression();
-			if(logDEBUG) Logger.debug(this, "Aggression = "+agg+" tasks size = "+tasks.size());
+			// if(logDEBUG) Logger.debug(this, "Aggression = "+agg+" tasks size = "+tasks.size());


Commented out code.

Bombe · 2020-07-30T17:28:48Z

src/plugins/Library/ArchiverFactory.java

+public interface ArchiverFactory {
+    <T, S extends ObjectStreamWriter & ObjectStreamReader>
+		  LiveArchiver<T, SimpleProgress>
+		  newArchiver(S rw, String mime, int size,


Methods in interfaces should have at least rudimentary documentation, otherwise nobody will ever know what that int is meant to be…

Bombe · 2020-07-30T17:31:15Z

src/plugins/Library/SpiderIndexURIs.java

-		return edition-1;
+		FileInputStream fis = null;
+		try {
+			fis = new FileInputStream(new File(SpiderIndexUploader.EDITION_FILENAME));


Please use try-with-resources.

Bombe · 2020-07-30T17:32:45Z

src/plugins/Library/SpiderIndexUploader.java

-	/** The uploaded index on Freenet. This never changes, it just gets updated. */
-	ProtoIndex idxFreenet;
-
+//<<<<<<< HEAD


This file is completely inacceptible.

Bombe · 2020-07-30T17:35:06Z

This PR is way too large and in rather bad shape. Are there smaller PRs this is based upon?

desyncr · 2020-07-31T01:56:19Z

@Bombe There are various branches with diverse changes. I believe this one are the most portable changes we can PR and review. These changes contain the SnakeYAML upgrade.

Debora Wöpcke and others added 30 commits December 19, 2015 12:39

Removed dead code.

3e7354d

Fixed indentation (and obvious bug because of it). Removed some System.out logging, fixed other.

More code cleanups.

bca4c8f

Setting up the structure.

2fec59b

Doing the first refacturing. --HG-- branch : eclipse-separation

Ignore built files.

16c5d07

--HG-- branch : eclipse-separation

Second part of the moving.

0953c9f

--HG-- branch : eclipse-separation

Moving another directory.

e34d776

--HG-- branch : eclipse-separation

Moved most of plugins.Library.util.concurrent.

0bf0a90

--HG-- branch : eclipse-separation

Moved the rest of plugin.Library.util.concurrent.

561424f

--HG-- branch : eclipse-separation

Moved first (and simple) part of the plugins.Library.util.

32daec1

--HG-- branch : eclipse-separation

Moved two more classes from plugins.Library.util.

c3c35a3

--HG-- branch : eclipse-separation

Moved some serialisers from plugins.Library.io.serial.

3a024be

--HG-- branch : eclipse-separation

Cleanups to allow moving of the classes.

590818d

Logging is left commented out for when another logging mechanism is eventually added. --HG-- branch : eclipse-separation

Moved the rest of the classes from plugins.Library.util.

8077166

--HG-- branch : eclipse-separation

Removed logging to allow for the move.

bed5daa

Logging was commented out. --HG-- branch : eclipse-separation

Moved almost all files from plugins.Library.io and .serial.

3e0d321

--HG-- branch : eclipse-separation

Refactoring the yaml-code to factor out the Freenet classes.

fa6053e

--HG-- branch : eclipse-separation

Moved the reader/writer and entries.

9d6c6ed

--HG-- branch : eclipse-separation

Re-enabled compilation using ant.

76954de

--HG-- branch : eclipse-separation

Fixes of first problem found when running on old index.

4cb7b8e

--HG-- branch : eclipse-separation

Refactored to simplify code and include object reading time in the lo…

147c28e

…gged time. --HG-- branch : eclipse-separation

Added more stack traces in the log to be able to spot complex problems.

83f2efd

--HG-- branch : eclipse-separation

Reverted the type changes in the TermPageEntry to allow old indexes t…

e035a8e

…o be read. --HG-- branch : eclipse-separation

Some eclipse settings for uploader.

f540a0b

--HG-- branch : eclipse-separation

Some small simple refactorings to prepare moving ProtoIndex to shared…

64610ff

… part. --HG-- branch : eclipse-separation

Changed FreenetURI to String in index/Proto*.java.

bd7f64a

--HG-- branch : eclipse-separation

Moved Index.java interface and URIEntry, URIKey to the shared.

8c62513

--HG-- branch : eclipse-separation

Created a register for the factory for LiveArchiver.

ab72b94

Moved Priority. --HG-- branch : eclipse-separation

Moved the ProtoIndex to shared.

a11bb25

--HG-- branch : eclipse-separation

First framework of the uploader compiling.

65f9ae2

--HG-- branch : eclipse-separation

Create the uploader jar.

95f21f3

--HG-- branch : eclipse-separation

debbiedub and others added 21 commits December 27, 2018 21:58

Improved the stopping of the process.

20fd1ca

Improved the name of the downloading.

6feda2b

Convert to only use tabs in indents.

bb7ac9a

Added function to specify number of simultaneous sessions.

4034dca

fix generic

d6820dc

explanatory comment added

2f4d210

update java version to 8 and snakeyaml to 1.25

86a7d0a

bypass for termTable

c5b130d

clean YamlReaderWriter and test

7ea5f86

refactoring: bypass for same bug in second place

07d43f9

disable snakeyaml implicit resolvers

bc7ab73

kludge related to bc7ab73

10d6ea2

clean

afee805

localized the place that led to the hang + temporary solution

77ca196

merge debbiedub's fcp-uploader

c7d15de

merge uploader

c950a78

first uploader launch

a6a9a94

continued testing

a013ef9

unclear null in url

2ef742a

try to fix hang

4cd7990

`Outstanding 0 jobs (0/0)` but keeps waiting

backward compatibility with previous indexes

a8b8490

ArneBab mentioned this pull request Jul 29, 2020

Upgraded to SnakeYAML 1.10 #2

Closed

desyncr requested changes Jul 30, 2020

View reviewed changes

Bombe reviewed Jul 30, 2020

View reviewed changes

Bombe requested changes Jul 30, 2020

View reviewed changes

desyncr mentioned this pull request Jul 31, 2020

Upgrade SnakeYAML #16

Open

ArneBab mentioned this pull request Oct 26, 2021

Redwerk Work #19

Open

		private static int version = 36;
		public static final String plugName = "Library " + getVersion();

Changes aggregated at redwerk #15

Are you sure you want to change the base?

Changes aggregated at redwerk #15

Uh oh!

Conversation

ArneBab commented Jul 29, 2020

Uh oh!

desyncr left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Bombe commented Jul 30, 2020

Uh oh!

desyncr commented Jul 31, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

desyncr left a comment •

edited

Loading

desyncr commented Jul 31, 2020 •

edited

Loading